From a7235db1917e535448c4fee18c98a700aab958d8 Mon Sep 17 00:00:00 2001
From: Stefan Holst <holstsn@users.sourceforge.net>
Date: Fri, 5 Aug 2005 19:44:34 +0000
Subject: merged flameeyes's 05_all_imagemagick.patch with a few corrections.
 introduces --disable-imagemagick configure option.

CVS patchset: 7707
CVS date: 2005/08/05 19:44:34
---
 configure.ac | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index da72db3b6..597edd79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1196,15 +1196,24 @@ dnl ---------------------------------------------
 dnl MagickWand API of Imagemagick.
 dnl ---------------------------------------------
 
-AC_PATH_PROG(WAND_CONFIG, Wand-config, no)
-if test "$WAND_CONFIG" = "no" ; then
-  AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***])
+AC_ARG_ENABLE([imagemagick],
+  AC_HELP_STRING([--disable-imagemagick], [do not build ImageMagick support]),
+  [with_imagemagick=$enableval], [with_imagemagick=yes])
+
+if test "x$with_imagemagick" = "xyes"; then
+  AC_PATH_PROG(WAND_CONFIG, Wand-config, no)
+  if test "$WAND_CONFIG" = "no" ; then
+    AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***])
+    have_imagemagick="no"
+  else
+    WAND_CFLAGS=`$WAND_CONFIG --cflags`
+    WAND_LDFLAGS=`$WAND_CONFIG --ldflags`
+    WAND_LIBS=`$WAND_CONFIG --libs`
+    have_imagemagick="yes"
+    AC_DEFINE(HAVE_WAND,1,[Define this if you have Imagemagick])
+  fi
 else
-  WAND_CFLAGS=`$WAND_CONFIG --cflags`
-  WAND_LDFLAGS=`$WAND_CONFIG --ldflags`
-  WAND_LIBS=`$WAND_CONFIG --libs`
-  have_imagemagick="yes"
-  AC_DEFINE(HAVE_WAND,1,[Define this if you have Imagemagick])
+  have_imagemagick="no"
 fi
 
 AM_CONDITIONAL(HAVE_WAND, test x"$have_imagemagick" = "xyes" )
@@ -2653,8 +2662,8 @@ fi
 if test x"$enable_w32dll" = "xyes"; then
   echo "   - w32dll"
 fi
-if test x"$have_libpng" = "xyes"; then
-  echo "   - png"
+if test x"$have_imagemagick" = "xyes"; then
+  echo "   - image"
 fi
 if test x"$no_theora" != "xyes"; then
   echo "   - theora"
-- 
cgit v1.2.3