add version test for MagickCore and conditionally include the path to…

… MagickCore.h
gnustep · Dec 12, 2023 · c4c6336 · c4c6336
1 parent 5b50975
commit c4c6336
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Source/GSImageMagickImageRep.m b/Source/GSImageMagickImageRep.m
@@ -43,7 +43,11 @@
 
 #if HAVE_IMAGEMAGICK
 
+#if MAGICKCORE_7_OR_NEWER
 #include <MagickCore/MagickCore.h>
+#else
+#include <magick/MagickCore.h>
+#endif
 
 @implementation GSImageMagickImageRep 
 

diff --git a/configure.ac b/configure.ac
@@ -431,6 +431,11 @@ AS_IF([test "x$enable_imagemagick" = "xyes"], [
     ],
     [AC_DEFINE([HAVE_IMAGEMAGICK], [0], [Don't have ImageMagick])])
 ])
+AS_IF([test "x$enable_imagemagick" = "xyes"], [
+   PKG_CHECK_MODULES([MAGICKCORE], [MagickCore >= 7],
+   [AC_DEFINE([MAGICKCORE_7_OR_NEWER], [1], [MagickCore >= 7])],
+   [AC_DEFINE([MAGICKCORE_7_OR_NEWER], [0], [MagickCore < 7])])
+])
 
 #--------------------------------------------------------------------
 # Check for International Components for Unicode