On 11/11/20 10:41 AM, Philippe Mathieu-Daudé wrote: > On 11/10/20 6:11 PM, Stefan Hajnoczi wrote: >> The --enable/disable-vhost-user-blk-server options were implemented in >> ./configure. There has been confusion about them and part of the problem >> is that the shell syntax used for setting the default value is not easy >> to read. Move the option over to meson where the conditions are easier >> to understand: >> >> have_vhost_user_blk_server = (targetos == 'linux') >> >> if get_option('vhost_user_blk_server').enabled() >> if targetos != 'linux' >> error('vhost_user_blk_server requires linux') >> endif >> elif get_option('vhost_user_blk_server').disabled() or not have_system >> have_vhost_user_blk_server = false >> endif > > Something is odd: > > $ ../configure --disable-system --enable-vhost-user-blk-server
I failed when pasting, this misses '--disable-tools' to make sense. We define in meson.build: have_block = have_system or have_tools Maybe this is the one you want instead of have_system? > $ make > > -> no binary. > > Anyhow: > Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> > >> >> This patch does not change behavior. >> >> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> >> --- >> meson_options.txt | 2 ++ >> configure | 16 ++++------------ >> meson.build | 12 ++++++++++++ >> block/export/meson.build | 5 ++++- >> 4 files changed, 22 insertions(+), 13 deletions(-)