[Python-checkins] r85697 - in python/branches/py3k: Misc/python-config.in Misc/python.pc.in configure configure.in

[barry.warsaw]

Author: barry.warsaw
Date: Mon Oct 18 19:09:07 2010
New Revision: 85697

Log:
One more change for issue 9807, by Matthias Klose.

This adds $ABIFLAGS to the static library, since it should match the shared
library name.  Also, include the abiflags in python-config --libs.


Modified:
   python/branches/py3k/Misc/python-config.in
   python/branches/py3k/Misc/python.pc.in
   python/branches/py3k/configure
   python/branches/py3k/configure.in

Modified: python/branches/py3k/Misc/python-config.in
==============================================================================
--- python/branches/py3k/Misc/python-config.in	(original)
+++ python/branches/py3k/Misc/python-config.in	Mon Oct 18 19:09:07 2010
@@ -1,4 +1,5 @@
 #!@EXENAME@
+# -*- python -*-
 
 import getopt
 import os
@@ -45,7 +46,7 @@
 
     elif opt in ('--libs', '--ldflags'):
         libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
-        libs.append('-lpython'+pyver)
+        libs.append('-lpython' + pyver + sys.abiflags)
         # add the prefix/lib/pythonX.Y/config dir, but only if there is no
         # shared library in prefix/lib/.
         if opt == '--ldflags':

Modified: python/branches/py3k/Misc/python.pc.in
==============================================================================
--- python/branches/py3k/Misc/python.pc.in	(original)
+++ python/branches/py3k/Misc/python.pc.in	Mon Oct 18 19:09:07 2010
@@ -8,6 +8,6 @@
 Requires: 
 Version: @VERSION@
 Libs.private: @LIBS@
-Libs: -L${libdir} -lpython at VERSION@
+Libs: -L${libdir} -lpython at VERSION@@ABIFLAGS@
 Cflags: -I${includedir}/python at VERSION@ 
 

Modified: python/branches/py3k/configure
==============================================================================
--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Mon Oct 18 19:09:07 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 85559 .
+# From configure.in Revision: 85656 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.67 for python 3.2.
 #
@@ -4679,7 +4679,7 @@
 $as_echo_n "checking LIBRARY... " >&6; }
 if test -z "$LIBRARY"
 then
-	LIBRARY='libpython$(VERSION).a'
+	LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
 $as_echo "$LIBRARY" >&6; }

Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Mon Oct 18 19:09:07 2010
@@ -585,7 +585,7 @@
 AC_MSG_CHECKING(LIBRARY)
 if test -z "$LIBRARY"
 then
-	LIBRARY='libpython$(VERSION).a'
+	LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
 fi
 AC_MSG_RESULT($LIBRARY)