From 89f3735091de947e50b7069fd659baafb64d12d5 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 18 Oct 2007 15:47:24 +0000 Subject: [PATCH 1/1] 2007-10-18 [wwp] 3.0.2cvs88 * src/Makefile.am Fix linking against GNUTLS (matters if --enable-gnutls only). --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/Makefile.am | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4638b1981..5130c6075 100644 --- 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 bbb8adbb4..7b03d0416 100644 --- 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 24734e4de..7a3f77fb1 100644 --- 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 928460087..e580ef251 100644 --- 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) \ -- 2.25.1