From 8f604f00a4abf33fc0311bde48357bfbd19fc36d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 23 Apr 2008 10:24:41 +0000 Subject: 2008-04-23 Paolo Bonzini * confsubdir.m4: Remove. * override.m4: Apply _AC_ARG_VALIDATE fix to all versions but 2.62. --- config/override.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'config/override.m4') 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 # -------------------- -- cgit v1.1