meson: always include contrib/libvhost-user
commita3f6be81aa95f4f80504face9bc6de6d2dc1743f
authorStefan Hajnoczi <stefanha@redhat.com>
Fri, 6 Nov 2020 21:03:40 +0000 (6 21:03 +0000)
committerThomas Huth <thuth@redhat.com>
Mon, 9 Nov 2020 17:34:21 +0000 (9 18:34 +0100)
tree1c0d89befb43ba6340a6247d46479543c359a034
parenta2547c1ba911a0c53a10fe02d94a0f539dc064cc
meson: always include contrib/libvhost-user

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é <philmd@redhat.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201106210340.698771-1-stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
meson.build