Matthew Booth wrote:
> * build-aux/bootstrap: fix hardcoded use of m4 directory
> ---
> build-aux/bootstrap | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/build-aux/bootstrap b/build-aux/bootstrap
> index 55147d7..c74bdcd 100755
> --- a/build-aux/bootstrap
> +++ b/build-aux/bootstrap
> @@ -875,7 +875,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"
> @@ -886,7 +886,7 @@ do
> command="${LIBTOOLIZE-libtoolize} -c -f"
> fi
> echo "$0: $command ..."
> - $command || exit
> + eval "$command" || exit
> done
I tested that in the context of libguestfs, and confirmed it
worked as expected. I'll push this in a few hours unless
someone objects.
