4 files changed, 12 insertions, 2 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index b10db870540..d5f2b0dce94 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 33c77a8832b..6d16e15d537 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 69db91f7e7b..e146ba79b0c 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 fba6bcee6b3..f017581fae6 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)