diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 16:05:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 19:22:03 +0200 |
| commit | 82d56b937445585b9e60451daf660aee5ace0523 (patch) | |
| tree | 83f9af2493eac6f70fa59974adc303c856efb9da /source4/lib/ldb/wscript | |
| parent | 471ed70c497f4eeaca27594d609f41f2b2c689cd (diff) | |
| download | samba-82d56b937445585b9e60451daf660aee5ace0523.tar.gz samba-82d56b937445585b9e60451daf660aee5ace0523.tar.bz2 samba-82d56b937445585b9e60451daf660aee5ace0523.zip | |
ldb: Fix dependencies when building with system ldb.
Diffstat (limited to 'source4/lib/ldb/wscript')
| -rw-r--r-- | source4/lib/ldb/wscript | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 2d54b61d0c..a1eca78268 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -152,7 +152,6 @@ def build(bld): ldb_deps = 'tevent LIBLDB' if s4_build: - ldb_deps += ' LDBSAMBA POPT_CREDENTIALS POPT_SAMBA LIBCMDLINE_CREDENTIALS gensec' abi_file='ABI/ldb-samba4-%s.sigs' % VERSION else: abi_file='ABI/ldb-%s.sigs' % VERSION @@ -172,9 +171,18 @@ def build(bld): vnum=VERSION, manpages='man/ldb.3', is_bundled=not bld.env.standalone_ldb) + bld.SAMBA_PYTHON('pyldb', 'pyldb.c', + deps='ldb', + realname='ldb.so') + + extra_cmdline_deps = '' + if s4_build: + extra_cmdline_deps += ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \ + 'LIBCMDLINE_CREDENTIALS gensec' + bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE', 'tools/ldbutil.c tools/cmdline.c', - 'ldb dl popt') + 'ldb dl popt' + extra_cmdline_deps) LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' for t in LDB_TOOLS.split(): @@ -185,10 +193,6 @@ def build(bld): bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE', install=False) - bld.SAMBA_PYTHON('pyldb', 'pyldb.c', - deps='ldb', - realname='ldb.so') - def test(ctx): '''run ldb testsuite''' |