summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-23 10:22:37 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-23 10:22:37 +0000
commit4aede81643b2ed590f77d34338c45810c4bb141b (patch)
tree040281b1f9d2b7d4a6f334ad3d59cfc65590ec06 /config
parent37b53d845e18b28effe23f8642fe237d8385f695 (diff)
downloadgcc-4aede81643b2ed590f77d34338c45810c4bb141b.tar.gz
2008-04-23 Paolo Bonzini <bonzini@gnu.org>
* override.m4: Apply _AC_ARG_VALIDATE fix to all versions but 2.62. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134590 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog5
-rw-r--r--config/override.m410
2 files changed, 11 insertions, 4 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 2bddc4d3887..32c912682a6 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-23 Paolo Bonzini <bonzini@gnu.org>
+
+ * override.m4: Apply _AC_ARG_VALIDATE fix to all versions
+ but 2.62.
+
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457
diff --git a/config/override.m4 b/config/override.m4
index 4838a7da95d..592f64139b6 100644
--- a/config/override.m4
+++ b/config/override.m4
@@ -17,14 +17,13 @@ dnl Redefine AC_CONFIG_SUBDIRS so aclocal pulls in this file
dnl when needed.
ifdef([m4_PACKAGE_VERSION],
-[ifelse(m4_PACKAGE_VERSION, [2.59], [
-
-dnl AC_DEFUN a commonly used macro so this file is picked up.
+[dnl AC_DEFUN a commonly used macro so this file is picked up.
m4_copy([AC_PREREQ], [_AC_PREREQ])
AC_DEFUN([AC_PREREQ], [frob])
m4_copy([_AC_PREREQ], [AC_PREREQ])
-dnl Override the broken macro.
+ifelse(m4_PACKAGE_VERSION, [2.59], [
+
# _AC_OUTPUT_SUBDIRS
# ------------------
# This is a subroutine of AC_OUTPUT, but it does not go into
@@ -127,6 +126,9 @@ if test "$no_recursion" != yes; then
done
fi
])# _AC_OUTPUT_SUBDIRS
+])
+
+ifelse(m4_PACKAGE_VERSION, [2.62],, [
# _AC_ARG_VAR_VALIDATE
# --------------------