diff options
| author | Tom Lane | 2004-10-10 19:07:55 +0000 |
|---|---|---|
| committer | Tom Lane | 2004-10-10 19:07:55 +0000 |
| commit | 86a39d5a196441fe0afd31bc7429842fa16c0b65 (patch) | |
| tree | b1f9580a17e3fb40ad475c1fd9373dd0f3c86ef6 /config/python.m4 | |
| parent | ea12f8e6a349b5852e5f628d066015ff4df74d41 (diff) | |
Un-break plpython build for non-Windows platforms.
Diffstat (limited to 'config/python.m4')
| -rw-r--r-- | config/python.m4 | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/config/python.m4 b/config/python.m4 index a62842170c4..2a61559f8a3 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -1,7 +1,7 @@ # # Autoconf macros for configuring the build of Python extension modules # -# $PostgreSQL: pgsql/config/python.m4,v 1.9 2004/10/06 09:20:40 momjian Exp $ +# $PostgreSQL: pgsql/config/python.m4,v 1.10 2004/10/10 19:07:52 tgl Exp $ # # PGAC_PATH_PYTHON @@ -29,24 +29,16 @@ else AC_MSG_RESULT(no) AC_MSG_ERROR([distutils module not found]) fi -AC_MSG_CHECKING([Python installation directories]) +AC_MSG_CHECKING([Python configuration directory]) python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"` -python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` -python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print os.path.join(f(plat_specific=1,standard_lib=1),'config')"` python_includespec=`${PYTHON} -c "import distutils.sysconfig; print '-I'+distutils.sysconfig.get_python_inc()"` -AC_SUBST(python_prefix)[]dnl -AC_SUBST(python_execprefix)[]dnl +AC_SUBST(python_version)[]dnl AC_SUBST(python_configdir)[]dnl AC_SUBST(python_includespec)[]dnl -AC_SUBST(python_version)[]dnl # This should be enough of a message. -if test "$python_prefix" != "$python_execprefix"; then - AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}]) -else - AC_MSG_RESULT([$python_prefix/lib/python${python_version}]) -fi +AC_MSG_RESULT([$python_configdir]) ])# _PGAC_CHECK_PYTHON_DIRS @@ -56,7 +48,7 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP], [AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS]) AC_MSG_CHECKING([how to link an embedded Python application]) -python_libspec=`${PYTHON} -c "import distutils.sysconfig,string;print string.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS')))"` +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')))"` AC_MSG_RESULT([${python_libspec}]) |