Re: AS_MESSAGE_FD

[Eric Blake]

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

According to Eric Blake on 11/21/2008 5:06 PM:
> * lib/m4sugar/m4sh.m4 (AS_MESSAGE_FD, AS_MESSAGE_LOG_FD)
> (AS_ORIGINAL_STDIN_FD): Provide default M4sh values.
> (_AS_ECHO_LOG, AS_MESSAGE, _AS_ERROR_PREPARE, AS_ERROR): Simplify
> usage.

> @@ -819,7 +842,7 @@ m4_defun_init([AS_ERROR],
>  [m4_append_uniq([_AS_CLEANUP],
>    [m4_divert_text([M4SH-INIT-FN], [_AS_ERROR_PREPARE[]])])],
>  [m4_ifvaln([$2], [{ AS_SET_STATUS([$2])])]dnl
> -[as_fn_error "_AS_QUOTE([$1])"m4_ifset([AS_MESSAGE_LOG_FD],
> +[as_fn_error "_AS_QUOTE([$1])"m4_ifval([AS_MESSAGE_LOG_FD],
>    [ "$LINENO" AS_MESSAGE_LOG_FD])[]m4_ifval([$2], [; }])])

And I got the wrong semantics.  m4_ifset([AS_MESSAGE_LOG_FD]) should be
simplified to either m4_ifval(m4_defn([AS_MESSAGE_LOG_FD])) or the following:

- --
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

iEYEARECAAYFAkkqrRsACgkQ84KuGfSFAYA9lgCfYdlN2kNFbWqND2/PC6sPzGg1
iBMAoLE2b3t4KjIWJut92xqRkDcy/GjE
=lrED
-----END PGP SIGNATURE-----

>From b74085770f3517505ab6d35bfca7157ba93fa9e8 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 24 Nov 2008 06:28:56 -0700
Subject: [PATCH] Fix typo in AS_MESSAGE_LOG_FD patch.

* lib/m4sugar/m4sh.m4 (AS_ERROR): Check correct condition.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog           |    5 +++++
 lib/m4sugar/m4sh.m4 |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdb13da..c6c7109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-24  Eric Blake  <address@hidden>
+
+       Fix typo in AS_MESSAGE_LOG_FD patch.
+       * lib/m4sugar/m4sh.m4 (AS_ERROR): Check correct condition.
+
 2008-11-23  Ralf Wildenhues  <address@hidden>
 
        More reliable signal handling in Autotest.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 0faa934..be9ff3b 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -842,7 +842,7 @@ m4_defun_init([AS_ERROR],
 [m4_append_uniq([_AS_CLEANUP],
   [m4_divert_text([M4SH-INIT-FN], [_AS_ERROR_PREPARE[]])])],
 [m4_ifvaln([$2], [{ AS_SET_STATUS([$2])])]dnl
-[as_fn_error "_AS_QUOTE([$1])"m4_ifval([AS_MESSAGE_LOG_FD],
+[as_fn_error "_AS_QUOTE([$1])"m4_ifval(AS_MESSAGE_LOG_FD,
   [ "$LINENO" AS_MESSAGE_LOG_FD])[]m4_ifval([$2], [; }])])
 
 
-- 
1.6.0.4