diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-15 02:46:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-15 13:15:50 +0200 |
| commit | fb7a98aa32875f8b113974e062c240e636a7ef64 (patch) | |
| tree | 2fb3ad517e0201f23d9f8ae3e93380188221cf4c | |
| parent | de68718d3ddb9a8e88267fae51e90d5db9b91fe7 (diff) | |
| download | samba-fb7a98aa32875f8b113974e062c240e636a7ef64.tar.gz samba-fb7a98aa32875f8b113974e062c240e636a7ef64.tar.bz2 samba-fb7a98aa32875f8b113974e062c240e636a7ef64.zip | |
ldb: Fix included ldb build.
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index e1bc975073..666a282540 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -373,6 +373,7 @@ def SAMBA_MODULE(bld, modname, source, source = [], target = realname, name = modname, + link_name = "modules/%s/%s.${SHLIBEXT}" % (subsystem, realname), samba_cflags = CURRENT_CFLAGS(bld, modname, cflags), samba_includes = includes, local_include = local_include, diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index ce6031f600..21225acd3f 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -866,6 +866,10 @@ int ldb_mod_register_control(struct ldb_module *module, const char *oid) return ret; } +#ifdef STATIC_ldb_MODULES +#define STATIC_LIBLDB_MODULES STATIC_ldb_MODULES +#endif + #ifndef STATIC_LIBLDB_MODULES #ifdef HAVE_LDB_LDAP diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index a540ce11fa..5ebc6b26ac 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -70,7 +70,7 @@ def build(bld): COMMON_SRC = bld.SUBDIR('common', '''ldb.c ldb_ldif.c ldb_parse.c ldb_msg.c ldb_utf8.c - ldb_debug.c ldb_dn.c ldb_match.c common/ldb_modules.c + ldb_debug.c ldb_dn.c ldb_match.c ldb_modules.c ldb_attributes.c attrib_handlers.c ldb_controls.c qsort.c''') if s4_build: @@ -126,42 +126,50 @@ def build(bld): bld.SAMBA_MODULE('ldb_paged_results', 'modules/paged_results.c', + includes='include', init_function='LDB_MODULE(paged_results)', subsystem='ldb') bld.SAMBA_MODULE('ldb_asq', 'modules/asq.c', + includes='include', init_function='LDB_MODULE(asq)', subsystem='ldb') bld.SAMBA_MODULE('ldb_server_sort', 'modules/sort.c', + includes='include', init_function='LDB_MODULE(server_sort)', subsystem='ldb') bld.SAMBA_MODULE('ldb_paged_searches', 'modules/paged_searches.c', + includes='include', init_function='LDB_MODULE(paged_searches)', enabled = s4_build, subsystem='ldb') bld.SAMBA_MODULE('ldb_rdn_name', 'modules/rdn_name.c', + includes='include', init_function='LDB_MODULE(rdn_name)', subsystem='ldb') bld.SAMBA_MODULE('ldb_sample', 'tests/sample_module.c', + includes='include', init_function='LDB_MODULE(sample)', subsystem='ldb') bld.SAMBA_MODULE('ldb_skel', 'modules/skel.c', + includes='include', init_function='LDB_MODULE(skel)', subsystem='ldb') bld.SAMBA_MODULE('ldb_sqlite3', 'sqlite3/ldb_sqlite3.c', + includes='include', init_function='LDB_BACKEND(sqlite3)', enabled=False, subsystem='ldb') @@ -171,6 +179,7 @@ def build(bld): '''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c ldb_cache.c ldb_tdb_wrap.c'''), init_function='LDB_BACKEND(tdb)', + includes='include', deps='tdb', subsystem='ldb') |