[libvirt] [PATCH] build: fix building error when building without libvirtd

[Eric Blake]

On 03/08/2011 07:15 PM, Wen Congyang wrote:
> When building libvirt without libvirtd, I receive the following errors:
> 
> make[1]: Leaving directory `/home/wency/source/test/libvirt/src'
>  (cd daemon && make  top_distdir=../libvirt-0.8.8 distdir=../libvirt-0.8.8/daemon \
>      am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
> make[1]: Entering directory `/home/wency/source/test/libvirt/daemon'
> make[1]: *** No rule to make target `libvirtd.8.in', needed by `distdir'.  Stop.
> make[1]: Leaving directory `/home/wency/source/test/libvirt/daemon'
> make: *** [distdir] Error 1
> 
> This bug was caused by commit 6db98a2d.
> 
> @@ -38,7 +38,6 @@ EXTRA_DIST =						\
>  	test_libvirtd.aug                               \
>  	THREADING.txt					\
>  	libvirtd.pod.in					\
> -	libvirtd.8.in					\
>  	libvirtd.stp					\
>  	$(AVAHI_SOURCES)				\
>  	$(DAEMON_SOURCES)
> @@ -47,6 +46,8 @@ BUILT_SOURCES =
>  
>  if WITH_LIBVIRTD
>  
> +EXTRA_DIST += libvirtd.8.in

NACK.  libvirtd.8.in _must_ be part of the tarball, even when you are
not building libvirtd, since someone else using your tarball may decide
to build libvirtd.  Rather, we need to move the rule for building
libvirtd.8.in outside of the WITH_LIBVIRTD conditional, and always run it.

Instead, does this fix your problem?

diff --git i/daemon/Makefile.am w/daemon/Makefile.am
index 912440c..520bdce 100644
--- i/daemon/Makefile.am
+++ w/daemon/Makefile.am
@@ -71,9 +71,6 @@ libvirtd.8: $(srcdir)/libvirtd.8.in
 	    < $< > $@-t
 	mv $@-t $@

-$(srcdir)/libvirtd.8.in: libvirtd.pod.in
-	$(AM_V_GEN)$(POD2MAN) $< $@
-
 libvirtd_SOURCES = $(DAEMON_SOURCES)

 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
@@ -330,6 +327,10 @@ install-data-local: install-data-sasl
 uninstall-local:: uninstall-data-sasl
 endif # WITH_LIBVIRTD

+# This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
+$(srcdir)/libvirtd.8.in: libvirtd.pod.in
+	$(AM_V_GEN)$(POD2MAN) $< $@
+
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 if HAVE_SASL

I'm just barely starting a test with that, and will probably push it
under the build-breaker rule if it passes.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110308/da0f0a47/attachment-0001.sig>