From da594c4a29ff199ff1b1986587cdd3babcaf1693 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 24 Aug 2008 03:13:05 +0000 Subject: [PATCH] Update a number of obsolete autoconf macros. --- bfd/ChangeLog | 5 +++++ bfd/aclocal.m4 | 12 ------------ bfd/configure.in | 8 ++++---- binutils/ChangeLog | 6 ++++++ binutils/aclocal.m4 | 12 ------------ binutils/configure | 30 ++++++++++++++++-------------- binutils/configure.in | 42 ++++++++++++++++++++++-------------------- gas/ChangeLog | 6 ++++++ gas/aclocal.m4 | 12 ------------ gas/configure | 29 +++++++++++++++-------------- gas/configure.in | 21 +++++++++++---------- gprof/ChangeLog | 4 ++++ gprof/configure.in | 4 ++-- ld/ChangeLog | 6 ++++++ ld/aclocal.m4 | 12 ------------ ld/configure | 30 ++++++++++++++++-------------- ld/configure.in | 28 +++++++++++++++------------- opcodes/ChangeLog | 5 +++++ opcodes/aclocal.m4 | 12 ------------ opcodes/configure.in | 8 ++++---- 20 files changed, 137 insertions(+), 155 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5319857f32..bf9d580228 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2008-08-24 Alan Modra + + * configure.in: Update a number of obsolete autoconf macros. + * aclocal.m4: Regenerate. + 2008-08-23 Andreas Schwab * opncls.c (find_separate_debug_file): Use the canonical diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 70546524bf..fa32dcb9ab 100644 --- a/bfd/aclocal.m4 +++ b/bfd/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/bfd/configure.in b/bfd/configure.in index cd31706767..d098988d16 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -10,20 +10,20 @@ AC_ISC_POSIX AM_INIT_AUTOMAKE(bfd, 2.18.50) -dnl These must be called before AM_PROG_LIBTOOL, because it may want +dnl These must be called before LT_INIT, because it may want dnl to call AC_CHECK_PROG. AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) dnl Default to a non shared library. This may be overridden by the dnl configure option --enable-shared. -AM_DISABLE_SHARED +AC_DISABLE_SHARED AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AC_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(64-bit-bfd, [ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], @@ -102,7 +102,7 @@ ACX_BUGURL([http://www.sourceware.org/bugzilla/]) 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.) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 492a67c405..6e0bfb4551 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 193b5f9eb3..cf88058350 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 fdafbe0659..e3121d17f2 100755 --- a/binutils/configure +++ b/binutils/configure @@ -1488,6 +1488,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= @@ -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 7ab34c75f5..d634465a1d 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 diff --git a/gas/ChangeLog b/gas/ChangeLog index b38032212d..140d293bdc 100644 --- a/gas/ChangeLog +++ b/gas/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-22 Nick Clifton * config/tc-mcore.c (md_assemble): Increase length of name array diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index d74dce93b4..2e8c99bfa7 100644 --- a/gas/aclocal.m4 +++ b/gas/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/gas/configure b/gas/configure index 22eb13acbf..a1594dd21a 100755 --- a/gas/configure +++ b/gas/configure @@ -1485,6 +1485,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= @@ -5250,13 +5251,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:5253: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5254: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5256: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5257: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5259: output\"" >&5) + (eval echo "\"\$as_me:5260: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6311,7 +6312,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6314 "configure"' > conftest.$ac_ext + echo '#line 6315 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6938,11 +6939,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:6941: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6942: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6945: \$? = $ac_status" >&5 + echo "$as_me:6946: \$? = $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. @@ -7260,11 +7261,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:7263: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7264: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7267: \$? = $ac_status" >&5 + echo "$as_me:7268: \$? = $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. @@ -7365,11 +7366,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:7368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7369: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7372: \$? = $ac_status" >&5 + echo "$as_me:7373: \$? = $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 @@ -7420,11 +7421,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:7423: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7424: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7427: \$? = $ac_status" >&5 + echo "$as_me:7428: \$? = $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 @@ -10217,7 +10218,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10220 "configure" +#line 10221 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10317,7 +10318,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10320 "configure" +#line 10321 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gas/configure.in b/gas/configure.in index 7145dce494..1203893e75 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -5,14 +5,15 @@ dnl brackets, be sure changequote invocations surround it. dnl dnl dnl v2.5 needed for --bindir et al -AC_PREREQ(2.57) -AC_INIT(as.h) +AC_PREREQ(2.59) +AC_INIT +AC_CONFIG_SRCDIR(as.h) dnl Autoconf 2.57 will find the aux dir without this. However, unless dnl we specify this explicitly, automake-1.7 will assume that ylwrap is in dnl gas/ instead of gas/../. AC_CONFIG_AUX_DIR(..) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_ISC_POSIX changequote(,)dnl @@ -24,12 +25,12 @@ AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AM_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(targets, [ --enable-targets alternative target configurations besides the primary], [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 ;; @@ -62,7 +63,7 @@ using_cgen=no AM_BINUTILS_WARNINGS # Generate a header file -AM_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADERS(config.h:config.in) # If we are on a DOS filesystem, we must use gdb.ini rather than # .gdbinit. @@ -225,7 +226,7 @@ changequote(,)dnl changequote([,])dnl ;; *) - AC_ERROR($target_cpu isn't a supported MIPS CPU name) + AC_MSG_ERROR($target_cpu isn't a supported MIPS CPU name) ;; esac # See whether it's appropriate to set E_MIPS_ABI_O32 for o32 @@ -624,7 +625,7 @@ fi AC_MSG_RESULT($cross_gas) dnl ansidecl.h will deal with const -dnl AC_CONST +dnl AC_C_CONST AC_FUNC_ALLOCA AC_C_INLINE @@ -637,7 +638,7 @@ AC_CHECK_FUNCS(sbrk) # do we need the math library? case "${need_libm}" in yes) - AC_CHECK_LIBM + LT_LIB_M AC_SUBST(LIBM) ;; esac @@ -679,7 +680,7 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [ AC_MSG_CHECKING(for a known getopt prototype in unistd.h) AC_CACHE_VAL(gas_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 *);])], gas_cv_decl_getopt_unistd_h=yes, gas_cv_decl_getopt_unistd_h=no)]) AC_MSG_RESULT($gas_cv_decl_getopt_unistd_h) if test $gas_cv_decl_getopt_unistd_h = yes; then diff --git a/gprof/ChangeLog b/gprof/ChangeLog index dd51b93b9b..9f9975c641 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,7 @@ +2008-08-24 Alan Modra + + *configure.in: Update a number of obsolete autoconf macros. + 2008-08-15 Alan Modra PR 6526 diff --git a/gprof/configure.in b/gprof/configure.in index 18475d74de..904e051954 100644 --- a/gprof/configure.in +++ b/gprof/configure.in @@ -22,7 +22,7 @@ AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS AC_PROG_INSTALL -AM_PROG_LIBTOOL +LT_INIT AC_CHECK_FUNCS(setmode) @@ -38,7 +38,7 @@ AC_CHECK_HEADERS(sys/gmon_out.h) AC_MSG_CHECKING(for a known getopt prototype in unistd.h) AC_CACHE_VAL(gprof_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 *);])], gprof_cv_decl_getopt_unistd_h=yes, gprof_cv_decl_getopt_unistd_h=no)]) AC_MSG_RESULT($gprof_cv_decl_getopt_unistd_h) if test $gprof_cv_decl_getopt_unistd_h = yes; then diff --git a/ld/ChangeLog b/ld/ChangeLog index a030e26ca4..95ad24e86c 100644 --- a/ld/ChangeLog +++ b/ld/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 Jan Kratochvil PR ld/6833 diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index 4fc5856a59..4317ce3426 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 f4d372cda2..c0ad08b5e2 100755 --- a/ld/configure +++ b/ld/configure @@ -1488,6 +1488,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= @@ -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 26ad87bbc3..8ec534f3e9 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=], [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 ], [extern int getopt (int, char *const*, const char *);], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [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 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3230d52a74..2e0d49e89b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2008-08-24 Alan Modra + + * configure.in: Update a number of obsolete autoconf macros. + * aclocal.m4: Regenerate. + 2008-08-20 H.J. Lu AVX Programming Reference (August, 2008) diff --git a/opcodes/aclocal.m4 b/opcodes/aclocal.m4 index 6fac0c74e2..50e7e23231 100644 --- a/opcodes/aclocal.m4 +++ b/opcodes/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/opcodes/configure.in b/opcodes/configure.in index ce66f7f59e..2800eed750 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -21,16 +21,16 @@ AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -dnl These must be called before AM_PROG_LIBTOOL, because it may want +dnl These must be called before LT_INIT, because it may want dnl to call AC_CHECK_PROG. AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) dnl Default to a non shared library. This may be overridden by the dnl configure option --enable-shared. -AM_DISABLE_SHARED +AC_DISABLE_SHARED -AM_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(targets, [ --enable-targets alternative target configurations], @@ -50,7 +50,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.) -- 2.34.1