[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  2947a70 ldb:wscript: make it possible to build samba with a system ldb again
      from  770fb8c selftest: add a check for disabled change notify

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


- Log -----------------------------------------------------------------
commit 2947a7041ba22b52a8a4ce0ad5ebc6095ea09ea0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Aug 27 11:14:51 2015 +0200

    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 at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Aug 31 18:53:16 CEST 2015 on sn-devel-104

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

Summary of changes:
 lib/ldb/wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 0e81932..0996f51 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)
 


-- 
Samba Shared Repository