colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Haller
2015-08-04 12:08:20 +02:00
parent 19c3ea948a
commit 7363dc94c6
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/nm-default.h
View File

@@ -26,6 +26,7 @@
* Depending on which parts are compiled, different values are set. */ * Depending on which parts are compiled, different values are set. */
#define NM_NETWORKMANAGER_COMPILATION_DEFAULT 0x0001 #define NM_NETWORKMANAGER_COMPILATION_DEFAULT 0x0001
#define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON 0x0002 #define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON 0x0002
#define NM_NETWORKMANAGER_COMPILATION_LIB 0x0004
#ifndef NETWORKMANAGER_COMPILATION #ifndef NETWORKMANAGER_COMPILATION
/* For convenience, we don't require our Makefile.am to define /* 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 #if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
/* the header is used inside src/, where additional /* the header is used inside src/, where additional

2
libnm-core/Makefile.am
View File

@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\"$(datadir)/locale\" \ -DLOCALEDIR=\"$(datadir)/locale\" \
-DNMCONFDIR=\"$(nmconfdir)\" \ -DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

1
libnm-glib/Makefile.am
View File

@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""libnm-glib"\" \ -DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

1
libnm-util/Makefile.am
View File

@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/include \
-DG_LOG_DOMAIN=\""libnm-util"\" \ -DG_LOG_DOMAIN=\""libnm-util"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \ -DLOCALEDIR=\"$(datadir)/locale\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \

2
libnm/Makefile.am
View File

@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm \ -I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \ -I$(top_builddir)/libnm \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \