Re: Test failure: 58

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Ralf Wildenhues on 10/6/2008 11:14 PM:
> Hello Eric,
> 
> FWIW, I get a new test failure now, on i686-pc-linux-gnu, /usr/bin/m4 is
> m4 (GNU M4) 1.4.11

Thanks for the report.

> +/usr/bin/m4:script.as:25: non-numeric argument to builtin `divert'
> +/usr/bin/m4:script.as:25: non-numeric argument to builtin `divert'
> +autom4te: /usr/bin/m4 failed with exit status: 1
> ../../autoconf/tests/m4sh.at:485: exit code was 1, expected 0
> 58. m4sh.at:455: 58. AS_REQUIRE_SHELL_FN and m4_require (m4sh.at:455): FAILED 
> (m4sh.at:485)

Fixed as follows, and sorry for not properly testing my previous commit:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjrUuwACgkQ84KuGfSFAYBKhQCgtdw8i6P+YJcrua9k2V17PPY6
j7AAoLf5430UXl0DCQVIvwg47W9k6SLp
=vsrf
-----END PGP SIGNATURE-----

>From a2f7e1aa97b03a5b5de68b62b1d5b7c554d6c7e2 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 7 Oct 2008 06:14:34 -0600
Subject: [PATCH] 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 <address@hidden>
---
 ChangeLog           |    7 +++++++
 lib/m4sugar/m4sh.m4 |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e73e22..5127319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-07  Eric Blake  <address@hidden>
+
+       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  <address@hidden>
        and Eric Blake  <address@hidden>
 
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 5fa2ef7..914987e 100644
--- 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
-- 
1.6.0.2