2007-10-18 [wwp] 3.0.2cvs88

	* src/Makefile.am
		Fix linking against GNUTLS (matters if --enable-gnutls only).

diff --git a/ChangeLog b/ChangeLog
index 4638b1981eb5260d95540fd96b7310bb2956577b..5130c60752cadd88dc623858388ee260983347fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18 [wwp]       3.0.2cvs88
+
+       * src/Makefile.am
+               Fix linking against GNUTLS (matters if --enable-gnutls only).
+
 2007-10-18 [colin]     3.0.2cvs87
 
        * po/POTFILES.in

diff --git a/PATCHSETS b/PATCHSETS
index bbb8adbb4632d5abb1c07397f7705c38e92d5d14..7b03d04163ae90d5051a4ef64c42f0a9566d40a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3000,3 +3000,4 @@
 ( cvs diff -u -r 1.654.2.3054 -r 1.654.2.3055 configure.ac;  cvs diff -u -r 1.4.2.54 -r 1.4.2.55 src/gtk/about.c;  ) > 3.0.2cvs85.patchset
 ( cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editbook.c;  cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/import.c;  cvs diff -u -r 1.105.2.113 -r 1.105.2.114 src/prefs_account.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_receive.c;  cvs diff -u -r 1.4.2.55 -r 1.4.2.56 src/gtk/about.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.23.2.43 -r 1.23.2.44 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.0.2cvs86.patchset
 ( cvs diff -u -r 1.53.2.31 -r 1.53.2.32 po/POTFILES.in;  ) > 3.0.2cvs87.patchset
+( cvs diff -u -r 1.155.2.79 -r 1.155.2.80 src/Makefile.am;  ) > 3.0.2cvs88.patchset

diff --git a/configure.ac b/configure.ac
index 24734e4de5adb398a42793bac1594c0af9211d6d..7a3f77fb13a257fd41334c648a4b993bed4d8bfa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=87
+EXTRA_VERSION=88
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 928460087bb235826da7191913ba5456ee742589..e580ef251477cb6e9dbf2d7c38066277ec883dc2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -481,6 +481,7 @@ claws_mail_LDADD = \
        $(GPGME_LIBS) \
        $(LDAP_LIBS) \
        $(OPENSSL_LIBS) \
+       $(GNUTLS_LIBS) \
        $(COMPFACE_LIBS) \
        $(JPILOT_LIBS) \
        $(PTHREAD_LIBS) \