diff options
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript | 10 | ||||
| -rw-r--r-- | wscript_configure_system_gnutls | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/wscript b/source4/dsdb/samdb/ldb_modules/wscript index ef984ccbe34..ce7f48d3349 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript +++ b/source4/dsdb/samdb/ldb_modules/wscript @@ -13,16 +13,6 @@ def options(opt): return def configure(conf): - if conf.env.HAVE_GNUTLS: - if conf.CHECK_FUNCS_IN( - 'gnutls_aead_cipher_init', - 'gnutls', - headers='gnutls/gnutls.h'): - - conf.DEFINE('HAVE_GNUTLS_AEAD', '1') - else: - Logs.warn('No gnutls support for AEAD encryption') - conf.SET_TARGET_TYPE('gpgme', 'EMPTY') if not Options.options.without_ad_dc \ diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls index 85b1277d2ee..729b16960ab 100644 --- a/wscript_configure_system_gnutls +++ b/wscript_configure_system_gnutls @@ -26,5 +26,13 @@ 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') +# Check for gnutls_aead_cipher_init (>= 3.4.0) used by encrypted_secrets +if conf.CHECK_FUNCS_IN('gnutls_aead_cipher_init', + 'gnutls', + headers='gnutls/gnutls.h'): + conf.DEFINE('HAVE_GNUTLS_AEAD', '1') +else: + Logs.warn('No gnutls support for AEAD encryption') + conf.DEFINE('HAVE_GNUTLS3', 1) conf.DEFINE('ENABLE_GNUTLS', 1) |