From d89fac038b1e09b72591add676f63de494aa738c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 20 Nov 2006 21:34:27 +0000
Subject: [PATCH] On windows use .pyd instead of .dll - Python-2.5 no longer
 works with dlls

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9571 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Python.html | 2 +-
 Examples/Makefile.in   | 4 ++--
 configure.in           | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index d3f3e6647..bd60ccf6a 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -698,7 +698,7 @@ installation under "Additional include directories".
 <li>Finally, select the settings for the entire project and go to
 "Link Options".  Add the Python library file to your link libraries.
 For example "python21.lib".  Also, set the name of the output file to
-match the name of your Python module (ie. _example.dll).
+match the name of your Python module, ie. _example.pyd - Note that _example.dll also worked with Python-2.4 and earlier.
 
 <li>Build your project.
 </ul>
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 497e47bd4..e576dd0b7 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -271,7 +271,7 @@ python_static_cpp: $(SRCS)
 python_clean:
 	rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc
 	rm -f core @EXTRA_CLEAN@
-	rm -f *.@OBJEXT@ *@SO@
+	rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@
 
 ##################################################################
 #####                       GUILE                           ######
@@ -950,7 +950,7 @@ lua_static_cpp: $(SRCS)
 lua_clean:
 	rm -f *_wrap* *~ .~* mylua@EXEEXT@
 	rm -f core @EXTRA_CLEAN@
-	rm -f *.@OBJEXT@ *@CSHARPSO@
+	rm -f *.@OBJEXT@ *@SO@
 
 ##################################################################
 #####                   ALLEGRO CL                          ######
diff --git a/configure.in b/configure.in
index 6edc0349f..236a8dbe1 100644
--- a/configure.in
+++ b/configure.in
@@ -226,6 +226,7 @@ AC_MSG_RESULT($LINKFORSHARED)
 
 AC_SUBST(PYTHON_SO)
 case $host in
+   *-*-mingw*) PYTHON_SO=.pyd;;
    *-*-darwin*) PYTHON_SO=.so;;
    *) PYTHON_SO=$SO;;
 esac
@@ -568,7 +569,7 @@ else
 # First figure out the name of the Python executable
 
 if test "x$PYBIN" = xyes; then
-AC_CHECK_PROGS(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python)
+AC_CHECK_PROGS(PYTHON, python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python)
 else
 PYTHON="$PYBIN"
 fi