From: Volker Lendecke <vl@samba.org>
Date: Thu, 12 Mar 2015 13:16:49 +0000 (+0000)
Subject: waf: Do not recurse into ntdb
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=9dfc521642d643b4e2e2537596021554382a2efa;p=metze%2Fsamba%2Fwip.git

waf: Do not recurse into ntdb

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/wscript b/wscript
index d6db12c4a73a..215bcaf4adc6 100644
--- a/wscript
+++ b/wscript
@@ -37,7 +37,6 @@ def set_options(opt):
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')
     opt.RECURSE('lib/ldb')
-    opt.RECURSE('lib/ntdb')
     opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('pidl')
@@ -153,7 +152,6 @@ def configure(conf):
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
     conf.RECURSE('lib/ccan')
-    conf.RECURSE('lib/ntdb')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
     conf.RECURSE('nsswitch')
@@ -262,7 +260,7 @@ def pydoctor(ctx):
     '''build python apidocs'''
     bp = os.path.abspath('bin/python')
     mpaths = {}
-    modules = ['talloc', 'tdb', 'ldb', 'ntdb']
+    modules = ['talloc', 'tdb', 'ldb']
     for m in modules:
         f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
         try:
diff --git a/wscript_build b/wscript_build
index 230f397dc724..d525b27187c8 100644
--- a/wscript_build
+++ b/wscript_build
@@ -43,8 +43,6 @@ bld.RECURSE('lib/texpect')
 bld.RECURSE('lib/addns')
 bld.RECURSE('lib/ccan')
 bld.RECURSE('lib/tdb_compat')
-if not bld.env.disable_ntdb:
-    bld.RECURSE('lib/ntdb')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')