From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Date: Wed, 11 Jan 2017 13:42:41 +0000 (+0100)
Subject: gnutls: check for alpn and ocsp in configure
X-Git-Tag: curl-7_53_0~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ba8020c467936283661357d21fe142f2bc48933;p=thirdparty%2Fcurl.git

gnutls: check for alpn and ocsp in configure

Check for presence of gnutls_alpn_* and gnutls_ocsp_* functions during
configure instead of relying on the version number.  GnuTLS has options
to turn these features off and we ca just work with with such builds
like we work with older versions.

Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>

Closes #1204
---

diff --git a/configure.ac b/configure.ac
index 65dac55bc0..fa44787ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1847,7 +1847,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
             AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
           fi
         fi
-        AC_CHECK_FUNCS(gnutls_certificate_set_x509_key_file2)
+        AC_CHECK_FUNCS([gnutls_certificate_set_x509_key_file2 gnutls_alpn_set_protocols gnutls_ocsp_req_init])
       fi
 
     fi
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 2b539380d7..a992f99947 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -92,11 +92,11 @@ static bool gtls_inited = FALSE;
 #    define GNUTLS_MAPS_WINSOCK_ERRORS 1
 #  endif
 
-#  if (GNUTLS_VERSION_NUMBER >= 0x030200)
+#  if HAVE_GNUTLS_ALPN_SET_PROTOCOLS
 #    define HAS_ALPN
 #  endif
 
-#  if (GNUTLS_VERSION_NUMBER >= 0x03020d)
+#  if HAVE_GNUTLS_OCSP_REQ_INIT
 #    define HAS_OCSP
 #  endif