diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-17 06:29:21 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-21 22:52:49 +0100 |
| commit | de700d09efa6564598fec046a50ca3e1fae1af20 (patch) | |
| tree | 1e77464d94cd4395a5c1de0d9a7a770b43a7d232 | |
| parent | 57c4ebcaad0ab7b21cd2a0a364ec80a9120823a8 (diff) | |
msi: use gtk-vnc conditionally
Only include gtk-vnc as dep when it's explicitly done in the configure.
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | data/virt-viewer.wxs.in | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 52a1249..9fa126c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -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) \ diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in index 01e86a1..2b09bba 100644 --- a/data/virt-viewer.wxs.in +++ b/data/virt-viewer.wxs.in @@ -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"?> |