diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-17 06:25:32 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-21 22:50:06 +0100 |
| commit | 57c4ebcaad0ab7b21cd2a0a364ec80a9120823a8 (patch) | |
| tree | d8d7d5f08b348d22ffffcb96c5bb81a83d80e5d3 /data | |
| parent | b8b64e67dc0d46a40c86357e7592320929593674 (diff) | |
msi: use spice-gtk conditionally
Only include spice-gtk as dep when it's explicitly done in the configure.
Diffstat (limited to 'data')
| -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 4c5ff2c..52a1249 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -28,6 +28,12 @@ else HaveOVirt = False endif +if HAVE_SPICE_GTK +HaveSpiceGtk = True +else +HaveSpiceGtk = False +endif + deps.txt: $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ @@ -52,6 +58,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 HaveSpiceGtk=$(HaveSpiceGtk) \ -D HaveLibvirt=$(HaveLibvirt) \ -D HaveOVirt=$(HaveOVirt) \ --arch $(WIXL_ARCH) \ diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in index d9af0e9..01e86a1 100644 --- a/data/virt-viewer.wxs.in +++ b/data/virt-viewer.wxs.in @@ -17,10 +17,14 @@ <?endif?> <?if $(var.GtkVersion) = "2.0"?> + <?if $(var.HaveSpiceGtk) = "True"?> <?require spice-gtk.wxi?> + <?endif?> <?require gtk-vnc.wxi?> <?else?> + <?if $(var.HaveSpiceGtk) = "True"?> <?require spice-gtk3.wxi?> + <?endif?> <?require gtk-vnc2.wxi?> <?require adwaita-icons-needed.wxi?> <?endif?> @@ -124,10 +128,14 @@ <Feature Id="Complete" Level="1"> <?if $(var.GtkVersion) = "2.0"?> - <ComponentGroupRef Id="CG.spice-gtk"/> + <?if $(var.HaveSpiceGtk) = "True"?> + <ComponentGroupRef Id="CG.spice-gtk"/> + <?endif?> <ComponentGroupRef Id="CG.gtk-vnc"/> <?else?> - <ComponentGroupRef Id="CG.spice-gtk3"/> + <?if $(var.HaveSpiceGtk) = "True"?> + <ComponentGroupRef Id="CG.spice-gtk3"/> + <?endif?> <ComponentGroupRef Id="CG.gtk-vnc2"/> <ComponentGroupRef Id="CG.adwaita-icons-needed"/> <?endif?> |