From 2e24adae896447a6b2bfca9994108dc5de85bfd3 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 25 Oct 2014 00:14:25 +0200
Subject: configure.ac: require xmlto for --enable-documentation

---
 Makefile.am  | 8 --------
 configure.ac | 7 ++++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2f3ab906e..c105b9945 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2141,19 +2141,11 @@ user_DATA = $(wildcard doc/user/*.html)
 developerdir = $(docdir)/developer
 developer_DATA = $(wildcard doc/developer/*.html)
 
-if HAVE_XMLTO
-
 DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
 
 $(DOCBOOK_HTML): %/index.html: %.xml
 	$(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html --stringparam use.id.as.filename=1 $<
 
-else
-
-DOCBOOK_HTML =
-
-endif
-
 doc/api/html/index.html: doc/doxygen.conf
 	@$(MKDIR_P) $(@D)
 	$(DOXYGEN) $<
diff --git a/configure.ac b/configure.ac
index 107a5afa2..168a01fb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1733,8 +1733,11 @@ dnl Documentation
 dnl ---------------------------------------------------------------------------
 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
@@ -1742,8 +1745,6 @@ 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