I had to move stuff around in the qemud/Makefile.am file in order to bring the libvirtd-dependent parts together, but I didn't change any of it.
Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903
Index: configure.in
===================================================================
RCS file: /data/cvs/libvirt/configure.in,v
retrieving revision 1.110
diff -u -r1.110 configure.in
--- configure.in 6 Dec 2007 11:42:26 -0000 1.110
+++ configure.in 6 Dec 2007 15:26:58 -0000
@@ -131,6 +131,8 @@
[ --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 @@
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([ 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([])
Index: qemud/Makefile.am
===================================================================
RCS file: /data/cvs/libvirt/qemud/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- qemud/Makefile.am 5 Dec 2007 21:31:07 -0000 1.40
+++ qemud/Makefile.am 6 Dec 2007 15:29:18 -0000
@@ -2,11 +2,6 @@
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 \
@@ -20,6 +15,28 @@
libvirtd.sasl \
$(conf_DATA)
+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
+sbin_PROGRAMS = libvirtd
+
+confdir = $(sysconfdir)/libvirt/
+conf_DATA = libvirtd.conf
+
libvirtd_SOURCES = \
qemud.c internal.h \
remote_protocol.h remote_protocol.c \
@@ -43,7 +60,6 @@
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 +107,6 @@
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 +149,4 @@
uninstall-init:
endif # DBUS_INIT_SCRIPTS_RED_HAT
+endif # WITH_LIBVIRTD
\ No newline at end of file
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
-- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list