Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
b4f84fab
Commit
b4f84fab
authored
Mar 01, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure.ac: make "xmlto" optional
Even when --enable-documentation is passed, don't abort if "xmlto" was not found.
parent
c4626143
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
Makefile.am
Makefile.am
+12
-3
configure.ac
configure.ac
+3
-4
No files found.
Makefile.am
View file @
b4f84fab
...
...
@@ -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
:
...
...
configure.ac
View file @
b4f84fab
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment