r10366: More scons fixes. Building et, asn1, lex and yacc files sort-of works now

(This used to be commit 22f18a84242e5e68a2d57b6d7ff77c089ee7434a)

6 files changed, 18 insertions, 5 deletions

diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index 8833028dbd..9c56310829 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -21,5 +21,4 @@ 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'],
-		   exports='hostenv')
+		   'appweb'])
diff --git a/source4/lib/genrand.c b/source4/lib/genrand.c
index ca79116b6a..1149314d0b 100644
--- a/source4/lib/genrand.c
+++ b/source4/lib/genrand.c
@@ -167,7 +167,6 @@ static int do_reseed(BOOL use_fd, int fd)
 	/* Add in some secret file contents */
 
 	do_filehash("/etc/shadow", &seed_inbuf[0]);
-	do_filehash(lp_smb_passwd_file(), &seed_inbuf[16]);
 
 	/*
 	 * Add the counter, time of day, and pid.
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
index 1ef1c5f9e6..1079a441d8 100644
--- a/source4/lib/ldb/SConscript
+++ b/source4/lib/ldb/SConscript
@@ -9,6 +9,7 @@ hostenv.StaticLibrary('modules/ldb_map.c')
 
 conf = Configure(hostenv)
 have_sqlite3 = conf.CheckLibWithHeader("sqlite3","sqlite3.h",'c',"sqlite3_open()")
+have_popt = conf.CheckLibWithHeader("popt","popt.h",'c',"poptGetArgs(NULL);")
 conf.Finish()
 
 if have_sqlite3:
diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript
index 65aeb5b17a..a90557532b 100644
--- a/source4/lib/registry/SConscript
+++ b/source4/lib/registry/SConscript
@@ -1,7 +1,12 @@
-Import('hostenv')
+Import('hostenv paths')
 #            tastes like -*- python -*-
 
 Import('talloc basic popt_common popt param')
 registry = hostenv.StaticLibrary('registry',
 			[basic,talloc,'common/reg_interface.c','common/reg_util.c'])
-hostenv.Program('regtree', ['tools/regtree.c',registry,talloc,basic,popt_common,popt,param])
+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.Install(paths['BINDIR'], [regtree,regshell,regpatch,regdiff])
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index 6ec9c338d3..ac9e0466b2 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,2 +1,7 @@
 Import('hostenv')
 hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
+
+opts = Options(None, ARGUMENTS)
+opts.AddOptions(
+	BoolOption('socket-wrapper','enable socket wrapper',0)
+)
diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript
index 6abcdff821..3b1a1d7d4e 100644
--- a/source4/lib/tls/SConscript
+++ b/source4/lib/tls/SConscript
@@ -1,2 +1,6 @@
 Import('hostenv')
 hostenv.StaticLibrary('tls', ['tls.c', 'tlscert.c'])
+
+conf = hostenv.Configure()
+conf.CheckLibWithHeader('gnutls', 'gnutls/gnutls.h', 'c', 'gnutls_global_init()')
+conf.Finish()