From e812832db347269e46b28af31ff7ba3301405117 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 20 Jun 2010 16:13:38 +0200 Subject: s4:ldb: only do ABI checking for the standalone build for now Otherwise we fail to build samba4 with a system ldb. metze Signed-off-by: Jelmer Vernooij --- source4/lib/ldb/wscript | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index df2245f674..588b6feaef 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -108,18 +108,30 @@ def build(bld): if not bld.CONFIG_SET('USING_SYSTEM_LDB'): modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}') - bld.SAMBA_LIBRARY('ldb', - COMMON_SRC + ' ' + LDB_MAP_SRC, - deps='tevent', - includes='include', - public_headers='include/ldb.h include/ldb_errors.h '\ - 'include/ldb_module.h include/ldb_handlers.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', - is_bundled=not bld.env.standalone_ldb) + if bld.env.standalone_ldb: + bld.SAMBA_LIBRARY('ldb', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps='tevent', + includes='include', + public_headers='include/ldb.h include/ldb_errors.h '\ + 'include/ldb_module.h include/ldb_handlers.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', + is_bundled=not bld.env.standalone_ldb) + else: + bld.SAMBA_LIBRARY('ldb', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps='tevent', + includes='include', + public_headers='include/ldb.h include/ldb_errors.h '\ + 'include/ldb_module.h include/ldb_handlers.h', + pc_files='ldb.pc', + cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir, + vnum=VERSION, manpages='man/ldb.3', + is_bundled=not bld.env.standalone_ldb) bld.SAMBA_PYTHON('pyldb', 'pyldb.c', deps='ldb pyldb_util', -- cgit