oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

meson.build: require Meson 1.0

Browse Source 
Debian Bookworm (the current stable) has 1.0.1 and Ubuntu LTS 24.04
has 1.3.2.  It's acceptable to require at least version 1.0 now.
This commit is contained in:
Max Kellermann
2024-07-05 17:02:30 +02:00
parent 473fb4e19f
commit 044280c538
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/icu/meson.build
View File

@@ -22,24 +22,8 @@ if icu_dep.found()
'Transliterator.cxx',
]
else
if meson.version().version_compare('>= 0.60')
iconv_dep = dependency('iconv', required: get_option('iconv'))
conf.set('HAVE_ICONV', iconv_dep.found())
elif not get_option('iconv').disabled()
iconv_open_snippet = '''#include <iconv.h>
int main() {
iconv_open("","");
}'''
have_iconv = compiler.links(iconv_open_snippet, name: 'iconv_open')
if not have_iconv
iconv_dep = compiler.find_library('iconv', required: false)
have_iconv = compiler.links(iconv_open_snippet, dependencies: iconv_dep, name: 'iconv_open')
endif
if not have_iconv and get_option('iconv').enabled()
error('iconv() not available')
endif
conf.set('HAVE_ICONV', have_iconv)
endif
iconv_dep = dependency('iconv', required: get_option('iconv'))
conf.set('HAVE_ICONV', iconv_dep.found())
endif
icu = static_library(