[vlc-commits] Contribs: Add xzcat decompression tool

Jean-Baptiste Kempf git at videolan.org
Tue Feb 3 11:46:48 CET 2015


vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb  3 11:39:03 2015 +0100| [902adaba7c68e866241997d037adfc96c5f85f33] | committer: Jean-Baptiste Kempf

Contribs: Add xzcat decompression tool

(cherry picked from commit 1fad7fcae5db01e29fc7ed8dd67db76d04752394)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=902adaba7c68e866241997d037adfc96c5f85f33
---

 contrib/src/main.mak |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 79e8e57..6ef8c3a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -185,6 +185,10 @@ endif
 ACLOCAL_AMFLAGS += -I$(PREFIX)/share/aclocal
 export ACLOCAL_AMFLAGS
 
+#########
+# Tools #
+#########
+
 PKG_CONFIG ?= pkg-config
 ifdef HAVE_CROSS_COMPILE
 # This inhibits .pc file from within the cross-compilation toolchain sysroot.
@@ -226,6 +230,12 @@ else
 download = $(error Neither curl nor wget found!)
 endif
 
+ifeq ($(shell which xzcat >/dev/null 2>&1 || echo FAIL),)
+XZCAT = xzcat
+else
+XZCAT ?= $(error xz and lzma client not found!)
+endif
+
 ifeq ($(shell which bzcat >/dev/null 2>&1 || echo FAIL),)
 BZCAT = bzcat
 else



More information about the vlc-commits mailing list