wafsamba: Fix include path inheritance from module subsystems.

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 666a28254021c75eeb42ce55273fdfe5d7de598c..fbb1726f82a7510e4aa8528901678eac44c642d3 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -330,9 +330,12 @@ def SAMBA_MODULE(bld, modname, source,
 
     source = bld.EXPAND_VARIABLES(source, vars=vars)
 
-    obj_target = modname + '.objlist'
+    if internal_module or BUILTIN_LIBRARY(bld, modname):
+        # treat internal modules as subsystems for now
+        if subsystem is not None:
+            deps += ' ' + subsystem
 
-    bld.SAMBA_SUBSYSTEM(obj_target, source,
+        bld.SAMBA_SUBSYSTEM(modname, source,
                     deps=deps,
                     includes=includes,
                     autoproto=autoproto,
@@ -341,10 +344,6 @@ def SAMBA_MODULE(bld, modname, source,
                     local_include=local_include,
                     enabled=enabled)
 
-    if internal_module or BUILTIN_LIBRARY(bld, modname):
-        # treat internal modules as subsystems for now
-        bld.SAMBA_SUBSYSTEM(modname, deps=obj_target, source=[],
-                            enabled=enabled)
         bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
         return
 
@@ -355,6 +354,17 @@ def SAMBA_MODULE(bld, modname, source,
     if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
         return
 
+    obj_target = modname + '.objlist'
+
+    obj_target = bld.SAMBA_SUBSYSTEM(obj_target, source,
+                    deps=deps,
+                    includes=includes,
+                    autoproto=autoproto,
+                    autoproto_extra_source=autoproto_extra_source,
+                    cflags=cflags,
+                    local_include=local_include,
+                    enabled=enabled)
+
     deps = TO_LIST(deps)
     deps.append(obj_target)
     realname = modname 

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 95a1a90192d939a577382a0bb486b96aabcb1367..19f532252d939df9d3d7daf625cbcdf9513a379a 100644 (file)
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -79,7 +79,6 @@ def build(bld):
                          init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)',
                          deps='talloc LIBCLI_LDAP CREDENTIALS',
                          internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-                         includes='include',
                          subsystem='ldb')
     else:
         # this is not included in the s4 build
@@ -123,50 +122,42 @@ def build(bld):
 
         bld.SAMBA_MODULE('ldb_paged_results',
                          'modules/paged_results.c',
-                         includes='include',
                          init_function='LDB_MODULE(paged_results)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_asq',
                          'modules/asq.c',
-                         includes='include',
                          init_function='LDB_MODULE(asq)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_server_sort',
                          'modules/sort.c',
-                         includes='include',
                          init_function='LDB_MODULE(server_sort)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_paged_searches',
                          'modules/paged_searches.c',
-                         includes='include',
                          init_function='LDB_MODULE(paged_searches)',
                          enabled = s4_build,
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_rdn_name',
                          'modules/rdn_name.c',
-                         includes='include',
                          init_function='LDB_MODULE(rdn_name)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_sample',
                          'tests/sample_module.c',
-                         includes='include',
                          init_function='LDB_MODULE(sample)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_skel',
                          'modules/skel.c',
-                         includes='include',
                          init_function='LDB_MODULE(skel)',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_sqlite3',
                          'sqlite3/ldb_sqlite3.c',
-                         includes='include',
                          init_function='LDB_BACKEND(sqlite3)',
                          enabled=False,
                          subsystem='ldb')
@@ -176,7 +167,6 @@ def build(bld):
                                     '''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c
                                     ldb_cache.c ldb_tdb_wrap.c'''),
                          init_function='LDB_BACKEND(tdb)',
-                         includes='include',
                          deps='tdb',
                          subsystem='ldb')