From: Jim Meyering <meyering@redhat.com>
Date: Tue, 3 May 2011 08:31:16 +0000 (+0200)
Subject: bootstrap: avoid build failure when $GZIP is set
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669d4ed58418b5dbffbd988a2c414c051673db04;p=pspp

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 2f3edc41fc..8f96680f74 100644
--- 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 7cbb5dc433..d91611b4a4 100755
--- 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