diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-21 20:02:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-26 04:27:28 +0200 |
| commit | 0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca (patch) | |
| tree | 0b948c5a8aab44dfb3cc63d40aa9339a9447b43c | |
| parent | 26a0ba7ee9ee0700746759c046a7e12edb8ecdd9 (diff) | |
| download | samba-0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca.tar.gz samba-0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca.tar.bz2 samba-0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca.zip | |
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
| -rw-r--r-- | source3/Makefile-smbtorture4 | 2 | ||||
| -rwxr-xr-x | wscript | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4 index 4a1bed7eab..3e23b05663 100644 --- 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 @@ -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') |