From: Bruno Haible <bruno@clisp.org>
Date: Thu, 20 Jul 2006 19:57:32 +0000 (+0000)
Subject: Work around a failure of the tests gettext-6, gettext-7 on glibc-2.4 systems.
X-Git-Tag: v0.15~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14724653cb1998b2c4cc39e6df139da7a41381cd;p=thirdparty%2Fgettext.git

Work around a failure of the tests gettext-6, gettext-7 on glibc-2.4 systems.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 08bbd611a..9342fa813 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -2,6 +2,10 @@
 
 	* gettext-0.15 released.
 
+2006-07-20  Bruno Haible  <bruno@clisp.org>
+
+	* dcigettext.c (HAVE_NL_LOCALE_NAME): Undefine.
+
 2006-07-20  Bruno Haible  <bruno@clisp.org>
 
 	* libgnuintl.h.in (LIBINTL_VERSION): Bump to 0.15.0.
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 01f9638ea..583976821 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -27,6 +27,9 @@
 # include <config.h>
 #endif
 
+/* NL_LOCALE_NAME does not work in glibc-2.4.  Ignore it.  */
+#undef HAVE_NL_LOCALE_NAME
+
 #include <sys/types.h>
 
 #ifdef __GNUC__