INTEGRATION: CWS pyunofixes1 (1.3.2); FILE MERGED

2005/01/17 22:39:24 jbu 1.3.2.1: #i40181# python builds now on FreeBSD

1 files changed, 139 insertions, 122 deletions

diff --git a/python/Python-2.3.4.patch b/python/Python-2.3.4.patch
index fdaff84e8bac..0c7cf964b2e9 100755
--- a/python/Python-2.3.4.patch
+++ b/python/Python-2.3.4.patch
@@ -1,5 +1,26 @@
+*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
+--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Mon Jan 17 23:20:57 2005
+***************
+*** 26,33 ****
+  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
+  
+  # Items more-or-less copied from the main Makefile
+! DIRMODE=755
+! FILEMODE=644
+  INSTALL=/usr/bin/install -c
+  INSTALL_SYMLINK=ln -fsn
+  INSTALL_PROGRAM=${INSTALL}
+--- 26,33 ----
+  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
+  
+  # Items more-or-less copied from the main Makefile
+! DIRMODE=775
+! FILEMODE=664
+  INSTALL=/usr/bin/install -c
+  INSTALL_SYMLINK=ln -fsn
+  INSTALL_PROGRAM=${INSTALL}
 *** misc/Python-2.3.4/Makefile.pre.in	Tue Nov 18 20:54:00 2003
---- misc/build/Python-2.3.4/Makefile.pre.in	Mon Dec  6 14:52:45 2004
+--- misc/build/Python-2.3.4/Makefile.pre.in	Mon Jan 17 23:20:56 2005
 ***************
 *** 114,123 ****
   RUNSHARED=       @RUNSHARED@
@@ -40,41 +61,8 @@
   		$(LN) -f $(INSTSONAME) $@; \
   	else\
   		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-*** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
---- misc/build/Python-2.3.4/configure	Mon Dec  6 14:42:14 2004
-***************
-*** 10129,10134 ****
---- 10129,10135 ----
-  	case $ac_sys_system/$ac_sys_release in
-  	SunOS*) if test "$GCC" = yes;
-  	        then CCSHARED="-fPIC";
-+ 	        else CCSHARED="-KPIC";  # for sun's cc
-  	        fi;;
-  	hp*|HP*) if test "$GCC" = yes;
-  		 then CCSHARED="-fPIC";
-*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
---- misc/build/Python-2.3.4/Mac/OSX/Makefile	Mon Dec  6 14:53:16 2004
-***************
-*** 26,33 ****
-  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
-  
-  # Items more-or-less copied from the main Makefile
-! DIRMODE=755
-! FILEMODE=644
-  INSTALL=/usr/bin/install -c
-  INSTALL_SYMLINK=ln -fsn
-  INSTALL_PROGRAM=${INSTALL}
---- 26,33 ----
-  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
-  
-  # Items more-or-less copied from the main Makefile
-! DIRMODE=775
-! FILEMODE=664
-  INSTALL=/usr/bin/install -c
-  INSTALL_SYMLINK=ln -fsn
-  INSTALL_PROGRAM=${INSTALL}
-*** misc/Python-2.3.4/PCbuild/_bsddb.dep	Mon Dec  6 14:56:37 2004
---- misc/build/Python-2.3.4/PCbuild/_bsddb.dep	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_bsddb.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_bsddb.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -127,8 +115,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_bsddb.mak	Mon Dec  6 14:56:37 2004
---- misc/build/Python-2.3.4/PCbuild/_bsddb.mak	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_bsddb.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_bsddb.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -388,8 +376,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_csv.dep	Mon Dec  6 14:56:34 2004
---- misc/build/Python-2.3.4/PCbuild/_csv.dep	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_csv.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_csv.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -443,8 +431,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_csv.mak	Mon Dec  6 14:56:34 2004
---- misc/build/Python-2.3.4/PCbuild/_csv.mak	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_csv.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_csv.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -704,8 +692,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_socket.dep	Mon Dec  6 14:56:33 2004
---- misc/build/Python-2.3.4/PCbuild/_socket.dep	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_socket.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_socket.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -763,8 +751,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_socket.mak	Mon Dec  6 14:56:33 2004
---- misc/build/Python-2.3.4/PCbuild/_socket.mak	Mon Dec  6 14:42:08 2004
+*** misc/Python-2.3.4/PCbuild/_socket.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/_socket.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1024,8 +1012,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_sre.dep	Mon Dec  6 14:56:34 2004
---- misc/build/Python-2.3.4/PCbuild/_sre.dep	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_sre.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_sre.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1081,8 +1069,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_sre.mak	Mon Dec  6 14:56:34 2004
---- misc/build/Python-2.3.4/PCbuild/_sre.mak	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_sre.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_sre.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1342,8 +1330,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_symtable.dep	Mon Dec  6 14:56:35 2004
---- misc/build/Python-2.3.4/PCbuild/_symtable.dep	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_symtable.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_symtable.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1398,8 +1386,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_symtable.mak	Mon Dec  6 14:56:34 2004
---- misc/build/Python-2.3.4/PCbuild/_symtable.mak	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_symtable.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_symtable.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1657,8 +1645,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_testcapi.dep	Mon Dec  6 14:56:35 2004
---- misc/build/Python-2.3.4/PCbuild/_testcapi.dep	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_testcapi.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_testcapi.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1713,8 +1701,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_testcapi.mak	Mon Dec  6 14:56:35 2004
---- misc/build/Python-2.3.4/PCbuild/_testcapi.mak	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_testcapi.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_testcapi.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1972,8 +1960,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/_tkinter.dep	Mon Dec  6 14:56:37 2004
---- misc/build/Python-2.3.4/PCbuild/_tkinter.dep	Mon Dec  6 14:42:09 2004
+*** misc/Python-2.3.4/PCbuild/_tkinter.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_tkinter.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2027,8 +2015,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/_tkinter.mak	Mon Dec  6 14:56:37 2004
---- misc/build/Python-2.3.4/PCbuild/_tkinter.mak	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/_tkinter.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/_tkinter.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2298,8 +2286,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/bz2.dep	Mon Dec  6 14:56:36 2004
---- misc/build/Python-2.3.4/PCbuild/bz2.dep	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/bz2.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/bz2.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2354,8 +2342,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/bz2.mak	Mon Dec  6 14:56:36 2004
---- misc/build/Python-2.3.4/PCbuild/bz2.mak	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/bz2.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/bz2.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2564,8 +2552,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/datetime.dep	Mon Dec  6 14:56:29 2004
---- misc/build/Python-2.3.4/PCbuild/datetime.dep	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/datetime.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/datetime.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2620,8 +2608,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/datetime.mak	Mon Dec  6 14:56:28 2004
---- misc/build/Python-2.3.4/PCbuild/datetime.mak	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/datetime.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/datetime.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2881,8 +2869,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/make_versioninfo.dep	Mon Dec  6 14:56:36 2004
---- misc/build/Python-2.3.4/PCbuild/make_versioninfo.dep	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/make_versioninfo.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2892,8 +2880,8 @@
 ! ..\PC\make_versioninfo.c : \
 ! 	"..\Include\patchlevel.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/make_versioninfo.mak	Mon Dec  6 14:56:36 2004
---- misc/build/Python-2.3.4/PCbuild/make_versioninfo.mak	Mon Dec  6 14:42:10 2004
+*** misc/Python-2.3.4/PCbuild/make_versioninfo.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3134,8 +3122,8 @@
 ! 
 ! 
 ! !ENDIF 
-*** misc/Python-2.3.4/PCbuild/mmap.dep	Mon Dec  6 14:56:29 2004
---- misc/build/Python-2.3.4/PCbuild/mmap.dep	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/mmap.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/mmap.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3188,8 +3176,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/mmap.mak	Mon Dec  6 14:56:29 2004
---- misc/build/Python-2.3.4/PCbuild/mmap.mak	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/mmap.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/mmap.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3447,8 +3435,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/parser.dep	Mon Dec  6 14:56:30 2004
---- misc/build/Python-2.3.4/PCbuild/parser.dep	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/parser.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/parser.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3506,8 +3494,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/parser.mak	Mon Dec  6 14:56:29 2004
---- misc/build/Python-2.3.4/PCbuild/parser.mak	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/parser.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/parser.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3767,8 +3755,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/pyexpat.dep	Mon Dec  6 14:56:30 2004
---- misc/build/Python-2.3.4/PCbuild/pyexpat.dep	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/pyexpat.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/pyexpat.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3858,8 +3846,8 @@
 ! 	"..\Modules\expat\xmltok_impl.h"\
 ! 	"..\Modules\expat\xmltok_ns.c"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/pyexpat.mak	Mon Dec  6 14:56:30 2004
---- misc/build/Python-2.3.4/PCbuild/pyexpat.mak	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/pyexpat.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/pyexpat.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4149,8 +4137,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/python.dep	Mon Dec  6 14:56:30 2004
---- misc/build/Python-2.3.4/PCbuild/python.dep	Mon Dec  6 14:42:11 2004
+*** misc/Python-2.3.4/PCbuild/python.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/python.dep	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4207,8 +4195,8 @@
 ! ..\PC\python_exe.rc : \
 ! 	"..\PC\pycon.ico"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/python.mak	Mon Dec  6 14:56:30 2004
---- misc/build/Python-2.3.4/PCbuild/python.mak	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/python.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/python.mak	Mon Jan 17 23:20:57 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4502,8 +4490,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/pythoncore.dep	Mon Dec  6 14:56:38 2004
---- misc/build/Python-2.3.4/PCbuild/pythoncore.dep	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/pythoncore.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/pythoncore.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -9960,8 +9948,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/pythoncore.mak	Mon Dec  6 14:56:37 2004
---- misc/build/Python-2.3.4/PCbuild/pythoncore.mak	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/pythoncore.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/pythoncore.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11419,8 +11407,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/pythonw.dep	Mon Dec  6 14:56:31 2004
---- misc/build/Python-2.3.4/PCbuild/pythonw.dep	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/pythonw.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/pythonw.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11477,8 +11465,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/pythonw.mak	Mon Dec  6 14:56:31 2004
---- misc/build/Python-2.3.4/PCbuild/pythonw.mak	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/pythonw.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/pythonw.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11756,8 +11744,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/select.dep	Mon Dec  6 14:56:31 2004
---- misc/build/Python-2.3.4/PCbuild/select.dep	Mon Dec  6 14:42:12 2004
+*** misc/Python-2.3.4/PCbuild/select.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/select.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11810,8 +11798,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/select.mak	Mon Dec  6 14:56:31 2004
---- misc/build/Python-2.3.4/PCbuild/select.mak	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/select.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/select.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12071,8 +12059,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/unicodedata.dep	Mon Dec  6 14:56:32 2004
---- misc/build/Python-2.3.4/PCbuild/unicodedata.dep	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/unicodedata.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/unicodedata.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12128,8 +12116,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/unicodedata.mak	Mon Dec  6 14:56:31 2004
---- misc/build/Python-2.3.4/PCbuild/unicodedata.mak	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/unicodedata.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/unicodedata.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12387,16 +12375,16 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/w9xpopen.dep	Mon Dec  6 14:56:32 2004
---- misc/build/Python-2.3.4/PCbuild/w9xpopen.dep	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/w9xpopen.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/w9xpopen.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
 --- 1,2 ----
 ! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von w9xpopen.mak
 ! 
-*** misc/Python-2.3.4/PCbuild/w9xpopen.mak	Mon Dec  6 14:56:32 2004
---- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/w9xpopen.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12597,8 +12585,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/winreg.dep	Mon Dec  6 14:56:33 2004
---- misc/build/Python-2.3.4/PCbuild/winreg.dep	Mon Dec  6 14:42:13 2004
+*** misc/Python-2.3.4/PCbuild/winreg.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/winreg.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12652,8 +12640,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/winreg.mak	Mon Dec  6 14:56:32 2004
---- misc/build/Python-2.3.4/PCbuild/winreg.mak	Mon Dec  6 14:42:14 2004
+*** misc/Python-2.3.4/PCbuild/winreg.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/winreg.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12929,8 +12917,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/winsound.dep	Mon Dec  6 14:56:33 2004
---- misc/build/Python-2.3.4/PCbuild/winsound.dep	Mon Dec  6 14:42:14 2004
+*** misc/Python-2.3.4/PCbuild/winsound.dep	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/winsound.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12983,8 +12971,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/winsound.mak	Mon Dec  6 14:56:33 2004
---- misc/build/Python-2.3.4/PCbuild/winsound.mak	Mon Dec  6 14:42:14 2004
+*** misc/Python-2.3.4/PCbuild/winsound.mak	Mon Jan 17 23:23:28 2005
+--- misc/build/Python-2.3.4/PCbuild/winsound.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13242,8 +13230,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** misc/Python-2.3.4/PCbuild/zlib.dep	Mon Dec  6 14:56:36 2004
---- misc/build/Python-2.3.4/PCbuild/zlib.dep	Mon Dec  6 14:42:14 2004
+*** misc/Python-2.3.4/PCbuild/zlib.dep	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/zlib.dep	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13297,8 +13285,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** misc/Python-2.3.4/PCbuild/zlib.mak	Mon Dec  6 14:56:35 2004
---- misc/build/Python-2.3.4/PCbuild/zlib.mak	Mon Dec  6 14:42:14 2004
+*** misc/Python-2.3.4/PCbuild/zlib.mak	Mon Jan 17 23:23:29 2005
+--- misc/build/Python-2.3.4/PCbuild/zlib.mak	Mon Jan 17 23:20:58 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13566,3 +13554,32 @@
 ! 
 ! !ENDIF 
 ! 
+*** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
+--- misc/build/Python-2.3.4/configure	Mon Jan 17 23:22:18 2005
+***************
+*** 3603,3609 ****
+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+  	  INSTSONAME="$LDLIBRARY".$SOVERSION
+            ;;
+!     Linux*|GNU*|NetBSD*)
+  	  LDLIBRARY='libpython$(VERSION).so'
+  	  BLDLIBRARY='-L. -lpython$(VERSION)'
+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+--- 3603,3609 ----
+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+  	  INSTSONAME="$LDLIBRARY".$SOVERSION
+            ;;
+!     Linux*|GNU*|NetBSD*|FreeBSD*)
+  	  LDLIBRARY='libpython$(VERSION).so'
+  	  BLDLIBRARY='-L. -lpython$(VERSION)'
+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+***************
+*** 10129,10134 ****
+--- 10129,10135 ----
+  	case $ac_sys_system/$ac_sys_release in
+  	SunOS*) if test "$GCC" = yes;
+  	        then CCSHARED="-fPIC";
++ 	        else CCSHARED="-KPIC";  # for sun's cc
+  	        fi;;
+  	hp*|HP*) if test "$GCC" = yes;
+  		 then CCSHARED="-fPIC";