diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/aclocal.m4 | 12 | ||||
| -rwxr-xr-x | ld/configure | 30 | ||||
| -rw-r--r-- | ld/configure.in | 28 |
4 files changed, 37 insertions, 39 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index a030e26..95ad24e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2008-08-24 Alan Modra <amodra@bigpond.net.au> + + * configure.in: Update a number of obsolete autoconf macros. + * configure: Regenerate. + * aclocal.m4: Regenerate. + 2008-08-21 Jan Kratochvil <jan.kratochvil@redhat.com> PR ld/6833 diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index 4fc5856..4317ce3 100644 --- a/ld/aclocal.m4 +++ b/ld/aclocal.m4 @@ -340,18 +340,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 diff --git a/ld/configure b/ld/configure index f4d372c..c0ad08b 100755 --- a/ld/configure +++ b/ld/configure @@ -1490,6 +1490,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -5541,13 +5542,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5544: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5545: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5547: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5548: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5550: output\"" >&5) + (eval echo "\"\$as_me:5551: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6602,7 +6603,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6605 "configure"' > conftest.$ac_ext + echo '#line 6606 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7229,11 +7230,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7233: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7236: \$? = $ac_status" >&5 + echo "$as_me:7237: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7551,11 +7552,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7554: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7555: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7558: \$? = $ac_status" >&5 + echo "$as_me:7559: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7656,11 +7657,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7660: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7663: \$? = $ac_status" >&5 + echo "$as_me:7664: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7711,11 +7712,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7714: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7715: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7718: \$? = $ac_status" >&5 + echo "$as_me:7719: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10508,7 +10509,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10511 "configure" +#line 10512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10608,7 +10609,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10611 "configure" +#line 10612 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13499,6 +13500,7 @@ fi ac_config_files="$ac_config_files Makefile po/Makefile.in:po/Make-in" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure 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 |