From b1fc41784136a2eb9737a7f0c821db52ab8d4dee Mon Sep 17 00:00:00 2001
From: "E. M. Bray" <erik.bray@lri.fr>
Date: Fri, 24 May 2019 18:39:39 +0200
Subject: [PATCH] bpo-21536: Fix configure.ac for LIBPYTHON on Android/Cygwin
 (GH-13552)

Add also missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP).
---
 configure    | 8 +++++---
 configure.ac | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index c76eb7affe5..bc276ac5836 100755
--- a/configure
+++ b/configure
@@ -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 99d99ae55c1..5e565191f27 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.