Put DMX AC_CONDITIONALS at the top level, since they must always be called.

This commit is contained in:
Daniel Stone 2005-09-12 07:02:46 +00:00
parent b0f6fe1f38
commit 34dc481a16
2 changed files with 12 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2005-09-12 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
Put DMX AC_CONDITIONALS at the top level, since they must always be
called.
2005-09-09 Jürg Billeter <j@bitron.ch>
* configure.ac: use RGB_DB not RGB_PATH as that's what it's looking for

View File

@ -528,15 +528,14 @@ if test "x$DMX" = xyes; then
AC_SUBST([XDMX_LIBS])
dnl USB sources in DMX require <linux/input.h>
AC_CHECK_HEADER([linux/input.h], HAVE_LINUX_INPUT_H="yes",
HAVE_LINUX_INPUT_H="no")
AM_CONDITIONAL([DMX_BUILD_USB],[test "x$HAVE_LINUX_INPUT_H" = xyes])
AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
DMX_BUILD_USB="no")
dnl Linux sources in DMX require <linux/keyboard.h>
AC_CHECK_HEADER([linux/keyboard.h], HAVE_LINUX_KEYBOARD_H="yes",
HAVE_LINUX_KEYBOARD_H="no")
AM_CONDITIONAL([DMX_BUILD_LNX],[test "x$HAVE_LINUX_KEYBOARD_H" = xyes])
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
DMX_BUILD_LNX="no")
fi
AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
dnl Xvfb DDX