wafsamba: Fix typo: noextenion -> noextension.

[nivanova/samba-autobuild/.git] / source4 / lib / ldb / wscript

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 95a1a90192d939a577382a0bb486b96aabcb1367..6f6c9a1f9edb8b66fd82a240e294c7fcb50d5fdf 100644 (file)
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -22,7 +22,7 @@ samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextenion='ldb')
+    opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextension='ldb')
     opt.RECURSE('lib/tdb')
     opt.RECURSE('lib/tevent')
 
@@ -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
@@ -99,14 +98,14 @@ def build(bld):
 
     abi_file = 'ABI/ldb-%s.sigs' % VERSION
 
-    bld.SAMBA_PYTHON('pyldb_util', deps='ldb',
-            source='pyldb_util.c')
+    bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb',
+            source='pyldb_util.c', needs_python=True)
 
     if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
         modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}')
         bld.SAMBA_LIBRARY('ldb',
                           COMMON_SRC + ' ' + LDB_MAP_SRC,
-                          deps='tevent ldb',
+                          deps='tevent',
                           includes='include',
                           public_headers='include/ldb.h include/ldb_errors.h '\
                               'include/ldb_module.h include/ldb_handlers.h',
@@ -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')