summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-31 13:51:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-31 13:57:03 +0200
commit151e239bcf2860411527a953d627b2d724c0a57e (patch)
tree4c310ea8c3194bc8dbd3cb5ca565017c762a302e
parentf89e390fbc6e4f3d8269c40ccab7c718bfcd394f (diff)
downloadsamba-151e239bcf2860411527a953d627b2d724c0a57e.tar.gz
samba-151e239bcf2860411527a953d627b2d724c0a57e.tar.bz2
samba-151e239bcf2860411527a953d627b2d724c0a57e.zip
ldb/waf: Fix build with system and bundled ldb.
-rw-r--r--source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs5
-rw-r--r--source4/lib/ldb/wscript9
2 files changed, 5 insertions, 9 deletions
diff --git a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs b/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
index 4639220759..2206e790fc 100644
--- a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
+++ b/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
@@ -166,7 +166,6 @@ ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct
ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
ldb_register_backend: int (const char *, ldb_connect_fn)
ldb_register_module: int (const struct ldb_module_ops *)
-ldb_register_samba_handlers: int (struct ldb_context *)
ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
@@ -177,8 +176,6 @@ ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *
ldb_request_get_status: int (struct ldb_request *)
ldb_request_set_state: void (struct ldb_request *, int)
ldb_reset_err_string: void (struct ldb_context *)
-ldb_samba_syntax_by_lDAPDisplayName: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
-ldb_samba_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
@@ -220,5 +217,3 @@ ldb_val_map_remote: struct ldb_val (struct ldb_module *, void *, const struct ld
ldb_val_to_time: int (const struct ldb_val *, time_t *)
ldb_valid_attr_name: int (const char *)
ldb_wait: int (struct ldb_handle *, enum ldb_wait_type)
-ldb_wrap_connect: struct ldb_context *(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, const char *, struct auth_session_info *, struct cli_credentials *, unsigned int)
-ldb_wrap_fork_hook: void (void)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index a2c55432f5..2d54b61d0c 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -164,12 +164,13 @@ def build(bld):
deps=ldb_deps,
includes='include',
public_headers='include/ldb.h include/ldb_errors.h '\
- 'include/ldb_module.h',
+ 'include/ldb_module.h',
pc_files='ldb.pc',
cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir,
abi_file=abi_file,
abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*',
- vnum=VERSION, manpages='man/ldb.3')
+ vnum=VERSION, manpages='man/ldb.3',
+ is_bundled=not bld.env.standalone_ldb)
bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
'tools/ldbutil.c tools/cmdline.c',
@@ -178,11 +179,11 @@ def build(bld):
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE',
- manpages='man/%s.1' % t)
+ manpages='man/%s.1' % t)
# ldbtest doesn't get installed
bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE',
- install=False)
+ install=False)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
deps='ldb',