From: Frank Ch. Eigler Date: Fri, 8 Jun 2012 17:31:09 +0000 (-0400) Subject: docs: only use working xmlto --with-fop X-Git-Tag: release-1.8~36 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=61598deb8717a45356b95b6028acbfb0f1fbb70d;p=systemtap.git 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 2782641a2..cc4134570 100755 --- 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 b47d74696..bdf8a51ec 100644 --- 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 index 000000000..dfc5a3318 --- /dev/null +++ b/doc/SystemTap_Tapset_Reference/dummy-tapsets.xml @@ -0,0 +1,37 @@ + + + + + SystemTap Tapset Reference Manual + + + 2008-2012 + Red Hat, Inc. and others + + + + + SystemTap + Hackers + + + + + + + +Introduction + 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. + + 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 + tapset library. This document describes the various + probe points and functions. + +