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