Re: [PATCH] bootstrap: remove some now-unneeded code

[Eric Blake]

On 12/17/2011 09:50 AM, Jim Meyering wrote:
> Here is a proposed patch to bring gnulib's bootstrap back
> into sync with the one from coreutils.
> 
> Back in September I made the following two changes to coreutils' bootstrap:
> 
>   maint: bootstrap: run autopoint and libtoolize *before* gnulib-tool
>     http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=3e26551096823b744016f6
> 
>   maint: bootstrap: remove some now-unneeded code
>     http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=5bf2c0eed323dc0079e438
> 
> They combine to eliminate some rather opaque code and to make
> the build process a little more efficient.

Except that at least on libvirt, libtoolize is not getting run at all.


> +
> +# 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.
> +if grep '^[    ]*LT_INIT' configure.ac >/dev/null; then
> +  echo "running: $LIBTOOLIZE --copy --install"
> +  $LIBTOOLIZE --copy --install
> +fi
> 

The culprit - libvirt is using AM_PROG_LIBTOOL rather than LT_INIT, for
the sake of compilation on RHEL 5 where libtool is too old to provide
the newer spelling.  But bootstrap already sets $use_libtool according
to probing for the older spelling, so it's just a matter of using the
right check.  I'm pushing this:

From 20afa10e2e0a6518a30ab4711472f4adf2b325aa Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 16 Jan 2012 10:16:01 -0700
Subject: [PATCH] bootstrap: properly check for libtool

Commit 767ccd40 changed things to invoke libtoolize before
gnulib-tool, but only for projects that use LT_INIT, even
though we had already probed for libtool via older spellings.

* build-aux/bootstrap (libtoolize): Also run libtool when older
usage is detected.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog           |    6 ++++++
 build-aux/bootstrap |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e296b4..5ed23e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-16  Eric Blake  <address@hidden>
+
+       bootstrap: properly check for libtool
+       * build-aux/bootstrap (libtoolize): Also run libtool when older
+       usage is detected.
+
 2012-01-15  Bruno Haible  <address@hidden>

        Improve support for MSVC 9.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 66da981..69bd960 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-01-16.17; # UTC

 # Bootstrap this package from checked-out sources.

@@ -758,7 +758,7 @@ 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.
-if grep '^[    ]*LT_INIT' configure.ac >/dev/null; then
+if test $use_libtool = 1; then
   echo "running: $LIBTOOLIZE --copy --install"
   $LIBTOOLIZE --copy --install
 fi
-- 
1.7.7.5

-- 
Eric Blake   address@hidden    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature