diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/SConscript | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/SConscript | 32 | ||||
| -rw-r--r-- | source4/lib/messaging/SConscript | 3 | ||||
| -rw-r--r-- | source4/lib/replace/SConscript | 11 | ||||
| -rw-r--r-- | source4/lib/samba3/SConscript | 5 | ||||
| -rw-r--r-- | source4/lib/socket/SConscript | 6 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/SConscript | 3 | ||||
| -rw-r--r-- | source4/lib/tdb/SConscript | 1 | ||||
| -rw-r--r-- | source4/lib/tls/SConscript | 3 |
9 files changed, 53 insertions, 15 deletions
diff --git a/source4/lib/SConscript b/source4/lib/SConscript index a4a1f92361..516537cac0 100644 --- a/source4/lib/SConscript +++ b/source4/lib/SConscript @@ -20,6 +20,6 @@ hostenv.StaticLibrary('gencache',['gencache.c']) hostenv.StaticLibrary('pidfile',['pidfile.c']) hostenv.StaticLibrary('unix_privs',['unix_privs.c']) -SConscript(dirs=['tdb','popt','cmdline','talloc','registry','charset', - 'ldb'], +SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset', + 'ldb','tls','samba3','socket','socket_wrapper','messaging'], exports='hostenv') diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript index 1698a7cff3..1ef1c5f9e6 100644 --- a/source4/lib/ldb/SConscript +++ b/source4/lib/ldb/SConscript @@ -1,29 +1,37 @@ Import('hostenv') - +Import('talloc') 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') + +conf = Configure(hostenv) +have_sqlite3 = conf.CheckLibWithHeader("sqlite3","sqlite3.h",'c',"sqlite3_open()") +conf.Finish() + +if have_sqlite3: + 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', +ldb = hostenv.StaticLibrary('ldb', + [talloc,'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']) +Export('ldb') hostenv.StaticLibrary('samba/ldif_handlers.c') -hostenv.StaticLibrary('ldb_cmdline', 'tools/cmdline.c') +ldb_cmdline = 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']) +hostenv.Program('ldbadd',['tools/ldbadd.c',ldb,talloc,ldb_cmdline]) +hostenv.Program('ldbdel',['tools/ldbdel.c',ldb,ldb_cmdline]) +hostenv.Program('ldbmodify',['tools/ldbmodify.c',ldb,ldb_cmdline]) +hostenv.Program('ldbsearch',['tools/ldbsearch.c',ldb,ldb_cmdline]) +hostenv.Program('ldbrename',['tools/ldbrename.c',ldb,ldb_cmdline]) +hostenv.Program('ldbtest',['tools/ldbtest.c',ldb,ldb_cmdline]) +hostenv.Program('oLschema2ldif',['tools/oLschema2ldif.c',ldb]) diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript new file mode 100644 index 0000000000..4c62ffb82e --- /dev/null +++ b/source4/lib/messaging/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') + +hostenv.StaticLibrary('messaging','messaging.c') diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript new file mode 100644 index 0000000000..f8efcc55b9 --- /dev/null +++ b/source4/lib/replace/SConscript @@ -0,0 +1,11 @@ +Import('hostenv') + +conf = Configure(hostenv) +#FIXME: conf.CheckBrokenInetNtoa() +for f in ['strtoull','__strtoull','strtouq','strtoll','__strtoll','strtoq', + 'seteuid','setresuid','setegid','setresgid']: + conf.CheckFunc(f,'c') +conf.Finish() + +hostenv.StaticLibrary('repdir', ['repdir/repdir.c']) +hostenv.StaticLibrary('replace', ['replace.c', 'snprintf.c']) diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript new file mode 100644 index 0000000000..7fc6e7ce37 --- /dev/null +++ b/source4/lib/samba3/SConscript @@ -0,0 +1,5 @@ +Import('hostenv') + +hostenv.StaticLibrary('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 new file mode 100644 index 0000000000..4d81cd5696 --- /dev/null +++ b/source4/lib/socket/SConscript @@ -0,0 +1,6 @@ +Import('hostenv') + +hostenv.StaticLibrary('socket_ipv4.c') +hostenv.StaticLibrary('socket_ipv6.c') +hostenv.StaticLibrary('socket_unix.c') +hostenv.StaticLibrary('socket', ['socket.c','access.c','connect.c']) diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript new file mode 100644 index 0000000000..fe5844d6da --- /dev/null +++ b/source4/lib/socket_wrapper/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') + +hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c']) diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript index a8696ec367..01f5bbe7c7 100644 --- a/source4/lib/tdb/SConscript +++ b/source4/lib/tdb/SConscript @@ -11,4 +11,3 @@ 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]) -Default(tdbtool,tdbtorture,tdbdump,tdbbackup) diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript new file mode 100644 index 0000000000..88f150b9cf --- /dev/null +++ b/source4/lib/tls/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') + +hostenv.StaticLibrary('tls', ['tls.c', 'tlscert.c']) |