diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2006-05-25 16:58:10 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2006-05-25 16:58:10 +0000 |
commit | 06f439b0994e90d3a4fdc095ca741c8f55a399a3 (patch) | |
tree | c3584419c1888bea586ca58cfd3c5e4bcae72dac | |
parent | 87712747c521bb34370b7ef6274b8310a92e0171 (diff) | |
download | monitoring-plugins-06f439b0994e90d3a4fdc095ca741c8f55a399a3.tar.gz |
Gettext fixes to sync with coreutils
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1406 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/common.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 977fe53c..405eb503 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1661,7 +1661,7 @@ AC_SUBST(EXTRA_NETOBJS) | |||
1661 | AC_SUBST(DEPLIBS) | 1661 | AC_SUBST(DEPLIBS) |
1662 | 1662 | ||
1663 | AM_GNU_GETTEXT([external], [need-ngettext]) | 1663 | AM_GNU_GETTEXT([external], [need-ngettext]) |
1664 | AM_GNU_GETTEXT_VERSION(0.11.5) | 1664 | AM_GNU_GETTEXT_VERSION(0.13.1) |
1665 | 1665 | ||
1666 | dnl Check for Redhat spopen problem | 1666 | dnl Check for Redhat spopen problem |
1667 | dnl Wierd problem where ECHILD is returned from a wait call in error | 1667 | dnl Wierd problem where ECHILD is returned from a wait call in error |
diff --git a/lib/Makefile.am b/lib/Makefile.am index 0d69089e..a4f9c7d8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
@@ -10,7 +10,7 @@ libcoreutils_a_SOURCES = \ | |||
10 | full-write.c full-write.h \ | 10 | full-write.c full-write.h \ |
11 | gettext.h \ | 11 | gettext.h \ |
12 | safe-read.c safe-read.h \ | 12 | safe-read.c safe-read.h \ |
13 | safe-write.c safe-write.h xalloc-die.c | 13 | safe-write.c safe-write.h strcase.h xalloc-die.c |
14 | 14 | ||
15 | other_coreutils_files = \ | 15 | other_coreutils_files = \ |
16 | error.c error.h \ | 16 | error.c error.h \ |
diff --git a/plugins/common.h b/plugins/common.h index baed12eb..31cc33f1 100644 --- a/plugins/common.h +++ b/plugins/common.h | |||
@@ -218,6 +218,12 @@ enum { | |||
218 | */ | 218 | */ |
219 | #include "gettext.h" | 219 | #include "gettext.h" |
220 | #define _(String) gettext (String) | 220 | #define _(String) gettext (String) |
221 | #if ! ENABLE_NLS | ||
222 | # undef textdomain | ||
223 | # define textdomain(Domainname) /* empty */ | ||
224 | # undef bindtextdomain | ||
225 | # define bindtextdomain(Domainname, Dirname) /* empty */ | ||
226 | #endif | ||
221 | 227 | ||
222 | /* For non-GNU compilers to ignore __attribute__ */ | 228 | /* For non-GNU compilers to ignore __attribute__ */ |
223 | #ifndef __GNUC__ | 229 | #ifndef __GNUC__ |