Fix python shlib probe for Cygwin.

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
index babf5ab1dbe898fab3a9f3698c72f24982659c34..b605212bea16a90fe1e8a705263602fb2c0a6de9 100644 (file)
--- 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
index 204daa056d5bceaadb8a90d5d872766453a110a0..ceaa3ba5f80cd3348b269b53bad8b2c39609cdd1 100755 (executable)
--- 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