|
Line
Link Here
|
|
This patch allows network-manager to not be present and in that case the |
|
This patch allows network-manager to not be present and in that case the |
| 1 |
network panel is not built. |
1 |
network panel is not built. |
| 2 |
-- cinnamon-control-center-2.2.11.orig/configure.ac |
2 |
++ cinnamon-control-center-2.2.11/configure.ac |
|
Lines 137-143
PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL
Link Here
|
| 137 |
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION |
137 |
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION |
| 138 |
libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION |
138 |
libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION |
| 139 |
libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION |
139 |
libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION |
| 140 |
libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION) |
140 |
libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION, |
|
|
141 |
[build_network="true"], [build_network="false"]) |
| 142 |
|
| 143 |
AM_CONDITIONAL(BUILD_NETWORK, test "x$build_network" = "xtrue") |
| 141 |
|
144 |
|
| 142 |
# Check for libnm-gtk + 0.9.9.0 |
145 |
# Check for libnm-gtk + 0.9.9.0 |
| 143 |
PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION |
146 |
PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION |
| 144 |
-- cinnamon-control-center-2.2.11.orig/panels/Makefile.am |
147 |
++ cinnamon-control-center-2.2.11/panels/Makefile.am |
|
Lines 10-16
enabled_panels = \
Link Here
|
| 10 |
power \ |
10 |
power \ |
| 11 |
sound \ |
11 |
sound \ |
| 12 |
sound-nua \ |
12 |
sound-nua \ |
| 13 |
network \ |
|
|
| 14 |
datetime |
13 |
datetime |
| 15 |
|
14 |
|
| 16 |
disabled_panels = $(NULL) |
15 |
disabled_panels = $(NULL) |
|
Lines 21-26
else
Link Here
|
| 21 |
disabled_panels += wacom |
20 |
disabled_panels += wacom |
| 22 |
endif |
21 |
endif |
| 23 |
|
22 |
|
|
|
23 |
if BUILD_NETWORK |
| 24 |
enabled_panels += network |
| 25 |
else |
| 26 |
disabled_panels += network |
| 27 |
endif |
| 28 |
|
| 24 |
SUBDIRS = common $(enabled_panels) |
29 |
SUBDIRS = common $(enabled_panels) |
| 25 |
DIST_SUBDIRS = $(SUBDIRS) $(disabled_panels) |
30 |
DIST_SUBDIRS = $(SUBDIRS) $(disabled_panels) |
| 26 |
|
31 |
|
