configury: test "xmlto pdf" with-fop if latter is already known to work

This should result in some generated pdf docs for tapsets.

diff --git a/configure b/configure
index a2c9bbbf38a29bcd4baffc7922664ca7c450a0d0..4742a9d07a2ddebad3d10a5d3c655b41defd9a6c 100755 (executable)
--- a/configure
+++ b/configure
@@ -9552,7 +9552,15 @@ fi
 if test "x${building_refdocs}" == "xyes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlto pdf support" >&5
 $as_echo_n "checking for xmlto pdf support... " >&6; }
-   xmlto pdf conftest.xml >& /dev/null
+   # xmlto pdf may work *only* with --with-fop
+   # XXX: To an extent this test is redundant in that the --with-fop test
+   # already ran xmlto --with-fop pdf ....
+   if test "x$have_fop" == "xyes"; then
+      XMLTOPDF_FOP=--with-fop
+   else
+      XMLTOPDF_FOP=
+   fi
+   xmlto $XMLTOPDF_FOP pdf conftest.xml >& /dev/null
    if test $? == 0; then
       have_xmlto_pdf="yes"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

diff --git a/configure.ac b/configure.ac
index d1a0b26cba3abc1d1a007122d70812b2c7235a83..4d8c97c75f8804b799a60929e06b7fbb61e1f2e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -307,7 +307,15 @@ AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
 
 if test "x${building_refdocs}" == "xyes"; then
 AC_MSG_CHECKING([for xmlto pdf support])
-   xmlto pdf conftest.xml >& /dev/null
+   # xmlto pdf may work *only* with --with-fop
+   # XXX: To an extent this test is redundant in that the --with-fop test
+   # already ran xmlto --with-fop pdf ....
+   if test "x$have_fop" == "xyes"; then
+      XMLTOPDF_FOP=--with-fop
+   else
+      XMLTOPDF_FOP=
+   fi
+   xmlto $XMLTOPDF_FOP pdf conftest.xml >& /dev/null
    if test $? == 0; then
       have_xmlto_pdf="yes"
       AC_MSG_RESULT([yes])