aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog8
-rw-r--r--config/override.m413
2 files changed, 21 insertions, 0 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index c9a51dc..7a2a7b6 100644
--- 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 bf112db..a10146f 100644
--- 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