--- psiconv/trunk/configure.in	1999/10/03 21:10:47	2
+++ psiconv/trunk/configure.in	1999/10/13 16:08:59	16
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(psiconv)
-AM_INIT_AUTOMAKE(psiconv,0.5.0)
+AM_INIT_AUTOMAKE(psiconv,0.5.0a)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -8,6 +8,23 @@
 AM_PROG_LIBTOOL
 
 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!)
+  fi
+fi
+if test x"$IMAGEMAGICK" = xyes ; then
+  LIB_MAGICK=-lMagick
+  AC_DEFINE(IMAGEMAGICK)
+else
+  LIB_MAGICK=
+fi
+AC_SUBST(LIB_MAGICK)
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -113,4 +130,13 @@
 esac],[asciidocs=false])
 AM_CONDITIONAL(ASCIIDOCS,test x$asciidocs = xtrue)
 
+AC_ARG_ENABLE(rtf-docs,
+[  --enable-rtf-docs       Enable generation of RTF docs (default: off)],
+[case "${enableval}" in
+  yes) rtfdocs=true ;;
+  no)  rtfdocs=false ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;;
+esac],[rtfdocs=false])
+AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
+
 AC_OUTPUT([Makefile compat/Makefile lib/Makefile psiconv/Makefile lib/general.h formats/Makefile docs/Makefile])