luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 22:03:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meson-intl-iconv-lookup' into 'main'

Browse Source 
meson: try iconv in libintl lookup

See merge request GNOME/glib!3448
This commit is contained in:
Philip Withnall 2023-06-28 14:48:19 +00:00
commit d3fbb6e0fc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -2117,6 +2117,10 @@ if libintl.found()
# pthread, so we do this manually here. # pthread, so we do this manually here.
if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix)
libintl_deps += [libintl] libintl_deps += [libintl]
else
libintl_iconv = cc.find_library('iconv', required : false)
if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv])
libintl_deps += [libintl, libintl_iconv]
else else
libintl_pthread = cc.find_library('pthread', required : false) libintl_pthread = cc.find_library('pthread', required : false)
if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix)
@ -2126,6 +2130,7 @@ if libintl.found()
endif endif
endif endif
endif endif
endif
if libintl.found() if libintl.found()
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix)