From: Ton Voon Date: Thu, 25 May 2006 16:58:10 +0000 (+0000) Subject: Gettext fixes to sync with coreutils X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06f439b0994e90d3a4fdc095ca741c8f55a399a3;p=nagiosplug.git Gettext fixes to sync with coreutils git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1406 f882894a-f735-0410-b71e-b25c423dba1c --- diff --git a/configure.in b/configure.in index 977fe53..405eb50 100644 --- a/configure.in +++ b/configure.in @@ -1661,7 +1661,7 @@ AC_SUBST(EXTRA_NETOBJS) AC_SUBST(DEPLIBS) AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT_VERSION(0.13.1) dnl Check for Redhat spopen problem dnl Wierd problem where ECHILD is returned from a wait call in error diff --git a/lib/Makefile.am b/lib/Makefile.am index 0d69089..a4f9c7d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,7 +10,7 @@ libcoreutils_a_SOURCES = \ full-write.c full-write.h \ gettext.h \ safe-read.c safe-read.h \ - safe-write.c safe-write.h xalloc-die.c + safe-write.c safe-write.h strcase.h xalloc-die.c other_coreutils_files = \ error.c error.h \ diff --git a/plugins/common.h b/plugins/common.h index baed12e..31cc33f 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -218,6 +218,12 @@ enum { */ #include "gettext.h" #define _(String) gettext (String) +#if ! ENABLE_NLS +# undef textdomain +# define textdomain(Domainname) /* empty */ +# undef bindtextdomain +# define bindtextdomain(Domainname, Dirname) /* empty */ +#endif /* For non-GNU compilers to ignore __attribute__ */ #ifndef __GNUC__