diff options
| author | Keith Packard <keithp@keithp.com> | 2009-10-22 00:00:35 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-22 00:00:35 +0900 |
| commit | 7e92bac5f769aca99bd20e21fe2811f0480b647b (patch) | |
| tree | a9a4ff6ea0fad006e0255fc2947467560f3ec839 | |
| parent | 1228e2d052f0bb98175c55c194340773b5fedb40 (diff) | |
| download | xserver-7e92bac5f769aca99bd20e21fe2811f0480b647b.tar.gz | |
Make sure HAVE_DOXYGEN is defined when not building dmx
The DMX docs are build using doxygen if present, so configure.ac
checks to see if that is available. However, when not building dmx
(the default), this conditional must still be defined to make automake
happy.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bc21d8c5a..e7e081213 100644 --- a/configure.ac +++ b/configure.ac @@ -1816,6 +1816,8 @@ 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 @@ -1855,9 +1857,9 @@ dnl Linux sources in DMX require <linux/keyboard.h> if test "x$DOXYGEN" = "xnot_found" ; then AC_MSG_WARN([doxygen not found in $PATH. Cannot build documentation]) fi - AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"]) AC_SUBST(DOXYGEN) fi +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]) |