Commit 010aa420 authored by Peter Eisentraut's avatar Peter Eisentraut

Fix shared libpython detection on OS X

Apparently, looking for an appropriately named file doesn't work on some
older versions, so put the back the explicit platform detection.
parent 0fd76464
...@@ -7542,24 +7542,29 @@ fi ...@@ -7542,24 +7542,29 @@ fi
# We need libpython as a shared library. With Python >=2.5, we check # We need libpython as a shared library. With Python >=2.5, we
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even # check the Py_ENABLE_SHARED setting. On Debian, the setting is not
# though Py_ENABLE_SHARED does not get set. On Debian, the setting # correct before the jessie release (http://bugs.debian.org/695979).
# is not correct before the jessie release # We also want to support older Python versions. So as a fallback
# (http://bugs.debian.org/695979). We also want to support older # we see if there is a file that is named like a shared library.
# Python versions. So as a fallback we see if there is a file that
# is named like a shared library.
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
# We don't know the platform shared library extension here yet, so # OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# we try some candidates. # get set. The file detection logic below doesn't succeed on
for dlsuffix in .so .dll .dylib .sl; do # older OS X versions, so make it explicit.
if test "$PORTNAME" = darwin; then
python_enable_shared=1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for dlsuffix in .so .dll .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1 python_enable_shared=1
break break
fi fi
done done
fi fi
fi
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
as_fn_error $? "cannot build PL/Python because libpython is not a shared library as_fn_error $? "cannot build PL/Python because libpython is not a shared library
......
...@@ -902,24 +902,29 @@ if test "$with_python" = yes; then ...@@ -902,24 +902,29 @@ if test "$with_python" = yes; then
PGAC_PATH_PYTHON PGAC_PATH_PYTHON
PGAC_CHECK_PYTHON_EMBED_SETUP PGAC_CHECK_PYTHON_EMBED_SETUP
# We need libpython as a shared library. With Python >=2.5, we check # We need libpython as a shared library. With Python >=2.5, we
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even # check the Py_ENABLE_SHARED setting. On Debian, the setting is not
# though Py_ENABLE_SHARED does not get set. On Debian, the setting # correct before the jessie release (http://bugs.debian.org/695979).
# is not correct before the jessie release # We also want to support older Python versions. So as a fallback
# (http://bugs.debian.org/695979). We also want to support older # we see if there is a file that is named like a shared library.
# Python versions. So as a fallback we see if there is a file that
# is named like a shared library.
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
# We don't know the platform shared library extension here yet, so # OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# we try some candidates. # get set. The file detection logic below doesn't succeed on
for dlsuffix in .so .dll .dylib .sl; do # older OS X versions, so make it explicit.
if test "$PORTNAME" = darwin; then
python_enable_shared=1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for dlsuffix in .so .dll .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1 python_enable_shared=1
break break
fi fi
done done
fi fi
fi
if test "$python_enable_shared" != 1; then if test "$python_enable_shared" != 1; then
AC_MSG_ERROR([cannot build PL/Python because libpython is not a shared library AC_MSG_ERROR([cannot build PL/Python because libpython is not a shared library
......
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