[SCM] GNU Autoconf source repository branch, master, updated. v2.67-39-g55f532e

[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=55f532e539427ff5829790fd71b6f8c6342b141a

The branch, master has been updated
       via  55f532e539427ff5829790fd71b6f8c6342b141a (commit)
      from  d1bea5123b8ecb406fbeabbe70552271f60de8e7 (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 55f532e539427ff5829790fd71b6f8c6342b141a
Author: Eric Blake <address@hidden>
Date:   Fri Aug 27 10:59:40 2010 -0600

    m4sh: protect LINENO against stray macro
    
    * lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): Double quote entire
    sed script, to avoid issue uncovered by automake testsuite where
    'b' was an m4 macro that broke execution on dash.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog           |    6 ++++++
 lib/m4sugar/m4sh.m4 |   10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 236bfcd..5a11ab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-27  Eric Blake  <address@hidden>
 
+       m4sh: protect LINENO against stray macro
+       * lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): Double quote entire
+       sed script, to avoid issue uncovered by automake testsuite where
+       'b' was an m4 macro that broke execution on dash.
+       Reported by Stefano Lattarini.
+
        m4sh: assume ${a:-b} support
        * tests/m4sh.at (Null variable substitution): New test.
        * doc/autoconf.texi (Shell Substitutions) <${var:-value}>: Mention
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 8343b25..ef99cb5 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1138,23 +1138,23 @@ dnl trailing '-' during substitution so that $LINENO is 
not a special
 dnl case at line end.  (Raja R Harinath suggested sed '=', and Paul
 dnl Eggert wrote the scripts with optimization help from Paolo Bonzini).
 [_AS_LINENO_WORKS || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+[  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
-    /[[$]]LINENO/=
+    /[$]LINENO/=
   ' <$as_myself |
     sed '
-      s/[[$]]LINENO.*/&-/
+      s/[$]LINENO.*/&-/
       t lineno
       b
       :lineno
       N
       :loop
-      s/[[$]]LINENO\([[^'$as_cr_alnum'_]].*\n\)\(.*\)/\2\1\2/
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
       s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
+  chmod +x "$as_me.lineno"] ||
     AS_ERROR([cannot create $as_me.lineno; rerun with a POSIX shell])
 
   # Don't try to exec as it changes $[0], causing all sort of problems


hooks/post-receive
-- 
GNU Autoconf source repository