waf: change private libraries to use the same soname as public libraries

See
http://lists.samba.org/archive/samba-technical/2011-January/075816.html
for a description of the reason behind this change

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Jan 19 02:21:06 CET 2011 on sn-devel-104

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 27234fb055f29c6f145964cfa19987ab202acfce..2e3e1300e32ec101285e6573cd3e8b40782659f5 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -6,13 +6,11 @@ from samba_utils import *
 
 def PRIVATE_NAME(bld, name, private_extension, private_library):
     '''possibly rename a library to include a bundled extension'''
-    if bld.env.DISABLE_SHARED or not private_extension:
-        return name
-    if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
-        return name
-    extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
-    if extension:
-        return name + '-' + extension
+
+    # we now use the same private name for libraries as the public name.
+    # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
+    # demonstration that this is the right thing to do
+    # also see http://lists.samba.org/archive/samba-technical/2011-January/075816.html
     return name