From 92c12a39a9b8d7bade00090f2a38a49ac3af13f6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 23 Oct 2010 16:38:57 -0700
Subject: ldb: Rename pyldb pkg-config file to pyldb-util, to avoid confusion
 with 'ldb' python module.

---
 source4/dsdb/wscript_build       |  2 +-
 source4/lib/ldb/pyldb-util.pc.in | 13 +++++++++++++
 source4/lib/ldb/pyldb.pc.in      | 13 -------------
 source4/lib/ldb/wscript          | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 source4/lib/ldb/pyldb-util.pc.in
 delete mode 100644 source4/lib/ldb/pyldb.pc.in

(limited to 'source4')

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-util.pc.in b/source4/lib/ldb/pyldb-util.pc.in
new file mode 100644
index 0000000000..2afca04b73
--- /dev/null
+++ b/source4/lib/ldb/pyldb-util.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+modulesdir=@LDB_MODULESDIR@
+
+Name: pyldb-util
+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/pyldb.pc.in b/source4/lib/ldb/pyldb.pc.in
deleted file mode 100644
index 4cf5c1ae0c..0000000000
--- a/source4/lib/ldb/pyldb.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-modulesdir=@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 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)
 
-- 
cgit