Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16175:5dd745d168ae
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 <gnu@gisladisker.se>.
| author | Alfred M. Szmidt <ams@gnu.org> |
|---|---|
| date | Wed, 21 Dec 2011 10:47:03 +0100 |
| parents | 7c58e2bf6b76 |
| children | a6a6647d041e |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-12-21 Alfred M. Szmidt <ams@gnu.org> + + 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 <gnu@gisladisker.se>. + 2011-12-17 Jim Meyering <meyering@redhat.com> bootstrap: remove some now-unneeded code
--- 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 @@ # 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.