X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=0b5e68f1367b6396d8b5e677384643455021a48e;hb=dc829a438a8b9f5cb8cd05dbbe24470bf192f935;hp=22f864f0986f227f9b86929bfc3972fb9cd8e273;hpb=35a11630c1727677df24cdaa42526e89f7614172;p=amitay%2Fsamba.git

diff --git a/wscript b/wscript
old mode 100644
new mode 100755
index 22f864f0986..0b5e68f1367
--- a/wscript
+++ b/wscript
@@ -13,32 +13,24 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
 
 samba_dist.DIST_DIRS('.')
 
-#This is a list of files that we don't want in the package, for
-#whatever reason.  Directories should be listed with a trailing / to
-#avoid over-exclusion.
-
-#This list includes files that would confuse the recipient of a
-#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/ ' +
-                          '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):
     opt.BUILTIN_DEFAULT('NONE')
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
-    opt.RECURSE('source4/dynconfig')
-    opt.RECURSE('source4/lib/ldb')
-    opt.RECURSE('source4/selftest')
+    opt.RECURSE('dynconfig')
+    opt.RECURSE('lib/ldb')
+    opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('lib/nss_wrapper')
     opt.RECURSE('lib/socket_wrapper')
     opt.RECURSE('lib/uid_wrapper')
     opt.RECURSE('pidl')
+    opt.RECURSE('source3')
 
     gr = opt.option_group('developer options')
     gr.add_option('--enable-build-farm',
@@ -50,9 +42,11 @@ 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)
+    conf.DEFINE('_SAMBA_WAF_BUILD_', version.MAJOR)
     conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
 
@@ -62,7 +56,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 #lib/replace')
 
     conf.RECURSE('lib/replace')
 
@@ -85,12 +79,13 @@ def configure(conf):
     if int(conf.env['PYTHON_VERSION'][0]) >= 3:
         raise Utils.WafError('Python version 3.x is not supported by Samba yet')
 
-    conf.RECURSE('source4/dynconfig')
-    conf.RECURSE('source4/lib/ldb')
+    conf.RECURSE('dynconfig')
+    conf.RECURSE('lib/ldb')
     conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
+    conf.RECURSE('lib/ccan')
     conf.RECURSE('lib/zlib')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
@@ -102,17 +97,24 @@ def configure(conf):
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('pidl')
-    conf.RECURSE('source4/selftest')
+    conf.RECURSE('selftest')
+    conf.RECURSE('source3')
 
     # we don't want any libraries or modules to rely on runtime
     # resolution of symbols
     if sys.platform != "openbsd4":
         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
 
+    if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []:
+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+            conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
+
+
     # gentoo always adds this. We want our normal build to be as
     # strict as the strictest OS we support, so adding this here
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
+
     if sys.platform != "openbsd4":
         conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
 
@@ -147,7 +149,7 @@ def ctags(ctx):
 # of commands in --help
 def build(bld):
     '''build all targets'''
-    samba_version.load_version(env=bld.env)
+    samba_version.load_version(env=bld.env, is_install=bld.is_install)
     pass