--- python/dist/src/configure.in.orig	Wed Sep 25 13:56:37 2002
+++ python/dist/src/configure.in	Thu Sep 26 21:16:45 2002
@@ -80,7 +80,8 @@
 if test -z "$MACHDEP"
 then
 	ac_sys_system=`uname -s`
-	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
+	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
 		ac_sys_release=`uname -v`
 	else
 		ac_sys_release=`uname -r`
@@ -473,11 +474,17 @@
 	*)
 	    OPT="-O3 -Wall -Wstrict-prototypes";;
 	esac
+	case $ac_sys_system in
+	    SCO_SV*) OPT="$OPT -m486 -DSCO5";;
+	esac
 	;;
     *)
 	case $ac_sys_system in
 	OpenUNIX*|UnixWare*)
 	    OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
+	SCO_SV*)
+	    CFLAGS="$CFLAGS -belf"
+	    OPT="-belf -O -Ki486 -DSCO5";;
 	*)
 	    OPT="-O";;
 	esac
@@ -936,10 +943,14 @@
 		fi;;
 	OpenUNIX*|UnixWare*)
 		if test "$GCC" = "yes"
-		then LDSHARED="$(CC) -shared"
-		else LDSHARED="$(CC) -G"
+		then LDSHARED='$(CC) -shared'
+		else LDSHARED='$(CC) -G'
+		fi;;
+	SCO_SV*)
+		if test "$GCC" = "yes"
+		then LDSHARED='$(CC) -Wl,-G,-Bexport'
+		else LDSHARED="cc -G -belf -Wl,-Bexport"
 		fi;;
-	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
 	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
 	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
 	atheos*) LDSHARED="gcc -shared";;
@@ -969,7 +980,11 @@
 		then CCSHARED="-fPIC"
 		else CCSHARED="-KPIC"
 		fi;;
-	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+	SCO_SV*)
+		if test "$GCC" = "yes"
+		then CCSHARED="-fPIC"
+		else CCSHARED="-Kpic -belf"
+		fi;;
 	Monterey*) CCSHARED="-G";;
 	IRIX*/6*)  case $CC in
 		   *gcc*) CCSHARED="-shared";;
@@ -1007,7 +1022,11 @@
 		fi
 		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
 	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
-	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
+	SCO_SV*)
+		if test "$GCC" = "yes"
+		then LINKFORSHARED="-Wl,-Bexport"
+		else LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport"
+		fi;;
 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
 	FreeBSD*|NetBSD*|OpenBSD*) 
 		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
@@ -1603,6 +1622,7 @@
 	BeOS*) DYNLOADFILE="dynload_beos.o";;
 	hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
 	Darwin/*) DYNLOADFILE="dynload_next.o";;
+ 	SCO_SV*) DYNLOADFILE="dynload_shlib.o";;
 	atheos*) DYNLOADFILE="dynload_atheos.o";;
 	*)
 	# use dynload_shlib.c and dlopen() if we have it; otherwise stub
@@ -2340,7 +2360,21 @@
 echo "creating Setup.local"
 if test ! -f Modules/Setup.local
 then
-	echo "# Edit this file for local setup changes" >Modules/Setup.local
+	case $ac_sys_system/$ac_sys_release in
+		SCO_SV*) cat >Modules/Setup.local <<_EOF
+# Edit this file for local setup changes
+#
+# these modules need to be compiled in on SCO.
+# Dynamic loading them will fail.
+pwd pwdmodule.c		# pwd(3)
+grp grpmodule.c		# grp(3)
+_hotshot _hotshot.c
+resource resource.c
+_EOF
+			;;
+		*) echo "# Edit this file for local setup changes" \
+		    >Modules/Setup.local ;;
+	esac
 fi
 
 echo "creating Makefile"
--- python/dist/src/Lib/test/regrtest.py.orig	Wed Sep 25 09:28:06 2002
+++ python/dist/src/Lib/test/regrtest.py	Thu Sep 26 20:44:00 2002
@@ -587,7 +587,7 @@
         test_winreg
         test_winsound
         """,
-    'unixware5':
+    'unixware7':
         """
         test_al
         test_bsddb
@@ -607,6 +607,63 @@
         test_socketserver
         test_sunaudiodev
         test_sundry
+        test_unicode_file
+        test_winreg
+        test_winsound
+        """,
+    'openunix8':
+        """
+        test_al
+        test_bsddb
+        test_cd
+        test_cl
+        test_dl
+        test_gl
+        test_imgfile
+        test_largefile
+        test_linuxaudiodev
+        test_minidom
+        test_nis
+        test_ntpath
+        test_openpty
+        test_pyexpat
+        test_sax
+        test_socketserver
+        test_sunaudiodev
+        test_sundry
+        test_unicode_file
+        test_winreg
+        test_winsound
+        """,
+    'sco_sv3':
+        """
+        test_al
+        test_asynchat
+        test_bsddb
+        test_cd
+        test_cl
+        test_dl
+        test_fork1
+        test_gettext
+        test_gl
+        test_imgfile
+        test_largefile
+        test_linuxaudiodev
+        test_locale
+        test_minidom
+        test_nis
+        test_ntpath
+        test_openpty
+        test_pyexpat
+        test_queue
+        test_sax
+        test_socketserver
+        test_sunaudiodev
+        test_sundry
+        test_thread
+        test_threaded_import
+        test_threadedtempfile
+        test_threading
         test_unicode_file
         test_winreg
         test_winsound
--- python/dist/src/Modules/_cursesmodule.c.orig	Thu Aug  1 19:27:13 2002
+++ python/dist/src/Modules/_cursesmodule.c	Thu Sep 26 20:44:01 2002
@@ -124,7 +124,7 @@
 #include <term.h>
 #endif
 
-#if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun))
+#if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5))
 #define STRICT_SYSV_CURSES       /* Don't use ncurses extensions */
 typedef chtype attr_t;           /* No attr_t type is available */
 #endif
--- python/dist/src/Modules/_hotshot.c.orig	Wed Sep 25 09:28:37 2002
+++ python/dist/src/Modules/_hotshot.c	Thu Sep 26 20:44:01 2002
@@ -64,6 +64,8 @@
 #ifndef PATH_MAX
 #   ifdef MAX_PATH
 #       define PATH_MAX MAX_PATH
+#   elif defined (_POSIX_PATH_MAX)
+#       define PATH_MAX _POSIX_PATH_MAX
 #   else
 #       error "Need a defn. for PATH_MAX in _hotshot.c"
 #   endif