--- psiconv/trunk/configure.in	2003/11/22 22:17:04	163
+++ psiconv/trunk/configure.in	2004/02/02 21:56:48	193
@@ -189,7 +189,11 @@
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_REPLACE_FUNCS(strdup)
-AC_CHECK_FUNCS(getopt_long,,AC_LIBOBJ([getopt]);AC_LIBOBJ([getopt1]))
+AC_CHECK_FUNC(getopt_long,getopt=yes,getopt=no)
+if test $getopt = no; then
+  AC_LIBOBJ([getopt])
+  AC_LIBOBJ([getopt1])
+fi
 
 AC_ARG_ENABLE(dmalloc,
 [  --enable-dmalloc        Enable dmalloc for developers (default:off)],
@@ -213,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)],
@@ -240,15 +244,5 @@
 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_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_OUTPUT