bootstrap: support ACLOCAL_FLAGS during aclocal

* build-aux/bootstrap (aclocal): Honor ACLOCAL_FLAGS, so the user
can add additional -I dir for third-party .m4 files.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index dbe606068f82f9912f41aefd908006ad9d9ad495..a35444b01eb476f748a8bec89adb2605102f505d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-30  Justin Clift  <jclift@redhat.com>  (tiny change)
+
+       bootstrap: support ACLOCAL_FLAGS during aclocal
+       * build-aux/bootstrap (aclocal): Honor ACLOCAL_FLAGS, so the user
+       can add additional -I dir for third-party .m4 files.
+
 2010-09-30  Eric Blake  <eblake@redhat.com>
 
        bootstrap: use glibtoolize on MacOS

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e94a29a6fb291c37b01c430ec6604f59bf1bbbeb..7f0ee8128cc2c514c131e8ab522c613fee7cdbfe 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-09-30.17; # UTC
+scriptversion=2010-09-30.21; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -800,7 +800,7 @@ grep -E '^[  ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
 
 for command in \
   libtool \
-  "${ACLOCAL-aclocal} --force -I m4" \
+  "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
   "${AUTOCONF-autoconf} --force" \
   "${AUTOHEADER-autoheader} --force" \
   "${AUTOMAKE-automake} --add-missing --copy --force-missing"