--- psiconv/trunk/configure.in	2004/02/02 21:56:48	193
+++ psiconv/trunk/configure.in	2004/04/29 22:14:09	253
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_SRCDIR([lib/psiconv])
-AM_INIT_AUTOMAKE(psiconv,0.9.0)
+AM_INIT_AUTOMAKE(psiconv,0.9.6)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -81,6 +81,7 @@
 
     AC_MSG_CHECKING(whether GetMagickInfo works and which API to use)
     AC_TRY_RUN([ #include <stdio.h>
+                 #include <time.h>
 		 #include <magick/api.h>
                  int main(void) { ExceptionInfo exception;
                  GetExceptionInfo(&exception);
@@ -244,5 +245,16 @@
 esac],[asciidocs=false])
 AM_CONDITIONAL(ASCIIDOCS,test x$asciidocs = xtrue)
 
-AC_CONFIG_FILES([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile extra/Makefile])
+AC_ARG_WITH(etcdir,
+	       [  --with-etcdir=DIR       Set configfile dir (default: SYSCONFDIR/psiconv)],
+	       [PSICONVETCDIR=${withval}],
+	       [PSICONVETCDIR=${sysconfdir}/psiconv])
+AC_SUBST(PSICONVETCDIR)
+
+AC_ARG_WITH(imagemagick,
+              [  --with-imagemagick      enable ImageMagick (default = yes)],
+              [IMAGEMAGICK=$withval],
+              [IMAGEMAGICK='yes'])
+
+AC_CONFIG_FILES([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile program/psiconv-config/Makefile program/psiconv-config/psiconv-config program/psiconv-config/psiconv-config.man lib/psiconv/general.h formats/Makefile docs/Makefile program/extra/Makefile etc/Makefile])
 AC_OUTPUT