Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16286:9f5a09cb866c
bootstrap: cater to autoconf 2.59
Autoconf didn't add --no-recursive until 2.59c, but gnulib supports
as far back as 2.59 for platforms like RHEL 5.
* build-aux/bootstrap (AUTORCONF): Work even when --no-recursive
is not available.
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Mon, 16 Jan 2012 10:55:56 -0700 |
| parents | 59c01cd32e37 |
| children | 707952b7107a |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-16 Eric Blake <eblake@redhat.com> + bootstrap: cater to autoconf 2.59 + * build-aux/bootstrap (AUTORCONF): Work even when --no-recursive + is not available. + bootstrap: properly check for libtool * build-aux/bootstrap (libtoolize): Also run libtool when older usage is detected.
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -820,10 +820,14 @@ -type l -xtype l -delete > /dev/null 2>&1 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. +no_recursive= +case $($AUTORECONF --help) in + *--no-recursive*) no_recursive=--no-recursive;; +esac echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" + "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ + $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ || exit 1 # Get some extra files from gnulib, overriding existing files.