diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2011-02-22 15:35:26 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2011-02-22 15:54:37 +0100 |
| commit | 69896eea1e93d5f777e3e522b212d92957574158 (patch) | |
| tree | d3f69232cd06e675c74dbbe53638e3da4db7e4f7 | |
| parent | 0b9380675caf5c80ec02e46cfc09496210f8ee12 (diff) | |
Simplify XInput package test
The XI2.1 support is present in sufficiently recent xinput packages,
so simplify the testing accordingly.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5809dd2..f53c0c7 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -29,9 +29,7 @@ AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support])) | |||
| 29 | AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"]) | 29 | AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"]) |
| 30 | 30 | ||
| 31 | AS_IF([test "x$with_xi" = "xyes"], [ | 31 | AS_IF([test "x$with_xi" = "xyes"], [ |
| 32 | PKG_CHECK_MODULES([X11], [x11]) | 32 | PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.4.1.99.1] [inputproto >= 2.0.99.1]) |
| 33 | PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5]) | ||
| 34 | PKG_CHECK_MODULES(XI2_1, [xi >= 1.4.99.1] [inputproto >= 2.0.99.1]) | ||
| 35 | ]) | 33 | ]) |
| 36 | 34 | ||
| 37 | AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x]) | 35 | AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x]) |