summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 16:38:57 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-10-24 00:20:04 +0000
commit92c12a39a9b8d7bade00090f2a38a49ac3af13f6 (patch)
treef21909a550c0b557e8c6bff66998502144471f8a /source4/lib
parent599afb065160a9444636fada9576c8b3e889ab68 (diff)
downloadsamba-92c12a39a9b8d7bade00090f2a38a49ac3af13f6.tar.gz
samba-92c12a39a9b8d7bade00090f2a38a49ac3af13f6.tar.bz2
samba-92c12a39a9b8d7bade00090f2a38a49ac3af13f6.zip
ldb: Rename pyldb pkg-config file to pyldb-util, to avoid confusion with
'ldb' python module.
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/pyldb-util.pc.in (renamed from source4/lib/ldb/pyldb.pc.in)2
-rw-r--r--source4/lib/ldb/wscript12
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/ldb/pyldb.pc.in b/source4/lib/ldb/pyldb-util.pc.in
index 4cf5c1ae0c..2afca04b73 100644
--- a/source4/lib/ldb/pyldb.pc.in
+++ b/source4/lib/ldb/pyldb-util.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
modulesdir=@LDB_MODULESDIR@
-Name: pyldb
+Name: pyldb-util
Description: Python bindings for LDB
Version: @PACKAGE_VERSION@
Requires: ldb
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 1dc89f5ec0..fe468102d9 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -46,10 +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,
+ if conf.CHECK_BUNDLED_SYSTEM('pyldb-util', minversion=VERSION,
onlyif='talloc tdb tevent ldb',
implied_deps='replace talloc tdb tevent ldb'):
- conf.define('USING_SYSTEM_PYLDB', 1)
+ conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
if conf.env.standalone_ldb:
conf.CHECK_XSLTPROC_MANPAGES()
@@ -105,13 +105,13 @@ def build(bld):
bld.env.PACKAGE_VERSION = VERSION
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
- if not bld.CONFIG_SET('USING_SYSTEM_PYLDB'):
- bld.SAMBA_LIBRARY('pyldb_util',
+ if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
+ bld.SAMBA_LIBRARY('pyldb-util',
deps='ldb',
source='pyldb_util.c',
public_headers='pyldb.h',
vnum=VERSION,
- pc_files='pyldb.pc',
+ pc_files='pyldb-util.pc',
pyext=True)
if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
@@ -143,7 +143,7 @@ def build(bld):
private_library=not bld.env.standalone_ldb)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
- deps='ldb pyldb_util',
+ deps='ldb pyldb-util',
realname='ldb.so',
cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)