Try to fix build failure with ImageMagick 7 on arch.

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 7d8603697a8691fc6f01d74a503aa320588d7e7f..5e9a255cd600c190047efc51dcd19b0e78a5a195 100644 (file)
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -25,8 +25,14 @@
 #include <dcp/version.h>
 #include <libssh/libssh.h>
 #ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
 #include <magick/MagickCore.h>
 #else
+#include <MagickCore/MagickCore.h>
+#endif
+#else
+/* GraphicsMagick */
 #include <magick/common.h>
 #include <magick/magick_config.h>
 #endif

diff --git a/wscript b/wscript
index 30d6fb8d67e6ee538390a5159b4a5bf31465d331..39b61c5f943cc9ae1e09776651fdf78bb598c654 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)