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.

diff --git a/Misc/python-config.in b/Misc/python-config.in
index ba9183e3cc273295a194f741eaf4f16dd78272e0..1d4a81d8502dfc36f7db15eab6a7220381e1853a 100644 (file)
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -1,4 +1,5 @@
 #!@EXENAME@
+# -*- python -*-
 
 import getopt
 import os
@@ -45,7 +46,7 @@ for opt in opt_flags:
 
     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':

diff --git a/Misc/python.pc.in b/Misc/python.pc.in
index 08481a95806fc52c58f1fd054d55b7791f2e8614..23b933a1ddeeb996d29faa72d7100a166fc4f5c3 100644 (file)
--- a/Misc/python.pc.in
+++ b/Misc/python.pc.in
@@ -8,6 +8,6 @@ Description: Python library
 Requires: 
 Version: @VERSION@
 Libs.private: @LIBS@
-Libs: -L${libdir} -lpython@VERSION@
+Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
 Cflags: -I${includedir}/python@VERSION@ 
 

diff --git a/configure b/configure
index c1b220111239a85586d05dddf13c3c458c33ef6a..fdb2f29bace1152ecd85cdd6662083aedec14694 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ esac
 $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; }

diff --git a/configure.in b/configure.in
index 9585b0953d7d5779f9660e712ef8670827be371b..26106577a4353b3515887c78d5d613811eebe28f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -585,7 +585,7 @@ AC_SUBST(LIBRARY)
 AC_MSG_CHECKING(LIBRARY)
 if test -z "$LIBRARY"
 then
-       LIBRARY='libpython$(VERSION).a'
+       LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
 fi
 AC_MSG_RESULT($LIBRARY)