intl patches (27)

[Bruno Haible]

Here is a patch that makes libintl, when compiled on a glibc system but
outside glibc, work the same way as inside glibc. No change inside glibc.


2001-09-24  Bruno Haible  <bruno@clisp.org>

	* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
	transliteration when building on a glibc system but outside glibc.

--- glibc-20011110/intl/loadmsgcat.c.bak	Wed Nov 21 12:35:53 2001
+++ glibc-20011110/intl/loadmsgcat.c	Tue Nov 20 01:36:02 2001
@@ -196,8 +196,9 @@
 	    domain->conv = (__gconv_t) -1;
 # else
 #  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION
+	  /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
+	     we want to use transliteration.  */
+#   if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105)
 	  len = strlen (outcharset);
 	  {
 	    char *tmp = (char *) alloca (len + 10 + 1);
@@ -207,7 +208,7 @@
 	  }
 #   endif
 	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION
+#   if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105)
 	  freea (outcharset);
 #   endif
 #  endif