diff options
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | doc/SystemTap_Tapset_Reference/Makefile.am | 6 |
2 files changed, 16 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 2a500f49..ab315c10 100644 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,17 @@ if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then AC_MSG_ERROR([must use --enable-docs with --enable-refdocs]) fi AC_CHECK_PROG(have_xmlto, xmlto, yes, no) -if test "x${have_xmlto}" == "xyes"; then +if test "$enable_refdocs" == "yes"; then + if test "x${have_xmlto}" != "xyes"; then + AC_MSG_ERROR([cannot find xmlto for building reference documentation]) + fi +fi +if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then + building_refdocs="yes" +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 <?xml version="1.0" encoding="UTF-8"?> @@ -206,17 +216,10 @@ EOF AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) + AC_MSG_WARN([Not building reference documentation in PDF format]) fi fi -if test "$enable_refdocs" == "yes"; then - if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then - AC_MSG_ERROR([cannot find proper xmlto for building reference documentation]) - fi -fi -if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then - building_refdocs="yes" -fi -AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) +AM_CONDITIONAL([BUILD_PDFREFDOCS], [test "have_xmlto_pdf" == "yes"]) dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 276c7169..a191461a 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -18,11 +18,11 @@ noinst_PROGRAMS = docproc SRCTREE=$(abs_top_srcdir)/ DOCPROC=$(abs_builddir)/docproc -if BUILD_REFDOCS +if BUILD_PDFREFDOCS PDFDOCS = tapsets.pdf endif -if BUILD_DOCS +if BUILD_REFDOCS all: $(PDFDOCS) stamp-htmldocs stamp-mandocs tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp') SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new @@ -47,7 +47,7 @@ stamp-mandocs: tapsets.xml #FIXME need to figure out where to install things appropriately #installmandocs: mandocs install-data-hook: -if BUILD_REFDOCS +if BUILD_PDFREFDOCS $(MKDIR_P) $(DOC_INSTALL_DIR) $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) endif |