oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: require xmlto for --enable-documentation

Browse Source
This commit is contained in:
Max Kellermann 2014-10-25 00:14:25 +02:00
parent 188b94cb3e
commit 2e24adae89
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -2141,19 +2141,11 @@ user_DATA = $(wildcard doc/user/*.html)
developerdir = $(docdir)/developer developerdir = $(docdir)/developer
developer_DATA = $(wildcard doc/developer/*.html) developer_DATA = $(wildcard doc/developer/*.html)
if HAVE_XMLTO
DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES)) DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
$(DOCBOOK_HTML): %/index.html: %.xml $(DOCBOOK_HTML): %/index.html: %.xml
$(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html --stringparam use.id.as.filename=1 $< $(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 doc/api/html/index.html: doc/doxygen.conf
@$(MKDIR_P) $(@D) @$(MKDIR_P) $(@D)
$(DOXYGEN) $< $(DOXYGEN) $<

7
configure.ac
View File

@ -1733,8 +1733,11 @@ dnl Documentation
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test x$enable_documentation = xyes; then if test x$enable_documentation = xyes; then
AC_PATH_PROG(XMLTO, xmlto) AC_PATH_PROG(XMLTO, xmlto)
if test x$XMLTO = x; then
AC_MSG_ERROR([xmlto not found])
fi
AC_SUBST(XMLTO) AC_SUBST(XMLTO)
AM_CONDITIONAL(HAVE_XMLTO, test x$XMLTO != x)
AC_PATH_PROG(DOXYGEN, doxygen) AC_PATH_PROG(DOXYGEN, doxygen)
if test x$DOXYGEN = x; then if test x$DOXYGEN = x; then
@ -1742,8 +1745,6 @@ if test x$enable_documentation = xyes; then
fi fi
AC_SUBST(DOXYGEN) AC_SUBST(DOXYGEN)
else
AM_CONDITIONAL(HAVE_XMLTO, false)
fi fi
AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)