diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-08-28 15:07:25 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-08 11:43:16 +0200 |
| commit | af04e89dd97a8098fe5643f6e9a28fa4233f21cf (patch) | |
| tree | fa92b53259f9d03aa9b3a52d1dda48b5332cc649 | |
| parent | 279588d4deea2694ebe9ceb29dfdc5c08a7c4e27 (diff) | |
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>
| -rwxr-xr-x | configure | 25 | ||||
| -rw-r--r-- | meson.build | 7 |
2 files changed, 3 insertions, 29 deletions
@@ -6313,28 +6313,6 @@ but not implemented on your system" fi ########################################## -# check for usable keyutils.h - -if test "$linux" = "yes" ; then - - have_keyutils=no - cat > $TMPC << EOF -#include <errno.h> -#include <asm/unistd.h> -#include <unistd.h> -#include <sys/types.h> -#include <keyutils.h> -int main(void) { - return request_key("user", NULL, NULL, 0); -} -EOF - if compile_prog "" "-lkeyutils"; then - have_keyutils=yes - fi -fi - - -########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -7522,9 +7500,6 @@ fi if test "$secret_keyring" = "yes" ; then echo "CONFIG_SECRET_KEYRING=y" >> $config_host_mak - if test "$have_keyutils" = "yes" ; then - echo "CONFIG_KEYUTILS=y" >> $config_host_mak - fi fi if test "$tcg_interpreter" = "yes"; then diff --git a/meson.build b/meson.build index d3cf531297..f7cd2b6f73 100644 --- a/meson.build +++ b/meson.build @@ -415,10 +415,8 @@ if 'CONFIG_TASN1' in config_host 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_JPEG', jpeg.found()) 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]) |