2006-08-22 [colin] 2.4.0cvs74

	* configure.ac
		Require libetpan 0.46 (crasher fix when built
		against gnutls)

diff --git a/ChangeLog b/ChangeLog
index a7d4a209a24ee95c8e8b643f6a3e85cca75637e5..8fad3467b972637d7fab17ff0bf7c8153c149e57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-22 [colin]     2.4.0cvs74
+
+       * configure.ac
+               Require libetpan 0.46 (crasher fix when built
+               against gnutls)
+

 2006-08-22 [colin]     2.4.0cvs73
 
        * src/folder.c
 2006-08-22 [colin]     2.4.0cvs73
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index d3a2af65064a1b75febf5b7d709fc35bbe3ad1b3..5d49f289782bdf4b75d94a80dd0d2215498e376d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1765,3 +1765,4 @@
 ( cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/pluginwindow.c;  ) > 2.4.0cvs71.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/account.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/faq.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/handling.xml;  ) > 2.4.0cvs72.patchset
 ( cvs diff -u -r 1.213.2.106 -r 1.213.2.107 src/folder.c;  cvs diff -u -r 1.207.2.112 -r 1.207.2.113 src/folderview.c;  cvs diff -u -r 1.150.2.73 -r 1.150.2.74 src/procmsg.c;  cvs diff -u -r 1.395.2.230 -r 1.395.2.231 src/summaryview.c;  cvs diff -u -r 1.36.2.75 -r 1.36.2.76 src/common/utils.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.38 -r 1.5.2.39 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/gtk/gtkutils.h;  ) > 2.4.0cvs73.patchset
 ( cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/pluginwindow.c;  ) > 2.4.0cvs71.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/account.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/faq.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/handling.xml;  ) > 2.4.0cvs72.patchset
 ( cvs diff -u -r 1.213.2.106 -r 1.213.2.107 src/folder.c;  cvs diff -u -r 1.207.2.112 -r 1.207.2.113 src/folderview.c;  cvs diff -u -r 1.150.2.73 -r 1.150.2.74 src/procmsg.c;  cvs diff -u -r 1.395.2.230 -r 1.395.2.231 src/summaryview.c;  cvs diff -u -r 1.36.2.75 -r 1.36.2.76 src/common/utils.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.38 -r 1.5.2.39 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/gtk/gtkutils.h;  ) > 2.4.0cvs73.patchset

+( cvs diff -u -r 1.654.2.1812 -r 1.654.2.1813 configure.ac;  ) > 2.4.0cvs74.patchset

diff --git a/configure.ac b/configure.ac
index 62bd591a388933fc94abd8a36e1e1e5a8aee28dc..7bc2af7dca9f23da07c22a095a1bdb81fcd62395 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=73
+EXTRA_VERSION=74

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -768,18 +768,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`

-          if test "$LIBETPAN_VERSION" -lt "045"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.45 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "046"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/])

                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])

-                AC_MSG_ERROR([libetpan 0.45 not found])
+                AC_MSG_ERROR([libetpan 0.46 not found])

           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else

-          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.45 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/ ])

           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])

-           AC_MSG_ERROR([libetpan 0.45 not found])
+           AC_MSG_ERROR([libetpan 0.46 not found])

        fi
 else
        AC_MSG_RESULT(no)
        fi
 else
        AC_MSG_RESULT(no)