|
Line
Link Here
|
| 0 |
-- /a/configure.ac |
0 |
++ /b/configure.ac |
|
Lines 260-274
Link Here
|
| 260 |
dnl --------------------------------------------------------------------------- |
260 |
dnl --------------------------------------------------------------------------- |
| 261 |
dnl - color |
261 |
dnl - color |
| 262 |
dnl --------------------------------------------------------------------------- |
262 |
dnl --------------------------------------------------------------------------- |
|
|
263 |
AC_ARG_ENABLE(color, |
| 264 |
AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),, |
| 265 |
enable_color=yes) |
| 266 |
build_color=false |
| 267 |
if test x"$enable_color" != x"no" ; then |
| 268 |
PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
| 269 |
build_color=true |
| 270 |
fi |
| 263 |
|
271 |
|
| 264 |
PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
272 |
AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"]) |
| 265 |
|
273 |
|
| 266 |
dnl --------------------------------------------------------------------------- |
274 |
dnl --------------------------------------------------------------------------- |
| 267 |
dnl - wacom |
275 |
dnl - wacom |
| 268 |
dnl --------------------------------------------------------------------------- |
276 |
dnl --------------------------------------------------------------------------- |
|
|
277 |
AC_ARG_ENABLE(wacom, |
| 278 |
AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),, |
| 279 |
enable_wacom=auto) |
| 269 |
build_wacom=false |
280 |
build_wacom=false |
| 270 |
PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0], |
281 |
if test x"$enable_wacom" != x"no" ; then |
| 271 |
[build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) |
282 |
PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0], |
|
|
283 |
[build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) |
| 284 |
fi |
| 272 |
|
285 |
|
| 273 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
286 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
| 274 |
|
287 |
|
|
Lines 604-609
Link Here
|
| 604 |
LCMS DICT support: ${have_new_lcms} |
617 |
LCMS DICT support: ${have_new_lcms} |
| 605 |
Libnotify support: ${have_libnotify} |
618 |
Libnotify support: ${have_libnotify} |
| 606 |
|
619 |
|
|
|
620 |
Colord support: ${build_color} |
| 607 |
Wacom support: ${build_wacom} |
621 |
Wacom support: ${build_wacom} |
| 608 |
|
622 |
|
| 609 |
Smartcard support: ${have_smartcard_support} |
623 |
Smartcard support: ${have_smartcard_support} |
| 610 |
-- /a/plugins/Makefile.am |
624 |
++ /b/plugins/Makefile.am |
|
Lines 6-12
Link Here
|
| 6 |
automount \ |
6 |
automount \ |
| 7 |
background \ |
7 |
background \ |
| 8 |
clipboard \ |
8 |
clipboard \ |
| 9 |
color \ |
|
|
| 10 |
cursor \ |
9 |
cursor \ |
| 11 |
dummy \ |
10 |
dummy \ |
| 12 |
datetime \ |
11 |
datetime \ |
|
Lines 23-28
Link Here
|
| 23 |
|
22 |
|
| 24 |
disabled_plugins = $(NULL) |
23 |
disabled_plugins = $(NULL) |
| 25 |
|
24 |
|
|
|
25 |
if BUILD_COLOR |
| 26 |
enabled_plugins += color |
| 27 |
else |
| 28 |
disabled_plugins += color |
| 29 |
endif |
| 30 |
|
| 26 |
if BUILD_WACOM |
31 |
if BUILD_WACOM |
| 27 |
enabled_plugins += wacom |
32 |
enabled_plugins += wacom |
| 28 |
else |
33 |
else |
