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

meson: Allow forcing fallback for libintl

Browse Source 
Closes #3048
This commit is contained in:
Brendan Shanks 2023-07-11 13:59:37 -07:00
parent 5d6c044da4
commit d0862c3692
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -2106,8 +2106,8 @@ libz_dep = dependency('zlib')
# implementations. This could be extended if issues are found in some platforms. # implementations. This could be extended if issues are found in some platforms.
libintl_deps = [] libintl_deps = []
libintl_prefix = '#include <libintl.h>' libintl_prefix = '#include <libintl.h>'
libintl = dependency('intl', required: false, allow_fallback: false) libintl = dependency('intl', required: false)
if libintl.found() if libintl.found() and libintl.type_name() != 'internal'
# libintl supports different threading APIs, which may not # libintl supports different threading APIs, which may not
# require additional flags, but it defaults to using pthreads if # require additional flags, but it defaults to using pthreads if
# found. Meson's "threads" dependency does not allow you to # found. Meson's "threads" dependency does not allow you to
@ -2134,9 +2134,10 @@ if libintl.found()
endif endif
endif endif
if libintl.found() if libintl.found() and libintl.type_name() != 'internal'
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)
else else
# using proxy-libintl fallback
libintl = dependency('intl', allow_fallback: true) libintl = dependency('intl', allow_fallback: true)
assert(libintl.type_name() == 'internal') assert(libintl.type_name() == 'internal')
libintl_deps = [libintl] libintl_deps = [libintl]