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 08bbd611a72fc595eb6f94dc4dff82344fbdada4..9342fa8137092aca2ee35f58d0bd3061c8338eb4 100644 (file)
--- 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 01f9638ea93cada732a82806bfc660ffebb7cd1b..583976821bee1f9dda36ca7365b5b25dc9b2d9a3 100644 (file)
--- 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__