diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-02-15 16:13:48 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-21 04:06:16 +0000 |
| commit | a574e8f51706809fff4b77ff098b28ba1a7d4103 (patch) | |
| tree | e97251182fa1d94bf22ab13823691c2dcff68c44 /lib/tevent | |
| parent | a459650054b5500026b6387fb0eb2ef29ced9b5f (diff) | |
| download | samba-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 'lib/tevent')
| -rw-r--r-- | lib/tevent/wscript | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/tevent/wscript b/lib/tevent/wscript index a9288add0a3..df3068af487 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -60,15 +60,8 @@ def configure(conf): if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'): conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals) - if not conf.env.disable_python: - # also disable if we don't have the python libs installed - conf.find_program('python', var='PYTHON') - conf.load('python') - conf.check_python_version((2,4,2)) - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) - if not conf.env.HAVE_PYTHON_H: - Logs.warn('Disabling pytevent as python devel libs not found') - conf.env.disable_python = True + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() conf.SAMBA_CONFIG_H() |