From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 18 Sep 2008 12:14:11 +0000 (+0200)
Subject: place _AS_UNSET_PREPARE in the right diversion
X-Git-Tag: v2.63b~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=926ed6a97561e0a77de18011b29c6bcaaff4c365;p=thirdparty%2Fautoconf.git

place _AS_UNSET_PREPARE in the right diversion
---

diff --git a/ChangeLog b/ChangeLog
index 2de90506..d2acab06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): Expand
+	_AS_UNSET_PREPARE in M4SH-SANITIZE.
+
 2008-10-08  Eric Blake  <ebb9@byu.net>
 
 	Avoid repeating required shell tests in suggested set.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 4d6e79c2..287b38e7 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -187,8 +187,8 @@ m4_set_add([_AS_DETECT_SUGGESTED_BODY],
 # <http://lists.gnu.org/archive/html/autoconf-patches/2006-03/msg00081.html>.
 #
 m4_defun_once([_AS_DETECT_BETTER_SHELL],
-[m4_append([_AS_CLEANUP], [m4_divert_text([M4SH-SANITIZE], [
-AS_REQUIRE([_AS_UNSET_PREPARE])dnl
+[AS_REQUIRE([_AS_UNSET_PREPARE], , [M4SH-SANITIZE])dnl
+m4_append([_AS_CLEANUP], [m4_divert_text([M4SH-SANITIZE], [
 if test "x$CONFIG_SHELL" = x; then
 dnl Remove any tests from suggested that are also required
   m4_set_foreach([_AS_DETECT_SUGGESTED_BODY], [AS_snippet],