bootstrap: avoid build failure when $GZIP is set

* build-aux/bootstrap (check_versions): Do not treat $GZIP as a
program name.  If defined at all, it is supposed to list gzip options.
Reported by Alan Curry in http://debbugs.gnu.org/8609

diff --git a/ChangeLog b/ChangeLog
index 2f3edc41fc3cb03950b7ba3f8eb84d88c408eab1..8f96680f74350396b805bd3571d8627178534e33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-03  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: avoid build failure when $GZIP is set
+       * build-aux/bootstrap (check_versions): Do not treat $GZIP as a
+       program name.  If defined at all, it is supposed to list gzip options.
+       Reported by Alan Curry in http://debbugs.gnu.org/8609
+
 2011-05-03  Reuben Thomas  <rrt@sc3d.org>
 
        readme-release: new module with release instructions

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 7cbb5dc4337ac14bd8540a4152d0278f7ba31a73..d91611b4a4819b247b852066b80dbc729156295e 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-04-05.18; # UTC
+scriptversion=2011-05-03.08; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -421,7 +421,10 @@ check_versions() {
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
     appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
-    eval "app=\${$appvar-$app}"
+    case $appvar in
+        GZIP) ;; # Do not use $GZIP:  it contains gzip options.
+        *) eval "app=\${$appvar-$app}" ;;
+    esac
     inst_ver=$(get_version $app)
     if [ ! "$inst_ver" ]; then
       echo "$me: Error: '$app' not found" >&2