From 151e239bcf2860411527a953d627b2d724c0a57e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 31 May 2010 13:51:49 +0200 Subject: ldb/waf: Fix build with system and bundled ldb. --- source4/lib/ldb/wscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/lib/ldb/wscript') 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', -- cgit