override.m4: Apply _AC_ARG_VALIDATE fix to all versions but 2.62.

2008-04-23  Paolo Bonzini  <bonzini@gnu.org>

	* override.m4: Apply _AC_ARG_VALIDATE fix to all versions
	but 2.62.

From-SVN: r134590

diff --git a/config/ChangeLog b/config/ChangeLog
index 2bddc4d388740330e8e96576e6c9880b1b2cb0eb..32c912682a658ab085176c535e709e353cc17434 100644 (file)
--- 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 4838a7da95d465dcad6b4682fae8b9bfb74d39ab..592f64139b6ff9162c49ecd6f7e47b730545b521 100644 (file)
--- 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
 # --------------------