Fix m4 quoting in previous patch.

* lib/m4sugar/m4sh.m4 (AS_REQUIRE_SHELL_FN): Determine diversion
name prior to invoking AS_REQUIRE.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 7e73e221bce1b01b3ab591a7e101cc0b297b901b..5127319356488064ab751e1854fc522f32eb6a1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-07  Eric Blake  <ebb9@byu.net>
+
+       Fix m4 quoting in previous patch.
+       * lib/m4sugar/m4sh.m4 (AS_REQUIRE_SHELL_FN): Determine diversion
+       name prior to invoking AS_REQUIRE.
+       Reported by Ralf Wildenhues.
+
 2008-09-18  Paolo Bonzini  <bonzini@gnu.org>
        and Eric Blake  <ebb9@byu.net>
 

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 5fa2ef78b6cc0e6e13371660f25c94446714afd6..914987e863b764c89d37f9483232d663348f4224 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -159,7 +159,7 @@ m4_define([AS_REQUIRE_SHELL_FN],
 [_AS_DETECT_REQUIRED([_AS_SHELL_FN_WORK])dnl
 AS_REQUIRE([AS_SHELL_FN_$1], [m4_provide([AS_SHELL_FN_$1])$1() {
 $2
-}], [m4_default_quoted([$3], [M4SH-INIT-FN])])])
+}], m4_default_quoted([$3], [M4SH-INIT-FN]))])
 
 
 # AS_BOURNE_COMPATIBLE