| blob | 632669a4ea63d7b938a2a37a7cfe7f8b9cb74db5 |
1 diff -urN glib-1.2.10/acglib.m4 glib-1.2.10-1/acglib.m4
2 --- glib-1.2.10/acglib.m4 1999-01-04 16:37:40.000000000 -0700
3 +++ glib-1.2.10-1/acglib.m4 2002-03-13 21:38:32.000000000 -0700
4 @@ -122,6 +122,18 @@
5 fi
6 echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso
7 done
8 - AC_MSG_RESULT(failed)])
9 + AC_MSG_RESULT(failed)],
10 +[ for glib_sysdef_input in $2 ; do
11 + glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([[^:]]*\):.*$/\1/'`
12 + glib_default=`echo $glib_sysdef_input | sed 's/^[[^:]]*:\(.*\)$/\1/'`
13 + if test $glib_sysdef != $glib_default; then
14 + glib_default=" $4$glib_default"
15 + else
16 + glib_default=
17 + fi
18 + echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso
19 + done
20 + AC_MSG_WARN(cannot check it if cross compiling -- using defaults)]
21 +)
22 rm -f confrun.c
23 ])
24 diff -urN glib-1.2.10/configure glib-1.2.10-1/configure
25 --- glib-1.2.10/configure 2001-03-15 08:44:01.000000000 -0700
26 +++ glib-1.2.10-1/configure 2002-03-13 21:38:32.000000000 -0700
27 @@ -2099,15 +2099,16 @@
28 glib_save_LIBS=$LIBS
29 LIBS="$LIBS -lm"
30 if test "$cross_compiling" = yes; then
31 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
32 + echo "configure: warning: cannot check it if cross compiling -- defaulting to none needed" 1>&2
33 +
34 else
35 cat > conftest.$ac_ext <<EOF
36 -#line 2106 "configure"
37 +#line 2107 "configure"
38 #include "confdefs.h"
39 #include <math.h>
40 int main (void) { return (log(1) != log(1.)); }
41 EOF
42 -if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
43 +if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
44 then
45 echo "$ac_t""none needed" 1>&6
46 else
47 @@ -2117,15 +2118,16 @@
48 glib_save_CFLAGS=$CFLAGS
49 CFLAGS="$CFLAGS -std1"
50 if test "$cross_compiling" = yes; then
51 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
52 + echo "configure: warning: suppress autoconf warning message" 1>&2
53 +
54 else
55 cat > conftest.$ac_ext <<EOF
56 -#line 2124 "configure"
57 +#line 2126 "configure"
58 #include "confdefs.h"
59 #include <math.h>
60 int main (void) { return (log(1) != log(1.)); }
61 EOF
62 -if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63 +if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64 then
65 echo "$ac_t""-std1" 1>&6
66 else
67 @@ -2135,12 +2137,10 @@
68 echo "$ac_t""" 1>&6
69 CFLAGS=$glib_save_CFLAGS
70 echo "configure: warning: No ANSI prototypes found in library. (-std1 didn't work.)" 1>&2
71 -
72 fi
73 rm -fr conftest*
74 fi
76 -
77 fi
78 rm -fr conftest*
79 fi
80 @@ -2544,7 +2544,7 @@
81 echo $ac_n "(cached) $ac_c" 1>&6
82 else
83 if test "$cross_compiling" = yes; then
84 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
85 + ac_cv_sizeof_char=1
86 else
87 cat > conftest.$ac_ext <<EOF
88 #line 2551 "configure"
89 @@ -2583,7 +2583,7 @@
90 echo $ac_n "(cached) $ac_c" 1>&6
91 else
92 if test "$cross_compiling" = yes; then
93 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
94 + ac_cv_sizeof_short=2
95 else
96 cat > conftest.$ac_ext <<EOF
97 #line 2590 "configure"
98 @@ -2622,7 +2622,7 @@
99 echo $ac_n "(cached) $ac_c" 1>&6
100 else
101 if test "$cross_compiling" = yes; then
102 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
103 + ac_cv_sizeof_long=4
104 else
105 cat > conftest.$ac_ext <<EOF
106 #line 2629 "configure"
107 @@ -2661,7 +2661,7 @@
108 echo $ac_n "(cached) $ac_c" 1>&6
109 else
110 if test "$cross_compiling" = yes; then
111 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
112 + ac_cv_sizeof_int=4
113 else
114 cat > conftest.$ac_ext <<EOF
115 #line 2668 "configure"
116 @@ -2700,7 +2700,7 @@
117 echo $ac_n "(cached) $ac_c" 1>&6
118 else
119 if test "$cross_compiling" = yes; then
120 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
121 + ac_cv_sizeof_void_p=4
122 else
123 cat > conftest.$ac_ext <<EOF
124 #line 2707 "configure"
125 @@ -2739,7 +2739,7 @@
126 echo $ac_n "(cached) $ac_c" 1>&6
127 else
128 if test "$cross_compiling" = yes; then
129 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
130 + ac_cv_sizeof_long_long=8
131 else
132 cat > conftest.$ac_ext <<EOF
133 #line 2746 "configure"
134 @@ -2785,7 +2785,7 @@
135 int main() {
137 /* Ultrix mips cc rejects this. */
138 -typedef int charset[2]; const charset x;
139 +typedef int charset[2]; const charset x = {0,0};
140 /* SunOS 4.1.1 cc rejects this. */
141 char const *const *ccp;
142 char **p;
143 @@ -2855,31 +2855,29 @@
144 echo $ac_n "(cached) $ac_c" 1>&6
145 else
147 - if test "$cross_compiling" = yes; then
148 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
149 -else
150 - cat > conftest.$ac_ext <<EOF
151 -#line 2863 "configure"
152 + cat > conftest.$ac_ext <<EOF
153 +#line 2860 "configure"
154 #include "confdefs.h"
156 +int main() {
157 +
158 __inline int foo () { return 0; }
159 int main () { return foo (); }
161 +; return 0; }
162 EOF
163 -if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
164 -then
165 +if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
166 + rm -rf conftest*
167 glib_cv_has__inline=yes
169 else
170 echo "configure: failed program was:" >&5
171 cat conftest.$ac_ext >&5
172 - rm -fr conftest*
173 + rm -rf conftest*
174 glib_cv_has__inline=no
175 -
176 -fi
177 -rm -fr conftest*
178 +
179 fi
180 -
181 +rm -f conftest*
183 fi
185 @@ -2891,36 +2889,34 @@
187 esac
188 echo $ac_n "checking for __inline__""... $ac_c" 1>&6
189 -echo "configure:2895: checking for __inline__" >&5
190 +echo "configure:2893: checking for __inline__" >&5
191 if eval "test \"`echo '$''{'glib_cv_has__inline__'+set}'`\" = set"; then
192 echo $ac_n "(cached) $ac_c" 1>&6
193 else
195 - if test "$cross_compiling" = yes; then
196 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
197 -else
198 - cat > conftest.$ac_ext <<EOF
199 -#line 2904 "configure"
200 + cat > conftest.$ac_ext <<EOF
201 +#line 2899 "configure"
202 #include "confdefs.h"
204 +int main() {
205 +
206 __inline__ int foo () { return 0; }
207 int main () { return foo (); }
209 +; return 0; }
210 EOF
211 -if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
212 -then
213 +if { (eval echo configure:2909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
214 + rm -rf conftest*
215 glib_cv_has__inline__=yes
217 else
218 echo "configure: failed program was:" >&5
219 cat conftest.$ac_ext >&5
220 - rm -fr conftest*
221 + rm -rf conftest*
222 glib_cv_has__inline__=no
224 fi
225 -rm -fr conftest*
226 -fi
227 -
228 +rm -f conftest*
230 fi
232 @@ -2932,36 +2928,34 @@
234 esac
235 echo $ac_n "checking for inline""... $ac_c" 1>&6
236 -echo "configure:2936: checking for inline" >&5
237 +echo "configure:2932: checking for inline" >&5
238 if eval "test \"`echo '$''{'glib_cv_hasinline'+set}'`\" = set"; then
239 echo $ac_n "(cached) $ac_c" 1>&6
240 else
242 - if test "$cross_compiling" = yes; then
243 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
244 -else
245 - cat > conftest.$ac_ext <<EOF
246 -#line 2945 "configure"
247 + cat > conftest.$ac_ext <<EOF
248 +#line 2938 "configure"
249 #include "confdefs.h"
251 +int main() {
252 +
253 inline int foo () { return 0; }
254 int main () { return foo (); }
256 +; return 0; }
257 EOF
258 -if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
259 -then
260 +if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
261 + rm -rf conftest*
262 glib_cv_hasinline=yes
264 else
265 echo "configure: failed program was:" >&5
266 cat conftest.$ac_ext >&5
267 - rm -fr conftest*
268 + rm -rf conftest*
269 glib_cv_hasinline=no
271 fi
272 -rm -fr conftest*
273 -fi
274 -
275 +rm -f conftest*
277 fi
279 @@ -2973,112 +2967,22 @@
281 esac
283 -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
284 -echo "configure:2978: checking whether byte ordering is bigendian" >&5
285 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
286 - echo $ac_n "(cached) $ac_c" 1>&6
287 -else
288 - ac_cv_c_bigendian=unknown
289 -# See if sys/param.h defines the BYTE_ORDER macro.
290 -cat > conftest.$ac_ext <<EOF
291 -#line 2985 "configure"
292 -#include "confdefs.h"
293 -#include <sys/types.h>
294 -#include <sys/param.h>
295 -int main() {
296 -
297 -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
298 - bogus endian macros
299 -#endif
300 -; return 0; }
301 -EOF
302 -if { (eval echo configure:2996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
303 - rm -rf conftest*
304 - # It does; now see whether it defined to BIG_ENDIAN or not.
305 -cat > conftest.$ac_ext <<EOF
306 -#line 3000 "configure"
307 -#include "confdefs.h"
308 -#include <sys/types.h>
309 -#include <sys/param.h>
310 -int main() {
311 -
312 -#if BYTE_ORDER != BIG_ENDIAN
313 - not big endian
314 -#endif
315 -; return 0; }
316 -EOF
317 -if { (eval echo configure:3011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
318 - rm -rf conftest*
319 - ac_cv_c_bigendian=yes
320 -else
321 - echo "configure: failed program was:" >&5
322 - cat conftest.$ac_ext >&5
323 - rm -rf conftest*
324 - ac_cv_c_bigendian=no
325 -fi
326 -rm -f conftest*
327 -else
328 - echo "configure: failed program was:" >&5
329 - cat conftest.$ac_ext >&5
330 -fi
331 -rm -f conftest*
332 -if test $ac_cv_c_bigendian = unknown; then
333 -if test "$cross_compiling" = yes; then
334 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
335 -else
336 - cat > conftest.$ac_ext <<EOF
337 -#line 3031 "configure"
338 -#include "confdefs.h"
339 -main () {
340 - /* Are we little or big endian? From Harbison&Steele. */
341 - union
342 - {
343 - long l;
344 - char c[sizeof (long)];
345 - } u;
346 - u.l = 1;
347 - exit (u.c[sizeof (long) - 1] == 1);
348 -}
349 -EOF
350 -if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
351 -then
352 - ac_cv_c_bigendian=no
353 -else
354 - echo "configure: failed program was:" >&5
355 - cat conftest.$ac_ext >&5
356 - rm -fr conftest*
357 - ac_cv_c_bigendian=yes
358 -fi
359 -rm -fr conftest*
360 -fi
361 -
362 -fi
363 -fi
364 -
365 -echo "$ac_t""$ac_cv_c_bigendian" 1>&6
366 -if test $ac_cv_c_bigendian = yes; then
367 - cat >> confdefs.h <<\EOF
368 -#define WORDS_BIGENDIAN 1
369 -EOF
370 -
371 -fi
372 -
374 for ac_hdr in float.h
375 do
376 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
377 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
378 -echo "configure:3072: checking for $ac_hdr" >&5
379 +echo "configure:2976: checking for $ac_hdr" >&5
380 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
381 echo $ac_n "(cached) $ac_c" 1>&6
382 else
383 cat > conftest.$ac_ext <<EOF
384 -#line 3077 "configure"
385 +#line 2981 "configure"
386 #include "confdefs.h"
387 #include <$ac_hdr>
388 EOF
389 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
390 -{ (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
391 +{ (eval echo configure:2986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
392 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
393 if test -z "$ac_err"; then
394 rm -rf conftest*
395 @@ -3111,17 +3015,17 @@
396 do
397 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
398 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
399 -echo "configure:3115: checking for $ac_hdr" >&5
400 +echo "configure:3019: checking for $ac_hdr" >&5
401 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
402 echo $ac_n "(cached) $ac_c" 1>&6
403 else
404 cat > conftest.$ac_ext <<EOF
405 -#line 3120 "configure"
406 +#line 3024 "configure"
407 #include "confdefs.h"
408 #include <$ac_hdr>
409 EOF
410 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
411 -{ (eval echo configure:3125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
412 +{ (eval echo configure:3029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
413 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
414 if test -z "$ac_err"; then
415 rm -rf conftest*
416 @@ -3154,17 +3058,17 @@
417 do
418 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
419 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
420 -echo "configure:3158: checking for $ac_hdr" >&5
421 +echo "configure:3062: checking for $ac_hdr" >&5
422 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
423 echo $ac_n "(cached) $ac_c" 1>&6
424 else
425 cat > conftest.$ac_ext <<EOF
426 -#line 3163 "configure"
427 +#line 3067 "configure"
428 #include "confdefs.h"
429 #include <$ac_hdr>
430 EOF
431 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
432 -{ (eval echo configure:3168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
433 +{ (eval echo configure:3072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
434 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
435 if test -z "$ac_err"; then
436 rm -rf conftest*
437 @@ -3197,17 +3101,17 @@
438 do
439 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
440 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
441 -echo "configure:3201: checking for $ac_hdr" >&5
442 +echo "configure:3105: checking for $ac_hdr" >&5
443 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
444 echo $ac_n "(cached) $ac_c" 1>&6
445 else
446 cat > conftest.$ac_ext <<EOF
447 -#line 3206 "configure"
448 +#line 3110 "configure"
449 #include "confdefs.h"
450 #include <$ac_hdr>
451 EOF
452 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
453 -{ (eval echo configure:3211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
454 +{ (eval echo configure:3115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
455 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
456 if test -z "$ac_err"; then
457 rm -rf conftest*
458 @@ -3240,17 +3144,17 @@
459 do
460 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
461 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
462 -echo "configure:3244: checking for $ac_hdr" >&5
463 +echo "configure:3148: checking for $ac_hdr" >&5
464 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
465 echo $ac_n "(cached) $ac_c" 1>&6
466 else
467 cat > conftest.$ac_ext <<EOF
468 -#line 3249 "configure"
469 +#line 3153 "configure"
470 #include "confdefs.h"
471 #include <$ac_hdr>
472 EOF
473 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
474 -{ (eval echo configure:3254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
475 +{ (eval echo configure:3158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
476 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
477 if test -z "$ac_err"; then
478 rm -rf conftest*
479 @@ -3283,17 +3187,17 @@
480 do
481 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
482 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
483 -echo "configure:3287: checking for $ac_hdr" >&5
484 +echo "configure:3191: checking for $ac_hdr" >&5
485 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
486 echo $ac_n "(cached) $ac_c" 1>&6
487 else
488 cat > conftest.$ac_ext <<EOF
489 -#line 3292 "configure"
490 +#line 3196 "configure"
491 #include "confdefs.h"
492 #include <$ac_hdr>
493 EOF
494 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
495 -{ (eval echo configure:3297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
496 +{ (eval echo configure:3201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
497 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
498 if test -z "$ac_err"; then
499 rm -rf conftest*
500 @@ -3326,17 +3230,17 @@
501 do
502 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
503 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
504 -echo "configure:3330: checking for $ac_hdr" >&5
505 +echo "configure:3234: checking for $ac_hdr" >&5
506 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
507 echo $ac_n "(cached) $ac_c" 1>&6
508 else
509 cat > conftest.$ac_ext <<EOF
510 -#line 3335 "configure"
511 +#line 3239 "configure"
512 #include "confdefs.h"
513 #include <$ac_hdr>
514 EOF
515 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
516 -{ (eval echo configure:3340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
517 +{ (eval echo configure:3244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
518 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
519 if test -z "$ac_err"; then
520 rm -rf conftest*
521 @@ -3369,17 +3273,17 @@
522 do
523 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
524 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
525 -echo "configure:3373: checking for $ac_hdr" >&5
526 +echo "configure:3277: checking for $ac_hdr" >&5
527 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
528 echo $ac_n "(cached) $ac_c" 1>&6
529 else
530 cat > conftest.$ac_ext <<EOF
531 -#line 3378 "configure"
532 +#line 3282 "configure"
533 #include "confdefs.h"
534 #include <$ac_hdr>
535 EOF
536 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
537 -{ (eval echo configure:3383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
538 +{ (eval echo configure:3287: \"$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 rm -rf conftest*
542 @@ -3412,17 +3316,17 @@
543 do
544 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
545 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
546 -echo "configure:3416: checking for $ac_hdr" >&5
547 +echo "configure:3320: checking for $ac_hdr" >&5
548 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
549 echo $ac_n "(cached) $ac_c" 1>&6
550 else
551 cat > conftest.$ac_ext <<EOF
552 -#line 3421 "configure"
553 +#line 3325 "configure"
554 #include "confdefs.h"
555 #include <$ac_hdr>
556 EOF
557 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
558 -{ (eval echo configure:3426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
559 +{ (eval echo configure:3330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
560 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
561 if test -z "$ac_err"; then
562 rm -rf conftest*
563 @@ -3455,17 +3359,17 @@
564 do
565 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
566 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
567 -echo "configure:3459: checking for $ac_hdr" >&5
568 +echo "configure:3363: checking for $ac_hdr" >&5
569 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
570 echo $ac_n "(cached) $ac_c" 1>&6
571 else
572 cat > conftest.$ac_ext <<EOF
573 -#line 3464 "configure"
574 +#line 3368 "configure"
575 #include "confdefs.h"
576 #include <$ac_hdr>
577 EOF
578 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
579 -{ (eval echo configure:3469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
580 +{ (eval echo configure:3373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
581 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
582 if test -z "$ac_err"; then
583 rm -rf conftest*
584 @@ -3499,12 +3403,12 @@
585 for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
586 do
587 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
588 -echo "configure:3503: checking for $ac_func" >&5
589 +echo "configure:3407: checking for $ac_func" >&5
590 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
591 echo $ac_n "(cached) $ac_c" 1>&6
592 else
593 cat > conftest.$ac_ext <<EOF
594 -#line 3508 "configure"
595 +#line 3412 "configure"
596 #include "confdefs.h"
597 /* System header to define __stub macros and hopefully few prototypes,
598 which can conflict with char $ac_func(); below. */
599 @@ -3527,7 +3431,7 @@
601 ; return 0; }
602 EOF
603 -if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
604 +if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
605 rm -rf conftest*
606 eval "ac_cv_func_$ac_func=yes"
607 else
608 @@ -3554,9 +3458,9 @@
610 # Check for sys_errlist
611 echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
612 -echo "configure:3558: checking for sys_errlist" >&5
613 +echo "configure:3462: checking for sys_errlist" >&5
614 cat > conftest.$ac_ext <<EOF
615 -#line 3560 "configure"
616 +#line 3464 "configure"
617 #include "confdefs.h"
619 int main() {
620 @@ -3567,7 +3471,7 @@
622 ; return 0; }
623 EOF
624 -if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
625 +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
626 rm -rf conftest*
627 glib_ok=yes
628 else
629 @@ -3587,9 +3491,9 @@
631 # Check for sys_siglist
632 echo $ac_n "checking for sys_siglist""... $ac_c" 1>&6
633 -echo "configure:3591: checking for sys_siglist" >&5
634 +echo "configure:3495: checking for sys_siglist" >&5
635 cat > conftest.$ac_ext <<EOF
636 -#line 3593 "configure"
637 +#line 3497 "configure"
638 #include "confdefs.h"
640 int main() {
641 @@ -3599,7 +3503,7 @@
643 ; return 0; }
644 EOF
645 -if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
646 +if { (eval echo configure:3507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
647 rm -rf conftest*
648 glib_ok=yes
649 else
650 @@ -3619,9 +3523,9 @@
652 # Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog)
653 echo $ac_n "checking for sys_siglist declaration""... $ac_c" 1>&6
654 -echo "configure:3623: checking for sys_siglist declaration" >&5
655 +echo "configure:3527: checking for sys_siglist declaration" >&5
656 cat > conftest.$ac_ext <<EOF
657 -#line 3625 "configure"
658 +#line 3529 "configure"
659 #include "confdefs.h"
660 #include <signal.h>
661 int main() {
662 @@ -3630,7 +3534,7 @@
664 ; return 0; }
665 EOF
666 -if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
667 +if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
668 rm -rf conftest*
669 glib_ok=yes
670 else
671 @@ -3650,16 +3554,16 @@
673 # Check if <sys/select.h> needs to be included for fd_set
674 echo $ac_n "checking for fd_set""... $ac_c" 1>&6
675 -echo "configure:3654: checking for fd_set" >&5
676 +echo "configure:3558: checking for fd_set" >&5
677 cat > conftest.$ac_ext <<EOF
678 -#line 3656 "configure"
679 +#line 3560 "configure"
680 #include "confdefs.h"
681 #include <sys/types.h>
682 int main() {
683 fd_set readMask, writeMask;
684 ; return 0; }
685 EOF
686 -if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
687 +if { (eval echo configure:3567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
688 rm -rf conftest*
689 gtk_ok=yes
690 else
691 @@ -3673,7 +3577,7 @@
692 echo "$ac_t""yes, found in sys/types.h" 1>&6
693 else
694 cat > conftest.$ac_ext <<EOF
695 -#line 3677 "configure"
696 +#line 3581 "configure"
697 #include "confdefs.h"
698 #include <sys/select.h>
699 EOF
700 @@ -3707,14 +3611,14 @@
701 # Check for wchar.h
703 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
704 -echo "configure:3711: checking for wchar.h" >&5
705 +echo "configure:3615: checking for wchar.h" >&5
706 cat > conftest.$ac_ext <<EOF
707 -#line 3713 "configure"
708 +#line 3617 "configure"
709 #include "confdefs.h"
710 #include <wchar.h>
711 EOF
712 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
713 -{ (eval echo configure:3718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
714 +{ (eval echo configure:3622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
715 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
716 if test -z "$ac_err"; then
717 rm -rf conftest*
718 @@ -3738,14 +3642,14 @@
719 # Check for wctype.h (for iswalnum)
721 echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
722 -echo "configure:3742: checking for wctype.h" >&5
723 +echo "configure:3646: checking for wctype.h" >&5
724 cat > conftest.$ac_ext <<EOF
725 -#line 3744 "configure"
726 +#line 3648 "configure"
727 #include "confdefs.h"
728 #include <wctype.h>
729 EOF
730 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
731 -{ (eval echo configure:3749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
732 +{ (eval echo configure:3653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
733 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
734 if test -z "$ac_err"; then
735 rm -rf conftest*
736 @@ -3769,12 +3673,12 @@
737 oLIBS="$LIBS"
738 # in Solaris 2.5, `iswalnum' is in -lw
739 echo $ac_n "checking for iswalnum""... $ac_c" 1>&6
740 -echo "configure:3773: checking for iswalnum" >&5
741 +echo "configure:3677: checking for iswalnum" >&5
742 if eval "test \"`echo '$''{'ac_cv_func_iswalnum'+set}'`\" = set"; then
743 echo $ac_n "(cached) $ac_c" 1>&6
744 else
745 cat > conftest.$ac_ext <<EOF
746 -#line 3778 "configure"
747 +#line 3682 "configure"
748 #include "confdefs.h"
749 /* System header to define __stub macros and hopefully few prototypes,
750 which can conflict with char iswalnum(); below. */
751 @@ -3797,7 +3701,7 @@
753 ; return 0; }
754 EOF
755 -if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
756 +if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
757 rm -rf conftest*
758 eval "ac_cv_func_iswalnum=yes"
759 else
760 @@ -3815,7 +3719,7 @@
761 else
762 echo "$ac_t""no" 1>&6
763 echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6
764 -echo "configure:3819: checking for iswalnum in -lw" >&5
765 +echo "configure:3723: checking for iswalnum in -lw" >&5
766 ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'`
767 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
768 echo $ac_n "(cached) $ac_c" 1>&6
769 @@ -3823,7 +3727,7 @@
770 ac_save_LIBS="$LIBS"
771 LIBS="-lw $LIBS"
772 cat > conftest.$ac_ext <<EOF
773 -#line 3827 "configure"
774 +#line 3731 "configure"
775 #include "confdefs.h"
776 /* Override any gcc2 internal prototype to avoid an error. */
777 /* We use char because int might match the return type of a gcc2
778 @@ -3834,7 +3738,7 @@
779 iswalnum()
780 ; return 0; }
781 EOF
782 -if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
783 +if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
784 rm -rf conftest*
785 eval "ac_cv_lib_$ac_lib_var=yes"
786 else
787 @@ -3866,9 +3770,9 @@
789 # The following is necessary for Linux libc-5.4.38
790 echo $ac_n "checking if iswalnum() and friends are properly defined""... $ac_c" 1>&6
791 -echo "configure:3870: checking if iswalnum() and friends are properly defined" >&5
792 +echo "configure:3774: checking if iswalnum() and friends are properly defined" >&5
793 cat > conftest.$ac_ext <<EOF
794 -#line 3872 "configure"
795 +#line 3776 "configure"
796 #include "confdefs.h"
797 #include <stdlib.h>
798 int main() {
799 @@ -3888,7 +3792,7 @@
801 ; return 0; }
802 EOF
803 -if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
804 +if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
805 rm -rf conftest*
806 glib_working_wctype=yes
807 else
808 @@ -3909,16 +3813,22 @@
809 echo "$ac_t""$glib_working_wctype" 1>&6
811 echo $ac_n "checking whether realloc (NULL,) will work""... $ac_c" 1>&6
812 -echo "configure:3913: checking whether realloc (NULL,) will work" >&5
813 +echo "configure:3817: checking whether realloc (NULL,) will work" >&5
814 if eval "test \"`echo '$''{'glib_cv_sane_realloc'+set}'`\" = set"; then
815 echo $ac_n "(cached) $ac_c" 1>&6
816 else
818 if test "$cross_compiling" = yes; then
819 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
820 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
821 + glib_cv_sane_realloc=yes
822 + cat >> confdefs.h <<\EOF
823 +#define REALLOC_0_WORKS 1
824 +EOF
825 +
826 +
827 else
828 cat > conftest.$ac_ext <<EOF
829 -#line 3922 "configure"
830 +#line 3832 "configure"
831 #include "confdefs.h"
833 #include <stdlib.h>
834 @@ -3926,7 +3836,7 @@
835 return realloc (0, sizeof (int)) == 0;
836 }
837 EOF
838 -if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
839 +if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
840 then
841 glib_cv_sane_realloc=yes
842 cat >> confdefs.h <<\EOF
843 @@ -3951,16 +3861,18 @@
846 echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
847 -echo "configure:3955: checking for an implementation of va_copy()" >&5
848 +echo "configure:3865: checking for an implementation of va_copy()" >&5
849 if eval "test \"`echo '$''{'glib_cv_va_copy'+set}'`\" = set"; then
850 echo $ac_n "(cached) $ac_c" 1>&6
851 else
853 if test "$cross_compiling" = yes; then
854 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
855 + echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2
856 + glib_cv_va_copy=no
857 +
858 else
859 cat > conftest.$ac_ext <<EOF
860 -#line 3964 "configure"
861 +#line 3876 "configure"
862 #include "confdefs.h"
864 #include <stdarg.h>
865 @@ -3977,7 +3889,7 @@
866 return 0;
867 }
868 EOF
869 -if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
870 +if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
871 then
872 glib_cv_va_copy=yes
874 @@ -3996,16 +3908,18 @@
876 echo "$ac_t""$glib_cv_va_copy" 1>&6
877 echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
878 -echo "configure:4000: checking for an implementation of __va_copy()" >&5
879 +echo "configure:3912: checking for an implementation of __va_copy()" >&5
880 if eval "test \"`echo '$''{'glib_cv___va_copy'+set}'`\" = set"; then
881 echo $ac_n "(cached) $ac_c" 1>&6
882 else
884 if test "$cross_compiling" = yes; then
885 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
886 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
887 + glib_cv___va_copy=yes
888 +
889 else
890 cat > conftest.$ac_ext <<EOF
891 -#line 4009 "configure"
892 +#line 3923 "configure"
893 #include "confdefs.h"
895 #include <stdarg.h>
896 @@ -4022,7 +3936,7 @@
897 return 0;
898 }
899 EOF
900 -if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
901 +if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
902 then
903 glib_cv___va_copy=yes
905 @@ -4041,16 +3955,18 @@
907 echo "$ac_t""$glib_cv___va_copy" 1>&6
908 echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
909 -echo "configure:4045: checking whether va_lists can be copied by value" >&5
910 +echo "configure:3959: checking whether va_lists can be copied by value" >&5
911 if eval "test \"`echo '$''{'glib_cv_va_val_copy'+set}'`\" = set"; then
912 echo $ac_n "(cached) $ac_c" 1>&6
913 else
915 if test "$cross_compiling" = yes; then
916 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
917 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
918 + glib_cv_va_val_copy=yes
919 +
920 else
921 cat > conftest.$ac_ext <<EOF
922 -#line 4054 "configure"
923 +#line 3970 "configure"
924 #include "confdefs.h"
926 #include <stdarg.h>
927 @@ -4067,7 +3983,7 @@
928 return 0;
929 }
930 EOF
931 -if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
932 +if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
933 then
934 glib_cv_va_val_copy=yes
936 @@ -4112,12 +4028,12 @@
937 G_MODULE_HAVE_DLERROR=0
938 if test -z "$G_MODULE_IMPL"; then
939 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
940 -echo "configure:4116: checking for dlopen" >&5
941 +echo "configure:4032: checking for dlopen" >&5
942 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
943 echo $ac_n "(cached) $ac_c" 1>&6
944 else
945 cat > conftest.$ac_ext <<EOF
946 -#line 4121 "configure"
947 +#line 4037 "configure"
948 #include "confdefs.h"
949 /* System header to define __stub macros and hopefully few prototypes,
950 which can conflict with char dlopen(); below. */
951 @@ -4140,7 +4056,7 @@
953 ; return 0; }
954 EOF
955 -if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
956 +if { (eval echo configure:4060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
957 rm -rf conftest*
958 eval "ac_cv_func_dlopen=yes"
959 else
960 @@ -4155,12 +4071,12 @@
961 if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
962 echo "$ac_t""yes" 1>&6
963 echo $ac_n "checking for dlsym""... $ac_c" 1>&6
964 -echo "configure:4159: checking for dlsym" >&5
965 +echo "configure:4075: checking for dlsym" >&5
966 if eval "test \"`echo '$''{'ac_cv_func_dlsym'+set}'`\" = set"; then
967 echo $ac_n "(cached) $ac_c" 1>&6
968 else
969 cat > conftest.$ac_ext <<EOF
970 -#line 4164 "configure"
971 +#line 4080 "configure"
972 #include "confdefs.h"
973 /* System header to define __stub macros and hopefully few prototypes,
974 which can conflict with char dlsym(); below. */
975 @@ -4183,7 +4099,7 @@
977 ; return 0; }
978 EOF
979 -if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
980 +if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
981 rm -rf conftest*
982 eval "ac_cv_func_dlsym=yes"
983 else
984 @@ -4211,7 +4127,7 @@
985 fi
986 if test -z "$G_MODULE_IMPL"; then
987 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
988 -echo "configure:4215: checking for dlopen in -ldl" >&5
989 +echo "configure:4131: checking for dlopen in -ldl" >&5
990 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
991 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
992 echo $ac_n "(cached) $ac_c" 1>&6
993 @@ -4219,7 +4135,7 @@
994 ac_save_LIBS="$LIBS"
995 LIBS="-ldl $LIBS"
996 cat > conftest.$ac_ext <<EOF
997 -#line 4223 "configure"
998 +#line 4139 "configure"
999 #include "confdefs.h"
1000 /* Override any gcc2 internal prototype to avoid an error. */
1001 /* We use char because int might match the return type of a gcc2
1002 @@ -4230,7 +4146,7 @@
1003 dlopen()
1004 ; return 0; }
1005 EOF
1006 -if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1007 +if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1008 rm -rf conftest*
1009 eval "ac_cv_lib_$ac_lib_var=yes"
1010 else
1011 @@ -4246,7 +4162,7 @@
1012 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1013 echo "$ac_t""yes" 1>&6
1014 echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
1015 -echo "configure:4250: checking for dlsym in -ldl" >&5
1016 +echo "configure:4166: checking for dlsym in -ldl" >&5
1017 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
1018 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1019 echo $ac_n "(cached) $ac_c" 1>&6
1020 @@ -4254,7 +4170,7 @@
1021 ac_save_LIBS="$LIBS"
1022 LIBS="-ldl $LIBS"
1023 cat > conftest.$ac_ext <<EOF
1024 -#line 4258 "configure"
1025 +#line 4174 "configure"
1026 #include "confdefs.h"
1027 /* Override any gcc2 internal prototype to avoid an error. */
1028 /* We use char because int might match the return type of a gcc2
1029 @@ -4265,7 +4181,7 @@
1030 dlsym()
1031 ; return 0; }
1032 EOF
1033 -if { (eval echo configure:4269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1034 +if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1035 rm -rf conftest*
1036 eval "ac_cv_lib_$ac_lib_var=yes"
1037 else
1038 @@ -4295,18 +4211,18 @@
1039 fi
1040 if test -z "$G_MODULE_IMPL"; then
1041 echo $ac_n "checking how to export all symbols""... $ac_c" 1>&6
1042 -echo "configure:4299: checking how to export all symbols" >&5
1043 +echo "configure:4215: checking how to export all symbols" >&5
1044 SAVED_LDFLAGS=$LDFLAGS
1045 LDFLAGS="$LDFLAGS -Wl,-E"
1046 cat > conftest.$ac_ext <<EOF
1047 -#line 4303 "configure"
1048 +#line 4219 "configure"
1049 #include "confdefs.h"
1051 int main() {
1052 return 0;
1053 ; return 0; }
1054 EOF
1055 -if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1056 +if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1057 rm -rf conftest*
1058 G_MODULE_LDFLAGS="-Wl,-E"
1059 else
1060 @@ -4316,14 +4232,14 @@
1062 LDFLAGS="$SAVED_LDFLAGS -bexpall"
1063 cat > conftest.$ac_ext <<EOF
1064 -#line 4320 "configure"
1065 +#line 4236 "configure"
1066 #include "confdefs.h"
1068 int main() {
1069 return 0;
1070 ; return 0; }
1071 EOF
1072 -if { (eval echo configure:4327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1073 +if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1074 rm -rf conftest*
1075 G_MODULE_LDFLAGS="-bexpall"
1076 else
1077 @@ -4343,7 +4259,7 @@
1078 G_MODULE_LDFLAGS=
1079 fi
1080 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
1081 -echo "configure:4347: checking for shl_load in -ldld" >&5
1082 +echo "configure:4263: checking for shl_load in -ldld" >&5
1083 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
1084 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1085 echo $ac_n "(cached) $ac_c" 1>&6
1086 @@ -4351,7 +4267,7 @@
1087 ac_save_LIBS="$LIBS"
1088 LIBS="-ldld $LIBS"
1089 cat > conftest.$ac_ext <<EOF
1090 -#line 4355 "configure"
1091 +#line 4271 "configure"
1092 #include "confdefs.h"
1093 /* Override any gcc2 internal prototype to avoid an error. */
1094 /* We use char because int might match the return type of a gcc2
1095 @@ -4362,7 +4278,7 @@
1096 shl_load()
1097 ; return 0; }
1098 EOF
1099 -if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1100 +if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1101 rm -rf conftest*
1102 eval "ac_cv_lib_$ac_lib_var=yes"
1103 else
1104 @@ -4396,16 +4312,17 @@
1105 LIBS="$LIBS $G_MODULE_LIBS"
1106 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
1107 echo $ac_n "checking for RTLD_GLOBAL brokenness""... $ac_c" 1>&6
1108 -echo "configure:4400: checking for RTLD_GLOBAL brokenness" >&5
1109 +echo "configure:4316: checking for RTLD_GLOBAL brokenness" >&5
1110 if eval "test \"`echo '$''{'glib_cv_rtldglobal_broken'+set}'`\" = set"; then
1111 echo $ac_n "(cached) $ac_c" 1>&6
1112 else
1114 if test "$cross_compiling" = yes; then
1115 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1116 + echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2
1117 + glib_cv_rtldglobal_broken=no
1118 else
1119 cat > conftest.$ac_ext <<EOF
1120 -#line 4409 "configure"
1121 +#line 4326 "configure"
1122 #include "confdefs.h"
1124 #include <dlfcn.h>
1125 @@ -4425,7 +4342,7 @@
1126 return global == local;
1127 }
1128 EOF
1129 -if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1130 +if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1131 then
1132 glib_cv_rtldglobal_broken=no
1133 else
1134 @@ -4448,16 +4365,18 @@
1135 G_MODULE_BROKEN_RTLD_GLOBAL=0
1136 fi
1137 echo $ac_n "checking for preceeding underscore in symbols""... $ac_c" 1>&6
1138 -echo "configure:4452: checking for preceeding underscore in symbols" >&5
1139 +echo "configure:4369: checking for preceeding underscore in symbols" >&5
1140 if eval "test \"`echo '$''{'glib_cv_uscore'+set}'`\" = set"; then
1141 echo $ac_n "(cached) $ac_c" 1>&6
1142 else
1144 if test "$cross_compiling" = yes; then
1145 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1146 + echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2
1147 + glib_cv_uscore=no
1148 +
1149 else
1150 cat > conftest.$ac_ext <<EOF
1151 -#line 4461 "configure"
1152 +#line 4380 "configure"
1153 #include "confdefs.h"
1155 #include <dlfcn.h>
1156 @@ -4471,7 +4390,7 @@
1157 } return (!f2 || f1);
1158 }
1159 EOF
1160 -if { (eval echo configure:4475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1161 +if { (eval echo configure:4394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1162 then
1163 glib_cv_uscore=yes
1164 else
1165 @@ -4496,12 +4415,12 @@
1167 LDFLAGS="$LDFLAGS_orig"
1168 echo $ac_n "checking for dlerror""... $ac_c" 1>&6
1169 -echo "configure:4500: checking for dlerror" >&5
1170 +echo "configure:4419: checking for dlerror" >&5
1171 if eval "test \"`echo '$''{'ac_cv_func_dlerror'+set}'`\" = set"; then
1172 echo $ac_n "(cached) $ac_c" 1>&6
1173 else
1174 cat > conftest.$ac_ext <<EOF
1175 -#line 4505 "configure"
1176 +#line 4424 "configure"
1177 #include "confdefs.h"
1178 /* System header to define __stub macros and hopefully few prototypes,
1179 which can conflict with char dlerror(); below. */
1180 @@ -4524,7 +4443,7 @@
1182 ; return 0; }
1183 EOF
1184 -if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1185 +if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1186 rm -rf conftest*
1187 eval "ac_cv_func_dlerror=yes"
1188 else
1189 @@ -4608,7 +4527,7 @@
1190 case $host in
1191 *-*-solaris*)
1192 echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6
1193 -echo "configure:4612: checking for cond_init in -lthread" >&5
1194 +echo "configure:4531: checking for cond_init in -lthread" >&5
1195 ac_lib_var=`echo thread'_'cond_init | sed 'y%./+-%__p_%'`
1196 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1197 echo $ac_n "(cached) $ac_c" 1>&6
1198 @@ -4616,7 +4535,7 @@
1199 ac_save_LIBS="$LIBS"
1200 LIBS="-lthread $LIBS"
1201 cat > conftest.$ac_ext <<EOF
1202 -#line 4620 "configure"
1203 +#line 4539 "configure"
1204 #include "confdefs.h"
1205 /* Override any gcc2 internal prototype to avoid an error. */
1206 /* We use char because int might match the return type of a gcc2
1207 @@ -4627,7 +4546,7 @@
1208 cond_init()
1209 ; return 0; }
1210 EOF
1211 -if { (eval echo configure:4631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1212 +if { (eval echo configure:4550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1213 rm -rf conftest*
1214 eval "ac_cv_lib_$ac_lib_var=yes"
1215 else
1216 @@ -4654,17 +4573,17 @@
1217 if test "x$have_threads" = xnone; then
1218 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
1219 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
1220 -echo "configure:4658: checking for pthread.h" >&5
1221 +echo "configure:4577: checking for pthread.h" >&5
1222 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1223 echo $ac_n "(cached) $ac_c" 1>&6
1224 else
1225 cat > conftest.$ac_ext <<EOF
1226 -#line 4663 "configure"
1227 +#line 4582 "configure"
1228 #include "confdefs.h"
1229 #include <pthread.h>
1230 EOF
1231 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1232 -{ (eval echo configure:4668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1233 +{ (eval echo configure:4587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1234 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1235 if test -z "$ac_err"; then
1236 rm -rf conftest*
1237 @@ -4690,7 +4609,7 @@
1238 if test "x$want_threads" = xyes || test "x$want_threads" = xnspr; then
1239 if test "x$have_threads" = xnone; then
1240 echo $ac_n "checking for PRP_NewNakedCondVar in -lnspr21""... $ac_c" 1>&6
1241 -echo "configure:4694: checking for PRP_NewNakedCondVar in -lnspr21" >&5
1242 +echo "configure:4613: checking for PRP_NewNakedCondVar in -lnspr21" >&5
1243 ac_lib_var=`echo nspr21'_'PRP_NewNakedCondVar | sed 'y%./+-%__p_%'`
1244 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1245 echo $ac_n "(cached) $ac_c" 1>&6
1246 @@ -4698,7 +4617,7 @@
1247 ac_save_LIBS="$LIBS"
1248 LIBS="-lnspr21 $LIBS"
1249 cat > conftest.$ac_ext <<EOF
1250 -#line 4702 "configure"
1251 +#line 4621 "configure"
1252 #include "confdefs.h"
1253 /* Override any gcc2 internal prototype to avoid an error. */
1254 /* We use char because int might match the return type of a gcc2
1255 @@ -4709,7 +4628,7 @@
1256 PRP_NewNakedCondVar()
1257 ; return 0; }
1258 EOF
1259 -if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1260 +if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1261 rm -rf conftest*
1262 eval "ac_cv_lib_$ac_lib_var=yes"
1263 else
1264 @@ -4733,7 +4652,7 @@
1265 fi
1267 echo $ac_n "checking for thread implementation""... $ac_c" 1>&6
1268 -echo "configure:4737: checking for thread implementation" >&5
1269 +echo "configure:4656: checking for thread implementation" >&5
1271 if test "x$have_threads" = xnone && test "x$want_threads" != xno; then
1272 echo "$ac_t""none available" 1>&6
1273 @@ -4752,7 +4671,7 @@
1274 posix)
1275 G_THREAD_LIBS=error
1276 echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
1277 -echo "configure:4756: checking for pthread_attr_init in -lpthread" >&5
1278 +echo "configure:4675: checking for pthread_attr_init in -lpthread" >&5
1279 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
1280 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1281 echo $ac_n "(cached) $ac_c" 1>&6
1282 @@ -4760,7 +4679,7 @@
1283 ac_save_LIBS="$LIBS"
1284 LIBS="-lpthread $LIBS"
1285 cat > conftest.$ac_ext <<EOF
1286 -#line 4764 "configure"
1287 +#line 4683 "configure"
1288 #include "confdefs.h"
1289 /* Override any gcc2 internal prototype to avoid an error. */
1290 /* We use char because int might match the return type of a gcc2
1291 @@ -4771,7 +4690,7 @@
1292 pthread_attr_init()
1293 ; return 0; }
1294 EOF
1295 -if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1296 +if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1297 rm -rf conftest*
1298 eval "ac_cv_lib_$ac_lib_var=yes"
1299 else
1300 @@ -4793,7 +4712,7 @@
1302 if test "x$G_THREAD_LIBS" = xerror; then
1303 echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
1304 -echo "configure:4797: checking for pthread_attr_init in -lpthreads" >&5
1305 +echo "configure:4716: checking for pthread_attr_init in -lpthreads" >&5
1306 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
1307 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1308 echo $ac_n "(cached) $ac_c" 1>&6
1309 @@ -4801,7 +4720,7 @@
1310 ac_save_LIBS="$LIBS"
1311 LIBS="-lpthreads $LIBS"
1312 cat > conftest.$ac_ext <<EOF
1313 -#line 4805 "configure"
1314 +#line 4724 "configure"
1315 #include "confdefs.h"
1316 /* Override any gcc2 internal prototype to avoid an error. */
1317 /* We use char because int might match the return type of a gcc2
1318 @@ -4812,7 +4731,7 @@
1319 pthread_attr_init()
1320 ; return 0; }
1321 EOF
1322 -if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1323 +if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1324 rm -rf conftest*
1325 eval "ac_cv_lib_$ac_lib_var=yes"
1326 else
1327 @@ -4835,7 +4754,7 @@
1328 fi
1329 if test "x$G_THREAD_LIBS" = xerror; then
1330 echo $ac_n "checking for pthread_attr_init in -lthread""... $ac_c" 1>&6
1331 -echo "configure:4839: checking for pthread_attr_init in -lthread" >&5
1332 +echo "configure:4758: checking for pthread_attr_init in -lthread" >&5
1333 ac_lib_var=`echo thread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
1334 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1335 echo $ac_n "(cached) $ac_c" 1>&6
1336 @@ -4843,7 +4762,7 @@
1337 ac_save_LIBS="$LIBS"
1338 LIBS="-lthread $LIBS"
1339 cat > conftest.$ac_ext <<EOF
1340 -#line 4847 "configure"
1341 +#line 4766 "configure"
1342 #include "confdefs.h"
1343 /* Override any gcc2 internal prototype to avoid an error. */
1344 /* We use char because int might match the return type of a gcc2
1345 @@ -4854,7 +4773,7 @@
1346 pthread_attr_init()
1347 ; return 0; }
1348 EOF
1349 -if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1350 +if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1351 rm -rf conftest*
1352 eval "ac_cv_lib_$ac_lib_var=yes"
1353 else
1354 @@ -4877,7 +4796,7 @@
1355 fi
1356 if test "x$G_THREAD_LIBS" = xerror; then
1357 echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
1358 -echo "configure:4881: checking for pthread_attr_init in -lc_r" >&5
1359 +echo "configure:4800: checking for pthread_attr_init in -lc_r" >&5
1360 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
1361 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1362 echo $ac_n "(cached) $ac_c" 1>&6
1363 @@ -4885,7 +4804,7 @@
1364 ac_save_LIBS="$LIBS"
1365 LIBS="-lc_r $LIBS"
1366 cat > conftest.$ac_ext <<EOF
1367 -#line 4889 "configure"
1368 +#line 4808 "configure"
1369 #include "confdefs.h"
1370 /* Override any gcc2 internal prototype to avoid an error. */
1371 /* We use char because int might match the return type of a gcc2
1372 @@ -4896,7 +4815,7 @@
1373 pthread_attr_init()
1374 ; return 0; }
1375 EOF
1376 -if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1377 +if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1378 rm -rf conftest*
1379 eval "ac_cv_lib_$ac_lib_var=yes"
1380 else
1381 @@ -4919,12 +4838,12 @@
1382 fi
1383 if test "x$G_THREAD_LIBS" = xerror; then
1384 echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
1385 -echo "configure:4923: checking for pthread_attr_init" >&5
1386 +echo "configure:4842: checking for pthread_attr_init" >&5
1387 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
1388 echo $ac_n "(cached) $ac_c" 1>&6
1389 else
1390 cat > conftest.$ac_ext <<EOF
1391 -#line 4928 "configure"
1392 +#line 4847 "configure"
1393 #include "confdefs.h"
1394 /* System header to define __stub macros and hopefully few prototypes,
1395 which can conflict with char pthread_attr_init(); below. */
1396 @@ -4947,7 +4866,7 @@
1398 ; return 0; }
1399 EOF
1400 -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1401 +if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1402 rm -rf conftest*
1403 eval "ac_cv_func_pthread_attr_init=yes"
1404 else
1405 @@ -4969,7 +4888,7 @@
1406 fi
1407 if test "x$G_THREAD_LIBS" = xerror; then
1408 echo $ac_n "checking for __d10_pthread_attr_init in -lthread""... $ac_c" 1>&6
1409 -echo "configure:4973: checking for __d10_pthread_attr_init in -lthread" >&5
1410 +echo "configure:4892: checking for __d10_pthread_attr_init in -lthread" >&5
1411 ac_lib_var=`echo thread'_'__d10_pthread_attr_init | sed 'y%./+-%__p_%'`
1412 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1413 echo $ac_n "(cached) $ac_c" 1>&6
1414 @@ -4977,7 +4896,7 @@
1415 ac_save_LIBS="$LIBS"
1416 LIBS="-lthread $LIBS"
1417 cat > conftest.$ac_ext <<EOF
1418 -#line 4981 "configure"
1419 +#line 4900 "configure"
1420 #include "confdefs.h"
1421 /* Override any gcc2 internal prototype to avoid an error. */
1422 /* We use char because int might match the return type of a gcc2
1423 @@ -4988,7 +4907,7 @@
1424 __d10_pthread_attr_init()
1425 ; return 0; }
1426 EOF
1427 -if { (eval echo configure:4992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1428 +if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1429 rm -rf conftest*
1430 eval "ac_cv_lib_$ac_lib_var=yes"
1431 else
1432 @@ -5012,7 +4931,7 @@
1433 fi
1434 if test "x$G_THREAD_LIBS" = xerror; then
1435 echo $ac_n "checking for __pthread_attr_init_system in -lpthread""... $ac_c" 1>&6
1436 -echo "configure:5016: checking for __pthread_attr_init_system in -lpthread" >&5
1437 +echo "configure:4935: checking for __pthread_attr_init_system in -lpthread" >&5
1438 ac_lib_var=`echo pthread'_'__pthread_attr_init_system | sed 'y%./+-%__p_%'`
1439 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1440 echo $ac_n "(cached) $ac_c" 1>&6
1441 @@ -5020,7 +4939,7 @@
1442 ac_save_LIBS="$LIBS"
1443 LIBS="-lpthread $LIBS"
1444 cat > conftest.$ac_ext <<EOF
1445 -#line 5024 "configure"
1446 +#line 4943 "configure"
1447 #include "confdefs.h"
1448 /* Override any gcc2 internal prototype to avoid an error. */
1449 /* We use char because int might match the return type of a gcc2
1450 @@ -5031,7 +4950,7 @@
1451 __pthread_attr_init_system()
1452 ; return 0; }
1453 EOF
1454 -if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1455 +if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1456 rm -rf conftest*
1457 eval "ac_cv_lib_$ac_lib_var=yes"
1458 else
1459 @@ -5061,7 +4980,7 @@
1460 solaris)
1461 G_THREAD_LIBS=error
1462 echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6
1463 -echo "configure:5065: checking for cond_init in -lthread" >&5
1464 +echo "configure:4984: checking for cond_init in -lthread" >&5
1465 ac_lib_var=`echo thread'_'cond_init | sed 'y%./+-%__p_%'`
1466 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1467 echo $ac_n "(cached) $ac_c" 1>&6
1468 @@ -5069,7 +4988,7 @@
1469 ac_save_LIBS="$LIBS"
1470 LIBS="-lthread $LIBS"
1471 cat > conftest.$ac_ext <<EOF
1472 -#line 5073 "configure"
1473 +#line 4992 "configure"
1474 #include "confdefs.h"
1475 /* Override any gcc2 internal prototype to avoid an error. */
1476 /* We use char because int might match the return type of a gcc2
1477 @@ -5080,7 +4999,7 @@
1478 cond_init()
1479 ; return 0; }
1480 EOF
1481 -if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1482 +if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1483 rm -rf conftest*
1484 eval "ac_cv_lib_$ac_lib_var=yes"
1485 else
1486 @@ -5108,7 +5027,7 @@
1487 ;;
1488 nspr)
1489 echo $ac_n "checking for PRP_NewNakedCondVar in -lnspr21""... $ac_c" 1>&6
1490 -echo "configure:5112: checking for PRP_NewNakedCondVar in -lnspr21" >&5
1491 +echo "configure:5031: checking for PRP_NewNakedCondVar in -lnspr21" >&5
1492 ac_lib_var=`echo nspr21'_'PRP_NewNakedCondVar | sed 'y%./+-%__p_%'`
1493 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1494 echo $ac_n "(cached) $ac_c" 1>&6
1495 @@ -5116,7 +5035,7 @@
1496 ac_save_LIBS="$LIBS"
1497 LIBS="-lnspr21 $LIBS"
1498 cat > conftest.$ac_ext <<EOF
1499 -#line 5120 "configure"
1500 +#line 5039 "configure"
1501 #include "confdefs.h"
1502 /* Override any gcc2 internal prototype to avoid an error. */
1503 /* We use char because int might match the return type of a gcc2
1504 @@ -5127,7 +5046,7 @@
1505 PRP_NewNakedCondVar()
1506 ; return 0; }
1507 EOF
1508 -if { (eval echo configure:5131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1509 +if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1510 rm -rf conftest*
1511 eval "ac_cv_lib_$ac_lib_var=yes"
1512 else
1513 @@ -5163,7 +5082,7 @@
1514 fi
1516 echo $ac_n "checking necessary linker options""... $ac_c" 1>&6
1517 -echo "configure:5167: checking necessary linker options" >&5
1518 +echo "configure:5086: checking necessary linker options" >&5
1519 echo "$ac_t""$G_THREAD_LIBS" 1>&6
1522 @@ -5191,7 +5110,7 @@
1523 old_CPPFLAGS=$CPPFLAGS
1524 CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
1525 cat > conftest.$ac_ext <<EOF
1526 -#line 5195 "configure"
1527 +#line 5114 "configure"
1528 #include "confdefs.h"
1529 #include <time.h>
1530 EOF
1531 @@ -5208,7 +5127,7 @@
1532 CPPFLAGS=$old_CPPFLAGS
1534 echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
1535 -echo "configure:5212: checking necessary compiler options" >&5
1536 +echo "configure:5131: checking necessary compiler options" >&5
1538 echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
1539 else
1540 @@ -5226,12 +5145,12 @@
1541 for ac_func in localtime_r rand_r
1542 do
1543 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
1544 -echo "configure:5230: checking for $ac_func" >&5
1545 +echo "configure:5149: checking for $ac_func" >&5
1546 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
1547 echo $ac_n "(cached) $ac_c" 1>&6
1548 else
1549 cat > conftest.$ac_ext <<EOF
1550 -#line 5235 "configure"
1551 +#line 5154 "configure"
1552 #include "confdefs.h"
1553 /* System header to define __stub macros and hopefully few prototypes,
1554 which can conflict with char $ac_func(); below. */
1555 @@ -5254,7 +5173,7 @@
1557 ; return 0; }
1558 EOF
1559 -if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1560 +if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1561 rm -rf conftest*
1562 eval "ac_cv_func_$ac_func=yes"
1563 else
1564 @@ -5280,15 +5199,17 @@
1566 if test "$ac_cv_header_pwd_h" = "yes"; then
1567 echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6
1568 -echo "configure:5284: checking for getpwuid_r" >&5
1569 +echo "configure:5203: checking for getpwuid_r" >&5
1570 if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then
1571 echo $ac_n "(cached) $ac_c" 1>&6
1572 else
1573 if test "$cross_compiling" = yes; then
1574 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1575 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
1576 + ac_cv_func_getpwuid_r=yes
1577 +
1578 else
1579 cat > conftest.$ac_ext <<EOF
1580 -#line 5292 "configure"
1581 +#line 5213 "configure"
1582 #include "confdefs.h"
1583 #include <errno.h>
1584 int main () { char buffer[10000], *pointer;
1585 @@ -5300,7 +5221,7 @@
1586 sizeof (buffer), &pointer);
1587 return errno == ENOSYS || error == ENOSYS;}
1588 EOF
1589 -if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1590 +if { (eval echo configure:5225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1591 then
1592 ac_cv_func_getpwuid_r=yes
1593 else
1594 @@ -5312,6 +5233,7 @@
1595 rm -fr conftest*
1596 fi
1598 +
1599 fi
1601 if test "$ac_cv_func_getpwuid_r" = yes; then
1602 @@ -5325,11 +5247,11 @@
1603 fi
1604 if test "$ac_cv_func_getpwuid_r" = "yes"; then
1605 echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6
1606 -echo "configure:5329: checking whether getpwuid_r is posix like" >&5
1607 +echo "configure:5251: checking whether getpwuid_r is posix like" >&5
1608 # The signature for the POSIX version is:
1609 # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **)
1610 cat > conftest.$ac_ext <<EOF
1611 -#line 5333 "configure"
1612 +#line 5255 "configure"
1613 #include "confdefs.h"
1614 #include <pwd.h>
1615 #include <sys/types.h>
1616 @@ -5338,7 +5260,7 @@
1617 getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);
1618 ; return 0; }
1619 EOF
1620 -if { (eval echo configure:5342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1621 +if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1622 rm -rf conftest*
1623 cat >> confdefs.h <<\EOF
1624 #define HAVE_GETPWUID_R_POSIX 1
1625 @@ -5357,17 +5279,17 @@
1626 if test x"$have_threads" = xposix; then
1627 LIBS="$LIBS $G_THREAD_LIBS"
1628 echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6
1629 -echo "configure:5361: checking whether pthread_getspecific is posix like" >&5
1630 +echo "configure:5283: checking whether pthread_getspecific is posix like" >&5
1631 # PCThreads has pthread_getspecific(pthread_key_t, void **);
1632 cat > conftest.$ac_ext <<EOF
1633 -#line 5364 "configure"
1634 +#line 5286 "configure"
1635 #include "confdefs.h"
1636 #include <pthread.h>
1637 int main() {
1638 pthread_getspecific(0,NULL);
1639 ; return 0; }
1640 EOF
1641 -if { (eval echo configure:5371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1642 +if { (eval echo configure:5293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1643 rm -rf conftest*
1644 echo "$ac_t""no" 1>&6
1645 else
1646 @@ -5382,20 +5304,25 @@
1647 fi
1648 rm -f conftest*
1649 echo $ac_n "checking whether pthread_mutex_trylock is posix like""... $ac_c" 1>&6
1650 -echo "configure:5386: checking whether pthread_mutex_trylock is posix like" >&5
1651 +echo "configure:5308: checking whether pthread_mutex_trylock is posix like" >&5
1652 # DCE Threads return 1 as success, posix 0. what a mess.
1653 if test "$cross_compiling" = yes; then
1654 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1655 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
1656 + cat >> confdefs.h <<\EOF
1657 +#define HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX 1
1658 +EOF
1659 +
1660 +
1661 else
1662 cat > conftest.$ac_ext <<EOF
1663 -#line 5392 "configure"
1664 +#line 5319 "configure"
1665 #include "confdefs.h"
1666 #include <pthread.h>
1667 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
1668 int main () {
1669 return !pthread_mutex_trylock (&mutex); }
1670 EOF
1671 -if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1672 +if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1673 then
1674 echo "$ac_t""no" 1>&6
1675 else
1676 @@ -5412,13 +5339,18 @@
1677 fi
1679 echo $ac_n "checking whether pthread_cond_timedwait is posix like""... $ac_c" 1>&6
1680 -echo "configure:5416: checking whether pthread_cond_timedwait is posix like" >&5
1681 +echo "configure:5343: checking whether pthread_cond_timedwait is posix like" >&5
1682 # DCE Threads return -1 as failure, posix ETIMEDOUT.
1683 if test "$cross_compiling" = yes; then
1684 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1685 + echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2
1686 + cat >> confdefs.h <<\EOF
1687 +#define HAVE_PTHREAD_COND_TIMEDWAIT_POSIX 1
1688 +EOF
1689 +
1690 +
1691 else
1692 cat > conftest.$ac_ext <<EOF
1693 -#line 5422 "configure"
1694 +#line 5354 "configure"
1695 #include "confdefs.h"
1696 #include <pthread.h>
1697 int main () {
1698 @@ -5432,7 +5364,7 @@
1699 return pthread_cond_timedwait (&cond,&mutex,&tspec)
1700 != -1;}
1701 EOF
1702 -if { (eval echo configure:5436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1703 +if { (eval echo configure:5368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1704 then
1705 echo "$ac_t""no" 1>&6
1706 else
1707 @@ -5475,15 +5407,16 @@
1708 case "$mutex_has_default" in
1709 "yes")
1710 echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
1711 -echo "configure:5479: checking size of $mutex_default_type" >&5
1712 +echo "configure:5411: checking size of $mutex_default_type" >&5
1713 if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
1714 echo $ac_n "(cached) $ac_c" 1>&6
1715 else
1716 if test "$cross_compiling" = yes; then
1717 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1718 + glib_cv_sizeof_gmutex=24
1719 +
1720 else
1721 cat > conftest.$ac_ext <<EOF
1722 -#line 5487 "configure"
1723 +#line 5420 "configure"
1724 #include "confdefs.h"
1725 #include <stdio.h>
1726 #include <$mutex_header_file>
1727 @@ -5495,7 +5428,7 @@
1728 exit(0);
1729 }
1730 EOF
1731 -if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1732 +if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1733 then
1734 glib_cv_sizeof_gmutex=`cat conftestval`
1735 else
1736 @@ -5515,7 +5448,7 @@
1739 echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
1740 -echo "configure:5519: checking byte contents of $mutex_default_type" >&5
1741 +echo "configure:5452: checking byte contents of $mutex_default_type" >&5
1742 if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
1743 echo $ac_n "(cached) $ac_c" 1>&6
1744 else
1745 @@ -5523,7 +5456,7 @@
1746 glib_cv_byte_contents_gmutex=0
1747 else
1748 cat > conftest.$ac_ext <<EOF
1749 -#line 5527 "configure"
1750 +#line 5460 "configure"
1751 #include "confdefs.h"
1752 #include <stdio.h>
1753 #include <$mutex_header_file>
1754 @@ -5540,7 +5473,7 @@
1755 exit(0);
1756 }
1757 EOF
1758 -if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1759 +if { (eval echo configure:5477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1760 then
1761 glib_cv_byte_contents_gmutex=`cat conftestval`
1762 else
1763 @@ -5576,7 +5509,7 @@
1764 glib_nl='\n'
1765 fi
1766 echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
1767 -echo "configure:5580: checking system definitions for $glib_sysdef_msg" >&5
1768 +echo "configure:5513: checking system definitions for $glib_sysdef_msg" >&5
1769 cat >confrun.c <<_______EOF
1770 #include <stdio.h>
1771 #include <sys/types.h>
1772 @@ -5600,14 +5533,25 @@
1773 done
1774 echo "return 0; }" >>confrun.c
1775 if test "$cross_compiling" = yes; then
1776 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1777 + for glib_sysdef_input in POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 ; do
1778 + glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([^:]*\):.*$/\1/'`
1779 + glib_default=`echo $glib_sysdef_input | sed 's/^[^:]*:\(.*\)$/\1/'`
1780 + if test $glib_sysdef != $glib_default; then
1781 + glib_default=" =$glib_default"
1782 + else
1783 + glib_default=
1784 + fi
1785 + echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso
1786 + done
1787 + echo "configure: warning: cannot check it if cross compiling -- using defaults" 1>&2
1788 +
1789 else
1790 cat > conftest.$ac_ext <<EOF
1791 -#line 5607 "configure"
1792 +#line 5551 "configure"
1793 #include "confdefs.h"
1794 `cat confrun.c`
1795 EOF
1796 -if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1797 +if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1798 then
1799 echo "$ac_t""done" 1>&6
1800 else