[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Tue Jun 15 05:16:07 MDT 2010
The branch, master has been updated
via 026fcc6... ldb: Bump version number, use same ABI version for Samba4 and non-Samba 4 versions.s
via fb7a98a... ldb: Fix included ldb build.
via de68718... wafsamba: Fix filenames for ldb modules.
via 0d7f8fb... wafsamba: Fix building of modules as shared libraries.
via 12b4647... wafsamba: Improve assertion error message to include the module.
via e27ef3d... ldb: Only build standard ldb modules when building bundled ldb.
via 7fe9e6c... dsdb: Fix includes when building against system ldb.
via 419928b... wafsamba: Only add init function if not building module as shared library.
via 6c93361... dsdb: Build modules as external modules when using system ldb.
via 9ac0a87... ldb-samba: Add missing dependency on credentials code.
from 60ea593... s3-waf: fix the build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 026fcc6a4f1b50518f2b1d33b278f5b671fb18a1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 13:12:23 2010 +0200
ldb: Bump version number, use same ABI version for Samba4 and non-Samba 4 versions.s
commit fb7a98aa32875f8b113974e062c240e636a7ef64
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 02:46:16 2010 +0200
ldb: Fix included ldb build.
commit de68718d3ddb9a8e88267fae51e90d5db9b91fe7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 01:35:42 2010 +0200
wafsamba: Fix filenames for ldb modules.
commit 0d7f8fb73d95c4658e785cb2f8bba57baf85b487
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 01:24:20 2010 +0200
wafsamba: Fix building of modules as shared libraries.
commit 12b46472896bc89dd7f1597a1f7ffeb5589046b1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 01:00:40 2010 +0200
wafsamba: Improve assertion error message to include the module.
commit e27ef3dd6d59c3e985e912671976ee30b1c613d5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 00:59:49 2010 +0200
ldb: Only build standard ldb modules when building bundled ldb.
commit 7fe9e6cd69c03246cf56cacc6a2d4e0693dc1101
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 15 00:55:03 2010 +0200
dsdb: Fix includes when building against system ldb.
commit 419928b8dfec9b055fc2bb775c40ee57108892e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 10 13:02:59 2010 +0200
wafsamba: Only add init function if not building module as shared library.
commit 6c9336110c75b9c14739c772f96147af5cea1eac
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jun 2 13:37:15 2010 +0200
dsdb: Build modules as external modules when using system ldb.
commit 9ac0a876a744e571ea9d797b59a033ff6db6241f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 1 13:28:50 2010 +0200
ldb-samba: Add missing dependency on credentials code.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_deps.py | 3 +-
buildtools/wafsamba/wafsamba.py | 68 +++++----
source4/auth/gensec/wscript_build | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 4 +-
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 2 +-
source4/dsdb/samdb/ldb_modules/objectclass.c | 2 +-
source4/dsdb/samdb/ldb_modules/operational.c | 4 +-
source4/dsdb/samdb/ldb_modules/wscript_build | 117 ++++++++++-----
source4/lib/ldb-samba/wscript_build | 2 +-
.../ldb/ABI/{ldb-0.9.10.sigs => ldb-0.9.12.sigs} | 1 +
source4/lib/ldb/common/ldb_modules.c | 4 +
source4/lib/ldb/wscript | 158 ++++++++++----------
source4/nbt_server/wscript_build | 5 +-
source4/smbd/wscript_build | 2 +-
14 files changed, 215 insertions(+), 159 deletions(-)
copy source4/lib/ldb/ABI/{ldb-0.9.10.sigs => ldb-0.9.12.sigs} (99%)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index d00fe7f..94b7484 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -55,10 +55,11 @@ def expand_subsystem_deps(bld):
continue
t = bld.name_to_obj(s, bld.env)
- bld.ASSERT(t is not None, "Subsystem target %s not found" % s)
for d in subsystems[s]:
type = targets[d['TARGET']]
if type != 'DISABLED' and type != 'EMPTY':
+ bld.ASSERT(t is not None,
+ "Subsystem target %s for %s (%s) not found" % (s, d['TARGET'], type))
t.samba_deps_extended.append(d['TARGET'])
t2 = bld.name_to_obj(d['TARGET'], bld.env)
t2.samba_includes_extended.extend(t.samba_includes_extended)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4b0580d..666a282 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -5,6 +5,7 @@ import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs,
from Configure import conf
from Logs import debug
from samba_utils import SUBST_VARS_RECURSIVE
+TaskGen.task_gen.apply_verif = Utils.nada
# bring in the other samba modules
from samba_optimisation import *
@@ -327,55 +328,64 @@ def SAMBA_MODULE(bld, modname, source,
enabled=True):
'''define a Samba module.'''
- # we add the init function regardless of whether the module
- # is enabled or not, as we need to generate a null list if
- # all disabled
- bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
+
+ obj_target = modname + '.objlist'
+
+ 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)
if internal_module or BUILTIN_LIBRARY(bld, modname):
# treat internal modules as subsystems for now
- SAMBA_SUBSYSTEM(bld, modname, source,
- deps=deps,
- includes=includes,
- autoproto=autoproto,
- autoproto_extra_source=autoproto_extra_source,
- cflags=cflags,
- local_include=local_include,
- enabled=enabled)
+ bld.SAMBA_SUBSYSTEM(modname, deps=obj_target, source=[],
+ enabled=enabled)
+ bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
return
if not enabled:
SET_TARGET_TYPE(bld, modname, 'DISABLED')
return
- source = bld.EXPAND_VARIABLES(source, vars=vars)
- source = unique_list(TO_LIST(source))
-
- # remember empty modules, so we can strip the dependencies
- if ((source == '') or (source == [])) and deps == '' and public_deps == '':
- SET_TARGET_TYPE(bld, modname, 'EMPTY')
- return
-
if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
return
+ deps = TO_LIST(deps)
+ deps.append(obj_target)
+ realname = modname
if subsystem is not None:
- deps += ' ' + subsystem
+ deps.append(subsystem)
+ while realname.startswith("lib"+subsystem+"_"):
+ realname = realname[len("lib"+subsystem+"_"):]
+ while realname.startswith(subsystem+"_"):
+ realname = realname[len(subsystem+"_"):]
+ while realname.startswith("lib"):
+ realname = realname[len("lib"):]
bld.SET_BUILD_GROUP('main')
- bld(
- features = 'cc',
- source = source,
- target = modname,
+ t = bld(
+ features = 'cc cshlib install_lib',
+ source = [],
+ target = realname,
+ name = modname,
+ link_name = "modules/%s/%s.${SHLIBEXT}" % (subsystem, realname),
samba_cflags = CURRENT_CFLAGS(bld, modname, cflags),
samba_includes = includes,
local_include = local_include,
- samba_deps = TO_LIST(deps)
+ samba_deps = deps,
+ install_path = None,
+ samba_inst_path= "${MODULESDIR}/%s" % subsystem,
+ samba_realname = realname+ ".${SHLIBEXT}",
+ vnum = None,
+ samba_install = True,
+ is_bundled = False,
)
- if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
-
Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 19264d1..0defdaf 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -31,7 +31,7 @@ bld.SAMBA_MODULE('cyrus_sasl',
subsystem='gensec',
init_function='gensec_sasl_init',
deps='CREDENTIALS SASL',
- enabled=bld.CONFIG_SET('HAVE_SASL')
+ enabled=bld.CONFIG_SET('HAVE_SASL')
)
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 08754ed..ba60682 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -33,8 +33,8 @@
*/
#include "includes.h"
-#include "ldb_module.h"
-#include "dlinklist.h"
+#include <ldb_module.h>
+#include "util/dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 56ed447..876ada6 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -30,7 +30,7 @@
#include "includes.h"
#include "ldb_module.h"
-#include "dlinklist.h"
+#include "util/dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "dsdb/samdb/ldb_modules/util.h"
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index b15dff0..2df8097 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -37,7 +37,7 @@
#include "includes.h"
#include "ldb_module.h"
-#include "dlinklist.h"
+#include "util/dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 42cbea7..a4cf49d 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -64,8 +64,8 @@
*/
#include "includes.h"
-#include "ldb_includes.h"
-#include "ldb_module.h"
+#include <ldb.h>
+#include <ldb_module.h>
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index b6f287d..cf53bcb 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -9,96 +9,108 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
bld.SAMBA_MODULE('ldb_samba_dsdb',
source='samba_dsdb.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(samba_dsdb)',
- deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS'
+ deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
)
bld.SAMBA_MODULE('ldb_samba_secrets',
source='samba_secrets.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(samba_secrets)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS LIBNDR'
)
bld.SAMBA_MODULE('ldb_objectguid',
source='objectguid.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(objectguid)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS LIBNDR'
)
bld.SAMBA_MODULE('ldb_repl_meta_data',
source='repl_meta_data.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(repl_meta_data)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_dsdb_cache',
source='dsdb_cache.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(dsdb_cache)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS'
)
bld.SAMBA_MODULE('ldb_schema_load',
source='schema_load.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(schema_load)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_schema_data',
source='schema_data.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(schema_data)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_naming_fsmo',
source='naming_fsmo.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(naming_fsmo)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_pdc_fsmo',
source='pdc_fsmo.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(pdc_fsmo)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_samldb',
source='samldb.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(samldb)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_samba3sam',
source='samba3sam.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(samba3sam)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
)
bld.SAMBA_MODULE('ldb_samba3sid',
source='samba3sid.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(samba3sid)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
)
@@ -106,48 +118,54 @@ bld.SAMBA_MODULE('ldb_samba3sid',
bld.SAMBA_MODULE('ldb_simple_ldap_map',
source='simple_ldap_map.c',
aliases='entryuuid nsuniqueid',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS ldb LIBNDR'
)
bld.SAMBA_MODULE('ldb_rootdse',
source='rootdse.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(rootdse)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB'
)
bld.SAMBA_MODULE('ldb_password_hash',
source='password_hash.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(password_hash)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5'
)
bld.SAMBA_MODULE('ldb_local_password',
source='local_password.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(local_password)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBNDR SAMDB'
)
bld.SAMBA_MODULE('ldb_kludge_acl',
source='kludge_acl.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(kludge_acl)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSECURITY SAMDB'
)
bld.SAMBA_MODULE('ldb_extended_dn_in',
source='extended_dn_in.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(extended_dn_in)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL'
)
@@ -155,24 +173,27 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
bld.SAMBA_MODULE('ldb_extended_dn_out',
source='extended_dn_out.c',
aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds',
- subsystem='LIBLDB',
+ subsystem='ldb',
deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
)
bld.SAMBA_MODULE('ldb_extended_dn_store',
source='extended_dn_store.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(extended_dn_store)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_show_deleted',
source='show_deleted.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(show_deleted)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL'
)
@@ -180,129 +201,143 @@ bld.SAMBA_MODULE('ldb_show_deleted',
bld.SAMBA_MODULE('ldb_partition',
source='partition.c partition_init.c',
autoproto='partition_proto.h',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(partition)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_new_partition',
source='new_partition.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(new_partition)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_update_keytab',
source='update_keytab.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(update_keytab)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS CREDENTIALS ldb'
)
bld.SAMBA_MODULE('ldb_objectclass',
source='objectclass.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(objectclass)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL'
)
bld.SAMBA_MODULE('ldb_objectclass_attrs',
source='objectclass_attrs.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(objectclass_attrs)',
- deps='talloc SAMDB LIBSAMBA-UTIL'
+ deps='talloc SAMDB LIBSAMBA-UTIL',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
)
bld.SAMBA_MODULE('ldb_subtree_rename',
source='subtree_rename.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(subtree_rename)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
)
bld.SAMBA_MODULE('ldb_subtree_delete',
source='subtree_delete.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(subtree_delete)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_linked_attributes',
source='linked_attributes.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(linked_attributes)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_ranged_results',
source='ranged_results.c',
- subsystem='LIBLDB',
+ subsystem='ldb',
init_function='LDB_MODULE(ranged_results)',
+ internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
--
Samba Shared Repository
More information about the samba-cvs
mailing list