[SCM] GNU Autoconf source repository branch, master, updated. v2.63b-22-gbc79643

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=bc796433831e23df45f75c9e34e50860e44da90f

The branch, master has been updated
       via  bc796433831e23df45f75c9e34e50860e44da90f (commit)
      from  63d463427f21e9de4ad3b04aff44af197517495d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc796433831e23df45f75c9e34e50860e44da90f
Author: Eric Blake <address@hidden>
Date:   Tue Apr 14 19:06:27 2009 -0600

    Fix yesterday's regression in AS_IF.
    
    * lib/m4sugar/m4sh.m4 (_AS_IF_ELSE): Don't corrupt $? in else
    branch; it is up to the user to avoid syntax errors.
    * tests/m4sh.at (AS@&address@hidden and AS@&address@hidden): Adjust test.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    7 +++++++
 lib/m4sugar/m4sh.m4 |    2 +-
 tests/m4sh.at       |    5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68cd416..feaabe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-14  Eric Blake  <address@hidden>
+
+       Fix yesterday's regression in AS_IF.
+       * lib/m4sugar/m4sh.m4 (_AS_IF_ELSE): Don't corrupt $? in else
+       branch; it is up to the user to avoid syntax errors.
+       * tests/m4sh.at (AS@&address@hidden and AS@&address@hidden): Adjust 
test.
+
 2009-04-14  Ralf Wildenhues  <address@hidden>
 
        Add traces for AM_SILENT_RULES.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 052c7eb..3c05201 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -609,7 +609,7 @@ m4_define([_AS_IF],
 ])
 m4_define([_AS_IF_ELSE],
 [m4_ifnblank([$1],
-[else :
+[else
   $1
 ])])
 
diff --git a/tests/m4sh.at b/tests/m4sh.at
index 5f7dc84..065a9dd 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -862,8 +862,11 @@ AS_CASE([foo], [foo], m4_do(AS_CASE([bar], [bar], [echo 
sixteen])))
 dnl Handle blank arguments.
 AS_IF([false], [:], [ ]) && AS_CASE([foo], [foo], []
 ) && echo seventeen
-m4_define([empty])AS_IF([false], [:], [empty]
+m4_define([empty])AS_IF([:], [empty]
 ) && AS_CASE([foo], [foo], [empty]) && echo eighteen
+dnl We can't handle AS_IF([false], [:], [empty]) unless m4_expand is
+dnl taught how to handle m4_require.  The user is responsible for
+dnl avoiding the syntax error in that case.
 
 # check that require works correctly
 m4_for([n], 1, 9, [],


hooks/post-receive
--
GNU Autoconf source repository