bootstrap: generalize autoheader check

* build-aux/bootstrap: Look for AC_CONFIG_HEADER as well as
AC_CONFIG_HEADERS.
(cherry picked from commit 7127847e1d16e94fec7422e637debeed24092c0f)

diff --git a/ChangeLog b/ChangeLog
index fbfa1e4..1872251 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>
 
        readlink: detect FreeBSD bug

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 8f14199..48cc10e 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 \