From dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 16 Jan 2012 10:55:56 -0700 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ build-aux/bootstrap | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ed23e605..b02b8155b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-16 Eric Blake + 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 69bd96016..2a409fcd6 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. -- 2.11.0