ldb: Rename pyldb pkg-config file to pyldb-util, to avoid confusion with

'ldb' python module.

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 091da813e199fe22007d87bbb97c9a1a794f7b94..616f1f625c25af7dc3c67667cb2d6a2677cea3ba 100644 (file)
--- 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
similarity index 94%
rename from source4/lib/ldb/pyldb.pc.in
rename to source4/lib/ldb/pyldb-util.pc.in
index 4cf5c1ae0c13a2ae5b0f28643f7af8d41b2d4062..2afca04b739c8c4fdf0bb2f9a83b039ccb943d10 100644 (file)
--- 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 1dc89f5ec004716af500b3a59dc8aafe127c713d..fe468102d95aa3c19766f1a6fec1f477b51d461d 100644 (file)
--- 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)