diff options
| -rw-r--r-- | selftest/wscript | 4 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 7 | ||||
| -rwxr-xr-x | wscript | 11 | ||||
| -rw-r--r-- | wscript_build | 3 |
4 files changed, 4 insertions, 21 deletions
diff --git a/selftest/wscript b/selftest/wscript index ce1be81083..ab9f269b79 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -187,10 +187,8 @@ def cmd_testonly(opt): if Options.options.TARGET: env.SELFTEST_TARGET = Options.options.TARGET - elif env.enable_s3build: - env.SELFTEST_TARGET = "samba" else: - env.SELFTEST_TARGET = "samba4" + env.SELFTEST_TARGET = "samba" if env.SELFTEST_TARGET == "samba4": env.SELFTEST_DIR = "${srcdir}/source4/selftest" diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index ce015ccaa5..e9456074f6 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -92,11 +92,6 @@ bld.SAMBA_LIBRARY('dcerpc-samba4', bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c') -if bld.env.enable_s3build: - s3_ndr = "NDR_WBINT" -else: - s3_ndr = "" - bld.SAMBA_SUBSYSTEM('ndr-table', source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c', public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS @@ -109,7 +104,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table', NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP - NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG ''' + s3_ndr, + NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''', depends_on='GEN_NDR_TABLES' ) @@ -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 diff --git a/wscript_build b/wscript_build index 5cbbc308d3..43e69a5904 100644 --- a/wscript_build +++ b/wscript_build @@ -120,8 +120,7 @@ bld.RECURSE('source4/scripting') bld.RECURSE('pidl') bld.RECURSE('lib') bld.RECURSE('libds/common') -if bld.env.enable_s3build: - bld.RECURSE('source3') +bld.RECURSE('source3') bld.RECURSE('testsuite/headers') |