Add libiconv dep to meson build again
Build success on macOS and ubuntu.
This commit is contained in:
parent
6a5e41edc5
commit
5b63816e82
14
meson.build
14
meson.build
|
@ -20,6 +20,7 @@ libicu_dep = notfound
|
||||||
libidn_dep = notfound
|
libidn_dep = notfound
|
||||||
libunistring = notfound
|
libunistring = notfound
|
||||||
networking_deps = notfound
|
networking_deps = notfound
|
||||||
|
libiconv_dep = notfound
|
||||||
|
|
||||||
# FIXME: Cleanup this when Meson gets 'feature-combo':
|
# FIXME: Cleanup this when Meson gets 'feature-combo':
|
||||||
# https://github.com/mesonbuild/meson/issues/4566
|
# https://github.com/mesonbuild/meson/issues/4566
|
||||||
|
@ -86,6 +87,19 @@ endif
|
||||||
if libidn2_dep.found() or libidn_dep.found()
|
if libidn2_dep.found() or libidn_dep.found()
|
||||||
# Check for libunistring, we need it for psl_str_to_utf8lower()
|
# Check for libunistring, we need it for psl_str_to_utf8lower()
|
||||||
libunistring = cc.find_library('unistring')
|
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
|
endif
|
||||||
|
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
|
|
|
@ -19,7 +19,7 @@ cargs = [
|
||||||
libpsl = library('psl', sources, suffixes_dafsa_h,
|
libpsl = library('psl', sources, suffixes_dafsa_h,
|
||||||
include_directories : [configinc, includedir],
|
include_directories : [configinc, includedir],
|
||||||
c_args : cargs,
|
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,
|
version: lt_version,
|
||||||
install: true,
|
install: true,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue