[Commits] [SCM] claws branch, master, updated. 3.13.0-42-gd33faf7

[mones at claws-mail.org]

The branch, master has been updated
       via  d33faf750fc05123e509d4cd0384159bcef610ee (commit)
      from  d390fa07f5548f3173dd9cc13b233db5ce934c82 (commit)

Summary of changes:
 configure.ac |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit d33faf750fc05123e509d4cd0384159bcef610ee
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Nov 6 12:10:02 2015 +0100

    Fix libetpan version test
    
    For current libetpan versioning schema ;-)
    Thanks Brian Morrison for the heads up!

diff --git a/configure.ac b/configure.ac
index 2aa91d0..546a473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ LT_INIT
 LT_AC_PROG_RC
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
+AC_PROG_AWK
 
 AC_SYS_LARGEFILE
 
@@ -871,12 +872,8 @@ if test x"$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
+	   LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
+	   if test "$LIBETPAN_VERSION" -lt "57"; 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.])
                 AC_MSG_ERROR([libetpan 0.57 not found])

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail