Contrib: detect zcat vs gzcat

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b6441d97d18734f9ea28c928c8fc4019ee0277cb..45dc3798af798cc39b97585ec3be760f68ac1b1c 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -112,7 +112,7 @@ FFMPEG_VERSION := git
 ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
        rm -Rf $@ $@-git
        mkdir -p $@-git
-       zcat "$<" | (cd $@-git && tar xv --strip-components=1)
+       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 ifdef HAVE_WIN32
        sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index d0e5e16a007e833ba609e47f9a2f225694e3c13b..2bed35d32ff7bf36c911ea9efaa5fb0a7f8a1e20 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -136,6 +136,14 @@ else
 download = $(error Neither curl nor wget found!)
 endif
 
+ifeq ($(shell gzcat --version >/dev/null 2>&1 || echo FAIL),)
+ZCAT = gzcat
+else ifeq ($(shell zcat --version >/dev/null 2>&1 || echo FAIL),)
+ZCAT = zcat
+else
+ZCAT ?= $(error Gunzip client (zcat) not found!)
+endif
+
 ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
 SHA512SUM = sha512sum
 else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 46925220d2c42ba236d73da320edbaf417df0878..03953b0decc73c7b5866cb457e21812e73a9346f 100644 (file)
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -43,7 +43,7 @@ X264_VERSION := git
 x264: x264-$(X264_VERSION).tar.gz .sum-x264
        rm -Rf x264-git
        mkdir -p x264-git
-       zcat "$<" | (cd x264-git && tar xv --strip-components=1)
+       $(ZCAT) "$<" | (cd x264-git && tar xv --strip-components=1)
        $(MOVE)
 
 .x264: x264