diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-23 00:39:16 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-23 00:42:05 +0100 |
| commit | 2cbfd08b0991a5a3245f703f4cce96709e55722b (patch) | |
| tree | f3bd51cb1ab9c0d75fc131b7f928c928404c7dd1 /data | |
| parent | c7cbf57efc68602e5d3d26115383d0db29c02bbc (diff) | |
| download | virt-viewer-2cbfd08b0991a5a3245f703f4cce96709e55722b.tar.gz virt-viewer-2cbfd08b0991a5a3245f703f4cce96709e55722b.tar.xz virt-viewer-2cbfd08b0991a5a3245f703f4cce96709e55722b.zip | |
nsis: use gtk-vnc conditionally
Only include gtk-vnc as dep when it's explicitly done in the configure.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rwxr-xr-x | data/virt-viewer.nsis.in | 35 |
2 files changed, 21 insertions, 15 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e8daaf8..510169b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -50,6 +50,7 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt -DDESTDIR=$$DESTDIR \ -DGTK_VERSION=$(GTK_API_VERSION) \ -DHaveSpiceGtk=$(HaveSpiceGtk) \ + -DHaveGtkVnc=$(HaveGtkVnc) \ -DHaveLibvirt=$(HaveLibvirt) \ -DHaveOVirt=$(HaveOVirt) \ $< >/dev/null && \ diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in index 03dbb6b..c6d4cac 100755 --- a/data/virt-viewer.nsis.in +++ b/data/virt-viewer.nsis.in @@ -161,15 +161,18 @@ Section "VirtViewer" !endif #gtkvnc - File "@prefix@/bin/libgnutls-28.dll" - File "@prefix@/bin/libgpg-error-0.dll" - File "@prefix@/bin/libgcrypt-20.dll" - File "@prefix@/bin/libgvnc-1.0-0.dll" - !if ${GTK_VERSION} == 2.0 - File "@prefix@/bin/libgtk-vnc-1.0-0.dll" - !else - File "@prefix@/bin/libgtk-vnc-2.0-0.dll" + !if ${HaveGtkVnc} == True + File "@prefix@/bin/libgpg-error-0.dll" + File "@prefix@/bin/libgcrypt-20.dll" + File "@prefix@/bin/libgvnc-1.0-0.dll" + !if ${GTK_VERSION} == 2.0 + File "@prefix@/bin/libgtk-vnc-1.0-0.dll" + !else + File "@prefix@/bin/libgtk-vnc-2.0-0.dll" + !endif !endif + + File "@prefix@/bin/libgnutls-28.dll" File "@prefix@/bin/libgmp-10.dll" File "@prefix@/bin/libhogweed-2-5.dll" File "@prefix@/bin/libnettle-4-7.dll" @@ -619,18 +622,21 @@ Section "Uninstall" Delete /rebootok "$INSTDIR\bin\virt-xml-validate" Delete /rebootok "$INSTDIR\bin\virt-viewer.exe" !endif - Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgmp-10.dll" Delete /rebootok "$INSTDIR\bin\libhogweed-2-5.dll" Delete /rebootok "$INSTDIR\bin\libnettle-4-7.dll" Delete /rebootok "$INSTDIR\bin\libgcc_s_sjlj-1.dll" Delete /rebootok "$INSTDIR\bin\libgcc_s_seh-1.dll" - !if ${GTK_VERSION} == 2.0 - Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll" - !else - Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll" + !if ${HaveGtkVnc} == True + Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll" + Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll" + Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll" + !if ${GTK_VERSION} == 2.0 + Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll" + !else + Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll" + !endif !endif - Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll" Delete /rebootok "$INSTDIR\bin\libssp-0.dll" Delete /rebootok "$INSTDIR\bin\iconv.dll" !if ${GTK_VERSION} == 2.0 @@ -641,7 +647,6 @@ Section "Uninstall" Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgnutls-28.dll" - Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll" Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll" |