walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #183 from neheb/patch-1 

meson: switch iconv to meson's handling
This commit is contained in:
Tim Rühsen 2022-06-10 15:54:38 +02:00 committed by GitHub
parent cf6878fd24 b27d4b69ce
commit a7b63cbb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -1,6 +1,6 @@
project('libpsl', 'c', project('libpsl', 'c',
version : files('version.txt'), version : files('version.txt'),
meson_version : '>=0.57.0') meson_version : '>=0.60.0')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
@ -91,19 +91,7 @@ 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 libiconv_dep = dependency('iconv')
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'