build: remove hacks from top level wscript

[nivanova/samba-autobuild/.git] / source4 / wscript

diff --git a/source4/wscript b/source4/wscript
index 211f30b157aafa42dbceff0851b41b89b93e0045..ae6a64f4841f3096ee8abb82264f8c481cf4927d 100644 (file)
--- a/source4/wscript
+++ b/source4/wscript
@@ -1,23 +1,67 @@
+#! /usr/bin/env python
+
 srcdir = '..'
 blddir = 'bin'
 
-LIBREPLACE_DIR= srcdir + '/lib/replace'
-LIBLDB_DIR=     srcdir + '/source4/lib/ldb'
+import sys
+sys.path.insert(0, srcdir+"/buildtools/wafsamba")
+import wafsamba, Options
 
 def set_options(opt):
-    opt.recurse(LIBREPLACE_DIR)
-    opt.recurse(LIBLDB_DIR)
+    opt.recurse('../lib/replace')
+    opt.recurse('dynconfig')
+    opt.recurse('scripting/python')
+    opt.recurse('lib/ldb')
+    opt.recurse('selftest')
+    opt.recurse('lib/tls')
+    opt.recurse('../lib/nss_wrapper')
+    opt.recurse('../lib/socket_wrapper')
+    opt.recurse('../lib/uid_wrapper')
 
 def configure(conf):
-    conf.DEFINE('_SAMBA_BUILD_', 4)
-    conf.sub_config(LIBREPLACE_DIR)
-    conf.sub_config(LIBLDB_DIR)
-    conf.sub_config('heimdal_build')
+    conf.define('PACKAGE_NAME', 'samba')
+    conf.define('PACKAGE_STRING', 'samba 4')
+    conf.define('PACKAGE_TARNAME',  'samba')
+    conf.define('PACKAGE_URL', "")
+    conf.define('PACKAGE_VERSION', "4")
+    conf.define('PACKAGE_BUGREPORT', 'samba-technical@samba.org')
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
-    conf.ADD_CFLAGS('-I.. -I../lib -I../../lib  -I../.. -I../include -Idefault/source4')
-    conf.ADD_CFLAGS('-I../../lib/socket_wrapper -I../../lib/talloc -I../../lib/replace -I../../lib/tevent')
+    conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True)
+    conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
+    if Options.options.developer:
+        conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
+
+    # set a lower limit on recursing in waf preprocessor
+    conf.env.preprocessor_recursion_limit = 10
+
+    conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #lib/replace #lib/talloc #lib/tevent')
+
+    conf.sub_config('../lib/replace')
 
-    conf.ADD_CFLAGS('-I../heimdal_build -I../heimdal/lib/krb5 -I../heimdal/lib/asn1 -I../heimdal/lib/com_err -I -I../heimdal/lib/hx509 -I../heimdal/lib/roken -I../heimdal/lib/hx509 -I../heimdal/lib/asn1 -I../heimdal/lib/hcrypto -I../heimdal/lib -I../heimdal/lib/hcrypto/imath -I../heimdal/lib/wind')
+    conf.find_program('python', var='PYTHON', mandatory=True)
+    conf.find_program('perl', var='PERL', mandatory=True)
+
+    # enable tool to build python extensions
+    conf.check_tool('python')
+    conf.check_python_version((2,4,2))
+    conf.check_python_headers()
+
+    conf.sub_config('dynconfig')
+    conf.sub_config('scripting/python')
+    conf.sub_config('lib/ldb')
+    conf.sub_config('heimdal_build')
+    conf.sub_config('lib/tls')
+    conf.sub_config('ntvfs/sysdep')
+    conf.sub_config('../lib/util')
+    conf.sub_config('../lib/zlib')
+    conf.sub_config('../lib/util/charset')
+    conf.sub_config('auth')
+    conf.sub_config('../lib/nss_wrapper')
+    conf.sub_config('../lib/socket_wrapper')
+    conf.sub_config('../lib/uid_wrapper')
+    conf.sub_config('lib/smbreadline')
 
     conf.SAMBA_CONFIG_H('include/config.h')
+
+