--- psiconv/trunk/configure.in	1999/10/27 14:29:40	19
+++ psiconv/tags/rel-0-7-0/configure.in	2000/12/15 18:52:50	68
@@ -1,25 +1,105 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(psiconv)
-AM_INIT_AUTOMAKE(psiconv,0.5.0a)
+AC_INIT(lib/psiconv)
+AM_INIT_AUTOMAKE(psiconv,0.7.0)
 
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AM_PROG_LIBTOOL
 
+dnl This is stolen from gnome-libs-1.0.14
+AC_ARG_ENABLE(compile-warnings, 
+[  --enable-compile-warnings=[no/minimum/yes]       Turn on compiler warnings.],
+,enable_compile_warnings=minimum)
+
+AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+warnCFLAGS=
+if test "x$GCC" != xyes; then
+  enable_compile_warnings=no
+fi
+if test "x$enable_compile_warnings" != "xno"; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *[\ \	]-Wall[\ \	]*) ;;
+    *) warnCFLAGS="-Wall -Wunused" ;;
+    esac
+
+    ## -W is not all that useful.  And it cannot be controlled
+    ## with individual -Wno-xxx flags, unlike -Wall
+    if test "x$enable_compile_warnings" = "xyes"; then
+      warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith"
+    fi
+  fi
+fi
+AC_MSG_RESULT($warnCFLAGS)
+
+AC_ARG_ENABLE(iso-c,
+  [  --enable-iso-c          Try to warn if code is not ISO C ],,
+  enable_iso_c=no)
+
+AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+complCFLAGS=
+if test "x$enable_iso_c" != "xno"; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *[\ \	]-ansi[\ \	]*) ;;
+    *) complCFLAGS="$complCFLAGS -ansi" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-pedantic[\ \	]*) ;;
+    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+    esac
+  fi
+fi
+AC_MSG_RESULT($complCFLAGS)
+if test "x$cflags_set" != "xyes"; then
+  CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+  cflags_set=yes
+  AC_SUBST(cflags_set)
+fi
+
+
 dnl Checks for libraries.
 AC_ARG_WITH(imagemagick,
               [  --with-imagemagick      enable ImageMagick (default = yes)],
               [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=
@@ -99,8 +179,9 @@
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strdup)
 AC_REPLACE_FUNCS(strdup)
+AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+
 
 dnl With and without functions
 AC_ARG_ENABLE(html-docs,
@@ -139,56 +220,5 @@
 esac],[rtfdocs=false])
 AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
 
-dnl This is stolen from gnome-libs-1.0.14
-AC_ARG_ENABLE(compile-warnings, 
-[  --enable-compile-warnings=[no/minimum/yes]       Turn on compiler warnings.],
-,enable_compile_warnings=minimum)
-
-AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-warnCFLAGS=
-if test "x$GCC" != xyes; then
-  enable_compile_warnings=no
-fi
-if test "x$enable_compile_warnings" != "xno"; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-Wall[\ \	]*) ;;
-    *) warnCFLAGS="-Wall -Wunused" ;;
-    esac
-
-    ## -W is not all that useful.  And it cannot be controlled
-    ## with individual -Wno-xxx flags, unlike -Wall
-    if test "x$enable_compile_warnings" = "xyes"; then
-      warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith"
-    fi
-  fi
-fi
-AC_MSG_RESULT($warnCFLAGS)
-
-AC_ARG_ENABLE(iso-c,
-  [  --enable-iso-c          Try to warn if code is not ISO C ],,
-  enable_iso_c=no)
-
-AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-complCFLAGS=
-if test "x$enable_iso_c" != "xno"; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-ansi[\ \	]*) ;;
-    *) complCFLAGS="$complCFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-pedantic[\ \	]*) ;;
-    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-    esac
-  fi
-fi
-AC_MSG_RESULT($complCFLAGS)
-if test "x$cflags_set" != "xyes"; then
-  CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
-  cflags_set=yes
-  AC_SUBST(cflags_set)
-fi
 
-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])