From: Alfred M. Szmidt Date: Wed, 21 Dec 2011 09:47:03 +0000 (+0100) Subject: bootstrap: fix it to honor $ACLOCAL_FLAGS once again X-Git-Tag: v0.1~1351 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=56fffd23320280790f46a3c181a13dcf15361c98;p=gnulib.git bootstrap: fix it to honor $ACLOCAL_FLAGS once again The 2011-12-17 change, commit 767ccd40, replaced a manual invocation of aclocal that used explicit $ACLOCAL_FLAGS with an invocation of autoreconf that did not. * build-aux/bootstrap: Use $ACLOCAL_FLAGS when invoking autoreconf. Reported by Mats Erik Andersson . --- diff --git a/ChangeLog b/ChangeLog index 980b94ba2..d52e398eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-12-21 Alfred M. Szmidt + + bootstrap: fix it to honor $ACLOCAL_FLAGS once again + The 2011-12-17 change, commit 767ccd40, replaced a manual invocation + of aclocal that used explicit $ACLOCAL_FLAGS with an invocation of + autoreconf that did not. + * build-aux/bootstrap: Use $ACLOCAL_FLAGS when invoking autoreconf. + Reported by Mats Erik Andersson . + 2011-12-17 Jim Meyering bootstrap: remove some now-unneeded code diff --git a/build-aux/bootstrap b/build-aux/bootstrap index a95c654a1..505a05e56 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-12-17.15; # UTC +scriptversion=2011-12-21.09; # UTC # Bootstrap this package from checked-out sources. @@ -821,9 +821,9 @@ find "$m4_base" "$source_base" \ # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install --no-recursive -I $m4_base" + "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install --no-recursive -I $m4_base \ + $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ || exit 1 # Get some extra files from gnulib, overriding existing files.