summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2019-02-15 16:13:48 +1300
committerAndrew Bartlett <abartlet@samba.org>2019-03-21 04:06:16 +0000
commita574e8f51706809fff4b77ff098b28ba1a7d4103 (patch)
treee97251182fa1d94bf22ab13823691c2dcff68c44 /wscript
parenta459650054b5500026b6387fb0eb2ef29ced9b5f (diff)
downloadsamba-a574e8f51706809fff4b77ff098b28ba1a7d4103.tar.gz
build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries
We do this by removing the confusing mandatory option to conf.SAMBA_CHECK_PYTHON{,_HEADERS}(), instead just use the value of --disable-python internally This follows the default minimum of Python 3.4 and keeps things consistent with the main Samba build where --disable-python is required to skip building python bindings. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript b/wscript
index a0a8080b448..47fc2ba2460 100644
--- a/wscript
+++ b/wscript
@@ -151,8 +151,8 @@ def configure(conf):
if not (Options.options.without_ad_dc):
raise Errors.WafError('--disable-python requires --without-ad-dc')
- conf.SAMBA_CHECK_PYTHON(mandatory=not conf.env.disable_python)
- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=(not conf.env.disable_python))
+ conf.SAMBA_CHECK_PYTHON()
+ conf.SAMBA_CHECK_PYTHON_HEADERS()
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