Bump libcxml version; add versions back to cscript.

diff --git a/cscript b/cscript
index 23dea9cdf1a76156b128798ea24edf9b03d1b45a..5669107542f0198edbb2d9bc264c32cc9a4d8c3e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -4,8 +4,7 @@ def dependencies(target):
     if target.platform == 'windows':
         return ()
     else:
-        # XXX: should be some versions in here
-        return (('libcxml', None), ('openjpeg-cdist', None))
+        return (('libcxml', 'v0.05'), ('openjpeg-cdist', '6771627cfa63e315d2e23d81669cafcdc66ddc9f'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()

diff --git a/wscript b/wscript
index d81c84a35fc099200a4da07246b319650dc470ad..fcf41e0ecfa091dc4cd0dd76cb381503e4ad4d76 100644 (file)
--- a/wscript
+++ b/wscript
@@ -49,8 +49,8 @@ def configure(conf):
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
     else:
-        conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
-        conf.check_cfg(package = 'libcxml', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True)
+        conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.05', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'