X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4fb535d86e85dfbabe250c71e4e04a725defacd4;hb=99b4e0705e9007aabfec08ea2c8d1a84eda0d32e;hp=0e6ae47dd0fc832e5781aec923d3154f610f6fbe;hpb=4ca3e80cb3943bd3994250f536dbe0483f350606;p=dcpomatic.git

diff --git a/wscript b/wscript
index 0e6ae47dd..4fb535d86 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.29'
+VERSION = '2.11.40devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -233,8 +233,51 @@ def configure(conf):
                    includes=conf.env['INCLUDES_MAGICK'],
                    define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE')
 
+    # See where MagickCore.h is
+    conf.check_cxx(fragment="""
+                            #include <magick/MagickCore.h>\n
+                            int main() { return 0; }\n
+                            """,
+                   mandatory=False,
+                   msg='Checking for MagickCore.h location',
+                   okmsg='magick',
+                   errmsg='not magick',
+                   includes=conf.env['INCLUDES_MAGICK'],
+                   define_name='DCPOMATIC_MAGICKCORE_MAGICK')
+
+    conf.check_cxx(fragment="""
+                            #include <MagickCore/MagickCore.h>\n
+                            int main() { return 0; }\n
+                            """,
+                   mandatory=False,
+                   msg='Checking for MagickCore.h location',
+                   okmsg='MagickCore',
+                   errmsg='not MagickCore',
+                   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)