[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] bootstrap: honour m4_base when running ac_local
From: |
Jim Meyering |
Subject: |
Re: [PATCH] bootstrap: honour m4_base when running ac_local |
Date: |
Thu, 03 Mar 2011 22:16:16 +0100 |
Matthew Booth wrote:
> * build-aux/bootstrap: fix hardcoded use of m4 directory
> ---
> build-aux/bootstrap | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Thanks, Matt.
Pushed like this:
>From 329c5b59c9ebfed10f51859a5d16fbe080835a24 Mon Sep 17 00:00:00 2001
From: Matthew Booth <address@hidden>
Date: Thu, 3 Mar 2011 22:15:13 +0100
Subject: [PATCH] bootstrap: honor m4_base when running aclocal
* build-aux/bootstrap: Fix hard-coded use of m4 directory name.
---
ChangeLog | 5 +++++
build-aux/bootstrap | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 208418b..1b9a2f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03 Matthew Booth <address@hidden>
+
+ bootstrap: honor m4_base when running aclocal
+ * build-aux/bootstrap: Fix hard-coded use of m4 directory name.
+
2011-03-02 Jim Meyering <address@hidden>
getopt-gnu: relax license from LGPLv3+ to LGPLv2+
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e9ec11e..f004ad3 100755
--- 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
--
1.7.4.1.21.g4cc62