|
Link Here
|
| 3 |
Date: Mon, 5 May 2014 21:50:25 -0400 |
3 |
Date: Mon, 5 May 2014 21:50:25 -0400 |
| 4 |
Subject: [PATCH] Make colord and wacom support optional and non-automagic |
4 |
Subject: [PATCH] Make colord and wacom support optional and non-automagic |
| 5 |
|
5 |
|
| 6 |
--- |
6 |
--- /a/configure.ac |
| 7 |
configure.ac | 20 +++++++++++++++++--- |
7 |
+++ /b/configure.ac |
| 8 |
plugins/Makefile.am | 7 ++++++- |
8 |
@@ -260,15 +260,28 @@ |
| 9 |
2 files changed, 23 insertions(+), 4 deletions(-) |
|
|
| 10 |
|
| 11 |
diff --git a/configure.ac b/configure.ac |
| 12 |
index 22db541..f9d50b1 100644 |
| 13 |
--- a/configure.ac |
| 14 |
+++ b/configure.ac |
| 15 |
@@ -253,15 +253,28 @@ fi |
| 16 |
dnl --------------------------------------------------------------------------- |
9 |
dnl --------------------------------------------------------------------------- |
| 17 |
dnl - color |
10 |
dnl - color |
| 18 |
dnl --------------------------------------------------------------------------- |
11 |
dnl --------------------------------------------------------------------------- |
|
Link Here
|
| 44 |
|
37 |
|
| 45 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
38 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
| 46 |
|
39 |
|
| 47 |
@@ -595,6 +608,7 @@ echo " |
40 |
@@ -604,6 +617,7 @@ |
| 48 |
LCMS DICT support: ${have_new_lcms} |
41 |
LCMS DICT support: ${have_new_lcms} |
| 49 |
Libnotify support: ${have_libnotify} |
42 |
Libnotify support: ${have_libnotify} |
| 50 |
|
43 |
|
| 51 |
+ Colord support: ${build_color} |
44 |
+ Colord support: ${build_color} |
| 52 |
Wacom support: ${build_wacom} |
45 |
Wacom support: ${build_wacom} |
| 53 |
|
46 |
|
| 54 |
Smartcard support: ${have_smartcard_support} |
47 |
Smartcard support: ${have_smartcard_support} |
| 55 |
diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
48 |
--- /a/plugins/Makefile.am |
| 56 |
index 666bfef..2a7a4e1 100644 |
49 |
+++ /b/plugins/Makefile.am |
| 57 |
--- a/plugins/Makefile.am |
50 |
@@ -6,7 +6,6 @@ |
| 58 |
+++ b/plugins/Makefile.am |
|
|
| 59 |
@@ -5,7 +5,6 @@ enabled_plugins = \ |
| 60 |
a11y-settings \ |
| 61 |
automount \ |
51 |
automount \ |
|
|
52 |
background \ |
| 62 |
clipboard \ |
53 |
clipboard \ |
| 63 |
- color \ |
54 |
- color \ |
| 64 |
cursor \ |
55 |
cursor \ |
| 65 |
dummy \ |
56 |
dummy \ |
| 66 |
datetime \ |
57 |
datetime \ |
| 67 |
@@ -22,6 +21,12 @@ enabled_plugins = \ |
58 |
@@ -23,6 +22,12 @@ |
| 68 |
|
59 |
|
| 69 |
disabled_plugins = $(NULL) |
60 |
disabled_plugins = $(NULL) |
| 70 |
|
61 |
|
|
Link Here
|
| 77 |
if BUILD_WACOM |
68 |
if BUILD_WACOM |
| 78 |
enabled_plugins += wacom |
69 |
enabled_plugins += wacom |
| 79 |
else |
70 |
else |
| 80 |
-- |
|
|
| 81 |
1.9.2 |
| 82 |
|
