* autoheader.sh (checking completeness): Be ready to recognize

patterns with a value, and spaces between `#' and the directive, e.g.
# define FOO FIXME:
Reported by John Fortin.

diff --git a/ChangeLog b/ChangeLog
index a0acf078833c41beae06395a67aceed3a1081d4b..ed5b9696ade2d3299ec4cb42f75b3295019905fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-25  Akim Demaille  <akim@epita.fr>
+
+       * autoheader.sh (checking completeness): Be ready to recognize
+       patterns with a value, and spaces between `#' and the directive, e.g.
+       # define FOO FIXME:
+       Reported by John Fortin.
+
 2000-03-25  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_RUN_IFELSE): New macro.

diff --git a/THANKS b/THANKS
index d4256a90280526617eda43b8f2326c6abd875db5..c1cb4594aa80ffbfdf94ebe6beffeef3ce6ac03c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ Jim Blandy            jimb@wookumz.gnu.ai.mit.edu
 Jim Meyering           meyering@ascend.com
 Jiro Takabatake                jiro@din.or.jp
 John David Anglin      dave@hiauly1.hia.nrc.ca
+John Fortin            fortinj@attglobal.net
 John Interrante                interran@uluru.stanford.edu
 John W. Eaton          jwe@bevo.che.wisc.edu
 J"orn Rennecke         amylaar@cygnus.co.uk
@@ -65,8 +66,8 @@ Ken Raeburn           raeburn@cygnus.com
 Koji Arai              JCA02266@nifty.ne.jp
 Kurt D. Zeilenga       kurt@openldap.org
 Larry Schwimmer                rosebud@cyclone.stanford.edu
-Lars J. Aas            larsa@sim.no
 Lars Hecking           lhecking@nmrc.ucc.ie
+Lars J. Aas            larsa@sim.no
 Marcus Daniels         marcus@sysc.pdx.edu
 Marcus Thiessel                marcus@xemacs.org
 Mark Elbrecht          snowball3@usa.net

diff --git a/autoheader.in b/autoheader.in
index 931a36cd76012b71d339699bc60bbd92346bbf33..466b0146f147412c99e425d1d670e40641b7a02c 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -259,12 +259,14 @@ test -r $localdir/acconfig.h &&
   sed -n '/@BOTTOM@/,${/@BOTTOM@/!p;}' $localdir/acconfig.h >>$tmpout
 test -f ${config_h}.bot && cat ${config_h}.bot >>$tmpout
 
-# Check that all the symbols have a template
-status=0
 
+# Check that all the symbols have a template.
+status=0
+# Regexp for a white space.
+w='[   ]'
 if test -n "$syms"; then
   for sym in $syms; do
-    if grep "^#[a-z]*[         ][      ]*$sym[         ]*$" $tmpout >/dev/null; then
+    if egrep "^#$w*[a-z]*$w$w*$sym($w*|$w.*)$" $tmpout >/dev/null; then
       : # All is well.
     else
       echo "$0: No template for symbol \`$sym'" >&2
@@ -273,6 +275,7 @@ if test -n "$syms"; then
   done
 fi
 
+
 # If the run was successful, output the result.
 if test $status = 0; then
   if test $# = 0; then

diff --git a/autoheader.sh b/autoheader.sh
index 931a36cd76012b71d339699bc60bbd92346bbf33..466b0146f147412c99e425d1d670e40641b7a02c 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -259,12 +259,14 @@ test -r $localdir/acconfig.h &&
   sed -n '/@BOTTOM@/,${/@BOTTOM@/!p;}' $localdir/acconfig.h >>$tmpout
 test -f ${config_h}.bot && cat ${config_h}.bot >>$tmpout
 
-# Check that all the symbols have a template
-status=0
 
+# Check that all the symbols have a template.
+status=0
+# Regexp for a white space.
+w='[   ]'
 if test -n "$syms"; then
   for sym in $syms; do
-    if grep "^#[a-z]*[         ][      ]*$sym[         ]*$" $tmpout >/dev/null; then
+    if egrep "^#$w*[a-z]*$w$w*$sym($w*|$w.*)$" $tmpout >/dev/null; then
       : # All is well.
     else
       echo "$0: No template for symbol \`$sym'" >&2
@@ -273,6 +275,7 @@ if test -n "$syms"; then
   done
 fi
 
+
 # If the run was successful, output the result.
 if test $status = 0; then
   if test $# = 0; then

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 931a36cd76012b71d339699bc60bbd92346bbf33..466b0146f147412c99e425d1d670e40641b7a02c 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -259,12 +259,14 @@ test -r $localdir/acconfig.h &&
   sed -n '/@BOTTOM@/,${/@BOTTOM@/!p;}' $localdir/acconfig.h >>$tmpout
 test -f ${config_h}.bot && cat ${config_h}.bot >>$tmpout
 
-# Check that all the symbols have a template
-status=0
 
+# Check that all the symbols have a template.
+status=0
+# Regexp for a white space.
+w='[   ]'
 if test -n "$syms"; then
   for sym in $syms; do
-    if grep "^#[a-z]*[         ][      ]*$sym[         ]*$" $tmpout >/dev/null; then
+    if egrep "^#$w*[a-z]*$w$w*$sym($w*|$w.*)$" $tmpout >/dev/null; then
       : # All is well.
     else
       echo "$0: No template for symbol \`$sym'" >&2
@@ -273,6 +275,7 @@ if test -n "$syms"; then
   done
 fi
 
+
 # If the run was successful, output the result.
 if test $status = 0; then
   if test $# = 0; then