r11214: Remove scons files (see http://lists.samba.org/archive/samba-technical/2005-October/043443.html)

(This used to be commit 7fffc5c9178158249be632ac0ca179c13bd1f98f)

53 files changed, 0 insertions, 1243 deletions

diff --git a/source4/SConstruct b/source4/SConstruct
deleted file mode 100644
index 5fc12c9695..0000000000
--- a/source4/SConstruct
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/usr/bin/env python
-
-# This is the experimental scons build script for Samba 4. For a proper 
-# build use the old build system (configure + make). scons may
-# eventually replace this system.
-#
-# Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org>
-# Copyright (C) 2005 Tim Potter <tpot@samba.org>
-#
-# Published under the GNU GPL
-#
-# TODO:
-# - finish fallback code
-# - support for init functions
-# - separate config file for lib/replace/
-# - Subsystem() ?
-
-import cPickle, string, os
-
-opts = Options(None, ARGUMENTS)
-opts.AddOptions(
-		BoolOption('developer','enable developer flags', False),
-		PathOption('prefix','installation prefix','/usr/local/samba'),
-		BoolOption('configure','run configure checks', False),
-)
-
-class SambaEnvironment(Environment):
-    def Subsystem(self, target, source, **kwargs):
-        """Create a Samba subsystem, basically a static library.
-
-	By default a prototype file for the subsystem is created,
-	unless the keyword argument 'noproto' is present.  A variable
-	corresponding to the target name is exported, unless the
-	keyword argument 'noexport' is present."""
-
-	# Generate prototype file for subsystem
-
-	if not kwargs.has_key('noproto'):
-	    self.proto_headers += self.CProtoHeader(
-		'%s_proto.h' % target, [str(x) for x in source])
-
-	# Maketh the library
-
-	result = self.Library(target, source, **kwargs)
-
-	# Export library symbol
-
-	if not kwargs.has_key('noexport'):
-	    locals()[target] = result	# Eww
-	    Export(target)
-
-	return result
-
-hostenv = SambaEnvironment(
-		toolpath=['build/scons','.'],
-		tools=['default','pidl','proto','et','asn1','samba'],
-		options=opts,
-		CPPPATH=['#include','#','#lib'], 
-        CPPDEFINES={'_SAMBA_BUILD_': None},
-		)
-
-hostenv.Help(opts.GenerateHelpText(hostenv))
-
-# We don't care about NFS builds...
-hostenv.SetOption('max_drift', 1)
-
-if hostenv['developer']:
-	hostenv.Append(CCFLAGS='-Wall')
-	hostenv.Append(CCFLAGS='-Wshadow')
-	hostenv.Append(CCFLAGS='-Werror-implicit-function-declaration')
-	hostenv.Append(CCFLAGS='-Wstrict-prototypes')
-	hostenv.Append(CCFLAGS='-Wpointer-arith')
-	hostenv.Append(CCFLAGS='-Wcast-qual')
-	hostenv.Append(CCFLAGS='-Wcast-align')
-	hostenv.Append(CCFLAGS='-Wwrite-strings')
-	hostenv.Append(CCFLAGS='-Wmissing-format-attribute')
-	hostenv.Append(CCFLAGS='-Wformat=2')
-	hostenv.Append(CCFLAGS='-Wno-format-y2k')
-	hostenv.Append(CCFLAGS='-Wno-declaration-after-statement')
-
-# Some tools get confused if $HOME isn't defined
-hostenv.Append(ENV={'HOME': os.environ['HOME']})
-
-# Store configuration data in a dictionary.
-
-def saveconfig(data):
-	"""Save configuration dict to a file."""
-	cached = cPickle.dump(data, open('sconf.cache', 'w'))
-
-def loadconfig():
-	"""Load configuration dict from a file."""
-	try:
-		return cPickle.load(open('sconf.cache', 'r'))
-	except IOError:
-		return None
-
-defines = loadconfig()
-
-if defines == None:
-	hostenv['configure'] = 1
-
-if hostenv['configure']:
-	defines = {}
-
-Export('defines')
-
-hostenv.Append(CPPPATH = ['#heimdal_build', '#heimdal/lib/krb5',
-			  '#heimdal/lib/hdb', '#heimdal/lib/gssapi',
-			  '#heimdal/lib/asn1', '#heimdal/lib/des',
-			  '#heimdal/kdc', '#heimdal/lib/roken',
-			  '#heimdal/lib/com_err'])
-
-Export('hostenv')
-
-buildenv = hostenv
-
-Export('buildenv')
-
-cross_compiling = 0
-
-if cross_compiling:
-	buildenv = hostenv.Copy()
-	buildenv.BuildDir('build-env','.')
-
-dynenv = hostenv.Copy()
-
-paths = { 
-	'BINDIR': 'bin',
-	'SBINDIR': 'sbin',
-	'CONFIGFILE': 'cfg',
-	'LOGFILEBASE': 'lfb',
-	'NCALRPCDIR': 'ncalrpc',
-	'LMHOSTSFILE': 'lmhosts',
-	'LIBDIR': 'libdir',
-	'SHLIBEXT': 'ext',
-	'LOCKDIR': 'lockdir',
-	'PIDDIR': 'piddir',
-	'PRIVATE_DIR': 'private',
-	'SWATDIR': 'swat'
-}
-
-Export('paths')
-
-if hostenv['configure']:
-	
-	conf = hostenv.Configure()
-
-	for h in ['sys/select.h','fcntl.h','sys/fcntl.h'] + \
-		['utime.h','grp.h','sys/id.h','limits.h','memory.h'] + \
-		['compat.h','math.h','sys/param.h','ctype.h','sys/wait.h'] + \
-		['sys/resource.h','sys/ioctl.h','sys/ipc.h','sys/mode.h'] + \
-		['sys/mman.h','sys/filio.h','sys/priv.h','sys/shm.h','string.h'] + \
-		['strings.h','stdlib.h','sys/vfs.h','sys/fs/s5param.h','sys/filsys.h'] + \
-		['termios.h','termio.h','fnmatch.h','pwd.h','sys/termio.h'] + \
-		['sys/time.h','sys/statfs.h','sys/statvfs.h','stdarg.h'] + \
-		['sys/syslog.h','syslog.h','stdint.h','inttypes.h','locale.h'] + \
-		['shadow.h','nss.h','nss_common.h','ns_api.h','sys/security.h'] + \
-		['security/pam_appl.h','sys/capability.h'] + \
-		['sys/acl.h','stdbool.h', 'netinet/in.h', 'sys/socket.h', 'arpa/inet.h', 'netdb.h']:
-		if conf.CheckCHeader(h):
-			defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1
-
-	for f in ['setsid','pipe','crypt16','getauthuid','strftime','sigprocmask',
-		'sigblock','sigaction','initgroups','setgroups','sysconf', 'getpwanam',
-		'setlinebuf','srandom','random','srand','rand','usleep','timegm',
-		'backtrace','setbuffer']:
-		if conf.CheckFunc(f):
-			defines['HAVE_' + f.upper()] = 1
-
-	# Pull in GNU extensions
-	defines['_GNU_SOURCE'] = 1
-
-	# Hardcode signal return type for now
-	defines['RETSIGTYPE'] = 'void'
-	
-	if conf.CheckType('comparison_fn_t', '#define _GNU_SOURCE\n#include <stdlib.h>'):
-		defines['HAVE_COMPARISON_FN_T'] = 1
-
-	if conf.CheckType('sig_atomic_t', '#include <signal.h>'):
-		defines['HAVE_SIG_ATOMIC_T_TYPE'] = 1
-
-	if conf.TryCompile("""
-#include <sys/types.h>
-
-int main() 
-{
-	volatile int i = 0;
-	return 0;
-}""", '.c'):
-		defines['HAVE_VOLATILE'] = 1
-
-	if conf.TryCompile("""
-#include <stdio.h>
-
-int main() 
-{
-   typedef struct {unsigned x;} FOOBAR;
-   #define X_FOOBAR(x) ((FOOBAR) { x })
-   #define FOO_ONE X_FOOBAR(1)
-   FOOBAR f = FOO_ONE;   
-   static struct {
-	FOOBAR y; 
-	} f2[] = {
-		{FOO_ONE}
-	};   
-	return 0;
-}""", '.c'):
-		defines['HAVE_IMMEDIATE_STRUCTURES'] = 1
-
-	hostenv.AlwaysBuild('include/config.h')
-
-	if conf.TryCompile("""
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  return 0;
-}
-""", '.c'):
-		defines['TIME_WITH_SYS_TIME'] = 1
-
-	if conf.TryCompile("""
-#include <sys/time.h>
-#include <unistd.h>
-main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
-""", '.c'):
-		defines['HAVE_GETTIMEOFDAY_TZ'] = 1
-
-	# Check for header that defines "DIR"
-	for h in ['dirent.h','sys/ndir.h','sys/dir.h','ndir.h']:
-		if conf.TryCompile("""
-#include <%s>
-
-int main() { DIR *x; return 0; }""" % h, '.c'):
-			defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1
-			break
-
-	conf.Finish()
-
-[dynenv.Append(CPPDEFINES = {p: '\\"%s\\"' % paths[p]}) for p in paths]
-	
-dynconfig = dynenv.Object('dynconfig.c')
-Export('dynconfig')
-
-hostenv.proto_headers = []
-
-SConscript(
-		dirs=['dsdb', 'libcli', 'lib','torture','rpc_server','cldap_server',
-		'nbt_server','client','ldap_server','libnet','nsswitch','web_server',
-		'smbd','dsdb','heimdal_build','ntptr','kdc','smb_server','ntvfs',
-		'winbind','scripting','auth', 'librpc','script/tests'])
-
-# proto.h
-
-def create_global_proto(env, target, source):
-	fd = open(str(target[0]), 'w')
-	[fd.write('#include "%s"\n' % x) for x in source]
-	fd.close()
-
-def create_global_proto_print(*args, **kwargs):
-	print 'Building global proto.h'
-
-hostenv.Command('include/proto.h', hostenv.proto_headers,
-	Action(create_global_proto, create_global_proto_print))
-
-# Save configuration
-
-if hostenv['configure']:
-	saveconfig(defines)
-
-# How to create config.h file
-def create_config_h(env, target, source):
-	fd = open(str(target[0]), 'w')
-	[fd.write('#define %s %s\n' % (x, defines[x])) for x in defines]
-	fd.close()
-
-def create_config_h_print(*args, **kwargs):
-	print 'Building config.h'
-
-hostenv.Command('include/config.h', [],
-		Action(create_config_h, create_config_h_print))
-hostenv.Append(CPPDEFINES = {'HAVE_CONFIG_H': 1})
diff --git a/source4/auth/SConscript b/source4/auth/SConscript
deleted file mode 100644
index f5151fd97f..0000000000
--- a/source4/auth/SConscript
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-Import('hostenv')
-
-hostenv.Library('auth_sam.c')
-hostenv.Library('auth_anonymous.c')
-hostenv.Library('auth_winbind.c')
-hostenv.Library('auth_domain.c')
-hostenv.Library('auth_developer.c')
-hostenv.Library('auth_unix.c')
-
-if hostenv['configure']:
-    conf = hostenv.Configure()
-    have_pam = conf.CheckLibWithHeader('pam', 'security/pam_appl.h', 'c', 'pam_start')
-    conf.Finish()
-
-proto_files = []
-hostenv.Library('pam_errors.c')
-proto_files += ['pam_errors.c', 'auth_sam.c']
-auth_files = ['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c']
-proto_files += auth_files
-hostenv.Library('auth',auth_files)
-
-ntlmssp_files = ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c',
-		'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c',
-		'ntlmssp/ntlmssp_server.c'] 
-proto_files += ntlmssp_files
-hostenv.Library('gensec_ntlmssp', ntlmssp_files)
-
-kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c',
-	'kerberos/kerberos_verify.c','kerberos/kerberos_util.c',
-	'kerberos/kerberos_pac.c','kerberos/gssapi_parse.c',
-	'kerberos/krb5_init_context.c']
-
-proto_files += kerberos_files
-
-hostenv.Library('kerberos', kerberos_files)
-
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
-
-SConscript(dirs=['gensec'])
diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript
deleted file mode 100644
index b576a7afb9..0000000000
--- a/source4/auth/gensec/SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
-Import('hostenv')
-
-gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.c',
-			    'spnego_parse.c', 'schannel.c', 'schannel_sign.c', 
-				'schannel_state.c']
-
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', gensec_files)
-
-hostenv.Library('gensec',['gensec.c'])
-hostenv.Library('gensec_krb5',['gensec_krb5.c'])
-hostenv.Library('gensec_gssapi',['gensec_gssapi.c'])
-hostenv.Library('gensec_spnego',['spnego.c','spnego_parse.c'])
-hostenv.Library('gensec_schannel',['schannel.c','schannel_sign.c'])
-hostenv.Library('schanneldb',['schannel_state.c'])
diff --git a/source4/auth/kerberos/SConscript b/source4/auth/kerberos/SConscript
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/auth/kerberos/SConscript
+++ /dev/null
diff --git a/source4/auth/ntlmssp/SConscript b/source4/auth/ntlmssp/SConscript
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/auth/ntlmssp/SConscript
+++ /dev/null
diff --git a/source4/cldap_server/SConscript b/source4/cldap_server/SConscript
deleted file mode 100644
index c81ab745fc..0000000000
--- a/source4/cldap_server/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Import('hostenv')
-hostenv.Library('cldap_server',['cldap_server.c','netlogon.c'])
diff --git a/source4/client/SConscript b/source4/client/SConscript
deleted file mode 100644
index 4ba6deedc5..0000000000
--- a/source4/client/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Import('hostenv popt_common basic talloc param')
-hostenv.Program('smbclient', ['client.c',popt_common,talloc,basic,param])
diff --git a/source4/dsdb/SConscript b/source4/dsdb/SConscript
deleted file mode 100644
index cdbf146149..0000000000
--- a/source4/dsdb/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('hostenv')
-
-dsdb_ldb_modules = []
-
-dsdb_ldb_modules.append(
-	hostenv.Library('ldb_objectguid',
-	['samdb/ldb_modules/objectguid.c']))
-
-dsdb_ldb_modules.append(
-	hostenv.Library('ldb_samldb',['samdb/ldb_modules/samldb.c']))
-
-dsdb_ldb_modules.append(
-	hostenv.Library('ldb_samba3sam',
-	['samdb/ldb_modules/samba3sam.c']))
-
-Export('dsdb_ldb_modules')
-
-samdb_files = ['samdb/samdb.c','samdb/samdb_privilege.c','common/flag_mapping.c']
-hostenv.Library('samdb',samdb_files)
-hostenv.proto_headers += hostenv.CProtoHeader(samdb_files)
diff --git a/source4/gtk/SConscript b/source4/gtk/SConscript
deleted file mode 100644
index 2e9eda3393..0000000000
--- a/source4/gtk/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-Import('hostenv')
-gtksmb = hostenv.Library('gtksmb',
-		['common/gtk-smb.c','common/select.c',
-		'common/gtk_events.c','common/credentials.c'])
-
-hostenv.Program('gregedit', [gtksmb,'tools/gregedit.c',gtksmb])
-hostenv.Program('gepdump', [gtksmb,'tools/gepdump.c',gtksmb])
-hostenv.Program('gwcrontab', [gtksmb,'tools/gwcrontab.c',gtksmb])
-hostenv.Program('gwsam', [gtksmb,'tools/gwsam.c','tools/gwsam_user.c',gtksmb])
diff --git a/source4/heimdal_build/SConscript b/source4/heimdal_build/SConscript
deleted file mode 100644
index 17d9273688..0000000000
--- a/source4/heimdal_build/SConscript
+++ /dev/null
@@ -1,121 +0,0 @@
-Import('buildenv hostenv defines')
-
-if hostenv['configure']:
-	defines['HAVE_KRB5'] = 1
-
-hostenv.Library('heimdal_kdc',
-	['../kdc/default_config.c','../kdc/kerberos5.c','../kdc/pkinit.c',
-	 '../kdc/log.c','../kdc/misc.c','../kdc/524.c','../kdc/kerberos4.c',
-	 '../kdc/kaserver.c','../kdc/process.c'])
-
-hdb_asn1 = hostenv.ASN1('../heimdal/lib/hdb/hdb.asn1',ASN1PREFIX='hdb_asn1')
-gssapi_asn1 = hostenv.ASN1('../heimdal/lib/gssapi/spnego.asn1',ASN1PREFIX='spnego_asn1')
-k5_asn1 = hostenv.ASN1('../heimdal/lib/asn1/k5.asn1',ASN1PREFIX='k5_asn1')
-
-hostenv.Library('heimdal_hdb',
-	['../heimdal/lib/hdb/db.c','../heimdal/lib/hdb/hdb.c','../heimdal/lib/hdb/ext.c','../heimdal/lib/hdb/keys.c',
-	'../heimdal/lib/hdb/mkey.c','../heimdal/lib/hdb/ndbm.c',hdb_asn1,
-	hostenv.ErrorTable('../heimdal/lib/hdb/hdb_err.et')])
-
-hostenv.Library('heimdal_gssapi',
-	['../heimdal/lib/gssapi/init_sec_context.c','../heimdal/lib/gssapi/inquire_cred.c',
-	'../heimdal/lib/gssapi/release_buffer.c','../heimdal/lib/gssapi/release_cred.c',
-	'../heimdal/lib/gssapi/release_name.c','../heimdal/lib/gssapi/release_oid_set.c',
-	'../heimdal/lib/gssapi/sequence.c','../heimdal/lib/gssapi/test_oid_set_member.c',
-	'../heimdal/lib/gssapi/unwrap.c','../heimdal/lib/gssapi/verify_mic.c','../heimdal/lib/gssapi/wrap.c',
-	'../heimdal/lib/gssapi/address_to_krb5addr.c',
-	gssapi_asn1,'../heimdal/lib/gssapi/8003.c',
-	'../heimdal/lib/gssapi/accept_sec_context.c','../heimdal/lib/gssapi/acquire_cred.c',
-	'../heimdal/lib/gssapi/add_oid_set_member.c','../heimdal/lib/gssapi/arcfour.c',
-	'../heimdal/lib/gssapi/ccache_name.c','../heimdal/lib/gssapi/copy_ccache.c','../heimdal/lib/gssapi/cfx.c',
-	'../heimdal/lib/gssapi/compat.c','../heimdal/lib/gssapi/context_time.c',
-	'../heimdal/lib/gssapi/create_emtpy_oid_set.c','../heimdal/lib/gssapi/decapsulate.c',
-	'../heimdal/lib/gssapi/delete_sec_context.c','../heimdal/lib/gssapi/display_name.c',
-	'../heimdal/lib/gssapi/display_status.c','../heimdal/lib/gssapi/duplicate_name.c',
-	'../heimdal/lib/gssapi/encapsulate.c','../heimdal/lib/gssapi/external.c',
-	'../heimdal/lib/gssapi/get_mic.c','../heimdal/lib/gssapi/import_name.c','../heimdal/lib/gssapi/init.c'])
-
-hostenv.Library('heimdal_krb5',
-	['../heimdal/lib/krb5/acache.c','../heimdal/lib/krb5/add_et_list.c','../heimdal/lib/krb5/addr_families.c',
-	'../heimdal/lib/krb5/appdefault.c','../heimdal/lib/krb5/asn1_glue.c','../heimdal/lib/krb5/auth_context.c',
-	'../heimdal/lib/krb5/build_ap_req.c','../heimdal/lib/krb5/build_auth.c','../heimdal/lib/krb5/cache.c',
-	'../heimdal/lib/krb5/changepw.c','../heimdal/lib/krb5/codec.c','../heimdal/lib/krb5/config_file.c',
-	'../heimdal/lib/krb5/config_file_netinfo.c','../heimdal/lib/krb5/constants.c',
-	'../heimdal/lib/krb5/context.c','../heimdal/lib/krb5/copy_host_realm.c','../heimdal/lib/krb5/crc.c',
-	'../heimdal/lib/krb5/creds.c','../heimdal/lib/krb5/crypto.c','../heimdal/lib/krb5/data.c',
-	'../heimdal/lib/krb5/eai_to_heim_errno.c','../heimdal/lib/krb5/error_string.c',
-	'../heimdal/lib/krb5/expand_hostname.c','../heimdal/lib/krb5/fcache.c',
-	'../heimdal/lib/krb5/free.c','../heimdal/lib/krb5/free_host_realm.c',
-	'../heimdal/lib/krb5/generate_seq_number.c','../heimdal/lib/krb5/generate_subkey.c',
-	'../heimdal/lib/krb5/get_cred.c','../heimdal/lib/krb5/get_default_principal.c',
-	'../heimdal/lib/krb5/get_default_realm.c','../heimdal/lib/krb5/get_for_creds.c',
-	'../heimdal/lib/krb5/get_host_realm.c','../heimdal/lib/krb5/get_in_tkt.c',
-	'../heimdal/lib/krb5/get_in_tkt_with_keytab.c','../heimdal/lib/krb5/get_port.c',
-	'../heimdal/lib/krb5/init_creds.c','../heimdal/lib/krb5/init_creds_pw.c','../heimdal/lib/krb5/kcm.c',
-	'../heimdal/lib/krb5/keyblock.c','../heimdal/lib/krb5/keytab.c','../heimdal/lib/krb5/keytab_any.c',
-	'../heimdal/lib/krb5/keytab_file.c','../heimdal/lib/krb5/keytab_memory.c',
-	'../heimdal/lib/krb5/keytab_keyfile.c','../heimdal/lib/krb5/keytab_krb4.c','../heimdal/lib/krb5/krbhst.c',
-	'../heimdal/lib/krb5/log.c','../heimdal/lib/krb5/mcache.c','../heimdal/lib/krb5/misc.c',
-	'../heimdal/lib/krb5/mk_error.c','../heimdal/lib/krb5/mk_priv.c','../heimdal/lib/krb5/mk_rep.c',
-	'../heimdal/lib/krb5/mk_req.c','../heimdal/lib/krb5/mk_req_ext.c','../heimdal/lib/krb5/mit_glue.c',
-	'../heimdal/lib/krb5/n-fold.c','../heimdal/lib/krb5/padata.c','../heimdal/lib/krb5/pkinit.c',
-	'../heimdal/lib/krb5/principal.c','../heimdal/lib/krb5/rd_cred.c','../heimdal/lib/krb5/rd_error.c',
-	'../heimdal/lib/krb5/rd_priv.c','../heimdal/lib/krb5/rd_rep.c','../heimdal/lib/krb5/rd_req.c',
-	'../heimdal/lib/krb5/replay.c','../heimdal/lib/krb5/send_to_kdc.c',
-	'../heimdal/lib/krb5/set_default_realm.c','../heimdal/lib/krb5/store.c','../heimdal/lib/krb5/store_emem.c',
-	'../heimdal/lib/krb5/store_fd.c','../heimdal/lib/krb5/store_mem.c','../heimdal/lib/krb5/ticket.c',
-	'../heimdal/lib/krb5/time.c','../heimdal/lib/krb5/transited.c','../heimdal/lib/krb5/v4_glue.c',
-	'../heimdal/lib/krb5/version.c','../heimdal/lib/krb5/warn.c',
-	hostenv.ErrorTable('../heimdal/lib/krb5/krb5_err.et'),
-	hostenv.ErrorTable('../heimdal/lib/krb5/heim_err.et'),
-	hostenv.ErrorTable('../heimdal/lib/krb5/k524_err.et')])
-
-hostenv.Library('heimdal_asn1', k5_asn1)
-
-hostenv.Library('heimdal_des',
-	['../heimdal/lib/des/aes.c','../heimdal/lib/des/des.c','../heimdal/lib/des/md4.c','../heimdal/lib/des/md5.c',
-	'../heimdal/lib/des/rc2.c','../heimdal/lib/des/rc4.c','../heimdal/lib/des/rijndael-alg-fst.c',
-	'../heimdal/lib/des/rnd_keys.c','../heimdal/lib/des/sha.c','../heimdal/lib/des/ui.c'])
-
-hostenv.Library('roken_gai_strerror', ['../heimdal/lib/roken/gai_strerror.c'])
-hostenv.Library('roken_inet_aton', ['../heimdal/lib/roken/inet_aton.c'])
-hostenv.Library('roken_addrinfo', 
-	['../heimdal/lib/roken/getaddrinfo.c','../heimdal/lib/roken/freeaddrinfo.c',
-	 '../heimdal/lib/roken/getipnodebyaddr.c','../heimdal/lib/roken/getipnodebyname.c',
-	 '../heimdal/lib/roken/freehostent.c', '../heimdal/lib/roken/copyhostent.c',
-	 '../heimdal/lib/roken/hostent_find_fqdn.c'])
-
-hostenv.Library('roken',
-	['../heimdal/lib/roken/base64.c','../heimdal/lib/roken/bswap.c','../heimdal/lib/roken/get_window_size.c',
-	'../heimdal/lib/roken/getprogname.c','../heimdal/lib/roken/h_errno.c','../heimdal/lib/roken/issuid.c',
-	'../heimdal/lib/roken/net_read.c','../heimdal/lib/roken/net_write.c','../heimdal/lib/roken/parse_time.c',
-	'../heimdal/lib/roken/parse_units.c','../heimdal/lib/roken/resolve.c',
-	'../heimdal/lib/roken/roken_gethostby.c','../heimdal/lib/roken/signal.c','../heimdal/lib/roken/vis.c',
-	'../heimdal/lib/roken/strlwr.c','../heimdal/lib/roken/strsep_copy.c','../heimdal/lib/roken/strupr.c',
-	'../heimdal/lib/roken/strpool.c','heimdal_build/replace.c'])
-
-hostenv.Library('heimdal_vers',['../heimdal/lib/version/print_version.c'])
-hostenv.Library('heimdal_glue',['heimdal_build/glue.c'])
-hostenv.Library('heimdal_com_err',
-	['../heimdal/lib/com_err/com_err.c','../heimdal/lib/com_err/error.c'])
-
-buildenv.Program('asn1_compile',
-	['../heimdal/lib/asn1/main.c','../heimdal/lib/asn1/gen.c',
-	'../heimdal/lib/asn1/gen_copy.c','../heimdal/lib/asn1/gen_decode.c',
-	'../heimdal/lib/asn1/gen_encode.c','../heimdal/lib/asn1/gen_free.c',
-	'../heimdal/lib/asn1/gen_glue.c','../heimdal/lib/asn1/gen_length.c',
-	'../heimdal/lib/asn1/hash.c','../heimdal/lib/asn1/lex.l',
-	'../heimdal/lib/asn1/parse.y','../heimdal/lib/roken/emalloc.c',
-	'../heimdal/lib/roken/getarg.c','../heimdal/lib/roken/setprogname.c',
-	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/getprogname.c',
-	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/estrdup.c',
-	'../heimdal/lib/roken/ecalloc.c','../heimdal/lib/asn1/symbol.c',
-	'heimdal_build/replace.c','../heimdal/lib/vers/print_version.c',
-	'lib/replace/snprintf.c','lib/replace/replace.c'])
-
-buildenv.Program('compile_et',
-	['../heimdal/lib/vers/print_version.c','../heimdal/lib/com_err/lex.l','../heimdal/lib/com_err/parse.y',
-	'../heimdal/lib/com_err/compile_et.c','../heimdal/lib/roken/getarg.c',
-	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/getprogname.c',
-	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/setprogname.c','heimdal_build/replace.c',
-	'lib/replace/snprintf.c','lib/replace/replace.c'])
diff --git a/source4/kdc/SConscript b/source4/kdc/SConscript
deleted file mode 100644
index 2453925756..0000000000
--- a/source4/kdc/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Import('hostenv')
-hostenv.Library('kdc',['kdc.c','pac-glue.c','hdb-ldb.c'])
diff --git a/source4/ldap_server/SConscript b/source4/ldap_server/SConscript
deleted file mode 100644
index d44da9b084..0000000000
--- a/source4/ldap_server/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('hostenv')
-hostenv.Library('ldap_server', 
-		['ldap_server.c','ldap_backend.c','ldap_bind.c','ldap_rootdse.c',
-	 	 'ldap_simple_ldb.c','ldap_hacked_ldb.c'])
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
deleted file mode 100644
index be77e8621d..0000000000
--- a/source4/lib/SConscript
+++ /dev/null
@@ -1,44 +0,0 @@
-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']
-
-proto_files = basic_files
-
-basic = hostenv.Library('basic', [dynconfig,charset,talloc,basic_files])
-Export('basic')
-
-hostenv.Library('tdr', ['tdr/tdr.c'])
-hostenv.Library('crypto', 
-		['crypto/crc32.c','crypto/md5.c','crypto/hmacmd5.c',
-		'crypto/md4.c','crypto/arcfour.c'])
-hostenv.Library('compression', ['compression/mszip.c'])
-hostenv.Library('gencache',['gencache.c'])
-hostenv.Library('pidfile',['pidfile.c'])
-hostenv.Library('unix_privs',['unix_privs.c'])
-
-SConscript(dirs=['ldb'])
-
-Import('ldb')
-gendb_files = ['gendb.c']
-proto_files += gendb_files
-gendb = hostenv.Library('gendb', [gendb_files,ldb])
-Export('gendb')
-
-credentials_files = ['credentials.c']
-proto_files += credentials_files
-credentials = hostenv.Library('credentials',[credentials_files,basic,gendb])
-Export('credentials')
-
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
-
-SConscript(dirs=['../param/','replace','tdb','popt','cmdline','registry', 'tls','samba3','socket','socket_wrapper','messaging','com','events', 'appweb', 'netif'])
-
diff --git a/source4/lib/appweb/SConscript b/source4/lib/appweb/SConscript
deleted file mode 100644
index 6ffcaa23ec..0000000000
--- a/source4/lib/appweb/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('mpr',['mpr/miniMpr.c','mpr/var.c'])
-hostenv.Library('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c'])
-hostenv.Library('esp',['esp/esp.c','esp/espProcs.c'])
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
deleted file mode 100644
index 9bc474ff48..0000000000
--- a/source4/lib/charset/SConscript
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-# tastes like -*- python -*-
-
-Import('hostenv')
-
-def _CheckIconvPath(context,path):
-	# Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  	# those with the standalone portable libiconv installed).
-	if path: 
-		context.Message("checking for iconv in " + path + " ... ")
-		context.env.Append(LIBPATH=path)
-	else:
-		context.Message("checking for iconv in default path ... ")
-
-	for l in [None,'giconv','iconv']:
-		for h in ['giconv.h','iconv.h']:
-			if l: 
-				context.env['LIBS'] = [l]
-			if context.TryLink("""
-#include <stdlib.h>
-#include <%s>
-
-int main()
-{
-	iconv_t cd = iconv_open("","");
-    iconv(cd,NULL,NULL,NULL,NULL);
-    iconv_close(cd);
-	return 0;
-}""" % h, '.c'):
-				context.Result(1)
-				return True
-			
-	context.Result(0)
-	return False
-
-def CheckIconv(context):
-	look_dirs = [None, '/usr','/usr/local','/sw']
-
-	for p in look_dirs:
-		if _CheckIconvPath(context,p):
-			break
-
-	if context.TryRun("""
-#include <iconv.h>
-main() {
-       iconv_t cd = iconv_open("ASCII", "UCS-2LE");
-       if (cd == 0 || cd == (iconv_t)-1) return -1;
-       return 0;
-}
-""", '.c'):
-		return (1,[])
-	
-	return (0,[])
-
-if hostenv['configure']:
-	conf = hostenv.Configure( custom_tests = { 'CheckIconv' : CheckIconv })
-	(have_iconv,iconv) = conf.CheckIconv()
-	conf.Finish()
-
-	if not have_iconv:
-		print "Install iconv for better charset compatibility"
-else:
-	iconv = [] # FIXME
-
-charset = hostenv.Library('charset',['iconv.c','charcnv.c',iconv])
-Export('charset')
diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript
deleted file mode 100644
index 4a2047f071..0000000000
--- a/source4/lib/cmdline/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-#            tastes like -*- python -*-
-
-Import('basic param credentials')
-popt_common = hostenv.Library('popt_common',['popt_common.c',basic,param,credentials])
-Export('popt_common')
diff --git a/source4/lib/com/SConscript b/source4/lib/com/SConscript
deleted file mode 100644
index 797cd37620..0000000000
--- a/source4/lib/com/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('hostenv')
-hostenv.Library('com', [ 'tables.c','rot.c','main.c'])
-hostenv.Library('dcom', [ 'dcom/tables.c','dcom/main.c'])
-hostenv.Library('com_simple', ['classes/simple.c'])
diff --git a/source4/lib/events/SConscript b/source4/lib/events/SConscript
deleted file mode 100644
index a8a6c08657..0000000000
--- a/source4/lib/events/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('events',['events.c','events_standard.c'])
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
deleted file mode 100644
index 8e246d1961..0000000000
--- a/source4/lib/ldb/SConscript
+++ /dev/null
@@ -1,63 +0,0 @@
-#            tastes like -*- python -*-
-
-Import('hostenv', 'talloc', 'defines', 'basic', 'cli_ldap')
-
-# Configure stuff
-
-if hostenv['configure']:
-    conf = Configure(hostenv)
-    if conf.CheckLibWithHeader('sqlite3','sqlite3.h','c','sqlite3_open()'):
-        defines['HAVE_SQLITE3'] = 1
-    conf.CheckLibWithHeader('popt','popt.h','c','poptGetArgs(NULL);')
-    conf.Finish()
-
-if defines.has_key('HAVE_SQLITE3'):
-    hostenv.Library('ldb_sqlite3/ldb_sqlite3.c')
-
-# LDB modules
-
-modules = []
-
-modules.append(hostenv.Library('modules/timestamps.c'))
-modules.append(hostenv.Library('modules/rdn_name.c'))
-modules.append(hostenv.Library('modules/schema.c'))
-modules.append(hostenv.Library('ldb_ildap/ldb_ildap.c'))
-#modules.append(hostenv.Library('modules/ldb_map.c'))
-
-Import('dsdb_ldb_modules')
-modules += dsdb_ldb_modules
-
-modules.append(hostenv.Library(
-    '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']))
-	       
-#modules.append(hostenv.Library('ldb_ildap', ['ldb_ildap/ldb_ildap.c']))
-
-# Export the ldb base plus modules for other parts of the build system
-# to enjoy.
-
-ldb = hostenv.Library(
-    '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/ldb_attributes.c', 'common/attrib_handlers.c', 'common/ldb_dn.c'])
-
-Export('ldb')
-
-hostenv.Library('samba/ldif_handlers.c')
-ldb_cmdline = hostenv.Library('ldb_cmdline', 'tools/cmdline.c')
-
-# Tools
-
-ldbenv = hostenv.Copy()
-ldbenv.Append(LIBS = ['popt'])
-
-ldbenv.Program('ldbadd',['tools/ldbadd.c',ldb,modules,ldb_cmdline,cli_ldap,talloc,basic])
-ldbenv.Program('ldbdel',['tools/ldbdel.c',ldb,ldb_cmdline,basic])
-ldbenv.Program('ldbmodify',['tools/ldbmodify.c',ldb,ldb_cmdline])
-ldbenv.Program('ldbsearch',['tools/ldbsearch.c',ldb,ldb_cmdline])
-ldbenv.Program('ldbrename',['tools/ldbrename.c',ldb,ldb_cmdline])
-ldbenv.Program('ldbtest',['tools/ldbtest.c',ldb,ldb_cmdline])
-ldbenv.Program('oLschema2ldif',['tools/oLschema2ldif.c',ldb])
diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript
deleted file mode 100644
index 7e060f0851..0000000000
--- a/source4/lib/messaging/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Import('hostenv')
-hostenv.Library('messaging','messaging.c')
diff --git a/source4/lib/netif/SConscript b/source4/lib/netif/SConscript
deleted file mode 100644
index 7630d13236..0000000000
--- a/source4/lib/netif/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-Import('hostenv defines')
-
-if hostenv['configure']:
-	conf = Configure(hostenv)
-
-	for h in ['arpa/inet.h','net/if.h','netdb.h','netinet/in.h','netinet/ip.h','netinet/tcp.h','netinet/in_systm.h','netinet/in_ip.h']:
-		if conf.CheckCHeader(h):
-			defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1
-	
-	for d in ['HAVE_IFACE_IFCONF','HAVE_IFACE_AIX','HAVE_IFACE_IFREQ']:
-		if conf.TryRun("""
-#define %s 1
-#define AUTOCONF_TEST 1
-#include "confdefs.h"
-#include "netif.c"
-""" % d, '.c'):
-			defines[d] = 1
-			break
-
-	conf.Finish()
-
-hostenv.Library('netif', ['interface.c', 'netif.c'])
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
deleted file mode 100644
index d9a576a031..0000000000
--- a/source4/lib/popt/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-#            tastes like -*- python -*-
-Import('hostenv')
-
-
-if hostenv['configure']:
-    conf = hostenv.Configure()
-    conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
-    conf.Finish()
-
-popt = hostenv.Library('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
-Export('popt')
diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript
deleted file mode 100644
index f2fa526a67..0000000000
--- a/source4/lib/registry/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('hostenv paths')
-#            tastes like -*- python -*-
-
-Import('talloc basic popt_common popt param')
-registry = hostenv.Library('registry',
-			[basic,talloc,'common/reg_interface.c','common/reg_util.c'])
-regtree = hostenv.Program('regtree', ['tools/regtree.c',registry,talloc,basic,popt_common,popt,param])
-regshell = hostenv.Program('regshell', ['tools/regshell.c',registry,talloc,basic,popt_common,popt,param])
-regpatch = hostenv.Program('regpatch', ['tools/regpatch.c',registry,talloc,basic,popt_common,popt,param])
-regdiff = hostenv.Program('regdiff', ['tools/regdiff.c',registry,talloc,basic,popt_common,popt,param])
-
-hostenv.Library('reg_backend_dir.c')
-hostenv.Library('reg_backend_gconf.c')
-hostenv.Library('reg_backend_ldb.c')
-hostenv.Library('reg_backend_nt4', ['reg_backend_nt4.c',hostenv.TdrMarshaller('regf.idl')])
-hostenv.Library('reg_backend_rpc.c')
-hostenv.Library('reg_backend_w95.c')
-hostenv.Library('reg_backend_wine.c')
-
-hostenv.Install(paths['BINDIR'], [regtree,regshell,regpatch,regdiff])
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
deleted file mode 100644
index cf28102175..0000000000
--- a/source4/lib/replace/SConscript
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-Import('hostenv defines')
-
-rep_files = ['replace.c', 'snprintf.c','dlfcn.c']
-
-if hostenv['configure']:
-	conf = Configure(hostenv)
-	for f in ['memset','syslog','setnetgrent','getnetgrent','endnetgrent', \
-			'mktemp', 'memcpy']:
-		if not conf.CheckFunc(f,'c'):
-			print "Required function `%s' not found" % f
-			exit(1)
-	
-	for f in ['strtoull','__strtoull','strtouq','strtoll','__strtoll','strtoq',
-			  'seteuid','setresuid','setegid','setresgid','dlsym','dlopen',
-			  'dlerror','dlclose','waitpid','getcwd','strdup','strndup',
-			  'strnlen','strerror','bzero','chroot','strlcpy','strlcat',
-			  'memmove','vsnprintf','asprintf','snprintf','vasprintf',
-			  'innetgr','mktime','rename','ftruncate','chsize','setlinebuf',
-			  'setenv','vsyslog','pread','pwrite']:
-		if conf.CheckFunc(f,'c'):
-			defines['HAVE_' + f.upper()] = 1
-
-	# Check for errno declaration
-	if conf.TryCompile("""
-#include <errno.h>
-
-int main() {
-	int i = (int)errno;
-	return 0;
-}""", '.c'):
-		defines['HAVE_ERRNO_DECL'] = 1
-
-	for h in ['dlfcn.h']:
-		if conf.CheckCHeader('dlfcn.h'):
-			defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1
-
-	if not conf.CheckType('socklen_t', "#include <sys/socket.h>"):
-		defines['socklen_t'] = 'int'
-
-	needed_types = { 
-		'uint_t': 'unsigned int',
-		'int8_t': 'signed char',
-		'uint8_t': 'unsigned char',
-		'u_int8_t': 'unsigned char',
-		'int16_t': 'short',
-		'uint16_t': 'unsigned short',
-		'u_int16_t': 'unsigned short',
-		'int32_t': 'long',
-		'uint32_t': 'unsigned long',
-		'u_int32_t': 'unsigned long',
-		'int64_t': 'long long',
-		'uint64_t': 'unsigned long long',
-		'ssize_t': 'int'
-	}
-
-	type_headers = """
-#include <stdint.h>
-#include <sys/types.h>
-"""	
-	for t in needed_types:
-		if not conf.CheckType(t,type_headers):
-			defines[t] = needed_types[t]
-
-	if not conf.TryRun(open("../../build/tests/os2_delete.c").read(), '.c'):
-		rep_files += ['repdir/repdir.c']
-
-	conf.Finish()
-
-hostenv.Library('replace', rep_files)
-SConscript(dirs=['win32'])
diff --git a/source4/lib/replace/win32/SConscript b/source4/lib/replace/win32/SConscript
deleted file mode 100644
index a23fb6a878..0000000000
--- a/source4/lib/replace/win32/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-Import('hostenv defines')
-
-if hostenv['configure']:
-	conf = Configure(hostenv)
-	for h in ['direct.h','windows.h','winsock2.h','ws2tcpip.h']:
-		if conf.CheckCHeader(h):
-			defines['HAVE_' + h.upper().replace('.','_')] = 1
-	conf.TryCompile("""
-#include <stdio.h>
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
-
-int main()
-{
-	mkdir("foo",0777);
-	return 0;
-}
-""", '.c')
-	
-	conf.Finish()
-
diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript
deleted file mode 100644
index 3fa9ea947b..0000000000
--- a/source4/lib/samba3/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('hostenv')
-hostenv.Library('samba3',
-		['smbpasswd.c','tdbsam.c','policy.c','idmap.c','winsdb.c','samba3.c',
-		'group.c','registry.c','secrets.c','share_info.c'])
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
deleted file mode 100644
index 73c7eeeeac..0000000000
--- a/source4/lib/socket/SConscript
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-Import('hostenv defines')
-
-if hostenv['configure']:
-	conf = hostenv.Configure()
-	for h in ['sys/socket.h','sys/sockio.h','sys/un.h']:
-		if conf.CheckCHeader(h):
-			defines['HAVE_' + h.upper().replace('/','_').replace('.','_')] = 1
-	#HAVE_SOCK_SIN_LEN
-	conf.TryCompile("""
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-int main(void)
-{
-	struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-	return 0;
-}""", '.c')
-
-	#HAVE_UNIXSOCKET
-	conf.TryCompile("""
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>],
-
-int main(void)
-{
-  struct sockaddr_un sunaddr; 
-  sunaddr.sun_family = AF_UNIX;
-  return 0;
-}""", '.c')
-
-	# HAVE_IPV6
-	conf.CheckFunc('gethostbyname2')
-
-	# The following test taken from the cvs sources
-	# If we can't find connect, try looking in -lsocket, -lnsl, and -linet.
-	# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has
-	# libsocket.so which has a bad implementation of gethostbyname (it
-	# only looks in /etc/hosts), so we only look for -lsocket if we need
-	# it.
-	
-	connect_libs = []
-
-	if not conf.CheckFunc('connect'):
-		for l in ['nsl_s','nsl','socket','inet']:
-			if conf.CheckLib(l, 'connect'):
-				connect_libs.append(l)
-				break
-
-	# HAVE_WORKING_AF_LOCAL
-	# FIXME: Try compiling build/tests/unixsock.c
-
-
-	conf.Finish()
-
-hostenv.Library('socket_ipv4.c')
-hostenv.Library('socket_ipv6.c')
-hostenv.Library('socket_unix.c')
-hostenv.Library('socket', ['socket.c','access.c','connect.c'])
-
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
deleted file mode 100644
index 248922bcd7..0000000000
--- a/source4/lib/socket_wrapper/SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
-Import('hostenv')
-
-opts = Options(None, ARGUMENTS)
-opts.AddOptions(
-	BoolOption('socket_wrapper','enable socket wrapper',0)
-)
-
-opts.Update(hostenv)
-
-if hostenv['socket_wrapper']:
-	hostenv.Append(CPPDEFINES = {'HAVE_SOCKET_WRAPPER': 1})
-	socket_wrapper = hostenv.Library('socket_wrapper',['socket_wrapper.c'])
-else:
-	socket_wrapper = []
diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript
deleted file mode 100644
index 222a00e001..0000000000
--- a/source4/lib/talloc/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('hostenv')
-#            tastes like -*- python -*-
-
-talloc = hostenv.Library('talloc',['talloc.c'])
-Export('talloc')
diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript
deleted file mode 100644
index 9eb347f3ac..0000000000
--- a/source4/lib/tdb/SConscript
+++ /dev/null
@@ -1,15 +0,0 @@
-Import('hostenv')
-
-tdbenv = hostenv.Copy()
-tdbenv.Append(CPPPATH=['include'])
-
-tdb_source = ['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/transaction.c', 'common/tdbutil.c']
-
-tdb = tdbenv.Library('tdb', tdb_source)
-
-tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb])
-tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb])
-tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb])
-#tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb])
diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript
deleted file mode 100644
index 452eaeeddc..0000000000
--- a/source4/lib/tls/SConscript
+++ /dev/null
@@ -1,7 +0,0 @@
-Import('hostenv')
-hostenv.Library('tls', ['tls.c', 'tlscert.c'])
-
-if hostenv['configure']:
-    conf = hostenv.Configure()
-    conf.CheckLibWithHeader('gnutls', 'gnutls/gnutls.h', 'c', 'gnutls_global_init()')
-    conf.Finish()
diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
deleted file mode 100644
index 5b600fdcff..0000000000
--- a/source4/libcli/SConscript
+++ /dev/null
@@ -1,119 +0,0 @@
-Import('hostenv')
-
-hostenv.Subsystem(
-    'cli_utils',
-    ['util/asn1.c',
-     'util/doserr.c',
-     'util/errormap.c',
-     'util/clierror.c',
-     'util/nterr.c',
-     'util/smbdes.c'])
-
-hostenv.Subsystem(
-    'cli_lsa',
-    ['util/clilsa.c'])
-
-hostenv.Subsystem(
-    'cli_composite_base',
-    ['composite/composite.c'])
-
-hostenv.Subsystem(
-    'cli_composite',
-    ['smb_composite/loadfile.c',
-     'smb_composite/savefile.c',
-     'smb_composite/connect.c',
-     'smb_composite/sesssetup.c',
-     'smb_composite/fetchfile.c',
-     'smb_composite/appendacl.c',
-     'smb_composite/fsinfo.c'])
-
-hostenv.Subsystem(
-    'cli_nbt',
-    ['nbt/nbtname.c',
-     'nbt/nbtsocket.c',
-     'nbt/namequery.c',
-     'nbt/nameregister.c',
-     'nbt/namerefresh.c',
-     'nbt/namerelease.c'])
-
-hostenv.Subsystem(
-    'cli_dgram',
-    ['dgram/dgramsocket.c',
-     'dgram/mailslot.c',
-     'dgram/netlogon.c',
-     'dgram/ntlogon.c',
-     'dgram/browse.c'])
-
-hostenv.Subsystem(
-    'cli_cldap',
-    ['cldap/cldap.c'])
-
-hostenv.Subsystem(
-    'cli_wrepl',
-    ['wrepl/winsrepl.c'])
-
-hostenv.Subsystem(
-    'cli_resolve',
-    ['resolve/resolve.c',
-     'resolve/nbtlist.c',
-     'resolve/bcast.c',
-     'resolve/wins.c',
-     'resolve/host.c'])
-
-hostenv.Subsystem(
-    'smb',
-    ['clireadwrite.c',
-     'cliconnect.c',
-     'clifile.c',
-     'clilist.c',
-     'clitrans2.c',
-     'climessage.c',
-     'clideltree.c'])
-    
-hostenv.Subsystem(
-    'cli_raw',
-    ['raw/rawfile.c',
-     'raw/smb_signing.c',
-     'raw/clisocket.c',
-     'raw/clitransport.c',
-     'raw/clisession.c',
-     'raw/clitree.c',
-     'raw/rawrequest.c',
-     'raw/rawreadwrite.c',
-     'raw/rawsearch.c',
-     'raw/rawsetfileinfo.c',
-     'raw/raweas.c',
-     'raw/rawtrans.c',
-     'raw/clioplock.c',
-     'raw/rawnegotiate.c',
-     'raw/rawfsinfo.c',
-     'raw/rawfileinfo.c',
-     'raw/rawnotify.c',
-     'raw/rawioctl.c',
-     'raw/rawacl.c',
-     'raw/rawdate.c',
-     'raw/rawlpq.c'])
-
-hostenv.Subsystem(
-    'cli_security',
-    ['security/security_token.c',
-     'security/security_descriptor.c',
-     'security/dom_sid.c',
-     'security/access_check.c',
-     'security/privilege.c',
-     '../librpc/ndr/ndr_sec_helper.c'])
-
-hostenv.Subsystem(
-    'cli_auth',
-    ['auth/credentials.c',
-     'auth/session.c',
-     'auth/smbencrypt.c'])
-
-hostenv.Subsystem(
-    'cli_ldap',
-    ['ldap/ldap.c',
-     'ldap/ldap_client.c',
-     'ldap/ldap_bind.c',
-     'ldap/ldap_msg.c',
-     'ldap/ldap_ndr.c',
-     'ldap/ldap_ildap.c'])
diff --git a/source4/libcli/auth/SConscript b/source4/libcli/auth/SConscript
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/libcli/auth/SConscript
+++ /dev/null
diff --git a/source4/libcli/ldap/SConscript b/source4/libcli/ldap/SConscript
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/libcli/ldap/SConscript
+++ /dev/null
diff --git a/source4/libcli/security/SConscript b/source4/libcli/security/SConscript
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/libcli/security/SConscript
+++ /dev/null
diff --git a/source4/libnet/SConscript b/source4/libnet/SConscript
deleted file mode 100644
index 16eaabbe57..0000000000
--- a/source4/libnet/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-hostenv.Library('net',
-		['libnet.c','libnet_passwd.c','libnet_time.c','libnet_rpc.c',
-		 'libnet_join.c','libnet_vampire.c','libnet_samdump.c',
-		 'libnet_samsync_ldb.c','libnet_user.c','libnet_share.c',
-		 'libnet_lookup.c','userinfo.c','userman.c','domain.c'])
diff --git a/source4/nbt_server/SConscript b/source4/nbt_server/SConscript
deleted file mode 100644
index 7617bd9764..0000000000
--- a/source4/nbt_server/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('winsdb',['wins/winsdb.c'])
-hostenv.Library('nbtd_wins',['wins/winsserver.c','wins/winsclient.c','wins/winswack.c'])
-hostenv.Library('nbtd_dgram',['dgram/request.c','dgram/netlogon.c','dgram/ntlogon.c','dgram/browse.c'])
-hostenv.Library('nbtd',['nbt_server.c','interfaces.c','register.c','query.c','nodestatus.c','defense.c','packet.c'])
diff --git a/source4/nsswitch/SConscript b/source4/nsswitch/SConscript
deleted file mode 100644
index 057ddba5f0..0000000000
--- a/source4/nsswitch/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Import('hostenv')
-hostenv.Library('cli_winbind',['wb_common.c'])
diff --git a/source4/ntptr/SConscript b/source4/ntptr/SConscript
deleted file mode 100644
index ea044ba0b8..0000000000
--- a/source4/ntptr/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('hostenv')
-hostenv.Library('ntptr_simple_ldb',
-		['simple_ldb/ntptr_simple_ldb.c'])
-hostenv.Library('ntptr',
-		['ntptr_base.c','ntptr_interface.c'])
diff --git a/source4/ntvfs/SConscript b/source4/ntvfs/SConscript
deleted file mode 100644
index 362eb8df2f..0000000000
--- a/source4/ntvfs/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('ntvfs_cifs',['cifs/vfs_cifs.c'])
-hostenv.Library('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c'])
-hostenv.Library('ntvfs_print',['print/vfs_print.c'])
-hostenv.Library('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c'])
-hostenv.Library('ntvfs_nbench',['nbench/vfs_nbench.c'])
-hostenv.Library('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c'])
-hostenv.Library('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c'])
-
-SConscript(dirs=['unixuid','posix'],exports='hostenv')
diff --git a/source4/ntvfs/posix/SConscript b/source4/ntvfs/posix/SConscript
deleted file mode 100644
index fc89530fcc..0000000000
--- a/source4/ntvfs/posix/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('ntvfs_posix',
-		['vfs_posix.c', 'pvfs_util.c', 'pvfs_search.c', 'pvfs_dirlist.c',
-		'pvfs_fileinfo.c', 'pvfs_unlink.c', 'pvfs_mkdir.c', 'pvfs_open.c',
-		'pvfs_read.c', 'pvfs_flush.c', 'pvfs_write.c', 'pvfs_fsinfo.c',
-		'pvfs_qfileinfo.c', 'pvfs_setfileinfo.c', 'pvfs_rename.c',
-		'pvfs_resolve.c', 'pvfs_shortname.c', 'pvfs_lock.c', 'pvfs_wait.c',
-		'pvfs_seek.c', 'pvfs_ioctl.c', 'pvfs_xattr.c', 'pvfs_streams.c',
-		'pvfs_acl.c', 'xattr_system.c', 'xattr_tdb.c'])
diff --git a/source4/ntvfs/unixuid/SConscript b/source4/ntvfs/unixuid/SConscript
deleted file mode 100644
index d3134c3183..0000000000
--- a/source4/ntvfs/unixuid/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('ntvfs_unixuid',['vfs_unixuid.c'])
diff --git a/source4/param/SConscript b/source4/param/SConscript
deleted file mode 100644
index b93cc342cd..0000000000
--- a/source4/param/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import('hostenv')
-#            tastes like -*- python -*-
-
-Import('dynconfig basic')
-param_files = ['loadparm.c','params.c']
-param = hostenv.Library('loadparm',[param_files,dynconfig,basic])
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', param_files)
-Export('param')
-generic = hostenv.Library('generic',['generic.c'])
-Export('generic')
diff --git a/source4/rpc_server/SConscript b/source4/rpc_server/SConscript
deleted file mode 100644
index 0ebc1a095c..0000000000
--- a/source4/rpc_server/SConscript
+++ /dev/null
@@ -1,21 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('rpcserver_common', 
-		[ 'common/server_info.c', 'common/share_info.c'])
-
-#hostenv.Library('rpcserver_dcom', [ 'dcom/oxidresolver.c','dcom/rot.c','dcom/rodb.c','dcom/remact.c', '../librpc/gen_ndr/ndr_dcom_d.c'])
-
-hostenv.Library('rpcserver_echo', ['echo/rpc_echo.c'])
-hostenv.Library('rpcserver_epmapper', ['epmapper/rpc_epmapper.c'])
-hostenv.Library('rpcserver_remote', ['remote/dcesrv_remote.c'])
-hostenv.Library('rpcserver_srvsvc', ['srvsvc/dcesrv_srvsvc.c'])
-hostenv.Library('rpcserver_wkssvc', ['wkssvc/dcesrv_wkssvc.c'])
-hostenv.Library('rpcserver_unixinfo', ['unixinfo/dcesrv_unixinfo.c'])
-hostenv.Library('rpcserver_samr', ['samr/dcesrv_samr.c','samr/samr_password.c'])
-hostenv.Library('rpcserver_winreg', [ 'winreg/rpc_winreg.c'])
-hostenv.Library('rpcserver_netlogon', [ 'netlogon/dcerpc_netlogon.c'])
-hostenv.Library('rpcserver_lsa', ['lsa/dcesrv_lsa.c'])
-hostenv.Library('rpcserver_spoolss', ['spoolss/dcesrv_spoolss.c'])
-hostenv.Library('rpcserver_drsuapi', ['drsuapi/dcesrv_drsuapi.c','drsuapi/drsuapi_cracknames.c'])
-hostenv.Library('rpcserver_dssetup', ['dssetup/dcesrv_dssetup.c'])
-hostenv.Library('rpcserver', ['dcerpc_server.c', 'dcerpc_sock.c', 'dcesrv_auth.c', 'handles.c'])
diff --git a/source4/script/tests/SConscript b/source4/script/tests/SConscript
deleted file mode 100644
index 010b12e844..0000000000
--- a/source4/script/tests/SConscript
+++ /dev/null
@@ -1,2 +0,0 @@
-Alias('quicktest', '#selftest.sh st quick SOCKET_WRAPPER')
-Alias('test', '#selftest.sh st all SOCKET_WRAPPER')
diff --git a/source4/scripting/SConscript b/source4/scripting/SConscript
deleted file mode 100644
index f32e93aae1..0000000000
--- a/source4/scripting/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('hostenv')
-
-SConscript(dirs=['ejs'],exports='hostenv')
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
deleted file mode 100644
index 43a73a92a0..0000000000
--- a/source4/scripting/ejs/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('ejsrpc',['ejsrpc.c'])
-hostenv.Library('ejs_smbcalls',
-		['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
-		 'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
-		 'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',
-		 'smbcalls_string.c','smbcalls_data.c','smbcalls_rand.c',
-		 'smbcalls_sys.c','smbcalls_creds.c','smbcalls_samba3.c',
-		 'smbcalls_param.c','mprutil.c'])
-
-hostenv.Program('smbscript',['smbscript.c'])
diff --git a/source4/smb_server/SConscript b/source4/smb_server/SConscript
deleted file mode 100644
index 6b3bb53264..0000000000
--- a/source4/smb_server/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('hostenv')
-hostenv.Library('smb_server', 
-		['smb_server.c','conn.c','negprot.c','nttrans.c','session.c',
-		 'reply.c','request.c','search.c','service.c','sesssetup.c',
-		 'srvtime.c','trans2.c','signing.c','management.c'])
diff --git a/source4/smbd/SConscript b/source4/smbd/SConscript
deleted file mode 100644
index b3426a0073..0000000000
--- a/source4/smbd/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-
-service_files = ['service.c','service_stream.c','service_task.c']
-hostenv.Library('server_service', service_files)
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', service_files)
-hostenv.Program('smbd',['server.c'])
diff --git a/source4/torture/SConscript b/source4/torture/SConscript
deleted file mode 100644
index 48d2e14b5d..0000000000
--- a/source4/torture/SConscript
+++ /dev/null
@@ -1,56 +0,0 @@
-Import('hostenv')
-hostenv.Library('torture_basic',
-	['basic/scanner.c','basic/utable.c','basic/charset.c',
-	 'basic/mangle_test.c','basic/denytest.c','basic/aliases.c',
-	 'basic/locking.c','basic/secleak.c','basic/rename.c','basic/dir.c',
-	 'basic/delete.c','basic/unlink.c','basic/disconnect.c',
-	 'basic/delaywrite.c','basic/attr.c','basic/properties.c'])
-
-hostenv.Library('torture_raw',
-	[ 'raw/qfsinfo.c', 'raw/qfileinfo.c', 'raw/setfileinfo.c', 'raw/search.c',
-	'raw/close.c', 'raw/open.c', 'raw/mkdir.c', 'raw/oplock.c', 'raw/notify.c',
-	'raw/mux.c', 'raw/ioctl.c', 'raw/chkpath.c', 'raw/unlink.c', 'raw/read.c',
-	'raw/context.c', 'raw/write.c', 'raw/lock.c', 'raw/rename.c', 'raw/eas.c',
-	'raw/streams.c', 'raw/acls.c', 'raw/seek.c', 'raw/composite.c'])
-
-hostenv.Library('torture_com',
-	[ 'com/simple.c'])
-
-hostenv.Library('torture_rpc',
-	[ 'rpc/lsa.c', 'rpc/session_key.c', 'rpc/echo.c', 'rpc/dcom.c',
-	'rpc/dfs.c', 'rpc/drsuapi.c', 'rpc/spoolss.c', 'rpc/unixinfo.c',
-	'rpc/samr.c', 'rpc/wkssvc.c', 'rpc/srvsvc.c', 'rpc/svcctl.c', 'rpc/atsvc.c',
-	'rpc/eventlog.c', 'rpc/epmapper.c', 'rpc/winreg.c', 'rpc/initshutdown.c',
-	'rpc/oxidresolve.c', 'rpc/remact.c', 'rpc/mgmt.c', 'rpc/scanner.c',
-	'rpc/autoidl.c', 'rpc/countcalls.c', 'rpc/testjoin.c', 'rpc/xplogin.c',
-	'rpc/schannel.c', 'rpc/netlogon.c', 'rpc/samlogon.c', 'rpc/samsync.c',
-	'rpc/rot.c', 'rpc/bind.c', 'rpc/dssetup.c', 'rpc/alter_context.c',
-	'rpc/bench.c'])
-
-hostenv.Library('torture_rap', [ 'rap/rap.c'] )
-
-hostenv.Library('torture_auth', [ 'auth/ntlmssp.c', 'auth/pac.c' ])
-
-hostenv.Library('torture_local', 
-	['local/iconv.c', 'lib/talloc/testsuite.c', 'local/messaging.c',
-	'local/binding_string.c', 'local/idtree.c', 'local/socket.c',
-	'local/irpc.c', 'local/resolve.c', 'local/util_strlist.c'])
-
-hostenv.Library('torture_nbench', [ 'nbench/nbio.c', 'nbench/nbench.c' ])
-
-hostenv.Library('torture_ldap',
-	[ 'ldap/common.c', 'ldap/basic.c', 'ldap/cldap.c', 'ldap/cldapbench.c' ])
-
-hostenv.Library('torture_nbt',
-	[ 'nbt/query.c', 'nbt/register.c', 'nbt/wins.c', 'nbt/winsbench.c',
-	'nbt/winsreplication.c', 'nbt/dgram.c'])
-
-hostenv.Library('torture_net', 
-	[ 'libnet/userinfo.c', 'libnet/userman.c', 'libnet/domain.c',
-	'libnet/libnet_lookup.c', 'libnet/libnet_user.c', 'libnet/libnet_share.c',
-	'libnet/libnet_rpc.c'])
-
-hostenv.Program('torture', [ 'torture.c', 'torture_util.c'])
-hostenv.Program('gentest', ['gentest.c','torture_util.c'])
-hostenv.Program('masktest.c')
-hostenv.Program('locktest', ['locktest.c','torture_util.c'])
diff --git a/source4/utils/SConscript b/source4/utils/SConscript
deleted file mode 100644
index 67b5dadd4a..0000000000
--- a/source4/utils/SConscript
+++ /dev/null
@@ -1,8 +0,0 @@
-Import('hostenv')
-
-hostenv.Program('ndrdump', ['utils/ndrdump.c'])
-hostenv.Program('ntlm_auth',['utils/ntlm_auth.c'])
-hostenv.Program('getntacl',['utils/getntacl.c'])
-hostenv.Program('setntacl',['utils/setntacl.c'])
-hostenv.Program('setnttoken',['utils/setnttoken.c'])
-hostenv.Program('nmblookup',['utils/nmblookup.c'])
diff --git a/source4/web_server/SConscript b/source4/web_server/SConscript
deleted file mode 100644
index 212adc9127..0000000000
--- a/source4/web_server/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('web_server',['web_server.c','http.c'])
diff --git a/source4/winbind/SConscript b/source4/winbind/SConscript
deleted file mode 100644
index 1d9abe0897..0000000000
--- a/source4/winbind/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('winbind',[ 'wb_server.c',
-			'wb_samba3_protocol.c'
-			'wb_samba3_cmd.c'
-			])