[Commits] [SCM] claws branch, master, updated. 3.13.2-99-ge10f0ce

[ticho at claws-mail.org]

The branch, master has been updated
       via  e10f0ced1ef1e5b2b697227b49ef6ad173439c9b (commit)
      from  0a55c9ba3750ea67fb3753fca99985e65e6fa518 (commit)

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


- Log -----------------------------------------------------------------
commit e10f0ced1ef1e5b2b697227b49ef6ad173439c9b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Apr 2 13:58:48 2016 +0200

    Require GnuTLS version 3.0 for password encryption.

diff --git a/configure.ac b/configure.ac
index dd0e18d..d9e0732 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,17 +524,23 @@ AC_ARG_WITH(password-encryption, [  --with-password-encryption=PROVIDER    Which
 
 if test x"$pwd_crypto" = xdefault; then
 	if test x"$enable_gnutls" = xyes; then
-		pwd_crypto="gnutls"
-	else
-		pwd_crypto="old"
+		if `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+			pwd_crypto="gnutls"
+		fi
 	fi
 fi
+if test x"$pwd_crypto" = xdefault; then
+	pwd_crypto="old"
+fi
 
 case $pwd_crypto in
 	gnutls)
 		if test x"$enable_gnutls" = xno; then
 			AC_MSG_ERROR([GnuTLS password encryption requested but GnuTLS is not available.])
 		fi
+		if ! `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+			AC_MSG_ERROR([GnuTLS version at least 3.0 is required for password encryption.])
+		fi
 		AC_DEFINE(PASSWORD_CRYPTO_GNUTLS, 1, Use GnuTLS for stored password encryption)
 		;;
 	old)

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


hooks/post-receive
-- 
Claws Mail