diff options
| author | Andreas Schneider <asn@samba.org> | 2019-05-06 11:12:54 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-05-07 00:11:25 +0000 |
| commit | 1b9cd2acda393577c0e9c2ef908c520b3d7ca6f7 (patch) | |
| tree | 78661a5ac8b12efbdfc5bdaac5f50019aa27ccce | |
| parent | 193b44466ba05deba8f2b1fdc16ab55c102e82ad (diff) | |
| download | samba-1b9cd2acda393577c0e9c2ef908c520b3d7ca6f7.tar.gz | |
waf: Also check for gnutls_privkey_export_x509()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/rpc_server/wscript_build | 3 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 3 | ||||
| -rw-r--r-- | wscript_configure_system_gnutls | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index a101846cdf2..019bd2026c1 100644 --- 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 8433d620b01..1ae7c29bdd8 100644 --- 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 2e4dc126f3a..cc9a2b035a2 100644 --- 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') |