[Gpg4win-commits] r1002 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-10-28 10:41:07 +0100 (Tue, 28 Oct 2008)
New Revision: 1002

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
Log:
Made gnutls work again.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-27 20:09:14 UTC (rev 1001)
+++ trunk/ChangeLog	2008-10-28 09:41:07 UTC (rev 1002)
@@ -1,7 +1,16 @@
+2008-10-28  Werner Koch  <wk at 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 at intevation.de>
+
 	* packages/packages.current: Update kleopatra-bin.
 
 2008-10-27  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
+
 	* packages/packages.current: Update kleopatra and kdelibs (without
 	source).
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-10-27 20:09:14 UTC (rev 1001)
+++ trunk/configure.ac	2008-10-28 09:41:07 UTC (rev 1002)
@@ -207,7 +207,7 @@
 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

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-10-27 20:09:14 UTC (rev 1001)
+++ trunk/src/Makefile.am	2008-10-28 09:41:07 UTC (rev 1002)
@@ -209,7 +209,9 @@
   --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