[Commits] [SCM] claws branch, master, updated. 3.10.0-36-g6600454

Colin colin at claws-mail.org
Mon Jun 2 16:06:55 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  6600454d455753ec964bc08b779239eec1e7f355 (commit)
      from  75da952813ff61e16cfa6b9e15ce4f9bedf0c608 (commit)


- Log -----------------------------------------------------------------
commit 6600454d455753ec964bc08b779239eec1e7f355
Author: Colin Leroy <colin at colino.net>
Date:   Mon Jun 2 16:06:37 2014 +0200

    Check for GnuTLS >= 2.11 only if we have GnuTLS >= 2.2

diff --git a/configure.ac b/configure.ac
index 19bae06..0740ec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,18 +474,18 @@ if test "x$enable_gnutls" != "xno"; then
         [
                 AC_DEFINE(USE_GNUTLS, 1, gnutls)
                 echo "Building with GnuTLS"
+		PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.11,
+		[
+			dnl No linking against libgcrypt needed
+		],
+		[
+			dnl linking against libgcrypt *is* needed
+			GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
+		])
         ],
         [
                 echo "Building without gnutls"
         ])
-        PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.11,
-        [
-                dnl No linking against libgcrypt needed
-        ],
-        [
-                dnl linking against libgcrypt *is* needed
-                GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
-        ])
         AC_SUBST(GNUTLS_LIBS)
         AC_SUBST(GNUTLS_CFLAGS)
 fi

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

Summary of changes:
 configure.ac |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list