Made gnutls work again.
authorWerner Koch <wk@gnupg.org>
Tue, 28 Oct 2008 09:41:07 +0000 (09:41 +0000)
committerWerner Koch <wk@gnupg.org>
Tue, 28 Oct 2008 09:41:07 +0000 (09:41 +0000)
ChangeLog
configure.ac
src/Makefile.am

index 784f4c7..6622399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
+2008-10-28  Werner Koch  <wk@g10code.com>
+
+       * configure.ac: Make gnutls depend on libgcrypt.
+
+       * src/Makefile.am (gpg4win_pkg_gnutls_configure): Add more prefix
+       options.
+
 2008-10-27  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
+
        * packages/packages.current: Update kleopatra-bin.
 
 2008-10-27  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
+
        * packages/packages.current: Update kleopatra and kdelibs (without
        source).
 
index c7af0de..fc50f89 100644 (file)
@@ -207,7 +207,7 @@ GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg2])
 GPG4WIN_SPKG([libgsasl])
 GPG4WIN_SPKG([libtasn1])
-GPG4WIN_SPKG([gnutls], [libgsasl libtasn1])
+GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 libgcrypt])
 GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
 GPG4WIN_SPKG([libxml2], [zlib])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
index 53cbe84..25962b9 100644 (file)
@@ -209,7 +209,9 @@ gpg4win_pkg_winpt_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
 gpg4win_pkg_gnutls_configure = \
-  --disable-cxx
+  --disable-cxx \
+  --with-libtasn1-prefix=$(idir) \
+  --with-libgcrypt-prefix=$(idir)
 
 gpg4win_pkg_curl_configure = \
   --with-gnutls --without-ca-bundle