]>
Commit | Line | Data |
---|---|---|
a5c25e62 JB |
1 | diff -Nur nspr-4.2.2/mozilla/nsprpub/configure nspr-4.2.2.b/mozilla/nsprpub/configure |
2 | --- nspr-4.2.2/mozilla/nsprpub/configure Thu Sep 19 02:16:14 2002 | |
3 | +++ nspr-4.2.2.b/mozilla/nsprpub/configure Thu Sep 26 14:46:21 2002 | |
4 | @@ -39,6 +39,9 @@ | |
5 | ac_help="$ac_help | |
6 | --enable-mdupdate Enable use of certain compilers' mdupdate feature" | |
7 | ac_help="$ac_help | |
8 | + --enable-macos-target=VER (default=10.1) | |
9 | + Set the minimum MacOS version needed at runtime" | |
10 | +ac_help="$ac_help | |
11 | --enable-strip Enable stripping of shared libs and programs" | |
12 | ac_help="$ac_help | |
13 | --with-pthreads Use system pthreads library as thread subsystem" | |
14 | @@ -614,7 +617,7 @@ | |
15 | fi | |
16 | ||
17 | echo $ac_n "checking host system type""... $ac_c" 1>&6 | |
18 | -echo "configure:618: checking host system type" >&5 | |
19 | +echo "configure:621: checking host system type" >&5 | |
20 | ||
21 | host_alias=$host | |
22 | case "$host_alias" in | |
23 | @@ -635,7 +638,7 @@ | |
24 | echo "$ac_t""$host" 1>&6 | |
25 | ||
26 | echo $ac_n "checking target system type""... $ac_c" 1>&6 | |
27 | -echo "configure:639: checking target system type" >&5 | |
28 | +echo "configure:642: checking target system type" >&5 | |
29 | ||
30 | target_alias=$target | |
31 | case "$target_alias" in | |
32 | @@ -653,7 +656,7 @@ | |
33 | echo "$ac_t""$target" 1>&6 | |
34 | ||
35 | echo $ac_n "checking build system type""... $ac_c" 1>&6 | |
36 | -echo "configure:657: checking build system type" >&5 | |
37 | +echo "configure:660: checking build system type" >&5 | |
38 | ||
39 | build_alias=$build | |
40 | case "$build_alias" in | |
41 | @@ -689,6 +692,7 @@ | |
42 | USE_CPLUS= | |
43 | USE_IPV6= | |
44 | USE_MDUPDATE= | |
45 | +MACOS_DEPLOYMENT_TARGET= | |
46 | _OPTIMIZE_FLAGS=-O | |
47 | _DEBUG_FLAGS=-g | |
48 | MOZ_DEBUG=1 | |
49 | @@ -719,7 +723,7 @@ | |
50 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
51 | set dummy $ac_prog; ac_word=$2 | |
52 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
53 | -echo "configure:723: checking for $ac_word" >&5 | |
54 | +echo "configure:727: checking for $ac_word" >&5 | |
55 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
56 | echo $ac_n "(cached) $ac_c" 1>&6 | |
57 | else | |
58 | @@ -907,6 +911,15 @@ | |
59 | fi | |
60 | ||
61 | ||
62 | +# Check whether --enable-macos-target or --disable-macos-target was given. | |
63 | +if test "${enable_macos_target+set}" = set; then | |
64 | + enableval="$enable_macos_target" | |
65 | + MACOS_DEPLOYMENT_TARGET_STR=$enableval | |
66 | +else | |
67 | + MACOS_DEPLOYMENT_TARGET_STR=10.1 | |
68 | +fi | |
69 | + | |
70 | + | |
71 | case "$target" in | |
72 | ||
73 | *-aix*) | |
74 | @@ -996,7 +1009,7 @@ | |
75 | # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. | |
76 | set dummy $WHOAMI whoami; ac_word=$2 | |
77 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
78 | -echo "configure:1000: checking for $ac_word" >&5 | |
79 | +echo "configure:1013: checking for $ac_word" >&5 | |
80 | if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then | |
81 | echo $ac_n "(cached) $ac_c" 1>&6 | |
82 | else | |
83 | @@ -1067,14 +1080,14 @@ | |
84 | _SAVE_LDFLAGS="$LDFLAGS" | |
85 | ||
86 | echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 | |
87 | -echo "configure:1071: checking for $host compiler" >&5 | |
88 | +echo "configure:1084: checking for $host compiler" >&5 | |
89 | if test -z "$HOST_CC"; then | |
90 | for ac_prog in gcc cc /usr/ucb/cc | |
91 | do | |
92 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
93 | set dummy $ac_prog; ac_word=$2 | |
94 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
95 | -echo "configure:1078: checking for $ac_word" >&5 | |
96 | +echo "configure:1091: checking for $ac_word" >&5 | |
97 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then | |
98 | echo $ac_n "(cached) $ac_c" 1>&6 | |
99 | else | |
100 | @@ -1121,16 +1134,16 @@ | |
101 | LDFLAGS="$HOST_LDFLAGS" | |
102 | ||
103 | echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 | |
104 | -echo "configure:1125: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | |
105 | +echo "configure:1138: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | |
106 | cat > conftest.$ac_ext <<EOF | |
107 | -#line 1127 "configure" | |
108 | +#line 1140 "configure" | |
109 | #include "confdefs.h" | |
110 | ||
111 | int main() { | |
112 | return(0); | |
113 | ; return 0; } | |
114 | EOF | |
115 | -if { (eval echo configure:1134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
116 | +if { (eval echo configure:1147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
117 | rm -rf conftest* | |
118 | ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 | |
119 | else | |
120 | @@ -1151,7 +1164,7 @@ | |
121 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
122 | set dummy $ac_prog; ac_word=$2 | |
123 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
124 | -echo "configure:1155: checking for $ac_word" >&5 | |
125 | +echo "configure:1168: checking for $ac_word" >&5 | |
126 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
127 | echo $ac_n "(cached) $ac_c" 1>&6 | |
128 | else | |
129 | @@ -1186,7 +1199,7 @@ | |
130 | # Extract the first word of "gcc", so it can be a program name with args. | |
131 | set dummy gcc; ac_word=$2 | |
132 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
133 | -echo "configure:1190: checking for $ac_word" >&5 | |
134 | +echo "configure:1203: checking for $ac_word" >&5 | |
135 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
136 | echo $ac_n "(cached) $ac_c" 1>&6 | |
137 | else | |
138 | @@ -1216,7 +1229,7 @@ | |
139 | # Extract the first word of "cc", so it can be a program name with args. | |
140 | set dummy cc; ac_word=$2 | |
141 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
142 | -echo "configure:1220: checking for $ac_word" >&5 | |
143 | +echo "configure:1233: checking for $ac_word" >&5 | |
144 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
145 | echo $ac_n "(cached) $ac_c" 1>&6 | |
146 | else | |
147 | @@ -1267,7 +1280,7 @@ | |
148 | # Extract the first word of "cl", so it can be a program name with args. | |
149 | set dummy cl; ac_word=$2 | |
150 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
151 | -echo "configure:1271: checking for $ac_word" >&5 | |
152 | +echo "configure:1284: checking for $ac_word" >&5 | |
153 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
154 | echo $ac_n "(cached) $ac_c" 1>&6 | |
155 | else | |
156 | @@ -1299,7 +1312,7 @@ | |
157 | fi | |
158 | ||
159 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
160 | -echo "configure:1303: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
161 | +echo "configure:1316: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
162 | ||
163 | ac_ext=c | |
164 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
165 | @@ -1310,12 +1323,12 @@ | |
166 | ||
167 | cat > conftest.$ac_ext << EOF | |
168 | ||
169 | -#line 1314 "configure" | |
170 | +#line 1327 "configure" | |
171 | #include "confdefs.h" | |
172 | ||
173 | main(){return(0);} | |
174 | EOF | |
175 | -if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
176 | +if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
177 | ac_cv_prog_cc_works=yes | |
178 | # If we can't run a trivial program, we are probably using a cross compiler. | |
179 | if (./conftest; exit) 2>/dev/null; then | |
180 | @@ -1341,12 +1354,12 @@ | |
181 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | |
182 | fi | |
183 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
184 | -echo "configure:1345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
185 | +echo "configure:1358: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
186 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
187 | cross_compiling=$ac_cv_prog_cc_cross | |
188 | ||
189 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
190 | -echo "configure:1350: checking whether we are using GNU C" >&5 | |
191 | +echo "configure:1363: checking whether we are using GNU C" >&5 | |
192 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
193 | echo $ac_n "(cached) $ac_c" 1>&6 | |
194 | else | |
195 | @@ -1355,7 +1368,7 @@ | |
196 | yes; | |
197 | #endif | |
198 | EOF | |
199 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
200 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
201 | ac_cv_prog_gcc=yes | |
202 | else | |
203 | ac_cv_prog_gcc=no | |
204 | @@ -1374,7 +1387,7 @@ | |
205 | ac_save_CFLAGS="$CFLAGS" | |
206 | CFLAGS= | |
207 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
208 | -echo "configure:1378: checking whether ${CC-cc} accepts -g" >&5 | |
209 | +echo "configure:1391: checking whether ${CC-cc} accepts -g" >&5 | |
210 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
211 | echo $ac_n "(cached) $ac_c" 1>&6 | |
212 | else | |
213 | @@ -1411,7 +1424,7 @@ | |
214 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
215 | set dummy $ac_prog; ac_word=$2 | |
216 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
217 | -echo "configure:1415: checking for $ac_word" >&5 | |
218 | +echo "configure:1428: checking for $ac_word" >&5 | |
219 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | |
220 | echo $ac_n "(cached) $ac_c" 1>&6 | |
221 | else | |
222 | @@ -1448,7 +1461,7 @@ | |
223 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
224 | set dummy $ac_prog; ac_word=$2 | |
225 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
226 | -echo "configure:1452: checking for $ac_word" >&5 | |
227 | +echo "configure:1465: checking for $ac_word" >&5 | |
228 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | |
229 | echo $ac_n "(cached) $ac_c" 1>&6 | |
230 | else | |
231 | @@ -1480,7 +1493,7 @@ | |
232 | ||
233 | ||
234 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
235 | -echo "configure:1484: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
236 | +echo "configure:1497: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
237 | ||
238 | ac_ext=C | |
239 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
240 | @@ -1491,12 +1504,12 @@ | |
241 | ||
242 | cat > conftest.$ac_ext << EOF | |
243 | ||
244 | -#line 1495 "configure" | |
245 | +#line 1508 "configure" | |
246 | #include "confdefs.h" | |
247 | ||
248 | int main(){return(0);} | |
249 | EOF | |
250 | -if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
251 | +if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
252 | ac_cv_prog_cxx_works=yes | |
253 | # If we can't run a trivial program, we are probably using a cross compiler. | |
254 | if (./conftest; exit) 2>/dev/null; then | |
255 | @@ -1522,12 +1535,12 @@ | |
256 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | |
257 | fi | |
258 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
259 | -echo "configure:1526: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
260 | +echo "configure:1539: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
261 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | |
262 | cross_compiling=$ac_cv_prog_cxx_cross | |
263 | ||
264 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | |
265 | -echo "configure:1531: checking whether we are using GNU C++" >&5 | |
266 | +echo "configure:1544: checking whether we are using GNU C++" >&5 | |
267 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | |
268 | echo $ac_n "(cached) $ac_c" 1>&6 | |
269 | else | |
270 | @@ -1536,7 +1549,7 @@ | |
271 | yes; | |
272 | #endif | |
273 | EOF | |
274 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
275 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
276 | ac_cv_prog_gxx=yes | |
277 | else | |
278 | ac_cv_prog_gxx=no | |
279 | @@ -1555,7 +1568,7 @@ | |
280 | ac_save_CXXFLAGS="$CXXFLAGS" | |
281 | CXXFLAGS= | |
282 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | |
283 | -echo "configure:1559: checking whether ${CXX-g++} accepts -g" >&5 | |
284 | +echo "configure:1572: checking whether ${CXX-g++} accepts -g" >&5 | |
285 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | |
286 | echo $ac_n "(cached) $ac_c" 1>&6 | |
287 | else | |
288 | @@ -1592,7 +1605,7 @@ | |
289 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
290 | set dummy $ac_prog; ac_word=$2 | |
291 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
292 | -echo "configure:1596: checking for $ac_word" >&5 | |
293 | +echo "configure:1609: checking for $ac_word" >&5 | |
294 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | |
295 | echo $ac_n "(cached) $ac_c" 1>&6 | |
296 | else | |
297 | @@ -1629,7 +1642,7 @@ | |
298 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
299 | set dummy $ac_prog; ac_word=$2 | |
300 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
301 | -echo "configure:1633: checking for $ac_word" >&5 | |
302 | +echo "configure:1646: checking for $ac_word" >&5 | |
303 | if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then | |
304 | echo $ac_n "(cached) $ac_c" 1>&6 | |
305 | else | |
306 | @@ -1666,7 +1679,7 @@ | |
307 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
308 | set dummy $ac_prog; ac_word=$2 | |
309 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
310 | -echo "configure:1670: checking for $ac_word" >&5 | |
311 | +echo "configure:1683: checking for $ac_word" >&5 | |
312 | if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then | |
313 | echo $ac_n "(cached) $ac_c" 1>&6 | |
314 | else | |
315 | @@ -1703,7 +1716,7 @@ | |
316 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
317 | set dummy $ac_prog; ac_word=$2 | |
318 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
319 | -echo "configure:1707: checking for $ac_word" >&5 | |
320 | +echo "configure:1720: checking for $ac_word" >&5 | |
321 | if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then | |
322 | echo $ac_n "(cached) $ac_c" 1>&6 | |
323 | else | |
324 | @@ -1740,7 +1753,7 @@ | |
325 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
326 | set dummy $ac_prog; ac_word=$2 | |
327 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
328 | -echo "configure:1744: checking for $ac_word" >&5 | |
329 | +echo "configure:1757: checking for $ac_word" >&5 | |
330 | if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then | |
331 | echo $ac_n "(cached) $ac_c" 1>&6 | |
332 | else | |
333 | @@ -1777,7 +1790,7 @@ | |
334 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
335 | set dummy $ac_prog; ac_word=$2 | |
336 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
337 | -echo "configure:1781: checking for $ac_word" >&5 | |
338 | +echo "configure:1794: checking for $ac_word" >&5 | |
339 | if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then | |
340 | echo $ac_n "(cached) $ac_c" 1>&6 | |
341 | else | |
342 | @@ -1814,7 +1827,7 @@ | |
343 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
344 | set dummy $ac_prog; ac_word=$2 | |
345 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
346 | -echo "configure:1818: checking for $ac_word" >&5 | |
347 | +echo "configure:1831: checking for $ac_word" >&5 | |
348 | if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then | |
349 | echo $ac_n "(cached) $ac_c" 1>&6 | |
350 | else | |
351 | @@ -1852,7 +1865,7 @@ | |
352 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
353 | set dummy $ac_prog; ac_word=$2 | |
354 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
355 | -echo "configure:1856: checking for $ac_word" >&5 | |
356 | +echo "configure:1869: checking for $ac_word" >&5 | |
357 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | |
358 | echo $ac_n "(cached) $ac_c" 1>&6 | |
359 | else | |
360 | @@ -1884,7 +1897,7 @@ | |
361 | ||
362 | ||
363 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
364 | -echo "configure:1888: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
365 | +echo "configure:1901: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
366 | ||
367 | ac_ext=C | |
368 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
369 | @@ -1895,12 +1908,12 @@ | |
370 | ||
371 | cat > conftest.$ac_ext << EOF | |
372 | ||
373 | -#line 1899 "configure" | |
374 | +#line 1912 "configure" | |
375 | #include "confdefs.h" | |
376 | ||
377 | int main(){return(0);} | |
378 | EOF | |
379 | -if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
380 | +if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
381 | ac_cv_prog_cxx_works=yes | |
382 | # If we can't run a trivial program, we are probably using a cross compiler. | |
383 | if (./conftest; exit) 2>/dev/null; then | |
384 | @@ -1926,12 +1939,12 @@ | |
385 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | |
386 | fi | |
387 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
388 | -echo "configure:1930: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
389 | +echo "configure:1943: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
390 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | |
391 | cross_compiling=$ac_cv_prog_cxx_cross | |
392 | ||
393 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | |
394 | -echo "configure:1935: checking whether we are using GNU C++" >&5 | |
395 | +echo "configure:1948: checking whether we are using GNU C++" >&5 | |
396 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | |
397 | echo $ac_n "(cached) $ac_c" 1>&6 | |
398 | else | |
399 | @@ -1940,7 +1953,7 @@ | |
400 | yes; | |
401 | #endif | |
402 | EOF | |
403 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
404 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
405 | ac_cv_prog_gxx=yes | |
406 | else | |
407 | ac_cv_prog_gxx=no | |
408 | @@ -1959,7 +1972,7 @@ | |
409 | ac_save_CXXFLAGS="$CXXFLAGS" | |
410 | CXXFLAGS= | |
411 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | |
412 | -echo "configure:1963: checking whether ${CXX-g++} accepts -g" >&5 | |
413 | +echo "configure:1976: checking whether ${CXX-g++} accepts -g" >&5 | |
414 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | |
415 | echo $ac_n "(cached) $ac_c" 1>&6 | |
416 | else | |
417 | @@ -1996,7 +2009,7 @@ | |
418 | # Extract the first word of "gcc", so it can be a program name with args. | |
419 | set dummy gcc; ac_word=$2 | |
420 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
421 | -echo "configure:2000: checking for $ac_word" >&5 | |
422 | +echo "configure:2013: checking for $ac_word" >&5 | |
423 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
424 | echo $ac_n "(cached) $ac_c" 1>&6 | |
425 | else | |
426 | @@ -2026,7 +2039,7 @@ | |
427 | # Extract the first word of "cc", so it can be a program name with args. | |
428 | set dummy cc; ac_word=$2 | |
429 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
430 | -echo "configure:2030: checking for $ac_word" >&5 | |
431 | +echo "configure:2043: checking for $ac_word" >&5 | |
432 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
433 | echo $ac_n "(cached) $ac_c" 1>&6 | |
434 | else | |
435 | @@ -2077,7 +2090,7 @@ | |
436 | # Extract the first word of "cl", so it can be a program name with args. | |
437 | set dummy cl; ac_word=$2 | |
438 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
439 | -echo "configure:2081: checking for $ac_word" >&5 | |
440 | +echo "configure:2094: checking for $ac_word" >&5 | |
441 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
442 | echo $ac_n "(cached) $ac_c" 1>&6 | |
443 | else | |
444 | @@ -2109,7 +2122,7 @@ | |
445 | fi | |
446 | ||
447 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
448 | -echo "configure:2113: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
449 | +echo "configure:2126: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
450 | ||
451 | ac_ext=c | |
452 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
453 | @@ -2120,12 +2133,12 @@ | |
454 | ||
455 | cat > conftest.$ac_ext << EOF | |
456 | ||
457 | -#line 2124 "configure" | |
458 | +#line 2137 "configure" | |
459 | #include "confdefs.h" | |
460 | ||
461 | main(){return(0);} | |
462 | EOF | |
463 | -if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
464 | +if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
465 | ac_cv_prog_cc_works=yes | |
466 | # If we can't run a trivial program, we are probably using a cross compiler. | |
467 | if (./conftest; exit) 2>/dev/null; then | |
468 | @@ -2151,12 +2164,12 @@ | |
469 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | |
470 | fi | |
471 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
472 | -echo "configure:2155: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
473 | +echo "configure:2168: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
474 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
475 | cross_compiling=$ac_cv_prog_cc_cross | |
476 | ||
477 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
478 | -echo "configure:2160: checking whether we are using GNU C" >&5 | |
479 | +echo "configure:2173: checking whether we are using GNU C" >&5 | |
480 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
481 | echo $ac_n "(cached) $ac_c" 1>&6 | |
482 | else | |
483 | @@ -2165,7 +2178,7 @@ | |
484 | yes; | |
485 | #endif | |
486 | EOF | |
487 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
488 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
489 | ac_cv_prog_gcc=yes | |
490 | else | |
491 | ac_cv_prog_gcc=no | |
492 | @@ -2184,7 +2197,7 @@ | |
493 | ac_save_CFLAGS="$CFLAGS" | |
494 | CFLAGS= | |
495 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
496 | -echo "configure:2188: checking whether ${CC-cc} accepts -g" >&5 | |
497 | +echo "configure:2201: checking whether ${CC-cc} accepts -g" >&5 | |
498 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
499 | echo $ac_n "(cached) $ac_c" 1>&6 | |
500 | else | |
501 | @@ -2217,7 +2230,7 @@ | |
502 | ||
503 | fi | |
504 | echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | |
505 | -echo "configure:2221: checking how to run the C preprocessor" >&5 | |
506 | +echo "configure:2234: checking how to run the C preprocessor" >&5 | |
507 | # On Suns, sometimes $CPP names a directory. | |
508 | if test -n "$CPP" && test -d "$CPP"; then | |
509 | CPP= | |
510 | @@ -2232,13 +2245,13 @@ | |
511 | # On the NeXT, cc -E runs the code through the compiler's parser, | |
512 | # not just through cpp. | |
513 | cat > conftest.$ac_ext <<EOF | |
514 | -#line 2236 "configure" | |
515 | +#line 2249 "configure" | |
516 | #include "confdefs.h" | |
517 | #include <assert.h> | |
518 | Syntax Error | |
519 | EOF | |
520 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
521 | -{ (eval echo configure:2242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
522 | +{ (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
523 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
524 | if test -z "$ac_err"; then | |
525 | : | |
526 | @@ -2249,13 +2262,13 @@ | |
527 | rm -rf conftest* | |
528 | CPP="${CC-cc} -E -traditional-cpp" | |
529 | cat > conftest.$ac_ext <<EOF | |
530 | -#line 2253 "configure" | |
531 | +#line 2266 "configure" | |
532 | #include "confdefs.h" | |
533 | #include <assert.h> | |
534 | Syntax Error | |
535 | EOF | |
536 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
537 | -{ (eval echo configure:2259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
538 | +{ (eval echo configure:2272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
539 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
540 | if test -z "$ac_err"; then | |
541 | : | |
542 | @@ -2266,13 +2279,13 @@ | |
543 | rm -rf conftest* | |
544 | CPP="${CC-cc} -nologo -E" | |
545 | cat > conftest.$ac_ext <<EOF | |
546 | -#line 2270 "configure" | |
547 | +#line 2283 "configure" | |
548 | #include "confdefs.h" | |
549 | #include <assert.h> | |
550 | Syntax Error | |
551 | EOF | |
552 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
553 | -{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
554 | +{ (eval echo configure:2289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
555 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
556 | if test -z "$ac_err"; then | |
557 | : | |
558 | @@ -2299,7 +2312,7 @@ | |
559 | # Extract the first word of "ranlib", so it can be a program name with args. | |
560 | set dummy ranlib; ac_word=$2 | |
561 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
562 | -echo "configure:2303: checking for $ac_word" >&5 | |
563 | +echo "configure:2316: checking for $ac_word" >&5 | |
564 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | |
565 | echo $ac_n "(cached) $ac_c" 1>&6 | |
566 | else | |
567 | @@ -2331,7 +2344,7 @@ | |
568 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
569 | set dummy $ac_prog; ac_word=$2 | |
570 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
571 | -echo "configure:2335: checking for $ac_word" >&5 | |
572 | +echo "configure:2348: checking for $ac_word" >&5 | |
573 | if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then | |
574 | echo $ac_n "(cached) $ac_c" 1>&6 | |
575 | else | |
576 | @@ -2372,7 +2385,7 @@ | |
577 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
578 | set dummy $ac_prog; ac_word=$2 | |
579 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
580 | -echo "configure:2376: checking for $ac_word" >&5 | |
581 | +echo "configure:2389: checking for $ac_word" >&5 | |
582 | if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then | |
583 | echo $ac_n "(cached) $ac_c" 1>&6 | |
584 | else | |
585 | @@ -2413,7 +2426,7 @@ | |
586 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
587 | set dummy $ac_prog; ac_word=$2 | |
588 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
589 | -echo "configure:2417: checking for $ac_word" >&5 | |
590 | +echo "configure:2430: checking for $ac_word" >&5 | |
591 | if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then | |
592 | echo $ac_n "(cached) $ac_c" 1>&6 | |
593 | else | |
594 | @@ -2454,7 +2467,7 @@ | |
595 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
596 | set dummy $ac_prog; ac_word=$2 | |
597 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
598 | -echo "configure:2458: checking for $ac_word" >&5 | |
599 | +echo "configure:2471: checking for $ac_word" >&5 | |
600 | if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then | |
601 | echo $ac_n "(cached) $ac_c" 1>&6 | |
602 | else | |
603 | @@ -2495,7 +2508,7 @@ | |
604 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
605 | set dummy $ac_prog; ac_word=$2 | |
606 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
607 | -echo "configure:2499: checking for $ac_word" >&5 | |
608 | +echo "configure:2512: checking for $ac_word" >&5 | |
609 | if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL'+set}'`\" = set"; then | |
610 | echo $ac_n "(cached) $ac_c" 1>&6 | |
611 | else | |
612 | @@ -2536,7 +2549,7 @@ | |
613 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
614 | set dummy $ac_prog; ac_word=$2 | |
615 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
616 | -echo "configure:2540: checking for $ac_word" >&5 | |
617 | +echo "configure:2553: checking for $ac_word" >&5 | |
618 | if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then | |
619 | echo $ac_n "(cached) $ac_c" 1>&6 | |
620 | else | |
621 | @@ -2598,7 +2611,7 @@ | |
622 | fi | |
623 | ||
624 | echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 | |
625 | -echo "configure:2602: checking for gcc -pipe support" >&5 | |
626 | +echo "configure:2615: checking for gcc -pipe support" >&5 | |
627 | if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then | |
628 | echo '#include <stdio.h>' > dummy-hello.c | |
629 | echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c | |
630 | @@ -2613,14 +2626,14 @@ | |
631 | _SAVE_CFLAGS=$CFLAGS | |
632 | CFLAGS="$CFLAGS -pipe" | |
633 | cat > conftest.$ac_ext <<EOF | |
634 | -#line 2617 "configure" | |
635 | +#line 2630 "configure" | |
636 | #include "confdefs.h" | |
637 | #include <stdio.h> | |
638 | int main() { | |
639 | printf("Hello World\n"); | |
640 | ; return 0; } | |
641 | EOF | |
642 | -if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
643 | +if { (eval echo configure:2637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
644 | rm -rf conftest* | |
645 | _res_gcc_pipe="yes" | |
646 | else | |
647 | @@ -2653,7 +2666,7 @@ | |
648 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
649 | set dummy $ac_prog; ac_word=$2 | |
650 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
651 | -echo "configure:2657: checking for $ac_word" >&5 | |
652 | +echo "configure:2670: checking for $ac_word" >&5 | |
653 | if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then | |
654 | echo $ac_n "(cached) $ac_c" 1>&6 | |
655 | else | |
656 | @@ -2886,17 +2899,17 @@ | |
657 | DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall' | |
658 | ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` | |
659 | echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 | |
660 | -echo "configure:2890: checking for sys/atomic_op.h" >&5 | |
661 | +echo "configure:2903: checking for sys/atomic_op.h" >&5 | |
662 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
663 | echo $ac_n "(cached) $ac_c" 1>&6 | |
664 | else | |
665 | cat > conftest.$ac_ext <<EOF | |
666 | -#line 2895 "configure" | |
667 | +#line 2908 "configure" | |
668 | #include "confdefs.h" | |
669 | #include <sys/atomic_op.h> | |
670 | EOF | |
671 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
672 | -{ (eval echo configure:2900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
673 | +{ (eval echo configure:2913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
674 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
675 | if test -z "$ac_err"; then | |
676 | rm -rf conftest* | |
677 | @@ -3052,7 +3065,7 @@ | |
678 | _DEBUG_FLAGS='-gdwarf-2 -O0' | |
679 | MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' | |
680 | echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 | |
681 | -echo "configure:3056: checking for gethostbyaddr in -lbind" >&5 | |
682 | +echo "configure:3069: checking for gethostbyaddr in -lbind" >&5 | |
683 | ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` | |
684 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
685 | echo $ac_n "(cached) $ac_c" 1>&6 | |
686 | @@ -3060,7 +3073,7 @@ | |
687 | ac_save_LIBS="$LIBS" | |
688 | LIBS="-lbind $LIBS" | |
689 | cat > conftest.$ac_ext <<EOF | |
690 | -#line 3064 "configure" | |
691 | +#line 3077 "configure" | |
692 | #include "confdefs.h" | |
693 | /* Override any gcc2 internal prototype to avoid an error. */ | |
694 | /* We use char because int might match the return type of a gcc2 | |
695 | @@ -3071,7 +3084,7 @@ | |
696 | gethostbyaddr() | |
697 | ; return 0; } | |
698 | EOF | |
699 | -if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
700 | +if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
701 | rm -rf conftest* | |
702 | eval "ac_cv_lib_$ac_lib_var=yes" | |
703 | else | |
704 | @@ -3174,7 +3187,7 @@ | |
705 | PR_MD_ASFILES=os_BSD_OS_386_2.s | |
706 | ;; | |
707 | ||
708 | - bsdi4.*) | |
709 | + bsdi4.* | bsdi5.*) | |
710 | cat >> confdefs.h <<\EOF | |
711 | #define _PR_SELECT_CONST_TIMEVAL 1 | |
712 | EOF | |
713 | @@ -3200,7 +3213,7 @@ | |
714 | DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)' | |
715 | STRIP="$STRIP -d" | |
716 | case "$target_os" in | |
717 | - bsdi4.2*) | |
718 | + bsdi4.2* | bsdi4.3* | bsdi5.*) | |
719 | cat >> confdefs.h <<\EOF | |
720 | #define _PR_HAVE_GETPROTO_R 1 | |
721 | EOF | |
722 | @@ -3274,6 +3287,22 @@ | |
723 | USE_PTHREADS=1 | |
724 | MDCPUCFG_H=_darwin.cfg | |
725 | PR_MD_CSRCS=darwin.c | |
726 | + | |
727 | + | |
728 | + MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` | |
729 | + MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` | |
730 | + MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` | |
731 | + if test -z "$MACOS_VERSION_MINOR"; then | |
732 | + MACOS_VERSION_MINOR=0 | |
733 | + fi | |
734 | + if test -z "$MACOS_VERSION_MICRO"; then | |
735 | + MACOS_VERSION_MICRO=0 | |
736 | + fi | |
737 | + MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` | |
738 | + cat >> confdefs.h <<EOF | |
739 | +#define MACOS_DEPLOYMENT_TARGET $MACOS_DEPLOYMENT_TARGET | |
740 | +EOF | |
741 | + | |
742 | ;; | |
743 | ||
744 | *-dgux*) | |
745 | @@ -3763,11 +3792,8 @@ | |
746 | ||
747 | MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@' | |
748 | else | |
749 | - case "$target" in | |
750 | - *-mingw*|*-cygwin*) | |
751 | - CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' | |
752 | - ;; | |
753 | - esac | |
754 | + topsrcdir=$srcdir | |
755 | + CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' | |
756 | CC='$(CYGWIN_WRAPPER) cl' | |
757 | CXX='$(CYGWIN_WRAPPER) cl' | |
758 | LD=link | |
759 | @@ -4208,17 +4234,17 @@ | |
760 | _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" | |
761 | ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` | |
762 | echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 | |
763 | -echo "configure:4212: checking for machine/builtins.h" >&5 | |
764 | +echo "configure:4238: checking for machine/builtins.h" >&5 | |
765 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
766 | echo $ac_n "(cached) $ac_c" 1>&6 | |
767 | else | |
768 | cat > conftest.$ac_ext <<EOF | |
769 | -#line 4217 "configure" | |
770 | +#line 4243 "configure" | |
771 | #include "confdefs.h" | |
772 | #include <machine/builtins.h> | |
773 | EOF | |
774 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
775 | -{ (eval echo configure:4222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
776 | +{ (eval echo configure:4248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
777 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
778 | if test -z "$ac_err"; then | |
779 | rm -rf conftest* | |
780 | @@ -4726,12 +4752,12 @@ | |
781 | if test -z "$SKIP_LIBRARY_CHECKS"; then | |
782 | ||
783 | echo $ac_n "checking for dlopen""... $ac_c" 1>&6 | |
784 | -echo "configure:4730: checking for dlopen" >&5 | |
785 | +echo "configure:4756: checking for dlopen" >&5 | |
786 | if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then | |
787 | echo $ac_n "(cached) $ac_c" 1>&6 | |
788 | else | |
789 | cat > conftest.$ac_ext <<EOF | |
790 | -#line 4735 "configure" | |
791 | +#line 4761 "configure" | |
792 | #include "confdefs.h" | |
793 | /* System header to define __stub macros and hopefully few prototypes, | |
794 | which can conflict with char dlopen(); below. */ | |
795 | @@ -4754,7 +4780,7 @@ | |
796 | ||
797 | ; return 0; } | |
798 | EOF | |
799 | -if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
800 | +if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
801 | rm -rf conftest* | |
802 | eval "ac_cv_func_dlopen=yes" | |
803 | else | |
804 | @@ -4773,7 +4799,7 @@ | |
805 | echo "$ac_t""no" 1>&6 | |
806 | ||
807 | echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | |
808 | -echo "configure:4777: checking for dlopen in -ldl" >&5 | |
809 | +echo "configure:4803: checking for dlopen in -ldl" >&5 | |
810 | ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` | |
811 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
812 | echo $ac_n "(cached) $ac_c" 1>&6 | |
813 | @@ -4781,7 +4807,7 @@ | |
814 | ac_save_LIBS="$LIBS" | |
815 | LIBS="-ldl $LIBS" | |
816 | cat > conftest.$ac_ext <<EOF | |
817 | -#line 4785 "configure" | |
818 | +#line 4811 "configure" | |
819 | #include "confdefs.h" | |
820 | /* Override any gcc2 internal prototype to avoid an error. */ | |
821 | /* We use char because int might match the return type of a gcc2 | |
822 | @@ -4792,7 +4818,7 @@ | |
823 | dlopen() | |
824 | ; return 0; } | |
825 | EOF | |
826 | -if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
827 | +if { (eval echo configure:4822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
828 | rm -rf conftest* | |
829 | eval "ac_cv_lib_$ac_lib_var=yes" | |
830 | else | |
831 | @@ -4820,13 +4846,13 @@ | |
832 | ||
833 | if test $ac_cv_prog_gcc = yes; then | |
834 | echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 | |
835 | -echo "configure:4824: checking whether ${CC-cc} needs -traditional" >&5 | |
836 | +echo "configure:4850: checking whether ${CC-cc} needs -traditional" >&5 | |
837 | if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then | |
838 | echo $ac_n "(cached) $ac_c" 1>&6 | |
839 | else | |
840 | ac_pattern="Autoconf.*'x'" | |
841 | cat > conftest.$ac_ext <<EOF | |
842 | -#line 4830 "configure" | |
843 | +#line 4856 "configure" | |
844 | #include "confdefs.h" | |
845 | #include <sgtty.h> | |
846 | Autoconf TIOCGETP | |
847 | @@ -4844,7 +4870,7 @@ | |
848 | ||
849 | if test $ac_cv_prog_gcc_traditional = no; then | |
850 | cat > conftest.$ac_ext <<EOF | |
851 | -#line 4848 "configure" | |
852 | +#line 4874 "configure" | |
853 | #include "confdefs.h" | |
854 | #include <termio.h> | |
855 | Autoconf TCGETA | |
856 | @@ -4868,12 +4894,12 @@ | |
857 | for ac_func in lchown strerror | |
858 | do | |
859 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
860 | -echo "configure:4872: checking for $ac_func" >&5 | |
861 | +echo "configure:4898: checking for $ac_func" >&5 | |
862 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
863 | echo $ac_n "(cached) $ac_c" 1>&6 | |
864 | else | |
865 | cat > conftest.$ac_ext <<EOF | |
866 | -#line 4877 "configure" | |
867 | +#line 4903 "configure" | |
868 | #include "confdefs.h" | |
869 | /* System header to define __stub macros and hopefully few prototypes, | |
870 | which can conflict with char $ac_func(); below. */ | |
871 | @@ -4896,7 +4922,7 @@ | |
872 | ||
873 | ; return 0; } | |
874 | EOF | |
875 | -if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
876 | +if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
877 | rm -rf conftest* | |
878 | eval "ac_cv_func_$ac_func=yes" | |
879 | else | |
880 | @@ -4935,7 +4961,7 @@ | |
881 | if test -z "$GNU_CC"; then | |
882 | ||
883 | echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 | |
884 | -echo "configure:4939: checking for +Olit support" >&5 | |
885 | +echo "configure:4965: checking for +Olit support" >&5 | |
886 | if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then | |
887 | echo $ac_n "(cached) $ac_c" 1>&6 | |
888 | else | |
889 | @@ -4969,7 +4995,7 @@ | |
890 | ||
891 | ||
892 | echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 | |
893 | -echo "configure:4973: checking for pthread_create in -lpthreads" >&5 | |
894 | +echo "configure:4999: checking for pthread_create in -lpthreads" >&5 | |
895 | echo " | |
896 | #include <pthread.h> | |
897 | void *foo(void *v) { return v; } | |
898 | @@ -4991,7 +5017,7 @@ | |
899 | echo "$ac_t""no" 1>&6 | |
900 | ||
901 | echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 | |
902 | -echo "configure:4995: checking for pthread_create in -lpthread" >&5 | |
903 | +echo "configure:5021: checking for pthread_create in -lpthread" >&5 | |
904 | echo " | |
905 | #include <pthread.h> | |
906 | void *foo(void *v) { return v; } | |
907 | @@ -5013,7 +5039,7 @@ | |
908 | echo "$ac_t""no" 1>&6 | |
909 | ||
910 | echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 | |
911 | -echo "configure:5017: checking for pthread_create in -lc_r" >&5 | |
912 | +echo "configure:5043: checking for pthread_create in -lc_r" >&5 | |
913 | echo " | |
914 | #include <pthread.h> | |
915 | void *foo(void *v) { return v; } | |
916 | @@ -5035,7 +5061,7 @@ | |
917 | echo "$ac_t""no" 1>&6 | |
918 | ||
919 | echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 | |
920 | -echo "configure:5039: checking for pthread_create in -lc" >&5 | |
921 | +echo "configure:5065: checking for pthread_create in -lc" >&5 | |
922 | echo " | |
923 | #include <pthread.h> | |
924 | void *foo(void *v) { return v; } | |
925 | @@ -5187,7 +5213,7 @@ | |
926 | rm -f conftest* | |
927 | ac_cv_have_dash_pthread=no | |
928 | echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 | |
929 | -echo "configure:5191: checking whether ${CC-cc} accepts -pthread" >&5 | |
930 | +echo "configure:5217: checking whether ${CC-cc} accepts -pthread" >&5 | |
931 | echo 'int main() { return 0; }' | cat > conftest.c | |
932 | ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 | |
933 | if test $? -eq 0; then | |
934 | @@ -5210,7 +5236,7 @@ | |
935 | ac_cv_have_dash_pthreads=no | |
936 | if test "$ac_cv_have_dash_pthread" = "no"; then | |
937 | echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 | |
938 | -echo "configure:5214: checking whether ${CC-cc} accepts -pthreads" >&5 | |
939 | +echo "configure:5240: checking whether ${CC-cc} accepts -pthreads" >&5 | |
940 | echo 'int main() { return 0; }' | cat > conftest.c | |
941 | ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 | |
942 | if test $? -eq 0; then | |
943 | @@ -5581,6 +5607,7 @@ | |
944 | ||
945 | ||
946 | ||
947 | + | |
948 | MAKEFILES=" | |
949 | Makefile | |
950 | config/Makefile | |
951 | @@ -5841,6 +5868,7 @@ | |
952 | s%@OS_ARCH@%$OS_ARCH%g | |
953 | s%@OS_RELEASE@%$OS_RELEASE%g | |
954 | s%@OS_TEST@%$OS_TEST%g | |
955 | +s%@MACOS_DEPLOYMENT_TARGET@%$MACOS_DEPLOYMENT_TARGET%g | |
956 | s%@DEFINES@%$DEFINES%g | |
957 | s%@AR_FLAGS@%$AR_FLAGS%g | |
958 | s%@ASFLAGS@%$ASFLAGS%g | |
959 | diff -Nur nspr-4.2.2/mozilla/nsprpub/configure.in nspr-4.2.2.b/mozilla/nsprpub/configure.in | |
960 | --- nspr-4.2.2/mozilla/nsprpub/configure.in Thu Sep 19 02:16:13 2002 | |
961 | +++ nspr-4.2.2.b/mozilla/nsprpub/configure.in Thu Sep 26 14:46:25 2002 | |
962 | @@ -55,6 +55,7 @@ | |
963 | USE_CPLUS= | |
964 | USE_IPV6= | |
965 | USE_MDUPDATE= | |
966 | +MACOS_DEPLOYMENT_TARGET= | |
967 | _OPTIMIZE_FLAGS=-O | |
968 | _DEBUG_FLAGS=-g | |
969 | MOZ_DEBUG=1 | |
970 | @@ -215,6 +216,12 @@ | |
971 | USE_MDUPDATE=1 | |
972 | fi ]) | |
973 | ||
974 | +AC_ARG_ENABLE(macos-target, | |
975 | + [ --enable-macos-target=VER (default=10.1) | |
976 | + Set the minimum MacOS version needed at runtime], | |
977 | + [MACOS_DEPLOYMENT_TARGET_STR=$enableval], | |
978 | + [MACOS_DEPLOYMENT_TARGET_STR=10.1]) | |
979 | + | |
980 | dnl ======================================================== | |
981 | dnl = | |
982 | dnl = Set the threading model | |
983 | @@ -813,7 +820,7 @@ | |
984 | PR_MD_ASFILES=os_BSD_OS_386_2.s | |
985 | ;; | |
986 | ||
987 | - bsdi4.*) | |
988 | + bsdi4.* | bsdi5.*) | |
989 | AC_DEFINE(_PR_SELECT_CONST_TIMEVAL) | |
990 | AC_DEFINE(_PR_BSDI_JMPBUF_IS_STRUCT) | |
991 | AC_DEFINE(HAVE_DLL) | |
992 | @@ -824,7 +831,7 @@ | |
993 | DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)' | |
994 | STRIP="$STRIP -d" | |
995 | case "$target_os" in | |
996 | - bsdi4.2*) | |
997 | + bsdi4.2* | bsdi4.3* | bsdi5.*) | |
998 | AC_DEFINE(_PR_HAVE_GETPROTO_R) | |
999 | AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER) | |
1000 | ;; | |
1001 | @@ -862,6 +869,22 @@ | |
1002 | USE_PTHREADS=1 | |
1003 | MDCPUCFG_H=_darwin.cfg | |
1004 | PR_MD_CSRCS=darwin.c | |
1005 | + | |
1006 | + dnl The C preprocessor can only handle integers in comparisons, so | |
1007 | + dnl convert the version to the form AABBCC where AA=major release, | |
1008 | + dnl BB=minor release, and CC=point/micro release. | |
1009 | + | |
1010 | + MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` | |
1011 | + MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` | |
1012 | + MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` | |
1013 | + if test -z "$MACOS_VERSION_MINOR"; then | |
1014 | + MACOS_VERSION_MINOR=0 | |
1015 | + fi | |
1016 | + if test -z "$MACOS_VERSION_MICRO"; then | |
1017 | + MACOS_VERSION_MICRO=0 | |
1018 | + fi | |
1019 | + MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` | |
1020 | + AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET) | |
1021 | ;; | |
1022 | ||
1023 | *-dgux*) | |
1024 | @@ -1187,11 +1210,8 @@ | |
1025 | AC_DEFINE(NONAMELESSUNION) | |
1026 | MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@' | |
1027 | else | |
1028 | - case "$target" in | |
1029 | - *-mingw*|*-cygwin*) | |
1030 | - CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' | |
1031 | - ;; | |
1032 | - esac | |
1033 | + topsrcdir=$srcdir | |
1034 | + CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' | |
1035 | CC='$(CYGWIN_WRAPPER) cl' | |
1036 | CXX='$(CYGWIN_WRAPPER) cl' | |
1037 | LD=link | |
1038 | @@ -2335,6 +2355,7 @@ | |
1039 | AC_SUBST(OS_ARCH) | |
1040 | AC_SUBST(OS_RELEASE) | |
1041 | AC_SUBST(OS_TEST) | |
1042 | +AC_SUBST(MACOS_DEPLOYMENT_TARGET) | |
1043 | ||
1044 | AC_SUBST(DEFINES) | |
1045 | AC_SUBST(DEFS) | |
1046 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/include/md/_bsdi.h nspr-4.2.2.b/mozilla/nsprpub/pr/include/md/_bsdi.h | |
1047 | --- nspr-4.2.2/mozilla/nsprpub/pr/include/md/_bsdi.h Tue Jun 20 23:22:09 2000 | |
1048 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/include/md/_bsdi.h Thu Sep 12 16:53:38 2002 | |
1049 | @@ -39,6 +39,8 @@ | |
1050 | * Internal configuration macros | |
1051 | */ | |
1052 | ||
1053 | +#include <sys/param.h> /* for _BSDI_VERSION */ | |
1054 | + | |
1055 | #define PR_LINKER_ARCH "bsdi" | |
1056 | #define _PR_SI_SYSNAME "BSDI" | |
1057 | #if defined(__i386__) | |
1058 | @@ -61,6 +63,14 @@ | |
1059 | ||
1060 | #define USE_SETJMP | |
1061 | ||
1062 | +/* BSD/OS 4.3 and newer all have IPv6 support */ | |
1063 | +#if _BSDI_VERSION >= 200105 | |
1064 | +#define _PR_INET6 | |
1065 | +#define _PR_HAVE_GETIPNODEBYNAME | |
1066 | +#define _PR_HAVE_GETIPNODEBYADDR | |
1067 | +#define _PR_INET6_PROBE | |
1068 | +#endif | |
1069 | + | |
1070 | #ifndef _PR_PTHREADS | |
1071 | ||
1072 | #include <setjmp.h> | |
1073 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/include/prtypes.h nspr-4.2.2.b/mozilla/nsprpub/pr/include/prtypes.h | |
1074 | --- nspr-4.2.2/mozilla/nsprpub/pr/include/prtypes.h Sun Feb 3 05:34:50 2002 | |
1075 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/include/prtypes.h Wed Sep 18 16:20:01 2002 | |
1076 | @@ -280,6 +280,18 @@ | |
1077 | #endif | |
1078 | ||
1079 | /************************************************************************ | |
1080 | + * MACROS: PR_INT8_MAX | |
1081 | + * PR_INT8_MIN | |
1082 | + * PR_UINT8_MAX | |
1083 | + * DESCRIPTION: | |
1084 | + * The maximum and minimum values of a PRInt8 or PRUint8. | |
1085 | +************************************************************************/ | |
1086 | + | |
1087 | +#define PR_INT8_MAX 127 | |
1088 | +#define PR_INT8_MIN (-128) | |
1089 | +#define PR_UINT8_MAX 255U | |
1090 | + | |
1091 | +/************************************************************************ | |
1092 | ** TYPES: PRUint16 | |
1093 | ** PRInt16 | |
1094 | ** DESCRIPTION: | |
1095 | @@ -293,6 +305,18 @@ | |
1096 | #endif | |
1097 | ||
1098 | /************************************************************************ | |
1099 | + * MACROS: PR_INT16_MAX | |
1100 | + * PR_INT16_MIN | |
1101 | + * PR_UINT16_MAX | |
1102 | + * DESCRIPTION: | |
1103 | + * The maximum and minimum values of a PRInt16 or PRUint16. | |
1104 | +************************************************************************/ | |
1105 | + | |
1106 | +#define PR_INT16_MAX 32767 | |
1107 | +#define PR_INT16_MIN (-32768) | |
1108 | +#define PR_UINT16_MAX 65535U | |
1109 | + | |
1110 | +/************************************************************************ | |
1111 | ** TYPES: PRUint32 | |
1112 | ** PRInt32 | |
1113 | ** DESCRIPTION: | |
1114 | @@ -313,6 +337,18 @@ | |
1115 | #endif | |
1116 | ||
1117 | /************************************************************************ | |
1118 | + * MACROS: PR_INT32_MAX | |
1119 | + * PR_INT32_MIN | |
1120 | + * PR_UINT32_MAX | |
1121 | + * DESCRIPTION: | |
1122 | + * The maximum and minimum values of a PRInt32 or PRUint32. | |
1123 | +************************************************************************/ | |
1124 | + | |
1125 | +#define PR_INT32_MAX PR_INT32(2147483647) | |
1126 | +#define PR_INT32_MIN (-PR_INT32_MAX - 1) | |
1127 | +#define PR_UINT32_MAX PR_UINT32(4294967295) | |
1128 | + | |
1129 | +/************************************************************************ | |
1130 | ** TYPES: PRUint64 | |
1131 | ** PRInt64 | |
1132 | ** DESCRIPTION: | |
1133 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/beos/bfile.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/beos/bfile.c | |
1134 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/md/beos/bfile.c Wed Jul 17 08:04:41 2002 | |
1135 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/beos/bfile.c Tue Sep 24 16:20:58 2002 | |
1136 | @@ -673,6 +673,10 @@ | |
1137 | } | |
1138 | } | |
1139 | } | |
1140 | + else | |
1141 | + { | |
1142 | + pd->out_flags = 0; | |
1143 | + } | |
1144 | } | |
1145 | ||
1146 | if (0 != ready) return ready; /* no need to block */ | |
1147 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/os2/os2poll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/os2/os2poll.c | |
1148 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/md/os2/os2poll.c Fri Jan 18 02:27:19 2002 | |
1149 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/os2/os2poll.c Tue Sep 24 16:21:00 2002 | |
1150 | @@ -214,6 +214,10 @@ | |
1151 | } | |
1152 | } | |
1153 | } | |
1154 | + else | |
1155 | + { | |
1156 | + pd->out_flags = 0; | |
1157 | + } | |
1158 | } | |
1159 | ||
1160 | if (0 != ready) | |
1161 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/unix/uxpoll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/unix/uxpoll.c | |
1162 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/md/unix/uxpoll.c Tue Jun 20 23:33:25 2000 | |
1163 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/unix/uxpoll.c Tue Sep 24 16:21:02 2002 | |
1164 | @@ -173,6 +173,7 @@ | |
1165 | { | |
1166 | /* make poll() ignore this entry */ | |
1167 | syspoll[index].fd = -1; | |
1168 | + pds[index].out_flags = 0; | |
1169 | } | |
1170 | } | |
1171 | ||
1172 | @@ -384,6 +385,10 @@ | |
1173 | } | |
1174 | } | |
1175 | } | |
1176 | + else | |
1177 | + { | |
1178 | + pd->out_flags = 0; | |
1179 | + } | |
1180 | } | |
1181 | ||
1182 | if (0 != ready) return ready; /* no need to block */ | |
1183 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/windows/w32poll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/windows/w32poll.c | |
1184 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/md/windows/w32poll.c Tue Jun 20 23:34:58 2000 | |
1185 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/windows/w32poll.c Tue Sep 24 16:21:04 2002 | |
1186 | @@ -223,6 +223,10 @@ | |
1187 | } | |
1188 | } | |
1189 | } | |
1190 | + else | |
1191 | + { | |
1192 | + pd->out_flags = 0; | |
1193 | + } | |
1194 | } | |
1195 | ||
1196 | if (0 != ready) return ready; /* no need to block */ | |
1197 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/misc/prdtoa.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/misc/prdtoa.c | |
1198 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/misc/prdtoa.c Fri Dec 28 04:35:14 2001 | |
1199 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/misc/prdtoa.c Thu Sep 26 14:46:29 2002 | |
1200 | @@ -197,6 +197,16 @@ | |
1201 | #endif | |
1202 | #else | |
1203 | #include "float.h" | |
1204 | +/* | |
1205 | + * MacOS 10.2 defines the macro FLT_ROUNDS to an internal function | |
1206 | + * which does not exist on 10.1. We can safely #define it to 1 here | |
1207 | + * to allow 10.2 builds to run on 10.1, since we can't use fesetround() | |
1208 | + * (which does not exist on 10.1 either). | |
1209 | + */ | |
1210 | +#if defined(MACOS_DEPLOYMENT_TARGET) && (MACOS_DEPLOYMENT_TARGET < 100200) | |
1211 | +#undef FLT_ROUNDS | |
1212 | +#define FLT_ROUNDS 1 | |
1213 | +#endif | |
1214 | #endif | |
1215 | #ifndef __MATH_H__ | |
1216 | #include "math.h" | |
1217 | diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/pthreads/ptio.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/pthreads/ptio.c | |
1218 | --- nspr-4.2.2/mozilla/nsprpub/pr/src/pthreads/ptio.c Thu Jun 13 20:05:26 2002 | |
1219 | +++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/pthreads/ptio.c Tue Sep 24 16:21:06 2002 | |
1220 | @@ -3824,6 +3824,7 @@ | |
1221 | { | |
1222 | /* make poll() ignore this entry */ | |
1223 | syspoll[index].fd = -1; | |
1224 | + pds[index].out_flags = 0; | |
1225 | } | |
1226 | } | |
1227 | if (0 == ready) | |
1228 | @@ -4085,6 +4086,10 @@ | |
1229 | } | |
1230 | } | |
1231 | } | |
1232 | + else | |
1233 | + { | |
1234 | + pds[index].out_flags = 0; | |
1235 | + } | |
1236 | } | |
1237 | if (0 == ready) | |
1238 | { |