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/wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/wscript')

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')
 
-- 
cgit