External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Use dependency().found() instead of conf.has()

Browse Source 
So far this change alone doesn't make much sense, but prepares
code for upcoming change. Unfortunately, some conf.has()
statements have to stay, because there's no corresponding
dependency(). But that's okay.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2023-03-23 09:15:35 +01:00
parent 2ef5876e2b
commit 063e8b9d62
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -1175,6 +1175,8 @@ if not get_option('sanlock').disabled()
conf.set('WITH_SANLOCK_STRERROR', 1) conf.set('WITH_SANLOCK_STRERROR', 1)
endif endif
endif endif
else
sanlock_dep = dependency('', required: false)
endif endif
sasl_version = '2.1.26' sasl_version = '2.1.26'
@ -2209,7 +2211,7 @@ libs_summary = {
'libssh': libssh_dep.found(), 'libssh': libssh_dep.found(),
'libssh2': libssh2_dep.found(), 'libssh2': libssh2_dep.found(),
'libutil': libutil_dep.found(), 'libutil': libutil_dep.found(),
'netcf': conf.has('WITH_NETCF'), 'netcf': netcf_dep.found(),
'NLS': have_gnu_gettext_tools, 'NLS': have_gnu_gettext_tools,
'numactl': numactl_dep.found(), 'numactl': numactl_dep.found(),
'openwsman': openwsman_dep.found(), 'openwsman': openwsman_dep.found(),
@ -2218,7 +2220,7 @@ libs_summary = {
'polkit': conf.has('WITH_POLKIT'), 'polkit': conf.has('WITH_POLKIT'),
'rbd': rbd_dep.found(), 'rbd': rbd_dep.found(),
'readline': readline_dep.found(), 'readline': readline_dep.found(),
'sanlock': conf.has('WITH_SANLOCK'), 'sanlock': sanlock_dep.found(),
'sasl': sasl_dep.found(), 'sasl': sasl_dep.found(),
'selinux': selinux_dep.found(), 'selinux': selinux_dep.found(),
'udev': udev_dep.found(), 'udev': udev_dep.found(),