summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/dsdb/wscript_build2
-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
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 091da813e1..616f1f625c 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -56,6 +56,6 @@ bld.SAMBA_PYTHON('python_dsdb',
# the dependency on dcerpc here is because gensec
# depends on dcerpc but the waf circular dependency finder
# removes it so we end up with unresolved symbols.
- deps='SAMDB pyldb_util dcerpc com_err',
+ deps='SAMDB pyldb-util dcerpc com_err',
realname='samba/dsdb.so'
)
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)