applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Make panel required on Linux

Browse source 
But do it earlier than the end of configure messages.
This commit is contained in:
Bastien Nocera 2017-02-08 20:01:48 +01:00
parent 0c2247eafa
commit 0090ba57e4
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
configure.ac
View file

@ -327,27 +327,21 @@ else
fi fi
AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
# wacom is disabled for s390/s390x and non Linux platforms (needs udev) # Wacom
case $host_os in PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
linux*) gnome-settings-daemon >= $GSD_REQUIRED_VERSION
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
have_wacom=no gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
else clutter-gtk-1.0
PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
gnome-settings-daemon >= $GSD_REQUIRED_VERSION [have_wacom=yes], [have_wacom=no])
xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION if test "x$have_wacom" = xyes ; then
clutter-gtk-1.0 AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
have_wacom=yes else
AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) linux_usb_error_or_warn "*** Wacom panel will not be built"
AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) fi
fi
;;
*)
have_wacom=no
;;
esac
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
# Kerberos kerberos support # Kerberos kerberos support