Fix three PyChecker-detected gotchas.
[python/dscho.git] / Misc / RPM / BeOpen-Python-Setup.patch
blobf9ae8051bdf3d3c80f3f79db0c22e6c7a88ec51b
1 *** /src/python/dist/src/Modules/Setup.in Mon Oct 9 10:40:21 2000
2 --- Modules/Setup.in Mon Oct 9 16:27:33 2000
3 ***************
4 *** 111,117 ****
5 # modules are to be built as shared libraries (see above for more
6 # detail; also note that *static* reverses this effect):
8 ! #*shared*
10 # GNU readline. Unlike previous Python incarnations, GNU readline is
11 # now incorporated in an optional module, configured in the Setup file
12 --- 111,117 ----
13 # modules are to be built as shared libraries (see above for more
14 # detail; also note that *static* reverses this effect):
16 ! *shared*
18 # GNU readline. Unlike previous Python incarnations, GNU readline is
19 # now incorporated in an optional module, configured in the Setup file
20 ***************
21 *** 121,127 ****
22 # it, depending on your system -- see the GNU readline instructions.
23 # It's okay for this to be a shared library, too.
25 ! #readline readline.c -lreadline -ltermcap
28 # Modules that should always be present (non UNIX dependent):
29 --- 121,127 ----
30 # it, depending on your system -- see the GNU readline instructions.
31 # It's okay for this to be a shared library, too.
33 ! readline readline.c -lreadline -ltermcap
36 # Modules that should always be present (non UNIX dependent):
37 ***************
38 *** 170,187 ****
39 # Some more UNIX dependent modules -- off by default, since these
40 # are not supported by all UNIX systems:
42 ! #nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
43 ! #termios termios.c # Steen Lumholt's termios module
44 ! #resource resource.c # Jeremy Hylton's rlimit interface
47 # Multimedia modules -- off by default.
48 # These don't work for 64-bit platforms!!!
49 # These represent audio samples or images as strings:
51 ! #audioop audioop.c # Operations on audio samples
52 ! #imageop imageop.c # Operations on images
53 ! #rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
56 # The md5 module implements the RSA Data Security, Inc. MD5
57 --- 170,187 ----
58 # Some more UNIX dependent modules -- off by default, since these
59 # are not supported by all UNIX systems:
61 ! nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
62 ! termios termios.c # Steen Lumholt's termios module
63 ! resource resource.c # Jeremy Hylton's rlimit interface
66 # Multimedia modules -- off by default.
67 # These don't work for 64-bit platforms!!!
68 # These represent audio samples or images as strings:
70 ! audioop audioop.c # Operations on audio samples
71 ! imageop imageop.c # Operations on images
72 ! rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
75 # The md5 module implements the RSA Data Security, Inc. MD5
76 ***************
77 *** 255,261 ****
79 # Linux specific modules -- off by default:
81 ! #linuxaudiodev linuxaudiodev.c
84 # George Neville-Neil's timing module:
85 --- 255,261 ----
87 # Linux specific modules -- off by default:
89 ! linuxaudiodev linuxaudiodev.c
92 # George Neville-Neil's timing module:
93 ***************
94 *** 311,317 ****
95 # Lance Ellinghaus's modules:
97 rotor rotormodule.c # enigma-inspired encryption
98 ! #syslog syslogmodule.c # syslog daemon interface
101 # Curses support, requring the System V version of curses, often
102 --- 311,317 ----
103 # Lance Ellinghaus's modules:
105 rotor rotormodule.c # enigma-inspired encryption
106 ! syslog syslogmodule.c # syslog daemon interface
109 # Curses support, requring the System V version of curses, often
110 ***************
111 *** 319,325 ****
112 # instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
113 # -L/usr/5lib before -lcurses).
115 ! #_curses _cursesmodule.c -lcurses -ltermcap
119 --- 319,325 ----
120 # instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
121 # -L/usr/5lib before -lcurses).
123 ! _curses _cursesmodule.c -lcurses -ltermcap
127 ***************
128 *** 349,355 ****
130 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
132 ! #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
135 # Berkeley DB interface.
136 --- 349,355 ----
138 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
140 ! gdbm gdbmmodule.c -I/usr/include -L/usr/lib -lgdbm
143 # Berkeley DB interface.
144 ***************
145 *** 406,412 ****
146 # Andrew Kuchling's zlib module.
147 # This require zlib 1.1.3 (or later).
148 # See http://www.cdrom.com/pub/infozip/zlib/
149 ! #zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
151 # Interface to the Expat XML parser
153 --- 406,412 ----
154 # Andrew Kuchling's zlib module.
155 # This require zlib 1.1.3 (or later).
156 # See http://www.cdrom.com/pub/infozip/zlib/
157 ! zlib zlibmodule.c -I/usr/include -L/usr/lib -lz
159 # Interface to the Expat XML parser
161 ***************
162 *** 427,434 ****
164 # ar cr libexpat.a xmltok/*.o xmlparse/*.o
166 ! #EXPAT_DIR=/usr/local/src/expat
167 ! #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat
170 # Example -- included for reference only:
171 --- 427,433 ----
173 # ar cr libexpat.a xmltok/*.o xmlparse/*.o
175 ! pyexpat pyexpat.c -I/usr/local/include/xmlparse -L/usr/local/lib -lexpat
178 # Example -- included for reference only: