From bf3b2e2aee284c85ecea6a3142bc1fa5344b430a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Apr 2011 02:04:13 +0200 Subject: Support the 'PYTHON' environment variable. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sat Apr 23 04:19:05 CEST 2011 on sn-devel-104 --- lib/tdb/wscript | 1 + lib/tevent/wscript | 1 + source4/lib/ldb/wscript | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 9041f8c1ba..58a747f0b2 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -45,6 +45,7 @@ def configure(conf): if not conf.env.disable_python: # also disable if we don't have the python libs installed + conf.find_program('python', var='PYTHON') conf.check_tool('python') conf.check_python_version((2,4,2)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) diff --git a/lib/tevent/wscript b/lib/tevent/wscript index de245d92e7..75c44c2962 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -46,6 +46,7 @@ def configure(conf): if not conf.env.disable_python: # also disable if we don't have the python libs installed + conf.find_program('python', var='PYTHON') conf.check_tool('python') conf.check_python_version((2,4,2)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 145d757795..b59e782e45 100755 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -26,12 +26,18 @@ def set_options(opt): opt.RECURSE('lib/tdb') opt.RECURSE('lib/tevent') opt.RECURSE('lib/replace') + opt.tool_options('python') # options for disabling pyc or pyo compilation def configure(conf): conf.RECURSE('lib/tdb') conf.RECURSE('lib/tevent') conf.RECURSE('lib/popt') conf.RECURSE('lib/replace') + conf.find_program('python', var='PYTHON') + conf.find_program('xsltproc', var='XSLTPROC') + conf.check_tool('python') + conf.check_python_version((2,4,2)) + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) # where does the default LIBDIR end up? in conf.env somewhere? # -- cgit