diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-05 11:27:26 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-05 14:40:43 +0200 |
| commit | 2eb400a6d55a8a1118db8eabe9126ae4e590a3c8 (patch) | |
| tree | fc1d8a036749ea4e26091fd4a2d5327d080a5638 | |
| parent | 46d322ad486c6696f9bb16c678793e5b16f3142c (diff) | |
| download | NetworkManager-2eb400a6d55a8a1118db8eabe9126ae4e590a3c8.tar.gz | |
fixup! nm-default: include i18n headers via "nm-default.h"
| -rw-r--r-- | include/nm-default.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/nm-default.h b/include/nm-default.h index ab6c876174..f37445476d 100644 --- a/include/nm-default.h +++ b/include/nm-default.h @@ -28,11 +28,23 @@ #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 + * -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DEFAULT. + * Still, we compile here this ~internal~ header, we know we do a + * NETWORKMANAGER_COMPILATION. */ +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DEFAULT +#endif + +/*****************************************************************************/ + +/* always include these headers for our internal source files. */ + #include "nm-glib.h" #include "nm-version.h" #include "gsystem-local-alloc.h" -#if defined (NETWORKMANAGER_COMPILATION) +/*****************************************************************************/ #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB @@ -44,6 +56,8 @@ #endif /* NM_NETWORKMANAGER_COMPILATION_LIB */ +/*****************************************************************************/ + #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON /* the header is used inside src/, where additional @@ -54,11 +68,6 @@ #endif /* NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON */ -#else /* NETWORKMANAGER_COMPILATION */ - -#include <glib/gi18n.h> - -#endif /* NETWORKMANAGER_COMPILATION */ - +/*****************************************************************************/ #endif /* __NM_DEFAULT_H__ */ |