[gnome-settings-daemon/gnome-3-4] disable wacom on non Linux platforms.
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/gnome-3-4] disable wacom on non Linux platforms.
- Date: Thu, 17 May 2012 17:34:17 +0000 (UTC)
commit 039875c74e384264d0f060cf4838e80ad027df88
Author: Antoine Jacoutot <ajacoutot gnome org>
Date: Fri Apr 27 13:37:36 2012 +0200
disable wacom on non Linux platforms.
wacom requires udev which is only available on Linux.
https://bugzilla.gnome.org/show_bug.cgi?id=674935
configure.ac | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f249396..61453b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,15 +197,22 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
dnl ---------------------------------------------------------------------------
-dnl - wacom (disabled for s390/s390x)
+dnl - wacom (disabled for s390/s390x and non Linux platforms)
dnl ---------------------------------------------------------------------------
-if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+case $host_os in
+ linux*)
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+ have_wacom=no
+ else
+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+ have_wacom=yes
+ fi
+ ;;
+ *)
have_wacom=no
-else
- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
- have_wacom=yes
-fi
+ ;;
+esac
AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
dnl ==============================================
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]