1ae4dd
diff -up Python-3.1.1/Modules/Setup.dist.config Python-3.1.1/Modules/Setup.dist
1ae4dd
--- Python-3.1.1/Modules/Setup.dist.config	2009-06-04 05:30:30.000000000 -0400
1ae4dd
+++ Python-3.1.1/Modules/Setup.dist	2010-01-25 23:08:55.179858352 -0500
1ae4dd
@@ -141,7 +141,7 @@ _symtable symtablemodule.c
a3483f
 # modules are to be built as shared libraries (see above for more
a3483f
 # detail; also note that *static* reverses this effect):
a3483f
 
a3483f
-#*shared*
a3483f
+*shared*
a3483f
 
a3483f
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
a3483f
 # now incorporated in an optional module, configured in the Setup file
1ae4dd
@@ -151,71 +151,71 @@ _symtable symtablemodule.c
a3483f
 # it, depending on your system -- see the GNU readline instructions.
a3483f
 # It's okay for this to be a shared library, too.
a3483f
 
a3483f
-#readline readline.c -lreadline -ltermcap
a3483f
+readline readline.c -lreadline -ltermcap
a3483f
 
a3483f
 
a3483f
 # Modules that should always be present (non UNIX dependent):
a3483f
 
a3483f
-#array arraymodule.c	# array objects
a3483f
-#cmath cmathmodule.c # -lm # complex math library functions
a3483f
-#math mathmodule.c # -lm # math library functions, e.g. sin()
a3483f
-#_struct _struct.c	# binary structure packing/unpacking
a3483f
-#time timemodule.c # -lm # time operations and variables
a3483f
-#operator operator.c	# operator.add() and similar goodies
a3483f
-#_weakref _weakref.c	# basic weak reference support
a3483f
-#_testcapi _testcapimodule.c    # Python C API test module
a3483f
-#_random _randommodule.c	# Random number generator
a3483f
-#_collections _collectionsmodule.c # Container types
a3483f
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
a3483f
-#atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
a3483f
+array arraymodule.c	# array objects
a3483f
+cmath cmathmodule.c # -lm # complex math library functions
a3483f
+math mathmodule.c # -lm # math library functions, e.g. sin()
a3483f
+_struct _struct.c	# binary structure packing/unpacking
a3483f
+time timemodule.c # -lm # time operations and variables
a3483f
+operator operator.c	# operator.add() and similar goodies
a3483f
+_weakref _weakref.c	# basic weak reference support
a3483f
+_testcapi _testcapimodule.c    # Python C API test module
a3483f
+_random _randommodule.c	# Random number generator
a3483f
+_collections _collectionsmodule.c # Container types
a3483f
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
a3483f
+atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
1ae4dd
 #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
1ae4dd
-#_pickle _pickle.c	# pickle accelerator
a3483f
+_pickle _pickle.c	# pickle accelerator
1ae4dd
 #datetime datetimemodule.c	# date/time type
1ae4dd
-#_bisect _bisectmodule.c	# Bisection algorithms
1ae4dd
-#_heapq _heapqmodule.c	# Heap queue algorithm
a3483f
+_bisect _bisectmodule.c	# Bisection algorithms
a3483f
+_heapq _heapqmodule.c	# Heap queue algorithm
a3483f
 
a3483f
-#unicodedata unicodedata.c    # static Unicode character database
a3483f
+unicodedata unicodedata.c    # static Unicode character database
a3483f
 
a3483f
 
a3483f
 # Modules with some UNIX dependencies -- on by default:
a3483f
 # (If you have a really backward UNIX, select and socket may not be
a3483f
 # supported...)
a3483f
 
a3483f
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
a3483f
-#spwd spwdmodule.c		# spwd(3) 
a3483f
-#grp grpmodule.c		# grp(3)
a3483f
-#select selectmodule.c	# select(2); not on ancient System V
a3483f
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
a3483f
+spwd spwdmodule.c		# spwd(3) 
a3483f
+grp grpmodule.c		# grp(3)
a3483f
+select selectmodule.c	# select(2); not on ancient System V
a3483f
 
a3483f
 # Memory-mapped files (also works on Win32).
a3483f
-#mmap mmapmodule.c
a3483f
+mmap mmapmodule.c
a3483f
 
a3483f
 # CSV file helper
a3483f
-#_csv _csv.c
a3483f
+_csv _csv.c
a3483f
 
a3483f
 # Socket module helper for socket(2)
a3483f
-#_socket socketmodule.c
a3483f
+_socket socketmodule.c
a3483f
 
a3483f
 # Socket module helper for SSL support; you must comment out the other
a3483f
 # socket line above, and possibly edit the SSL variable:
a3483f
 #SSL=/usr/local/ssl
a3483f
-#_ssl _ssl.c \
a3483f
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
a3483f
-#	-L$(SSL)/lib -lssl -lcrypto
a3483f
+_ssl _ssl.c \
a3483f
+	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
a3483f
+	-L$(SSL)/lib -lssl -lcrypto
a3483f
 
a3483f
 # The crypt module is now disabled by default because it breaks builds
a3483f
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
a3483f
 #
a3483f
 # First, look at Setup.config; configure may have set this for you.
a3483f
 
a3483f
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
a3483f
+crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
a3483f
 
a3483f
 
a3483f
 # Some more UNIX dependent modules -- off by default, since these
a3483f
 # are not supported by all UNIX systems:
a3483f
 
a3483f
-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
a3483f
-#termios termios.c	# Steen Lumholt's termios module
a3483f
-#resource resource.c	# Jeremy Hylton's rlimit interface
a3483f
+nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
a3483f
+termios termios.c	# Steen Lumholt's termios module
a3483f
+resource resource.c	# Jeremy Hylton's rlimit interface
a3483f
 
a3483f
 
a3483f
 # Multimedia modules -- off by default.
1ae4dd
@@ -223,7 +223,7 @@ _symtable symtablemodule.c
a3483f
 # #993173 says audioop works on 64-bit platforms, though.
a3483f
 # These represent audio samples or images as strings:
a3483f
 
a3483f
-#audioop audioop.c	# Operations on audio samples
a3483f
+audioop audioop.c	# Operations on audio samples
a3483f
 
a3483f
 
a3483f
 # Note that the _md5 and _sha modules are normally only built if the
1ae4dd
@@ -238,9 +238,9 @@ _symtable symtablemodule.c
a3483f
 
a3483f
 # The _sha module implements the SHA checksum algorithms.
a3483f
 # (NIST's Secure Hash Algorithms.)
a3483f
-#_sha shamodule.c
a3483f
-#_sha256 sha256module.c
a3483f
-#_sha512 sha512module.c
a3483f
+_sha1 sha1module.c
a3483f
+_sha256 sha256module.c
a3483f
+_sha512 sha512module.c
a3483f
 
a3483f
 
a3483f
 # The _tkinter module.
1ae4dd
@@ -255,7 +255,7 @@ _symtable symtablemodule.c
a3483f
 # every system.
a3483f
 
a3483f
 # *** Always uncomment this (leave the leading underscore in!):
a3483f
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
a3483f
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
a3483f
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
a3483f
 #	-L/usr/local/lib \
a3483f
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
1ae4dd
@@ -265,7 +265,7 @@ _symtable symtablemodule.c
a3483f
 # *** Or uncomment this for Solaris:
a3483f
 #	-I/usr/openwin/include \
a3483f
 # *** Uncomment and edit for Tix extension only:
a3483f
-#	-DWITH_TIX -ltix8.1.8.2 \
a3483f
+	-DWITH_TIX -ltix \
a3483f
 # *** Uncomment and edit for BLT extension only:
a3483f
 #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
a3483f
 # *** Uncomment and edit for PIL (TkImaging) extension only:
1ae4dd
@@ -274,7 +274,7 @@ _symtable symtablemodule.c
a3483f
 # *** Uncomment and edit for TOGL extension only:
a3483f
 #	-DWITH_TOGL togl.c \
a3483f
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
a3483f
-#	-ltk8.2 -ltcl8.2 \
a3483f
+	-ltk -ltcl \
a3483f
 # *** Uncomment and edit to reflect where your X11 libraries are:
a3483f
 #	-L/usr/X11R6/lib \
a3483f
 # *** Or uncomment this for Solaris:
1ae4dd
@@ -284,10 +284,10 @@ _symtable symtablemodule.c
a3483f
 # *** Uncomment for AIX:
a3483f
 #	-lld \
a3483f
 # *** Always uncomment this; X11 libraries to link with:
a3483f
-#	-lX11
a3483f
+	-lX11
a3483f
 
a3483f
 # Lance Ellinghaus's syslog module
a3483f
-#syslog syslogmodule.c		# syslog daemon interface
a3483f
+syslog syslogmodule.c		# syslog daemon interface
a3483f
 
a3483f
 
a3483f
 # Curses support, requring the System V version of curses, often
1ae4dd
@@ -321,14 +321,14 @@ _symtable symtablemodule.c
a3483f
 #
a3483f
 # First, look at Setup.config; configure may have set this for you.
a3483f
 
a3483f
-#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
a3483f
+_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
a3483f
 
a3483f
 
a3483f
 # Helper module for various ascii-encoders
a3483f
-#binascii binascii.c
a3483f
+binascii binascii.c
a3483f
 
a3483f
 # Fred Drake's interface to the Python parser
a3483f
-#parser parsermodule.c
a3483f
+parser parsermodule.c
a3483f
 
a3483f
 
a3483f
 # Lee Busby's SIGFPE modules.
1ae4dd
@@ -351,7 +351,7 @@ _symtable symtablemodule.c
a3483f
 # Andrew Kuchling's zlib module.
a3483f
 # This require zlib 1.1.3 (or later).
a3483f
 # See http://www.gzip.org/zlib/
a3483f
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
a3483f
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
a3483f
 
a3483f
 # Interface to the Expat XML parser
a3483f
 #
1ae4dd
@@ -369,14 +369,14 @@ _symtable symtablemodule.c
a3483f
 # Hye-Shik Chang's CJKCodecs
a3483f
 
a3483f
 # multibytecodec is required for all the other CJK codec modules
a3483f
-#_multibytecodec cjkcodecs/multibytecodec.c
a3483f
+_multibytecodec cjkcodecs/multibytecodec.c
a3483f
 
a3483f
-#_codecs_cn cjkcodecs/_codecs_cn.c
a3483f
-#_codecs_hk cjkcodecs/_codecs_hk.c
a3483f
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
a3483f
-#_codecs_jp cjkcodecs/_codecs_jp.c
a3483f
-#_codecs_kr cjkcodecs/_codecs_kr.c
a3483f
-#_codecs_tw cjkcodecs/_codecs_tw.c
a3483f
+_codecs_cn cjkcodecs/_codecs_cn.c
a3483f
+_codecs_hk cjkcodecs/_codecs_hk.c
a3483f
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
a3483f
+_codecs_jp cjkcodecs/_codecs_jp.c
a3483f
+_codecs_kr cjkcodecs/_codecs_kr.c
a3483f
+_codecs_tw cjkcodecs/_codecs_tw.c
a3483f
 
a3483f
 # Example -- included for reference only:
a3483f
 # xx xxmodule.c