From 9a9e3423d8c7be6350cba20cb6001fc14d47d336 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Thu, 23 Feb 2017 10:16:25 -0500 Subject: [PATCH] waf: disable-python - fix ctdb configuration When ctdb is built in standalone mode, it turned off the python requirement for submodules by setting Options.options.disable_python to True before checking for its own (non-optional) python support. Ad ctdb does not need python for itself or any of the submodules it is built against, the safest solution seems to be to allow the python and python-headers checks to not find python. Signed-off-by: Ian Stakenvicius Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- ctdb/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/wscript b/ctdb/wscript index 4c8db60e139..9e99fa2dd0e 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -107,8 +107,8 @@ def configure(conf): if conf.env.standalone_ctdb: conf.SAMBA_CHECK_PERL(mandatory=True) - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) if conf.CHECK_FOR_THIRD_PARTY(): conf.RECURSE('third_party/popt') -- 2.34.1