From: Akim Demaille <akim@epita.fr>
Date: Sat, 25 Mar 2000 09:16:53 +0000 (+0000)
Subject: * autoheader.sh (checking completeness): Be ready to recognize
X-Git-Tag: autoconf-2.50~997
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f684a9be3dfac96a43b78a90af8358e1afb2bbe7;p=thirdparty%2Fautoconf.git

* 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 a0acf0788..ed5b9696a 100644
--- 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 d4256a902..c1cb4594a 100644
--- 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 931a36cd7..466b0146f 100644
--- 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 931a36cd7..466b0146f 100644
--- 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 931a36cd7..466b0146f 100644
--- 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