94e658
diff -up Python-2.6.2/Modules/Setup.dist.rhconfig Python-2.6.2/Modules/Setup.dist
94e658
--- Python-2.6.2/Modules/Setup.dist.rhconfig	2008-11-27 05:15:12.000000000 -0500
94e658
+++ Python-2.6.2/Modules/Setup.dist	2010-01-25 21:11:01.508867242 -0500
94e658
@@ -152,7 +152,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # modules are to be built as shared libraries (see above for more
60b7a5
 # detail; also note that *static* reverses this effect):
60b7a5
 
60b7a5
-#*shared*
60b7a5
+*shared*
60b7a5
 
60b7a5
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
60b7a5
 # now incorporated in an optional module, configured in the Setup file
94e658
@@ -162,74 +162,74 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # it, depending on your system -- see the GNU readline instructions.
60b7a5
 # It's okay for this to be a shared library, too.
60b7a5
 
60b7a5
-#readline readline.c -lreadline -ltermcap
a7ef9c
+readline readline.c -lreadline -ltermcap
60b7a5
 
60b7a5
 
60b7a5
 # Modules that should always be present (non UNIX dependent):
60b7a5
 
60b7a5
-#array arraymodule.c	# array objects
60b7a5
-#cmath cmathmodule.c # -lm # complex math library functions
60b7a5
-#math mathmodule.c # -lm # math library functions, e.g. sin()
60b7a5
-#_struct _struct.c	# binary structure packing/unpacking
60b7a5
-#time timemodule.c # -lm # time operations and variables
60b7a5
-#operator operator.c	# operator.add() and similar goodies
60b7a5
-#_weakref _weakref.c	# basic weak reference support
60b7a5
-#_testcapi _testcapimodule.c    # Python C API test module
60b7a5
-#_random _randommodule.c	# Random number generator
a7ef9c
-#_collections _collectionsmodule.c # Container types
60b7a5
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
60b7a5
-#strop stropmodule.c		# String manipulations
59ba18
-#_functools _functoolsmodule.c	# Tools for working with functions and callable objects
60b7a5
+array arraymodule.c	# array objects
60b7a5
+cmath cmathmodule.c # -lm # complex math library functions
60b7a5
+math mathmodule.c # -lm # math library functions, e.g. sin()
60b7a5
+_struct _struct.c	# binary structure packing/unpacking
60b7a5
+time timemodule.c # -lm # time operations and variables
60b7a5
+operator operator.c	# operator.add() and similar goodies
60b7a5
+_weakref _weakref.c	# basic weak reference support
60b7a5
+_testcapi _testcapimodule.c    # Python C API test module
60b7a5
+_random _randommodule.c	# Random number generator
a7ef9c
+_collections _collectionsmodule.c # Container types
60b7a5
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
60b7a5
+strop stropmodule.c		# String manipulations
59ba18
+_functools _functoolsmodule.c	# Tools for working with functions and callable objects
94e658
 #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
94e658
 #_pickle _pickle.c	# pickle accelerator
94e658
 #datetime datetimemodule.c	# date/time type
94e658
-#_bisect _bisectmodule.c	# Bisection algorithms
59ba18
+_bisect _bisectmodule.c	# Bisection algorithms
60b7a5
 
60b7a5
-#unicodedata unicodedata.c    # static Unicode character database
60b7a5
+unicodedata unicodedata.c    # static Unicode character database
60b7a5
 
60b7a5
 # access to ISO C locale support
60b7a5
-#_locale _localemodule.c  # -lintl
60b7a5
+_locale _localemodule.c  # -lintl
60b7a5
 
60b7a5
 
60b7a5
 # Modules with some UNIX dependencies -- on by default:
60b7a5
 # (If you have a really backward UNIX, select and socket may not be
60b7a5
 # supported...)
60b7a5
 
60b7a5
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
60b7a5
-#spwd spwdmodule.c		# spwd(3) 
60b7a5
-#grp grpmodule.c		# grp(3)
60b7a5
-#select selectmodule.c	# select(2); not on ancient System V
60b7a5
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
60b7a5
+spwd spwdmodule.c		# spwd(3) 
60b7a5
+grp grpmodule.c		# grp(3)
60b7a5
+select selectmodule.c	# select(2); not on ancient System V
60b7a5
 
60b7a5
 # Memory-mapped files (also works on Win32).
60b7a5
-#mmap mmapmodule.c
60b7a5
+mmap mmapmodule.c
60b7a5
 
60b7a5
 # CSV file helper
60b7a5
-#_csv _csv.c
60b7a5
+_csv _csv.c
60b7a5
 
60b7a5
 # Socket module helper for socket(2)
60b7a5
-#_socket socketmodule.c
60b7a5
+_socket socketmodule.c
60b7a5
 
60b7a5
 # Socket module helper for SSL support; you must comment out the other
60b7a5
 # socket line above, and possibly edit the SSL variable:
60b7a5
 #SSL=/usr/local/ssl
60b7a5
-#_ssl _ssl.c \
60b7a5
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
60b7a5
-#	-L$(SSL)/lib -lssl -lcrypto
60b7a5
+_ssl _ssl.c \
60b7a5
+	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
60b7a5
+	-L$(SSL)/lib -lssl -lcrypto
60b7a5
 
60b7a5
 # The crypt module is now disabled by default because it breaks builds
60b7a5
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
60b7a5
 #
60b7a5
 # First, look at Setup.config; configure may have set this for you.
60b7a5
 
60b7a5
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
1e29b8
+crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
60b7a5
 
60b7a5
 
60b7a5
 # Some more UNIX dependent modules -- off by default, since these
60b7a5
 # are not supported by all UNIX systems:
60b7a5
 
60b7a5
-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
60b7a5
-#termios termios.c	# Steen Lumholt's termios module
60b7a5
-#resource resource.c	# Jeremy Hylton's rlimit interface
60b7a5
+nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
60b7a5
+termios termios.c	# Steen Lumholt's termios module
60b7a5
+resource resource.c	# Jeremy Hylton's rlimit interface
60b7a5
 
60b7a5
 
60b7a5
 # Multimedia modules -- off by default.
94e658
@@ -237,8 +237,8 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # #993173 says audioop works on 64-bit platforms, though.
60b7a5
 # These represent audio samples or images as strings:
60b7a5
 
60b7a5
-#audioop audioop.c	# Operations on audio samples
60b7a5
-#imageop imageop.c	# Operations on images
60b7a5
+audioop audioop.c	# Operations on audio samples
60b7a5
+imageop imageop.c	# Operations on images
60b7a5
 
60b7a5
 
60b7a5
 # Note that the _md5 and _sha modules are normally only built if the
94e658
@@ -248,14 +248,14 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
60b7a5
 # md5.c and md5.h are included here.
60b7a5
 
60b7a5
-#_md5 md5module.c md5.c
60b7a5
+_md5 md5module.c md5.c
60b7a5
 
60b7a5
 
a7ef9c
 # The _sha module implements the SHA checksum algorithms.
a7ef9c
 # (NIST's Secure Hash Algorithms.)
60b7a5
-#_sha shamodule.c
a7ef9c
-#_sha256 sha256module.c
a7ef9c
-#_sha512 sha512module.c
60b7a5
+_sha shamodule.c
a7ef9c
+_sha256 sha256module.c
a7ef9c
+_sha512 sha512module.c
60b7a5
 
60b7a5
 
60b7a5
 # SGI IRIX specific modules -- off by default.
94e658
@@ -302,12 +302,12 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # A Linux specific module -- off by default; this may also work on 
60b7a5
 # some *BSDs.
60b7a5
 
60b7a5
-#linuxaudiodev linuxaudiodev.c
60b7a5
+linuxaudiodev linuxaudiodev.c
60b7a5
 
60b7a5
 
60b7a5
 # George Neville-Neil's timing module:
60b7a5
 
60b7a5
-#timing timingmodule.c
60b7a5
+timing timingmodule.c
60b7a5
 
60b7a5
 
60b7a5
 # The _tkinter module.
94e658
@@ -322,7 +322,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # every system.
60b7a5
 
60b7a5
 # *** Always uncomment this (leave the leading underscore in!):
60b7a5
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
60b7a5
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
60b7a5
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
60b7a5
 #	-L/usr/local/lib \
60b7a5
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
94e658
@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # *** Or uncomment this for Solaris:
60b7a5
 #	-I/usr/openwin/include \
60b7a5
 # *** Uncomment and edit for Tix extension only:
60b7a5
-#	-DWITH_TIX -ltix8.1.8.2 \
60b7a5
+	-DWITH_TIX -ltix \
60b7a5
 # *** Uncomment and edit for BLT extension only:
60b7a5
 #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
60b7a5
 # *** Uncomment and edit for PIL (TkImaging) extension only:
94e658
@@ -341,7 +341,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # *** Uncomment and edit for TOGL extension only:
60b7a5
 #	-DWITH_TOGL togl.c \
60b7a5
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
60b7a5
-#	-ltk8.2 -ltcl8.2 \
60b7a5
+	-ltk -ltcl \
60b7a5
 # *** Uncomment and edit to reflect where your X11 libraries are:
60b7a5
 #	-L/usr/X11R6/lib \
60b7a5
 # *** Or uncomment this for Solaris:
94e658
@@ -351,7 +351,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # *** Uncomment for AIX:
60b7a5
 #	-lld \
60b7a5
 # *** Always uncomment this; X11 libraries to link with:
60b7a5
-#	-lX11
60b7a5
+	-lX11
60b7a5
 
60b7a5
 # Lance Ellinghaus's syslog module
60b7a5
 #syslog syslogmodule.c		# syslog daemon interface
94e658
@@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # it is a highly experimental and dangerous device for calling
60b7a5
 # *arbitrary* C functions in *arbitrary* shared libraries:
60b7a5
 
60b7a5
-#dl dlmodule.c
60b7a5
+dl dlmodule.c
60b7a5
 
60b7a5
 
60b7a5
 # Modules that provide persistent dictionary-like semantics.  You will
94e658
@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 #
60b7a5
 # First, look at Setup.config; configure may have set this for you.
60b7a5
 
60b7a5
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
59ba18
+gdbm gdbmmodule.c -lgdbm
60b7a5
 
60b7a5
 
60b7a5
 # Sleepycat Berkeley DB interface.
94e658
@@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear
94e658
 #
60b7a5
 # Edit the variables DB and DBLIBVERto point to the db top directory
60b7a5
 # and the subdirectory of PORT where you built it.
60b7a5
-#DB=/usr/local/BerkeleyDB.4.0
60b7a5
-#DBLIBVER=4.0
60b7a5
-#DBINC=$(DB)/include
60b7a5
-#DBLIB=$(DB)/lib
60b7a5
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
0495de
+DBLIBVER=4.7
60b7a5
+DBINC=/usr/include/db4
60b7a5
+DBLIB=/usr/lib
60b7a5
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
60b7a5
 
60b7a5
 # Historical Berkeley DB 1.85
60b7a5
 #
94e658
@@ -430,14 +429,14 @@ GLHACK=-Dclear=__GLclear
60b7a5
 
60b7a5
 
60b7a5
 # Helper module for various ascii-encoders
60b7a5
-#binascii binascii.c
60b7a5
+binascii binascii.c
60b7a5
 
60b7a5
 # Fred Drake's interface to the Python parser
60b7a5
-#parser parsermodule.c
60b7a5
+parser parsermodule.c
60b7a5
 
60b7a5
 # cStringIO and cPickle
60b7a5
-#cStringIO cStringIO.c
60b7a5
-#cPickle cPickle.c
60b7a5
+cStringIO cStringIO.c
60b7a5
+cPickle cPickle.c
60b7a5
 
60b7a5
 
60b7a5
 # Lee Busby's SIGFPE modules.
94e658
@@ -460,7 +459,7 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # Andrew Kuchling's zlib module.
60b7a5
 # This require zlib 1.1.3 (or later).
60b7a5
 # See http://www.gzip.org/zlib/
60b7a5
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
60b7a5
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
60b7a5
 
60b7a5
 # Interface to the Expat XML parser
60b7a5
 #
94e658
@@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear
60b7a5
 # Hye-Shik Chang's CJKCodecs
60b7a5
 
60b7a5
 # multibytecodec is required for all the other CJK codec modules
60b7a5
-#_multibytecodec cjkcodecs/multibytecodec.c
60b7a5
+_multibytecodec cjkcodecs/multibytecodec.c
60b7a5
 
60b7a5
-#_codecs_cn cjkcodecs/_codecs_cn.c
60b7a5
-#_codecs_hk cjkcodecs/_codecs_hk.c
60b7a5
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
60b7a5
-#_codecs_jp cjkcodecs/_codecs_jp.c
60b7a5
-#_codecs_kr cjkcodecs/_codecs_kr.c
60b7a5
-#_codecs_tw cjkcodecs/_codecs_tw.c
60b7a5
+_codecs_cn cjkcodecs/_codecs_cn.c
60b7a5
+_codecs_hk cjkcodecs/_codecs_hk.c
60b7a5
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
60b7a5
+_codecs_jp cjkcodecs/_codecs_jp.c
60b7a5
+_codecs_kr cjkcodecs/_codecs_kr.c
60b7a5
+_codecs_tw cjkcodecs/_codecs_tw.c
60b7a5
 
60b7a5
 # Example -- included for reference only:
60b7a5
 # xx xxmodule.c