[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-212-g5d63e9d

[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 M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=5d63e9d0496586df3f7054802463fc7c5631cd0f

The branch, master has been updated
       via  5d63e9d0496586df3f7054802463fc7c5631cd0f (commit)
       via  59344a14f7d2c95b185c8a7f9a79e63968e7879c (commit)
       via  2eb2fe897ad172856543e09aee26db4f52090904 (commit)
      from  979fcdc4cfe76c0df7e3ec6450df03a366e5f3b7 (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 5d63e9d0496586df3f7054802463fc7c5631cd0f
Author: Eric Blake <address@hidden>
Date:   Fri Mar 13 16:36:07 2009 -0600

    Try to tolerate spaces in directory names in testsuite.
    
    * tests/null.m4: Provide shell quoting, in case __program__
    contains spaces.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 59344a14f7d2c95b185c8a7f9a79e63968e7879c
Author: Eric Blake <address@hidden>
Date:   Thu Mar 12 19:25:01 2009 -0600

    Fix awk script portability.
    
    * checks/get-them: In gsub, properly escape {.
    Reported by Gary V. Vaughan.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit c05bae4ccb7b39543b019d612a4bdb6b7c6f0b08)

commit 2eb2fe897ad172856543e09aee26db4f52090904
Author: Eric Blake <address@hidden>
Date:   Thu Feb 26 14:27:34 2009 -0700

    Make bootstrap easier on Solaris.
    
    * bootstrap: Add GNULIB_SRCDIR.  Useful when a wrapper script
    gnulib-tool exists earlier on the path to work around /bin/sh
    failure in parsing $GNULIB_SRCDIR/gnulib-tool.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit 90a0154d6ef1effe64c199eb61a06430199aaa91)

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

Summary of changes:
 ChangeLog          |   15 +++++++++++++++
 bootstrap          |   25 +++++++++++++++----------
 tests/generate.awk |   15 ++++++++-------
 tests/null.m4      |  Bin 7702 -> 7738 bytes
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30f1c16..3769414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2009-03-13  Eric Blake  <address@hidden>
 
+       Try to tolerate spaces in directory names in testsuite.
+       * tests/null.m4: Provide shell quoting, in case __program__
+       contains spaces.
+
+       Fix awk script portability.
+       * checks/get-them: In gsub, properly escape {.
+       Reported by Gary V. Vaughan.
+
+       Make bootstrap easier on Solaris.
+       * bootstrap: Add GNULIB_SRCDIR.  Useful when a wrapper script
+       gnulib-tool exists earlier on the path to work around /bin/sh
+       failure in parsing $GNULIB_SRCDIR/gnulib-tool.
+
+2009-03-13  Eric Blake  <address@hidden>
+
        Allow configuration choice in syscmd shell.
        * ltdl/m4/m4-syscmd.m4: New file.
        * configure.ac (M4_SYSCMD): Use it to provide
diff --git a/bootstrap b/bootstrap
index 7bd9f7e..8bc3021 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2008-09-16
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# bootstrap (GNU M4) version 2009-03-13
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
@@ -32,7 +33,8 @@
 
 # You can also set the following variables to help $progname
 # locate the right tools:
-#   AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, LIBTOOLIZE, M4, RM, SED
+#   AUTOPOINT, AUTORECONF, AWK, GNULIB_SRCDIR, GNULIB_TOOL, LIBTOOLIZE,
+#   M4, RM, SED
 
 # This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
 # out to parts of the GNU Build Platform.  Currently this requires GNU
@@ -398,14 +400,17 @@ ${LIBTOOLIZE} --force --copy --install
 ## Find the gnulib module tree. ##
 ## ---------------------------- ##
 
-case $GNULIB_TOOL in
+if test -n "$GNULIB_SRCDIR" && test -d "$GNULIB_SRCDIR" ; then
+  gnulibdir=$GNULIB_SRCDIR
+else
+  case $GNULIB_TOOL in
     /*  )  gnulibdir=$GNULIB_TOOL ;;           # absolute
     */* )  gnulibdir=`pwd`/$GNULIB_TOOL ;;     # relative
     *   )  gnulibdir=`which "$GNULIB_TOOL"` ;; # PATH search
-esac
+  esac
 
-# Follow symlinks
-while test -h "$gnulibdir"; do
+  # Follow symlinks
+  while test -h "$gnulibdir"; do
 
     # Resolve symbolic link.
     sedexpr1='s, -> ,#%%#,'
@@ -418,9 +423,9 @@ while test -h "$gnulibdir"; do
        * )  gnulibdir=`echo "$gnulibdir" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
     esac
 
-done
-
-gnulibdir=`echo "$gnulibdir" | $SED "$dirname"`
+  done
+  gnulibdir=`echo "$gnulibdir" | $SED "$dirname"`
+fi
 
 
 ## ---------------------- ##
diff --git a/tests/generate.awk b/tests/generate.awk
index 538dc09..f4e782e 100755
--- a/tests/generate.awk
+++ b/tests/generate.awk
@@ -1,6 +1,6 @@
 # Extract all examples from the manual source.            -*- AWK -*-
 
-# Copyright (C) 1992, 2000, 2001, 2006, 2007, 2008 Free Software
+# Copyright (C) 1992, 2000, 2001, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
@@ -28,7 +28,8 @@ BEGIN {
   # I don't know how to get this file's name, so it's hard coded :(
   print "# Do not edit by hand, it was generated by generate.awk.";
   print "#";
-  print "# Copyright (C) 1992, 2000, 2001, 2006 Free Software Foundation, 
Inc.";
+  print "# Copyright (C) 1992, 2000, 2001, 2006, 2007, 2008, 2009 Free";
+  print "# Software Foundation, Inc.";
   print ;
   print "AT_BANNER([Documentation examples.])";
   print ;
@@ -134,13 +135,13 @@ function normalize(contents,    i, lines, n, line, res) {
   for (i = 1; i < n; ++i)
     {
       line = lines[i];
-      gsub (/address@hidden/, "", line);
-      gsub (/address@hidden/,  "", line);
+      gsub ("address@hidden", "", line);
+      gsub ("address@hidden",  "", line);
       gsub ("@[{]", "{", line);
       gsub ("@}", "}", line);
       gsub ("@@", "@", line);
-      gsub ("@tabchar{}", "\t", line);
-      gsub ("@w{ }", " @\\&t@", line);
+      gsub ("@tabchar[{]}", "\t", line);
+      gsub ("@w[{] }", " @\\&t@", line);
       gsub ("m4_", "address@hidden&address@hidden", line);
 
       # Some of the examples have improperly balanced square brackets.
@@ -154,7 +155,7 @@ function normalize(contents,    i, lines, n, line, res) {
 
 function new_group(node) {
   banner = node ". ";
-  gsub (/./, "-", banner);
+  gsub (".", "-", banner);
   printf ("\n\n");
   printf ("## %s ##\n", banner);
   printf ("## %s.  ##\n", node);
diff --git a/tests/null.m4 b/tests/null.m4
index 0e13cb4..92fb6a1 100644
Binary files a/tests/null.m4 and b/tests/null.m4 differ


hooks/post-receive
--
GNU M4 source repository