From: Bruno Haible <bruno@clisp.org>
Date: Fri, 8 Jun 2007 10:32:31 +0000 (+0000)
Subject: Use localename.c from gnulib.
X-Git-Tag: v0.17~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5501accbcc50982abe483aeae90370f658bcf9;p=thirdparty%2Fgettext.git

Use localename.c from gnulib.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index acebf8031..978cd9918 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-08  Bruno Haible  <bruno@clisp.org>
+
+	* msginit.c: Include localename.h.
+	(_nl_locale_name): Remove declaration.
+	(main): Use gl_locale_name instead of _nl_locale_name.
+	* Makefile.am (msginit_LDADD): Remove localename object file.
+
 2007-05-28  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (WOE32_LDADD): New variable.
@@ -5283,4 +5290,4 @@
 	* user-email.in: Use 'gettext' instead of @PACKAGE@.
 
 
-See ChangeLog.0 for earlier changes.
\ No newline at end of file
+See ChangeLog.0 for earlier changes.
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 4dc8bf97a..827cbfca9 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -253,8 +253,7 @@ msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msginit_LDADD = ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
-                libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
+msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 recode_sr_latin_LDADD = ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 
diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index d559666b9..8cfbff598 100644
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -68,6 +68,7 @@
 #include "write-stringtable.h"
 #include "po-charset.h"
 #include "localcharset.h"
+#include "localename.h"
 #include "po-time.h"
 #include "plural-table.h"
 #include "lang-table.h"
@@ -96,7 +97,6 @@
 
 #define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
 
-extern const char * _nl_locale_name (int category, const char *categoryname);
 extern const char * _nl_expand_alias (const char *name);
 
 /* Locale name.  */
@@ -279,7 +279,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
   /* Determine target locale.  */
   if (locale == NULL)
     {
-      locale = _nl_locale_name (LC_MESSAGES, "LC_MESSAGES");
+      locale = gl_locale_name (LC_MESSAGES, "LC_MESSAGES");
       if (strcmp (locale, "C") == 0)
 	{
 	  multiline_error (xstrdup (""),