bootstrap: pass --force to autoreconf.

* build-aux/bootstrap (no_recursive): Remove, replaced by...
(AUTORECONFFLAGS): this new variable.
Add "--force" so that Automake's ylwrap and other such tools
be updated at each bootstrap invocation.
Use it.

2 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 41e35e3ade..6d43b232a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-28  Akim Demaille  <akim@lrde.epita.fr>
+
+	bootstrap: pass --force to autoreconf.
+	* build-aux/bootstrap (AUTORECONFFLAGS): New.
+	Add "--force" so that Automake's ylwrap and other such tools
+	be updated at each bootstrap invocation.
+	Use it.
+
 2012-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	argp: fix port of port new 'inline' approach to Sun C 5.12 + Solaris 10
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e3e270b007..c84d24968a 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-07-19.14; # UTC
+scriptversion=2012-12-28.10; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -889,20 +889,21 @@ find "$m4_base" "$source_base" \
   -depth \( -name '*.m4' -o -name '*.[ch]' \) \
   -type l -xtype l -delete > /dev/null 2>&1
 
+# Invoke autoreconf with --force --install to ensure upgrades of tools
+# such as ylwrap.
+AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+
 # Some systems (RHEL 5) are using ancient autotools, for which the
 # --no-recursive option had not been invented.  Detect that lack and
 # omit the option when it's not supported.  FIXME in 2017: remove this
 # hack when RHEL 5 autotools are updated, or when they become irrelevant.
-no_recursive=
 case $($AUTORECONF --help) in
-  *--no-recursive*) no_recursive=--no-recursive;;
+  *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
 esac
 
 # 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 $ACLOCAL_FLAGS"
-AUTOPOINT=true LIBTOOLIZE=true \
-    $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
+echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
   || die "autoreconf failed"
 
 # Get some extra files from gnulib, overriding existing files.