diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/aclocal.m4 | 12 | ||||
| -rwxr-xr-x | gas/configure | 29 | ||||
| -rw-r--r-- | gas/configure.in | 21 |
4 files changed, 32 insertions, 36 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index b380322..140d293 100644 --- a/gas/ChangeLog +++ b/gas/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-22 Nick Clifton <nickc@redhat.com> * config/tc-mcore.c (md_assemble): Increase length of name array diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index d74dce9..2e8c99b 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 22eb13a..a1594dd 100755 --- a/gas/configure +++ b/gas/configure @@ -1487,6 +1487,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in .. $srcdir/..; do if test -f $ac_dir/install-sh; then @@ -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 7145dce..1203893 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 <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 *);])], 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 |