From cd98a72ca6dea49ccf85ed345830e5d2bd8e4ba1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 4 Feb 2009 15:25:57 +0100 Subject: [PATCH] configure.ac: make DocBook processing optional Disable the HTML documentation generator by default. Most users will pick it from the web site. --- configure.ac | 19 ++++++++++++------- doc/Makefile.am | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 6f6711792..187d2bd59 100644 --- a/configure.ac +++ b/configure.ac @@ -1006,16 +1006,21 @@ dnl dnl Documentation dnl -AC_MSG_CHECKING([for xmlto (DocBook processing)]) -AC_PATH_PROG(XMLTO, xmlto) -if test x$XMLTO != x; then +AC_ARG_ENABLE(documentation, + AS_HELP_STRING([--enable-documentation], + [build documentation (default: disable)]),, + [enable_documentation=no]) + +if test x$enable_documentation = xyes; then + AC_PATH_PROG(XMLTO, xmlto) + if test x$XMLTO = x; then + AC_MSG_ERROR([xmlto not found]) + fi + AC_SUBST(XMLTO) - AC_MSG_RESULT($XMLTO) -else - AC_MSG_RESULT(no) fi -AM_CONDITIONAL(HAVE_XMLTO, test x$XMLTO != x) +AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) dnl diff --git a/doc/Makefile.am b/doc/Makefile.am index f59b2fe81..e88957483 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,7 +5,7 @@ man_MANS = mpd.1 mpd.conf.5 doc_DATA = mpdconf.example EXTRA_DIST = $(man_MANS) $(DOCBOOK_FILES) mpdconf.example -if HAVE_XMLTO +if ENABLE_DOCUMENTATION protocoldir = $(docdir)/protocol protocol_DATA = $(wildcard protocol/*.html)