bootstrap: generalize autoheader check

* build-aux/bootstrap: Look for AC_CONFIG_HEADER as well as
AC_CONFIG_HEADERS.

diff --git a/ChangeLog b/ChangeLog
index 17ccdb44ef077696e822876d8963dd469e6614cc..0347b9fb3913214b82673e6478b0203d129ca9f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: generalize autoheader check
+       * build-aux/bootstrap: Look for AC_CONFIG_HEADER as well as
+       AC_CONFIG_HEADERS.
+
 2009-11-11  Eric Blake  <ebb9@byu.net>
 
        mkfifoat: use new modules for Solaris and BSD bugs

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 8f14199959646ba998bf9d6f464c11143764acae..48cc10e47ea559212e4fdbda5abe0288740d2700 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -729,7 +729,7 @@ find "$m4_base" "$source_base" \
 # Reconfigure, getting other files.
 
 # Skip autoheader if it's not needed.
-grep '^[        ]*AC_CONFIG_HEADERS\>' configure.ac >/dev/null ||
+grep -E '^[     ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
   AUTOHEADER=true
 
 for command in \