diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-12-09 15:48:01 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-12-15 08:08:59 +0100 |
| commit | e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90 (patch) | |
| tree | 8173a1666474740f2f3a73f7b1a88e594f245174 /meson.build | |
| parent | 719051ca3fd0ee765d8a80670df1a0292aa566f0 (diff) | |
| download | qemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.zip qemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.tar.gz qemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.tar.bz2 | |
Move the libssh setup from configure to meson.build
It's easier to do this in meson.build now.
Message-Id: <20211209144801.148388-1-thuth@redhat.com>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 96de1a6..ae67ca2 100644 --- a/meson.build +++ b/meson.build @@ -874,11 +874,15 @@ if not get_option('glusterfs').auto() or have_block ''', dependencies: glusterfs) endif endif + libssh = not_found -if 'CONFIG_LIBSSH' in config_host - libssh = declare_dependency(compile_args: config_host['LIBSSH_CFLAGS'].split(), - link_args: config_host['LIBSSH_LIBS'].split()) +if not get_option('libssh').auto() or have_block + libssh = dependency('libssh', version: '>=0.8.7', + method: 'pkg-config', + required: get_option('libssh'), + kwargs: static_kwargs) endif + libbzip2 = not_found if not get_option('bzip2').auto() or have_block libbzip2 = cc.find_library('bz2', has_headers: ['bzlib.h'], @@ -1451,6 +1455,7 @@ config_host_data.set('CONFIG_EBPF', libbpf.found()) config_host_data.set('CONFIG_LIBDAXCTL', libdaxctl.found()) config_host_data.set('CONFIG_LIBISCSI', libiscsi.found()) config_host_data.set('CONFIG_LIBNFS', libnfs.found()) +config_host_data.set('CONFIG_LIBSSH', libssh.found()) config_host_data.set('CONFIG_LINUX_AIO', libaio.found()) config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found()) config_host_data.set('CONFIG_LIBPMEM', libpmem.found()) @@ -3430,7 +3435,7 @@ endif summary_info += {'seccomp support': seccomp} summary_info += {'GlusterFS support': glusterfs} summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')} -summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')} +summary_info += {'libssh support': libssh} summary_info += {'lzo support': lzo} summary_info += {'snappy support': snappy} summary_info += {'bzip2 support': libbzip2} |