From 7aa768c4823966db325c48ea4af540c4db5d4745 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Thu, 30 Sep 2010 15:25:22 -0600 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ build-aux/bootstrap | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbe606068..a35444b01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-30 Justin Clift (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 bootstrap: use glibtoolize on MacOS diff --git a/build-aux/bootstrap b/build-aux/bootstrap index e94a29a6f..7f0ee8128 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" -- 2.11.0