s3-auth set session_info->sanitized_username in create_local_token()

[amitay/samba.git] / wscript

diff --git a/wscript b/wscript
index a4fb470087206b021423d79cc8ef600f7ec9de25..0b5e68f1367b6396d8b5e677384643455021a48e 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -23,7 +23,7 @@ def set_options(opt):
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')
-    opt.RECURSE('source4/lib/ldb')
+    opt.RECURSE('lib/ldb')
     opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('lib/nss_wrapper')
@@ -80,7 +80,7 @@ def configure(conf):
         raise Utils.WafError('Python version 3.x is not supported by Samba yet')
 
     conf.RECURSE('dynconfig')
-    conf.RECURSE('source4/lib/ldb')
+    conf.RECURSE('lib/ldb')
     conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
@@ -115,12 +115,8 @@ def configure(conf):
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
 
-    # However, until the source3 waf build settles down, this needs to
-    # be disabled, as the bugs mentioned above are hitting too many of
-    # our users
-
-    #if sys.platform != "openbsd4":
-    #    conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+    if sys.platform != "openbsd4":
+        conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)