Path for bugzilla #1152 from Timur Bakeyev. Allow python modules to

build despite libraries added to LDFLAGS instead of LDPATH.

diff --git a/source/Makefile.in b/source/Makefile.in
index 843e843a1efca1a4bf6b1703b4605b6c01487341..daa626af573646855405b2e29cf28fd186ec2eb8 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1284,7 +1284,7 @@ python_ext: $(PYTHON_PICOBJS)
        fi
        PYTHON_OBJS="$(PYTHON_PICOBJS)" \
        PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-       LIBS="$(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
+       LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
                $(PYTHON) python/setup.py build
 
 python_install: $(PYTHON_PICOBJS)
@@ -1294,7 +1294,7 @@ python_install: $(PYTHON_PICOBJS)
        fi
        PYTHON_OBJS="$(PYTHON_PICOBJS)" \
        PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
-       LIBS="$(LIBS)" \
+       LIBS="$(LDFLAGS) $(LIBS)" \
                $(PYTHON) python/setup.py install
 
 python_clean:

diff --git a/source/python/setup.py b/source/python/setup.py
index a9f220f195ae7836b68e5b8cabe04651bb2fde20..4a4f6ad3f813b7ac550ce9c63ef96b7537d987d6 100755 (executable)
--- a/source/python/setup.py
+++ b/source/python/setup.py
@@ -57,6 +57,9 @@ for lib in string.split(samba_libs):
     if 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)