summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-28 15:42:28 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:12 +1000
commitc2d17cf978cb2d5275b2915fb0a87daa79acc28b (patch)
tree5423ac464e696853c9d74195a38f0647dd7ac901 /lib
parent3b380ea7ac9f33f208a9479d34bd514f8e3d5bf4 (diff)
downloadsamba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.tar.gz
samba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.tar.bz2
samba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.zip
s4-waf: set default for bundled libraries
Diffstat (limited to 'lib')
-rw-r--r--lib/replace/wscript2
-rw-r--r--lib/talloc/wscript6
-rw-r--r--lib/tdb/wscript3
-rw-r--r--lib/tevent/wscript3
4 files changed, 12 insertions, 2 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)