# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1326747391 -3600
# Node ID 707952b7107aaa358194636ce0a1b6988dada811
# Parent  9f5a09cb866c09c210397f88419ce86429ff6f10
bootstrap: add a FIXME comment to ensure we eventually remove the hack

* build-aux/bootstrap (gnulib_tool_options): Add comment.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-16  Jim Meyering  <meyering@redhat.com>
+
+	bootstrap: add a FIXME comment to ensure we eventually remove the hack
+	* build-aux/bootstrap (gnulib_tool_options): Add comment.
+
 2012-01-16  Eric Blake  <eblake@redhat.com>
 
 	bootstrap: cater to autoconf 2.59
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-01-16.17; # UTC
+scriptversion=2012-01-16.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -819,11 +819,16 @@
   -depth \( -name '*.m4' -o -name '*.[ch]' \) \
   -type l -xtype l -delete > /dev/null 2>&1
 
-# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+# 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;;
 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 \