diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-08-27 11:14:51 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-09-01 12:36:48 +0200 |
| commit | b9e5d16aca1f31b99da09852121e8dba814295cb (patch) | |
| tree | d032c3c34c77685afeb1ac40fa2abc34a9d04879 | |
| parent | c1c5a2e545de0e581fc1966852cea48526df4771 (diff) | |
| download | samba-b9e5d16aca1f31b99da09852121e8dba814295cb.tar.gz | |
ldb:wscript: make it possible to build samba with a system ldb again
This fixes a regression in commit fcf4a891945b22dc6eccdc71fd441f1a879f556a.
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 2947a7041ba22b52a8a4ce0ad5ebc6095ea09ea0)
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
| -rwxr-xr-x | lib/ldb/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 0e819322277..0996f516975 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -56,11 +56,11 @@ def configure(conf): if not conf.env.standalone_ldb: 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'): conf.define('USING_SYSTEM_PYLDB_UTIL', 1) 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'): conf.define('USING_SYSTEM_LDB', 1) |