Support the 'PYTHON' environment variable.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Apr 23 04:19:05 CEST 2011 on sn-devel-104

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 9041f8c1ba6fff69b1d9b06a41a70d9ade5ae93e..58a747f0b2364a5f5230802769247880f49883ce 100644 (file)
--- 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 de245d92e74d116a17e816b9d0edbe753666a74d..75c44c29622a7723f0367eb3dbf917d37f6c274d 100644 (file)
--- 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 145d7577958486e8a6e8f7837cb502ec647b61e4..b59e782e4574c433c82bee801021348abb1b07c1 100755 (executable)
--- 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?
     #