From da594c4a29ff199ff1b1986587cdd3babcaf1693 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 24 Aug 2008 03:13:05 +0000 Subject: Update a number of obsolete autoconf macros. --- binutils/ChangeLog | 6 ++++++ binutils/aclocal.m4 | 12 ------------ binutils/configure | 30 ++++++++++++++++-------------- binutils/configure.in | 42 ++++++++++++++++++++++-------------------- 4 files changed, 44 insertions(+), 46 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 492a67c..6e0bfb4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2008-08-24 Alan Modra + + * configure.in: Update a number of obsolete autoconf macros. + * configure: Regenerate. + * aclocal.m4: Regenerate. + 2008-08-21 Richard Henderson * readelf.c (is_32bit_pcrel_reloc): Fix hppa entry. diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index 193b5f9..cf88058 100644 --- a/binutils/aclocal.m4 +++ b/binutils/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/binutils/configure b/binutils/configure index fdafbe0..e3121d1 100755 --- a/binutils/configure +++ b/binutils/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 @@ -5252,13 +5253,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:5255: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5256: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5258: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5259: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5261: output\"" >&5) + (eval echo "\"\$as_me:5262: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6313,7 +6314,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6316 "configure"' > conftest.$ac_ext + echo '#line 6317 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6940,11 +6941,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:6943: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6947: \$? = $ac_status" >&5 + echo "$as_me:6948: \$? = $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. @@ -7262,11 +7263,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:7265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7266: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:7270: \$? = $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. @@ -7367,11 +7368,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:7370: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7371: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7374: \$? = $ac_status" >&5 + echo "$as_me:7375: \$? = $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 @@ -7422,11 +7423,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:7425: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7426: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7429: \$? = $ac_status" >&5 + echo "$as_me:7430: \$? = $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 @@ -10219,7 +10220,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10222 "configure" +#line 10223 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10319,7 +10320,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10322 "configure" +#line 10323 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15237,6 +15238,7 @@ done ac_config_files="$ac_config_files Makefile doc/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/binutils/configure.in b/binutils/configure.in index 7ab34c7..d634465 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -1,9 +1,10 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_PREREQ(2.57) -AC_INIT(ar.c) +AC_PREREQ(2.59) +AC_INIT +AC_CONFIG_SRCDIR(ar.c) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_ISC_POSIX changequote(,)dnl @@ -14,12 +15,12 @@ AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION}) AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AC_PROG_LIBTOOL +LT_INIT 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 ;; @@ -34,7 +35,7 @@ esac])dnl 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.) @@ -96,13 +97,13 @@ AC_CHECK_FUNC([mkdtemp], # needs to be defined for it AC_MSG_CHECKING([for fopen64]) AC_CACHE_VAL(bu_cv_have_fopen64, -[AC_TRY_LINK([#include ], [FILE *f = fopen64 ("/tmp/foo","r");], +[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [FILE *f = fopen64 ("/tmp/foo","r");])], bu_cv_have_fopen64=yes, [saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" - AC_TRY_LINK([#include ], [FILE *f = fopen64 ("/tmp/foo","r");], -bu_cv_have_fopen64="need -D_LARGEFILE64_SOURCE", -bu_cv_have_fopen64=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [FILE *f = fopen64 ("/tmp/foo","r");])], + bu_cv_have_fopen64="need -D_LARGEFILE64_SOURCE", + bu_cv_have_fopen64=no) CPPFLAGS=$saved_CPPFLAGS])]) AC_MSG_RESULT($bu_cv_have_fopen64) if test "$bu_cv_have_fopen64" != no; then @@ -111,13 +112,13 @@ if test "$bu_cv_have_fopen64" != no; then fi AC_MSG_CHECKING([for stat64]) AC_CACHE_VAL(bu_cv_have_stat64, -[AC_TRY_LINK([#include ], [struct stat64 st; stat64 ("/tmp/foo", &st);], +[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [struct stat64 st; stat64 ("/tmp/foo", &st);])], bu_cv_have_stat64=yes, [saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" - AC_TRY_LINK([#include ], [struct stat64 st; stat64 ("/tmp/foo", &st);], -bu_cv_have_stat64="need -D_LARGEFILE64_SOURCE", -bu_cv_have_stat64=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [struct stat64 st; stat64 ("/tmp/foo", &st);])], + bu_cv_have_stat64="need -D_LARGEFILE64_SOURCE", + bu_cv_have_stat64=no) CPPFLAGS=$saved_CPPFLAGS])]) AC_MSG_RESULT($bu_cv_have_stat64) if test "$bu_cv_have_stat64" != no; then @@ -136,7 +137,7 @@ AC_SEARCH_LIBS(frexp, m) AC_MSG_CHECKING(for time_t in time.h) AC_CACHE_VAL(bu_cv_decl_time_t_time_h, -[AC_TRY_COMPILE([#include ], [time_t i;], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [time_t i;])], bu_cv_decl_time_t_time_h=yes, bu_cv_decl_time_t_time_h=no)]) AC_MSG_RESULT($bu_cv_decl_time_t_time_h) if test $bu_cv_decl_time_t_time_h = yes; then @@ -146,7 +147,7 @@ fi AC_MSG_CHECKING(for time_t in sys/types.h) AC_CACHE_VAL(bu_cv_decl_time_t_types_h, -[AC_TRY_COMPILE([#include ], [time_t i;], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [time_t i;])], bu_cv_decl_time_t_types_h=yes, bu_cv_decl_time_t_types_h=no)]) AC_MSG_RESULT($bu_cv_decl_time_t_types_h) if test $bu_cv_decl_time_t_types_h = yes; then @@ -156,7 +157,7 @@ fi AC_MSG_CHECKING(for a known getopt prototype in unistd.h) AC_CACHE_VAL(bu_cv_decl_getopt_unistd_h, -[AC_TRY_COMPILE([#include ], [extern int getopt (int, char *const*, const char *);], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [extern int getopt (int, char *const*, const char *);])], bu_cv_decl_getopt_unistd_h=yes, bu_cv_decl_getopt_unistd_h=no)]) AC_MSG_RESULT($bu_cv_decl_getopt_unistd_h) if test $bu_cv_decl_getopt_unistd_h = yes; then @@ -168,12 +169,12 @@ fi # by default. AC_MSG_CHECKING([for utime.h]) AC_CACHE_VAL(bu_cv_header_utime_h, -[AC_TRY_COMPILE([#include +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #ifdef HAVE_TIME_H #include #endif #include ], -[struct utimbuf s;], +[struct utimbuf s;])], bu_cv_header_utime_h=yes, bu_cv_header_utime_h=no)]) AC_MSG_RESULT($bu_cv_header_utime_h) if test $bu_cv_header_utime_h = yes; then @@ -453,4 +454,5 @@ AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) -AC_OUTPUT(Makefile doc/Makefile po/Makefile.in:po/Make-in) +AC_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in) +AC_OUTPUT -- cgit v1.1