diff options
Diffstat (limited to 'source4/lib/ldb/wscript')
| -rw-r--r-- | source4/lib/ldb/wscript | 59 |
1 files changed, 14 insertions, 45 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index ebd653c9af..3204ba8e32 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -37,8 +37,6 @@ def configure(conf): # conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') - s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4 - conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not conf.env.standalone_ldb: @@ -72,10 +70,6 @@ def build(bld): bld.RECURSE('lib/popt') bld.RECURSE('lib/replace') - # in Samba4 we build some extra modules, and add extra - # capabilities to the ldb cmdline tools - s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4 - LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') @@ -84,23 +78,13 @@ def build(bld): ldb_debug.c ldb_dn.c ldb_match.c ldb_options.c ldb_attributes.c attrib_handlers.c ldb_controls.c qsort.c''') - if s4_build: - # this is only in the s4 build - bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c', - init_function='ldb_ildap_init', - module_init_name='ldb_init_module', - deps='talloc cli-ldap CREDENTIALS auth_system_session', - internal_module=False, - subsystem='ldb') - else: - # this is not included in the s4 build - bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c', - init_function='ldb_ldap_init', - module_init_name='ldb_init_module', - deps='talloc lber ldap ldb', - enabled=bld.env.ENABLE_LDAP_BACKEND, - internal_module=True, - subsystem='ldb') + bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c', + init_function='ldb_ldap_init', + module_init_name='ldb_init_module', + deps='talloc lber ldap ldb', + enabled=bld.env.ENABLE_LDAP_BACKEND, + internal_module=False, + subsystem='ldb') # we're not currently linking against the ldap libs, but ldb.pc.in # has @LDAP_LIBS@ @@ -127,17 +111,8 @@ def build(bld): # the current modules, not the installed ones modules_dir = os.path.join(os.getcwd(), 'bin/modules/ldb') - if bld.env.standalone_ldb: - # do ABI checking on the standalone ldb - abi_file = 'ABI/ldb-%s.sigs' % VERSION - abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*' - private_library = False - vnum = VERSION - else: - abi_file = None - abi_match = None - private_library = True - vnum = None + abi_file = 'ABI/ldb-%s.sigs' % VERSION + abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*' bld.SAMBA_LIBRARY('ldb', COMMON_SRC + ' ' + LDB_MAP_SRC, @@ -146,10 +121,11 @@ def build(bld): public_headers='include/ldb.h include/ldb_errors.h '\ 'include/ldb_module.h include/ldb_handlers.h', pc_files='ldb.pc', - vnum=vnum, manpages='man/ldb.3', + vnum=VERSION, + manpages='man/ldb.3', abi_file = abi_file, - abi_match = abi_match, - private_library=private_library) + abi_match = abi_match) + bld.SAMBA_PYTHON('pyldb', 'pyldb.c', deps='ldb pyldb-util', @@ -181,7 +157,6 @@ def build(bld): 'modules/paged_searches.c', init_function='ldb_paged_searches_init', module_init_name='ldb_init_module', - enabled = s4_build, deps='ldb', subsystem='ldb') @@ -231,15 +206,9 @@ def build(bld): includes='include', cflags='-DLDB_MODULESDIR=\"%s\" -DLDB_VERSION=\"%s\"' % (modules_dir, VERSION)) - if s4_build: - extra_cmdline_deps = ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \ - 'cmdline-credentials gensec' - else: - extra_cmdline_deps = '' - bld.SAMBA_LIBRARY('ldb-cmdline', source='tools/ldbutil.c tools/cmdline.c', - deps='ldb dl popt' + extra_cmdline_deps, + deps='ldb dl popt', private_library=True) LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' |