--- Python-2.3.3/Modules/Setup.dist.orig 2003-06-15 06:03:05.000000000 +0900 +++ Python-2.3.3/Modules/Setup.dist 2004-04-08 17:35:25.000000000 +0900 @@ -114,6 +114,9 @@ _sre _sre.c # Fredrik Lundh's new regular expressions _codecs _codecsmodule.c # access to the builtin codecs and codec registry +# This one seemed missing... +regex regexmodule.c regexpr.c + # The zipimport module is always imported at startup. Having it as a # builtin module avoids some bootstrapping problems and reduces overhead. zipimport zipimport.c @@ -147,7 +150,7 @@ # modules are to be built as shared libraries (see above for more # detail; also note that *static* reverses this effect): -#*shared* +*shared* # GNU readline. Unlike previous Python incarnations, GNU readline is # now incorporated in an optional module, configured in the Setup file @@ -157,40 +160,40 @@ # it, depending on your system -- see the GNU readline instructions. # It's okay for this to be a shared library, too. -#readline readline.c -lreadline -ltermcap +readline readline.c -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): -#array arraymodule.c # array objects -#cmath cmathmodule.c # -lm # complex math library functions -#math mathmodule.c # -lm # math library functions, e.g. sin() -#struct structmodule.c # binary structure packing/unpacking -#time timemodule.c # -lm # time operations and variables -#operator operator.c # operator.add() and similar goodies -#_weakref _weakref.c # basic weak reference support -#_testcapi _testcapimodule.c # Python C API test module +array arraymodule.c # array objects +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c # -lm # math library functions, e.g. sin() +struct structmodule.c # binary structure packing/unpacking +time timemodule.c # -lm # time operations and variables +operator operator.c # operator.add() and similar goodies +_weakref _weakref.c # basic weak reference support +_testcapi _testcapimodule.c # Python C API test module -#unicodedata unicodedata.c # static Unicode character database +unicodedata unicodedata.c # static Unicode character database # access to ISO C locale support -#_locale _localemodule.c # -lintl +_locale _localemodule.c # -lintl # Modules with some UNIX dependencies -- on by default: # (If you have a really backward UNIX, select and socket may not be # supported...) -#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) -#pwd pwdmodule.c # pwd(3) -#grp grpmodule.c # grp(3) -#select selectmodule.c # select(2); not on ancient System V +fcntl fcntlmodule.c # fcntl(2) and ioctl(2) +pwd pwdmodule.c # pwd(3) +grp grpmodule.c # grp(3) +select selectmodule.c # select(2); not on ancient System V # Memory-mapped files (also works on Win32). -#mmap mmapmodule.c +mmap mmapmodule.c # Dynamic readlines -#xreadlines xreadlinesmodule.c +xreadlines xreadlinesmodule.c # CSV file helper #_csv _csv.c @@ -200,46 +203,46 @@ # Socket module helper for SSL support; you must comment out the other # socket line above, and possibly edit the SSL variable: -#SSL=/usr/local/ssl -#_ssl _ssl.c \ -# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ -# -L$(SSL)/lib -lssl -lcrypto +SSL=/usr/local/ssl +_ssl _ssl.c \ + -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ + -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). # # First, look at Setup.config; configure may have set this for you. -#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems +crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere -#termios termios.c # Steen Lumholt's termios module -#resource resource.c # Jeremy Hylton's rlimit interface +nis nismodule.c -lnsl # Sun yellow pages -- not everywhere +termios termios.c # Steen Lumholt's termios module +resource resource.c # Jeremy Hylton's rlimit interface # Multimedia modules -- off by default. # These don't work for 64-bit platforms!!! # These represent audio samples or images as strings: -#audioop audioop.c # Operations on audio samples -#imageop imageop.c # Operations on images -#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) +audioop audioop.c # Operations on audio samples +imageop imageop.c # Operations on images +rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. -#md5 md5module.c md5c.c +md5 md5module.c md5c.c # The sha module implements the SHA checksum algorithm. # (NIST's Secure Hash Algorithm.) -#sha shamodule.c +sha shamodule.c # The mpz module interfaces to the GNU Multiple Precision library. @@ -256,6 +259,8 @@ #GMP=/ufs/guido/src/gmp #mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a +#GMP=/usr +#mpz mpzmodule.c -I$(GMP) $(GMP)/lib/libgmp.a # SGI IRIX specific modules -- off by default. @@ -302,7 +307,7 @@ # A Linux specific module -- off by default; this may also work on # some *BSDs. -#linuxaudiodev linuxaudiodev.c +linuxaudiodev linuxaudiodev.c # George Neville-Neil's timing module: @@ -322,28 +327,28 @@ # every system. # *** Always uncomment this (leave the leading underscore in!): -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ + _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: # -L/usr/local/lib \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: # -I/usr/local/include \ # *** Uncomment and edit to reflect where your X11 header files are: -# -I/usr/X11R6/include \ + -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ # *** Uncomment and edit for Tix extension only: -# -DWITH_TIX -ltix8.1.8.2 \ + -DWITH_TIX -ltix \ # *** Uncomment and edit for BLT extension only: -# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ +# -DWITH_BLT -lBLT2.4 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # (See http://www.pythonware.com/products/pil/ for more info) # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -# -ltk8.2 -ltcl8.2 \ + -ltk -ltcl \ # *** Uncomment and edit to reflect where your X11 libraries are: -# -L/usr/X11R6/lib \ + -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: @@ -351,12 +356,12 @@ # *** Uncomment for AIX: # -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 + -lX11 # Lance Ellinghaus's modules: -#rotor rotormodule.c # enigma-inspired encryption -#syslog syslogmodule.c # syslog daemon interface +rotor rotormodule.c # enigma-inspired encryption +syslog syslogmodule.c # syslog daemon interface # Curses support, requring the System V version of curses, often @@ -366,7 +371,7 @@ # # First, look at Setup.config; configure may have set this for you. -#_curses _cursesmodule.c -lcurses -ltermcap +_curses _cursesmodule.c -lcurses -ltermcap # Wrapper for the panel library that's part of ncurses and SYSV curses. #_curses_panel _curses_panel.c -lpanel -lncurses @@ -376,7 +381,7 @@ # it is a highly experimental and dangerous device for calling # *arbitrary* C functions in *arbitrary* shared libraries: -#dl dlmodule.c +dl dlmodule.c # Modules that provide persistent dictionary-like semantics. You will @@ -400,6 +405,7 @@ # First, look at Setup.config; configure may have set this for you. #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm +gdbm gdbmmodule.c -lgdbm # Sleepycat Berkeley DB interface. @@ -429,18 +435,18 @@ #DB=/depot/sundry/src/berkeley-db/db.1.85 #DBPORT=$(DB)/PORT/irix.5.3 #bsddb185 bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a - +bsddb bsddbmodule.c -I/usr/include/db4 -DHAVE_DB_185_H -L/lib -ldb-4.2 # Helper module for various ascii-encoders -#binascii binascii.c +binascii binascii.c # Fred Drake's interface to the Python parser -#parser parsermodule.c +parser parsermodule.c # cStringIO and cPickle -#cStringIO cStringIO.c -#cPickle cPickle.c +cStringIO cStringIO.c +cPickle cPickle.c # Lee Busby's SIGFPE modules. @@ -455,7 +461,7 @@ #fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm # For other systems: see instructions in fpectlmodule.c. -#fpectl fpectlmodule.c ... +fpectl fpectlmodule.c # Test module for fpectl. No extra libraries needed. #fpetest fpetestmodule.c @@ -463,7 +469,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). # See http://www.cdrom.com/pub/infozip/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz # Interface to the Expat XML parser #