Disable option checking in the toplevel, avoid 2.64 fopen glitch.

/:
	* configure.ac: Call AC_DISABLE_OPTION_CHECKING.
	(baseargs): Add --disable-option-checking.
	* configure: Regenerate.

config/:
	* override.m4 (AC_DISABLE_OPTION_CHECKING): Define to be
	empty if not defined, to avoid error with 2.59.
	(_AC_LANG_IO_PROGRAM): When the Autoconf version is exactly
	2.64, avoid per-language instances to drop fopen from test
	program.

diff --git a/ChangeLog b/ChangeLog
index 982ba75bad53e0f87fd03faf58a83c86fa695e8b..7c424a8c4f676d81beed87e3ffd0b3cc328c93bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * configure.ac: Call AC_DISABLE_OPTION_CHECKING.
+       (baseargs): Add --disable-option-checking.
+       * configure: Regenerate.
+
        * Makefile.def (configure-target-libiberty): Depend on
        all-binutils and all-ld.
        (configure-target-newlib): Likewise.

diff --git a/config/ChangeLog b/config/ChangeLog
index c9a51dc988ce129a9e0e7932b0bfd79696488155..7a2a7b642e1f68049d5cf677139ca4e0433064fe 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * override.m4 (AC_DISABLE_OPTION_CHECKING): Define to be
+       empty if not defined, to avoid error with 2.59.
+       (_AC_LANG_IO_PROGRAM): When the Autoconf version is exactly
+       2.64, avoid per-language instances to drop fopen from test
+       program.
+
 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand

diff --git a/config/override.m4 b/config/override.m4
index bf112db99a89f35fdc48b272de18fd7a03501eca..a10146ff75afedac20a7ad489bdbbb09746b49d6 100644 (file)
--- a/config/override.m4
+++ b/config/override.m4
@@ -58,6 +58,19 @@ m4_define([AC_INIT], m4_defn([AC_INIT])[
 _GCC_AUTOCONF_VERSION_CHECK
 ])
 
+
+dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
+m4_ifndef([AC_DISABLE_OPTION_CHECKING],
+  [m4_define([AC_DISABLE_OPTION_CHECKING])])
+
+
+dnl Fix 2.64 cross compile detection for AVR and RTEMS
+dnl by not trying to compile fopen.
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.64],
+  [m4_foreach([_GCC_LANG], [C, C++, Fortran, Fortran 77],
+     [m4_define([_AC_LANG_IO_PROGRAM(]_GCC_LANG[)], m4_defn([AC_LANG_PROGRAM(]_GCC_LANG[)]))])])
+
+
 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

diff --git a/configure b/configure
index ed4791b1288599399963d5106661d5b20dafa517..1acfca7fe109f11085de1b7209f222c2ee2fefd8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1509,6 +1509,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 
 
 progname=$0
@@ -6546,6 +6547,7 @@ baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
 if test "$silent" = yes; then
   baseargs="$baseargs --silent"
 fi
+baseargs="$baseargs --disable-option-checking"
 
 # For the build-side libraries, we just need to pretend we're native,
 # and not use the same cache file.  Multilibs are neither needed nor

diff --git a/configure.ac b/configure.ac
index 7508758f01fedf7eeb703ad965508beba1962692..9da0048969a7f78dd9fe508c03b59304415b3a2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ m4_include(config/proginstall.m4)
 
 AC_INIT(move-if-change)
 AC_PREREQ(2.59)
+AC_DISABLE_OPTION_CHECKING
 
 progname=$0
 # if PWD already has a value, it is probably wrong.
@@ -2662,6 +2663,7 @@ baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
 if test "$silent" = yes; then
   baseargs="$baseargs --silent"
 fi
+baseargs="$baseargs --disable-option-checking"
 
 # For the build-side libraries, we just need to pretend we're native,
 # and not use the same cache file.  Multilibs are neither needed nor