[gnome-control-center] disable wacom on s390/s390x and non Linux platforms



commit 0b782b5633249a1f8c15a24399a833ac2e41c6d5
Author: Antoine Jacoutot <ajacoutot gnome org>
Date:   Thu May 24 09:50:52 2012 +0200

    disable wacom on s390/s390x and non Linux platforms
    
    Follow gnome-settings-daemon behavior and disable the wacom panel on
    s390/s390x (because this architecture does not provide development files
    from the wacom xorg driver) and on non Linux platforms (where udev is
    missing).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=676714

 configure.ac       |   28 ++++++++++++++++++++++++----
 panels/Makefile.am |    7 +++++--
 2 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 35ee904..309e6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,10 +130,6 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
                   pwquality
                   $SYSTEMD)
-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 
 GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
 AC_SUBST(GDESKTOP_PREFIX)
@@ -203,6 +199,25 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# wacom is disabled for s390/s390x and non Linux platforms (needs udev)
+case $host_os in
+  linux*)
+    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+      have_wacom=no
+    else
+      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+      have_wacom=yes
+    fi
+    ;;
+  *)
+    have_wacom=no
+    ;;
+esac
+AM_CONDITIONAL(BUILD_WACOM, [test x"$have_wacom" = x"yes"])
+
 # This is a hard-dependency for the region and user-accounts panels
 PKG_CHECK_MODULES(ISOCODES, iso-codes)
 
@@ -451,4 +466,9 @@ if test "x$with_systemd" = "xyes"; then
 else
 	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
 fi
+if test "x$have_wacom" = "xyes"; then
+	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+else
+	AC_MSG_NOTICE([   Wacom panel disabled])
+fi
 AC_MSG_NOTICE([End options])
diff --git a/panels/Makefile.am b/panels/Makefile.am
index 172dd06..01697fb 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -13,8 +13,11 @@ SUBDIRS= \
 	keyboard \
 	universal-access \
 	user-accounts \
-	datetime \
-	wacom
+	datetime
+
+if BUILD_WACOM
+SUBDIRS += wacom
+endif
 
 if BUILD_PRINTERS
 SUBDIRS += printers



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]