From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Apr 2014 15:14:14 +0000 (-0600)
Subject: Crypto-NG: require GnuTLS to have version 3.1.5 or later
X-Git-Tag: SQUID_3_5_0_1~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c113986ed8b0c282b723e51d8b243a8ddc951019;p=thirdparty%2Fsquid.git

Crypto-NG: require GnuTLS to have version 3.1.5 or later
---

diff --git a/configure.ac b/configure.ac
index d4b89c46c0..46b76499af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,9 +1240,11 @@ if test "x$with_gnutls" != "xno"; then
   LIBS="$LIBS $LIBGNUTLS_PATH"
 
   # auto-detect using pkg-config
-  PKG_CHECK_MODULES([LIBGNUTLS],[gnutls],,[
+  PKG_CHECK_MODULES([LIBGNUTLS],[gnutls >= 3.1.5],,[
     ## find the package without pkg-config
-    AC_CHECK_LIB(gnutls,gnutls_init,[LIBGNUTLS_LIBS="-lgnutls"])
+    ## check that the library is actually new enough.
+    ## by testing for a 3.1.5+ function which we use
+    AC_CHECK_LIB(gnutls,gnutls_certificate_verify_peers3,[LIBGNUTLS_LIBS="-lgnutls"])
   ])
 
   SQUID_STATE_ROLLBACK(squid_gnutls_state) #de-pollute LIBS