From 3a489d38fd0076d2f9fc8c60b70aa66290a0a199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 20 Jan 2021 16:15:39 +0100 Subject: [PATCH] meson: Declare have_virtfs_proxy_helper in main meson.build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit have_virtfs_proxy_helper is used from docs/meson.build, and can be not declared when including it before fsdev/meson.build. This fixes: ../docs/meson.build:54:2: ERROR: Unknown variable "have_virtfs_proxy_helper". Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210120151539.1166252-1-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- fsdev/meson.build | 1 - meson.build | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fsdev/meson.build b/fsdev/meson.build index 65455a179e..adf57cc43e 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -8,7 +8,6 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( ), if_false: files('qemu-fsdev-dummy.c')) softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) -have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and have_virtfs if have_virtfs_proxy_helper executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'), diff --git a/meson.build b/meson.build index e813814fb0..4f0e459243 100644 --- a/meson.build +++ b/meson.build @@ -1034,6 +1034,8 @@ have_virtfs = (targetos == 'linux' and libattr.found() and libcap_ng.found()) +have_virtfs_proxy_helper = have_virtfs and have_tools + if get_option('virtfs').enabled() if not have_virtfs if targetos != 'linux'