[PATCH] bootstrap: correct the recent buildreq change

[Jim Meyering]

In comparing gnulib's bootstrap and the one in coreutils,
I saw something strange...  code that cannot work ;-)

This fix makes it work as intended:

>From ae92f6e5746d1eacc77af8f3ee568cc8205f5dea Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 17 Dec 2011 16:28:55 +0100
Subject: [PATCH] bootstrap: correct the recent buildreq change

The 2011-12-07 commit, 39f5f1e4, omitted some '*'s, and thus
had no effect.
* build-aux/bootstrap (buildreq): Bracket each search term with
"*...*", so that the shell "case" statement works as intended.
Add comments.
---
 ChangeLog           |    9 +++++++++
 build-aux/bootstrap |   14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be5b789..9ab3012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-17  Jim Meyering  <address@hidden>
+
+       bootstrap: correct the recent buildreq change
+       The 2011-12-07 commit, 39f5f1e4, omitted some '*'s, and thus
+       had no effect.
+       * build-aux/bootstrap (buildreq): Bracket each search term with
+       "*...*", so that the shell "case" statement works as intended.
+       Add comments.
+
 2011-12-17  Bernhard Voelker  <address@hidden>

        build: let bootstrap resort to wget when downloading .po files
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 61e1185..2a83f43 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-12-07.20; # UTC
+scriptversion=2011-12-17.15; # UTC

 # Bootstrap this package from checked-out sources.

@@ -478,26 +478,32 @@ if test $use_libtool = 1; then
   find_tool LIBTOOLIZE glibtoolize libtoolize
 fi

+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
 case $buildreq in
-  automake) ;;
+  *automake*) ;;
   *) buildreq="automake 1.9
 $buildreq" ;;
 esac
 case $buildreq in
-  autoconf) ;;
+  *autoconf*) ;;
   *) buildreq="autoconf 2.59
 $buildreq" ;;
 esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
 if test ! -d "$local_gl_dir" \
     || find "$local_gl_dir" -name '*.diff' -exec false {} +; then
   :
 else
   case $buildreq in
-    patch) ;;
+    *patch*) ;;
     *) buildreq="patch -
 $buildreq" ;;
   esac
 fi
+
 if ! printf "$buildreq" | check_versions; then
   echo >&2
   if test -f README-prereq; then
--
1.7.8.250.g900a1