Fix merge.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 028a6b6de7caa462188664b0e3f55684c5529d2c..6df36d7ead8b68e4317a796eefc8218e17e2a056 100644 (file)
--- a/wscript
+++ b/wscript
@@ -20,8 +20,6 @@ def configure(conf):
         conf.load('winres')
 
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
-    # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
-    conf.env.append_value('LIB', 'lzma')
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
@@ -39,6 +37,8 @@ def configure(conf):
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
+        # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
+        conf.env.append_value('LIB', 'lzma')
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
@@ -55,6 +55,7 @@ def configure(conf):
     if conf.options.static:
         pkgconfig_args += ' --static'
 
+    conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True)
     conf.check_cfg(package = 'libavformat', args = pkgconfig_args, uselib_store = 'AVFORMAT', mandatory = True)
     conf.check_cfg(package = 'libavfilter', args = pkgconfig_args, uselib_store = 'AVFILTER', mandatory = True)
     conf.check_cfg(package = 'libavcodec', args = pkgconfig_args, uselib_store = 'AVCODEC', mandatory = True)