From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 16 Oct 2008 06:19:15 +0000 (+0200)
Subject: Fix Libtool's config.lt test.
X-Git-Tag: v2.63b~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a38c243f00eb482729fa21fb8e9f1dc9580512e0;p=thirdparty%2Fautoconf.git

Fix Libtool's config.lt test.

* lib/m4sugar/m4sh.m4 (_AS_PREPARE): Disable AS_REQUIRE while
expanding it.
---

diff --git a/ChangeLog b/ChangeLog
index e627d14f..64fbe92a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	Fix Libtool's config.lt test.
+	* lib/m4sugar/m4sh.m4 (_AS_PREPARE): Disable AS_REQUIRE while
+	expanding it.
+
 2008-10-15  Eric Blake  <ebb9@byu.net>
 
 	Break circular require chain in _AS_LINENO_PREPARE.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 44c80491..5e6245d8 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -257,7 +257,8 @@ fi
 # there are so many _AS_PREPARE_* below, and that's also why it is
 # important not to forget some: config.status needs them.
 m4_defun([_AS_PREPARE],
-[as_func_mkdir_p ()
+[m4_pushdef([AS_REQUIRE], [])dnl
+as_func_mkdir_p ()
 {
   _AS_MKDIR_P
 }
@@ -274,6 +275,7 @@ _AS_TEST_PREPARE
 _AS_TR_CPP_PREPARE
 _AS_TR_SH_PREPARE
 _AS_UNSET_PREPARE
+m4_popdef([AS_REQUIRE])dnl
 ])
 
 # AS_PREPARE