msi: use gtk-vnc conditionally
Only include gtk-vnc as dep when it's explicitly done in the configure.
Fabiano Fidêncio
9 years ago
| 33 | 33 |
HaveSpiceGtk = False
|
| 34 | 34 |
endif
|
| 35 | 35 |
|
|
36 |
if HAVE_GTK_VNC
|
|
37 |
HaveGtkVnc = True
|
|
38 |
else
|
|
39 |
HaveGtkVnc = False
|
|
40 |
endif
|
|
41 |
|
| 36 | 42 |
deps.txt:
|
| 37 | 43 |
$(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
|
| 38 | 44 |
|
|
| 58 | 64 |
-D DESTDIR=$$DESTDIR$(prefix) \
|
| 59 | 65 |
-D GtkVersion=$(GTK_API_VERSION) \
|
| 60 | 66 |
-D HaveSpiceGtk=$(HaveSpiceGtk) \
|
|
67 |
-D HaveGtkVnc=$(HaveGtkVnc) \
|
| 61 | 68 |
-D HaveLibvirt=$(HaveLibvirt) \
|
| 62 | 69 |
-D HaveOVirt=$(HaveOVirt) \
|
| 63 | 70 |
--arch $(WIXL_ARCH) \
|
| 19 | 19 |
<?if $(var.HaveSpiceGtk) = "True"?>
|
| 20 | 20 |
<?require spice-gtk.wxi?>
|
| 21 | 21 |
<?endif?>
|
|
22 |
<?if $(var.HaveGtkVnc) = "True"?>
|
| 22 | 23 |
<?require gtk-vnc.wxi?>
|
|
24 |
<?endif?>
|
| 23 | 25 |
<?else?>
|
| 24 | 26 |
<?if $(var.HaveSpiceGtk) = "True"?>
|
| 25 | 27 |
<?require spice-gtk3.wxi?>
|
| 26 | 28 |
<?endif?>
|
|
29 |
<?if $(var.HaveGtkVnc) = "True"?>
|
| 27 | 30 |
<?require gtk-vnc2.wxi?>
|
|
31 |
<?endif?>
|
| 28 | 32 |
<?require adwaita-icons-needed.wxi?>
|
| 29 | 33 |
<?endif?>
|
| 30 | 34 |
<?if $(var.HaveLibvirt) = "True"?>
|
|
| 130 | 134 |
<?if $(var.HaveSpiceGtk) = "True"?>
|
| 131 | 135 |
<ComponentGroupRef Id="CG.spice-gtk"/>
|
| 132 | 136 |
<?endif?>
|
| 133 | |
<ComponentGroupRef Id="CG.gtk-vnc"/>
|
|
137 |
<?if $(var.HaveGtkVnc) = "True"?>
|
|
138 |
<ComponentGroupRef Id="CG.gtk-vnc"/>
|
|
139 |
<?endif?>
|
| 134 | 140 |
<?else?>
|
| 135 | 141 |
<?if $(var.HaveSpiceGtk) = "True"?>
|
| 136 | 142 |
<ComponentGroupRef Id="CG.spice-gtk3"/>
|
| 137 | 143 |
<?endif?>
|
| 138 | |
<ComponentGroupRef Id="CG.gtk-vnc2"/>
|
|
144 |
<?if $(var.HaveGtkVnc) = "True"?>
|
|
145 |
<ComponentGroupRef Id="CG.gtk-vnc2"/>
|
|
146 |
<?endif?>
|
| 139 | 147 |
<ComponentGroupRef Id="CG.adwaita-icons-needed"/>
|
| 140 | 148 |
<?endif?>
|
| 141 | 149 |
<?if $(var.HaveLibvirt) = "True"?>
|