[Kde-imaging] extragear/libs/kipi-plugins

[Angelo Naselli]

SVN commit 536738 by anaselli:

Added a test check for libMagik needed by jpeglossless plugin

CCMAIL: kde-imaging at kde.org, digikam-devel at kde.org

 M  +6 -1      configure.in.bot  
 M  +20 -1     configure.in.in  


--- trunk/extragear/libs/kipi-plugins/configure.in.bot #536737:536738
@@ -59,4 +59,9 @@
   all_tests=bad
 fi
 
-
+if test "x$have_Magick" != "xyes"; then
+  echo ""
+  echo "You're missing libMagick. The jpeglossless plugin will not be compiled."
+  echo ""
+  all_tests=bad
+fi
--- trunk/extragear/libs/kipi-plugins/configure.in.in #536737:536738
@@ -143,6 +143,24 @@
 AM_CONDITIONAL(compile_HTMLEXPORT, test -n "${XSLT_CONFIG}")
 
 
+#---------------------------------------------------------
+#
+# libMagick detection
+#
+#---------------------------------------------------------
+have_Magick=no
+AC_PATH_PROG(MAGICK_CONFIG,Magick++-config)
+if test -n "${MAGICK_CONFIG}"; then
+  LIBMAGICK_CFLAGS="`$MAGICK_CONFIG --cflags`"
+  AC_SUBST(LIBMAGICK_CFLAGS)
+  LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
+  AC_SUBST(LIBMAGICK_LIBS)
+  have_Magick=yes
+else
+  AC_MSG_WARN([
+libMagick is required for the jpeglossess plugin.
+])
+fi
 
 # ----------------------------------------------------------
 #
@@ -298,4 +316,5 @@
 
 
 AM_CONDITIONAL(compile_TIMEADJUST,   [test x$have_libkexif = xyes])
-AM_CONDITIONAL(compile_JPEGLOSSLESS,  [test x$have_libkexif = xyes -a x$have_tiff = xyes])
+AM_CONDITIONAL(compile_JPEGLOSSLESS,  [test x$have_libkexif = xyes -a x$have_tiff = xyes -a x$have_Magick = xyes])
+