sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Make ldb configuration --disable-python work as intended

Browse Source 
Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Timur I. Bakeyev 2018-05-18 10:10:50 +08:00 committed by Stefan Metzmacher
parent 4c354cd551
commit 95c117ff11
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ldb/wscript
View File

@ -201,9 +201,15 @@ def build(bld):
bld.RECURSE('lib/tdb') bld.RECURSE('lib/tdb')
if bld.env.standalone_ldb: if bld.env.standalone_ldb:
if not 'PACKAGE_VERSION' in bld.env:
bld.env.PACKAGE_VERSION = VERSION
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
private_library = False private_library = False
else: else:
private_library = True private_library = True
# we're not currently linking against the ldap libs, but ldb.pc.in
# has @LDAP_LIBS@
bld.env.LDAP_LIBS = ''
LDB_MAP_SRC = bld.SUBDIR('ldb_map', LDB_MAP_SRC = bld.SUBDIR('ldb_map',
'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
@ -224,13 +230,6 @@ def build(bld):
if bld.PYTHON_BUILD_IS_ENABLED(): if bld.PYTHON_BUILD_IS_ENABLED():
if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
for env in bld.gen_python_environments(['PKGCONFIGDIR']): for env in bld.gen_python_environments(['PKGCONFIGDIR']):
# we're not currently linking against the ldap libs, but ldb.pc.in
# has @LDAP_LIBS@
bld.env.LDAP_LIBS = ''
if not 'PACKAGE_VERSION' in bld.env:
bld.env.PACKAGE_VERSION = VERSION
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
name = bld.pyembed_libname('pyldb-util') name = bld.pyembed_libname('pyldb-util')
bld.SAMBA_LIBRARY(name, bld.SAMBA_LIBRARY(name,