X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=13ebe36b1c75992b996095d5c7e3ffce22411239;hp=d614effe9cdb9d44f965037cbf4434360805e6d1;hb=cbbee4e8727c583daf32d9bf17f00afaa839ef10;hpb=cfe2fd2a36f43c1f998bb5e7c0cec15480ed3f96
diff --git a/aclocal.m4 b/aclocal.m4
index d614eff..13ebe36 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -747,14 +747,28 @@ AS_VAR_POPDEF([fp_func])dnl
# FP_GEN_DOCBOOK_XML
# ------------------
# Generates a DocBook XML V4.2 document in conftest.xml.
+#
+# It took a lot of experimentation to find a document that will cause
+# xsltproc to fail with an error code when the relevant
+# stylesheets/DTDs are not found. I couldn't make xsltproc fail with
+# a single-file document, it seems a multi-file document is needed.
+# -- SDM 2009-06-03
+#
AC_DEFUN([FP_GEN_DOCBOOK_XML],
-[rm -f conftest.xml
+[rm -f conftest.xml conftest-book.xml
cat > conftest.xml << EOF
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [[
+
+]]>
- A DocBook Test Document
+&conftest-book;
+
+EOF
+cat >conftest-book.xml << EOF
+
+
A DocBook “Test Document”
A Chapter Title
This is a paragraph, referencing .
@@ -763,7 +777,6 @@ cat > conftest.xml << EOF
Another Chapter Title
This is another paragraph, referencing .
-
EOF
]) # FP_GEN_DOCBOOK_XML
@@ -793,11 +806,9 @@ fi
])# FP_PROG_XSLTPROC
-# FP_DOCBOOK_XSL(XSL-DIRS)
+# FP_DOCBOOK_XSL
# ----------------------------
-# Check which of the directories XSL-DIRS contains DocBook XSL stylesheets. The
-# output variable HAVE_DOCBOOK_XSL will contain the first usable directory or
-# will be empty if none could be found.
+# Check that we can process a DocBook XML document to HTML using xsltproc.
AC_DEFUN([FP_DOCBOOK_XSL],
[AC_REQUIRE([FP_PROG_XSLTPROC])dnl
if test -n "$XsltprocCmd"; then
@@ -838,7 +849,7 @@ AC_DEFUN([FP_CHECK_DOCBOOK_DTD],
if test -n "$XmllintCmd"; then
AC_MSG_CHECKING([for DocBook DTD])
FP_GEN_DOCBOOK_XML
- if $XmllintCmd --nonet --valid --noout conftest.xml > /dev/null 2>&1; then
+ if $XmllintCmd --nonet --valid --noout conftest.xml ; then
AC_MSG_RESULT([ok])
else
AC_MSG_RESULT([failed])