----- Original Message -----
> Only include libvirt as dep when it's explicitly done in the configure.
> ---
> data/Makefile.am | 1 +
> data/virt-viewer.wxs.in | 8 ++++++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/data/Makefile.am b/data/Makefile.am
> index c80b970..e3d127e 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -40,6 +40,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs
> deps.txt
> MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
> -D DESTDIR=$$DESTDIR$(prefix) \
> -D GtkVersion=${GTK_API_VERSION} \
> + -D HaveLibvirt=${HAVE_LIBVIRT} \
ack series
Btw, why do you use the ${} notation?
> --arch $(WIXL_ARCH) \
> -o $@ \
> $< virt-viewer-files.wxs && \
> diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
> index cc5b2fa..aa435f6 100644
> --- a/data/virt-viewer.wxs.in
> +++ b/data/virt-viewer.wxs.in
> @@ -24,7 +24,9 @@
> <?require gtk-vnc2.wxi?>
> <?require adwaita-icons-needed.wxi?>
> <?endif?>
> - <?require libvirt.wxi?>
> + <?if $(var.HaveLibvirt) = "1"?>
> + <?require libvirt.wxi?>
> + <?endif?>
> <?require libgovirt.wxi?>
>
> <?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
> @@ -127,7 +129,9 @@
> <ComponentGroupRef Id="CG.gtk-vnc2"/>
> <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
> <?endif?>
> - <ComponentGroupRef Id="CG.libvirt"/>
> + <?if $(var.HaveLibvirt) = "1"?>
> + <ComponentGroupRef Id="CG.libvirt"/>
> + <?endif?>
> <ComponentGroupRef Id="CG.libgovirt"/>
> <ComponentGroupRef Id="CG.virt-viewer"/>
> <ComponentRef Id="CDepsFile"/>
> --
> 2.1.0
>
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/virt-tools-list
>
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
