1999-09-24 Ben Elliston <bje@cygnus.com>

	* autoreconf.sh: Do not run autoheader if AC_CONFIG_HEADER is
	commented out in configure.in. Reported by Erez Zadok
	<ezk@cs.columbia.edu> as a fix for autoconf/21.

diff --git a/ChangeLog b/ChangeLog
index ad2cf4205b726a941eae54c72d527fb6467da090..7a454443e428054bd0e02ec0fc792b1fee3c22a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-09-24  Ben Elliston  <bje@cygnus.com>
 
+       * autoreconf.sh: Do not run autoheader if AC_CONFIG_HEADER is
+       commented out in configure.in. Reported by Erez Zadok
+       <ezk@cs.columbia.edu> as a fix for autoconf/21.
+
        * install.texi: Replace `can not' with `cannot'.
 
 1999-09-22  Ben Elliston  <bje@cygnus.com>

diff --git a/autoreconf.in b/autoreconf.in
index ba76b48f9b58d5c654799c1512119388e07fff0f..237d0e39c9e7dc01eff54468c875fef2d11de648 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -201,7 +201,7 @@ while read dir; do
     $autoconf $macrodir_opt $localdir_opt
   fi
 
-  if grep 'A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
+  if grep '^[  ]*A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
     templates=`sed -n '/A[CM]_CONFIG_HEADER/ {
        s%[^#]*A[CM]_CONFIG_HEADER[     ]*(\([^)]*\).*%\1%
        p

diff --git a/autoreconf.sh b/autoreconf.sh
index ba76b48f9b58d5c654799c1512119388e07fff0f..237d0e39c9e7dc01eff54468c875fef2d11de648 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -201,7 +201,7 @@ while read dir; do
     $autoconf $macrodir_opt $localdir_opt
   fi
 
-  if grep 'A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
+  if grep '^[  ]*A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
     templates=`sed -n '/A[CM]_CONFIG_HEADER/ {
        s%[^#]*A[CM]_CONFIG_HEADER[     ]*(\([^)]*\).*%\1%
        p

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index ba76b48f9b58d5c654799c1512119388e07fff0f..237d0e39c9e7dc01eff54468c875fef2d11de648 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -201,7 +201,7 @@ while read dir; do
     $autoconf $macrodir_opt $localdir_opt
   fi
 
-  if grep 'A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
+  if grep '^[  ]*A[CM]_CONFIG_HEADER' configure.in >/dev/null; then
     templates=`sed -n '/A[CM]_CONFIG_HEADER/ {
        s%[^#]*A[CM]_CONFIG_HEADER[     ]*(\([^)]*\).*%\1%
        p