[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  bdf0a81 waf: Remove 'linkflags.remove(x)' line added in error.
      from  48e90ba tdb: Do not build test binaries if it's not a standalone build

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


- Log -----------------------------------------------------------------
commit bdf0a81006534348996a27207e0f712646bf39b5
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Mar 30 11:41:09 2015 -0700

    waf: Remove 'linkflags.remove(x)' line added in error.
    
    Fixes bug #11165 - Bug in configure scripts when system-mitkrb5 is used
    
    https://bugzilla.samba.org/show_bug.cgi?id=11165
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Tue Mar 31 04:32:52 CEST 2015 on sn-devel-104

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

Summary of changes:
 buildtools/wafsamba/samba_conftests.py | 1 -
 1 file changed, 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 1afc6c9..96fead5 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -565,7 +565,6 @@ def samba_config_c_parse_flags(line1, uselib, env):
         # bugs in the real parse_flags() function.
         #
         if x == '-Wl,-rpath' or x == '-Wl,-R':
-            linkflags.remove(x)
             x = lst1.pop(0)
             if x.startswith('-Wl,'):
                 rpath = x[4:]


-- 
Samba Shared Repository