[patch] Fix check for libetpan version in configure.ac

claws-mail-3.7.5-fix-libetpan-check.patch (text/plain), 1.94 KB, created by Didier Barvaux on 2010-04-09 17:08:24 UTC

Index: configure.ac
===================================================================
RCS file: //claws/configure.ac,v
retrieving revision 1.654.2.4056
diff -u -p -r1.654.2.4056 configure.ac
--- configure.ac	29 Mar 2010 18:22:38 -0000	1.654.2.4056
+++ configure.ac	9 Apr 2010 16:44:40 -0000
@@ -973,11 +973,19 @@ if test x"$ac_cv_enable_libetpan" = xyes
 	if test "x$libetpan_result" = "xyes"; then
 	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
 	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
-	   LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-	   if test "$LIBETPAN_VERSION" -lt "057"; then
+	   AC_MSG_CHECKING([whether libetpan is version 0.57 or newer])
+	   LIBETPAN_VERSION=`$libetpanconfig --version | sed 's/-.*$//'`
+	   LIBETPAN_VERSION_MAJOR=`echo "$LIBETPAN_VERSION" | sed 's/^\(.\+\)\.\(.\+\)$/\1/'`
+	   LIBETPAN_VERSION_MINOR=`echo "$LIBETPAN_VERSION" | sed 's/^\(.\+\)\.\(.\+\)$/\2/'`
+	   if test "$LIBETPAN_VERSION_MAJOR" -gt "0"; then
+		AC_MSG_RESULT([yes, version is $LIBETPAN_VERSION])
+	   elif test "$LIBETPAN_VERSION_MINOR" -ge "57"; then
+		AC_MSG_RESULT([yes, version is $LIBETPAN_VERSION])
+	   else
+		AC_MSG_RESULT([no, version is $LIBETPAN_VERSION])
 		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.])
-                AC_MSG_ERROR([libetpan 0.57 not found])
+		AC_MSG_ERROR([libetpan >= 0.57 not found])
 	   fi
 	   AC_SUBST(LIBETPAN_FLAGS)
 	   AC_SUBST(LIBETPAN_LIBS)
@@ -985,7 +993,7 @@ if test x"$ac_cv_enable_libetpan" = xyes
 	else
 	   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.])
-           AC_MSG_ERROR([libetpan 0.57 not found])
+	   AC_MSG_ERROR([libetpan >= 0.57 not found])
 	fi
 else
 	AC_MSG_RESULT(no)