talons

commit 7166e8603d29b3bc535450d364d5af9faa1b4981
parent ebd29bd72d587035c7da2dac321d1a9666724832
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 12 Apr 2010 14:19:12 +0000

2010-04-12 [colin]	3.7.5cvs45

	* configure.ac
		Fix bug 2162, 'configure check for libetpan
		fails with libetpan 1.0'

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
6
+++++-

3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-12 [colin]	3.7.5cvs45
+
+	* configure.ac
+		Fix bug 2162, 'configure check for libetpan 
+		fails with libetpan 1.0'
+
+
 2010-04-09 [mones]	3.7.5cvs44
 
 	* manual/de/glossary.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -3985,3 +3985,4 @@
 ( cvs diff -u -r 1.1.2.90 -r 1.1.2.91 src/gtk/quicksearch.c;  ) > 3.7.5cvs42.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/matcher_parser.h;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.2.91 -r 1.1.2.92 src/gtk/quicksearch.c;  ) > 3.7.5cvs43.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/de/glossary.xml;  ) > 3.7.5cvs44.patchset
+( cvs diff -u -r 1.654.2.4057 -r 1.654.2.4058 configure.ac;  ) > 3.7.5cvs45.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -973,7 +973,11 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
 	if test "x$libetpan_result" = "xyes"; then
 	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
 	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
+           LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
 	   LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
+           if test x"$LIBETPAN_STABLE" != "x"; then
+                LIBETPAN_VERSION="100"
+           fi
 	   if test "$LIBETPAN_VERSION" -lt "057"; then
 		AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
 		AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])