From: Justin Clift <jclift@redhat.com>
Date: Thu, 30 Sep 2010 21:25:22 +0000 (-0600)
Subject: bootstrap: support ACLOCAL_FLAGS during aclocal
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa768c4823966db325c48ea4af540c4db5d4745;p=pspp

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 dbe606068f..a35444b01e 100644
--- 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 e94a29a6fb..7f0ee8128c 100755
--- 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"