Fix m4_cr_all for EBCDIC.

* lib/m4sugar/m4sugar.m4 (m4_cr_all): Swap * and $, so that we
don't end up with $* in EBCDIC.
* NEWS: Document the fix.
* THANKS: Update.
Reported by Steve Goetze.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 9b8c75c7e53e65a5b17cddaaabeae9313d8683cb..181de16eb8fbb4d247d7df7d8ebb1673ceb4dc92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-05  Eric Blake  <eblake@redhat.com>
+
+       Fix m4_cr_all for EBCDIC.
+       * lib/m4sugar/m4sugar.m4 (m4_cr_all): Swap * and $, so that we
+       don't end up with $* in EBCDIC.
+       * NEWS: Document the fix.
+       * THANKS: Update.
+       Reported by Steve Goetze.
+
 2010-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Do not use @acronym in the manual.

diff --git a/NEWS b/NEWS
index 207325eb653bcec682e68f918ade0c7a87930a74..afd890795be8e43f67a57185014e8cb2cb0b26c2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ GNU Autoconf NEWS - User visible changes.
 ** AC_PROG_INSTALL correctly uses `shtool' again.  Regression introduced
    in 2.64.
 
+** Autoconf should work on EBCDIC hosts.
+
 * Major changes in Autoconf 2.65 (2009-11-21) [stable]
   Released by Eric Blake, based on git versions 2.64.*.
 

diff --git a/THANKS b/THANKS
index 300d1e8af9356c2cb2b6993294758bc5ce07fb9f..21aeb899a04e834392195e128411a1221ee4440b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -362,6 +362,7 @@ Stephen Gildea              filtered@against.spam
 Stephen Rasku               srasku@mail.tantalus-systems.com
 Stephen P. Schaefer         sschaefer@acm.org
 Steve Chamberlain           sac@cygnus.com
+Steve Goetze                goetze@dovetail.com
 Steve Huston                shuston@riverace.com
 Steve Robbins               steve@nyongwa.montreal.qc.ca
 Steven G. Johnson           stevenj@alum.mit.edu

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 06ac4c6d699b13a12d7f36ff4afcfffa952f815f..15fbd354c5abb2ff26231d97d611e55f9212aca6 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -2192,13 +2192,16 @@ m4_defn([m4_cr_digits])dnl
 # characters via m4_translit must deal with the fact that m4_translit does
 # not add quotes to the output.
 #
+# In EBCDIC, $ is immediately followed by *, which leads to problems
+# if m4_cr_all is inlined into a macro definition; so swap them.
+#
 # It is mainly useful in generating inverted character range maps, for use
 # in places where m4_translit is faster than an equivalent m4_bpatsubst;
 # the regex `[^a-z]' is equivalent to:
 #  m4_translit(m4_dquote(m4_defn([m4_cr_all])), [a-z])
 m4_define([m4_cr_all],
 m4_translit(m4_dquote(m4_format(m4_dquote(m4_for(
-  ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [-])-)
+  ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [$*-], [*$])-)
 
 
 # _m4_define_cr_not(CATEGORY)