------------------------------------------------------------
revno: 13383
revision-id: squid3@treenet.co.nz-20140425151414-mh4bkqkp5j6js6v1
parent: chtsanti@users.sourceforge.net-20140425133822-knwygcv4aycz199e
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Fri 2014-04-25 09:14:14 -0600
message:
  Crypto-NG: require GnuTLS to have version 3.1.5 or later
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140425151414-mh4bkqkp5j6js6v1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: a4981adaeb4767cfa4e3ba5bfc0a2330920aa344
# timestamp: 2014-04-25 15:53:49 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20140425133822-\
#   knwygcv4aycz199e
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2014-04-18 15:47:24 +0000
+++ configure.ac	2014-04-25 15:14:14 +0000
@@ -1240,9 +1240,11 @@
   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