diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-21 14:21:07 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-01-24 12:52:20 -0800 |
| commit | 2984c18eb994696927a7f3b94d86fd47907334a0 (patch) | |
| tree | 5ab788c93fb06b05cd8cba483b49f23d2bdfa1fa | |
| parent | d9c20ee4191de7276a08288adffc24dff48aff8f (diff) | |
config: replace custom code with reusable macro XORG_WITH_DOXYGEN
XORG_WITH_DOXYGEN provides additional functions like a configure
option which allow platform builders to control the usage of
the doxygen program.
This is a requirement from platforms that do not have such doc tool.
A platform with a back level doxygen may use --without-doxygen
to get the rest of the documentation built.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | hw/dmx/doc/Makefile.am | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 8c1085b29..1f5c343b9 100644 --- a/configure.ac +++ b/configure.ac @@ -34,9 +34,10 @@ AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.5) XORG_DEFAULT_OPTIONS +XORG_WITH_DOXYGEN m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])]) XORG_FONT_MACROS_VERSION(1.1) @@ -1943,8 +1944,6 @@ fi AC_MSG_RESULT([$DMX]) AM_CONDITIONAL(DMX, [test "x$DMX" = xyes]) -DOXYGEN="not_found" - if test "x$DMX" = xyes; then if test "x$have_dmx" = xno; then AC_MSG_ERROR([Xdmx build explicitly requested, but required @@ -1980,12 +1979,6 @@ dnl Linux sources in DMX require <linux/keyboard.h> AC_SUBST(X11EXAMPLES_DEP_LIBS) fi -AC_PATH_PROG(DOXYGEN,doxygen,[not_found]) -if test "x$DOXYGEN" = "xnot_found" ; then - AC_MSG_WARN([doxygen not found in $PATH. Cannot build dmx documentation]) -fi -AC_SUBST(DOXYGEN) -AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"]) AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes]) AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes]) diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am index 0fb6e8949..c6fc1c9d3 100644 --- a/hw/dmx/doc/Makefile.am +++ b/hw/dmx/doc/Makefile.am @@ -62,7 +62,7 @@ dist-local: html/annotated.html html/annotated.html: $(DOXYGEN_SRC) $(DOXYGEN) $(srcdir)/doxygen.conf -clean-local: +maintainer-clean-local: rm -rf html/ endif |