summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 15:30:51 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 15:31:02 +1000
commit291af0e17ed7a5bedf20265773250ddab398c3c2 (patch)
tree0bc6e811e5c8dc007cb77731e77540376168df76
parent189d9bdce7c3a297c52f788afd16e0f5dcfb24a5 (diff)
Require server 1.10 (through pkgconfig, not ABI checks)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac2
-rw-r--r--src/xf86HyperPen.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 31f2c24..8577757 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index deb84d3..5c7beaf 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -61,10 +61,6 @@
#include <mipointer.h>
#include <xf86Module.h>
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-#error "This driver requires server with ABI 12."
-#endif
-
/*
* Be sure to set vmin appropriately for your device's protocol. You want to
* read a full packet before returning