[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Tue Nov 2 22:14:01 MDT 2010


The branch, master has been updated
       via  b028f55 s4-test: if using a system version of ldb, override the ldb modules path
      from  ef1afae waf: more agressively expand subsystem syslib deps

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


- Log -----------------------------------------------------------------
commit b028f55880f5beedb9acb440d4ea53b54345870b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Nov 3 14:26:04 2010 +1100

    s4-test: if using a system version of ldb, override the ldb modules path
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Nov  3 04:13:22 UTC 2010 on sn-devel-104

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

Summary of changes:
 source4/selftest/wscript |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 2f4e436..2273def 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -141,6 +141,11 @@ def cmd_testonly(opt):
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')
 
+    # if we are using a system version of ldb then we need to tell it to
+    # load modules from our modules path
+    if env.USING_SYSTEM_LDB:
+        os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
+
     # tell build system where to find config.h
     os.environ['CONFIG_H'] = 'bin/default/source4/include/config.h'
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list