diff options
| author | Tom Lane | 2016-10-04 20:38:45 +0000 |
|---|---|---|
| committer | Tom Lane | 2016-10-04 20:38:45 +0000 |
| commit | fc76259f5b8473dbd3d2009b0e4a267cf3a7e704 (patch) | |
| tree | f5fd959acce33202dba074047beeb64586f3d0b4 | |
| parent | 46ddbbb1177a7e6ce5a4fe0ef8fa8ac49f36d0bb (diff) | |
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.
| -rw-r--r-- | config/python.m4 | 13 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/config/python.m4 b/config/python.m4 index 108d52cb07..20f5e46a32 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -67,10 +67,12 @@ AC_SUBST(python_includespec)[]dnl # 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 # 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 -# a shared library not a plain 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.) +# so that LIBDIR is irrelevant. Also, some packagers put the .so symlink for +# the shlib in ${python_configdir} even though Python itself never does. +# We must also check that what we found is a shared library not a plain +# 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_REQUIRE([_PGAC_CHECK_PYTHON_DIRS]) AC_MSG_CHECKING([how to link an embedded Python application]) @@ -94,7 +96,8 @@ else fi # Search for a likely-looking file. 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 if test -e "$d/lib${ldlibrary}$e"; then python_libdir="$d" @@ -7639,7 +7639,8 @@ else fi # Search for a likely-looking file. 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 if test -e "$d/lib${ldlibrary}$e"; then python_libdir="$d" |