aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-10-25 00:14:25 +0200
committerMax Kellermann <max@duempel.org>2014-10-25 00:14:25 +0200
commit2e24adae896447a6b2bfca9994108dc5de85bfd3 (patch)
tree65a8e396232c4a6213d3bcf784587ba2746834ad
parent188b94cb3e2d6257ad5545160563a7c94a0bc291 (diff)
downloadmpd-2e24adae896447a6b2bfca9994108dc5de85bfd3.tar.gz
mpd-2e24adae896447a6b2bfca9994108dc5de85bfd3.tar.xz
mpd-2e24adae896447a6b2bfca9994108dc5de85bfd3.zip
configure.ac: require xmlto for --enable-documentation
Diffstat (limited to '')
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac7
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)