changeset 13749:259247e24a97

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>
author Justin Clift <jclift@redhat.com>
date Thu, 30 Sep 2010 15:25:22 -0600
parents f26ce5f24d79
children c67c281ae7ff
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
 
 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"