2010-12-15 Colin Leroy <colin@colino.net>
authorColin Leroy <colin@colino.net>
Wed, 15 Dec 2010 16:05:27 +0000 (16:05 +0000)
committerColin Leroy <colin@colino.net>
Wed, 15 Dec 2010 16:05:27 +0000 (16:05 +0000)
* src/inst-pinentry.nsi: Fix NSIS builds without QT.

ChangeLog
src/inst-pinentry.nsi

index b3ab130..d936d92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-15  Colin Leroy  <colin@colino.net>
+
+       * src/inst-pinentry.nsi: Fix NSIS builds without QT.
+
 2010-12-15  Marcus Brinkmann  <marcus@g10code.com>
 
        * src/Makefile.am (gpg4win_pkg_claws_mail_post_install): New macro.
index 3306901..d867114 100644 (file)
@@ -37,6 +37,7 @@ Section "-Pinentry" SEC_pinentry
   File "${prefix}/bin/pinentry-w32.exe"
   File "${prefix}/bin/pinentry-gtk-2.exe"
 !ifndef GPG4WIN_LIGHT
+!ifdef HAVE_PKG_QT
   File "${prefix}/bin/pinentry-qt4.exe"
 
   # If Qt is installed (usually by selecting kleopatra), we want
@@ -49,6 +50,7 @@ Section "-Pinentry" SEC_pinentry
   Goto inst_pinentry_done
   inst_pinentry_skip_qt:
 !endif
+!endif
   File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
   inst_pinentry_done: