diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-09-30 19:07:26 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-09-30 19:07:26 -0400 |
| commit | 468abaf4588392bcf7d7e243c707bb41bc17532c (patch) | |
| tree | ad08fb0183cc8f497c758d91c56b245a0e527ada /configure.ac | |
| parent | 90b64e1e89a33317d6008e10fe2c106a0dc34c7a (diff) | |
| download | systemtap-steved-468abaf4588392bcf7d7e243c707bb41bc17532c.tar.gz systemtap-steved-468abaf4588392bcf7d7e243c707bb41bc17532c.tar.xz systemtap-steved-468abaf4588392bcf7d7e243c707bb41bc17532c.zip | |
doc build: support older xmlto without --stringparm option
* configure.ac: Check for xmlto --stringparam support.
* doc/Systemtap_Tapset_Reference/Makefile.am: Be sensitive to the result.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index a758eac3..ce16e9a0 100644 --- a/configure.ac +++ b/configure.ac @@ -206,19 +206,32 @@ if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_d fi AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) -if test "x${building_refdocs}" == "xyes"; then -AC_MSG_CHECKING([for xmlto pdf support]) -cat > conftest.$ac_ext << EOF +cat > conftest.xml << 'EOF' <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []> - <book id="pdffromxml"> - <bookinfo> - <title>test</title> - </bookinfo> + <book lang="en"> + <bookinfo><title>foo</title></bookinfo> + <chapter><title>bar</title><para>baz</para></chapter> </book> EOF - xmlto pdf conftest.$ac_ext >& /dev/null + +if test "x${have_xmlto}" == "xyes"; then +AC_MSG_CHECKING([for xmlto --stringparam support]) + xmlto --stringparam man.authors.section.enabled=0 txt conftest.xml + if test $? == 0; then + have_xmlto_stringparam="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + rm -f conftest.txt +fi +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 if test $? == 0; then have_xmlto_pdf="yes" AC_MSG_RESULT([yes]) @@ -226,6 +239,7 @@ EOF AC_MSG_RESULT([no]) AC_MSG_WARN([Not building reference documentation in PDF format]) fi + rm -f conftest.pdf fi dnl Unfortunately https://bugzilla.redhat.com/show_bug.cgi?id=526273 dnl blocks "xmlto pdf" on our docs (but not on the above test). @@ -233,6 +247,9 @@ dnl So we need to disable this anyway. dnl AM_CONDITIONAL([BUILD_PDFREFDOCS], [test "$have_xmlto_pdf" == "yes"]) AM_CONDITIONAL([BUILD_PDFREFDOCS], [test "maybe later" == "yes"]) +rm -f conftest.xml + + dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], AS_HELP_STRING([--enable-server], |