|
Link Here
|
| 4 |
Subject: [PATCH] Make networkmanager dependency optional for Gentoo |
4 |
Subject: [PATCH] Make networkmanager dependency optional for Gentoo |
| 5 |
|
5 |
|
| 6 |
--- |
6 |
--- |
| 7 |
configure.ac | 36 ++++++++++++++++++++++++++++++++++-- |
7 |
--- /a/configure.ac 2014-10-31 18:21:43.000000000 -0400 |
| 8 |
js/misc/config.js.in | 2 ++ |
|
|
| 9 |
src/Makefile.am | 5 ++++- |
| 10 |
3 files changed, 40 insertions(+), 3 deletions(-) |
| 11 |
|
| 12 |
diff --git a/configure.ac b/configure.ac |
| 13 |
index bc764e1..894379b 100644 |
| 14 |
--- a/configure.ac |
| 15 |
+++ b/configure.ac |
| 16 |
@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION |
|
Link Here
|
| 54 |
+ |
46 |
+ |
| 55 |
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") |
47 |
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") |
| 56 |
|
48 |
|
| 57 |
PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) |
49 |
PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION) |
| 58 |
|
50 |
|
| 59 |
diff --git a/js/misc/config.js.in b/js/misc/config.js.in |
51 |
--- /a/js/misc/config.js.in 2014-10-31 18:21:43.000000000 -0400 |
| 60 |
index 704989b..df7e014 100644 |
|
|
| 61 |
--- a/js/misc/config.js.in |
| 62 |
+++ b/js/misc/config.js.in |
| 63 |
@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; |
|
Link Here
|
| 68 |
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; |
58 |
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; |
| 69 |
/* The system TLS CA list */ |
59 |
/* The system TLS CA list */ |
| 70 |
const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; |
60 |
const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; |
| 71 |
diff --git a/src/Makefile.am b/src/Makefile.am |
61 |
--- /a/src/Makefile.am 2014-11-02 14:02:15.993938578 -0500 |
| 72 |
index 06d7f93..fe12cb9 100644 |
|
|
| 73 |
--- a/src/Makefile.am |
| 74 |
+++ b/src/Makefile.am |
| 75 |
@@ -267,7 +267,10 @@ libcinnamon_la_LIBADD = \ |
|
Link Here
|
| 84 |
Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) |
72 |
Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) |
| 85 |
Cinnamon_0_1_gir_LIBS = libcinnamon.la |
73 |
Cinnamon_0_1_gir_LIBS = libcinnamon.la |
| 86 |
Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) |
74 |
Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) |
| 87 |
-- |
|
|
| 88 |
1.9.2 |
| 89 |
|
