v3-6-ctdb:VERSION: bump ctdb vendor patch level to 27

[obnox/samba-ctdb.git] / wscript

diff --git a/wscript b/wscript
old mode 100644 (file)
new mode 100755 (executable)
index a31939e..d7c2744
--- a/wscript
+++ b/wscript
@@ -21,15 +21,14 @@ samba_dist.DIST_DIRS('.')
 #samba-4.0.0 branded tarball (until the merge is complete) and the
 #core elements of the autotools build system (which is known to
 #produce buggy binaries).
-samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap source3/ ' +
+samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap ' +
                           'packaging/ docs-xml/ examples/ swat/ WHATSNEW.txt MAINTAINERS ')
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'
 
+os.environ['TOPLEVEL_BUILD'] = '1'
 
 def set_options(opt):
-    os.putenv('TOPLEVEL_BUILD', '1')
-
     opt.BUILTIN_DEFAULT('NONE')
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
@@ -73,7 +72,7 @@ def configure(conf):
     # 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')
 
-    conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #include')
+    conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include')
 
     conf.RECURSE('lib/replace')