[network-manager-openvpn/th/include-cleanup] build: split NM_NETWORKMANAGER_COMPILATION_LIB define in a "base" and "editor" part

[Thomas Haller <thaller src gnome org>]

commit 67aa10d787192c1133ff4f9716d9ee3e0537075b
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 19:49:10 2016 +0200

    build: split NM_NETWORKMANAGER_COMPILATION_LIB define in a "base" and "editor" part

 shared/nm-default.h |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 1fa1d05..a255bf4 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -25,7 +25,9 @@
 /* makefiles define NETWORKMANAGER_COMPILATION for compiling NetworkManager.
  * Depending on which parts are compiled, different values are set. */
 #define NM_NETWORKMANAGER_COMPILATION_DEFAULT             0x0001
-#define NM_NETWORKMANAGER_COMPILATION_LIB                 0x0002
+#define NM_NETWORKMANAGER_COMPILATION_LIB_BASE            0x0002
+#define NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR          0x0004
+#define NM_NETWORKMANAGER_COMPILATION_LIB                 (0x0002 | 0x0004)
 
 #ifndef NETWORKMANAGER_COMPILATION
 /* For convenience, we don't require our Makefile.am to define
@@ -48,7 +50,7 @@
 
 /*****************************************************************************/
 
-#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB
+#if ((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB)
 
 #include <glib/gi18n-lib.h>
 
@@ -100,7 +102,7 @@
 
 /*****************************************************************************/
 
-#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB
+#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR
 
 #ifdef NM_OPENVPN_OLD
 #include <nm-ui-utils.h>
@@ -108,7 +110,7 @@
 #include <nma-ui-utils.h>
 #endif /* NM_OPENVPN_OLD */
 
-#endif /* NM_NETWORKMANAGER_COMPILATION_LIB */
+#endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */
 
 /*****************************************************************************/