summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-31 04:48:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-31 04:48:00 +0200
commitcd2dd331032895259e0875c717e8d9f5e6de301f (patch)
tree048dec9b08dffed1069d7631e9372154ad48db1c
parent04fc459a301c09d027e2d484b9a4e0737819b093 (diff)
downloadsamba-cd2dd331032895259e0875c717e8d9f5e6de301f.tar.gz
samba-cd2dd331032895259e0875c717e8d9f5e6de301f.tar.bz2
samba-cd2dd331032895259e0875c717e8d9f5e6de301f.zip
ldb: Support building with system ldb library
-rw-r--r--source4/lib/ldb/wscript25
1 files changed, 12 insertions, 13 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index a2855dcf42..02820737dc 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -39,19 +39,18 @@ def configure(conf):
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
- if not s4_build:
- if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
-
- if conf.env.standalone_ldb:
- conf.find_program('xsltproc', var='XSLTPROC')
-
- # we need this for the ldap backend
- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
- conf.env.ENABLE_LDAP_BACKEND = True
+ if not conf.env.standalone_ldb:
+ if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
+ onlyif='talloc tdb tevent',
+ implied_deps='replace talloc tdb tevent'):
+ conf.define('USING_SYSTEM_LDB', 1)
+
+ if conf.env.standalone_ldb:
+ conf.find_program('xsltproc', var='XSLTPROC')
+
+ # we need this for the ldap backend
+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
+ conf.env.ENABLE_LDAP_BACKEND = True
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)