[Python-checkins] r54636 - python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Misc/python-config.in

[georg.brandl]

Author: georg.brandl
Date: Sat Mar 31 20:58:21 2007
New Revision: 54636

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Misc/python-config.in
Log:
Backport docs for recv_into and recvfrom_into.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Mar 31 20:58:21 2007
@@ -426,6 +426,10 @@
 Build
 -----
 
+- Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
+  returned by python-config if Python was built with --enable-shared
+  because that prevented the shared library from being used.
+
 - Patch #1569798: fix a bug in distutils when building Python from a
   directory within sys.exec_prefix.
 

Modified: python/branches/release25-maint/Misc/python-config.in
==============================================================================
--- python/branches/release25-maint/Misc/python-config.in	(original)
+++ python/branches/release25-maint/Misc/python-config.in	Sat Mar 31 20:58:21 2007
@@ -45,7 +45,9 @@
 elif opt in ('--libs', '--ldflags'):
     libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
     libs.append('-lpython'+pyver)
-    if opt == '--ldflags':
+    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+    # shared library in prefix/lib/.
+    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
         libs.insert(0, '-L' + getvar('LIBPL'))
     print ' '.join(libs)