gnome-settings-daemon r120 - trunk

[sbacher svn gnome org]

Author: sbacher
Date: Fri Feb  8 17:48:20 2008
New Revision: 120
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=120&view=rev

Log:
2008-02-08  Sebastien Bacher  <seb128 ubuntu com>

	* configure.ac: check for xinput (bug #514942)



Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb  8 17:48:20 2008
@@ -145,7 +145,22 @@
 
 AC_PATH_XTRA
 
-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+dnl
+dnl Check for XInput
+dnl
+
+have_xinput=no
+AC_CHECK_LIB(Xi, XListInputDevices,
+  [AC_CHECK_HEADER(X11/extensions/XInput.h,
+     have_xinput=yes
+     XINPUT_LIBS="-lXi"
+     AC_DEFINE(HAVE_XINPUT, 1, [Define if XInput extension is available]),
+	  :, [#include <X11/Xlib.h>])], : ,
+       -lXi $x_libs)
+AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes])
+
+
+ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $XINPUT_LIBS"
 
 dnl ---------------------------------------------------------------------------
 dnl - XFT2