summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/scripting/python/wscript12
-rw-r--r--source4/wscript5
2 files changed, 3 insertions, 14 deletions
diff --git a/source4/scripting/python/wscript b/source4/scripting/python/wscript
deleted file mode 100644
index 14e924b378..0000000000
--- a/source4/scripting/python/wscript
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-def set_options(opt):
- # enable options related to building python extensions
- opt.tool_options('python') # options for disabling pyc or pyo compilation
-
-
-def configure(conf):
- # enable tool to build python extensions
- conf.check_tool('python')
- conf.check_python_version((2,4,2))
- conf.check_python_headers()
diff --git a/source4/wscript b/source4/wscript
index 145f6b8af8..dabca7f69c 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -33,7 +33,6 @@ def set_options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
opt.RECURSE('../lib/replace')
opt.RECURSE('dynconfig')
- opt.RECURSE('scripting/python')
opt.RECURSE('lib/ldb')
opt.RECURSE('selftest')
opt.RECURSE('lib/tls')
@@ -47,6 +46,9 @@ def set_options(opt):
help='enable special build farm options',
action='store_true', dest='BUILD_FARM')
+ opt.tool_options('python') # options for disabling pyc or pyo compilation
+ # enable options related to building python extensions
+
def configure(conf):
version = samba_version.load_version(env=conf.env)
@@ -85,7 +87,6 @@ def configure(conf):
raise Utils.WafError('Python version 3.x is not supported by Samba yet')
conf.RECURSE('dynconfig')
- conf.RECURSE('scripting/python')
conf.RECURSE('lib/ldb')
conf.RECURSE('heimdal_build')
conf.RECURSE('lib/tls')