build: Remove --disable-s3build so we can rely on these subsystems

This will make it easier to write code that uses the whole codebase.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon May  9 12:25:33 CEST 2011 on sn-devel-104

1 files changed, 1 insertions, 10 deletions

diff --git a/wscript b/wscript
index 04c4e9140b2..92c2594f3eb 100755
--- a/wscript
+++ b/wscript
@@ -47,10 +47,6 @@ def set_options(opt):
                    help='enable special build farm options',
                    action='store_true', dest='BUILD_FARM')
 
-    gr.add_option('--disable-s3build',
-                   help='disable build of s3 binaries',
-                   action='store_true', dest='S3BUILD')
-
     opt.tool_options('python') # options for disabling pyc or pyo compilation
     # enable options related to building python extensions
 
@@ -67,10 +63,6 @@ def configure(conf):
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
 
-    conf.env.enable_s3build = True
-    if Options.options.S3BUILD:
-        conf.env.enable_s3build = False
-
     # this enables smbtorture.static for s3 in the build farm
     conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
 
@@ -115,8 +107,7 @@ def configure(conf):
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('pidl')
     conf.RECURSE('selftest')
-    if conf.env.enable_s3build:
-        conf.RECURSE('source3')
+    conf.RECURSE('source3')
 
     # we don't want any libraries or modules to rely on runtime
     # resolution of symbols