Fix signed-ness warning on macOS.

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index ac3dbabd7bc9daa5f68ac49b73e5fbb8760cea60..54b965637a05075f7d4e0d4df37f4180b0dbd0fe 100644 (file)
--- a/wscript
+++ b/wscript
@@ -48,6 +48,10 @@ if this_version == '':
 else:
     VERSION = this_version[1:].strip()
 
+if sys.version_info.major == 2:
+    # Handle Python 2 (for Ubuntu 16.04)
+    VERSION = VERSION.encode('UTF-8')
+
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -150,7 +154,7 @@ def configure(conf):
 
     if conf.options.static:
         conf.env.STLIB_OPENJPEG = ['openjp2']
-        conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
+        conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
         conf.env.HAVE_ASDCPLIB_CTH = 1
         conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
         conf.env.HAVE_CXML = 1
@@ -159,8 +163,8 @@ def configure(conf):
         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-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
+        conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', 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: