frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Keith Packard 2009-10-22 00:00:35 +09:00
parent 1228e2d052
commit 7e92bac5f7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1816,6 +1816,8 @@ fi
AC_MSG_RESULT([$DMX]) AC_MSG_RESULT([$DMX])
AM_CONDITIONAL(DMX, [test "x$DMX" = xyes]) AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
DOXYGEN="not_found"
if test "x$DMX" = xyes; then if test "x$DMX" = xyes; then
if test "x$have_dmx" = xno; then if test "x$have_dmx" = xno; then
AC_MSG_ERROR([Xdmx build explicitly requested, but required 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 if test "x$DOXYGEN" = "xnot_found" ; then
AC_MSG_WARN([doxygen not found in $PATH. Cannot build documentation]) AC_MSG_WARN([doxygen not found in $PATH. Cannot build documentation])
fi fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"])
AC_SUBST(DOXYGEN) AC_SUBST(DOXYGEN)
fi 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_LNX], [test "x$DMX_BUILD_LNX" = xyes])
AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes]) AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])