From: Ian Stakenvicius Date: Fri, 27 Jan 2017 19:07:21 +0000 (-0500) Subject: waf: disable-python - configuration adjustments X-Git-Tag: tdb-1.3.13~548 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=7d5db908509ffa099fa4b2ce7351e6bf7d1c06e2;hp=5bbcd09382a65f9fb86b446bfbaf58a9b6e13aa1 waf: disable-python - configuration adjustments Adjust configuration to accomodate when --disable-python is set: - Error when AD-DC is still enabled (and others later as needed) - Set mandatory=false on SAMBA_CHECK_PYTHON_HEADERS Signed-off-by: Ian Stakenvicius Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/wscript b/wscript index 407bcdc132e..4fd56ed0026 100644 --- a/wscript +++ b/wscript @@ -107,8 +107,12 @@ def configure(conf): conf.SAMBA_CHECK_PERL(mandatory=True) conf.find_program('xsltproc', var='XSLTPROC') + if conf.env.disable_python: + if not (Options.options.without_ad_dc): + raise Utils.WafError('--disable-python requires --without-ad-dc') + conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2, 6, 0)) - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=(not conf.env.disable_python)) if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: # Mac OSX needs to have this and it's also needed that the python is compiled with this