From 4aede81643b2ed590f77d34338c45810c4bb141b Mon Sep 17 00:00:00 2001 From: bonzini Date: Wed, 23 Apr 2008 10:22:37 +0000 Subject: [PATCH] 2008-04-23 Paolo Bonzini * 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 --- config/ChangeLog | 5 +++++ config/override.m4 | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 2bddc4d..32c9126 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2008-04-23 Paolo Bonzini + + * override.m4: Apply _AC_ARG_VALIDATE fix to all versions + but 2.62. + 2008-04-18 Paolo Bonzini PR bootstrap/35457 diff --git a/config/override.m4 b/config/override.m4 index 4838a7d..592f641 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 # -------------------- -- 2.7.4