diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2009-10-25 15:01:20 +0100 |
|---|---|---|
| committer | Jens Granseuer <jensgr@gmx.net> | 2009-10-25 15:01:20 +0100 |
| commit | 5fdf07cfdf10be0e0e5c71084bf6adfcf074ae8b (patch) | |
| tree | 1a17c865dbd41c8e8addd7f0f3892ae961ede62b | |
| parent | 3d5189d3984980ec97d794f7bde6159bc97e1379 (diff) | |
| download | gnome-settings-daemon-5fdf07cfdf10be0e0e5c71084bf6adfcf074ae8b.tar.gz | |
Tighten check for XInput
Check for XDevicePresenceNotifyEvent to make sure the version
of XInput available is recent enough (bug #585315).
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 28b9562c..df1e5cce 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) |