2006-09-28 [colin] 2.5.2cvs14

	* src/Makefile.am
		Actually use SM_LIBS

diff --git a/ChangeLog b/ChangeLog
index 6d6f8af9122ee6a6f75f33e77d85627435e6ed7c..f6a2f6d9712d77689cf2c7fa8325b0bf6c3ca389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-28 [colin]     2.5.2cvs14
+
+       * src/Makefile.am
+               Actually use SM_LIBS
+
 2006-09-28 [ticho]     2.5.2cvs13
 
        * src/export.c

diff --git a/PATCHSETS b/PATCHSETS
index e7b0e5bfc86b154e899ea1e0716a5184c9e10681..93f7a49604661d5ea768542997ec6b5cac8b67b6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1927,3 +1927,4 @@
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/authors.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 doc/man/sylpheed-claws.1;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/ack.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/ack.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/ack.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/ack.xml;  ) > 2.5.2cvs11.patchset
 ( cvs diff -u -r 1.654.2.1975 -r 1.654.2.1976 configure.ac;  ) > 2.5.2cvs12.patchset
 ( cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/export.c;  cvs diff -u -r 1.94.2.106 -r 1.94.2.107 src/messageview.c;  cvs diff -u -r 1.83.2.90 -r 1.83.2.91 src/mimeview.c;  cvs diff -u -r 1.101.2.30 -r 1.101.2.31 src/news.c;  cvs diff -u -r 1.56.2.43 -r 1.56.2.44 src/pop.c;  cvs diff -u -r 1.3.2.43 -r 1.3.2.44 src/prefs_themes.c;  cvs diff -u -r 1.150.2.79 -r 1.150.2.80 src/procmsg.c;  cvs diff -u -r 1.17.2.33 -r 1.17.2.34 src/send_message.c;  cvs diff -u -r 1.395.2.255 -r 1.395.2.256 src/summaryview.c;  cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/common/session.c;  cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/common/smtp.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/common/ssl_certificate.c;  cvs diff -u -r 1.36.2.79 -r 1.36.2.80 src/common/utils.c;  ) > 2.5.2cvs13.patchset
+( cvs diff -u -r 1.155.2.42 -r 1.155.2.43 src/Makefile.am;  ) > 2.5.2cvs14.patchset

diff --git a/configure.ac b/configure.ac
index abb2f05494a57687857700388337b363a8120051..44921e0eebf5fbe7b96bd945646f729f7e3debd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/Makefile.am b/src/Makefile.am
index e6c2dac4f2be849f699fe1e823ba8d3fbae227c2..b7691e37c0124037b80e72a26f107449fd38129e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -431,6 +431,7 @@ sylpheed_claws_LDADD = \
        $(JPILOT_LIBS) \
        $(PTHREAD_LIBS) \
        $(GNOMEPRINT_LIBS) \
+       $(SM_LIBS) \
        $(LIBICONV) \
        $(STARTUP_NOTIFICATION_LIBS) \
        $(LIBETPAN_LIBS)