BACKPORT source4/libcli/ldap/ldap_bind.c from master

[metze/samba/wip.git] / wscript_configure_system_gnutls

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index c6eb9df7b642127cc90f805c8184062b7bb0e642..765fe39dcc989321a463c6dd6e15bd97cb315f14 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -1,4 +1,4 @@
-from waflib import Options
+from waflib import Logs
 import os
 
 def parse_version(v):
@@ -29,6 +29,9 @@ conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
 # Check for gnutls_set_default_priority_append (>= 3.6.3)
 conf.CHECK_FUNCS_IN('gnutls_set_default_priority_append', 'gnutls')
 
+# Check for gnutls_pbkdf2 (>= 3.6.13)
+conf.CHECK_FUNCS_IN('gnutls_pbkdf2', 'gnutls')
+
 # Check for gnutls_aead_cipher_encryptv2
 #
 # This is available since version 3.6.10, but 3.6.10 has a bug which got fixed
@@ -47,6 +50,13 @@ if (gnutls_version > parse_version('3.6.10')):
 if (gnutls_version < parse_version('3.5.2')):
     conf.DEFINE('HAVE_GNUTLS_AEAD_CIPHER_DECRYPT_PTEXT_LEN_BUG', 1)
 
+# GNUTLS_CB_TLS_SERVER_END_POINT is available with
+# 3.7.2
+if (gnutls_version >= parse_version('3.7.2')):
+      conf.DEFINE('HAVE_GNUTLS_CB_TLS_SERVER_END_POINT', 1)
+if (gnutls_version >= parse_version('3.6.0')):
+      conf.DEFINE('HAVE_GNUTLS_DIG_MD5_SHA1', 1)
+
 # Check if gnutls has fips mode support
 # gnutls_fips140_mode_enabled() is available since 3.3.0
 fragment = '''