External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 20:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: assume pkg-config support for yajl

Browse Source 
Per the platform support rules, we no longer need to consider SLES 12 as
a target, and so can now assume pkg-config support in yajl.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-11-13 10:43:04 +00:00
parent 19c4c6f8fd
commit 7b42f33278
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meson.build
View File

@ -1460,25 +1460,7 @@ else
endif endif
yajl_version = '2.0.3' yajl_version = '2.0.3'
if not get_option('yajl').disabled() yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: get_option('yajl'))
yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: false)
# 2.0.3 was the version where the pkg-config file was first added
# SLES 12 and openSUSE Leap 42.3 still use 2.0.1
# TODO: delete this in July 2020
if not yajl_dep.found()
yajl_dep = cc.find_library('yajl', required: get_option('yajl'))
if yajl_dep.found()
has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_tree.h>')
if not has_func and get_option('yajl').enabled()
error('yajl >= @0@ was not found'.format(yajl_version))
elif not has_func
yajl_dep = dependency('', required: false)
endif
endif
endif
else
yajl_dep = dependency('', required: false)
endif
if yajl_dep.found() if yajl_dep.found()
conf.set('WITH_YAJL', 1) conf.set('WITH_YAJL', 1)
endif endif