From b27d4b69ceab0b5cbd7d26faa85b379e27214d16 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 9 Jun 2022 17:01:18 -0700 Subject: [PATCH] meson: switch iconv to meson's handling Fixes compilation under OpenWrt. --- meson.build | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 0f7c205..335c9b1 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('libpsl', 'c', version : files('version.txt'), - meson_version : '>=0.57.0') + meson_version : '>=0.60.0') cc = meson.get_compiler('c') @@ -91,19 +91,7 @@ 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 + libiconv_dep = dependency('iconv') endif if host_machine.system() == 'windows'