waf: Also check for gnutls_privkey_export_x509()

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 a101846cdf218e1dd8a5b8db5ef3f1b003f61f8c..019bd2026c15ba9847e8d9a1c7d66b60a7c300eb 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -119,7 +119,8 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        )
 
 
-if bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID'):
+if (bld.CONFIG_SET('HAVE_GNUTLS_PRIVKEY_EXPORT_X509') and
+    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 8433d620b01a53fd73184fb7cbe5dfd2f28d0cc9..1ae7c29bdd876aff30f543a54f423f1a1c4e009a 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -83,7 +83,8 @@ bld.SAMBA_SUBSYSTEM('IREMOTEWINSPOOL_COMMON',
 
 torture_rpc_backupkey = ''
 if bld.AD_DC_BUILD_IS_ENABLED():
-    if bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID'):
+    if (bld.CONFIG_SET('HAVE_GNUTLS_PRIVKEY_EXPORT_X509') and
+        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 2e4dc126f3a1408f2a8fe5bcaa06158f63df61ad..cc9a2b035a2f99feb163eb13f444393b4afd83f9 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_privkey_export_x509 (>= 3.4.0) required by backupkey
+conf.CHECK_FUNCS_IN('gnutls_privkey_export_x509', 'gnutls')
+
 # 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')