shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-09 08:58:17 +03:00
Code Issues Projects Releases Wiki Activity

nsis: use gtk-vnc conditionally

Browse Source 
Only include gtk-vnc as dep when it's explicitly done in the configure.
This commit is contained in:
Fabiano Fidêncio 2014-12-23 00:39:16 +01:00
parent c7cbf57efc
commit 2cbfd08b09
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Makefile.am
View File

@ -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 && \

35
data/virt-viewer.nsis.in
View File

@ -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"