Un-break plpython build for non-Windows platforms.

3 files changed, 13 insertions, 28 deletions

diff --git a/config/python.m4 b/config/python.m4
index 6795907162..1bb53d026f 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -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}])
 
diff --git a/configure b/configure
index 59327b959d..e1a3057ba9 100755
--- a/configure
+++ b/configure
@@ -4235,28 +4235,21 @@ echo "${ECHO_T}no" >&6
 echo "$as_me: error: distutils module not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: checking Python installation directories" >&5
-echo $ECHO_N "checking Python installation directories... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking Python configuration directory" >&5
+echo $ECHO_N "checking Python configuration directory... $ECHO_C" >&6
 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()"`
 
 # This should be enough of a message.
-if test "$python_prefix" != "$python_execprefix"; then
-  echo "$as_me:$LINENO: result: $python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}" >&5
-echo "${ECHO_T}$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}" >&6
-else
-  echo "$as_me:$LINENO: result: $python_prefix/lib/python${python_version}" >&5
-echo "${ECHO_T}$python_prefix/lib/python${python_version}" >&6
-fi
+echo "$as_me:$LINENO: result: $python_configdir" >&5
+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 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')))"`
 
 echo "$as_me:$LINENO: result: ${python_libspec}" >&5
 echo "${ECHO_T}${python_libspec}" >&6
@@ -18897,11 +18890,9 @@ s,@perl_privlibexp@,$perl_privlibexp,;t t
 s,@perl_useshrplib@,$perl_useshrplib,;t t
 s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
 s,@PYTHON@,$PYTHON,;t t
-s,@python_prefix@,$python_prefix,;t t
-s,@python_execprefix@,$python_execprefix,;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_version@,$python_version,;t t
 s,@python_libspec@,$python_libspec,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@HAVE_IPV6@,$HAVE_IPV6,;t t
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 7b1e622a6c..c238a65a3e 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -12,10 +12,12 @@ ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
 shared_libpython = yes
 endif
 
-# Convert backslashed paths to normal slashes
+# Windows needs to convert backslashed paths to normal slashes,
+# and we have to remove -lpython from libspec since we are building our own
 ifeq ($(PORTNAME), win32)
 shared_libpython = yes
 python_includespec := $(subst \,/,$(python_includespec))
+python_libspec := $(subst -lpython$(python_version),,$(python_libspec))
 endif
 
 # Darwin (OS X) has its own ideas about how to do this.