From 7ab2ca013c976a12830ae525df1c7cb66222c0ea Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Tue, 1 Nov 2016 21:12:07 +0300
Subject: build: require XInput unconditionally - same as done in m-s-d

---
 capplets/mouse/mate-mouse-properties.c |  8 ++------
 configure.ac                           | 17 +++++------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index 0a6fb88d..fb4bb74b 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -38,10 +38,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#ifdef HAVE_XINPUT
+
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput.h>
-#endif
 
 #ifdef HAVE_XCURSOR
 #include <X11/Xcursor/Xcursor.h>
@@ -204,7 +203,6 @@ orientation_radio_button_toggled (GtkToggleButton *togglebutton,
 static void
 synaptics_check_capabilities (GtkBuilder *dialog)
 {
-#ifdef HAVE_XINPUT
 	int numdevices, i;
 	XDeviceInfo *devicelist;
 	Atom realtype, prop;
@@ -250,14 +248,12 @@ synaptics_check_capabilities (GtkBuilder *dialog)
 		XCloseDevice (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device);
 	}
 	XFreeDeviceList (devicelist);
-#endif
 }
 
 static gboolean
 find_synaptics (void)
 {
 	gboolean ret = FALSE;
-#ifdef HAVE_XINPUT
 	int numdevices, i;
 	XDeviceInfo *devicelist;
 	Atom realtype, prop;
@@ -311,7 +307,7 @@ find_synaptics (void)
 
 	XFree (version);
 	XFreeDeviceList (devicelist);
-#endif
+
 	return ret;
 }
 
diff --git a/configure.ac b/configure.ac
index 4b2df496..61a38245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,17 +240,11 @@ fi
 
 CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
 
-dnl =============================================
-dnl X Input library >= 1.2 with property support
-dnl =============================================
-have_xinput=no
-PKG_CHECK_MODULES(XINPUT, [xi >= 1.2],
-	have_xinput=yes
-	AC_DEFINE(HAVE_XINPUT, 1, [Define if the XInput extension is available]),
-	have_xinput=no)
-AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput=yes])
-AC_SUBST(XINPUT_CFLAGS)
-AC_SUBST(XINPUT_LIBS)
+dnl ======================
+dnl X Input library >= 1.5
+dnl ======================
+
+PKG_CHECK_MODULES(XINPUT, xi >= 1.5)
 
 CAPPLET_LIBS="$CAPPLET_LIBS $XINPUT_LIBS"
 
@@ -374,5 +368,4 @@ echo "
         Appindicator:          ${enable_appindicator}
         Libmate-slab:          ${have_libmateslab}
         XCursor support:       ${have_xcursor}
-        XInput support:        ${have_xinput}
 "
-- 
cgit v1.2.1