msi: use libgovirt conditionally

Only include libgovirt as dep when it's explicitly done in the configure.
This commit is contained in:
Fabiano Fidêncio 2014-12-17 06:21:33 +01:00
parent befd4608e4
commit b8b64e67dc
2 changed files with 13 additions and 2 deletions

View File

@ -22,6 +22,12 @@ else
HaveLibvirt = False
endif
if HAVE_OVIRT
HaveOVirt = True
else
HaveOVirt = False
endif
deps.txt:
$(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
@ -47,6 +53,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
-D DESTDIR=$$DESTDIR$(prefix) \
-D GtkVersion=$(GTK_API_VERSION) \
-D HaveLibvirt=$(HaveLibvirt) \
-D HaveOVirt=$(HaveOVirt) \
--arch $(WIXL_ARCH) \
-o $@ \
$< virt-viewer-files.wxs && \

View File

@ -27,7 +27,9 @@
<?if $(var.HaveLibvirt) = "True"?>
<?require libvirt.wxi?>
<?endif?>
<?require libgovirt.wxi?>
<?if $(var.HaveOVirt) = "True"?>
<?require libgovirt.wxi?>
<?endif?>
<?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
<Product Id="*"
@ -132,7 +134,9 @@
<?if $(var.HaveLibvirt) = "True"?>
<ComponentGroupRef Id="CG.libvirt"/>
<?endif?>
<ComponentGroupRef Id="CG.libgovirt"/>
<?if $(var.HaveOVirt) = "True"?>
<ComponentGroupRef Id="CG.libgovirt"/>
<?endif?>
<ComponentGroupRef Id="CG.virt-viewer"/>
<ComponentRef Id="CDepsFile"/>
<ComponentRef Id="CShortcut"/>