From 95c117ff1114122aad367adab6c738b835a7c3d3 Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Fri, 18 May 2018 10:10:50 +0800 Subject: [PATCH] Make ldb configuration --disable-python work as intended Signed-off-by: Timur I. Bakeyev Reviewed-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- lib/ldb/wscript | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript index dfca1bc7b34..412bd4f0069 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -201,9 +201,15 @@ def build(bld): bld.RECURSE('lib/tdb') 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 else: 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.c ldb_map_inbound.c ldb_map_outbound.c') @@ -224,13 +230,6 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): 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') bld.SAMBA_LIBRARY(name,