diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 15:49:19 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 15:49:19 +0000 |
| commit | f1ba52066cadb90edb192ea93d55ba775bdb73d7 (patch) | |
| tree | 57074935fa7f9c44746d2bd9281d010b323e5c1a /configure.ac | |
| parent | c728addb610cd230d2aa0c1c857888377063a5df (diff) | |
| parent | 1be098611ebeee171991e50571574a6e13388df4 (diff) | |
| download | dbus-f1ba52066cadb90edb192ea93d55ba775bdb73d7.tar.gz | |
Merge branch 'doxygenate' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Conflicts:
configure.ac
doc/Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 815783dc..03914e17 100644 --- a/configure.ac +++ b/configure.ac @@ -1351,6 +1351,10 @@ fi AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes) AC_MSG_RESULT($enable_doxygen_docs) +XSLTPROC=false +AC_CHECK_PROGS([XSLTPROC], [xsltproc]) +AM_CONDITIONAL(DBUS_HAVE_XSLTPROC, test "$XSLTPROC" != false) + ### XML Documentation AC_PATH_PROG(XMLTO, xmlto, no) |