- merge 3.4

This commit is contained in:
doko@ubuntu.com 2015-05-06 01:13:31 +02:00
commit 4ccc1514d0
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -14381,7 +14381,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
$as_echo "$LDVERSION" >&6; } $as_echo "$LDVERSION" >&6; }
LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}" LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
# Check whether right shifting a negative integer extends the sign bit # Check whether right shifting a negative integer extends the sign bit

View File

@ -4331,7 +4331,7 @@ AC_MSG_RESULT($LDVERSION)
dnl define LIBPL after ABIFLAGS and LDVERSION is defined. dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED) AC_SUBST(PY_ENABLE_SHARED)
LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}" LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
AC_SUBST(LIBPL) AC_SUBST(LIBPL)
# Check whether right shifting a negative integer extends the sign bit # Check whether right shifting a negative integer extends the sign bit