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

configure.ac: make "xmlto" optional

Browse Source 
Even when --enable-documentation is passed, don't abort if "xmlto" was
not found.
This commit is contained in:
Max Kellermann
2009-03-01 01:26:04 +01:00
parent c4626143c9
commit b4f84fab34
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@@ -569,9 +569,6 @@ endif
# Documentation # Documentation
# #
DOCBOOK_FILES = doc/protocol.xml
DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
man_MANS = doc/mpd.1 doc/mpd.conf.5 man_MANS = doc/mpd.1 doc/mpd.conf.5
doc_DATA = AUTHORS COPYING NEWS README TODO UPGRADING doc/mpdconf.example doc_DATA = AUTHORS COPYING NEWS README TODO UPGRADING doc/mpdconf.example
@@ -579,12 +576,24 @@ if ENABLE_DOCUMENTATION
protocoldir = $(docdir)/protocol protocoldir = $(docdir)/protocol
protocol_DATA = $(wildcard doc/protocol/*.html) 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 $(DOCBOOK_HTML): %/index.html: %.xml
$(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html $< $(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html $<
doc/api/html/index.html: doc/doxygen.conf doc/api/html/index.html: doc/doxygen.conf
$(DOXYGEN) $< $(DOXYGEN) $<
else
DOCBOOK_FILES =
DOCBOOK_HTML =
endif
all-local: $(DOCBOOK_HTML) doc/api/html/index.html all-local: $(DOCBOOK_HTML) doc/api/html/index.html
clean-local: clean-local:

7
configure.ac
View File

@@ -1089,11 +1089,8 @@ AC_ARG_ENABLE(documentation,
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
@@ -1101,6 +1098,8 @@ 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)