diff options
| author | Tom Lane | 2016-10-07 15:27:34 +0000 |
|---|---|---|
| committer | Tom Lane | 2016-10-07 15:27:34 +0000 |
| commit | 17a3a1eb0efc5d84c81e46a26fe6bd21dbe90de9 (patch) | |
| tree | 07cab932bad1f4bb681a741f7105ff90ce198eb5 /config/python.m4 | |
| parent | 4806f26f9e4273888cbf85f42b3bdc5e9d950ba6 (diff) | |
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.
Diffstat (limited to 'config/python.m4')
| -rw-r--r-- | config/python.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/python.m4 b/config/python.m4 index babf5ab1dbe..b605212bea1 100644 --- 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 |