[gnome-control-center] mouse: Require libXInput

[Bastien Nocera <hadess src gnome org>]

commit eb742ed14d831a2461860eac3e5a67cabf58a0bf
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 12 19:43:32 2010 +0100

    mouse: Require libXInput
    
    As it's pretty much required for a modern desktop system.

 configure.ac                          |    7 +------
 panels/mouse/gnome-mouse-properties.c |    8 ++------
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1474817..01cc687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,12 +120,7 @@ GNOMECC_LIBS="$GNOMECC_LIBS $x_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])
+PKG_CHECK_MODULES(XINPUT, [xi >= 1.2])
 
 CAPPLET_LIBS="$CAPPLET_LIBS $XINPUT_LIBS"
 
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 34bf5f8..30aed0b 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -39,10 +39,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
 
 #define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x)
 
@@ -327,7 +326,6 @@ scrollmethod_changed_event (GConfPropertyEditor *peditor,
 static void
 synaptics_check_capabilities (GtkBuilder *dialog)
 {
-#ifdef HAVE_XINPUT
 	int numdevices, i;
 	XDeviceInfo *devicelist;
 	Atom realtype, prop;
@@ -371,14 +369,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;
@@ -427,7 +423,7 @@ find_synaptics (void)
 
 	XFree (version);
 	XFreeDeviceList (devicelist);
-#endif
+
 	return ret;
 }