From 43fc4f0631f7dbfa4656cc40f06f780b60ffeb3c Mon Sep 17 00:00:00 2001 From: Alexey Rochev Date: Tue, 4 Jan 2022 15:49:58 +0300 Subject: [PATCH] meson: bring back libiconv dependency lookup --- meson.build | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meson.build b/meson.build index ccb3d48..2263e31 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,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 @@ -83,6 +84,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'