2006-03-09 [wwp] 2.0.0cvs127

	* configure.ac
		revert accidental commit (requirement for libetpan 0.43), this time
		not in HEAD.

diff --git a/ChangeLog b/ChangeLog
index c239ac4bf7312af2c1dea9b8dd917726710f2c3f..3f2f669b0297dbe37dd64115f6c718090ef6fb41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-09 [wwp]       2.0.0cvs127
+
+       * configure.ac
+               revert accidental commit (requirement for libetpan 0.43), this time
+               not in HEAD.
+
 2006-03-09 [wwp]       2.0.0cvs125
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 532e63b2dd921a6517750f49f48a3adeae74b9da..82a3bbeb13e368a8a6891721c45a7c631b5d80ab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1311,3 +1311,4 @@
 ( cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/addressadd.c;  cvs diff -u -r 1.26.2.24 -r 1.26.2.25 src/foldersel.c;  cvs diff -u -r 1.204.2.78 -r 1.204.2.79 src/prefs_common.c;  cvs diff -u -r 1.103.2.44 -r 1.103.2.45 src/prefs_common.h;  ) > 2.0.0cvs125.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_receive.c;  cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.23.2.22 -r 1.23.2.23 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs126.patchset
 ( cvs diff -u -r 1.1370 -r 1.1371 configure.ac;  ) > 2.0.0cvs125.patchset
+( cvs diff -u -r 1.654.2.1356 -r 1.654.2.1357 configure.ac;  ) > 2.0.0cvs127.patchset

diff --git a/configure.ac b/configure.ac
index de6b72ace843f86378a48c40a8d1e2e41aff6f16..730790507d4f0b5b92369df8608827038c96bf5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=126
+EXTRA_VERSION=127
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -759,18 +759,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/-.*$//"`
-          if test "$LIBETPAN_VERSION" -lt "043"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.43 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "041"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-                AC_MSG_ERROR([libetpan 0.43 not found])
+                AC_MSG_ERROR([libetpan 0.41 not found])
           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.43 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/ ])
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-           AC_MSG_ERROR([libetpan 0.43 not found])
+           AC_MSG_ERROR([libetpan 0.41 not found])
        fi
 else
        AC_MSG_RESULT(no)