oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

src/lib/icu: fix iconv() detection when libiconv is installed

Browse Source
This commit is contained in:
aeolio 2022-04-20 16:10:39 +02:00
parent ac06088948
commit 3882a5a263
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/icu/meson.build
View File

@ -12,17 +12,23 @@ if is_windows
icu_sources += 'Win32.cxx' icu_sources += 'Win32.cxx'
endif endif
iconv_dep = []
if icu_dep.found() if icu_dep.found()
icu_sources += [ icu_sources += [
'Util.cxx', 'Util.cxx',
'Init.cxx', 'Init.cxx',
] ]
elif not get_option('iconv').disabled() elif not get_option('iconv').disabled()
have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>') # an installed iconv library will make the builtin iconf() unavailable,
conf.set('HAVE_ICONV', have_iconv) # so search for the library first and pass it as (possible) dependency
iconv_dep = compiler.find_library('libiconv', required: false)
have_iconv = compiler.has_function('iconv',
dependencies: iconv_dep,
prefix : '#include <iconv.h>')
if not have_iconv and get_option('iconv').enabled() if not have_iconv and get_option('iconv').enabled()
error('iconv() not available') error('iconv() not available')
endif endif
conf.set('HAVE_ICONV', have_iconv)
endif endif
icu = static_library( icu = static_library(
@ -31,6 +37,7 @@ icu = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
icu_dep, icu_dep,
iconv_dep,
fmt_dep, fmt_dep,
], ],
) )