nm-default: include i18n headers via "nm-default.h"

diff --git a/include/nm-default.h b/include/nm-default.h
index 6a2ccff..f86feac 100644 (file)
--- a/include/nm-default.h
+++ b/include/nm-default.h
@@ -26,6 +26,7 @@
  * Depending on which parts are compiled, different values are set. */
 #define NM_NETWORKMANAGER_COMPILATION_DEFAULT             0x0001
 #define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON       0x0002
+#define NM_NETWORKMANAGER_COMPILATION_LIB                 0x0004
 
 #ifndef NETWORKMANAGER_COMPILATION
 /* For convenience, we don't require our Makefile.am to define
@@ -44,6 +45,18 @@
 
 /*****************************************************************************/
 
+#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB
+
+#include <glib/gi18n-lib.h>
+
+#else
+
+#include <glib/gi18n.h>
+
+#endif /* NM_NETWORKMANAGER_COMPILATION_LIB */
+
+/*****************************************************************************/
+
 #if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
 
 /* the header is used inside src/, where additional

diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
index 08f2afc..470fd9a 100644 (file)
--- a/libnm-core/Makefile.am
+++ b/libnm-core/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DNMCONFDIR=\"$(nmconfdir)\" \
        -DNMLIBDIR=\"$(nmlibdir)\" \
-       -DNETWORKMANAGER_COMPILATION \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(GLIB_CFLAGS)
 

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 20a2481..179f4e6 100644 (file)
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""libnm-glib"\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS)

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index f508494..d7d3ba8 100644 (file)
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/include \
        -DG_LOG_DOMAIN=\""libnm-util"\" \
        -DLOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(GLIB_CFLAGS) \
        $(DBUS_CFLAGS) \

diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 0a41ab5..2ae3f87 100644 (file)
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm \
        -I$(top_builddir)/libnm \
        -DG_LOG_DOMAIN=\""libnm"\" \
-       -DNETWORKMANAGER_COMPILATION \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(GLIB_CFLAGS) \
        $(GUDEV_CFLAGS) \