From 17a3a1eb0efc5d84c81e46a26fe6bd21dbe90de9 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 7 Oct 2016 11:27:34 -0400
Subject: [PATCH] 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.
---
config/python.m4 | 10 +++++-----
configure | 10 +++++-----
2 files changed, 10 insertions(+), 10 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
diff --git a/configure b/configure
index 204daa056d5..ceaa3ba5f80 100755
--- 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
--
GitLab