From b4f84fab349525aa5a4ea364509a4d9ec9db47f4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 1 Mar 2009 01:26:04 +0100
Subject: configure.ac: make "xmlto" optional

Even when --enable-documentation is passed, don't abort if "xmlto" was
not found.
---
 Makefile.am  | 15 ++++++++++++---
 configure.ac |  7 +++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8dae19bad..6d72b3051 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -569,9 +569,6 @@ endif
 # Documentation
 #
 
-DOCBOOK_FILES = doc/protocol.xml
-DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
-
 man_MANS = doc/mpd.1 doc/mpd.conf.5
 doc_DATA = AUTHORS COPYING NEWS README TODO UPGRADING doc/mpdconf.example
 
@@ -579,12 +576,24 @@ if ENABLE_DOCUMENTATION
 protocoldir = $(docdir)/protocol
 protocol_DATA = $(wildcard doc/protocol/*.html)
 
+if HAVE_XMLTO
+
+DOCBOOK_FILES = doc/protocol.xml
+DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
+
 $(DOCBOOK_HTML): %/index.html: %.xml
 	$(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html $<
 
 doc/api/html/index.html: doc/doxygen.conf
 	$(DOXYGEN) $<
 
+else
+
+DOCBOOK_FILES =
+DOCBOOK_HTML =
+
+endif
+
 all-local: $(DOCBOOK_HTML) doc/api/html/index.html
 
 clean-local:
diff --git a/configure.ac b/configure.ac
index d1d887d44..5f5f70a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,11 +1089,8 @@ AC_ARG_ENABLE(documentation,
 
 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)
+	AM_CONDITIONAL(HAVE_XMLTO, test x$XMLTO != x)
 
 	AC_PATH_PROG(DOXYGEN, doxygen)
 	if test x$DOXYGEN = x; then
@@ -1101,6 +1098,8 @@ if test x$enable_documentation = xyes; then
 	fi
 
 	AC_SUBST(DOXYGEN)
+else
+	AM_CONDITIONAL(HAVE_XMLTO, false)
 fi
 
 AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
-- 
cgit v1.2.3