docs: only use working xmlto --with-fop

There are configurations in the wild that only endavour to work.

* configure.ac: Re. fop, trust but VERIFY, with "xmlto --with-fop".

diff --git a/configure b/configure
index 2782641a2bdd8f737efb412b35d620713d259fec..cc4134570fc126378bfb309585e4d92f415bcab1 100755 (executable)
--- a/configure
+++ b/configure
@@ -9257,6 +9257,17 @@ $as_echo "no" >&6; }
 fi
 
 
+if test "x${have_fop}" == "xyes"; then
+   # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+   # hope that it works.
+   if xmlto --with-fop pdf ${srcdir}/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml >/dev/null 2>&1; then
+      true # whew
+   else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fop present but xmlto --with-fop is broken, disabling fop" >&5
+$as_echo "$as_me: WARNING: fop present but xmlto --with-fop is broken, disabling fop" >&2;}
+      have_fop="broken"
+   fi
+fi
  if test "$have_fop" == "yes"; then
   HAVE_FOP_TRUE=
   HAVE_FOP_FALSE='#'

diff --git a/configure.ac b/configure.ac
index b47d74696c5021276d2fa68863e4fb913843231c..bdf8a51ec2238f4308488c83487e61a813fcb432 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -261,6 +261,16 @@ fi
 AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
 
 AC_CHECK_PROG(have_fop, fop, yes, no)
+if test "x${have_fop}" == "xyes"; then
+   # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+   # hope that it works.
+   if xmlto --with-fop pdf ${srcdir}/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml >/dev/null 2>&1; then
+      true # whew
+   else
+      AC_MSG_WARN([fop present but xmlto --with-fop is broken, disabling fop])
+      have_fop="broken"
+   fi
+fi
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
 
 dnl There is a strange bug in older versions of xmlto when generating pdf.

diff --git a/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml b/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml
new file mode 100644 (file)
index 0000000..dfc5a33
--- /dev/null
+++ b/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="TapsetRef">
+ <bookinfo>
+  <title>SystemTap Tapset Reference Manual</title>
+<!--starthere-->
+  <copyright>
+   <year>2008-2012</year>
+   <holder>Red Hat, Inc. and others</holder>
+  </copyright>
+
+  <authorgroup>
+   <author>
+    <othername>SystemTap</othername>
+    <contrib>Hackers</contrib>
+   </author>
+  </authorgroup>
+
+
+ </bookinfo>
+<!-- pls dont remove marker comments, as they are used in publican conversion-->
+<toc/>
+<chapter id="introduction"><title>Introduction</title><para>
+    SystemTap provides free software (GPL) infrastructure to simplify the
+    gathering of information about the running Linux system. This assists
+    diagnosis of a performance or functional problem. SystemTap eliminates the
+    need for the developer to go through the tedious and disruptive instrument,
+    recompile, install, and reboot sequence that may be otherwise required to
+    collect data.
+  </para><para>
+    SystemTap provides a simple command line interface and scripting language
+    for writing instrumentation for a live running kernel. The instrumentation
+    makes extensive use of the probe points and functions provided in the
+    <firstterm>tapset</firstterm> library. This document describes the various
+    probe points and functions.
+  </para></chapter>
+</book>