The %meson macro sets "--auto-features=enabled", so it is not enough to
disable the driver options, we must also disable any library options
which the drivers depend on.
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
libvirt.spec.in | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 06afd0dab8..1b6a9596d8 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1026,15 +1026,15 @@ exit 1
%endif
%if %{with_esx}
- %define arg_esx -Ddriver_esx=enabled
+ %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled
%else
- %define arg_esx -Ddriver_esx=disabled
+ %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled
%endif
%if %{with_hyperv}
- %define arg_hyperv -Ddriver_hyperv=enabled
+ %define arg_hyperv -Ddriver_hyperv=enabled -Dopenwsman=enabled
%else
- %define arg_hyperv -Ddriver_hyperv=disabled
+ %define arg_hyperv -Ddriver_hyperv=disabled -Dopenwsman=disabled
%endif
%if %{with_vmware}
@@ -1056,9 +1056,9 @@ exit 1
%endif
%if %{with_storage_gluster}
- %define arg_storage_gluster -Dstorage_gluster=enabled
+ %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled
%else
- %define arg_storage_gluster -Dstorage_gluster=disabled
+ %define arg_storage_gluster -Dstorage_gluster=disabled -Dglusterfs=disabled
%endif
%if %{with_storage_zfs}
@@ -1104,9 +1104,9 @@ exit 1
%endif
%if %{with_storage_iscsi_direct}
- %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled
+ %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled -Dlibiscsi=enabled
%else
- %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled
+ %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled -Dlibiscsi=disabled
%endif
%if %{with_libssh}
--
2.28.0
