Fix python shlib probe for Cygwin.

tglsfdc · tglsfdc · commit 17a3a1eb0efc · 2016-10-07T11:27:34.000-04:00
On buildfarm member cockatiel, that library is in /usr/bin.
(Possibly we should look at $PATH on this platform?)
Per off-list report from Andrew Dunstan.
diff --git a/config/python.m4 b/config/python.m4
@@ -130,11 +130,11 @@ else
 			done
 		done
 	fi
-	# As usual, Windows has its own ideas.  c:/Windows/System32 takes the
-	# place of /usr/lib as a possible default library location, and the
-	# "lib" prefix might not be there.
-	if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then
-		for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32
+	# As usual, Windows has its own ideas.  Possible default library
+	# locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
+	# and the "lib" prefix might not be there.
+	if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
+		for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
 		do
 			for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
 				if test -e "$f"; then
diff --git a/configure b/configure
@@ -7673,11 +7673,11 @@ else
 			done
 		done
 	fi
-	# As usual, Windows has its own ideas.  c:/Windows/System32 takes the
-	# place of /usr/lib as a possible default library location, and the
-	# "lib" prefix might not be there.
-	if test "$found_shlib" != 1 -a "$PORTNAME" = win32 ; then
-		for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32
+	# As usual, Windows has its own ideas.  Possible default library
+	# locations include c:/Windows/System32 and (for Cygwin) /usr/bin,
+	# and the "lib" prefix might not be there.
+	if test "$found_shlib" != 1 -a \( "$PORTNAME" = win32 -o "$PORTNAME" = cygwin \); then
+		for d in "${python_libdir}" "${python_configdir}" c:/Windows/System32 /usr/bin
 		do
 			for f in "$d/lib${ldlibrary}.dll" "$d/${ldlibrary}.dll" ; do
 				if test -e "$f"; then
