diff options
| author | Paolo Bonzini | 2021-06-03 11:15:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-25 10:53:46 +0200 |
| commit | ba7ed407e67589167ef582ac1f17a38f09fbd327 (patch) | |
| tree | fad5c4cf104be42958a4e3c4cd7bf1e03618a089 /meson.build | |
| parent | configure, meson: convert crypto detection to meson (diff) | |
| download | qemu-ba7ed407e67589167ef582ac1f17a38f09fbd327.tar.gz qemu-ba7ed407e67589167ef582ac1f17a38f09fbd327.tar.xz qemu-ba7ed407e67589167ef582ac1f17a38f09fbd327.zip | |
configure, meson: convert libtasn1 detection to meson
Make it depend on gnutls too, since it is only used as part of gnutls
tests.
Reviewed-by: Richard Henderson <richard.henderson@liaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 286b37aecb..d4ce2ca57b 100644 --- a/meson.build +++ b/meson.build @@ -985,9 +985,10 @@ if 'CONFIG_LIBDAXCTL' in config_host libdaxctl = declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'].split()) endif tasn1 = not_found -if 'CONFIG_TASN1' in config_host - tasn1 = declare_dependency(compile_args: config_host['TASN1_CFLAGS'].split(), - link_args: config_host['TASN1_LIBS'].split()) +if gnutls.found() + tasn1 = dependency('libtasn1', + method: 'pkg-config', + kwargs: static_kwargs) endif keyutils = dependency('libkeyutils', required: false, method: 'pkg-config', kwargs: static_kwargs) @@ -2727,7 +2728,7 @@ summary_info += {'pixman': pixman.found()} summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')} # TODO: add back version summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt} -summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')} +summary_info += {'libtasn1': tasn1.found()} summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')} summary_info += {'iconv support': iconv.found()} summary_info += {'curses support': curses.found()} |