From 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Sep 2005 18:18:09 +0000
Subject: r10586: Add MergedObject() builder. Default to Library() rather then
 StaticLibrary() (This used to be commit
 b53313dc517986c69a4e4cb8fe3885b696f8faa1)

---
 source4/SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/SConstruct')

diff --git a/source4/SConstruct b/source4/SConstruct
index 297147fbe3..4fd59b7d50 100644
--- a/source4/SConstruct
+++ b/source4/SConstruct
@@ -24,7 +24,7 @@ opts.AddOptions(
 
 hostenv = Environment(
 		toolpath=['build/scons','.'],
-		tools=['default','pidl','proto','et','asn1'],
+		tools=['default','pidl','proto','et','asn1','samba'],
 		options=opts,
 		CPPPATH=['#include','#','#lib'], 
         CPPDEFINES={'_SAMBA_BUILD_': None},
-- 
cgit