diff options
| author | Andreas Schneider <asn@samba.org> | 2015-12-03 17:47:14 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-12-10 08:49:20 +0100 |
| commit | 53e8feeb6ad06c2345936a69b47769d1117e5e59 (patch) | |
| tree | 796a39809164a9b49bdae2df98bc26fe6bcd46fa /source4/lib/tls | |
| parent | 8e096698af8f9fb35fbca5da20c552bf486d2b5e (diff) | |
| download | samba-53e8feeb6ad06c2345936a69b47769d1117e5e59.tar.gz | |
waf: Check for GnuTLS 3.4.7
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/lib/tls')
| -rw-r--r-- | source4/lib/tls/wscript | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index 83520a7b2a7..20834092d5f 100644 --- a/source4/lib/tls/wscript +++ b/source4/lib/tls/wscript @@ -21,14 +21,28 @@ def configure(conf): conf.fatal("--disable-gnutls given: Building the AD DC requires GnuTLS (eg libgnutls-dev, gnutls-devel) for ldaps:// support and for the BackupKey protocol") return - if conf.CHECK_CFG(package='gnutls', - args='"gnutls >= 3.0.0" --cflags --libs', - msg='Checking for gnutls >= 3.0.0s', mandatory=False): + if Options.options.with_system_mitkrb5 and conf.env.AD_DC_BUILD_IS_ENABLED: + conf.CHECK_CFG(package='gnutls', + args='"gnutls >= 3.4.7" --cflags --libs', + msg='Checking for gnutls >= 3.4.7', + mandatory=True) + conf.DEFINE('HAVE_GNUTLS_3_4_7', 1) conf.DEFINE('HAVE_GNUTLS3', 1) else: - conf.CHECK_CFG(package='gnutls', - args='"gnutls >= 1.4.0 gnutls != 2.2.4 gnutls != 2.8.0 gnutls != 2.8.1" --cflags --libs', - msg='Checking for gnutls >= 1.4.0 and broken versions', mandatory=False) + if conf.CHECK_CFG(package='gnutls', + args='"gnutls >= 3.4.7" --cflags --libs', + msg='Checking for gnutls >= 3.4.7', + mandatory=False): + conf.DEFINE('HAVE_GNUTLS_3_4_7', 1) + conf.DEFINE('HAVE_GNUTLS3', 1) + elif conf.CHECK_CFG(package='gnutls', + args='"gnutls >= 3.0.0" --cflags --libs', + msg='Checking for gnutls >= 3.0.0s', mandatory=False): + conf.DEFINE('HAVE_GNUTLS3', 1) + else: + conf.CHECK_CFG(package='gnutls', + args='"gnutls >= 1.4.0 gnutls != 2.2.4 gnutls != 2.8.0 gnutls != 2.8.1" --cflags --libs', + msg='Checking for gnutls >= 1.4.0 and broken versions', mandatory=False) if 'HAVE_GNUTLS' in conf.env: conf.DEFINE('ENABLE_GNUTLS', 1) |