[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  2771266 build: do not duplicate the checks for python in samba4
      from  c4e795c build: Cope with broken libiconv

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2771266defbf92373787e7f0fb795de713a02770
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Dec 9 00:38:12 2010 +0300

    build: do not duplicate the checks for python in samba4
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Thu Dec  9 00:47:23 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/wscript |   12 ------------
 source4/wscript                  |    5 +++--
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 source4/scripting/python/wscript


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/wscript b/source4/scripting/python/wscript
deleted file mode 100644
index 14e924b..0000000
--- 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 145f6b8..dabca7f 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')


-- 
Samba Shared Repository