[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  a4a127e... s4-waf: Fix build of libldb_ildap against system ldb.
      from  773e47f... wafsamba: Fix include path inheritance from module subsystems.

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


- Log -----------------------------------------------------------------
commit a4a127ea5a62102890f4eecde45fdb244023dfa3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Jun 15 20:52:01 2010 +0200

    s4-waf: Fix build of libldb_ildap against system ldb.

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

Summary of changes:
 buildtools/wafsamba/wafsamba.py       |    2 +-
 source4/lib/ldb/ldb_ildap/ldb_ildap.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index fbb1726..eb2d56e 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -356,7 +356,7 @@ def SAMBA_MODULE(bld, modname, source,
 
     obj_target = modname + '.objlist'
 
-    obj_target = bld.SAMBA_SUBSYSTEM(obj_target, source,
+    bld.SAMBA_SUBSYSTEM(obj_target, source,
                     deps=deps,
                     includes=includes,
                     autoproto=autoproto,
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index dc1d987..044f91b 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -42,7 +42,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
-#include "dlinklist.h"
+#include "util/dlinklist.h"
 
 #include "libcli/ldap/libcli_ldap.h"
 #include "libcli/ldap/ldap_client.h"


-- 
Samba Shared Repository