7 files changed, 68 insertions, 10 deletions
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index f1bff77cd0..a4a1f92361 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -20,8 +20,6 @@ hostenv.StaticLibrary('gencache',['gencache.c'])
 hostenv.StaticLibrary('pidfile',['pidfile.c'])
 hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
 
-SConscript('popt/SConscript','hostenv')
-SConscript('cmdline/SConscript','hostenv')
-SConscript('talloc/SConscript','hostenv')
-SConscript('registry/SConscript','hostenv')
-SConscript('charset/SConscript', 'hostenv')
+SConscript(dirs=['tdb','popt','cmdline','talloc','registry','charset',
+		   'ldb'],
+		   exports='hostenv')
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 86392cfc40..3fa9bb354b 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -47,7 +47,6 @@ ADD_OBJ_FILES = \
 		lib/xfile.o \
 		lib/debug.o \
 		lib/fault.o \
-		lib/pidfile.o \
 		lib/signal.o \
 		lib/system.o \
 		lib/time.o \
@@ -66,7 +65,6 @@ ADD_OBJ_FILES = \
 		lib/select.o \
 		lib/mutex.o \
 		lib/idtree.o \
-		lib/unix_privs.o \
 		lib/db_wrap.o \
 		lib/gendb.o \
 		lib/credentials.o
@@ -76,3 +74,8 @@ REQUIRED_SUBSYSTEMS = \
 # End SUBSYSTEM LIBBASIC
 ##############################
 
+[SUBSYSTEM::PIDFILE]
+OBJ_FILES = lib/pidfile.o
+
+[SUBSYSTEM::UNIX_PRIVS]
+OBJ_FILES = lib/unix_privs.o
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index d73d390309..7d9044d547 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,5 +1,15 @@
+SConscript('../../build/scons/iconv.py')
 #            tastes like -*- python -*-
-
 Import('hostenv')
-charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c'])
+
+#conf = Configure(hostenv, custom_tests = { 'CheckIconv' : CheckIconv })
+#(have_iconv,iconv) = conf.CheckIconv()
+#conf.Finish()
+
+#if not have_iconv:
+#	print "Install iconv for better charset compatibility"
+
+iconv = []
+
+charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c',iconv])
 Export('charset')
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
new file mode 100644
index 0000000000..1698a7cff3
--- /dev/null
+++ b/source4/lib/ldb/SConscript
@@ -0,0 +1,29 @@
+Import('hostenv')
+
+
+hostenv.StaticLibrary('modules/timestamps.c')
+hostenv.StaticLibrary('modules/rdn_name.c')
+hostenv.StaticLibrary('modules/schema.c')
+hostenv.StaticLibrary('ldb_ildap/ldb_ildap.c')
+hostenv.StaticLibrary('modules/ldb_map.c')
+hostenv.StaticLibrary('ldb_sqlite3/ldb_sqlite3.c')
+hostenv.StaticLibrary('ldb_tdb',
+	['ldb_tdb/ldb_tdb.c','ldb_tdb/ldb_search.c','ldb_tdb/ldb_pack.c',
+	 'ldb_tdb/ldb_index.c','ldb_tdb/ldb_cache.c','ldb_tdb/ldb_tdb_wrap.c'])
+
+hostenv.StaticLibrary('ldb', 
+	['common/ldb.c','common/ldb_ldif.c','common/ldb_parse.c',
+	 'common/ldb_parse.c','common/ldb_msg.c','common/ldb_utf8.c',
+	 'common/ldb_debug.c','common/ldb_modules.c','common/ldb_match.c',
+	 'common/attrib_handlers.c','common/ldb_dn.c'])
+
+hostenv.StaticLibrary('samba/ldif_handlers.c')
+hostenv.StaticLibrary('ldb_cmdline', 'tools/cmdline.c')
+
+hostenv.Program('ldbadd',['tools/ldbadd.c'])
+hostenv.Program('ldbdel',['tools/ldbdel.c'])
+hostenv.Program('ldbmodify',['tools/ldbmodify.c'])
+hostenv.Program('ldbsearch',['tools/ldbsearch.c'])
+hostenv.Program('ldbrename',['tools/ldbrename.c'])
+hostenv.Program('ldbtest',['tools/ldbtest.c'])
+hostenv.Program('oLschema2ldif',['tools/oLschema2ldif.c'])
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index 580de92023..fd13edc42f 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,5 +1,10 @@
 #            tastes like -*- python -*-
 
 Import('hostenv')
+
+conf = Configure(hostenv)
+conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
+conf.Finish()
+
 popt = hostenv.StaticLibrary('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
 Export('popt')
diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript
new file mode 100644
index 0000000000..d2ebf7002f
--- /dev/null
+++ b/source4/lib/tdb/SConscript
@@ -0,0 +1,13 @@
+Import('hostenv')
+tdbenv = hostenv.Copy()
+tdbenv.Append(CPPPATH=['include'])
+tdb = tdbenv.StaticLibrary('tdb',
+	['common/tdb.c','common/dump.c','common/io.c','common/lock.c',
+	 'common/open.c','common/traverse.c','common/freelist.c',
+	 'common/error.c','common/tdbutil.c'])
+
+tdbtool = tdbenv.Program('tdbtool', ['tools/tdbtool.c',tdb])
+tdbtorture = tdbenv.Program('tdbtorture', ['tools/tdbtorture.c',tdb])
+tdbdump = tdbenv.Program('tdbdump', ['tools/tdbdump.c',tdb])
+tdbbackup = tdbenv.Program('tdbbackup', ['tools/tdbbackup.c',tdb])
+Default(tdbtool,tdbtorture,tdbdump,tdbbackup)
diff --git a/source4/lib/tdb/tools/tdbbackup.c b/source4/lib/tdb/tools/tdbbackup.c
index 4cb6a8cfdd..872ca99f0d 100644
--- a/source4/lib/tdb/tools/tdbbackup.c
+++ b/source4/lib/tdb/tools/tdbbackup.c
@@ -63,11 +63,11 @@
 #else
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #endif
 
 #include "tdb.h"
-#include "tdbback.h"
 
 /*
   see if one file is newer than another