diff options
| author | Paolo Bonzini | 2020-11-17 12:43:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2021-01-02 21:03:37 +0100 |
| commit | f9cd86fe72be3cd89ef7f7dfe490155d67e88b57 (patch) | |
| tree | a033551e527936be015cb4f6085cb7e910e3418f /meson.build | |
| parent | curl: remove compatibility code, require 7.29.0 (diff) | |
| download | qemu-f9cd86fe72be3cd89ef7f7dfe490155d67e88b57.tar.gz qemu-f9cd86fe72be3cd89ef7f7dfe490155d67e88b57.tar.xz qemu-f9cd86fe72be3cd89ef7f7dfe490155d67e88b57.zip | |
curl: convert to meson
Reviewed-by: Daniel Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 2bc667721d..8bf77acc8d 100644 --- a/meson.build +++ b/meson.build @@ -396,9 +396,11 @@ if 'CONFIG_VIRGL' in config_host link_args: config_host['VIRGL_LIBS'].split()) endif curl = not_found -if 'CONFIG_CURL' in config_host - curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(), - link_args: config_host['CURL_LIBS'].split()) +if not get_option('curl').auto() or have_block + curl = dependency('libcurl', version: '>=7.29.0', + method: 'pkg-config', + required: get_option('curl'), + static: enable_static) endif libudev = not_found if targetos == 'linux' and (have_system or have_tools) @@ -876,6 +878,7 @@ config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found()) config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) +config_host_data.set('CONFIG_CURL', curl.found()) config_host_data.set('CONFIG_CURSES', curses.found()) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) @@ -2165,7 +2168,7 @@ summary_info += {'iconv support': iconv.found()} summary_info += {'curses support': curses.found()} # TODO: add back version summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')} -summary_info += {'curl support': config_host.has_key('CONFIG_CURL')} +summary_info += {'curl support': curl.found()} summary_info += {'mingw32 support': targetos == 'windows'} summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']} summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']} |