1.0.5-docs.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- doc/Makefile.am
  2. +++ doc/Makefile.am
  3. @@ -29,11 +29,10 @@
  4. if BUILD_DOC
  5. man_MANS += hb_report.8 ha_logd.8 ha_logger.1 stonith.8 meatclient.8
  6. -endif
  7. EXTRA_DIST = $(man_MANS)
  8. -STYLESHEET_PREFIX ?= http://docbook.sourceforge.net/release/xsl/current
  9. +STYLESHEET_PREFIX ?= /usr/share/sgml/docbook/xsl-stylesheets/
  10. MANPAGES_STYLESHEET ?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
  11. HTML_STYLESHEET ?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
  12. FO_STYLESHEET ?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
  13. @@ -47,3 +46,4 @@
  14. $(XSLTPROC) \
  15. $(XSLTPROC_MANPAGES_OPTIONS) \
  16. $(MANPAGES_STYLESHEET) $<
  17. +endif
  18. --- configure.ac
  19. +++ configure.ac
  20. @@ -492,11 +492,13 @@
  21. AC_PATH_PROGS(PKGCONFIG, pkg-config)
  22. AC_PATH_PROGS(XML2CONFIG, xml2-config)
  23. -AC_PATH_PROGS(XSLTPROC, xsltproc)
  24. -AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
  25. -if test "x$XSLTPROC" = "x"; then
  26. - AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
  27. +AC_ARG_ENABLE([doc],
  28. + [ --enable-doc build documentation, [default=no]],
  29. + [enable_doc=$withval], [enable_doc=no])
  30. +if test "x$enable_doc" != "xno"; then
  31. + AC_PATH_PROGS(XSLTPROC, xsltproc)
  32. fi
  33. +AM_CONDITIONAL(BUILD_DOC, test "x$enable_doc" != "xno" )
  34. AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
  35. AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)