generated: take into account the things needed in master

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 4ba2d40..ba3084c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -230,12 +230,11 @@ AC_ARG_ENABLE([linux-syscall-probing],
     ,
     [enable_linux_syscall_probing="maybe"])
     
-
 AC_ARG_WITH([xslt-processor],
        AS_HELP_STRING([--with-xslt-processor=ARG],
        [which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]),
                XSLTPROC="$withval",
-               XSLTPROC="libxslt")
+       AC_CHECK_PROGS([XSLTPROC], [libxslt saxon xalan-j xsltproc], [echo]))
 
 AC_ARG_WITH([html-xsl], 
         AS_HELP_STRING([--with-html-xsl],
@@ -243,6 +242,12 @@ AC_ARG_WITH([html-xsl],
        HTML_XSL="$withval",
        HTML_XSL=no)
 
+AC_ARG_WITH([docbook2pdf],
+       AS_HELP_STRING([--with-docbook2pdf=ARG],
+       [which Docbook to PDF utility to use (possible choices are: docbook2pdf, dblatex)]),
+               DOCBOOK2PDF="$withval",
+       AC_CHECK_PROGS([DOCBOOK2PDF], [docbook2pdf dblatex], [echo]))
+
 enable_login="no"
 
 dnl weird ass systems
@@ -1672,6 +1677,7 @@ AC_SUBST(DARWIN_INFOFILE)
 AC_SUBST(IRIX_BUILD_IP35)
 AC_SUBST(HTML_XSL)
 AC_SUBST(XSLTPROC)
+AC_SUBST(DOCBOOK2PDF)
 
 OPENAFS_OSCONF
 OPENAFS_FUSE