5 files changed, 64 insertions, 12 deletions
diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index 142078b..cf77ed1 100644
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -479,10 +479,9 @@ PyObject_Compare
 PyObject_Unicode
 PyObject_Str
 PyObject_Repr
+_PyGC_Dump
 _PyObject_Dump
 PyObject_Print
-_PyGC_Remove
-_PyGC_Insert
 _PyObject_Del
 _PyObject_NewVar
 _PyObject_New
@@ -620,6 +619,7 @@ Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
 PyMac_OSErrException
+PyMacGluePtr_PyMac_GetFSSpec
 PyMacGluePtr_AEDesc_New
 PyMacGluePtr_AEDesc_Convert
 PyMacGluePtr_CmpObj_New
@@ -712,6 +712,7 @@ CmpObj_Convert
 CmpObj_New
 AEDesc_Convert
 AEDesc_New
+PyMac_GetFSSpec
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed
@@ -788,9 +789,8 @@ initmacfs
 PyMac_BuildFSSpec
 PyMac_BuildFSRef
 PyMac_GetFSRef
-newmfsrobject
 newmfssobject
-PyMac_GetFSSpec
+_PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -1047,6 +1047,9 @@ PyDescr_NewWrapper
 PyDescr_NewGetSet
 PyDescr_NewMember
 PyDescr_NewMethod
+initgc
+_PyGC_Remove
+_PyGC_Insert
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index 80d92cd..c662d62 100644
--- a/Mac/Build/PythonCore.mcp
+++ b/Mac/Build/PythonCore.mcp
diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index adaf913..3cfc93a 100644
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -479,10 +479,9 @@ PyObject_Compare
 PyObject_Unicode
 PyObject_Str
 PyObject_Repr
+_PyGC_Dump
 _PyObject_Dump
 PyObject_Print
-_PyGC_Remove
-_PyGC_Insert
 _PyObject_Del
 _PyObject_NewVar
 _PyObject_New
@@ -620,6 +619,7 @@ Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
 PyMac_OSErrException
+PyMacGluePtr_PyMac_GetFSSpec
 PyMacGluePtr_AEDesc_New
 PyMacGluePtr_AEDesc_Convert
 PyMacGluePtr_CmpObj_New
@@ -712,6 +712,7 @@ CmpObj_Convert
 CmpObj_New
 AEDesc_Convert
 AEDesc_New
+PyMac_GetFSSpec
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed
@@ -783,7 +784,7 @@ PyMac_BuildFSRef
 PyMac_GetFSRef
 newmfsrobject
 newmfssobject
-PyMac_GetFSSpec
+_PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -1040,6 +1041,9 @@ PyDescr_NewWrapper
 PyDescr_NewGetSet
 PyDescr_NewMember
 PyDescr_NewMethod
+initgc
+_PyGC_Remove
+_PyGC_Insert
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
diff --git a/Mac/Include/pyconfig.h b/Mac/Include/pyconfig.h
index 4158873..90b56c4 100644
--- a/Mac/Include/pyconfig.h
+++ b/Mac/Include/pyconfig.h
@@ -129,9 +129,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the Mach cthreads package */
 #undef C_THREADS
 
-/* Defined when case of imported modules are checked against case of file. */
-#define CHECK_IMPORT_CASE
-
 /* Define to `long' if <time.h> doesn't define.  */
 #undef clock_t
 
@@ -148,6 +145,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define this if your time.h defines altzone */
 #undef HAVE_ALTZONE
 
+/* Define if --enable-ipv6 is specified */
+#undef ENABLE_IPV6
+
+/* Define if sockaddr has sa_len member */
+#undef HAVE_SOCKADDR_SA_LEN
+
+/* struct addrinfo (netdb.h) */
+#undef HAVE_ADDRINFO
+
+/* struct sockaddr_storage (sys/socket.h) */
+#undef HAVE_SOCKADDR_STORAGE
+
 /* Defined when any dynamic module loading is enabled */
 /* #undef HAVE_DYNAMIC_LOADING */
 
@@ -184,6 +193,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have GNU PTH threads */
 #undef HAVE_PTH
 
+/* Define if you have readline 4.2 */
+#undef HAVE_RL_COMPLETION_MATCHES
+
 /* Define if your compiler supports variable length function prototypes
    (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
 #define HAVE_STDARG_PROTOTYPES
@@ -208,6 +220,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define as the size of the unicode type. */
 #define Py_UNICODE_SIZE 2
 
+/* Define if nice() returns success/failure instead of the new priority. */
+#undef HAVE_BROKEN_NICE
+
 /* Define if malloc(0) returns a NULL pointer */
 #ifdef USE_MSL_MALLOC
 #define MALLOC_ZERO_RETURNS_NULL
@@ -269,7 +284,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #undef WANT_WCTYPE_FUNCTIONS
 
 /* Define if you want to compile in cycle garbage collection */
-#undef WITH_CYCLE_GC
+#define WITH_CYCLE_GC 1
 
 /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
    This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
@@ -294,6 +309,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    (shared library plus accessory files). */
 #undef WITH_NEXT_FRAMEWORK
 
+/* Define if you want to use MacPython modules on MacOSX in unix-Python */
+#define USE_TOOLBOX_OBJECT_GLUE
+
 /* Define if you want to use SGI (IRIX 4) dynamic linking.
    This requires the "dl" library by Jack Jansen,
    ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
@@ -419,6 +437,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the getlogin function.  */
 #undef HAVE_GETLOGIN
 
+/* Define if you have the getnameinfo function.  */
+#undef HAVE_GETNAMEINFO
+
 /* Define if you have the getpeername function.  */
 #ifdef USE_GUSI
 #define HAVE_GETPEERNAME
@@ -430,6 +451,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the getpid function.  */
 #undef HAVE_GETPID
 
+/* Define if you have the getpriority function.  */
+#undef HAVE_GETPRIORITY
+
 /* Define if you have the getpwent function.  */
 #undef HAVE_GETPWENT
 
@@ -441,6 +465,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the getwd function.  */
 #undef HAVE_GETWD
 
+/* Define if you have the hstrerror function.  */
+#undef HAVE_HSTRERROR
+
 /* Define if you have the hypot function.  */
 #ifndef __MC68K__
 /* 68K hypot definition (and implementation) are unuseable
@@ -449,6 +476,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define HAVE_HYPOT
 #endif
 
+/* Define if you have the inet_pton function.  */
+#undef HAVE_INET_PTON
+
 /* Define if you have the kill function.  */
 #undef HAVE_KILL
 
@@ -544,6 +574,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the sigrelse function.  */
 #undef HAVE_SIGRELSE
 
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF
+
 /* Define if you have the statvfs function.  */
 #undef HAVE_STATVFS
 
@@ -683,6 +716,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/poll.h> header file.  */
+#undef HAVE_SYS_POLL_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
diff --git a/Mac/Python/macgetcompiler.c b/Mac/Python/macgetcompiler.c
index e3d24b7..eb9c3c4 100644
--- a/Mac/Python/macgetcompiler.c
+++ b/Mac/Python/macgetcompiler.c
@@ -57,7 +57,13 @@ PERFORMANCE OF THIS SOFTWARE.
 #define TARGET_API " PPC"
 #endif
 
-#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD"]"
+#ifdef WITH_CYCLE_GC
+#define HASGC " GC"
+#else
+#define HASGC ""
+#endif
+
+#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD HASGC"]"
 #endif
 
 #ifdef MPW