Find libasdcp-dcpomatic and xerces-c in a less flaky way.

1 files changed, 5 insertions, 8 deletions

diff --git a/wscript b/wscript
index c757edb4..cd21e579 100644
--- a/wscript
+++ b/wscript
@@ -165,18 +165,15 @@ def configure(conf):
         conf.check_cfg(package='libopenjp2', args='libopenjp2 >= 2.5.0 --cflags --libs', uselib_store='OPENJPEG', mandatory=True, msg='Checking for libopenjp2 >= 2.5.0')
 
     conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True)
+    conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True)
+    conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
     if conf.options.static:
         conf.env.STLIB_OPENJPEG = ['openjp2']
-        conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True)
-        conf.env.HAVE_ASDCPLIB_DCPOMATIC = 1
-        conf.env.STLIB_ASDCPLIB_DCPOMATIC = ['asdcp-dcpomatic', 'kumu-dcpomatic']
+        for lib in ('asdcplib-dcpomatic', 'kumu-dcpomatic'):
+            conf.env.LIB_ASDCPLIB_DCPOMATIC.remove(lib)
+            conf.env.STLIB_ASDCPLIB_DCPOMATIC.append(lib)
         conf.env.LIB_CXML.remove('cxml')
         conf.env.STLIB_CXML.append('cxml')
-        conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
-        conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
-    else:
-        conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True)
-        conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
 
     if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         # XXX: it feels like there should be a more elegant way to get these included