commit af04e89dd97a8098fe5643f6e9a28fa4233f21cf
author Marc-André Lureau <marcandre.lureau@redhat.com> Fri Aug 28 15:07:25 2020 +0400
committer Paolo Bonzini <pbonzini@redhat.com> Tue Sep 08 11:43:16 2020 +0200
tree fa92b53259f9d03aa9b3a52d1dda48b5332cc649
parent 279588d4deea2694ebe9ceb29dfdc5c08a7c4e27

meson: move keyutils dependency check

Since there is not minimum version specified, and it's a test-only
dependency, it's fair to depend on a version that ships with a .pc I
suppose.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-8-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

meson.build

diff --git a/meson.build b/meson.build
index d3cf531..f7cd2b6 100644
--- a/meson.build
+++ b/meson.build
@@ -415,10 +415,8 @@
   tasn1 = declare_dependency(compile_args: config_host['TASN1_CFLAGS'].split(),
                              link_args: config_host['TASN1_LIBS'].split())
 endif
-keyutils = not_found
-if 'CONFIG_KEYUTILS' in config_host
-  keyutils = declare_dependency(link_args: '-lkeyutils')
-endif
+keyutils = dependency('libkeyutils', required: false,
+                      method: 'pkg-config', static: enable_static)
 
 # Create config-host.h
 
@@ -429,6 +427,7 @@
 config_host_data.set('CONFIG_VNC_PNG', png.found())
 config_host_data.set('CONFIG_VNC_SASL', sasl.found())
 config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
+config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
 config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
 config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
 config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])