[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  8870fcb build: fixed the ELF name for private libraries
      from  0a78c57 s4-dsdb: Ensure we permit multi-valued backlinks on single-valued attributes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8870fcb154d27c0d10d3de3f926a95743b6e4e28
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Mar 2 11:40:33 2011 +1100

    build: fixed the ELF name for private libraries
    
    thanks to Simo and rpmbuild for spotting this!
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Mar  2 02:49:34 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_install.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 3e055d7..d755d01 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -124,8 +124,12 @@ def install_library(self):
         install_link = None
         inst_name    = bld.make_libname(t.target)
 
-    if t.env.SONAME_ST and install_link:
-        t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_link)
+    if t.env.SONAME_ST:
+        # ensure we get the right names in the library
+        if install_link:
+            t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_link)
+        else:
+            t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_name)
         t.env.SONAME_ST = ''
 
     # tell waf to install the library


-- 
Samba Shared Repository