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.
> 

> -
> +# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
> +echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
> +    "$AUTORECONF --verbose --install --no-recursive -I $m4_base"
> +AUTOPOINT=true LIBTOOLIZE=true \
> +    $AUTORECONF --verbose --install --no-recursive -I $m4_base \
> +  || exit 1

Next problem - autoconf 2.59 (alas, RHEL 5 is still stuck on ancient
autotools) didn't understand 'autoreconf --no-recursive'.  I'm pushing this:

From dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
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 <address@hidden>
---
 ChangeLog           |    4 ++++
 build-aux/bootstrap |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ed23e6..b02b815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-01-16  Eric Blake  <address@hidden>

+       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 69bd960..2a409fc 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.
-- 
1.7.7.5

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

signature.asc
Description: OpenPGP digital signature