diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -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. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 69bd960160..2a409fcd68 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -820,10 +820,14 @@ find "$m4_base" "$source_base" \ -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. |