From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 3 Nov 2021 09:57:41 +0000 (+0100)
Subject: meson: Enable ZFS storage backend even more often
X-Git-Tag: v7.10.0-rc1~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4dc9613fb3be1012ef458d62cc5e406b8e1bf3;p=thirdparty%2Flibvirt.git

meson: Enable ZFS storage backend even more often

Commit 73a2ff36163e already improved the situation a lot. This
pushes things even further.

If the user or, more likely, the distro packager explicitly
asked for ZFS support to be enabled, then we should comply with
that request regardless of whether the necessary programs are
available at build time.

This is particularly important in the context of Debian, where
ZFS cannot be a build dependency of libvirt due to licensing
issues but it can still be an optional runtime dependency.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
---

diff --git a/meson.build b/meson.build
index 6f5d480c1e..60bf2a1d72 100644
--- a/meson.build
+++ b/meson.build
@@ -1978,7 +1978,7 @@ if conf.has('WITH_LIBVIRTD')
     foreach name : [ 'zfs', 'zpool' ]
       set_variable(
         '@0@_prog'.format(name),
-        find_program(name, required: get_option('storage_zfs'), dirs: libvirt_sbin_path)
+        find_program(name, required: false, dirs: libvirt_sbin_path)
       )
     endforeach