[virt-tools-list] [PATCH 2/4] msi: use libgovirt conditionally

[Fabiano Fidêncio]

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

diff --git a/data/Makefile.am b/data/Makefile.am
index e3d127e..1bd2183 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 HaveLibvirt=${HAVE_LIBVIRT}				\
+             -D HaveOVirt=${HAVE_OVIRT}					\
              --arch $(WIXL_ARCH)					\
              -o $@							\
 	     $< virt-viewer-files.wxs &&				\
diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
index aa435f6..7faac05 100644
--- a/data/virt-viewer.wxs.in
+++ b/data/virt-viewer.wxs.in
@@ -27,7 +27,9 @@
   <?if $(var.HaveLibvirt) = "1"?>
     <?require libvirt.wxi?>
   <?endif?>
-  <?require libgovirt.wxi?>
+  <?if $(var.HaveOVirt) = "1"?>
+    <?require libgovirt.wxi?>
+  <?endif?>
 
   <?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
   <Product Id="*"
@@ -132,7 +134,9 @@
       <?if $(var.HaveLibvirt) = "1"?>
         <ComponentGroupRef Id="CG.libvirt"/>
       <?endif?>
-      <ComponentGroupRef Id="CG.libgovirt"/>
+      <?if $(var.HaveOVirt) = "1"?>
+        <ComponentGroupRef Id="CG.libgovirt"/>
+      <?endif?>
       <ComponentGroupRef Id="CG.virt-viewer"/>
       <ComponentRef Id="CDepsFile"/>
       <ComponentRef Id="CShortcut"/>
-- 
2.1.0