summaryrefslogtreecommitdiff
path: root/build-aux/bootstrap
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2012-01-16 10:55:56 -0700
committerEric Blake <eblake@redhat.com>2012-01-16 10:55:56 -0700
commitdd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 (patch)
tree6c92ce2e82c991bcbf676288b59ab957d80d97cd /build-aux/bootstrap
parent20afa10e2e0a6518a30ab4711472f4adf2b325aa (diff)
downloadgnulib-dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2.tar.gz
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>
Diffstat (limited to 'build-aux/bootstrap')
-rwxr-xr-xbuild-aux/bootstrap8
1 files changed, 6 insertions, 2 deletions
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.