Allow UML build to be disabled in RPM

diff --git a/ChangeLog b/ChangeLog
index 3ac7f085df07e079140ea9289768228d154195b4..a0322870010a4e3aeeae3ea19e778e30cf64863a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 21 10:07:14 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * libvirt.spec.in: Add conditional to allow UML driver to be
+       disabled
+
 Fri Nov 21 11:05:14 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * po/POTFILES.in src/uml_conf.h src/uml_driver.c: fixes syntax

diff --git a/libvirt.spec.in b/libvirt.spec.in
index cfd4a6629e3cdb99259036c0321e07c2accc0a09..91af8436ced1a717eab4f44dd39d0fe81dfaf750 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -10,6 +10,7 @@
 %define with_polkit    0%{!?_without_polkit:0}
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
+%define with_uml       0%{!?_without_uml:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -197,6 +198,10 @@ of recent versions of Linux (and other OSes).
 %define _without_libvirtd --without-libvirtd
 %endif
 
+%if ! %{with_uml}
+%define _without_uml --without-uml
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -206,6 +211,7 @@ of recent versions of Linux (and other OSes).
            %{?_without_polkit} \
            %{?_without_python} \
            %{?_without_libvirtd} \
+           %{?_without_uml} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid