Add libiconv dep to meson build again

Build success on macOS and ubuntu.
This commit is contained in:
Zhao Zhili 2021-01-07 20:59:17 +08:00
parent 6a5e41edc5
commit 5b63816e82
2 changed files with 15 additions and 1 deletions

View File

@ -20,6 +20,7 @@ libicu_dep = notfound
libidn_dep = notfound
libunistring = notfound
networking_deps = notfound
libiconv_dep = notfound
# FIXME: Cleanup this when Meson gets 'feature-combo':
# https://github.com/mesonbuild/meson/issues/4566
@ -86,6 +87,19 @@ endif
if libidn2_dep.found() or libidn_dep.found()
# Check for libunistring, we need it for psl_str_to_utf8lower()
libunistring = cc.find_library('unistring')
found_iconv = false
if cc.has_function('iconv_open')
libiconv_dep = []
found_iconv = true
endif
if not found_iconv and cc.has_header_symbol('iconv.h', 'iconv_open')
libiconv_dep = [cc.find_library('iconv')]
found_iconv = true
endif
if not found_iconv
error('iconv implementation not found')
endif
endif
if host_machine.system() == 'windows'

View File

@ -19,7 +19,7 @@ cargs = [
libpsl = library('psl', sources, suffixes_dafsa_h,
include_directories : [configinc, includedir],
c_args : cargs,
dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps],
dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv_dep],
version: lt_version,
install: true,
)