s4-waf: set default for bundled libraries

7 files changed, 18 insertions, 6 deletions

diff --git a/lib/replace/wscript b/lib/replace/wscript
index b10db87054..d5f2b0dce9 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -9,6 +9,8 @@ import wafsamba
 import Options, os, preproc
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('NONE')
+    opt.BUNDLED_EXTENSION_DEFAULT('')
     opt.recurse('../../buildtools/wafsamba')
 
 @wafsamba.runonce
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 33c77a8832..6d16e15d53 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -7,7 +7,13 @@ blddir = 'bin'
 
 LIBREPLACE_DIR= srcdir + '/lib/replace'
 
+import sys
+sys.path.insert(0, srcdir+"/buildtools/wafsamba")
+import wafsamba
+
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('replace')
+    opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc')
     opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 69db91f7e7..e146ba79b0 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -13,10 +13,11 @@ import wafsamba
 LIBREPLACE_DIR= srcdir + '/lib/replace'
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('replace')
+    opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextenion='tdb')
     opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
-    conf.BUNDLED_LIBRARY_EXTENSION('tdb')
     conf.sub_config(LIBREPLACE_DIR)
     conf.SAMBA_CONFIG_H()
 
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index fba6bcee6b..f017581fae 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -13,11 +13,12 @@ LIBREPLACE_DIR= srcdir + '/lib/replace'
 LIBTALLOC_DIR=  srcdir + '/lib/talloc'
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('replace')
+    opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent')
     opt.recurse(LIBREPLACE_DIR)
     opt.recurse(LIBTALLOC_DIR)
 
 def configure(conf):
-    conf.BUNDLED_LIBRARY_EXTENSION('tevent')
     conf.sub_config(LIBREPLACE_DIR)
     conf.sub_config(LIBTALLOC_DIR)
 
diff --git a/source3/wscript b/source3/wscript
index eb080272e9..ac231d4ed3 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -10,6 +10,8 @@ import build.charset
 from samba_utils import *
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('NONE')
+    opt.BUNDLED_EXTENSION_DEFAULT('s3')
     opt.recurse('../lib/replace')
     opt.recurse('build')
     opt.recurse('../lib/nss_wrapper')
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 2cde5ee36a..ad875374db 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -13,12 +13,12 @@ LIBTDB_DIR= srcdir + '/lib/tdb'
 LIBTEVENT_DIR= srcdir + '/lib/tevent'
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('replace')
+    opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextenion='ldb')
     opt.recurse(LIBTDB_DIR)
     opt.recurse(LIBTEVENT_DIR)
 
 def configure(conf):
-    conf.BUNDLED_LIBRARY_EXTENSION('ldb')
-
     conf.sub_config(LIBTDB_DIR)
     conf.sub_config(LIBTEVENT_DIR)
     # where does the default LIBDIR end up? in conf.env somewhere?
diff --git a/source4/wscript b/source4/wscript
index b7b66c6f10..d8361398f4 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -8,6 +8,8 @@ sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba, Options
 
 def set_options(opt):
+    opt.BUILTIN_DEFAULT('NONE')
+    opt.BUNDLED_EXTENSION_DEFAULT('s4')
     opt.recurse('../lib/replace')
     opt.recurse('dynconfig')
     opt.recurse('scripting/python')
@@ -32,8 +34,6 @@ def configure(conf):
     conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True)
     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
 
-    conf.BUNDLED_LIBRARY_EXTENSION('s4')
-
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')