--- psiconv/trunk/configure	2000/10/04 19:02:04	52
+++ psiconv/trunk/configure	2000/10/21 00:49:13	53
@@ -1552,67 +1552,65 @@
 fi
 
 if test x"$IMAGEMAGICK" != xno ; then
-  echo $ac_n "checking for ConstituteImage in -lMagick""... $ac_c" 1>&6
-echo "configure:1557: checking for ConstituteImage in -lMagick" >&5
-ac_lib_var=`echo Magick'_'ConstituteImage | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  # Extract the first word of "Magick-config", so it can be a program name with args.
+set dummy Magick-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1559: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_IMAGEMAGICK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lMagick  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1565 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ConstituteImage();
-
-int main() {
-ConstituteImage()
-; return 0; }
-EOF
-if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  if test -n "$IMAGEMAGICK"; then
+  ac_cv_prog_IMAGEMAGICK="$IMAGEMAGICK" # Let the user override the test.
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  IMAGEMAGICK=yes
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_IMAGEMAGICK="yes"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_IMAGEMAGICK" && ac_cv_prog_IMAGEMAGICK="no"
+fi
+fi
+IMAGEMAGICK="$ac_cv_prog_IMAGEMAGICK"
+if test -n "$IMAGEMAGICK"; then
+  echo "$ac_t""$IMAGEMAGICK" 1>&6
 else
   echo "$ac_t""no" 1>&6
-IMAGEMAGICK=no
 fi
 
   if test x"$IMAGEMAGICK" != xno ; then
-    LIBS_SAVE="$LIBS"
-    LIBS="$LIBS -lMagick"
+    CFLAGS_OLD="$CFLAGS"
+    CPPFLAGS_OLD="$CPPFLAGS"
+    LDFLAGS_OLD="$LDFLAGS"
+    LIBS_OLD="$LIBS"
+    CFLAGS="$CFLAGS `Magick-config --cflags`"
+    CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
+    LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
+    LIBS="$LIBS `Magick-config --libs`"
+
     echo $ac_n "checking whether GetMagickInfo works""... $ac_c" 1>&6
-echo "configure:1601: checking whether GetMagickInfo works" >&5
+echo "configure:1597: checking whether GetMagickInfo works" >&5
     if test "$cross_compiling" = yes; then
   IMAGEMAGICK=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 1606 "configure"
+#line 1602 "configure"
 #include "confdefs.h"
  #include <magick/magick.h>
+                 #include <magick/config.h>
                  #include <stdio.h>
-                 int main(void) { MagickInfo *mi;GetMagickInfo(NULL);
+                 extern void OpenModules(void);
+                 int main(void) { GetMagickInfo(NULL);
                  #if defined(HasLTDL)
                  OpenModules();
                  #endif
-                 return (NULL !=  GetMagickInfo(NULL)); }
+                 return (NULL ==  GetMagickInfo(NULL)); }
 EOF
-if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   IMAGEMAGICK=yes
 else
@@ -1625,14 +1623,16 @@
 fi
 
     echo "$ac_t""$IMAGEMAGICK" 1>&6
-    LIBS="$LIBS_SAVE"
-  fi
-  if test x"$IMAGEMAGICK" = xno ; then
-    echo "configure: warning: ImageMagick support disabled!" 1>&2
+    LDFLAGS="$LDFLAGS_OLD"
+    LIBS="$LIBS_OLD"
+    if test x"$IMAGEMAGICK" = xno ; then
+      CFLAGS="$CFLAGS_OLD"
+      CPPFLAGS="$CPPFLAGS_OLD"
+    fi
   fi
 fi
 if test x"$IMAGEMAGICK" = xyes ; then
-  LIB_MAGICK=-lMagick
+  LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
   cat >> confdefs.h <<\EOF
 #define IMAGEMAGICK 1
 EOF
@@ -2660,6 +2660,7 @@
 s%@LN_S@%$LN_S%g
 s%@LIBTOOL@%$LIBTOOL%g
 s%@cflags_set@%$cflags_set%g
+s%@IMAGEMAGICK@%$IMAGEMAGICK%g
 s%@LIB_MAGICK@%$LIB_MAGICK%g
 s%@CPP@%$CPP%g
 s%@INT_8_BIT@%$INT_8_BIT%g