r10819: merging a couple of fixes from trunk

* only keep the registry,tdb file open when we have an open key handle
* tpot's setup.py fix
* removing files that no longer exist in trunk and copying some
  that were missing in 3.0
(This used to be commit 6c6bf6ca5fd430a7a20bf20ed08050328660e570)

1 files changed, 19 insertions, 12 deletions

diff --git a/source3/python/setup.py b/source3/python/setup.py
index a8b2c2c26d..18f1f2648a 100755
--- a/source3/python/setup.py
+++ b/source3/python/setup.py
@@ -52,21 +52,28 @@ obj_list = string.split(samba_objs)
 libraries = []
 library_dirs = []
 
+next_is_path = 0
+next_is_flag = 0
+
 for lib in string.split(samba_libs):
-    if lib[0:2] == "-l":
-        libraries.append(lib[2:])
-        continue
-    if lib[0:8] == "-pthread":
+    if next_is_path != 0:
+        library_dirs.append(lib);
+        next_is_path = 0;
+    elif next_is_flag != 0:
+        next_is_flag = 0;
+    elif lib == "-Wl,-rpath":
+        next_is_path = 1;
+    elif lib[0:2] in ("-l","-pthread"):
         libraries.append(lib[2:])
-        continue
-    if lib[0:2] == "-L":
+    elif lib[0:2] == "-L":
         library_dirs.append(lib[2:])
-        continue
-    if lib[0:2] == "-W":
-        # Skip linker flags
-        continue
-    print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
-    sys.exit(1)
+    elif lib[0:2] in ("-W","-s"):
+        pass # Skip linker flags
+    elif lib[0:2] == "-z":
+        next_is_flag = 1 # Skip linker flags
+    else:
+        print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
+        sys.exit(1)
 
 flags_list = string.split(samba_cflags)