Index: Makefile.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.in,v
retrieving revision 1.104
diff -c -r1.104 Makefile.in
*** Makefile.in 2000/09/24 19:57:18     1.104
--- Makefile.in 2000/10/08 23:27:51
***************
*** 333,338 ****
--- 333,339 ----
                cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
                export PATH; PATH="`pwd`:$$PATH"; \
                export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
+               export EXE; EXE="@EXE@"; \
                cd $(srcdir)/Lib/$(PLATDIR); ./regen
  
  # Install the include files
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.168
diff -c -r1.168 configure.in
*** configure.in        2000/10/07 16:21:27     1.168
--- configure.in        2000/10/08 23:27:53
***************
*** 506,511 ****
--- 506,514 ----
  # Minor variations in building a framework between NextStep versions 4 and 5
  AC_SUBST(LIBTOOL_CRUFT)
  case $ac_sys_system/$ac_sys_release in
+   Darwin/*)
+     ns_undef_sym='_environ'
+     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym" ;;
    next/4*)
      ns_undef_sym='__environ'
      LIBTOOL_CRUFT="-U $ns_undef_sym" ;;
***************
*** 581,587 ****
        DYNIX/ptx*) LDSHARED="ld -G";;
          Darwin/*|next/*) 
                if test "$ns_dyld"
!               then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
                else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
                fi
        if test "$with_next_framework" ; then
--- 584,594 ----
        DYNIX/ptx*) LDSHARED="ld -G";;
          Darwin/*|next/*) 
                if test "$ns_dyld"
!               then 
!                       if test "$ac_sys_system" = Darwin
!                       then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
!                       else LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
!                       fi
                else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
                fi
        if test "$with_next_framework" ; then
***************
*** 652,657 ****
--- 659,665 ----
        # crt1.o) gets erroneously defined as common, which breaks dynamic
        # loading of any modules which reference it in System.framework
        next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
+       Darwin/*) LINKFORSHARED="-framework System" ;;        
        SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
        ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
        FreeBSD*|NetBSD*) 
***************
*** 924,930 ****
        AIX*) DYNLOADFILE="dynload_aix.o";;
        BeOS*) DYNLOADFILE="dynload_beos.o";;
        hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
!       next/*) DYNLOADFILE="dynload_next.o";;
        *)
        # use dynload_shlib.c and dlopen() if we have it; otherwise stub
        # out any dynamic loading
--- 932,938 ----
        AIX*) DYNLOADFILE="dynload_aix.o";;
        BeOS*) DYNLOADFILE="dynload_beos.o";;
        hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
!       Darwin/*|next/*) DYNLOADFILE="dynload_next.o";;
        *)
        # use dynload_shlib.c and dlopen() if we have it; otherwise stub
        # out any dynamic loading
Index: Lib/plat-generic/regen
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-generic/regen,v
retrieving revision 1.2
diff -c -r1.2 regen
*** Lib/plat-generic/regen      1996/08/08 18:25:40     1.2
--- Lib/plat-generic/regen      2000/10/08 23:27:58
***************
*** 1,6 ****
  #! /bin/sh
  set -v
! python ../../Tools/scripts/h2py.py /usr/include/fcntl.h
! python ../../Tools/scripts/h2py.py /usr/include/sys/socket.h
! python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
! python ../../Tools/scripts/h2py.py /usr/include/termios.h
--- 1,6 ----
  #! /bin/sh
  set -v
! python$EXE ../../Tools/scripts/h2py.py /usr/include/fcntl.h
! python$EXE ../../Tools/scripts/h2py.py /usr/include/sys/socket.h
! python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
! python$EXE ../../Tools/scripts/h2py.py /usr/include/termios.h