diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-09-12 07:02:46 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-09-12 07:02:46 +0000 |
| commit | 34dc481a16c0c1cbd69a9ec7172331b59b85e9a7 (patch) | |
| tree | a3d2f71cc8c4432b95cda441da96a0e7a8560a87 /configure.ac | |
| parent | b0f6fe1f38b448b5f1a280e86b01353865866c70 (diff) | |
Put DMX AC_CONDITIONALS at the top level, since they must always be called.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
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 <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 |