This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 5bab20eed2d0d0239923841532f24bcf7323661b
Author: Daniel M <dmori...@gmail.com>
AuthorDate: Wed Oct 17 15:44:42 2018 -0700
supporting ImageMagick 6 and 7
(cherry picked from commit fa471031ebbadcc3c2e8038408f998b1826ad334)
---
configure.ac | 17 +++++++++++++----
plugins/experimental/magick/magick.cc | 5 ++++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7ccae97..b9c8296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,15 +509,24 @@ AM_CONDITIONAL([BUILD_MEMCACHED_REMAP_PLUGIN], [test
"x${have_libmemcached}" = "
#
# Check Magick++ is available. Enable experimental/webp_transform plugin
#
-PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++], [
+PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++ >= 7], [
+ TS_ADDTO(LIBMAGICKCPP_CFLAGS, [-DMAGICK_VERSION=7])
have_libmagickcpp=yes
AS_IF([test "x$enable_experimental_plugins" = "xyes"], [
enable_image_magick_plugins=yes
])
],
-[
- have_libmagickcpp=no
-])
+
+ PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++ < 7], [
+ TS_ADDTO(LIBMAGICKCPP_CFLAGS, [-DMAGICK_VERSION=6])
+ have_libmagickcpp=yes
+ AS_IF([test "x$enable_experimental_plugins" = "xyes"], [
+ enable_image_magick_plugins=yes
+ ])
+ ],
+ [
+ have_libmagickcpp=no
+ ]))
AM_CONDITIONAL([BUILD_IMAGE_MAGICK_PLUGINS], [test
"x${enable_image_magick_plugins}" = "xyes"])
diff --git a/plugins/experimental/magick/magick.cc
b/plugins/experimental/magick/magick.cc
index f618243..833c34c 100644
--- a/plugins/experimental/magick/magick.cc
+++ b/plugins/experimental/magick/magick.cc
@@ -39,8 +39,11 @@
#include <openssl/evp.h>
#include <openssl/pem.h>
+#if MAGICK_VERSION > 6
#include <MagickWand/MagickWand.h>
-#include <MagickWand/magick-cli.h>
+#else
+#include <wand/MagickWand.h>
+#endif
#define PLUGIN_TAG "ats-magick"
