r13233: build fixes for smbmnt; remove unused variable; ready to ship 3.0.21b now

[ira/wip.git] / source3 / python / setup.py

diff --git a/source3/python/setup.py b/source3/python/setup.py
index 8bc8868a70cbd9ce9ccda1af1738b06c3d65e523..ffdafd70877f2f752d4097870a22da226e6eb9a9 100755 (executable)
--- a/source3/python/setup.py
+++ b/source3/python/setup.py
@@ -37,19 +37,45 @@ samba_cflags = os.environ.get("PYTHON_CFLAGS", "")
 
 samba_srcdir = os.environ.get("SRCDIR", "")
 
+compiler = os.environ.get("CC", "")
+
 # These variables are filled in by configure
 
 samba_libs = os.environ.get("LIBS", "")
 
-# Convert libs and objs from space separated strings to lists of strings
-# for distutils to digest.  Split "-l" prefix off library list.
-
 obj_list = string.split(samba_objs)
 
-lib_list = []
+# Unfortunately the samba_libs variable contains both shared libraries
+# and linker flags.  The python distutils doesn't like this so we have
+# to split $samba_libs into a flags component and a library component.
+
+libraries = []
+library_dirs = []
+
+next_is_path = 0
+next_is_flag = 0
 
 for lib in string.split(samba_libs):
-    lib_list.append(string.replace(lib, "-l", ""))
+    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"):
+        libraries.append(lib[2:])
+    elif lib[0:8] in ("-pthread"):
+        pass # Skip linker flags
+    elif lib[0:2] == "-L":
+        library_dirs.append(lib[2:])
+    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)
 
@@ -96,8 +122,8 @@ setup(
                          samba_srcdir + "python/py_spoolss_jobs.c",
                          samba_srcdir + "python/py_spoolss_jobs_conv.c",
                          ],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -107,8 +133,8 @@ setup(
               sources = [samba_srcdir + "python/py_lsa.c",
                          samba_srcdir + "python/py_common.c",
                          samba_srcdir + "python/py_ntsec.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -116,10 +142,11 @@ setup(
 
     Extension(name = "samr",
               sources = [samba_srcdir + "python/py_samr.c",
+                         samba_srcdir + "python/py_conv.c",
                          samba_srcdir + "python/py_samr_conv.c",
                          samba_srcdir + "python/py_common.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -130,8 +157,8 @@ setup(
                          samba_srcdir + "python/py_winbind_conv.c",
                          samba_srcdir + "python/py_conv.c",
                          samba_srcdir + "python/py_common.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -140,8 +167,8 @@ setup(
     Extension(name = "winreg",
               sources = [samba_srcdir + "python/py_winreg.c",
                          samba_srcdir + "python/py_common.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -152,8 +179,8 @@ setup(
                          samba_srcdir + "python/py_conv.c",
                          samba_srcdir + "python/py_srvsvc_conv.c",
                          samba_srcdir + "python/py_common.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -161,8 +188,8 @@ setup(
 
     Extension(name = "tdb",
               sources = [samba_srcdir + "python/py_tdb.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
@@ -172,8 +199,8 @@ setup(
               sources = [samba_srcdir + "python/py_smb.c",
                          samba_srcdir + "python/py_common.c",
                          samba_srcdir + "python/py_ntsec.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
+              libraries = libraries,
+              library_dirs = ["/usr/kerberos/lib"] + library_dirs,
               extra_compile_args = flags_list,
               extra_objects = obj_list),