The branch, master has been updated via c25afb6 ldb: Support using system pyldb library. via 9a2f83a ldb: Install pkg-config file for pyldb. via bd48e23 ldb: Install pyldb-util as public library. from dec00bf tdb: Revert re-addition of tdb_set_logging_function.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c25afb6aa16b3e527c6050985e9aeaca0beec355 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Oct 23 20:41:27 2010 +0200 ldb: Support using system pyldb library. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Sat Oct 23 19:24:25 UTC 2010 on sn-devel-104 commit 9a2f83a86ae9068c9c63b0c701f5625d19114028 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Oct 23 20:39:48 2010 +0200 ldb: Install pkg-config file for pyldb. commit bd48e23f3414331445a901143f84cda125230262 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Oct 23 20:38:52 2010 +0200 ldb: Install pyldb-util as public library. ----------------------------------------------------------------------- Summary of changes: source4/lib/ldb/pyldb.pc.in | 13 +++++++++++++ source4/lib/ldb/wscript | 18 ++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 source4/lib/ldb/pyldb.pc.in Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/pyldb.pc.in b/source4/lib/ldb/pyldb.pc.in new file mode 100644 index 0000000..4cf5c1a --- /dev/null +++ b/source4/lib/ldb/pyldb.pc.in @@ -0,0 +1,13 @@ +pref...@prefix@ +exec_pref...@exec_prefix@ +libd...@libdir@ +included...@includedir@ +modulesd...@ldb_modulesdir@ + +Name: pyldb +Description: Python bindings for LDB +Version: @PACKAGE_VERSION@ +Requires: ldb +Libs: -L${libdir} -lpyldb-util +Cflags: -I${includedir} +URL: http://ldb.samba.org/ diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 0e2c881..e67ff94 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -46,6 +46,10 @@ def configure(conf): onlyif='talloc tdb tevent', implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) + if conf.CHECK_BUNDLED_SYSTEM('pyldb', minversion=VERSION, + onlyif='talloc tdb tevent ldb', + implied_deps='replace talloc tdb tevent ldb'): + conf.define('USING_SYSTEM_PYLDB', 1) if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -101,12 +105,14 @@ def build(bld): bld.env.PACKAGE_VERSION = VERSION bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - - bld.SAMBA_LIBRARY('pyldb_util', - deps='ldb', - source='pyldb_util.c', - pyext=True, - private_library=True) + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB'): + bld.SAMBA_LIBRARY('pyldb_util', + deps='ldb', + source='pyldb_util.c', + public_headers='pyldb.h', + vnum=VERSION, + pc_files='pyldb.pc', + pyext=True) if not bld.CONFIG_SET('USING_SYSTEM_LDB'): if Options.is_install: -- Samba Shared Repository