From 34dc481a16c0c1cbd69a9ec7172331b59b85e9a7 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 12 Sep 2005 07:02:46 +0000 Subject: [PATCH] Put DMX AC_CONDITIONALS at the top level, since they must always be called. --- ChangeLog | 6 ++++++ configure.ac | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 161c42506..8c8332cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-12 Daniel Stone + + * configure.ac: + Put DMX AC_CONDITIONALS at the top level, since they must always be + called. + 2005-09-09 Jürg Billeter * configure.ac: use RGB_DB not RGB_PATH as that's what it's looking for diff --git a/configure.ac b/configure.ac index 91a7261cf..9eb3eb9cc 100644 --- a/configure.ac +++ b/configure.ac @@ -528,15 +528,14 @@ if test "x$DMX" = xyes; then AC_SUBST([XDMX_LIBS]) dnl USB sources in DMX require - 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 - 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