[gtk+/touch-for-3.4-2: 2/44] configure: Detect XInput 2.2
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/touch-for-3.4-2: 2/44] configure: Detect XInput 2.2
- Date: Thu, 1 Mar 2012 20:26:21 +0000 (UTC)
commit 884a52fa7f292f021b93fd9ba1440b96e4e6189e
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Feb 28 20:43:03 2011 +0100
configure: Detect XInput 2.2
configure.ac | 6 +++++-
gdk/x11/Makefile.am | 2 ++
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a74cb82..25a8428 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,7 +935,7 @@ if test "x$enable_x11_backend" = xyes; then
have_base_x_pc=true
X_PACKAGES="$X_PACKAGES x11 xext"
x_libs="`$PKG_CONFIG --libs x11 xext`"
- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext` -DXINPUT2_1_USE_UNSTABLE_PROTOCOL -DXINPUT2_2_USE_UNSTABLE_PROTOCOL"
# Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files)
@@ -1126,6 +1126,10 @@ if test "x$enable_x11_backend" = xyes; then
AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
X_EXTENSIONS="$X_EXTENSIONS XInput")
+ gtk_save_LIBS="$LIBS"
+ LIBS="$LIBS -lXi"
+ AC_CHECK_FUNC(XIAllowTouchEvents, AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]))
+ LIBS="$gtk_save_LIBS"
else
AC_DEFINE(XINPUT_NONE, 1,
[Define to 1 if no XInput should be used])
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 3b0d1bd..d8abfd5 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -7,6 +7,8 @@ libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
+ -DXINPUT2_2_USE_UNSTABLE_PROTOCOL \
+ -DXINPUT2_1_USE_UNSTABLE_PROTOCOL \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]