diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-11 19:32:19 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-11 19:32:19 +0000 |
| commit | 669ca7af831fb1bba21fdcb037b8e8a365534230 (patch) | |
| tree | d254c40fac4c520c844025895c6dda1200226112 /configure | |
| parent | e5d30091e6059328877969acd099e23899b6afd3 (diff) | |
| download | postgresql-669ca7af831fb1bba21fdcb037b8e8a365534230.tar.gz | |
Another try at making plpython autoconfiguration work correctly. Use a
-L spec rather than assuming libpython is in the standard search path
(this returns to the way 7.4 did it). But check the distutils output
to see if it looks like Python has built a shared library, and if so
link with that instead of the probably-not-shared library found in
configdir.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -4249,10 +4249,26 @@ echo "${ECHO_T}$python_configdir" >&6 echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5 echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6 -python_libspec=`${PYTHON} -c "import distutils.sysconfig,string; print '-lpython${python_version} '+string.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS')))"` +python_libdir=`${PYTHON} -c "import distutils.sysconfig,string; print string.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR')))"` +python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig,string; print string.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY')))"` +python_so=`${PYTHON} -c "import distutils.sysconfig,string; print string.join(filter(None,distutils.sysconfig.get_config_vars('SO')))"` +ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"` -echo "$as_me:$LINENO: result: ${python_libspec}" >&5 -echo "${ECHO_T}${python_libspec}" >&6 +if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}" +then + # New way: use the official shared library + ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"` + python_libspec="-L${python_libdir} -l${ldlibrary}" +else + # Old way: use libpython from python_configdir + python_libdir="${python_configdir}" + python_libspec="-L${python_libdir} -lpython${python_version}" +fi + +python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print string.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS')))"` + +echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5 +echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6 fi @@ -18893,7 +18909,9 @@ s,@PYTHON@,$PYTHON,;t t s,@python_version@,$python_version,;t t s,@python_configdir@,$python_configdir,;t t s,@python_includespec@,$python_includespec,;t t +s,@python_libdir@,$python_libdir,;t t s,@python_libspec@,$python_libspec,;t t +s,@python_additional_libs@,$python_additional_libs,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@HAVE_IPV6@,$HAVE_IPV6,;t t s,@acx_pthread_config@,$acx_pthread_config,;t t |