place _AS_UNSET_PREPARE in the right diversion

diff --git a/ChangeLog b/ChangeLog
index 2de905064316fcf14285dd7e997a8a327454e63a..d2acab06d5eef46b9f0f5460f97b6ed99be9db88 100644 (file)
--- 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 4d6e79c22fd0c87a5c543e1a0265ceee77ee1efe..287b38e79bd5dc1372cad251c972943c1a5df49b 100644 (file)
--- 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],