Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16794:42a3333c10b6
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Thu, 19 Apr 2012 16:39:06 -0600 |
| parents | b4a006114483 |
| children | 6a9ea5d7b466 |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-04-19 Eric Blake <eblake@redhat.com> + + bootstrap: accommodate older libtool + * build-aux/bootstrap (use_libtool): Cater to libtool 1.5.22. + Reported by Daniel P. Berrange. + 2012-04-19 Jim Meyering <meyering@redhat.com> announce-gen: avoid failure due to lack of Digest::SHA1
--- 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 @@ # 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() {