From f040d7de94a057f2c26c8b3d140b33273bfcc595 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 18 Oct 2010 17:09:07 +0000
Subject: [PATCH] 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.
---
 Misc/python-config.in | 3 ++-
 Misc/python.pc.in     | 2 +-
 configure             | 4 ++--
 configure.in          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Misc/python-config.in b/Misc/python-config.in
index ba9183e3cc2..1d4a81d8502 100644
--- 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 08481a95806..23b933a1dde 100644
--- 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 c1b22011123..fdb2f29bace 100755
--- 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 9585b0953d7..26106577a43 100644
--- 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)