build: Invert --enable-s3build into --disable-s3build

We always want the s3 binaries, except when building an smbtorture4
for the s3-waf and autoconf builds.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Apr 26 04:27:28 CEST 2011 on sn-devel-104

diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 4a1bed7eabfe5dd7531ee895417948cd57dd4a03..3e23b05663f05c35770d67dbcfc7e40038a2527c 100644 (file)
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
 samba4-configure:
        @(cd .. && \
                CFLAGS='' $(WAF) reconfigure || \
-               CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
+               CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --disable-s3build)
 
 .PHONY: samba4-configure
 

diff --git a/wscript b/wscript
index 6961eb84af72a66ecb1cd6758ee7af836b7fbf19..46773bfd86ad45a0c052b090ad2bc8b2c9f76b2e 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -47,8 +47,8 @@ def set_options(opt):
                    help='enable special build farm options',
                    action='store_true', dest='BUILD_FARM')
 
-    gr.add_option('--enable-s3build',
-                   help='enable build of s3 binaries',
+    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
@@ -66,8 +66,9 @@ 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 = True
+        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')