On 10/22/2010 03:05 PM, Eric Blake wrote:
On 10/22/2010 02:57 PM, Justin Clift wrote:
> This 1-liner was actually written by Eric Blake, over IRC. It
> addresses a compilation failure in make dist and make rpm for
> systems without the dtrace/systemtap development libraries
> installed.
> ---
> daemon/Makefile.am | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index 0e254d4..d1ffd97 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -168,7 +168,7 @@ EXTRA_DIST += probes.d libvirtd.stp
>
> if WITH_DTRACE
> libvirtd_LDADD += probes.o
> -libvirtd_SOURCES += probes.h
> +libvirtd_nodist_SOURCES = probes.h
Given your testing of my one-liner IRC comment:
ACK.
Actually, the automake manual says this needs to be
nodist_libvirtd_SOURCES (sorry I didn't check the manual before ACK'ing;
and I'm assuming you tested without dtrace).
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org