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 e627d14fc4f370cf27befb511e56e2b64e7ca771..64fbe92a3416e7f18f01bc9be3c28dbca995f5a3 100644 (file)
--- 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 44c804915f7b97cb1d5ee08c8725534a2861d011..5e6245d8187252629f9ef78fa3835b4ef97542fe 100644 (file)
--- 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