From c2d17cf978cb2d5275b2915fb0a87daa79acc28b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Mar 2010 15:42:28 +1100
Subject: s4-waf: set default for bundled libraries

---
 source4/lib/ldb/wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/wscript')

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?
-- 
cgit