summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-04-11 17:12:16 +0930
committerJeremy Allison <jra@samba.org>2013-04-13 02:01:02 +0200
commit41333f92d0c78e44a524f2248f5ae641ad59abf3 (patch)
tree7c66421c6c6056b14c2596ce1761784de60a9094 /wscript
parented6a4e04e1f8a0ca952e37577bfdc9731d6ef93d (diff)
downloadsamba-41333f92d0c78e44a524f2248f5ae641ad59abf3.tar.gz
samba-41333f92d0c78e44a524f2248f5ae641ad59abf3.tar.bz2
samba-41333f92d0c78e44a524f2248f5ae641ad59abf3.zip
ntdb: remove --disable-ntdb.
Remove DISABLE_NTDB option, and --disable-ntdb from waf build. This just means that it will always get built: it isn't used by default yet. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Apr 13 02:01:02 CEST 2013 on sn-devel-104
Diffstat (limited to 'wscript')
-rw-r--r--wscript10
1 files changed, 1 insertions, 9 deletions
diff --git a/wscript b/wscript
index 4944a72bc3..dad54d1c6c 100644
--- a/wscript
+++ b/wscript
@@ -58,10 +58,6 @@ def set_options(opt):
gr = opt.option_group('developer options')
- opt.add_option('--disable-ntdb',
- help=("disable ntdb"),
- action="store_true", dest='disable_ntdb', default=False)
-
opt.tool_options('python') # options for disabling pyc or pyo compilation
# enable options related to building python extensions
@@ -120,11 +116,7 @@ def configure(conf):
conf.RECURSE('source4/ntvfs/sysdep')
conf.RECURSE('lib/util')
conf.RECURSE('lib/ccan')
- conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False)
- if not Options.options.disable_ntdb:
- conf.RECURSE('lib/ntdb')
- else:
- conf.DEFINE('DISABLE_NTDB', 1)
+ conf.RECURSE('lib/ntdb')
conf.RECURSE('lib/zlib')
conf.RECURSE('lib/util/charset')
conf.RECURSE('source4/auth')