44 lines
1.7 KiB
Plaintext
44 lines
1.7 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.4 2012/05/17 18:04:00 ajacoutot Exp $
|
|
|
|
From 5fe10c4dc39554916bd5975bb05797b0cb23d6f6 Mon Sep 17 00:00:00 2001
|
|
From: Antoine Jacoutot <ajacoutot@gnome.org>
|
|
Date: Fri, 27 Apr 2012 11:37:36 +0000
|
|
Subject: disable wacom on non Linux platforms.
|
|
|
|
--- configure.ac.orig Mon Apr 16 14:34:35 2012
|
|
+++ configure.ac Fri Apr 27 13:40:54 2012
|
|
@@ -197,10 +197,23 @@ 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 and non Linux platforms)
|
|
dnl ---------------------------------------------------------------------------
|
|
|
|
-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
|
|
+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
|
|
+ ;;
|
|
+esac
|
|
+AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
|
|
|
|
dnl ==============================================
|
|
dnl PackageKit section
|
|
@@ -508,6 +521,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}
|
|
}\
|