diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 64 | 
1 files changed, 47 insertions, 17 deletions
| diff --git a/configure.in b/configure.in index 9665cb03..8a2c7aad 100644 --- a/configure.in +++ b/configure.in @@ -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} | 
