From f209333996c1a06716db52c261c2870936cd6710 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Thu, 14 Jul 2011 13:20:19 +0800 Subject: [PATCH] build: disable some drivers when building without libvirt daemon We disable some drivers when building without libvirtd in configure, but we do not do the same thing in libvirt.spec. It may break rpm building without libvirtd. --- libvirt.spec.in | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 230237e977..667a1bab6b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -168,6 +168,22 @@ %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif +# Disable some drivers when building without libvirt daemon. +# The logic is the same as in configure.ac +%if ! %{with_libvirtd} +%define with_network 0 +%define with_qemu 0 +%define with_lxc 0 +%define with_uml 0 +%define with_hal 0 +%define with_udev 0 +%define with_storage_fs 0 +%define with_storage_lvm 0 +%define with_storage_iscsi 0 +%define with_storage_mpath 0 +%define with_storage_disk 0 +%endif + # Enable libpcap library %if %{with_qemu} %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} @@ -212,13 +228,6 @@ %define with_rhel5 0 %endif - -# there's no use compiling the network driver without -# the libvirt daemon -%if ! %{with_libvirtd} -%define with_network 0 -%endif - Summary: Library providing a simple virtualization API Name: libvirt Version: @VERSION@