From: Ben Elliston <bje+keyword+gnu.7caf74@air.net.au>
Date: Fri, 24 Sep 1999 04:45:36 +0000 (+0000)
Subject: 1999-09-24  Ben Elliston  <bje@cygnus.com>
X-Git-Tag: trunk-pre-merge-trunk-into-experimental-1999-10-01~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5609f43bed2358e697d4cc6cd7deee1a8044c0;p=thirdparty%2Fautoconf.git

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 ad2cf420..7a454443 100644
--- 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 ba76b48f..237d0e39 100644
--- 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 ba76b48f..237d0e39 100644
--- 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 ba76b48f..237d0e39 100644
--- 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