From: popolon2 <popolon2@users.sourceforge.net>
Date: Sat, 10 May 2008 10:39:42 +0000 (+0000)
Subject: clean Imagemagick detection and doesn't link anymore unused related libs (bug #179369)
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f18a09731f6850d871c94e279c00e24b7504055;p=inkscape.git

clean Imagemagick detection and doesn't link anymore unused related libs (bug #179369)
---

diff --git a/configure.ac b/configure.ac
index eaa420af7..dc8aaab42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,19 +601,15 @@ dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
 
-AC_CHECK_LIB(Magick++, InitializeMagick, [AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)], magick_ok=no, -llcms -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread)
-
+PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
 if test "x$magick_ok" = "xyes"; then
-	AC_CHECK_PROG(MAGICKPP_CONFIG, Magick++-config, yes, no)
-	if test "x$MAGICKPP_CONFIG" = "xyes"; then
-		IMAGEMAGICK_LIBS=`Magick++-config --libs`
-		AC_SUBST(IMAGEMAGICK_LIBS)
-		AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
-	fi
+      AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
 fi
-
 AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
 
+AC_SUBST(IMAGEMAGICK_LIBS)
+AC_SUBST(IMAGEMAGICK_CFLAGS)
+
 dnl ******************************
 dnl   Unconditional dependencies
 dnl ******************************