X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=6f2c3df12b1206f48814339bd7a37e1f42f5a5b3;hb=dcb8eea81538712fae2c67d0e900f5906244ef7c;hp=879b49dfb70dfd5256a393d68bcd82020cd721bb;hpb=78a8676a77645fe13fde35659ac02f0efd3b1bff;p=dcpomatic.git

diff --git a/wscript b/wscript
index 879b49dfb..6f2c3df12 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.31'
+VERSION = '2.11.36'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -256,8 +256,28 @@ def configure(conf):
                    includes=conf.env['INCLUDES_MAGICK'],
                    define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
 
+    # See if we have advanced compare() methods in Magick
+    conf.check_cxx(fragment="""
+                            #include <Magick++.h>\n
+                            int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); }
+                            """,
+                   mandatory=False,
+                   msg='Checking for advanced compare() method in {Image/Graphics}Magick',
+                   uselib='MAGICK',
+                   define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE'
+                   )
+
     # libzip
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
+    conf.check_cxx(fragment="""
+                            #include <zip.h>
+                            int main() { zip_source_t* foo; }
+                            """,
+                   mandatory=False,
+                   msg="Checking for zip_source_t",
+                   uselib="ZIP",
+                   define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
+                   )
 
     # fontconfig
     conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)