From a3f6be81aa95f4f80504face9bc6de6d2dc1743f Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 6 Nov 2020 21:03:40 +0000 Subject: meson: always include contrib/libvhost-user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libvhost-user is needed when CONFIG_LINUX is set. The CONFIG_VHOST_USER check in meson.build is incorrect. In fact, no explicit check is needed since this dependency is not built by default. If something declares a dependency on libvhost-user then it will be built, otherwise it won't be built (i.e. on non-Linux hosts). This fixes ./configure --disable-vhost-user && make. Fixes: bc15e44cb2191bbb2318878acdf5038134e56394 ("configure: introduce --enable-vhost-user-blk-server") Reported-by: Philippe Mathieu-Daudé Reported-by: Michael S. Tsirkin Signed-off-by: Stefan Hajnoczi Message-Id: <20201106210340.698771-1-stefanha@redhat.com> Signed-off-by: Thomas Huth --- meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index f5175010df..b473620321 100644 --- a/meson.build +++ b/meson.build @@ -1450,11 +1450,7 @@ trace_events_subdirs += [ 'util', ] -vhost_user = not_found -if 'CONFIG_VHOST_USER' in config_host - subdir('contrib/libvhost-user') -endif - +subdir('contrib/libvhost-user') subdir('qapi') subdir('qobject') subdir('stubs') -- cgit v1.2.3