3 files changed, 27 insertions, 8 deletions
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index 9c56310829..387f557932 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -1,13 +1,16 @@
 Import('hostenv')
 #            tastes like -*- python -*-
 
+SConscript(dirs=['talloc','charset'])
+Import('talloc dynconfig charset')
+
 basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.c', 
 	 'signal.c', 'system.c', 'time.c', 'genrand.c', 'dprintf.c',
 	 'util_str.c', 'util_strlist.c', 'util_unistr.c', 'util_file.c',
 	 'data_blob.c', 'util.c', 'util_sock.c', 'substitute.c', 
 	 'fsusage.c', 'ms_fnmatch.c', 'select.c', 'mutex.c', 'idtree.c',
-	 'db_wrap.c', 'gendb.c', 'credentials.c']
-basic = hostenv.StaticLibrary('basic', basic_files)
+	 'db_wrap.c']
+basic = hostenv.StaticLibrary('basic', [dynconfig,charset,talloc,basic_files])
 Export('basic')
 
 hostenv.StaticLibrary('netif', ['netif/interface.c', 'netif/netif.c'])
@@ -20,5 +23,14 @@ hostenv.StaticLibrary('gencache',['gencache.c'])
 hostenv.StaticLibrary('pidfile',['pidfile.c'])
 hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
 
-SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset', 'ldb','tls','samba3','socket','socket_wrapper','messaging','com','events',
-		   'appweb'])
+SConscript(dirs=['ldb'])
+
+Import('ldb')
+gendb = hostenv.StaticLibrary('gendb', ['gendb.c',ldb])
+Export('gendb')
+
+credentials = hostenv.StaticLibrary('credentials',['credentials.c',basic,gendb])
+Export('credentials')
+
+SConscript(dirs=['../param/','replace','tdb','popt','cmdline','registry', 'tls','samba3','socket','socket_wrapper','messaging','com','events', 'appweb'])
+
diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript
index a99a2b4892..12f4f7c11c 100644
--- a/source4/lib/cmdline/SConscript
+++ b/source4/lib/cmdline/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('basic param')
-popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param])
+Import('basic param credentials')
+popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param,credentials])
 Export('popt_common')
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index ac9e0466b2..1c0253a0d4 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,7 +1,14 @@
 Import('hostenv')
-hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
 
 opts = Options(None, ARGUMENTS)
 opts.AddOptions(
-	BoolOption('socket-wrapper','enable socket wrapper',0)
+	BoolOption('socket_wrapper','enable socket wrapper',0)
 )
+
+opts.Update(hostenv)
+
+if hostenv['socket_wrapper']:
+	hostenv.Append(CPPDEFINES = {'HAVE_SOCKET_WRAPPER': 1})
+	socket_wrapper = hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
+else:
+	socket_wrapper = []