Commit fc76259f authored by Tom Lane's avatar Tom Lane

Huh, we do need to look in $python_configdir for the Python shlib.

Debian does it that way, for no doubt what seems to them a good reason.
Thanks to Aidan Van Dyk for confirmation.
parent 46ddbbb1
...@@ -67,10 +67,12 @@ AC_SUBST(python_includespec)[]dnl ...@@ -67,10 +67,12 @@ AC_SUBST(python_includespec)[]dnl
# directory name and LDLIBRARY is the file name of the shlib. But in older # directory name and LDLIBRARY is the file name of the shlib. But in older
# installations LDLIBRARY is frequently a useless path fragment, and it's also # installations LDLIBRARY is frequently a useless path fragment, and it's also
# possible that the shlib is in a standard library directory such as /usr/lib # possible that the shlib is in a standard library directory such as /usr/lib
# so that LIBDIR is of no interest. We must also check that what we found is # so that LIBDIR is irrelevant. Also, some packagers put the .so symlink for
# a shared library not a plain library, which we do by checking its extension. # the shlib in ${python_configdir} even though Python itself never does.
# (We used to rely on Py_ENABLE_SHARED, but that only tells us that a shlib # We must also check that what we found is a shared library not a plain
# exists, not that we found it.) # library, which we do by checking its extension. (We used to rely on
# Py_ENABLE_SHARED, but that only tells us that a shlib exists, not that
# we found it.)
AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP], AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS]) [AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
AC_MSG_CHECKING([how to link an embedded Python application]) AC_MSG_CHECKING([how to link an embedded Python application])
...@@ -94,7 +96,8 @@ else ...@@ -94,7 +96,8 @@ else
fi fi
# Search for a likely-looking file. # Search for a likely-looking file.
found_shlib=0 found_shlib=0
for d in "${python_libdir}" /usr/lib64 /usr/lib; do for d in "${python_libdir}" "${python_configdir}" /usr/lib64 /usr/lib
do
for e in .so .dll .dylib .sl; do for e in .so .dll .dylib .sl; do
if test -e "$d/lib${ldlibrary}$e"; then if test -e "$d/lib${ldlibrary}$e"; then
python_libdir="$d" python_libdir="$d"
......
...@@ -7639,7 +7639,8 @@ else ...@@ -7639,7 +7639,8 @@ else
fi fi
# Search for a likely-looking file. # Search for a likely-looking file.
found_shlib=0 found_shlib=0
for d in "${python_libdir}" /usr/lib64 /usr/lib; do for d in "${python_libdir}" "${python_configdir}" /usr/lib64 /usr/lib
do
for e in .so .dll .dylib .sl; do for e in .so .dll .dylib .sl; do
if test -e "$d/lib${ldlibrary}$e"; then if test -e "$d/lib${ldlibrary}$e"; then
python_libdir="$d" python_libdir="$d"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment