[SCM] GNU Autoconf source repository branch, master, updated. v2.65-70-g64f8fde

[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=64f8fde40c5fa18f1b4a2ade9ce96ac7a2addff3

The branch, master has been updated
       via  64f8fde40c5fa18f1b4a2ade9ce96ac7a2addff3 (commit)
       via  43ebd33d57d03b95d1283823d85dae427b501dcb (commit)
      from  0139d1718cc2a8d0c58ee450c0181ba7de14ff03 (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 64f8fde40c5fa18f1b4a2ade9ce96ac7a2addff3
Author: Eric Blake <address@hidden>
Date:   Wed May 12 08:38:57 2010 -0600

    Document the grep workaround.
    
    * doc/autoconf.texi (Limitations of Usual Tools) <grep>: Document
    the bug.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 43ebd33d57d03b95d1283823d85dae427b501dcb
Author: Mark Hessling <address@hidden>
Date:   Wed May 12 08:35:00 2010 -0600

    Work around QNX4 grep bug.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Count ^
    rather than $ to avoid QNX4 grep bug.
    * THANKS: Update.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog              |   13 +++++++++++++
 THANKS                 |    1 +
 doc/autoconf.texi      |    4 ++++
 lib/autoconf/status.m4 |    2 +-
 4 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d05a82c..fd7d068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-05-12  Eric Blake  <address@hidden>
+
+       Document the grep workaround.
+       * doc/autoconf.texi (Limitations of Usual Tools) <grep>: Document
+       the bug.
+
+2010-05-12  Mark Hessling  <address@hidden>  (tiny change)
+
+       Work around QNX4 grep bug.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Count ^
+       rather than $ to avoid QNX4 grep bug.
+       * THANKS: Update.
+
 2010-05-11  David Reiss  <address@hidden>  (tiny change)
 
        Improve Erlang documentation.
diff --git a/THANKS b/THANKS
index 218a5c9..a621844 100644
--- a/THANKS
+++ b/THANKS
@@ -244,6 +244,7 @@ Mark Cave-Ayland            ?
 Mark D. Baushke             ?
 Mark D. Roth                ?
 Mark Elbrecht               address@hidden
+Mark Hessling               address@hidden
 Mark Kettenis               address@hidden
 Markku Savela               address@hidden
 Markus Oberhumer            address@hidden
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 39e11a5..ff62eac 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -17829,6 +17829,10 @@ redirect the standard output and standard error (in 
case the file
 doesn't exist) of @code{grep} to @file{/dev/null}.  Check the exit
 status of @code{grep} to determine whether it found a match.
 
+The QNX4 implementation fails to count lines with @code{grep -c '$'},
+but works with @code{grep -c '^'}.  Another alternative for counting
+lines is to use @code{wc -l}.
+
 Some traditional @command{grep} implementations do not work on long
 input lines.  On AIX the default @code{grep} silently truncates long
 lines on the input before matching.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index b12a4bd..fd3c5da 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -403,7 +403,7 @@ rm -f conf$$files.sh
   echo "_ACEOF"
 } >conf$$subs.sh ||
   AC_MSG_ERROR([could not make $CONFIG_STATUS])
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||


hooks/post-receive
-- 
GNU Autoconf source repository