Thu Dec 6 16:30:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

	* configure.in, qemud/Makefile.am: Added a --without-libvirtd
	  configure option.

diff --git a/ChangeLog b/ChangeLog
index 90f28d18c8f4d2821605dd8a8276de7591233da1..a512758e296111730a481c197384f7919f39fa9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 16:30:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * configure.in, qemud/Makefile.am: Added a --without-libvirtd
+         configure option.
+
 Thu Dec  6 10:35:41 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * libvirt.spec.in: Fix macros build on RHEL distros

diff --git a/configure.in b/configure.in
index 35db64d086f7c61b7de278766d3dd15256ad6048..811e1d6d452bbde160df4367fc81e2318da2e350 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -131,6 +131,8 @@ AC_ARG_WITH(test,
 [  --with-test             add test driver support (on)],[],[with_test=yes])
 AC_ARG_WITH(remote,
 [  --with-remote           add remote driver support (on)],[],[with_remote=yes])
+AC_ARG_WITH(libvirtd,
+[  --with-libvirtd         add libvirtd support (on)],[],[with_libvirtd=yes])
 
 dnl
 dnl specific tests to setup DV devel environments with debug etc ...
@@ -636,6 +638,9 @@ AC_MSG_RESULT([$with_xen_proxy])
 
 AM_CONDITIONAL(WITH_PROXY,[test "$with_xen_proxy" = "yes"])
 
+dnl Enable building libvirtd?
+AM_CONDITIONAL(WITH_LIBVIRTD,[test "x$with_libvirtd" = "xyes"])
+
 dnl Check for gettext
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
@@ -697,6 +702,7 @@ AC_MSG_NOTICE([    QEMU: $with_qemu])
 AC_MSG_NOTICE([  OpenVZ: $with_openvz])
 AC_MSG_NOTICE([    Test: $with_test])
 AC_MSG_NOTICE([  Remote: $with_remote])
+AC_MSG_NOTICE([Libvirtd: $with_libvirtd])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index ef940014b7860723c75818c685554e416c610270..db6adb18a76f5f7f5470b27614453d54e800e1da 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -1,12 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-UUID=$(shell uuidgen)
-
-sbin_PROGRAMS = libvirtd
-
-confdir = $(sysconfdir)/libvirt/
-conf_DATA = libvirtd.conf
-
 # Distribute the generated files so that rpcgen isn't required on the
 # target machine (although almost any Unix machine will have it).
 EXTRA_DIST = libvirtd.init.in libvirtd.sysconf default-network.xml \
@@ -18,7 +11,32 @@ EXTRA_DIST = libvirtd.init.in libvirtd.sysconf default-network.xml \
        remote_dispatch_proc_switch.h \
        mdns.c mdns.h \
         libvirtd.sasl \
-        $(conf_DATA)
+        libvirtd.conf
+
+if RPCGEN
+.x.c:
+       rm -f $@
+       rpcgen -c -o $@ $<
+if GLIBC_RPCGEN
+       mv $@ $@.bak
+       perl -w rpcgen_fix.pl < $@.bak > $@
+endif
+
+.x.h:
+       rm -f $@
+       rpcgen -h -o $@ $<
+endif
+
+remote_protocol.c: remote_protocol.h
+
+if WITH_LIBVIRTD
+
+UUID=$(shell uuidgen)
+
+sbin_PROGRAMS = libvirtd
+
+confdir = $(sysconfdir)/libvirt/
+conf_DATA = libvirtd.conf
 
 libvirtd_SOURCES = \
                qemud.c internal.h \
@@ -43,7 +61,6 @@ libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \
 libvirtd_DEPENDENCIES = ../src/libvirt.la
 libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la
 
-
 if HAVE_POLKIT
 policydir = $(datadir)/PolicyKit/policy
 policy_DATA = libvirtd.policy
@@ -91,22 +108,6 @@ install-data-sasl:
 uninstall-data-sasl:
 endif
 
-if RPCGEN
-.x.c:
-       rm -f $@
-       rpcgen -c -o $@ $<
-if GLIBC_RPCGEN
-       mv $@ $@.bak
-       perl -w rpcgen_fix.pl < $@.bak > $@
-endif
-
-.x.h:
-       rm -f $@
-       rpcgen -h -o $@ $<
-endif
-
-remote_protocol.c: remote_protocol.h
-
 remote.c: remote_dispatch_prototypes.h \
          remote_dispatch_localvars.h \
          remote_dispatch_proc_switch.h
@@ -149,3 +150,5 @@ install-init:
 uninstall-init:
 
 endif # DBUS_INIT_SCRIPTS_RED_HAT
+
+endif # WITH_LIBVIRTD
\ No newline at end of file