diff options
| -rw-r--r-- | Misc/python-config.in | 3 | ||||
| -rw-r--r-- | Misc/python.pc.in | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Misc/python-config.in b/Misc/python-config.in index ba9183e..1d4a81d 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 08481a9..23b933a 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@ @@ -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 9585b09..2610657 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) |