diff options
Diffstat (limited to 'ld/configure.in')
| -rw-r--r-- | ld/configure.in | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ld/configure.in b/ld/configure.in index 26ad87b..8ec534f 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -1,9 +1,10 @@ dnl Process this file with autoconf to produce a configure script dnl -AC_PREREQ(2.57) -AC_INIT(ldmain.c) +AC_PREREQ(2.59) +AC_INIT +AC_CONFIG_SRCDIR(ldmain.c) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_ISC_POSIX changequote(,)dnl @@ -15,7 +16,7 @@ AC_ARG_WITH(lib-path, [ --with-lib-path=dir1:dir2... set default LIB_PATH],LIB AC_ARG_ENABLE(targets, [ --enable-targets alternative target configurations], [case "${enableval}" in - yes | "") AC_ERROR(enable-targets option must specify target names or 'all') + yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all') ;; no) enable_targets= ;; *) enable_targets=$enableval ;; @@ -72,7 +73,7 @@ AS_HELP_STRING([--enable-got=<type>], [GOT handling scheme (target, single, negative, multigot)]), [case "${enableval}" in target | single | negative | multigot) got_handling=$enableval ;; - *) AC_ERROR(bad value ${enableval} for --enable-got option) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-got option) ;; esac], [got_handling=target]) @@ -89,12 +90,12 @@ case "${got_handling}" in multigot) AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_MULTIGOT], [Define to choose default GOT handling scheme]) ;; - *) AC_ERROR(bad value ${got_handling} for --enable-got option) ;; + *) AC_MSG_ERROR(bad value ${got_handling} for --enable-got option) ;; esac AM_BINUTILS_WARNINGS -AM_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADERS([config.h:config.in]) if test -z "$target" ; then AC_MSG_ERROR(Unrecognized target system type; please check config.sub.) @@ -110,7 +111,7 @@ AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS AC_PROG_INSTALL -AM_PROG_LIBTOOL +LT_INIT ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi" ZW_GNU_GETTEXT_SISTER_DIR @@ -137,7 +138,7 @@ AC_HEADER_DIRENT AC_MSG_CHECKING(for a known getopt prototype in unistd.h) AC_CACHE_VAL(ld_cv_decl_getopt_unistd_h, -[AC_TRY_COMPILE([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);])], ld_cv_decl_getopt_unistd_h=yes, ld_cv_decl_getopt_unistd_h=no)]) AC_MSG_RESULT($ld_cv_decl_getopt_unistd_h) if test $ld_cv_decl_getopt_unistd_h = yes; then @@ -161,9 +162,9 @@ AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) # support string concatenation. AC_MSG_CHECKING([whether ANSI C string concatenation works]) AC_CACHE_VAL(ld_cv_string_concatenation, -[AC_TRY_COMPILE(,[char *a = "a" "a";], - [ld_cv_string_concatenation=yes], - [ld_cv_string_concatenation=no])]) +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [char *a = "a" "a";])], + ld_cv_string_concatenation=yes, + ld_cv_string_concatenation=no)]) AC_MSG_RESULT($ld_cv_string_concatenation) if test "$ld_cv_string_concatenation" = "yes"; then STRINGIFY=astring.sed @@ -306,4 +307,5 @@ AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) -AC_OUTPUT(Makefile po/Makefile.in:po/Make-in) +AC_CONFIG_FILES(Makefile po/Makefile.in:po/Make-in) +AC_OUTPUT |