summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-10-26 15:51:15 +0300
committermonsta <[email protected]>2016-10-26 15:51:15 +0300
commitaa8b1bbe1becaec01ece9db08d33545707bb18b3 (patch)
tree564236210c036bd0bb43e93ebfc1444e6c23c66f /configure.ac
parentc45edfab1fd9ef8af7d78d531aeaeb1c654cc272 (diff)
downloadmate-settings-daemon-aa8b1bbe1becaec01ece9db08d33545707bb18b3.tar.bz2
mate-settings-daemon-aa8b1bbe1becaec01ece9db08d33545707bb18b3.tar.xz
build: require XInput unconditionally
as done in g-s-d six years ago: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5b2a28376a3aa81d865679e8c91d2f6beb8af799
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index b033fc1..5747f7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,18 +227,7 @@ dnl ---------------------------------------------------------------------------
dnl - XInput
dnl ---------------------------------------------------------------------------
-have_xinput=no
-AC_CHECK_X_LIB(Xi, XListInputDevices,
- [AC_CHECK_X_HEADERS(X11/extensions/XInput.h,
- [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)
+PKG_CHECK_MODULES(XINPUT, xi)
dnl ---------------------------------------------------------------------------
dnl - Fontconfig