diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-29 00:08:38 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:15 +1000 |
| commit | a2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27 (patch) | |
| tree | b9163b6b00ae6ca067d3fa592c603a06a12b90d8 /source4/lib | |
| parent | 71322481643878151553dee80fa2ab3de3f9e34f (diff) | |
| download | samba-a2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27.tar.gz samba-a2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27.tar.bz2 samba-a2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27.zip | |
s4-waf: ensure we don't end up with mixed versions of talloc/tdb/tevent
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/wscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index e0269d7607..ffbb68e4b8 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -31,7 +31,8 @@ def configure(conf): if not s4_build: - if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION): + if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, + onlyif='talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) # we need this for the ldap backend conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h', mandatory=True) |