Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

diff --git a/wscript b/wscript
index 1c6ab31d63b428c9739b2652ca6f3603b5870820..1fbdf0c32936ce895491f66d38c2f057a932979b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -236,6 +236,10 @@ def configure(conf):
     if conf.env.TARGET_DEBIAN:
         # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file
         conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
+
+    if conf.env.TARGET_CENTOS_6 or conf.env.TARGET_CENTOS_7:
+        # libavcodec seems to be linked against this on Centos
+        conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
         
     if not conf.env.DISABLE_GUI and conf.env.TARGET_LINUX:
         conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)