X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=6fca93426cd8de6ddab3bdf22a26991e6e8800f8;hb=f8755c678d5b4b3d6b31761ef0ec13265190ca0c;hp=30d6fb8d67e6ee538390a5159b4a5bf31465d331;hpb=036c739fe6ea0b9873d4697b4ddec433644c1f51;p=dcpomatic.git

diff --git a/wscript b/wscript
index 30d6fb8d6..6fca93426 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.29devel'
+VERSION = '2.11.30devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -233,6 +233,29 @@ 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')
+
     # libzip
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)