INTEGRATION: CWS macosx02 (1.3.10); FILE MERGED

2005/02/22 18:40:48 pjanik 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2005/02/11 17:27:41 pjanik 1.3.10.1: #i38130#: Add support for .dylib building on MacOS X.

1 files changed, 269 insertions, 95 deletions

diff --git a/python/Python-2.3.4.patch b/python/Python-2.3.4.patch
index 0c7cf964b2e9..beec936cffcf 100755
--- a/python/Python-2.3.4.patch
+++ b/python/Python-2.3.4.patch
@@ -1,5 +1,5 @@
 *** 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
+--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Fri Feb 18 21:10:43 2005
 ***************
 *** 26,33 ****
   INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
@@ -20,7 +20,7 @@
   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 Jan 17 23:20:56 2005
+--- misc/build/Python-2.3.4/Makefile.pre.in	Fri Feb 18 21:10:43 2005
 ***************
 *** 114,123 ****
   RUNSHARED=       @RUNSHARED@
@@ -45,7 +45,7 @@
   # configure script arguments
   CONFIG_ARGS=	@CONFIG_ARGS@
 ***************
-*** 345,351 ****
+*** 345,355 ****
   
   libpython$(VERSION).so: $(LIBRARY_OBJS)
   	if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -53,7 +53,11 @@
   		$(LN) -f $(INSTSONAME) $@; \
   	else\
   		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
---- 345,351 ----
+  	fi
+  
+  libpython$(VERSION).sl: $(LIBRARY_OBJS)
+  	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+--- 345,358 ----
   
   libpython$(VERSION).so: $(LIBRARY_OBJS)
   	if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -61,8 +65,68 @@
   		$(LN) -f $(INSTSONAME) $@; \
   	else\
   		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-*** 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
+  	fi
++ 
++ libpython$(VERSION).dylib: $(LIBRARY)
++ 	$(CC) -dynamiclib -all_load -framework System -framework CoreServices -framework Foundation $(LIBRARY) -o $@ -install_name $@ -current_version $(VERSION) -compatibility_version $(VERSION) -ldl
+  
+  libpython$(VERSION).sl: $(LIBRARY_OBJS)
+  	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+*** misc/Python-2.3.4/Misc/setuid-prog.c	Thu Sep 10 22:18:09 1998
+--- misc/build/Python-2.3.4/Misc/setuid-prog.c	Fri Feb 18 21:10:43 2005
+***************
+*** 70,75 ****
+--- 70,81 ----
+  #define environ _environ
+  #endif
+  
++ #if defined(__APPLE__)
++ # include <sys/time.h>
++ # include <crt_externs.h>
++ # define environ (*_NSGetEnviron())
++ #endif /* __APPLE__ */
++ 
+  /* don't change def_IFS */
+  char def_IFS[] = "IFS= \t\n";
+  /* you may want to change def_PATH, but you should really change it in */
+*** misc/Python-2.3.4/Modules/posixmodule.c	Tue May  4 10:07:49 2004
+--- misc/build/Python-2.3.4/Modules/posixmodule.c	Fri Feb 18 21:10:43 2005
+***************
+*** 304,310 ****
+  #endif
+  
+  /* Return a dictionary corresponding to the POSIX environment table */
+! #ifdef WITH_NEXT_FRAMEWORK
+  /* On Darwin/MacOSX a shared library or framework has no access to
+  ** environ directly, we must obtain it with _NSGetEnviron().
+  */
+--- 304,310 ----
+  #endif
+  
+  /* Return a dictionary corresponding to the POSIX environment table */
+! #ifdef __APPLE__
+  /* On Darwin/MacOSX a shared library or framework has no access to
+  ** environ directly, we must obtain it with _NSGetEnviron().
+  */
+***************
+*** 322,328 ****
+  	d = PyDict_New();
+  	if (d == NULL)
+  		return NULL;
+! #ifdef WITH_NEXT_FRAMEWORK
+  	if (environ == NULL)
+  		environ = *_NSGetEnviron();
+  #endif
+--- 322,328 ----
+  	d = PyDict_New();
+  	if (d == NULL)
+  		return NULL;
+! #ifdef __APPLE__
+  	if (environ == NULL)
+  		environ = *_NSGetEnviron();
+  #endif
+*** misc/Python-2.3.4/PCbuild/_bsddb.dep	Fri Feb 18 21:14:39 2005
+--- misc/build/Python-2.3.4/PCbuild/_bsddb.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -115,8 +179,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_bsddb.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_bsddb.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -376,8 +440,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_csv.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/_csv.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -431,8 +495,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_csv.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/_csv.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -692,8 +756,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_socket.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/_socket.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -751,8 +815,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_socket.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/_socket.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1012,8 +1076,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_sre.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_sre.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1069,8 +1133,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_sre.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/_sre.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1330,8 +1394,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_symtable.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_symtable.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1386,8 +1450,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_symtable.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_symtable.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1645,8 +1709,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_testcapi.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_testcapi.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1701,8 +1765,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_testcapi.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_testcapi.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -1960,8 +2024,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/_tkinter.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_tkinter.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2015,8 +2079,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/_tkinter.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/_tkinter.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2286,8 +2350,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/bz2.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/bz2.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2342,8 +2406,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/bz2.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/bz2.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2552,8 +2616,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/datetime.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/datetime.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2608,8 +2672,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/datetime.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/datetime.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2869,8 +2933,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/make_versioninfo.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -2880,8 +2944,8 @@
 ! ..\PC\make_versioninfo.c : \
 ! 	"..\Include\patchlevel.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/make_versioninfo.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/make_versioninfo.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3122,8 +3186,8 @@
 ! 
 ! 
 ! !ENDIF 
-*** 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
+*** misc/Python-2.3.4/PCbuild/mmap.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/mmap.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3176,8 +3240,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/mmap.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/mmap.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3435,8 +3499,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/parser.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/parser.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3494,8 +3558,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/parser.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/parser.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3755,8 +3819,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/pyexpat.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/pyexpat.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -3846,8 +3910,8 @@
 ! 	"..\Modules\expat\xmltok_impl.h"\
 ! 	"..\Modules\expat\xmltok_ns.c"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/pyexpat.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/pyexpat.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4137,8 +4201,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/python.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/python.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4195,8 +4259,8 @@
 ! ..\PC\python_exe.rc : \
 ! 	"..\PC\pycon.ico"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/python.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/python.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -4490,8 +4554,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/pythoncore.dep	Fri Feb 18 21:14:39 2005
+--- misc/build/Python-2.3.4/PCbuild/pythoncore.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -9948,8 +10012,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/pythoncore.mak	Fri Feb 18 21:14:39 2005
+--- misc/build/Python-2.3.4/PCbuild/pythoncore.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11407,8 +11471,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/pythonw.dep	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/pythonw.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11465,8 +11529,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/pythonw.mak	Fri Feb 18 21:14:36 2005
+--- misc/build/Python-2.3.4/PCbuild/pythonw.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11744,8 +11808,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/select.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/select.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -11798,8 +11862,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/select.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/select.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12059,8 +12123,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/unicodedata.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/unicodedata.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12116,8 +12180,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/unicodedata.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/unicodedata.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12375,16 +12439,16 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/w9xpopen.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/w9xpopen.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
 --- 1,2 ----
 ! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von w9xpopen.mak
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/w9xpopen.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12585,8 +12649,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/winreg.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/winreg.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12640,8 +12704,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/winreg.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/winreg.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12917,8 +12981,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/winsound.dep	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/winsound.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -12971,8 +13035,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/winsound.mak	Fri Feb 18 21:14:37 2005
+--- misc/build/Python-2.3.4/PCbuild/winsound.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13230,8 +13294,8 @@
 ! 
 ! !ENDIF 
 ! 
-*** 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
+*** misc/Python-2.3.4/PCbuild/zlib.dep	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/zlib.dep	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13285,8 +13349,8 @@
 ! 	"..\PC\pyconfig.h"\
 ! 	{$(INCLUDE)}"basetsd.h"\
 ! 	
-*** 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
+*** misc/Python-2.3.4/PCbuild/zlib.mak	Fri Feb 18 21:14:38 2005
+--- misc/build/Python-2.3.4/PCbuild/zlib.mak	Fri Feb 18 21:10:43 2005
 ***************
 *** 1 ****
 ! dummy
@@ -13554,8 +13618,38 @@
 ! 
 ! !ENDIF 
 ! 
+*** misc/Python-2.3.4/Python/dynload_shlib.c	Sat May  3 11:14:53 2003
+--- misc/build/Python-2.3.4/Python/dynload_shlib.c	Fri Feb 18 21:13:33 2005
+***************
+*** 46,53 ****
+--- 46,58 ----
+          {"module.exe", "rb", C_EXTENSION},
+          {"MODULE.EXE", "rb", C_EXTENSION},
+  #else
++ #ifdef __APPLE__
++ 	{".dylib", "rb", C_EXTENSION},
++ 	{"module.dylib", "rb", C_EXTENSION},
++ #else
+  	{".so", "rb", C_EXTENSION},
+  	{"module.so", "rb", C_EXTENSION},
++ #endif
+  #endif
+  #endif
+  #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
+--- misc/build/Python-2.3.4/configure	Fri Feb 18 21:11:37 2005
+***************
+*** 3590,3595 ****
+--- 3590,3598 ----
+  _ACEOF
+  
+    case $ac_sys_system in
++     Darwin*)
++          LDLIBRARY='libpython$(VERSION).dylib'
++          ;;
+      BeOS*)
+            LDLIBRARY='libpython$(VERSION).so'
+            ;;
 ***************
 *** 3603,3609 ****
   	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -13565,7 +13659,7 @@
   	  LDLIBRARY='libpython$(VERSION).so'
   	  BLDLIBRARY='-L. -lpython$(VERSION)'
   	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
---- 3603,3609 ----
+--- 3606,3612 ----
   	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
   	  INSTSONAME="$LDLIBRARY".$SOVERSION
             ;;
@@ -13574,8 +13668,71 @@
   	  BLDLIBRARY='-L. -lpython$(VERSION)'
   	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 ***************
+*** 4021,4027 ****
+  	    ;;
+  	# is there any other compiler on Darwin besides gcc?
+  	Darwin*)
+! 	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+  	    ;;
+      esac
+      ;;
+--- 4024,4030 ----
+  	    ;;
+  	# is there any other compiler on Darwin besides gcc?
+  	Darwin*)
+! 	    BASECFLAGS="$BASECFLAGS -fno-common -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+  	    ;;
+      esac
+      ;;
+***************
+*** 10031,10036 ****
+--- 10034,10040 ----
+  	case $ac_sys_system in
+  	hp*|HP*)   SO=.sl;;
+  	CYGWIN*)   SO=.dll;;
++ 	Darwin*)   SO=.dylib;;
+  	*)	   SO=.so;;
+  	esac
+  else
+***************
+*** 10082,10088 ****
+  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+  		else
+  			# No framework. Ignore undefined symbols, assuming they come from Python
+! 			LDSHARED="$LDSHARED -undefined suppress"
+  		fi ;;
+  	Darwin/*)
+  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
+--- 10086,10092 ----
+  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+  		else
+  			# No framework. Ignore undefined symbols, assuming they come from Python
+! 			LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+  		fi ;;
+  	Darwin/*)
+  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
+***************
+*** 10091,10098 ****
+  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+  		else
+  			# No framework, use the Python app as bundle-loader
+! 			BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
+! 			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+  		fi ;;
+  	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+  	dgux*) LDSHARED="ld -G";;
+--- 10095,10102 ----
+  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+  		else
+  			# No framework, use the Python app as bundle-loader
+! 			BLDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+! 			LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+  		fi ;;
+  	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+  	dgux*) LDSHARED="ld -G";;
+***************
 *** 10129,10134 ****
---- 10129,10135 ----
+--- 10133,10139 ----
   	case $ac_sys_system/$ac_sys_release in
   	SunOS*) if test "$GCC" = yes;
   	        then CCSHARED="-fPIC";
@@ -13583,3 +13740,20 @@
   	        fi;;
   	hp*|HP*) if test "$GCC" = yes;
   		 then CCSHARED="-fPIC";
+***************
+*** 12986,12992 ****
+  	;;
+  	BeOS*) DYNLOADFILE="dynload_beos.o";;
+  	hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
+! 	Darwin/*) DYNLOADFILE="dynload_next.o";;
+  	atheos*) DYNLOADFILE="dynload_atheos.o";;
+  	*)
+  	# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+--- 12991,12997 ----
+  	;;
+  	BeOS*) DYNLOADFILE="dynload_beos.o";;
+  	hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
+! 	Darwin/*) DYNLOADFILE="dynload_shlib.o";;
+  	atheos*) DYNLOADFILE="dynload_atheos.o";;
+  	*)
+  	# use dynload_shlib.c and dlopen() if we have it; otherwise stub