From: Bruno Haible <bruno@clisp.org>
Date: Wed, 14 Feb 2024 22:51:28 +0000 (+0100)
Subject: intl: Improve support of Citrus/FreeBSD iconv.
X-Git-Tag: v0.23~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9ea887094cff43ace77b83005bd7b887a8736a;p=thirdparty%2Fgettext.git

intl: Improve support of Citrus/FreeBSD iconv.

* gettext-runtime/intl/dcigettext.c (_nl_find_msg): Use //TRANSLIT with all
iconv implementations that support it.
---

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 56bcea2fc..4337f3af7 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -1207,7 +1207,8 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
 			 we want to use transliteration.  */
 #   if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
 	&& !defined __UCLIBC__) \
-       || _LIBICONV_VERSION >= 0x0105
+       || _LIBICONV_VERSION >= 0x0105 \
+       || defined ICONV_SET_TRANSLITERATE
 		      if (strchr (outcharset, '/') == NULL)
 			{
 			  char *tmp;