summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-14 09:16:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-14 09:24:05 +1000
commit539a4e9e2317d920902840083250c093684ea376 (patch)
tree9d78380243d7ddfb2fa816fe4cd8f543c12f8f70
parent020c04e295629b4db6afe16b26a028ccbd14e801 (diff)
Bump minimum required server version to 1.10
And remove manual ABI check, all 1.10 servers ship with ABI 12. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac4
-rw-r--r--src/xf86Fpit.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 9c3a9a0..ad66332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,8 +57,8 @@ AC_SUBST(inputdir)
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.0] xproto $REQUIRED_MODULES)
+# Obtain compiler/linker options for the fpit driver dependencies
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 6f73038..592a0ec 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -69,10 +69,6 @@
# include <xf86Module.h>
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-#error "Need a server with input ABI 12"
-#endif
-
/*
***************************************************************************
*