Windows also needs an override of the shared libpython detection

Author: petere

configure

@@ -7549,15 +7549,18 @@ fi
   # we see if there is a file that is named like a shared library.
 
   if test "$python_enable_shared" != 1; then
-    # OS X does supply a .dylib even though Py_ENABLE_SHARED does not
-    # get set.  The file detection logic below doesn't succeed on
-    # older OS X versions, so make it explicit.
     if test "$PORTNAME" = darwin; then
+      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # not get set.  The file detection logic below doesn't succeed
+      # on older OS X versions, so make it explicit.
+      python_enable_shared=1
+    elif test "$PORTNAME" = win32; then
+      # Windows also needs an explicit override.
       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
+      for dlsuffix in .so .sl; do
         if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
           python_enable_shared=1
           break

configure.in

@@ -909,15 +909,18 @@ if test "$with_python" = yes; then
   # we see if there is a file that is named like a shared library.
 
   if test "$python_enable_shared" != 1; then
-    # OS X does supply a .dylib even though Py_ENABLE_SHARED does not
-    # get set.  The file detection logic below doesn't succeed on
-    # older OS X versions, so make it explicit.
     if test "$PORTNAME" = darwin; then
+      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # not get set.  The file detection logic below doesn't succeed
+      # on older OS X versions, so make it explicit.
+      python_enable_shared=1
+    elif test "$PORTNAME" = win32; then
+      # Windows also needs an explicit override.
       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
+      for dlsuffix in .so .sl; do
         if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
           python_enable_shared=1
           break

src/pl/plpython/Makefile

@@ -8,7 +8,6 @@ include $(top_builddir)/src/Makefile.global
 # Windows needs to convert backslashed paths to normal slashes,
 # and we have to remove -lpython from the link since we are building our own
 ifeq ($(PORTNAME), win32)
-shared_libpython = yes
 python_includespec := $(subst \,/,$(python_includespec))
 override python_libspec =
 endif