--- psiconv/trunk/configure.in	1999/12/02 18:05:36	36
+++ psiconv/trunk/configure.in	2000/12/10 16:49:40	58
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(psiconv)
-AM_INIT_AUTOMAKE(psiconv,0.6.0)
+AC_INIT(lib/psiconv)
+AM_INIT_AUTOMAKE(psiconv,0.6.3)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -66,13 +66,40 @@
               [IMAGEMAGICK=$withval],
               [IMAGEMAGICK='yes'])
 if test x"$IMAGEMAGICK" != xno ; then
-  AC_CHECK_LIB(Magick,MagickWarning,IMAGEMAGICK=yes,IMAGEMAGICK=no)
-  if test x"$IMAGEMAGICK" = xno ; then
-    AC_MSG_WARN(ImageMagick support disabled!)
+  AC_CHECK_PROG(IMAGEMAGICK,Magick-config,yes,no)
+  if test x"$IMAGEMAGICK" != xno ; then
+    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`"
+
+    AC_MSG_CHECKING(whether GetMagickInfo works)
+    AC_TRY_RUN([ #include <magick/magick.h>
+                 #include <magick/config.h>
+                 #include <stdio.h>
+                 extern void OpenModules(void);
+                 int main(void) { GetMagickInfo(NULL);
+                 #if defined(HasLTDL)
+                 OpenModules();
+                 #endif
+                 return (NULL ==  GetMagickInfo(NULL)); }],
+        IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)
+    AC_MSG_RESULT($IMAGEMAGICK)
+    LDFLAGS="$LDFLAGS_OLD"
+    LIBS="$LIBS_OLD"
+dnl Note: CFLAGS can't be set for single directories, so we propagate them
+    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`"
   AC_DEFINE(IMAGEMAGICK)
 else
   LIB_MAGICK=
@@ -194,4 +221,4 @@
 AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
 
 
-AC_OUTPUT([Makefile compat/Makefile lib/Makefile psiconv/Makefile lib/general.h formats/Makefile docs/Makefile])
+AC_OUTPUT([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile])