Commit 78b69c68 authored by Havoc Pennington's avatar Havoc Pennington

2003-09-29 Havoc Pennington <hp@pobox.com>

	* configure.in: split checks for Doxygen from XML docs, check for
	xmlto

	* doc/Makefile.am: XML-ify all the docs, and add a blank
	dbus-tutorial.xml
parent 9a4bd6bf
2003-09-29 Havoc Pennington <hp@pobox.com>
* configure.in: split checks for Doxygen from XML docs, check for
xmlto
* doc/Makefile.am: XML-ify all the docs, and add a blank
dbus-tutorial.xml
2003-09-29 Havoc Pennington <hp@pobox.com>
* Merge dbus-object-names branch. To see the entire patch
......
......@@ -30,7 +30,8 @@ AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic
AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(asserts, [ --enable-asserts include assertion checks],enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(checks, [ --enable-checks include sanity checks on public API],enable_checks=$enableval,enable_checks=yes)
AC_ARG_ENABLE(docs, [ --enable-docs build documentation (requires Doxygen and jade)],enable_docs=$enableval,enable_docs=auto)
AC_ARG_ENABLE(xml-docs, [ --enable-xml-docs build XML documentation (requires xmlto)],enable_xml_docs=$enableval,enable_xml_docs=auto)
AC_ARG_ENABLE(doxygen-docs, [ --enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)],enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
AC_ARG_ENABLE(gcov, [ --enable-gcov compile with coverage profiling instrumentation (gcc only)],enable_gcov=$enableval,enable_gcov=no)
AC_ARG_ENABLE(abstract-sockets, [ --enable-abstract-sockets use abstract socket namespace (linux only)],enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
AC_ARG_ENABLE(gcj, [ --enable-gcj build gcj bindings],enable_gcj=$enableval,enable_gcj=no)
......@@ -685,34 +686,62 @@ fi
AC_SUBST(DBUS_X_CFLAGS)
AC_SUBST(DBUS_X_LIBS)
### Documentation
### Doxygen Documentation
AC_PATH_PROG(DOXYGEN, doxygen, no)
AC_PATH_PROG(DB2HTML, db2html, no)
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_CHECKING([whether to build Doxygen documentation])
if test x$DOXYGEN = xno -o x$DB2HTML = xno ; then
have_docs_tools=no
if test x$DOXYGEN = xno ; then
have_doxygen=no
else
have_docs_tools=yes
have_doxygen=yes
fi
if test x$enable_docs = xauto ; then
if test x$have_docs_tools = xno ; then
enable_docs=no
if test x$enable_doxygen_docs = xauto ; then
if test x$have_doxygen = xno ; then
enable_doxygen_docs=no
else
enable_docs=yes
enable_doxygen_docs=yes
fi
fi
if test x$enable_docs = xyes; then
if test x$have_docs_tools = xno; then
AC_MSG_ERROR([Building docs explicitly required, but Doxygen or db2html not found])
if test x$enable_doxygen_docs = xyes; then
if test x$have_doxygen = xno; then
AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
fi
fi
AM_CONDITIONAL(DBUS_DOCS_ENABLED, test x$enable_docs = xyes)
AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
AC_MSG_RESULT(yes)
### XML Documentation
AC_PATH_PROG(XMLTO, xmlto, no)
AC_MSG_CHECKING([whether to build XML documentation])
if test x$XMLTO = xno ; then
have_xmlto=no
else
have_xmlto=yes
fi
if test x$enable_xml_docs = xauto ; then
if test x$have_xmlto = xno ; then
enable_xml_docs=no
else
enable_xml_docs=yes
fi
fi
if test x$enable_xml_docs = xyes; then
if test x$have_xmlto = xno; then
AC_MSG_ERROR([Building XML docs explicitly required, but xmlto not found])
fi
fi
AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes)
AC_MSG_RESULT(yes)
#### Have to go $localstatedir->$prefix/var->/usr/local/var
......@@ -941,7 +970,7 @@ echo "
cxxflags: ${CXXFLAGS}
64-bit int: ${DBUS_INT64_TYPE}
Doxygen: ${DOXYGEN}
db2html: ${DB2HTML}"
xmlto: ${XMLTO}"
if test x$enable_gcj = xyes ; then
echo \
......@@ -975,7 +1004,8 @@ echo "
Building Python bindings: ${have_python}
Building GTK+ tools: ${have_gtk}
Building X11 code: ${enable_x11}
Building documentation: ${enable_docs}
Building Doxygen docs: ${enable_doxygen_docs}
Building XML docs: ${enable_xml_docs}
Using XML parser: ${with_xml}
Init scripts style: ${with_init_scripts}
Abstract socket names: ${have_abstract_sockets}
......
EXTRA_DIST= \
dbus-specification.html \
dbus-specification.sgml \
dbus-specification.xml \
dbus-test-plan.html \
dbus-test-plan.sgml \
dbus-test-plan.xml \
dbus-tutorial.html \
dbus-tutorial.xml \
dcop-howto.txt \
file-boilerplate.c
if DBUS_DOCS_ENABLED
all-local: dbus-specification.html dbus-test-plan.html
HTML_FILES= \
dbus-specification.html \
dbus-test-plan.html \
dbus-tutorial.html
if DBUS_XML_DOCS_ENABLED
all-local: $(HTML_FILES)
endif
## Debian db2html outputs to stdout, so we collect stdout and use
## it if we didn't get the proper output
dbus-specification.html: dbus-specification.xml
$(XMLTO) html-nochunks $<
dbus-specification.html: dbus-specification.sgml
rm -f $@ && \
$(DB2HTML) -o . --nochunks $< > $@.stdout && \
(test -e $@ && rm -f $@.stdout || mv $@.stdout $@) && \
rm -rf $(srcdir)/dbus-specification/stylesheet-images && \
(if test -d $(srcdir)/dbus-specification ; then \
rmdir $(srcdir)/dbus-specification ; fi)
dbus-test-plan.html: dbus-test-plan.xml
$(XMLTO) html-nochunks $<
dbus-test-plan.html: dbus-test-plan.sgml
rm -f $@ && \
$(DB2HTML) -o . --nochunks $< > $@.stdout && \
(test -e $@ && rm -f $@.stdout || mv $@.stdout $@) && \
rm -rf $(srcdir)/dbus-test-plan/stylesheet-images && \
(if test -d $(srcdir)/dbus-test-plan ; then \
rmdir $(srcdir)/dbus-test-plan ; fi)
dbus-tutorial.html: dbus-tutorial.xml
$(XMLTO) html-nochunks $<
maintainer-clean-local:
rm -f dbus-test-plan.html
rm -rf dbus-test-plan/stylesheet-images
test -d dbus-test-plan && rmdir dbus-test-plan
rm -f dbus-specification.html
rm -rf dbus-specification/stylesheet-images
test -d dbus-specification && rmdir dbus-specification
rm -f $(HTML_FILES)
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<?xml version="1.0" standalone="no"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
[
]>
<article id="index">
<artheader>
<articleinfo>
<title>D-BUS Test Plan</title>
<date>14 February 2003</date>
<authorgroup>
......@@ -14,7 +18,7 @@
</affiliation>
</author>
</authorgroup>
</artheader>
</articleinfo>
<sect1 id="introduction">
<title>Introduction</title>
<para>
......
<?xml version="1.0" standalone="no"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
[
]>
<article id="index">
<articleinfo>
<title>D-BUS Tutorial</title>
<releaseinfo>Version 0.1</releaseinfo>
<date>29 September 2003</date>
<authorgroup>
<author>
<firstname>Havoc</firstname>
<surname>Pennington</surname>
<affiliation>
<orgname>Red Hat, Inc.</orgname>
<address>
<email>hp@pobox.com</email>
</address>
</affiliation>
</author>
</authorgroup>
</articleinfo>
<sect1 id="introduction">
<title>Introduction</title>
<para>
D-BUS blah blah blah
<itemizedlist>
<listitem>
<para>
foo
</para>
</listitem>
<listitem>
<para>
bar
</para>
</listitem>
</itemizedlist>
</para>
<para>
blah blah blah
</para>
<para>
blah blah blah
</para>
</sect1>
</article>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment