waf: Add check for gnutls_x509_crt_set_subject_unique_id()

This is used by the GnuTLS backupkey implementation.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index ece71b6adae0969b57702daf49c709c473c02803..a101846cdf218e1dd8a5b8db5ef3f1b003f61f8c 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -119,7 +119,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        )
 
 
-if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'):
+if bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID'):
        bld.SAMBA_MODULE('dcerpc_backupkey',
                source='backupkey/dcesrv_backupkey.c ',
                autoproto='backupkey/proto.h',

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 0189300aca95c6d47933201ec81996c5c03f5291..97b36a1f3a582c7e159b026840a7e97c979686f9 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -83,7 +83,7 @@ bld.SAMBA_SUBSYSTEM('IREMOTEWINSPOOL_COMMON',
 
 torture_rpc_backupkey = ''
 if bld.AD_DC_BUILD_IS_ENABLED():
-    if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'):
+    if bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID'):
         torture_rpc_backupkey = 'rpc/backupkey.c'
     else:
         torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index f46cf31eca3f45c64f4db1a840183628c7daad17..85b1277d2ee56299832bb7350bd75a4c7593830c 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -20,6 +20,9 @@ conf.CHECK_CFG(package='gnutls',
 # Define gnutls as a system library
 conf.SET_TARGET_TYPE('gnutls', 'SYSLIB')
 
+# Check for gnutls_x509_crt_set_subject_unique_id (>= 3.4.7) required by backupkey
+conf.CHECK_FUNCS_IN('gnutls_x509_crt_set_subject_unique_id', 'gnutls')
+
 # Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat
 conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')