diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-01 12:45:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:42:03 +1100 |
| commit | 055f017b3693af95864f6595cf4ead041c389c52 (patch) | |
| tree | 9e59e56dc7dc3345722bf678027db66a75eb1062 /wscript | |
| parent | 83f0dc44a70ed7e49bcee3718ff17b2063b2a01e (diff) | |
| download | samba-055f017b3693af95864f6595cf4ead041c389c52.tar.gz samba-055f017b3693af95864f6595cf4ead041c389c52.tar.bz2 samba-055f017b3693af95864f6595cf4ead041c389c52.zip | |
build: Reduce build systems to just top level waf and autoconf
The s3-waf build system is a key component of the top level build, but
with this commit is is no longer available directly. This reduces the
number of build system combinations in master as we prepare for the
Samba 4.0 release.
Andrew Bartlett
Diffstat (limited to 'wscript')
| -rwxr-xr-x | wscript | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -16,8 +16,6 @@ samba_dist.DIST_DIRS('.') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' -os.environ['TOPLEVEL_BUILD'] = '1' - def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('samba4') @@ -42,7 +40,6 @@ def set_options(opt): def configure(conf): - conf.env.toplevel_build = True version = samba_version.load_version(env=conf.env) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) |