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 977fe53c914052f9f61dd346d42d319d8182e283..405eb503bfb77cba20eb4470272782421e438e65 100644 (file)
--- 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 0d69089e86a7264bac79fb5d95c4b861c1a0ee17..a4f9c7d8d19f87b01e1494e21bdcf05320d4bdf3 100644 (file)
--- 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 baed12eb84078142b8c865b43c73a248ac65c5cc..31cc33f1fa1b2aa1c7ac961604032a8abe928f31 100644 (file)
--- 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__