summaryrefslogtreecommitdiff
path: root/source4
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 /source4
parent3b380ea7ac9f33f208a9479d34bd514f8e3d5bf4 (diff)
downloadsamba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.tar.gz
samba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.tar.bz2
samba-c2d17cf978cb2d5275b2915fb0a87daa79acc28b.zip
s4-waf: set default for bundled libraries
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/wscript4
-rw-r--r--source4/wscript4
2 files changed, 4 insertions, 4 deletions
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')