diff options
| author | Eric Blake <eblake@redhat.com> | 2012-04-19 16:39:06 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-04-19 16:52:13 -0600 |
| commit | f15a17dc1f5d2b1fc8a423795c54b211552c0483 (patch) | |
| tree | 58c3034639f9ed35c5a4b1da297a53d83c41907c /build-aux/bootstrap | |
| parent | 40be4b8ddf60a93676c46aa932ec6950e681637a (diff) | |
| download | gnulib-f15a17dc1f5d2b1fc8a423795c54b211552c0483.tar.gz | |
bootstrap: accommodate older libtool
RHEL 5 still ships with libtool 1.5.22, where libtoolize lacks the
--install option but has that behavior by default. And gnulib's
DEPENDENCIES file states that we still support that old of libtool
as our minimum version.
* build-aux/bootstrap (use_libtool): Cater to libtool 1.5.22.
Reported by Daniel P. Berrange.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'build-aux/bootstrap')
| -rwxr-xr-x | build-aux/bootstrap | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 4afc6c44ea..5aa73cc1b7 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-19.14; # UTC +scriptversion=2012-04-19.22; # UTC # Bootstrap this package from checked-out sources. @@ -762,9 +762,15 @@ fi # Autoreconf runs aclocal before libtoolize, which causes spurious # warnings if the initial aclocal is confused by the libtoolized # (or worse out-of-date) macro directory. +# libtoolize 1.9b added the --install option; but we support back +# to libtoolize 1.5.22, where the install action was default. if test $use_libtool = 1; then - echo "running: $LIBTOOLIZE --copy --install" - $LIBTOOLIZE --copy --install + install= + case $($LIBTOOLIZE --help) in + *--install*) install=--install ;; + esac + echo "running: $LIBTOOLIZE $install --copy" + $LIBTOOLIZE $install --copy fi version_controlled_file() { |