|
Link Here
|
| 1 |
diff --git a/configure.ac b/configure.ac |
1 |
--- /a/configure.ac |
| 2 |
index b900c53..0656e18 100644 |
2 |
+++ /b/configure.ac |
| 3 |
--- a/configure.ac |
3 |
@@ -124,7 +124,6 @@ |
| 4 |
+++ b/configure.ac |
4 |
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
| 5 |
@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) |
|
|
| 6 |
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) |
| 7 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 |
5 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 |
| 8 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION) |
6 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION) |
| 9 |
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
7 |
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
| 10 |
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 |
8 |
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 |
| 11 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
9 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
| 12 |
libxklavier >= 5.1 libgnomekbdui >= 2.91.91) |
10 |
libxklavier >= 5.1 libgnomekbdui >= 2.91.91) |
| 13 |
@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then |
11 |
@@ -201,15 +200,51 @@ |
| 14 |
AC_SUBST(CUPS_LIBS) |
12 |
AC_SUBST(CUPS_LIBS) |
| 15 |
fi |
13 |
fi |
| 16 |
|
14 |
|
|
Link Here
|
| 66 |
|
64 |
|
| 67 |
# This is a hard-dependency for the region and user-accounts panels |
65 |
# This is a hard-dependency for the region and user-accounts panels |
| 68 |
PKG_CHECK_MODULES(ISOCODES, iso-codes) |
66 |
PKG_CHECK_MODULES(ISOCODES, iso-codes) |
| 69 |
diff --git a/panels/Makefile.am b/panels/Makefile.am |
67 |
--- /a/panels/Makefile.am |
| 70 |
index ff8ea98..4a7fba7 100644 |
68 |
+++ /b/panels/Makefile.am |
| 71 |
--- a/panels/Makefile.am |
69 |
@@ -3,7 +3,6 @@ |
| 72 |
+++ b/panels/Makefile.am |
|
|
| 73 |
@@ -3,7 +3,6 @@ NULL = |
| 74 |
enabled_panels = \ |
70 |
enabled_panels = \ |
| 75 |
common \ |
71 |
common \ |
| 76 |
screen \ |
72 |
screen \ |
|
Link Here
|
| 78 |
display \ |
74 |
display \ |
| 79 |
region \ |
75 |
region \ |
| 80 |
universal-access \ |
76 |
universal-access \ |
| 81 |
@@ -15,6 +14,12 @@ enabled_panels = \ |
77 |
@@ -14,6 +13,12 @@ |
| 82 |
|
78 |
|
| 83 |
disabled_panels = $(NULL) |
79 |
disabled_panels = $(NULL) |
| 84 |
|
80 |
|
|
Link Here
|
| 88 |
+disabled_panels += color |
84 |
+disabled_panels += color |
| 89 |
+endif |
85 |
+endif |
| 90 |
+ |
86 |
+ |
| 91 |
if BUILD_WACOM |
87 |
if BUILD_NETWORK |
| 92 |
enabled_panels += wacom |
88 |
enabled_panels += network |
| 93 |
else |
89 |
else |
