[gnome-settings-daemon] Tighten check for XInput
- From: Jens Granseuer <jensg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] Tighten check for XInput
- Date: Sun, 25 Oct 2009 14:03:50 +0000 (UTC)
commit 5fdf07cfdf10be0e0e5c71084bf6adfcf074ae8b
Author: Jens Granseuer <jensgr gmx net>
Date: Sun Oct 25 15:01:20 2009 +0100
Tighten check for XInput
Check for XDevicePresenceNotifyEvent to make sure the version
of XInput available is recent enough (bug #585315).
configure.ac | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 28b9562..df1e5cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,10 +174,13 @@ dnl ---------------------------------------------------------------------------
have_xinput=no
AC_CHECK_X_LIB(Xi, XListInputDevices,
[AC_CHECK_X_HEADERS(X11/extensions/XInput.h,
- have_xinput=yes
- XINPUT_LIBS="-lXi",
- :, [#include <X11/Xlib.h>])], : ,
- -lXi $x_libs)
+ [AC_CHECK_TYPES([XDevicePresenceNotifyEvent], [
+ have_xinput=yes
+ XINPUT_LIBS="-lXi"],
+ [], [#include <X11/extensions/XInput.h>])],
+ [], [[#include <X11/Xlib.h>>]])],
+ [], [-lXi $x_libs])
+
AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes])
AC_SUBST(XINPUT_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]