[gnome-settings-daemon] disable wacom support on s390/s390x
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] disable wacom support on s390/s390x
- Date: Thu, 29 Mar 2012 09:25:53 +0000 (UTC)
commit fedb2be311b69c9dd12ada94047c82a28e73df47
Author: Dan HorÃk <dan danny cz>
Date: Wed Mar 21 18:40:06 2012 +0100
disable wacom support on s390/s390x
https://bugzilla.gnome.org/show_bug.cgi?id=672576
configure.ac | 11 +++++++++--
data/Makefile.am | 7 ++++++-
plugins/Makefile.am | 7 ++++++-
3 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d6d1cb8..f73583e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,10 +197,16 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
dnl ---------------------------------------------------------------------------
-dnl - wacom
+dnl - wacom (disabled for s390/s390x)
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+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
+AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
dnl ==============================================
dnl PackageKit section
@@ -508,6 +514,7 @@ echo "
PackageKit support: ${have_packagekit}
Smartcard support: ${have_smartcard_support}
Cups support: ${have_cups}
+ Wacom support: ${have_wacom}
${NSS_DATABASE:+\
System nssdb: ${NSS_DATABASE}
}\
diff --git a/data/Makefile.am b/data/Makefile.am
index 19decc2..5af5170 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,6 @@ gsettings_SCHEMAS = \
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
- org.gnome.settings-daemon.peripherals.wacom.gschema.xml \
org.gnome.settings-daemon.plugins.xrandr.gschema.xml
all_schemas = $(gsettings_SCHEMAS)
@@ -33,6 +32,12 @@ else
all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
endif
+if HAVE_WACOM
+gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
+else
+all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
+endif
+
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2b7566a..a4aa666 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -15,7 +15,6 @@ enabled_plugins = \
media-keys \
mouse \
sound \
- wacom \
xrandr \
xsettings \
$(NULL)
@@ -40,6 +39,12 @@ else
disabled_plugins += orientation
endif
+if HAVE_WACOM
+enabled_plugins += wacom
+else
+disabled_plugins += wacom
+endif
+
if BUILD_PRINT_NOTIFICATIONS
enabled_plugins += print-notifications
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]