--- psiconv/trunk/configure.in	2004/01/09 22:31:16	186
+++ psiconv/trunk/configure.in	2004/02/25 16:11:17	228
@@ -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.3)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -217,14 +217,14 @@
 AC_SUBST(LIB_DMALLOC)
 
 dnl With and without functions
-AC_ARG_ENABLE(html-docs,
-[  --disable-html-docs     Disable generation of HTML 3.2 docs (default: on)],
+AC_ARG_ENABLE(xhtml-docs,
+[  --disable-xhtml-docs    Disable generation of XHTML docs (default: on)],
 [case "${enableval}" in
-  yes) htmldocs=true ;;
-  no)  htmldocs=false ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for --enable-html-docs) ;;
-esac],[htmldocs=true])
-AM_CONDITIONAL(HTMLDOCS,test x$htmldocs = xtrue)
+  yes) xhtmldocs=true ;;
+  no)  xhtmldocs=false ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for --enable-xhtml-docs) ;;
+esac],[xhtmldocs=true])
+AM_CONDITIONAL(XHTMLDOCS,test x$xhtmldocs = xtrue)
 
 AC_ARG_ENABLE(html4-docs,
 [  --enable-html4-docs     Enable generation of HTML 4 docs (default: off)],
@@ -244,15 +244,16 @@
 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_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 lib/psiconv/general.h formats/Makefile docs/Makefile extra/Makefile])
+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