From b79776cf8caa2b8db2984177661698da862befa6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jun 2011 10:22:39 +1000 Subject: Require server 1.10 We require ABI 12.2 in the driver, enforce it through pkg-config. Technically ABI 12.2 is first available in 1.9.99.902 but 1.10 looks so much nicer. Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone --- configure.ac | 2 +- src/evdev.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 887021c..3b422d4 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions -PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto) # Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, diff --git a/src/evdev.h b/src/evdev.h index 73df9ac..a18a025 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -39,10 +39,6 @@ #include #include -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) < 1202 -#error "Need X server input ABI version 12.2 or greater" -#endif - #ifndef EV_CNT /* linux 2.6.23 kernels and earlier lack _CNT defines */ #define EV_CNT (EV_MAX+1) #endif -- cgit v1.2.3