XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-14 11:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require xserver 1.12 RC1

Browse Source 
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>
This commit is contained in:
Peter Hutterer
2011-12-29 10:37:38 +10:00
parent 0c7c087f77
commit 6dd6f2d3c6
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -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

11
src/evdev.h
View File

@@ -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