* configure: Regenerate.
config/ * override.m4: Use m4_version_prereq throughout. (_AC_ARG_VAR_VALIDATE, AC_MSG_FAILURE): Backport from git Autoconf: output pwd along with fatal errors, so the right config.log file is hinted at more prominently. (PARSE_ARGS): Push setting of ac_pwd in this diversion. (_GCC_AUTOCONF_VERSION): New, define to 2.59 if not defined. (_GCC_AUTOCONF_VERSION_CHECK): New macro, require use of Autoconf version _GCC_AUTOCONF_VERSION throughout the tree. (m4_wrap): New override, fix for Posix semantics of m4wrap. binutils/ * configure: Regenerate. opcodes/ * configure: Regenerate. bfd/ * configure: Regenerate. gas/ * configure: Regenerate. gprof/ * configure: Regenerate. ld/ * config.in: Regenerate. * configure: Regenerate.
This commit is contained in:
Ralf Wildenhues
parent
e4278ecbd2
commit
7fb8d61266
|
|
@ -1,3 +1,7 @@
|
|||
2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure.ac: Set TOPLEVEL_CONFIGURE_ARGUMENTS early, when
|
||||
|
|
|
|||
|
|
@ -1,3 +1,15 @@
|
|||
2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* override.m4: Use m4_version_prereq throughout.
|
||||
(_AC_ARG_VAR_VALIDATE, AC_MSG_FAILURE): Backport from git
|
||||
Autoconf: output pwd along with fatal errors, so the right
|
||||
config.log file is hinted at more prominently.
|
||||
(PARSE_ARGS): Push setting of ac_pwd in this diversion.
|
||||
(_GCC_AUTOCONF_VERSION): New, define to 2.59 if not defined.
|
||||
(_GCC_AUTOCONF_VERSION_CHECK): New macro, require use of Autoconf
|
||||
version _GCC_AUTOCONF_VERSION throughout the tree.
|
||||
(m4_wrap): New override, fix for Posix semantics of m4wrap.
|
||||
|
||||
2008-06-08 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
PR tree-optimization/36218
|
||||
|
|
|
|||
|
|
@ -2,10 +2,15 @@ dnl Fix Autoconf-2.59 bugs: by overriding broken internal
|
|||
dnl Autoconf macros with backports of the 2.60+ fix.
|
||||
dnl - AC_CONFIG_SUBDIRS whitespace mangling,
|
||||
dnl - more lenient precious variable checks
|
||||
dnl - better configure error message
|
||||
dnl - reliance on non-Posix m4wrap (M4 1.6 or newer implement FIFO)
|
||||
dnl
|
||||
dnl This file should be a no-op for Autoconf versions != 2.59.
|
||||
dnl It can be removed once the complete tree has moved to a
|
||||
dnl newer Autoconf version.
|
||||
dnl The override bits of this file should be a no-op for the newest
|
||||
dnl Autoconf version, which means they can be removed once the complete
|
||||
dnl tree has moved to a new enough Autoconf version.
|
||||
dnl
|
||||
dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired
|
||||
dnl Autoconf version is used. It should be kept for consistency.
|
||||
|
||||
dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro.
|
||||
dnl We use it because this fix is intended for 2.59 only.
|
||||
|
|
@ -22,7 +27,36 @@ m4_copy([AC_PREREQ], [_AC_PREREQ])
|
|||
AC_DEFUN([AC_PREREQ], [frob])
|
||||
m4_copy([_AC_PREREQ], [AC_PREREQ])
|
||||
|
||||
ifelse(m4_PACKAGE_VERSION, [2.59], [
|
||||
|
||||
dnl Ensure exactly this Autoconf version is used
|
||||
m4_ifndef([_GCC_AUTOCONF_VERSION],
|
||||
[m4_define([_GCC_AUTOCONF_VERSION], [2.59])])
|
||||
|
||||
dnl Test for the exact version when AC_INIT is expanded.
|
||||
dnl This allows to update the tree in steps (for testing)
|
||||
dnl by putting
|
||||
dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
|
||||
dnl in configure.ac before AC_INIT,
|
||||
dnl without rewriting this file.
|
||||
dnl Or for updating the whole tree at once with the definition above.
|
||||
AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
|
||||
[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
|
||||
m4_defn([m4_PACKAGE_VERSION]), [],
|
||||
[m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
|
||||
])
|
||||
m4_define([AC_INIT], m4_defn([AC_INIT])[
|
||||
_GCC_AUTOCONF_VERSION_CHECK
|
||||
])
|
||||
|
||||
m4_version_prereq([2.60],, [
|
||||
dnl We use $ac_pwd in some of the overrides below; ensure its definition
|
||||
m4_divert_push([PARSE_ARGS])dnl
|
||||
ac_pwd=`pwd`
|
||||
m4_divert_pop([PARSE_ARGS])dnl
|
||||
])
|
||||
|
||||
|
||||
m4_version_prereq([2.60],, [
|
||||
|
||||
# _AC_OUTPUT_SUBDIRS
|
||||
# ------------------
|
||||
|
|
@ -128,13 +162,15 @@ fi
|
|||
])# _AC_OUTPUT_SUBDIRS
|
||||
])
|
||||
|
||||
ifelse(m4_PACKAGE_VERSION, [2.62],, [
|
||||
m4_version_prereq([2.63],, [
|
||||
|
||||
# _AC_ARG_VAR_VALIDATE
|
||||
# --------------------
|
||||
# The code is the same as autoconf 2.59, but with a more lenient check
|
||||
# on precious variables that has been added in autoconf 2.62.
|
||||
# on precious variables and an output of pwd that have been added in
|
||||
# autoconf 2.62.
|
||||
m4_define([_AC_ARG_VAR_VALIDATE],
|
||||
[m4_divert_text([INIT_PREPARE],
|
||||
[# Check that the precious variables saved in the cache have kept the same
|
||||
# value.
|
||||
ac_cache_corrupted=false
|
||||
|
|
@ -184,8 +220,32 @@ dnl it's sensitive. Putting any kind of quote in it causes syntax errors.
|
|||
fi
|
||||
done
|
||||
if $ac_cache_corrupted; then
|
||||
AS_MESSAGE([error: in `$ac_pwd':], 2)
|
||||
AS_MESSAGE([error: changes in the environment can compromise the build], 2)
|
||||
AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over])
|
||||
fi
|
||||
fi])dnl
|
||||
])# _AC_ARG_VAR_VALIDATE
|
||||
])])
|
||||
])
|
||||
|
||||
m4_version_prereq([2.63],, [
|
||||
|
||||
# AC_MSG_FAILURE(ERROR, [EXIT-STATUS = 1])
|
||||
# ----------------------------------------
|
||||
# This is the same code as in 2.59 and 2.61, except it also outputs pwd.
|
||||
m4_define([AC_MSG_FAILURE],
|
||||
[{ AS_MESSAGE([error: in `$ac_pwd':], 2)
|
||||
AC_MSG_ERROR([$1
|
||||
See `config.log' for more details.], [$2]); }])
|
||||
])
|
||||
])
|
||||
|
||||
m4_version_prereq([2.60],, [
|
||||
dnl M4 1.6 and newer implement m4wrap using FIFO semantics, as required
|
||||
dnl by Posix; earlier versions used LIFO semantics. Unfortunately,
|
||||
dnl Autoconf versions before 2.60 require those LIFO semantics, so
|
||||
dnl make sure to give it to them.
|
||||
m4_define([m4_wrap], [m4_ifdef([_$0_text],
|
||||
[m4_define([_$0_text], [$1]m4_defn([_$0_text]))],
|
||||
[m4_define([_$0_text], [$1])m4_builtin([m4wrap],
|
||||
[m4_default(m4_defn([_$0_text])m4_undefine([_$0_text]))])])])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -274,6 +274,7 @@ PACKAGE_BUGREPORT=
|
|||
ac_unique_file="move-if-change"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||
ac_pwd=`pwd`
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=
|
||||
|
|
@ -1447,6 +1448,8 @@ echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
|||
fi
|
||||
done
|
||||
if $ac_cache_corrupted; then
|
||||
{ echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
||||
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
||||
|
|
@ -1476,6 +1479,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -3229,11 +3235,13 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||||
test -z "$CC" && { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
{ (exit 1); exit 1; }; }; }
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:$LINENO:" \
|
||||
|
|
@ -3319,11 +3327,13 @@ else
|
|||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: C compiler cannot create executables
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 77); exit 77; }; }
|
||||
{ (exit 77); exit 77; }; }; }
|
||||
fi
|
||||
|
||||
ac_exeext=$ac_cv_exeext
|
||||
|
|
@ -3348,13 +3358,15 @@ if test "$cross_compiling" != yes; then
|
|||
if test "$cross_compiling" = maybe; then
|
||||
cross_compiling=yes
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||||
{ { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||||
If you meant to cross compile, use \`--host'.
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run C compiled programs.
|
||||
If you meant to cross compile, use \`--host'.
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
{ (exit 1); exit 1; }; }; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -3392,11 +3404,13 @@ for ac_file in conftest.exe conftest conftest.*; do
|
|||
esac
|
||||
done
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||||
{ { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
{ (exit 1); exit 1; }; }; }
|
||||
fi
|
||||
|
||||
rm -f conftest$ac_cv_exeext
|
||||
|
|
@ -3443,11 +3457,13 @@ else
|
|||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||
echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
{ (exit 1); exit 1; }; }; }
|
||||
fi
|
||||
|
||||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||||
|
|
|
|||
Loading…
Reference in New Issue