configure: allow to override gzip binary, fixes #2852

diff --git a/Makefile.webui b/Makefile.webui
index 686688cf328fa13cce10e27150ded0571c313e03..efe24218f048ad010a4467d5a43d0c51a48cf3bf 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 = gzip -n
+GZIP += -n
 
 ifeq ($(WEBUI),std)
 DEBUG =

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

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