sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-14 21:44:19 +03:00
Code Activity

ldb:wscript: make it possible to build samba with a system ldb again

Browse Source 
This fixes a regression in commit fcf4a89194.

If we check for 'ldb' later the 'pyldb-util' can't depend on the 'ldb' check.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11458

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Aug 31 18:53:16 CEST 2015 on sn-devel-104

(cherry picked from commit 2947a7041b)

Autobuild-User(v4-3-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-3-test): Tue Sep  1 12:36:48 CEST 2015 on sn-devel-104
This commit is contained in:
Stefan Metzmacher
2015-08-27 11:14:51 +02:00
parent c1c5a2e545
commit b9e5d16aca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ldb/wscript
View File

@@ -56,11 +56,11 @@ def configure(conf):
if not conf.env.standalone_ldb: if not conf.env.standalone_ldb:
if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
onlyif='talloc tdb tevent ldb', onlyif='talloc tdb tevent',
implied_deps='replace talloc tdb tevent ldb'): implied_deps='replace talloc tdb tevent ldb'):
conf.define('USING_SYSTEM_PYLDB_UTIL', 1) conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
onlyif='talloc tdb tevent', onlyif='talloc tdb tevent pyldb-util',
implied_deps='replace talloc tdb tevent'): implied_deps='replace talloc tdb tevent'):
conf.define('USING_SYSTEM_LDB', 1) conf.define('USING_SYSTEM_LDB', 1)