[virt-tools-list] [PATCH 4/4] msi: use gtk-vnc conditionally

[Fabiano Fidêncio]

Only include gtk-vnc as dep when it's explicitly done in the configure.
---
 data/Makefile.am        |  1 +
 data/virt-viewer.wxs.in | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index de1fde1..35a25e2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,6 +41,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
              -D DESTDIR=$$DESTDIR$(prefix)				\
              -D GtkVersion=${GTK_API_VERSION}				\
              -D HaveSpiceGtk=${HAVE_SPICE_GTK}				\
+             -D HaveGtkVnc=${HAVE_GTK_VNC}				\
              -D HaveLibvirt=${HAVE_LIBVIRT}				\
              -D HaveOVirt=${HAVE_OVIRT}					\
              --arch $(WIXL_ARCH)					\
diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
index 7cad9fa..117ebc5 100644
--- a/data/virt-viewer.wxs.in
+++ b/data/virt-viewer.wxs.in
@@ -20,12 +20,16 @@
     <?if $(var.HaveSpiceGtk) = "1"?>
       <?require spice-gtk.wxi?>
     <?endif?>
+    <?if $(var.HaveGtkVnc) = "1"?>
       <?require gtk-vnc.wxi?>
+    <?endif?>
   <?else?>
     <?if $(var.HaveSpiceGtk) = "1"?>
       <?require spice-gtk3.wxi?>
     <?endif?>
+    <?if $(var.HaveGtkVnc) = "1"?>
       <?require gtk-vnc2.wxi?>
+    <?endif?>
       <?require adwaita-icons-needed.wxi?>
   <?endif?>
   <?if $(var.HaveLibvirt) = "1"?>
@@ -131,12 +135,16 @@
         <?if $(var.HaveSpiceGtk) = "1"?>
           <ComponentGroupRef Id="CG.spice-gtk"/>
         <?endif?>
-        <ComponentGroupRef Id="CG.gtk-vnc"/>
+        <?if $(var.HaveGtkVnc) = "1"?>
+          <ComponentGroupRef Id="CG.gtk-vnc"/>
+        <?endif?>
       <?else?>
         <?if $(var.HaveSpiceGtk) = "1"?>
           <ComponentGroupRef Id="CG.spice-gtk3"/>
         <?endif?>
-        <ComponentGroupRef Id="CG.gtk-vnc2"/>
+        <?if $(var.HaveGtkVnc) = "1"?>
+          <ComponentGroupRef Id="CG.gtk-vnc2"/>
+        <?endif?>
         <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
       <?endif?>
       <?if $(var.HaveLibvirt) = "1"?>
-- 
2.1.0