configure: another gzip fix, fixes #2853

The gzip utility fetches default options from the GZIP environment variable.
Don't use this name in the tvh build.

diff --git a/Makefile.webui b/Makefile.webui
index 42b17d319d93100277b046a8136c26f5d4034f1c..52422eb7cc979c271434e3c71bea8f5dfdd6e618 100644 (file)
--- a/Makefile.webui
+++ b/Makefile.webui
@@ -32,7 +32,7 @@ EXTJSPATH = $(ROOTPATH)/extjs
 CSS_PY = PYTHONIOENCODING=utf-8 $(PYTHON) support/css.py
 RUN_JS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rjsmin-1.0.10/rjsmin.py
 RUN_CSS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rcssmin-1.0.5/rcssmin.py
-GZIP += -n
+GZIPCMD += -n
 
 ifeq ($(WEBUI),std)
 DEBUG =
@@ -154,7 +154,7 @@ define GO_JS
        $(VV)cat $^ > $@.tmp
        $(VV)$(RUN_JS) < $@.tmp > $@.tmp2
        @stat --printf="%-35n %7s\n" $@.tmp $@.tmp2
-       $(VV)$(GZIP) -c $@.tmp2 > $@.tmp
+       $(VV)$(GZIPCMD) -c $@.tmp2 > $@.tmp
        @rm $@.tmp2
        @mv $@.tmp $@
        @stat --printf="%-35n %7s\n" $@
@@ -165,7 +165,7 @@ define GO_CSS
        $(VV)$(CSS_PY) --in="$^" > $@.tmp
        $(VV)$(RUN_CSS) < $@.tmp > $@.tmp2
        @stat --printf="%-35n %7s\n" $@.tmp $@.tmp2
-       $(VV)$(GZIP) -c $@.tmp2 > $@.tmp
+       $(VV)$(GZIPCMD) -c $@.tmp2 > $@.tmp
        @rm $@.tmp2
        @mv $@.tmp $@
        @stat --printf="%-35n %7s\n" $@

diff --git a/configure b/configure
index 61f7d368473b60a131ec60df20c0139be6258fc8..b841faf41292d370671a98b1e61abf73b74a98d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -73,7 +73,10 @@ for opt do
     *dir|prefix)
       eval "$opt=$val"
       ;;
-    cc|cflags|ldflags|arch|cpu|platform|python|gzip|bzip2)
+    gzip)
+      eval "$(toupper ${opt}CMD)=\"$val\""
+      ;;
+    cc|cflags|ldflags|arch|cpu|platform|python|bzip2)
       eval "$(toupper $opt)=\"$val\""
       ;;
     enable-*)
@@ -235,7 +238,7 @@ check_py_import gzip
 #
 # Binaries
 #
-check_bin ${GZIP} || die 'WARN: no gzip binary found'
+check_bin ${GZIPCMD} || die 'WARN: no gzip binary found'
 check_bin ${BZIP2} || echo 'WARN: no bzip2 binary found'
 
 #

diff --git a/support/configure.inc b/support/configure.inc
index f733844da8bd6f35af8f991b09a85693bbe87998..64d163d485187b43e0a7bf5e838ca5fe6bb3bf82 100755 (executable)
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -17,7 +17,7 @@ CONFIGURE_ARGS="$*"
 [ -z "$ARCH"     ] && ARCH=$(uname -m)
 [ -z "$OSENV"    ] && OSENV=posix
 [ -z "$PYTHON"   ] && PYTHON=python
-[ -z "$GZIP"     ] && GZIP=gzip
+[ -z "$GZIPCMD"  ] && GZIPCMD=gzip
 [ -z "$BZIP2"    ] && BZIP2=bzip2
 
 # Paths
@@ -400,7 +400,7 @@ print_config ()
 
   echo "Binaries:"
   printf "$fmt" "Using PYTHON:" "${PYTHON}"
-  printf "$fmt" "Using GZIP:" "${GZIP}"
+  printf "$fmt" "Using GZIP:" "${GZIPCMD}"
   printf "$fmt" "Using BZIP2:" "${BZIP2}"
   echo ""
 
@@ -459,7 +459,7 @@ ifeq (\$(origin CC),default)
 CC        = ${CC}
 endif
 PYTHON   ?= ${PYTHON}
-GZIP     ?= ${GZIP}
+GZIPCMD  ?= ${GZIPCMD}
 BZIP2    ?= ${BZIP2}
 CFLAGS   += ${CFLAGS}
 LDFLAGS  += ${LDFLAGS}