aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-12-29 10:37:38 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-12-29 10:37:38 +1000
commit6dd6f2d3c6b2fee5f78b01618643c7f3ed0819c3 (patch)
tree2789da67154f82b54723700154c97e6c70622035
parentTest for mtdev before assuming multitouch (diff)
downloadxf86-input-evdev-6dd6f2d3c6b2fee5f78b01618643c7f3ed0819c3.tar.gz
xf86-input-evdev-6dd6f2d3c6b2fee5f78b01618643c7f3ed0819c3.tar.bz2
xf86-input-evdev-6dd6f2d3c6b2fee5f78b01618643c7f3ed0819c3.zip
Require xserver 1.12 RC1
Remove the ABI check hack, just check for the server version directly now that we have one that definitely has the multitouch APIs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac2
-rw-r--r--src/evdev.h11
2 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 451a730..10ec8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ XORG_DEFAULT_OPTIONS
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
PKG_CHECK_MODULES(UDEV, udev)
-PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3], HAVE_XI22="yes", HAVE_XI22="no")
+PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no")
if test "x$HAVE_XI22" = xyes; then
# Obtain compiler/linker options for mtdev
diff --git a/src/evdev.h b/src/evdev.h
index 609365f..acd4289 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -43,17 +43,6 @@
#include <xf86_OSproc.h>
#include <xkbstr.h>
-/* FIXME: once the server version is bumped, we can remove this with a
- * proper pkg-config check. Right now we need an inputproto check for
- * the right protocol, the pkgconfig check for the mtdev pkgconfig, and an
- * ABI check to undo the first two if the proto was updated but the server
- * wasn't yet */
-#ifdef MULTITOUCH
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 16
-#undef MULTITOUCH
-#endif
-#endif
-
#ifdef MULTITOUCH
#include <mtdev.h>
#endif