[PATCH 3/5] place _AS_UNSET_PREPARE in the right diversion

[Paolo Bonzini]

This patch is mostly for self-documentation, because  _AS_UNSET_PREPARE
is called anyway by AS_SHELL_SANITIZE.  However, by default AS_REQUIRE
places stuff in M4SH-INIT and that comes after the find-better-shell test.
This is wrong and this patch fixes it.

2008-09-18  Paolo Bonzini  <address@hidden>

        * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): Expand
        _AS_UNSET_PREPARE in M4SH-SANITIZE.

---
 lib/m4sugar/m4sh.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index d5a5bda..3b4fcb8 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -242,8 +242,8 @@ m4_expand_once([m4_append([_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
   AS_IF([_AS_RUN([_AS_DETECT_REQUIRED_BODY]) 2>/dev/null],
        [as_have_required=yes],
-- 
1.5.5