diff options
| author | E. M. Bray <erik.bray@lri.fr> | 2019-05-24 16:39:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2019-05-24 16:39:38 (GMT) |
| commit | b1fc41784136a2eb9737a7f0c821db52ab8d4dee (patch) | |
| tree | 6b0937ea07b911013f487c70150d5414b51ef5d9 | |
| parent | bc66faccb8a6140e7e07b5e67843b7f21152c144 (diff) | |
| download | cpython-b1fc41784136a2eb9737a7f0c821db52ab8d4dee.zip cpython-b1fc41784136a2eb9737a7f0c821db52ab8d4dee.tar.gz cpython-b1fc41784136a2eb9737a7f0c821db52ab8d4dee.tar.bz2 | |
bpo-21536: Fix configure.ac for LIBPYTHON on Android/Cygwin (GH-13552)
Add also missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP).
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 6 deletions
@@ -3292,6 +3292,8 @@ then '') MACHDEP="unknown";; esac fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5 +$as_echo "\"$MACHDEP\"" >&6; } if test "$cross_compiling" = yes; then @@ -15131,10 +15133,10 @@ $as_echo "$LDVERSION" >&6; } # On Android and Cygwin the shared libraries must be linked with libpython. -if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then - LIBPYTHON='' -else +if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" +else + LIBPYTHON='' fi diff --git a/configure.ac b/configure.ac index 99d99ae..5e56519 100644 --- a/configure.ac +++ b/configure.ac @@ -411,6 +411,7 @@ then '') MACHDEP="unknown";; esac fi +AC_MSG_RESULT("$MACHDEP") AC_SUBST(_PYTHON_HOST_PLATFORM) if test "$cross_compiling" = yes; then @@ -4622,10 +4623,10 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) -if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then - LIBPYTHON='' -else +if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" +else + LIBPYTHON='' fi dnl define LIBPL after ABIFLAGS and LDVERSION is defined. |