]>
Commit | Line | Data |
---|---|---|
99e69167 MT |
1 | diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dist |
2 | --- Python-2.7.1/Modules/Setup.dist.rhconfig 2010-08-21 07:40:30.000000000 -0400 | |
3 | +++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:47:12.111059967 -0500 | |
4 | @@ -153,7 +153,7 @@ GLHACK=-Dclear=__GLclear | |
5 | # modules are to be built as shared libraries (see above for more | |
6 | # detail; also note that *static* reverses this effect): | |
7 | ||
8 | -#*shared* | |
9 | +*shared* | |
10 | ||
11 | # GNU readline. Unlike previous Python incarnations, GNU readline is | |
12 | # now incorporated in an optional module, configured in the Setup file | |
13 | @@ -163,73 +163,73 @@ GLHACK=-Dclear=__GLclear | |
14 | # it, depending on your system -- see the GNU readline instructions. | |
15 | # It's okay for this to be a shared library, too. | |
16 | ||
17 | -#readline readline.c -lreadline -ltermcap | |
18 | +readline readline.c -lreadline -ltermcap | |
19 | ||
20 | ||
21 | # Modules that should always be present (non UNIX dependent): | |
22 | ||
23 | -#array arraymodule.c # array objects | |
24 | -#cmath cmathmodule.c _math.c # -lm # complex math library functions | |
25 | -#math mathmodule.c _math.c # -lm # math library functions, e.g. sin() | |
26 | -#_struct _struct.c # binary structure packing/unpacking | |
27 | -#time timemodule.c # -lm # time operations and variables | |
28 | -#operator operator.c # operator.add() and similar goodies | |
29 | -#_testcapi _testcapimodule.c # Python C API test module | |
30 | -#_random _randommodule.c # Random number generator | |
31 | -#_collections _collectionsmodule.c # Container types | |
32 | -#itertools itertoolsmodule.c # Functions creating iterators for efficient looping | |
33 | -#strop stropmodule.c # String manipulations | |
34 | -#_functools _functoolsmodule.c # Tools for working with functions and callable objects | |
35 | +array arraymodule.c # array objects | |
36 | +cmath cmathmodule.c _math.c # -lm # complex math library functions | |
37 | +math mathmodule.c _math.c # -lm # math library functions, e.g. sin() | |
38 | +_struct _struct.c # binary structure packing/unpacking | |
39 | +time timemodule.c # -lm # time operations and variables | |
40 | +operator operator.c # operator.add() and similar goodies | |
41 | +_testcapi _testcapimodule.c # Python C API test module | |
42 | +_random _randommodule.c # Random number generator | |
43 | +_collections _collectionsmodule.c # Container types | |
44 | +itertools itertoolsmodule.c # Functions creating iterators for efficient looping | |
45 | +strop stropmodule.c # String manipulations | |
46 | +_functools _functoolsmodule.c # Tools for working with functions and callable objects | |
47 | #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator | |
48 | #_pickle _pickle.c # pickle accelerator | |
49 | #datetime datetimemodule.c # date/time type | |
50 | -#_bisect _bisectmodule.c # Bisection algorithms | |
51 | +_bisect _bisectmodule.c # Bisection algorithms | |
52 | ||
53 | -#unicodedata unicodedata.c # static Unicode character database | |
54 | +unicodedata unicodedata.c # static Unicode character database | |
55 | ||
56 | # access to ISO C locale support | |
57 | -#_locale _localemodule.c # -lintl | |
58 | +_locale _localemodule.c # -lintl | |
59 | ||
60 | ||
61 | # Modules with some UNIX dependencies -- on by default: | |
62 | # (If you have a really backward UNIX, select and socket may not be | |
63 | # supported...) | |
64 | ||
65 | -#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) | |
66 | -#spwd spwdmodule.c # spwd(3) | |
67 | -#grp grpmodule.c # grp(3) | |
68 | -#select selectmodule.c # select(2); not on ancient System V | |
69 | +fcntl fcntlmodule.c # fcntl(2) and ioctl(2) | |
70 | +spwd spwdmodule.c # spwd(3) | |
71 | +grp grpmodule.c # grp(3) | |
72 | +select selectmodule.c # select(2); not on ancient System V | |
73 | ||
74 | # Memory-mapped files (also works on Win32). | |
75 | -#mmap mmapmodule.c | |
76 | +mmap mmapmodule.c | |
77 | ||
78 | # CSV file helper | |
79 | -#_csv _csv.c | |
80 | +_csv _csv.c | |
81 | ||
82 | # Socket module helper for socket(2) | |
83 | -#_socket socketmodule.c | |
84 | +_socket socketmodule.c | |
85 | ||
86 | # Socket module helper for SSL support; you must comment out the other | |
87 | # socket line above, and possibly edit the SSL variable: | |
88 | #SSL=/usr/local/ssl | |
89 | -#_ssl _ssl.c \ | |
90 | -# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ | |
91 | -# -L$(SSL)/lib -lssl -lcrypto | |
92 | +_ssl _ssl.c \ | |
93 | + -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ | |
94 | + -L$(SSL)/lib -lssl -lcrypto | |
95 | ||
96 | # The crypt module is now disabled by default because it breaks builds | |
97 | # on many systems (where -lcrypt is needed), e.g. Linux (I believe). | |
98 | # | |
99 | # First, look at Setup.config; configure may have set this for you. | |
100 | ||
101 | -#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems | |
102 | +crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems | |
103 | ||
104 | ||
105 | # Some more UNIX dependent modules -- off by default, since these | |
106 | # are not supported by all UNIX systems: | |
107 | ||
108 | -#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere | |
109 | -#termios termios.c # Steen Lumholt's termios module | |
110 | -#resource resource.c # Jeremy Hylton's rlimit interface | |
111 | +nis nismodule.c -lnsl # Sun yellow pages -- not everywhere | |
112 | +termios termios.c # Steen Lumholt's termios module | |
113 | +resource resource.c # Jeremy Hylton's rlimit interface | |
114 | ||
115 | ||
116 | # Multimedia modules -- off by default. | |
117 | @@ -237,8 +237,8 @@ GLHACK=-Dclear=__GLclear | |
118 | # #993173 says audioop works on 64-bit platforms, though. | |
119 | # These represent audio samples or images as strings: | |
120 | ||
121 | -#audioop audioop.c # Operations on audio samples | |
122 | -#imageop imageop.c # Operations on images | |
123 | +audioop audioop.c # Operations on audio samples | |
124 | +imageop imageop.c # Operations on images | |
125 | ||
126 | ||
127 | # Note that the _md5 and _sha modules are normally only built if the | |
128 | @@ -248,14 +248,14 @@ GLHACK=-Dclear=__GLclear | |
129 | # Message-Digest Algorithm, described in RFC 1321. The necessary files | |
130 | # md5.c and md5.h are included here. | |
131 | ||
132 | -#_md5 md5module.c md5.c | |
133 | +_md5 md5module.c md5.c | |
134 | ||
135 | ||
136 | # The _sha module implements the SHA checksum algorithms. | |
137 | # (NIST's Secure Hash Algorithms.) | |
138 | -#_sha shamodule.c | |
139 | -#_sha256 sha256module.c | |
140 | -#_sha512 sha512module.c | |
141 | +_sha shamodule.c | |
142 | +_sha256 sha256module.c | |
143 | +_sha512 sha512module.c | |
144 | ||
145 | ||
146 | # SGI IRIX specific modules -- off by default. | |
147 | @@ -302,12 +302,12 @@ GLHACK=-Dclear=__GLclear | |
148 | # A Linux specific module -- off by default; this may also work on | |
149 | # some *BSDs. | |
150 | ||
151 | -#linuxaudiodev linuxaudiodev.c | |
152 | +linuxaudiodev linuxaudiodev.c | |
153 | ||
154 | ||
155 | # George Neville-Neil's timing module: | |
156 | ||
157 | -#timing timingmodule.c | |
158 | +timing timingmodule.c | |
159 | ||
160 | ||
161 | # The _tkinter module. | |
162 | @@ -322,7 +322,7 @@ GLHACK=-Dclear=__GLclear | |
163 | # every system. | |
164 | ||
165 | # *** Always uncomment this (leave the leading underscore in!): | |
166 | -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ | |
167 | +_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ | |
168 | # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: | |
169 | # -L/usr/local/lib \ | |
170 | # *** Uncomment and edit to reflect where your Tcl/Tk headers are: | |
171 | @@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear | |
172 | # *** Or uncomment this for Solaris: | |
173 | # -I/usr/openwin/include \ | |
174 | # *** Uncomment and edit for Tix extension only: | |
175 | -# -DWITH_TIX -ltix8.1.8.2 \ | |
176 | + -DWITH_TIX -ltix \ | |
177 | # *** Uncomment and edit for BLT extension only: | |
178 | # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ | |
179 | # *** Uncomment and edit for PIL (TkImaging) extension only: | |
180 | @@ -341,7 +341,7 @@ GLHACK=-Dclear=__GLclear | |
181 | # *** Uncomment and edit for TOGL extension only: | |
182 | # -DWITH_TOGL togl.c \ | |
183 | # *** Uncomment and edit to reflect your Tcl/Tk versions: | |
184 | -# -ltk8.2 -ltcl8.2 \ | |
185 | + -ltk -ltcl \ | |
186 | # *** Uncomment and edit to reflect where your X11 libraries are: | |
187 | # -L/usr/X11R6/lib \ | |
188 | # *** Or uncomment this for Solaris: | |
189 | @@ -351,7 +351,7 @@ GLHACK=-Dclear=__GLclear | |
190 | # *** Uncomment for AIX: | |
191 | # -lld \ | |
192 | # *** Always uncomment this; X11 libraries to link with: | |
193 | -# -lX11 | |
194 | + -lX11 | |
195 | ||
196 | # Lance Ellinghaus's syslog module | |
197 | #syslog syslogmodule.c # syslog daemon interface | |
198 | @@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear | |
199 | # it is a highly experimental and dangerous device for calling | |
200 | # *arbitrary* C functions in *arbitrary* shared libraries: | |
201 | ||
202 | -#dl dlmodule.c | |
203 | +dl dlmodule.c | |
204 | ||
205 | ||
206 | # Modules that provide persistent dictionary-like semantics. You will | |
207 | @@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear | |
208 | # | |
209 | # First, look at Setup.config; configure may have set this for you. | |
210 | ||
211 | -#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm | |
212 | +gdbm gdbmmodule.c -lgdbm | |
213 | ||
214 | ||
215 | # Sleepycat Berkeley DB interface. | |
216 | @@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear | |
217 | # | |
218 | # Edit the variables DB and DBLIBVERto point to the db top directory | |
219 | # and the subdirectory of PORT where you built it. | |
220 | -#DB=/usr/local/BerkeleyDB.4.0 | |
221 | -#DBLIBVER=4.0 | |
222 | -#DBINC=$(DB)/include | |
223 | -#DBLIB=$(DB)/lib | |
224 | -#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) | |
225 | +DBLIBVER=4.7 | |
226 | +DBINC=/usr/include/db4 | |
227 | +DBLIB=/usr/lib | |
228 | +_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) | |
229 | ||
230 | # Historical Berkeley DB 1.85 | |
231 | # | |
232 | @@ -430,14 +429,14 @@ GLHACK=-Dclear=__GLclear | |
233 | ||
234 | ||
235 | # Helper module for various ascii-encoders | |
236 | -#binascii binascii.c | |
237 | +binascii binascii.c | |
238 | ||
239 | # Fred Drake's interface to the Python parser | |
240 | -#parser parsermodule.c | |
241 | +parser parsermodule.c | |
242 | ||
243 | # cStringIO and cPickle | |
244 | -#cStringIO cStringIO.c | |
245 | -#cPickle cPickle.c | |
246 | +cStringIO cStringIO.c | |
247 | +cPickle cPickle.c | |
248 | ||
249 | ||
250 | # Lee Busby's SIGFPE modules. | |
251 | @@ -460,7 +459,7 @@ GLHACK=-Dclear=__GLclear | |
252 | # Andrew Kuchling's zlib module. | |
253 | # This require zlib 1.1.3 (or later). | |
254 | # See http://www.gzip.org/zlib/ | |
255 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz | |
256 | +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz | |
257 | ||
258 | # Interface to the Expat XML parser | |
259 | # | |
260 | @@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear | |
261 | # Hye-Shik Chang's CJKCodecs | |
262 | ||
263 | # multibytecodec is required for all the other CJK codec modules | |
264 | -#_multibytecodec cjkcodecs/multibytecodec.c | |
265 | +_multibytecodec cjkcodecs/multibytecodec.c | |
266 | ||
267 | -#_codecs_cn cjkcodecs/_codecs_cn.c | |
268 | -#_codecs_hk cjkcodecs/_codecs_hk.c | |
269 | -#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c | |
270 | -#_codecs_jp cjkcodecs/_codecs_jp.c | |
271 | -#_codecs_kr cjkcodecs/_codecs_kr.c | |
272 | -#_codecs_tw cjkcodecs/_codecs_tw.c | |
273 | +_codecs_cn cjkcodecs/_codecs_cn.c | |
274 | +_codecs_hk cjkcodecs/_codecs_hk.c | |
275 | +_codecs_iso2022 cjkcodecs/_codecs_iso2022.c | |
276 | +_codecs_jp cjkcodecs/_codecs_jp.c | |
277 | +_codecs_kr cjkcodecs/_codecs_kr.c | |
278 | +_codecs_tw cjkcodecs/_codecs_tw.c | |
279 | ||
280 | # Example -- included for reference only: | |
281 | # xx xxmodule.c |