More fixes for (portable) Vanilla installer
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 18 Nov 2014 15:38:10 +0000 (16:38 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 18 Nov 2014 15:38:10 +0000 (16:38 +0100)
    * src/gpg4win.nsi (GPG4WIN_VANILLA): Include libtasn.
    * src/mkportable-vanilla.h: Include libtasn and gnutls.

src/gpg4win.nsi
src/mkportable-vanilla.h

index 4a62a05..d89b354 100644 (file)
@@ -56,9 +56,9 @@
 !ifdef HAVE_PKG_LIBGSASL
 !undef HAVE_PKG_LIBGSASL
 !endif
-!ifdef HAVE_PKG_LIBTASN1
-!undef HAVE_PKG_LIBTASN1
-!endif
+;!ifdef HAVE_PKG_LIBTASN1
+;!undef HAVE_PKG_LIBTASN1
+;!endif
 ;!ifdef HAVE_PKG_GNUTLS
 ;!undef HAVE_PKG_GNUTLS
 ;!endif
index 9394b33..cbed38e 100644 (file)
@@ -27,10 +27,14 @@ const char * const vanilla_files[] =
   "libffi-6.dll",
   "libgcrypt-20.dll",
   "libgdk_pixbuf-2.0-0.dll",
+  "libgnutls-26.dll",
+  "libgnutls-extra-26.dll",
+  "libgnutls-openssl-27.dll",
   "libgpg-error-0.dll",
   "libiconv-2.dll",
   "libintl-8.dll",
   "libksba-8.dll",
+  "libtasn1-3.dll",
   "libw32pth-0.dll",
   "md5sum.exe",
   "paperkey.exe",