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
The following commit(s) were added to refs/heads/8.0.x by this push:
new 6f6141b Fixing the Magick versioned checks
6f6141b is described below
commit 6f6141baf744b2be6bdaeae2dd8556cb40157857
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Fri Nov 2 21:25:27 2018 -0600
Fixing the Magick versioned checks
(cherry picked from commit 753e0dd0be99c82c1c7c4a3e0e4d308dea500419)
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b9c8296..e49ed7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,7 +516,7 @@ PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++ >= 7], [
enable_image_magick_plugins=yes
])
],
-
+[
PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++ < 7], [
TS_ADDTO(LIBMAGICKCPP_CFLAGS, [-DMAGICK_VERSION=6])
have_libmagickcpp=yes
@@ -526,7 +526,7 @@ PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++ >= 7], [
],
[
have_libmagickcpp=no
- ]))
+ ])])
AM_CONDITIONAL([BUILD_IMAGE_MAGICK_PLUGINS], [test
"x${enable_image_magick_plugins}" = "xyes"])
