From 9fc56cc943c8b680a77730668e7a2118a6bab85b Mon Sep 17 00:00:00 2001
From: "Erik M. Bray" <erik.bray@lri.fr>
Date: Fri, 24 May 2019 18:09:27 +0200
Subject: [PATCH 1/2] Fix this test and invert the sense of it somewhat so that
 it's clearer (positive propositions instead of negative).

---
 configure    | 6 +++---
 configure.ac | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index c76eb7affe54be..b66307467bfa09 100755
--- a/configure
+++ b/configure
@@ -15131,10 +15131,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 99d99ae55c17f3..37bf616c0e4afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4622,10 +4622,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.

From 5924bca971e377089639cdaa179f34ad3422e784 Mon Sep 17 00:00:00 2001
From: "Erik M. Bray" <erik.bray@lri.fr>
Date: Fri, 24 May 2019 18:10:32 +0200
Subject: [PATCH 2/2] Add missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP)

---
 configure    | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/configure b/configure
index b66307467bfa09..bc276ac58362bf 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
diff --git a/configure.ac b/configure.ac
index 37bf616c0e4afe..5e565191f27de1 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