From ba9377c6d9e6d0d2813e471b516bb36902dae2ce Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 24 Dec 2011 12:19:40 +1000 Subject: Remove need for --enable-multitouch If we spot inputproto 2.1.99.3, we assume we have a capable X server. This should really be a server version check, but the server version hasn't been bumped yet. Signed-off-by: Peter Hutterer --- src/evdev.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/evdev.h') diff --git a/src/evdev.h b/src/evdev.h index acd4289..609365f 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -43,6 +43,17 @@ #include #include +/* 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 #endif -- cgit v1.2.3