pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 06:23:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: use gtk-vnc conditionally

Browse Source 
Only include gtk-vnc as dep when it's explicitly done in the configure.
This commit is contained in:
Fabiano Fidêncio 2014-12-17 06:29:21 +01:00
parent 57c4ebcaad
commit de700d09ef
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/Makefile.am
View File

@ -34,6 +34,12 @@ else
HaveSpiceGtk = False
endif
if HAVE_GTK_VNC
HaveGtkVnc = True
else
HaveGtkVnc = False
endif
deps.txt:
$(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
@ -59,6 +65,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
-D DESTDIR=$$DESTDIR$(prefix) \
-D GtkVersion=$(GTK_API_VERSION) \
-D HaveSpiceGtk=$(HaveSpiceGtk) \
-D HaveGtkVnc=$(HaveGtkVnc) \
-D HaveLibvirt=$(HaveLibvirt) \
-D HaveOVirt=$(HaveOVirt) \
--arch $(WIXL_ARCH) \

12
data/virt-viewer.wxs.in
View File

@ -20,12 +20,16 @@
<?if $(var.HaveSpiceGtk) = "True"?>
<?require spice-gtk.wxi?>
<?endif?>
<?if $(var.HaveGtkVnc) = "True"?>
<?require gtk-vnc.wxi?>
<?endif?>
<?else?>
<?if $(var.HaveSpiceGtk) = "True"?>
<?require spice-gtk3.wxi?>
<?endif?>
<?if $(var.HaveGtkVnc) = "True"?>
<?require gtk-vnc2.wxi?>
<?endif?>
<?require adwaita-icons-needed.wxi?>
<?endif?>
<?if $(var.HaveLibvirt) = "True"?>
@ -131,12 +135,16 @@
<?if $(var.HaveSpiceGtk) = "True"?>
<ComponentGroupRef Id="CG.spice-gtk"/>
<?endif?>
<ComponentGroupRef Id="CG.gtk-vnc"/>
<?if $(var.HaveGtkVnc) = "True"?>
<ComponentGroupRef Id="CG.gtk-vnc"/>
<?endif?>
<?else?>
<?if $(var.HaveSpiceGtk) = "True"?>
<ComponentGroupRef Id="CG.spice-gtk3"/>
<?endif?>
<ComponentGroupRef Id="CG.gtk-vnc2"/>
<?if $(var.HaveGtkVnc) = "True"?>
<ComponentGroupRef Id="CG.gtk-vnc2"/>
<?endif?>
<ComponentGroupRef Id="CG.adwaita-icons-needed"/>
<?endif?>
<?if $(var.HaveLibvirt) = "True"?>