don't use GZIP for the location of the gzip executable, because the latter actually uses that very variable for a list of default options. Use GZIP_CMD instead

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4690 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 16 insertions, 15 deletions

diff --git a/lib/make/configure b/lib/make/configure
index 92839969..a68366ce 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -1320,39 +1320,39 @@ done
 
 fi
 
-if test -z "$GZIP" ; then
+if test -z "$GZIP_CMD" ; then
   for ac_prog in gzip
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:1330: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GZIP'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_prog_GZIP_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$GZIP"; then
-  ac_cv_prog_GZIP="$GZIP" # Let the user override the test.
+  if test -n "$GZIP_CMD"; then
+  ac_cv_prog_GZIP_CMD="$GZIP_CMD" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GZIP="$ac_prog"
+      ac_cv_prog_GZIP_CMD="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-GZIP="$ac_cv_prog_GZIP"
-if test -n "$GZIP"; then
-  echo "$ac_t""$GZIP" 1>&6
+GZIP_CMD="$ac_cv_prog_GZIP_CMD"
+if test -n "$GZIP_CMD"; then
+  echo "$ac_t""$GZIP_CMD" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-test -n "$GZIP" && break
+test -n "$GZIP_CMD" && break
 done
 
 fi
@@ -5995,10 +5995,10 @@ cat > conftest.$ac_ext <<EOF
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char WAxQ1n;
+char xAatVE;
 
 int main() {
-ScgKpp
+mNPfgz
 ; return 0; }
 EOF
 if { (eval echo configure:6005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -7045,7 +7045,7 @@ s%@FPP@%$FPP%g
 s%@CUCC@%$CUCC%g
 s%@PERL@%$PERL%g
 s%@TAR@%$TAR%g
-s%@GZIP@%$GZIP%g
+s%@GZIP_CMD@%$GZIP_CMD%g
 s%@PATCH@%$PATCH%g
 s%@GIT@%$GIT%g
 s%@F90@%$F90%g
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 2bba5837..4705df39 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -205,8 +205,8 @@ if test -z "$TAR" ; then
   AC_CHECK_PROGS(TAR, gtar tar)
 fi
 
-if test -z "$GZIP" ; then
-  AC_CHECK_PROGS(GZIP, gzip)
+if test -z "$GZIP_CMD" ; then
+  AC_CHECK_PROGS(GZIP_CMD, gzip)
 fi
 
 if test -z "$PATCH" ; then
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index 3bf4cd9e..516bf00d 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -33,7 +33,8 @@ export AR          = @AR@
 export RANLIB      = @RANLIB@
 export PERL        = @PERL@
 export TAR         = @TAR@
-export GZIP        = @GZIP@
+# GZIP is used by gzip for a list of default options, thus we use GZIP_CMD
+export GZIP_CMD    = @GZIP_CMD@
 export PATCH       = @PATCH@
 export GIT         = @GIT@