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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
From: Ole Reifschneider <mail@ole-reifschneider.de>
Date: Tue, 15 Aug 2017 18:51:42 +0200
Subject: [PATCH 1/6] Make colord and wacom support optional
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
Signed-off-by: Timo Tambet <ttambet@gmail.com>
Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com>
---
configure.ac | 54 ++++++++++++++++++++++++++++++----------------
plugins/Makefile.am | 9 ++++++--
plugins/common/Makefile.am | 7 ++++--
plugins/dummy/Makefile.am | 5 ++++-
4 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 73fe91e6..d8778c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
gtk+-x11-3.0
x11)
-PKG_CHECK_MODULES(COLOR,
- colord >= 1.0.2
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- libcanberra-gtk3
- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
- lcms2 >= $LCMS_REQUIRED_VERSION
- libnotify)
+AC_ARG_ENABLE([color],
+ AS_HELP_STRING([--disable-color],
+ [turn off color plugin]),
+ [],
+ [enable_color=yes])
+
+AS_IF([test "$enable_color" = "yes"],
+ [PKG_CHECK_MODULES(COLOR,
+ colord >= 1.0.2
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ libcanberra-gtk3
+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ lcms2 >= $LCMS_REQUIRED_VERSION
+ libnotify)
+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
+ ])
+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
PKG_CHECK_MODULES(DATETIME,
libnotify >= $LIBNOTIFY_REQUIRED_VERSION
@@ -268,23 +278,31 @@ case $host_os in
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
- if test x$enable_gudev != xno; then
- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
- else
- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
- fi
- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
- have_wacom=yes
+ have_wacom=no
+ AS_IF([test "$enable_gudev" != "no"],
+ [AC_ARG_ENABLE([wacom],
+ AS_HELP_STRING([--disable-wacom],
+ [turn off wacom plugin]),
+ [],
+ [enable_wacom=no]) dnl Default value
+ AS_IF([test "$enable_wacom" = "yes"],
+ [
+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+ have_wacom=yes
+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+ ])
+ ], [
+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+ ])
fi
;;
*)
have_wacom=no
;;
esac
-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
dnl ---------------------------------------------------------------------------
dnl - common
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9324b406..ee78d6d0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,7 +4,6 @@ enabled_plugins = \
a11y-keyboard \
a11y-settings \
clipboard \
- color \
datetime \
dummy \
power \
@@ -22,13 +21,19 @@ enabled_plugins = \
disabled_plugins = $(NULL)
+if BUILD_COLOR
+enabled_plugins += color
+else
+disabled_plugins += color
+endif
+
if SMARTCARD_SUPPORT
enabled_plugins += smartcard
else
disabled_plugins += smartcard
endif
-if HAVE_WACOM
+if BUILD_WACOM
enabled_plugins += wacom
else
disabled_plugins += wacom
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 239c6015..65de4007 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/
-libcommon_la_CFLAGS = $(COMMON_CFLAGS)
+libcommon_la_CFLAGS = \
+ $(COMMON_CFLAGS) \
+ $(LIBWACOM_CFLAGS)
libcommon_la_LDFLAGS = \
$(GSD_PLUGIN_LDFLAGS)
libcommon_la_LIBADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(COMMON_LIBS)
+ $(COMMON_LIBS) \
+ $(LIBWACOM_LIBS)
libexec_PROGRAMS = gsd-test-input-helper
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index cb5856cf..d8e8bc4e 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -25,7 +25,10 @@ desktop_DATA =
if !SMARTCARD_SUPPORT
desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
endif
-if !HAVE_WACOM
+if !BUILD_COLOR
+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
+endif
+if !BUILD_WACOM
desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
endif
if !BUILD_PRINT_NOTIFICATIONS
--
2.14.1
|
GitWeb