1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From e11e16e2842b3861c763f0d7714717ba1ba44f66 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Mon, 5 May 2014 21:50:25 -0400
Subject: [PATCH] Make colord and wacom support optional and non-automagic
---
configure.ac | 20 +++++++++++++++++---
plugins/Makefile.am | 7 ++++++-
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 22db541..f9d50b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,15 +253,28 @@ fi
dnl ---------------------------------------------------------------------------
dnl - color
dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(color,
+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
+ enable_color=yes)
+build_color=false
+if test x"$enable_color" != x"no" ; then
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+ build_color=true
+fi
-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
dnl ---------------------------------------------------------------------------
dnl - wacom
dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(wacom,
+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
+ enable_wacom=auto)
build_wacom=false
-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],
- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+if test x"$enable_wacom" != x"no" ; then
+ 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],
+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+fi
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
@@ -595,6 +608,7 @@ echo "
LCMS DICT support: ${have_new_lcms}
Libnotify support: ${have_libnotify}
+ Colord support: ${build_color}
Wacom support: ${build_wacom}
Smartcard support: ${have_smartcard_support}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 666bfef..2a7a4e1 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,7 +5,6 @@ enabled_plugins = \
a11y-settings \
automount \
clipboard \
- color \
cursor \
dummy \
datetime \
@@ -22,6 +21,12 @@ enabled_plugins = \
disabled_plugins = $(NULL)
+if BUILD_COLOR
+enabled_plugins += color
+else
+disabled_plugins += color
+endif
+
if BUILD_WACOM
enabled_plugins += wacom
else
--
1.9.2
|
GitWeb