[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  cd2dd33... ldb: Support building with system ldb library
      from  04fc459... tdb-waf: Don't install binaries when using system tdb.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cd2dd331032895259e0875c717e8d9f5e6de301f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon May 31 04:48:00 2010 +0200

    ldb: Support building with system ldb library

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/wscript |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index a2855dc..0282073 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)
 


-- 
Samba Shared Repository