bootstrap: honor m4_base when running aclocal

* build-aux/bootstrap: Fix hard-coded use of m4 directory name.

diff --git a/ChangeLog b/ChangeLog
index 208418b..1b9a2f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03  Matthew Booth  <mbooth@redhat.com>
+
+       bootstrap: honor m4_base when running aclocal
+       * build-aux/bootstrap: Fix hard-coded use of m4 directory name.
+
 2011-03-02  Jim Meyering  <meyering@redhat.com>
 
        getopt-gnu: relax license from LGPLv3+ to LGPLv2+

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e9ec11e..f004ad3 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-01-21.16; # UTC
+scriptversion=2011-03-03.12; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -874,7 +874,7 @@ grep -E '^[  ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
 
 for command in \
   libtool \
-  "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
+  "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
   "${AUTOCONF-autoconf} --force" \
   "${AUTOHEADER-autoheader} --force" \
   "${AUTOMAKE-automake} --add-missing --copy --force-missing"
@@ -885,7 +885,7 @@ do
     command="${LIBTOOLIZE-libtoolize} -c -f"
   fi
   echo "$0: $command ..."
-  $command || exit
+  eval "$command" || exit
 done