1 --- iceweasel-3.0.1.orig/configure
2 +++ iceweasel-3.0.1/configure
7 -for ac_prog in gawk mawk nawk awk
8 +for ac_prog in mawk gawk nawk awk
10 # Extract the first word of "$ac_prog", so it can be a program name with args.
11 set dummy $ac_prog; ac_word=$2
12 @@ -1897,57 +1897,6 @@
16 -for ac_declaration in \
18 - '#include <stdlib.h>' \
19 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
20 - 'extern "C" void std::exit (int); using std::exit;' \
21 - 'extern "C" void exit (int) throw ();' \
22 - 'extern "C" void exit (int);' \
25 - cat > conftest.$ac_ext <<EOF
26 -#line 1911 "configure"
27 -#include "confdefs.h"
34 -if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
37 - echo "configure: failed program was:" >&5
38 - cat conftest.$ac_ext >&5
43 - cat > conftest.$ac_ext <<EOF
44 -#line 1929 "configure"
45 -#include "confdefs.h"
51 -if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
55 - echo "configure: failed program was:" >&5
56 - cat conftest.$ac_ext >&5
60 -if test -n "$ac_declaration"; then
61 - echo '#ifdef __cplusplus' >>confdefs.h
62 - echo $ac_declaration >>confdefs.h
63 - echo '#endif' >>confdefs.h
68 case "$build:$target" in
69 powerpc-apple-darwin8*:i?86-apple-darwin*)
71 # Extract the first word of "$ac_prog", so it can be a program name with args.
72 set dummy $ac_prog; ac_word=$2
73 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
74 -echo "configure:1965: checking for $ac_word" >&5
75 +echo "configure:1914: checking for $ac_word" >&5
76 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
77 echo $ac_n "(cached) $ac_c" 1>&6
80 # Extract the first word of "$ac_prog", so it can be a program name with args.
81 set dummy $ac_prog; ac_word=$2
82 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
83 -echo "configure:2000: checking for $ac_word" >&5
84 +echo "configure:1949: checking for $ac_word" >&5
85 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
86 echo $ac_n "(cached) $ac_c" 1>&6
89 # Extract the first word of "$ac_prog", so it can be a program name with args.
90 set dummy $ac_prog; ac_word=$2
91 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
92 -echo "configure:2035: checking for $ac_word" >&5
93 +echo "configure:1984: checking for $ac_word" >&5
94 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
95 echo $ac_n "(cached) $ac_c" 1>&6
98 # Extract the first word of "$ac_prog", so it can be a program name with args.
99 set dummy $ac_prog; ac_word=$2
100 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
101 -echo "configure:2076: checking for $ac_word" >&5
102 +echo "configure:2025: checking for $ac_word" >&5
103 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
104 echo $ac_n "(cached) $ac_c" 1>&6
106 @@ -2107,7 +2056,7 @@
107 # Extract the first word of "$ac_prog", so it can be a program name with args.
108 set dummy $ac_prog; ac_word=$2
109 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
110 -echo "configure:2111: checking for $ac_word" >&5
111 +echo "configure:2060: checking for $ac_word" >&5
112 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
113 echo $ac_n "(cached) $ac_c" 1>&6
115 @@ -2142,7 +2091,7 @@
116 # Extract the first word of "$ac_prog", so it can be a program name with args.
117 set dummy $ac_prog; ac_word=$2
118 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
119 -echo "configure:2146: checking for $ac_word" >&5
120 +echo "configure:2095: checking for $ac_word" >&5
121 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
122 echo $ac_n "(cached) $ac_c" 1>&6
124 @@ -2180,7 +2129,7 @@
125 # Extract the first word of "gcc", so it can be a program name with args.
126 set dummy gcc; ac_word=$2
127 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
128 -echo "configure:2184: checking for $ac_word" >&5
129 +echo "configure:2133: checking for $ac_word" >&5
130 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
131 echo $ac_n "(cached) $ac_c" 1>&6
133 @@ -2210,7 +2159,7 @@
134 # Extract the first word of "cc", so it can be a program name with args.
135 set dummy cc; ac_word=$2
136 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
137 -echo "configure:2214: checking for $ac_word" >&5
138 +echo "configure:2163: checking for $ac_word" >&5
139 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
140 echo $ac_n "(cached) $ac_c" 1>&6
142 @@ -2261,7 +2210,7 @@
143 # Extract the first word of "cl", so it can be a program name with args.
144 set dummy cl; ac_word=$2
145 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
146 -echo "configure:2265: checking for $ac_word" >&5
147 +echo "configure:2214: checking for $ac_word" >&5
148 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
149 echo $ac_n "(cached) $ac_c" 1>&6
151 @@ -2293,7 +2242,7 @@
154 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
155 -echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
156 +echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
159 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
160 @@ -2304,12 +2253,12 @@
162 cat > conftest.$ac_ext << EOF
164 -#line 2308 "configure"
165 +#line 2257 "configure"
166 #include "confdefs.h"
170 -if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
171 +if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
172 ac_cv_prog_cc_works=yes
173 # If we can't run a trivial program, we are probably using a cross compiler.
174 if (./conftest; exit) 2>/dev/null; then
175 @@ -2335,12 +2284,12 @@
176 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
178 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
179 -echo "configure:2339: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
180 +echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
181 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
182 cross_compiling=$ac_cv_prog_cc_cross
184 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
185 -echo "configure:2344: checking whether we are using GNU C" >&5
186 +echo "configure:2293: checking whether we are using GNU C" >&5
187 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
188 echo $ac_n "(cached) $ac_c" 1>&6
190 @@ -2349,7 +2298,7 @@
194 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
195 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
199 @@ -2368,7 +2317,7 @@
200 ac_save_CFLAGS="$CFLAGS"
202 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
203 -echo "configure:2372: checking whether ${CC-cc} accepts -g" >&5
204 +echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5
205 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
206 echo $ac_n "(cached) $ac_c" 1>&6
208 @@ -2404,7 +2353,7 @@
209 # Extract the first word of "$ac_prog", so it can be a program name with args.
210 set dummy $ac_prog; ac_word=$2
211 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
212 -echo "configure:2408: checking for $ac_word" >&5
213 +echo "configure:2357: checking for $ac_word" >&5
214 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
215 echo $ac_n "(cached) $ac_c" 1>&6
217 @@ -2436,7 +2385,7 @@
220 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
221 -echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
222 +echo "configure:2389: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
225 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
226 @@ -2447,12 +2396,12 @@
228 cat > conftest.$ac_ext << EOF
230 -#line 2451 "configure"
231 +#line 2400 "configure"
232 #include "confdefs.h"
234 int main(){return(0);}
236 -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
237 +if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
238 ac_cv_prog_cxx_works=yes
239 # If we can't run a trivial program, we are probably using a cross compiler.
240 if (./conftest; exit) 2>/dev/null; then
241 @@ -2478,12 +2427,12 @@
242 { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
244 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
245 -echo "configure:2482: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
246 +echo "configure:2431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
247 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
248 cross_compiling=$ac_cv_prog_cxx_cross
250 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
251 -echo "configure:2487: checking whether we are using GNU C++" >&5
252 +echo "configure:2436: checking whether we are using GNU C++" >&5
253 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
254 echo $ac_n "(cached) $ac_c" 1>&6
256 @@ -2492,7 +2441,7 @@
260 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
261 +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
265 @@ -2511,7 +2460,7 @@
266 ac_save_CXXFLAGS="$CXXFLAGS"
268 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
269 -echo "configure:2515: checking whether ${CXX-g++} accepts -g" >&5
270 +echo "configure:2464: checking whether ${CXX-g++} accepts -g" >&5
271 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
272 echo $ac_n "(cached) $ac_c" 1>&6
274 @@ -2542,61 +2491,10 @@
278 -for ac_declaration in \
280 - '#include <stdlib.h>' \
281 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
282 - 'extern "C" void std::exit (int); using std::exit;' \
283 - 'extern "C" void exit (int) throw ();' \
284 - 'extern "C" void exit (int);' \
287 - cat > conftest.$ac_ext <<EOF
288 -#line 2556 "configure"
289 -#include "confdefs.h"
296 -if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
299 - echo "configure: failed program was:" >&5
300 - cat conftest.$ac_ext >&5
305 - cat > conftest.$ac_ext <<EOF
306 -#line 2574 "configure"
307 -#include "confdefs.h"
313 -if { (eval echo configure:2581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
317 - echo "configure: failed program was:" >&5
318 - cat conftest.$ac_ext >&5
322 -if test -n "$ac_declaration"; then
323 - echo '#ifdef __cplusplus' >>confdefs.h
324 - echo $ac_declaration >>confdefs.h
325 - echo '#endif' >>confdefs.h
329 # Extract the first word of "ranlib", so it can be a program name with args.
330 set dummy ranlib; ac_word=$2
331 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
332 -echo "configure:2600: checking for $ac_word" >&5
333 +echo "configure:2498: checking for $ac_word" >&5
334 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
335 echo $ac_n "(cached) $ac_c" 1>&6
337 @@ -2628,7 +2526,7 @@
338 # Extract the first word of "$ac_prog", so it can be a program name with args.
339 set dummy $ac_prog; ac_word=$2
340 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
341 -echo "configure:2632: checking for $ac_word" >&5
342 +echo "configure:2530: checking for $ac_word" >&5
343 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
344 echo $ac_n "(cached) $ac_c" 1>&6
346 @@ -2669,7 +2567,7 @@
347 # Extract the first word of "$ac_prog", so it can be a program name with args.
348 set dummy $ac_prog; ac_word=$2
349 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
350 -echo "configure:2673: checking for $ac_word" >&5
351 +echo "configure:2571: checking for $ac_word" >&5
352 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
353 echo $ac_n "(cached) $ac_c" 1>&6
355 @@ -2704,7 +2602,7 @@
356 # Extract the first word of "$ac_prog", so it can be a program name with args.
357 set dummy $ac_prog; ac_word=$2
358 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
359 -echo "configure:2708: checking for $ac_word" >&5
360 +echo "configure:2606: checking for $ac_word" >&5
361 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
362 echo $ac_n "(cached) $ac_c" 1>&6
364 @@ -2739,7 +2637,7 @@
365 # Extract the first word of "$ac_prog", so it can be a program name with args.
366 set dummy $ac_prog; ac_word=$2
367 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
368 -echo "configure:2743: checking for $ac_word" >&5
369 +echo "configure:2641: checking for $ac_word" >&5
370 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
371 echo $ac_n "(cached) $ac_c" 1>&6
373 @@ -2774,7 +2672,7 @@
374 # Extract the first word of "$ac_prog", so it can be a program name with args.
375 set dummy $ac_prog; ac_word=$2
376 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
377 -echo "configure:2778: checking for $ac_word" >&5
378 +echo "configure:2676: checking for $ac_word" >&5
379 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
380 echo $ac_n "(cached) $ac_c" 1>&6
382 @@ -2907,7 +2805,7 @@
383 # Extract the first word of "$ac_prog", so it can be a program name with args.
384 set dummy $ac_prog; ac_word=$2
385 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
386 -echo "configure:2911: checking for $ac_word" >&5
387 +echo "configure:2809: checking for $ac_word" >&5
388 if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then
389 echo $ac_n "(cached) $ac_c" 1>&6
391 @@ -2949,14 +2847,14 @@
392 cross_compiling=$ac_cv_prog_cc_cross
394 cat > conftest.$ac_ext <<EOF
395 -#line 2953 "configure"
396 +#line 2851 "configure"
397 #include "confdefs.h"
400 printf("Hello World\n");
403 -if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
404 +if { (eval echo configure:2858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
407 echo "configure: failed program was:" >&5
408 @@ -2974,14 +2872,14 @@
409 cross_compiling=$ac_cv_prog_cxx_cross
411 cat > conftest.$ac_ext <<EOF
412 -#line 2978 "configure"
413 +#line 2876 "configure"
414 #include "confdefs.h"
417 unsigned *test = new unsigned(42);
420 -if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
421 +if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
424 echo "configure: failed program was:" >&5
425 @@ -3096,7 +2994,7 @@
426 _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
427 # Add flags if necessary
428 echo $ac_n "checking for midl flags""... $ac_c" 1>&6
429 -echo "configure:3100: checking for midl flags" >&5
430 +echo "configure:2998: checking for midl flags" >&5
431 if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then
432 # Starting with MIDL version 6.0.359, the MIDL compiler
433 # generates /Oicf /robust stubs by default, which is not
434 @@ -3118,9 +3016,9 @@
435 _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
436 _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
437 echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
438 -echo "configure:3122: checking for w32api version >= $W32API_VERSION" >&5
439 +echo "configure:3020: checking for w32api version >= $W32API_VERSION" >&5
440 cat > conftest.$ac_ext <<EOF
441 -#line 3124 "configure"
442 +#line 3022 "configure"
443 #include "confdefs.h"
446 @@ -3132,7 +3030,7 @@
450 -if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
451 +if { (eval echo configure:3034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
455 @@ -3148,7 +3046,7 @@
457 # Check windres version
458 echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
459 -echo "configure:3152: checking for windres version >= $WINDRES_VERSION" >&5
460 +echo "configure:3050: checking for windres version >= $WINDRES_VERSION" >&5
461 _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
462 echo "$ac_t""$_WINDRES_VERSION" 1>&6
463 _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
464 @@ -3187,10 +3085,10 @@
465 if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
466 if test "x$CC" != xcc; then
467 echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
468 -echo "configure:3191: checking whether $CC and cc understand -c and -o together" >&5
469 +echo "configure:3089: checking whether $CC and cc understand -c and -o together" >&5
471 echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
472 -echo "configure:3194: checking whether cc understands -c and -o together" >&5
473 +echo "configure:3092: checking whether cc understands -c and -o together" >&5
475 set dummy $CC; ac_cc="`echo $2 |
476 sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
477 @@ -3202,16 +3100,16 @@
478 # We do the test twice because some compilers refuse to overwrite an
479 # existing .o file with -o, though they will create one.
480 ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
481 -if { (eval echo configure:3206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
482 - test -f conftest.o && { (eval echo configure:3207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
483 +if { (eval echo configure:3104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
484 + test -f conftest.o && { (eval echo configure:3105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
486 eval ac_cv_prog_cc_${ac_cc}_c_o=yes
487 if test "x$CC" != xcc; then
488 # Test first that cc exists at all.
489 - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
490 + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
491 ac_try='cc -c conftest.c -o conftest.o 1>&5'
492 - if { (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
493 - test -f conftest.o && { (eval echo configure:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
494 + if { (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
495 + test -f conftest.o && { (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
499 @@ -3247,7 +3145,7 @@
502 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
503 -echo "configure:3251: checking how to run the C preprocessor" >&5
504 +echo "configure:3149: checking how to run the C preprocessor" >&5
505 # On Suns, sometimes $CPP names a directory.
506 if test -n "$CPP" && test -d "$CPP"; then
508 @@ -3262,13 +3160,13 @@
509 # On the NeXT, cc -E runs the code through the compiler's parser,
510 # not just through cpp.
511 cat > conftest.$ac_ext <<EOF
512 -#line 3266 "configure"
513 +#line 3164 "configure"
514 #include "confdefs.h"
518 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
519 -{ (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
520 +{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
521 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
522 if test -z "$ac_err"; then
524 @@ -3279,13 +3177,13 @@
526 CPP="${CC-cc} -E -traditional-cpp"
527 cat > conftest.$ac_ext <<EOF
528 -#line 3283 "configure"
529 +#line 3181 "configure"
530 #include "confdefs.h"
534 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
535 -{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
536 +{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
537 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
538 if test -z "$ac_err"; then
540 @@ -3296,13 +3194,13 @@
542 CPP="${CC-cc} -nologo -E"
543 cat > conftest.$ac_ext <<EOF
544 -#line 3300 "configure"
545 +#line 3198 "configure"
546 #include "confdefs.h"
550 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
551 -{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
552 +{ (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
553 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
554 if test -z "$ac_err"; then
556 @@ -3327,7 +3225,7 @@
557 echo "$ac_t""$CPP" 1>&6
559 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
560 -echo "configure:3331: checking how to run the C++ preprocessor" >&5
561 +echo "configure:3229: checking how to run the C++ preprocessor" >&5
562 if test -z "$CXXCPP"; then
563 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
564 echo $ac_n "(cached) $ac_c" 1>&6
565 @@ -3340,12 +3238,12 @@
566 cross_compiling=$ac_cv_prog_cxx_cross
567 CXXCPP="${CXX-g++} -E"
568 cat > conftest.$ac_ext <<EOF
569 -#line 3344 "configure"
570 +#line 3242 "configure"
571 #include "confdefs.h"
574 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
575 -{ (eval echo configure:3349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
576 +{ (eval echo configure:3247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
577 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
578 if test -z "$ac_err"; then
580 @@ -3400,7 +3298,7 @@
581 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
582 # ./install, which can be erroneously created by make from ./install.sh.
583 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
584 -echo "configure:3404: checking for a BSD compatible install" >&5
585 +echo "configure:3302: checking for a BSD compatible install" >&5
586 if test -z "$INSTALL"; then
587 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
588 echo $ac_n "(cached) $ac_c" 1>&6
589 @@ -3453,7 +3351,7 @@
590 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
592 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
593 -echo "configure:3457: checking whether ln -s works" >&5
594 +echo "configure:3355: checking whether ln -s works" >&5
595 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
596 echo $ac_n "(cached) $ac_c" 1>&6
598 @@ -3478,7 +3376,7 @@
599 # Extract the first word of "$ac_prog", so it can be a program name with args.
600 set dummy $ac_prog; ac_word=$2
601 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
602 -echo "configure:3482: checking for $ac_word" >&5
603 +echo "configure:3380: checking for $ac_word" >&5
604 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
605 echo $ac_n "(cached) $ac_c" 1>&6
607 @@ -3519,7 +3417,7 @@
609 if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then
610 echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
611 -echo "configure:3523: checking for minimum required perl version >= $PERL_VERSION" >&5
612 +echo "configure:3421: checking for minimum required perl version >= $PERL_VERSION" >&5
613 _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5`
615 echo "$ac_t""$_perl_version" 1>&6
616 @@ -3530,7 +3428,7 @@
619 echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
620 -echo "configure:3534: checking for full perl installation" >&5
621 +echo "configure:3432: checking for full perl installation" >&5
622 _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5`
624 if test "$_perl_res" != 0; then
625 @@ -3545,7 +3443,7 @@
626 # Extract the first word of "$ac_prog", so it can be a program name with args.
627 set dummy $ac_prog; ac_word=$2
628 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
629 -echo "configure:3549: checking for $ac_word" >&5
630 +echo "configure:3447: checking for $ac_word" >&5
631 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
632 echo $ac_n "(cached) $ac_c" 1>&6
634 @@ -3590,7 +3488,7 @@
635 # Extract the first word of "$ac_prog", so it can be a program name with args.
636 set dummy $ac_prog; ac_word=$2
637 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
638 -echo "configure:3594: checking for $ac_word" >&5
639 +echo "configure:3492: checking for $ac_word" >&5
640 if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
641 echo $ac_n "(cached) $ac_c" 1>&6
643 @@ -3635,7 +3533,7 @@
644 # Extract the first word of "doxygen", so it can be a program name with args.
645 set dummy doxygen; ac_word=$2
646 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
647 -echo "configure:3639: checking for $ac_word" >&5
648 +echo "configure:3537: checking for $ac_word" >&5
649 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then
650 echo $ac_n "(cached) $ac_c" 1>&6
652 @@ -3671,7 +3569,7 @@
653 # Extract the first word of "whoami", so it can be a program name with args.
654 set dummy whoami; ac_word=$2
655 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
656 -echo "configure:3675: checking for $ac_word" >&5
657 +echo "configure:3573: checking for $ac_word" >&5
658 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
659 echo $ac_n "(cached) $ac_c" 1>&6
661 @@ -3707,7 +3605,7 @@
662 # Extract the first word of "autoconf", so it can be a program name with args.
663 set dummy autoconf; ac_word=$2
664 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
665 -echo "configure:3711: checking for $ac_word" >&5
666 +echo "configure:3609: checking for $ac_word" >&5
667 if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then
668 echo $ac_n "(cached) $ac_c" 1>&6
670 @@ -3743,7 +3641,7 @@
671 # Extract the first word of "unzip", so it can be a program name with args.
672 set dummy unzip; ac_word=$2
673 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
674 -echo "configure:3747: checking for $ac_word" >&5
675 +echo "configure:3645: checking for $ac_word" >&5
676 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
677 echo $ac_n "(cached) $ac_c" 1>&6
679 @@ -3781,7 +3679,7 @@
680 # Extract the first word of "$ac_prog", so it can be a program name with args.
681 set dummy $ac_prog; ac_word=$2
682 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
683 -echo "configure:3785: checking for $ac_word" >&5
684 +echo "configure:3683: checking for $ac_word" >&5
685 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
686 echo $ac_n "(cached) $ac_c" 1>&6
688 @@ -3822,7 +3720,7 @@
689 # Extract the first word of "makedepend", so it can be a program name with args.
690 set dummy makedepend; ac_word=$2
691 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
692 -echo "configure:3826: checking for $ac_word" >&5
693 +echo "configure:3724: checking for $ac_word" >&5
694 if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then
695 echo $ac_n "(cached) $ac_c" 1>&6
697 @@ -3857,7 +3755,7 @@
698 # Extract the first word of "xargs", so it can be a program name with args.
699 set dummy xargs; ac_word=$2
700 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
701 -echo "configure:3861: checking for $ac_word" >&5
702 +echo "configure:3759: checking for $ac_word" >&5
703 if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then
704 echo $ac_n "(cached) $ac_c" 1>&6
706 @@ -3918,7 +3816,7 @@
707 # Extract the first word of "$ac_prog", so it can be a program name with args.
708 set dummy $ac_prog; ac_word=$2
709 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
710 -echo "configure:3922: checking for $ac_word" >&5
711 +echo "configure:3820: checking for $ac_word" >&5
712 if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then
713 echo $ac_n "(cached) $ac_c" 1>&6
715 @@ -3968,7 +3866,7 @@
716 # Extract the first word of "sdp", so it can be a program name with args.
717 set dummy sdp; ac_word=$2
718 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
719 -echo "configure:3972: checking for $ac_word" >&5
720 +echo "configure:3870: checking for $ac_word" >&5
721 if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then
722 echo $ac_n "(cached) $ac_c" 1>&6
724 @@ -4089,7 +3987,7 @@
727 echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
728 -echo "configure:4093: checking for valid compiler/Mac OS X SDK combination" >&5
729 +echo "configure:3991: checking for valid compiler/Mac OS X SDK combination" >&5
731 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
732 ac_cpp='$CXXCPP $CPPFLAGS'
733 @@ -4098,7 +3996,7 @@
734 cross_compiling=$ac_cv_prog_cxx_cross
736 cat > conftest.$ac_ext <<EOF
737 -#line 4102 "configure"
738 +#line 4000 "configure"
739 #include "confdefs.h"
741 int main() { return 0; }
742 @@ -4106,7 +4004,7 @@
746 -if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
747 +if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
751 @@ -4137,7 +4035,7 @@
752 # Extract the first word of "$ac_prog", so it can be a program name with args.
753 set dummy $ac_prog; ac_word=$2
754 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
755 -echo "configure:4141: checking for $ac_word" >&5
756 +echo "configure:4039: checking for $ac_word" >&5
757 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
758 echo $ac_n "(cached) $ac_c" 1>&6
760 @@ -4180,7 +4078,7 @@
761 # Extract the first word of "$ac_prog", so it can be a program name with args.
762 set dummy $ac_prog; ac_word=$2
763 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
764 -echo "configure:4184: checking for $ac_word" >&5
765 +echo "configure:4082: checking for $ac_word" >&5
766 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
767 echo $ac_n "(cached) $ac_c" 1>&6
769 @@ -4248,7 +4146,7 @@
770 # Uses ac_ vars as temps to allow command line to override cache and checks.
771 # --without-x overrides everything else, but does not touch the cache.
772 echo $ac_n "checking for X""... $ac_c" 1>&6
773 -echo "configure:4252: checking for X" >&5
774 +echo "configure:4150: checking for X" >&5
776 # Check whether --with-x or --without-x was given.
777 if test "${with_x+set}" = set; then
778 @@ -4310,12 +4208,12 @@
780 # First, try using that file with no special directory specified.
781 cat > conftest.$ac_ext <<EOF
782 -#line 4314 "configure"
783 +#line 4212 "configure"
784 #include "confdefs.h"
785 #include <$x_direct_test_include>
787 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
788 -{ (eval echo configure:4319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
789 +{ (eval echo configure:4217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
790 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
791 if test -z "$ac_err"; then
793 @@ -4384,14 +4282,14 @@
795 LIBS="-l$x_direct_test_library $LIBS"
796 cat > conftest.$ac_ext <<EOF
797 -#line 4388 "configure"
798 +#line 4286 "configure"
799 #include "confdefs.h"
802 ${x_direct_test_function}()
805 -if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
806 +if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
809 # We can link X programs with no special library path.
810 @@ -4497,17 +4395,17 @@
811 case "`(uname -sr) 2>/dev/null`" in
813 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
814 -echo "configure:4501: checking whether -R must be followed by a space" >&5
815 +echo "configure:4399: checking whether -R must be followed by a space" >&5
816 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
817 cat > conftest.$ac_ext <<EOF
818 -#line 4504 "configure"
819 +#line 4402 "configure"
820 #include "confdefs.h"
826 -if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
827 +if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
831 @@ -4523,14 +4421,14 @@
833 LIBS="$ac_xsave_LIBS -R $x_libraries"
834 cat > conftest.$ac_ext <<EOF
835 -#line 4527 "configure"
836 +#line 4425 "configure"
837 #include "confdefs.h"
843 -if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
844 +if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
848 @@ -4562,7 +4460,7 @@
849 # libraries were built with DECnet support. And karl@cs.umb.edu says
850 # the Alpha needs dnet_stub (dnet does not exist).
851 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
852 -echo "configure:4566: checking for dnet_ntoa in -ldnet" >&5
853 +echo "configure:4464: checking for dnet_ntoa in -ldnet" >&5
854 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
855 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
856 echo $ac_n "(cached) $ac_c" 1>&6
857 @@ -4570,7 +4468,7 @@
860 cat > conftest.$ac_ext <<EOF
861 -#line 4574 "configure"
862 +#line 4472 "configure"
863 #include "confdefs.h"
864 /* Override any gcc2 internal prototype to avoid an error. */
865 /* We use char because int might match the return type of a gcc2
866 @@ -4581,7 +4479,7 @@
870 -if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
871 +if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
873 eval "ac_cv_lib_$ac_lib_var=yes"
875 @@ -4603,7 +4501,7 @@
877 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
878 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
879 -echo "configure:4607: checking for dnet_ntoa in -ldnet_stub" >&5
880 +echo "configure:4505: checking for dnet_ntoa in -ldnet_stub" >&5
881 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
882 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
883 echo $ac_n "(cached) $ac_c" 1>&6
884 @@ -4611,7 +4509,7 @@
886 LIBS="-ldnet_stub $LIBS"
887 cat > conftest.$ac_ext <<EOF
888 -#line 4615 "configure"
889 +#line 4513 "configure"
890 #include "confdefs.h"
891 /* Override any gcc2 internal prototype to avoid an error. */
892 /* We use char because int might match the return type of a gcc2
893 @@ -4622,7 +4520,7 @@
897 -if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
898 +if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
900 eval "ac_cv_lib_$ac_lib_var=yes"
902 @@ -4651,12 +4549,12 @@
903 # The nsl library prevents programs from opening the X display
904 # on Irix 5.2, according to dickey@clark.net.
905 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
906 -echo "configure:4655: checking for gethostbyname" >&5
907 +echo "configure:4553: checking for gethostbyname" >&5
908 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
909 echo $ac_n "(cached) $ac_c" 1>&6
911 cat > conftest.$ac_ext <<EOF
912 -#line 4660 "configure"
913 +#line 4558 "configure"
914 #include "confdefs.h"
915 /* System header to define __stub macros and hopefully few prototypes,
916 which can conflict with char gethostbyname(); below. */
917 @@ -4679,7 +4577,7 @@
921 -if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
922 +if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
924 eval "ac_cv_func_gethostbyname=yes"
926 @@ -4700,7 +4598,7 @@
928 if test $ac_cv_func_gethostbyname = no; then
929 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
930 -echo "configure:4704: checking for gethostbyname in -lnsl" >&5
931 +echo "configure:4602: checking for gethostbyname in -lnsl" >&5
932 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
933 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
934 echo $ac_n "(cached) $ac_c" 1>&6
935 @@ -4708,7 +4606,7 @@
938 cat > conftest.$ac_ext <<EOF
939 -#line 4712 "configure"
940 +#line 4610 "configure"
941 #include "confdefs.h"
942 /* Override any gcc2 internal prototype to avoid an error. */
943 /* We use char because int might match the return type of a gcc2
944 @@ -4719,7 +4617,7 @@
948 -if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
949 +if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
951 eval "ac_cv_lib_$ac_lib_var=yes"
953 @@ -4749,12 +4647,12 @@
954 # -lsocket must be given before -lnsl if both are needed.
955 # We assume that if connect needs -lnsl, so does gethostbyname.
956 echo $ac_n "checking for connect""... $ac_c" 1>&6
957 -echo "configure:4753: checking for connect" >&5
958 +echo "configure:4651: checking for connect" >&5
959 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
960 echo $ac_n "(cached) $ac_c" 1>&6
962 cat > conftest.$ac_ext <<EOF
963 -#line 4758 "configure"
964 +#line 4656 "configure"
965 #include "confdefs.h"
966 /* System header to define __stub macros and hopefully few prototypes,
967 which can conflict with char connect(); below. */
968 @@ -4777,7 +4675,7 @@
972 -if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
973 +if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
975 eval "ac_cv_func_connect=yes"
977 @@ -4798,7 +4696,7 @@
979 if test $ac_cv_func_connect = no; then
980 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
981 -echo "configure:4802: checking for connect in -lsocket" >&5
982 +echo "configure:4700: checking for connect in -lsocket" >&5
983 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
984 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
985 echo $ac_n "(cached) $ac_c" 1>&6
986 @@ -4806,7 +4704,7 @@
988 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
989 cat > conftest.$ac_ext <<EOF
990 -#line 4810 "configure"
991 +#line 4708 "configure"
992 #include "confdefs.h"
993 /* Override any gcc2 internal prototype to avoid an error. */
994 /* We use char because int might match the return type of a gcc2
995 @@ -4817,7 +4715,7 @@
999 -if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1000 +if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1002 eval "ac_cv_lib_$ac_lib_var=yes"
1004 @@ -4841,12 +4739,12 @@
1006 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1007 echo $ac_n "checking for remove""... $ac_c" 1>&6
1008 -echo "configure:4845: checking for remove" >&5
1009 +echo "configure:4743: checking for remove" >&5
1010 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1011 echo $ac_n "(cached) $ac_c" 1>&6
1013 cat > conftest.$ac_ext <<EOF
1014 -#line 4850 "configure"
1015 +#line 4748 "configure"
1016 #include "confdefs.h"
1017 /* System header to define __stub macros and hopefully few prototypes,
1018 which can conflict with char remove(); below. */
1019 @@ -4869,7 +4767,7 @@
1023 -if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1024 +if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1026 eval "ac_cv_func_remove=yes"
1028 @@ -4890,7 +4788,7 @@
1030 if test $ac_cv_func_remove = no; then
1031 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1032 -echo "configure:4894: checking for remove in -lposix" >&5
1033 +echo "configure:4792: checking for remove in -lposix" >&5
1034 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1035 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1036 echo $ac_n "(cached) $ac_c" 1>&6
1037 @@ -4898,7 +4796,7 @@
1038 ac_save_LIBS="$LIBS"
1039 LIBS="-lposix $LIBS"
1040 cat > conftest.$ac_ext <<EOF
1041 -#line 4902 "configure"
1042 +#line 4800 "configure"
1043 #include "confdefs.h"
1044 /* Override any gcc2 internal prototype to avoid an error. */
1045 /* We use char because int might match the return type of a gcc2
1046 @@ -4909,7 +4807,7 @@
1050 -if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1051 +if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1053 eval "ac_cv_lib_$ac_lib_var=yes"
1055 @@ -4933,12 +4831,12 @@
1057 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1058 echo $ac_n "checking for shmat""... $ac_c" 1>&6
1059 -echo "configure:4937: checking for shmat" >&5
1060 +echo "configure:4835: checking for shmat" >&5
1061 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
1062 echo $ac_n "(cached) $ac_c" 1>&6
1064 cat > conftest.$ac_ext <<EOF
1065 -#line 4942 "configure"
1066 +#line 4840 "configure"
1067 #include "confdefs.h"
1068 /* System header to define __stub macros and hopefully few prototypes,
1069 which can conflict with char shmat(); below. */
1070 @@ -4961,7 +4859,7 @@
1074 -if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1075 +if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1077 eval "ac_cv_func_shmat=yes"
1079 @@ -4982,7 +4880,7 @@
1081 if test $ac_cv_func_shmat = no; then
1082 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
1083 -echo "configure:4986: checking for shmat in -lipc" >&5
1084 +echo "configure:4884: checking for shmat in -lipc" >&5
1085 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
1086 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1087 echo $ac_n "(cached) $ac_c" 1>&6
1088 @@ -4990,7 +4888,7 @@
1089 ac_save_LIBS="$LIBS"
1091 cat > conftest.$ac_ext <<EOF
1092 -#line 4994 "configure"
1093 +#line 4892 "configure"
1094 #include "confdefs.h"
1095 /* Override any gcc2 internal prototype to avoid an error. */
1096 /* We use char because int might match the return type of a gcc2
1097 @@ -5001,7 +4899,7 @@
1101 -if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1102 +if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1104 eval "ac_cv_lib_$ac_lib_var=yes"
1106 @@ -5034,7 +4932,7 @@
1107 # libraries we check for below, so use a different variable.
1108 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
1109 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
1110 -echo "configure:5038: checking for IceConnectionNumber in -lICE" >&5
1111 +echo "configure:4936: checking for IceConnectionNumber in -lICE" >&5
1112 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
1113 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1114 echo $ac_n "(cached) $ac_c" 1>&6
1115 @@ -5042,7 +4940,7 @@
1116 ac_save_LIBS="$LIBS"
1117 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
1118 cat > conftest.$ac_ext <<EOF
1119 -#line 5046 "configure"
1120 +#line 4944 "configure"
1121 #include "confdefs.h"
1122 /* Override any gcc2 internal prototype to avoid an error. */
1123 /* We use char because int might match the return type of a gcc2
1124 @@ -5053,7 +4951,7 @@
1125 IceConnectionNumber()
1128 -if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1129 +if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1131 eval "ac_cv_lib_$ac_lib_var=yes"
1133 @@ -5521,7 +5419,7 @@
1134 if test "$COMPILE_ENVIRONMENT"; then
1135 if test "$GNU_CC"; then
1136 echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
1137 -echo "configure:5525: checking whether ld has archive extraction flags" >&5
1138 +echo "configure:5423: checking whether ld has archive extraction flags" >&5
1139 if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
1140 echo $ac_n "(cached) $ac_c" 1>&6
1142 @@ -5538,14 +5436,14 @@
1145 cat > conftest.$ac_ext <<EOF
1146 -#line 5542 "configure"
1147 +#line 5440 "configure"
1148 #include "confdefs.h"
1154 -if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1155 +if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1157 ac_cv_mkshlib_force_and_unforce=$line; break
1159 @@ -5578,7 +5476,7 @@
1162 echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
1163 -echo "configure:5582: checking that static assertion macros used in autoconf tests work" >&5
1164 +echo "configure:5480: checking that static assertion macros used in autoconf tests work" >&5
1165 if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
1166 echo $ac_n "(cached) $ac_c" 1>&6
1168 @@ -5592,14 +5490,14 @@
1170 ac_cv_static_assertion_macros_work="yes"
1171 cat > conftest.$ac_ext <<EOF
1172 -#line 5596 "configure"
1173 +#line 5494 "configure"
1174 #include "confdefs.h"
1175 $configure_static_assert_macros
1177 CONFIGURE_STATIC_ASSERT(1)
1180 -if { (eval echo configure:5603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1181 +if { (eval echo configure:5501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1184 echo "configure: failed program was:" >&5
1185 @@ -5609,14 +5507,14 @@
1188 cat > conftest.$ac_ext <<EOF
1189 -#line 5613 "configure"
1190 +#line 5511 "configure"
1191 #include "confdefs.h"
1192 $configure_static_assert_macros
1194 CONFIGURE_STATIC_ASSERT(0)
1197 -if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1198 +if { (eval echo configure:5518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1200 ac_cv_static_assertion_macros_work="no"
1202 @@ -5632,14 +5530,14 @@
1203 cross_compiling=$ac_cv_prog_cxx_cross
1205 cat > conftest.$ac_ext <<EOF
1206 -#line 5636 "configure"
1207 +#line 5534 "configure"
1208 #include "confdefs.h"
1209 $configure_static_assert_macros
1211 CONFIGURE_STATIC_ASSERT(1)
1214 -if { (eval echo configure:5643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1215 +if { (eval echo configure:5541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1218 echo "configure: failed program was:" >&5
1219 @@ -5649,14 +5547,14 @@
1222 cat > conftest.$ac_ext <<EOF
1223 -#line 5653 "configure"
1224 +#line 5551 "configure"
1225 #include "confdefs.h"
1226 $configure_static_assert_macros
1228 CONFIGURE_STATIC_ASSERT(0)
1231 -if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1232 +if { (eval echo configure:5558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1234 ac_cv_static_assertion_macros_work="no"
1236 @@ -5691,16 +5589,16 @@
1237 cross_compiling=$ac_cv_prog_cc_cross
1239 echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
1240 -echo "configure:5695: checking for 64-bit OS" >&5
1241 +echo "configure:5593: checking for 64-bit OS" >&5
1242 cat > conftest.$ac_ext <<EOF
1243 -#line 5697 "configure"
1244 +#line 5595 "configure"
1245 #include "confdefs.h"
1246 $configure_static_assert_macros
1248 CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)
1251 -if { (eval echo configure:5704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1252 +if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1256 @@ -5873,9 +5771,9 @@
1257 cross_compiling=$ac_cv_prog_cxx_cross
1259 echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6
1260 -echo "configure:5877: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
1261 +echo "configure:5775: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
1262 cat > conftest.$ac_ext <<EOF
1263 -#line 5879 "configure"
1264 +#line 5777 "configure"
1265 #include "confdefs.h"
1268 @@ -5884,7 +5782,7 @@
1272 -if { (eval echo configure:5888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1273 +if { (eval echo configure:5786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1277 @@ -5922,17 +5820,17 @@
1279 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1280 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1281 -echo "configure:5926: checking for $ac_hdr" >&5
1282 +echo "configure:5824: checking for $ac_hdr" >&5
1283 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1284 echo $ac_n "(cached) $ac_c" 1>&6
1286 cat > conftest.$ac_ext <<EOF
1287 -#line 5931 "configure"
1288 +#line 5829 "configure"
1289 #include "confdefs.h"
1292 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1293 -{ (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1294 +{ (eval echo configure:5834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1295 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1296 if test -z "$ac_err"; then
1298 @@ -5974,7 +5872,7 @@
1300 if test "$COMPILE_ENVIRONMENT"; then
1301 echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
1302 -echo "configure:5978: checking for main in -lbind" >&5
1303 +echo "configure:5876: checking for main in -lbind" >&5
1304 ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'`
1305 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1306 echo $ac_n "(cached) $ac_c" 1>&6
1307 @@ -5982,14 +5880,14 @@
1308 ac_save_LIBS="$LIBS"
1310 cat > conftest.$ac_ext <<EOF
1311 -#line 5986 "configure"
1312 +#line 5884 "configure"
1313 #include "confdefs.h"
1319 -if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1320 +if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1322 eval "ac_cv_lib_$ac_lib_var=yes"
1324 @@ -6010,7 +5908,7 @@
1327 echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
1328 -echo "configure:6014: checking for main in -lzeta" >&5
1329 +echo "configure:5912: checking for main in -lzeta" >&5
1330 ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'`
1331 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1332 echo $ac_n "(cached) $ac_c" 1>&6
1333 @@ -6018,14 +5916,14 @@
1334 ac_save_LIBS="$LIBS"
1336 cat > conftest.$ac_ext <<EOF
1337 -#line 6022 "configure"
1338 +#line 5920 "configure"
1339 #include "confdefs.h"
1345 -if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1346 +if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1348 eval "ac_cv_lib_$ac_lib_var=yes"
1350 @@ -6094,18 +5992,18 @@
1353 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
1354 -echo "configure:6098: checking for -dead_strip option to ld" >&5
1355 +echo "configure:5996: checking for -dead_strip option to ld" >&5
1356 _SAVE_LDFLAGS=$LDFLAGS
1357 LDFLAGS="$LDFLAGS -Wl,-dead_strip"
1358 cat > conftest.$ac_ext <<EOF
1359 -#line 6102 "configure"
1360 +#line 6000 "configure"
1361 #include "confdefs.h"
1367 -if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1368 +if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1372 @@ -6630,17 +6528,17 @@
1374 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1375 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1376 -echo "configure:6634: checking for $ac_hdr" >&5
1377 +echo "configure:6532: checking for $ac_hdr" >&5
1378 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1379 echo $ac_n "(cached) $ac_c" 1>&6
1381 cat > conftest.$ac_ext <<EOF
1382 -#line 6639 "configure"
1383 +#line 6537 "configure"
1384 #include "confdefs.h"
1387 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1388 -{ (eval echo configure:6644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1389 +{ (eval echo configure:6542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1390 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1391 if test -z "$ac_err"; then
1393 @@ -6679,17 +6577,17 @@
1395 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1396 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1397 -echo "configure:6683: checking for $ac_hdr" >&5
1398 +echo "configure:6581: checking for $ac_hdr" >&5
1399 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1400 echo $ac_n "(cached) $ac_c" 1>&6
1402 cat > conftest.$ac_ext <<EOF
1403 -#line 6688 "configure"
1404 +#line 6586 "configure"
1405 #include "confdefs.h"
1408 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1409 -{ (eval echo configure:6693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1410 +{ (eval echo configure:6591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1411 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1412 if test -z "$ac_err"; then
1414 @@ -6935,19 +6833,19 @@
1415 _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__"
1417 echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6
1418 -echo "configure:6939: checking for __declspec(dllexport)" >&5
1419 +echo "configure:6837: checking for __declspec(dllexport)" >&5
1420 if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then
1421 echo $ac_n "(cached) $ac_c" 1>&6
1423 cat > conftest.$ac_ext <<EOF
1424 -#line 6944 "configure"
1425 +#line 6842 "configure"
1426 #include "confdefs.h"
1427 __declspec(dllexport) void ac_os2_declspec(void) {}
1432 -if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1433 +if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1435 ac_os2_declspec="yes"
1437 @@ -7133,14 +7031,14 @@
1438 _SAVE_LDFLAGS=$LDFLAGS
1439 LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
1440 cat > conftest.$ac_ext <<EOF
1441 -#line 7137 "configure"
1442 +#line 7035 "configure"
1443 #include "confdefs.h"
1446 printf("Hello World\n");
1449 -if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1450 +if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1453 echo "configure: failed program was:" >&5
1454 @@ -7169,7 +7067,7 @@
1455 CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
1456 CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
1457 echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6
1458 -echo "configure:7173: checking for Forte compiler version >= WS6U2" >&5
1459 +echo "configure:7071: checking for Forte compiler version >= WS6U2" >&5
1462 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1463 @@ -7179,7 +7077,7 @@
1464 cross_compiling=$ac_cv_prog_cxx_cross
1466 cat > conftest.$ac_ext <<EOF
1467 -#line 7183 "configure"
1468 +#line 7081 "configure"
1469 #include "confdefs.h"
1472 @@ -7188,7 +7086,7 @@
1476 -if { (eval echo configure:7192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1477 +if { (eval echo configure:7090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1481 @@ -7339,12 +7237,12 @@
1482 cross_compiling=$ac_cv_prog_cc_cross
1484 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
1485 -echo "configure:7343: checking for ANSI C header files" >&5
1486 +echo "configure:7241: checking for ANSI C header files" >&5
1487 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
1488 echo $ac_n "(cached) $ac_c" 1>&6
1490 cat > conftest.$ac_ext <<EOF
1491 -#line 7348 "configure"
1492 +#line 7246 "configure"
1493 #include "confdefs.h"
1496 @@ -7352,7 +7250,7 @@
1499 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1500 -{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1501 +{ (eval echo configure:7254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1502 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1503 if test -z "$ac_err"; then
1505 @@ -7369,7 +7267,7 @@
1506 if test $ac_cv_header_stdc = yes; then
1507 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
1508 cat > conftest.$ac_ext <<EOF
1509 -#line 7373 "configure"
1510 +#line 7271 "configure"
1511 #include "confdefs.h"
1514 @@ -7387,7 +7285,7 @@
1515 if test $ac_cv_header_stdc = yes; then
1516 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
1517 cat > conftest.$ac_ext <<EOF
1518 -#line 7391 "configure"
1519 +#line 7289 "configure"
1520 #include "confdefs.h"
1523 @@ -7408,7 +7306,7 @@
1526 cat > conftest.$ac_ext <<EOF
1527 -#line 7412 "configure"
1528 +#line 7310 "configure"
1529 #include "confdefs.h"
1531 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
1532 @@ -7419,7 +7317,7 @@
1536 -if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1537 +if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1541 @@ -7443,12 +7341,12 @@
1544 echo $ac_n "checking for working const""... $ac_c" 1>&6
1545 -echo "configure:7447: checking for working const" >&5
1546 +echo "configure:7345: checking for working const" >&5
1547 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
1548 echo $ac_n "(cached) $ac_c" 1>&6
1550 cat > conftest.$ac_ext <<EOF
1551 -#line 7452 "configure"
1552 +#line 7350 "configure"
1553 #include "confdefs.h"
1556 @@ -7497,7 +7395,7 @@
1560 -if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1561 +if { (eval echo configure:7399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1565 @@ -7518,12 +7416,12 @@
1568 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
1569 -echo "configure:7522: checking for mode_t" >&5
1570 +echo "configure:7420: checking for mode_t" >&5
1571 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
1572 echo $ac_n "(cached) $ac_c" 1>&6
1574 cat > conftest.$ac_ext <<EOF
1575 -#line 7527 "configure"
1576 +#line 7425 "configure"
1577 #include "confdefs.h"
1578 #include <sys/types.h>
1580 @@ -7551,12 +7449,12 @@
1583 echo $ac_n "checking for off_t""... $ac_c" 1>&6
1584 -echo "configure:7555: checking for off_t" >&5
1585 +echo "configure:7453: checking for off_t" >&5
1586 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
1587 echo $ac_n "(cached) $ac_c" 1>&6
1589 cat > conftest.$ac_ext <<EOF
1590 -#line 7560 "configure"
1591 +#line 7458 "configure"
1592 #include "confdefs.h"
1593 #include <sys/types.h>
1595 @@ -7584,12 +7482,12 @@
1598 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
1599 -echo "configure:7588: checking for pid_t" >&5
1600 +echo "configure:7486: checking for pid_t" >&5
1601 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
1602 echo $ac_n "(cached) $ac_c" 1>&6
1604 cat > conftest.$ac_ext <<EOF
1605 -#line 7593 "configure"
1606 +#line 7491 "configure"
1607 #include "confdefs.h"
1608 #include <sys/types.h>
1610 @@ -7617,12 +7515,12 @@
1613 echo $ac_n "checking for size_t""... $ac_c" 1>&6
1614 -echo "configure:7621: checking for size_t" >&5
1615 +echo "configure:7519: checking for size_t" >&5
1616 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
1617 echo $ac_n "(cached) $ac_c" 1>&6
1619 cat > conftest.$ac_ext <<EOF
1620 -#line 7626 "configure"
1621 +#line 7524 "configure"
1622 #include "confdefs.h"
1623 #include <sys/types.h>
1625 @@ -7650,12 +7548,12 @@
1628 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
1629 -echo "configure:7654: checking for st_blksize in struct stat" >&5
1630 +echo "configure:7552: checking for st_blksize in struct stat" >&5
1631 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
1632 echo $ac_n "(cached) $ac_c" 1>&6
1634 cat > conftest.$ac_ext <<EOF
1635 -#line 7659 "configure"
1636 +#line 7557 "configure"
1637 #include "confdefs.h"
1638 #include <sys/types.h>
1639 #include <sys/stat.h>
1640 @@ -7663,7 +7561,7 @@
1641 struct stat s; s.st_blksize;
1644 -if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1645 +if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1647 ac_cv_struct_st_blksize=yes
1649 @@ -7684,12 +7582,12 @@
1652 echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
1653 -echo "configure:7688: checking for siginfo_t" >&5
1654 +echo "configure:7586: checking for siginfo_t" >&5
1655 if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
1656 echo $ac_n "(cached) $ac_c" 1>&6
1658 cat > conftest.$ac_ext <<EOF
1659 -#line 7693 "configure"
1660 +#line 7591 "configure"
1661 #include "confdefs.h"
1662 #define _POSIX_C_SOURCE 199506L
1664 @@ -7697,7 +7595,7 @@
1668 -if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1669 +if { (eval echo configure:7599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1671 ac_cv_siginfo_t=true
1673 @@ -7731,12 +7629,12 @@
1676 echo $ac_n "checking for int16_t""... $ac_c" 1>&6
1677 -echo "configure:7735: checking for int16_t" >&5
1678 +echo "configure:7633: checking for int16_t" >&5
1679 if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then
1680 echo $ac_n "(cached) $ac_c" 1>&6
1682 cat > conftest.$ac_ext <<EOF
1683 -#line 7740 "configure"
1684 +#line 7638 "configure"
1685 #include "confdefs.h"
1687 #include <sys/types.h>
1688 @@ -7744,7 +7642,7 @@
1692 -if { (eval echo configure:7748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1693 +if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1697 @@ -7766,12 +7664,12 @@
1698 echo "$ac_t""no" 1>&6
1700 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
1701 -echo "configure:7770: checking for int32_t" >&5
1702 +echo "configure:7668: checking for int32_t" >&5
1703 if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then
1704 echo $ac_n "(cached) $ac_c" 1>&6
1706 cat > conftest.$ac_ext <<EOF
1707 -#line 7775 "configure"
1708 +#line 7673 "configure"
1709 #include "confdefs.h"
1711 #include <sys/types.h>
1712 @@ -7779,7 +7677,7 @@
1716 -if { (eval echo configure:7783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1717 +if { (eval echo configure:7681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1721 @@ -7801,12 +7699,12 @@
1722 echo "$ac_t""no" 1>&6
1724 echo $ac_n "checking for int64_t""... $ac_c" 1>&6
1725 -echo "configure:7805: checking for int64_t" >&5
1726 +echo "configure:7703: checking for int64_t" >&5
1727 if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then
1728 echo $ac_n "(cached) $ac_c" 1>&6
1730 cat > conftest.$ac_ext <<EOF
1731 -#line 7810 "configure"
1732 +#line 7708 "configure"
1733 #include "confdefs.h"
1735 #include <sys/types.h>
1736 @@ -7814,7 +7712,7 @@
1740 -if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1741 +if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1745 @@ -7836,12 +7734,12 @@
1746 echo "$ac_t""no" 1>&6
1748 echo $ac_n "checking for int64""... $ac_c" 1>&6
1749 -echo "configure:7840: checking for int64" >&5
1750 +echo "configure:7738: checking for int64" >&5
1751 if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then
1752 echo $ac_n "(cached) $ac_c" 1>&6
1754 cat > conftest.$ac_ext <<EOF
1755 -#line 7845 "configure"
1756 +#line 7743 "configure"
1757 #include "confdefs.h"
1759 #include <sys/types.h>
1760 @@ -7849,7 +7747,7 @@
1764 -if { (eval echo configure:7853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1765 +if { (eval echo configure:7751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1769 @@ -7871,12 +7769,12 @@
1770 echo "$ac_t""no" 1>&6
1772 echo $ac_n "checking for uint""... $ac_c" 1>&6
1773 -echo "configure:7875: checking for uint" >&5
1774 +echo "configure:7773: checking for uint" >&5
1775 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
1776 echo $ac_n "(cached) $ac_c" 1>&6
1778 cat > conftest.$ac_ext <<EOF
1779 -#line 7880 "configure"
1780 +#line 7778 "configure"
1781 #include "confdefs.h"
1783 #include <sys/types.h>
1784 @@ -7884,7 +7782,7 @@
1788 -if { (eval echo configure:7888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1789 +if { (eval echo configure:7786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1793 @@ -7906,12 +7804,12 @@
1794 echo "$ac_t""no" 1>&6
1796 echo $ac_n "checking for uint_t""... $ac_c" 1>&6
1797 -echo "configure:7910: checking for uint_t" >&5
1798 +echo "configure:7808: checking for uint_t" >&5
1799 if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then
1800 echo $ac_n "(cached) $ac_c" 1>&6
1802 cat > conftest.$ac_ext <<EOF
1803 -#line 7915 "configure"
1804 +#line 7813 "configure"
1805 #include "confdefs.h"
1807 #include <sys/types.h>
1808 @@ -7919,7 +7817,7 @@
1812 -if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1813 +if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1817 @@ -7941,12 +7839,12 @@
1818 echo "$ac_t""no" 1>&6
1820 echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
1821 -echo "configure:7945: checking for uint16_t" >&5
1822 +echo "configure:7843: checking for uint16_t" >&5
1823 if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then
1824 echo $ac_n "(cached) $ac_c" 1>&6
1826 cat > conftest.$ac_ext <<EOF
1827 -#line 7950 "configure"
1828 +#line 7848 "configure"
1829 #include "confdefs.h"
1831 #include <sys/types.h>
1832 @@ -7954,7 +7852,7 @@
1836 -if { (eval echo configure:7958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1837 +if { (eval echo configure:7856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1841 @@ -7985,12 +7883,12 @@
1844 echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
1845 -echo "configure:7989: checking for uname.domainname" >&5
1846 +echo "configure:7887: checking for uname.domainname" >&5
1847 if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then
1848 echo $ac_n "(cached) $ac_c" 1>&6
1850 cat > conftest.$ac_ext <<EOF
1851 -#line 7994 "configure"
1852 +#line 7892 "configure"
1853 #include "confdefs.h"
1854 #include <sys/utsname.h>
1856 @@ -7998,7 +7896,7 @@
1857 (void)uname(res); if (res != 0) { domain = res->domainname; }
1860 -if { (eval echo configure:8002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1861 +if { (eval echo configure:7900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1863 ac_cv_have_uname_domainname_field=true
1865 @@ -8022,12 +7920,12 @@
1868 echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
1869 -echo "configure:8026: checking for uname.__domainname" >&5
1870 +echo "configure:7924: checking for uname.__domainname" >&5
1871 if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then
1872 echo $ac_n "(cached) $ac_c" 1>&6
1874 cat > conftest.$ac_ext <<EOF
1875 -#line 8031 "configure"
1876 +#line 7929 "configure"
1877 #include "confdefs.h"
1878 #include <sys/utsname.h>
1880 @@ -8035,7 +7933,7 @@
1881 (void)uname(res); if (res != 0) { domain = res->__domainname; }
1884 -if { (eval echo configure:8039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1885 +if { (eval echo configure:7937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1887 ac_cv_have_uname_us_domainname_field=true
1889 @@ -8068,12 +7966,12 @@
1892 echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
1893 -echo "configure:8072: checking for usable wchar_t (2 bytes, unsigned)" >&5
1894 +echo "configure:7970: checking for usable wchar_t (2 bytes, unsigned)" >&5
1895 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
1896 echo $ac_n "(cached) $ac_c" 1>&6
1898 cat > conftest.$ac_ext <<EOF
1899 -#line 8077 "configure"
1900 +#line 7975 "configure"
1901 #include "confdefs.h"
1903 $configure_static_assert_macros
1904 @@ -8082,7 +7980,7 @@
1905 CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
1908 -if { (eval echo configure:8086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1909 +if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1911 ac_cv_have_usable_wchar_v2="yes"
1913 @@ -8101,7 +7999,7 @@
1916 HAVE_CPP_2BYTE_WCHAR_T=1
1922 @@ -8115,12 +8013,12 @@
1923 CXXFLAGS="$CXXFLAGS -fshort-wchar"
1925 echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
1926 -echo "configure:8119: checking for compiler -fshort-wchar option" >&5
1927 +echo "configure:8017: checking for compiler -fshort-wchar option" >&5
1928 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
1929 echo $ac_n "(cached) $ac_c" 1>&6
1931 cat > conftest.$ac_ext <<EOF
1932 -#line 8124 "configure"
1933 +#line 8022 "configure"
1934 #include "confdefs.h"
1936 $configure_static_assert_macros
1937 @@ -8129,7 +8027,7 @@
1938 CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
1941 -if { (eval echo configure:8133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1942 +if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1944 ac_cv_have_usable_wchar_option_v2="yes"
1946 @@ -8163,7 +8061,7 @@
1948 if test "$GNU_CC"; then
1949 echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
1950 -echo "configure:8167: checking for visibility(hidden) attribute" >&5
1951 +echo "configure:8065: checking for visibility(hidden) attribute" >&5
1952 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
1953 echo $ac_n "(cached) $ac_c" 1>&6
1955 @@ -8188,7 +8086,7 @@
1958 echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
1959 -echo "configure:8192: checking for visibility(default) attribute" >&5
1960 +echo "configure:8090: checking for visibility(default) attribute" >&5
1961 if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
1962 echo $ac_n "(cached) $ac_c" 1>&6
1964 @@ -8213,7 +8111,7 @@
1967 echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
1968 -echo "configure:8217: checking for visibility pragma support" >&5
1969 +echo "configure:8115: checking for visibility pragma support" >&5
1970 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
1971 echo $ac_n "(cached) $ac_c" 1>&6
1973 @@ -8238,7 +8136,7 @@
1974 echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
1975 if test "$ac_cv_visibility_pragma" = "yes"; then
1976 echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
1977 -echo "configure:8242: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
1978 +echo "configure:8140: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
1979 if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
1980 echo $ac_n "(cached) $ac_c" 1>&6
1982 @@ -8266,7 +8164,7 @@
1983 echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
1985 echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
1986 -echo "configure:8270: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
1987 +echo "configure:8168: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
1988 if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
1989 echo $ac_n "(cached) $ac_c" 1>&6
1991 @@ -8314,12 +8212,12 @@
1993 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1994 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
1995 -echo "configure:8318: checking for $ac_hdr that defines DIR" >&5
1996 +echo "configure:8216: checking for $ac_hdr that defines DIR" >&5
1997 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
1998 echo $ac_n "(cached) $ac_c" 1>&6
2000 cat > conftest.$ac_ext <<EOF
2001 -#line 8323 "configure"
2002 +#line 8221 "configure"
2003 #include "confdefs.h"
2004 #include <sys/types.h>
2006 @@ -8327,7 +8225,7 @@
2010 -if { (eval echo configure:8331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2011 +if { (eval echo configure:8229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2013 eval "ac_cv_header_dirent_$ac_safe=yes"
2015 @@ -8352,7 +8250,7 @@
2016 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
2017 if test $ac_header_dirent = dirent.h; then
2018 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
2019 -echo "configure:8356: checking for opendir in -ldir" >&5
2020 +echo "configure:8254: checking for opendir in -ldir" >&5
2021 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
2022 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2023 echo $ac_n "(cached) $ac_c" 1>&6
2024 @@ -8360,7 +8258,7 @@
2025 ac_save_LIBS="$LIBS"
2027 cat > conftest.$ac_ext <<EOF
2028 -#line 8364 "configure"
2029 +#line 8262 "configure"
2030 #include "confdefs.h"
2031 /* Override any gcc2 internal prototype to avoid an error. */
2032 /* We use char because int might match the return type of a gcc2
2033 @@ -8371,7 +8269,7 @@
2037 -if { (eval echo configure:8375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2038 +if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2040 eval "ac_cv_lib_$ac_lib_var=yes"
2042 @@ -8393,7 +8291,7 @@
2045 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
2046 -echo "configure:8397: checking for opendir in -lx" >&5
2047 +echo "configure:8295: checking for opendir in -lx" >&5
2048 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
2049 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2050 echo $ac_n "(cached) $ac_c" 1>&6
2051 @@ -8401,7 +8299,7 @@
2052 ac_save_LIBS="$LIBS"
2054 cat > conftest.$ac_ext <<EOF
2055 -#line 8405 "configure"
2056 +#line 8303 "configure"
2057 #include "confdefs.h"
2058 /* Override any gcc2 internal prototype to avoid an error. */
2059 /* We use char because int might match the return type of a gcc2
2060 @@ -8412,7 +8310,7 @@
2064 -if { (eval echo configure:8416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2065 +if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2067 eval "ac_cv_lib_$ac_lib_var=yes"
2069 @@ -8444,17 +8342,17 @@
2071 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2072 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2073 -echo "configure:8448: checking for $ac_hdr" >&5
2074 +echo "configure:8346: checking for $ac_hdr" >&5
2075 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2076 echo $ac_n "(cached) $ac_c" 1>&6
2078 cat > conftest.$ac_ext <<EOF
2079 -#line 8453 "configure"
2080 +#line 8351 "configure"
2081 #include "confdefs.h"
2084 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2085 -{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2086 +{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2087 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2088 if test -z "$ac_err"; then
2090 @@ -8484,17 +8382,17 @@
2092 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2093 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2094 -echo "configure:8488: checking for $ac_hdr" >&5
2095 +echo "configure:8386: checking for $ac_hdr" >&5
2096 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2097 echo $ac_n "(cached) $ac_c" 1>&6
2099 cat > conftest.$ac_ext <<EOF
2100 -#line 8493 "configure"
2101 +#line 8391 "configure"
2102 #include "confdefs.h"
2105 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2106 -{ (eval echo configure:8498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2107 +{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2108 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2109 if test -z "$ac_err"; then
2111 @@ -8524,17 +8422,17 @@
2113 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2114 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2115 -echo "configure:8528: checking for $ac_hdr" >&5
2116 +echo "configure:8426: checking for $ac_hdr" >&5
2117 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2118 echo $ac_n "(cached) $ac_c" 1>&6
2120 cat > conftest.$ac_ext <<EOF
2121 -#line 8533 "configure"
2122 +#line 8431 "configure"
2123 #include "confdefs.h"
2126 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2127 -{ (eval echo configure:8538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2128 +{ (eval echo configure:8436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2129 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2130 if test -z "$ac_err"; then
2132 @@ -8564,17 +8462,17 @@
2134 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2135 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2136 -echo "configure:8568: checking for $ac_hdr" >&5
2137 +echo "configure:8466: checking for $ac_hdr" >&5
2138 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2139 echo $ac_n "(cached) $ac_c" 1>&6
2141 cat > conftest.$ac_ext <<EOF
2142 -#line 8573 "configure"
2143 +#line 8471 "configure"
2144 #include "confdefs.h"
2147 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2148 -{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2149 +{ (eval echo configure:8476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2150 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2151 if test -z "$ac_err"; then
2153 @@ -8604,17 +8502,17 @@
2155 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2156 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2157 -echo "configure:8608: checking for $ac_hdr" >&5
2158 +echo "configure:8506: checking for $ac_hdr" >&5
2159 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2160 echo $ac_n "(cached) $ac_c" 1>&6
2162 cat > conftest.$ac_ext <<EOF
2163 -#line 8613 "configure"
2164 +#line 8511 "configure"
2165 #include "confdefs.h"
2168 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2169 -{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2170 +{ (eval echo configure:8516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2171 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2172 if test -z "$ac_err"; then
2174 @@ -8645,17 +8543,17 @@
2176 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2177 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2178 -echo "configure:8649: checking for $ac_hdr" >&5
2179 +echo "configure:8547: checking for $ac_hdr" >&5
2180 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2181 echo $ac_n "(cached) $ac_c" 1>&6
2183 cat > conftest.$ac_ext <<EOF
2184 -#line 8654 "configure"
2185 +#line 8552 "configure"
2186 #include "confdefs.h"
2189 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2190 -{ (eval echo configure:8659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2191 +{ (eval echo configure:8557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2192 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2193 if test -z "$ac_err"; then
2195 @@ -8686,17 +8584,17 @@
2197 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2198 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2199 -echo "configure:8690: checking for $ac_hdr" >&5
2200 +echo "configure:8588: checking for $ac_hdr" >&5
2201 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2202 echo $ac_n "(cached) $ac_c" 1>&6
2204 cat > conftest.$ac_ext <<EOF
2205 -#line 8695 "configure"
2206 +#line 8593 "configure"
2207 #include "confdefs.h"
2210 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2211 -{ (eval echo configure:8700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2212 +{ (eval echo configure:8598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2213 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2214 if test -z "$ac_err"; then
2216 @@ -8733,17 +8631,17 @@
2218 ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
2219 echo $ac_n "checking for new""... $ac_c" 1>&6
2220 -echo "configure:8737: checking for new" >&5
2221 +echo "configure:8635: checking for new" >&5
2222 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2223 echo $ac_n "(cached) $ac_c" 1>&6
2225 cat > conftest.$ac_ext <<EOF
2226 -#line 8742 "configure"
2227 +#line 8640 "configure"
2228 #include "confdefs.h"
2231 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2232 -{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2233 +{ (eval echo configure:8645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2234 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2235 if test -z "$ac_err"; then
2237 @@ -8785,17 +8683,17 @@
2238 if test "x$enable_dtrace" = "xyes"; then
2239 ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'`
2240 echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6
2241 -echo "configure:8789: checking for sys/sdt.h" >&5
2242 +echo "configure:8687: checking for sys/sdt.h" >&5
2243 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2244 echo $ac_n "(cached) $ac_c" 1>&6
2246 cat > conftest.$ac_ext <<EOF
2247 -#line 8794 "configure"
2248 +#line 8692 "configure"
2249 #include "confdefs.h"
2250 #include <sys/sdt.h>
2252 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2253 -{ (eval echo configure:8799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2254 +{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2255 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2256 if test -z "$ac_err"; then
2258 @@ -8835,17 +8733,17 @@
2260 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2261 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2262 -echo "configure:8839: checking for $ac_hdr" >&5
2263 +echo "configure:8737: checking for $ac_hdr" >&5
2264 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2265 echo $ac_n "(cached) $ac_c" 1>&6
2267 cat > conftest.$ac_ext <<EOF
2268 -#line 8844 "configure"
2269 +#line 8742 "configure"
2270 #include "confdefs.h"
2273 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2274 -{ (eval echo configure:8849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2275 +{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2276 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2277 if test -z "$ac_err"; then
2279 @@ -8879,7 +8777,7 @@
2282 echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
2283 -echo "configure:8883: checking for gethostbyname_r in -lc_r" >&5
2284 +echo "configure:8781: checking for gethostbyname_r in -lc_r" >&5
2285 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
2286 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2287 echo $ac_n "(cached) $ac_c" 1>&6
2288 @@ -8887,7 +8785,7 @@
2289 ac_save_LIBS="$LIBS"
2291 cat > conftest.$ac_ext <<EOF
2292 -#line 8891 "configure"
2293 +#line 8789 "configure"
2294 #include "confdefs.h"
2295 /* Override any gcc2 internal prototype to avoid an error. */
2296 /* We use char because int might match the return type of a gcc2
2297 @@ -8898,7 +8796,7 @@
2301 -if { (eval echo configure:8902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2302 +if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2304 eval "ac_cv_lib_$ac_lib_var=yes"
2306 @@ -8935,7 +8833,7 @@
2309 echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
2310 -echo "configure:8939: checking for atan in -lm" >&5
2311 +echo "configure:8837: checking for atan in -lm" >&5
2312 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
2313 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2314 echo $ac_n "(cached) $ac_c" 1>&6
2315 @@ -8943,7 +8841,7 @@
2316 ac_save_LIBS="$LIBS"
2318 cat > conftest.$ac_ext <<EOF
2319 -#line 8947 "configure"
2320 +#line 8845 "configure"
2321 #include "confdefs.h"
2322 /* Override any gcc2 internal prototype to avoid an error. */
2323 /* We use char because int might match the return type of a gcc2
2324 @@ -8954,7 +8852,7 @@
2328 -if { (eval echo configure:8958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2329 +if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2331 eval "ac_cv_lib_$ac_lib_var=yes"
2333 @@ -8982,7 +8880,7 @@
2336 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
2337 -echo "configure:8986: checking for dlopen in -ldl" >&5
2338 +echo "configure:8884: checking for dlopen in -ldl" >&5
2339 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
2340 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2341 echo $ac_n "(cached) $ac_c" 1>&6
2342 @@ -8990,7 +8888,7 @@
2343 ac_save_LIBS="$LIBS"
2345 cat > conftest.$ac_ext <<EOF
2346 -#line 8994 "configure"
2347 +#line 8892 "configure"
2348 #include "confdefs.h"
2349 /* Override any gcc2 internal prototype to avoid an error. */
2350 /* We use char because int might match the return type of a gcc2
2351 @@ -9001,7 +8899,7 @@
2355 -if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2356 +if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2358 eval "ac_cv_lib_$ac_lib_var=yes"
2360 @@ -9018,17 +8916,17 @@
2361 echo "$ac_t""yes" 1>&6
2362 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
2363 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
2364 -echo "configure:9022: checking for dlfcn.h" >&5
2365 +echo "configure:8920: checking for dlfcn.h" >&5
2366 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2367 echo $ac_n "(cached) $ac_c" 1>&6
2369 cat > conftest.$ac_ext <<EOF
2370 -#line 9027 "configure"
2371 +#line 8925 "configure"
2372 #include "confdefs.h"
2375 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2376 -{ (eval echo configure:9032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2377 +{ (eval echo configure:8930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2378 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2379 if test -z "$ac_err"; then
2381 @@ -9065,12 +8963,12 @@
2382 for ac_func in dladdr
2384 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2385 -echo "configure:9069: checking for $ac_func" >&5
2386 +echo "configure:8967: checking for $ac_func" >&5
2387 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2388 echo $ac_n "(cached) $ac_c" 1>&6
2390 cat > conftest.$ac_ext <<EOF
2391 -#line 9074 "configure"
2392 +#line 8972 "configure"
2393 #include "confdefs.h"
2394 /* System header to define __stub macros and hopefully few prototypes,
2395 which can conflict with char $ac_func(); below. */
2396 @@ -9093,7 +8991,7 @@
2400 -if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2401 +if { (eval echo configure:8995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2403 eval "ac_cv_func_$ac_func=yes"
2405 @@ -9124,7 +9022,7 @@
2408 echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
2409 -echo "configure:9128: checking for demangle in -lC_r" >&5
2410 +echo "configure:9026: checking for demangle in -lC_r" >&5
2411 ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'`
2412 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2413 echo $ac_n "(cached) $ac_c" 1>&6
2414 @@ -9132,7 +9030,7 @@
2415 ac_save_LIBS="$LIBS"
2417 cat > conftest.$ac_ext <<EOF
2418 -#line 9136 "configure"
2419 +#line 9034 "configure"
2420 #include "confdefs.h"
2421 /* Override any gcc2 internal prototype to avoid an error. */
2422 /* We use char because int might match the return type of a gcc2
2423 @@ -9143,7 +9041,7 @@
2427 -if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2428 +if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2430 eval "ac_cv_lib_$ac_lib_var=yes"
2432 @@ -9173,7 +9071,7 @@
2435 echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
2436 -echo "configure:9177: checking for demangle in -lC" >&5
2437 +echo "configure:9075: checking for demangle in -lC" >&5
2438 ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'`
2439 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2440 echo $ac_n "(cached) $ac_c" 1>&6
2441 @@ -9181,7 +9079,7 @@
2442 ac_save_LIBS="$LIBS"
2444 cat > conftest.$ac_ext <<EOF
2445 -#line 9185 "configure"
2446 +#line 9083 "configure"
2447 #include "confdefs.h"
2448 /* Override any gcc2 internal prototype to avoid an error. */
2449 /* We use char because int might match the return type of a gcc2
2450 @@ -9192,7 +9090,7 @@
2454 -if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2455 +if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2457 eval "ac_cv_lib_$ac_lib_var=yes"
2459 @@ -9223,7 +9121,7 @@
2462 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
2463 -echo "configure:9227: checking for socket in -lsocket" >&5
2464 +echo "configure:9125: checking for socket in -lsocket" >&5
2465 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
2466 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2467 echo $ac_n "(cached) $ac_c" 1>&6
2468 @@ -9231,7 +9129,7 @@
2469 ac_save_LIBS="$LIBS"
2470 LIBS="-lsocket $LIBS"
2471 cat > conftest.$ac_ext <<EOF
2472 -#line 9235 "configure"
2473 +#line 9133 "configure"
2474 #include "confdefs.h"
2475 /* Override any gcc2 internal prototype to avoid an error. */
2476 /* We use char because int might match the return type of a gcc2
2477 @@ -9242,7 +9140,7 @@
2481 -if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2482 +if { (eval echo configure:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2484 eval "ac_cv_lib_$ac_lib_var=yes"
2486 @@ -9287,7 +9185,7 @@
2487 _SAVE_LDFLAGS="$LDFLAGS"
2488 LDFLAGS="$XLDFLAGS $LDFLAGS"
2489 echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
2490 -echo "configure:9291: checking for XDrawLines in -lX11" >&5
2491 +echo "configure:9189: checking for XDrawLines in -lX11" >&5
2492 ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
2493 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2494 echo $ac_n "(cached) $ac_c" 1>&6
2495 @@ -9295,7 +9193,7 @@
2496 ac_save_LIBS="$LIBS"
2497 LIBS="-lX11 $XLIBS $LIBS"
2498 cat > conftest.$ac_ext <<EOF
2499 -#line 9299 "configure"
2500 +#line 9197 "configure"
2501 #include "confdefs.h"
2502 /* Override any gcc2 internal prototype to avoid an error. */
2503 /* We use char because int might match the return type of a gcc2
2504 @@ -9306,7 +9204,7 @@
2508 -if { (eval echo configure:9310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2509 +if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2511 eval "ac_cv_lib_$ac_lib_var=yes"
2513 @@ -9328,7 +9226,7 @@
2516 echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
2517 -echo "configure:9332: checking for XextAddDisplay in -lXext" >&5
2518 +echo "configure:9230: checking for XextAddDisplay in -lXext" >&5
2519 ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
2520 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2521 echo $ac_n "(cached) $ac_c" 1>&6
2522 @@ -9336,7 +9234,7 @@
2523 ac_save_LIBS="$LIBS"
2524 LIBS="-lXext $XLIBS $LIBS"
2525 cat > conftest.$ac_ext <<EOF
2526 -#line 9340 "configure"
2527 +#line 9238 "configure"
2528 #include "confdefs.h"
2529 /* Override any gcc2 internal prototype to avoid an error. */
2530 /* We use char because int might match the return type of a gcc2
2531 @@ -9347,7 +9245,7 @@
2535 -if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2536 +if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2538 eval "ac_cv_lib_$ac_lib_var=yes"
2540 @@ -9371,7 +9269,7 @@
2543 echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
2544 -echo "configure:9375: checking for XtFree in -lXt" >&5
2545 +echo "configure:9273: checking for XtFree in -lXt" >&5
2546 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
2547 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2548 echo $ac_n "(cached) $ac_c" 1>&6
2549 @@ -9379,7 +9277,7 @@
2550 ac_save_LIBS="$LIBS"
2552 cat > conftest.$ac_ext <<EOF
2553 -#line 9383 "configure"
2554 +#line 9281 "configure"
2555 #include "confdefs.h"
2556 /* Override any gcc2 internal prototype to avoid an error. */
2557 /* We use char because int might match the return type of a gcc2
2558 @@ -9390,7 +9288,7 @@
2562 -if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2563 +if { (eval echo configure:9292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2565 eval "ac_cv_lib_$ac_lib_var=yes"
2567 @@ -9411,7 +9309,7 @@
2569 unset ac_cv_lib_Xt_XtFree
2570 echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
2571 -echo "configure:9415: checking for IceFlush in -lICE" >&5
2572 +echo "configure:9313: checking for IceFlush in -lICE" >&5
2573 ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
2574 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2575 echo $ac_n "(cached) $ac_c" 1>&6
2576 @@ -9419,7 +9317,7 @@
2577 ac_save_LIBS="$LIBS"
2578 LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
2579 cat > conftest.$ac_ext <<EOF
2580 -#line 9423 "configure"
2581 +#line 9321 "configure"
2582 #include "confdefs.h"
2583 /* Override any gcc2 internal prototype to avoid an error. */
2584 /* We use char because int might match the return type of a gcc2
2585 @@ -9430,7 +9328,7 @@
2589 -if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2590 +if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2592 eval "ac_cv_lib_$ac_lib_var=yes"
2594 @@ -9451,7 +9349,7 @@
2597 echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
2598 -echo "configure:9455: checking for SmcCloseConnection in -lSM" >&5
2599 +echo "configure:9353: checking for SmcCloseConnection in -lSM" >&5
2600 ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
2601 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2602 echo $ac_n "(cached) $ac_c" 1>&6
2603 @@ -9459,7 +9357,7 @@
2604 ac_save_LIBS="$LIBS"
2605 LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
2606 cat > conftest.$ac_ext <<EOF
2607 -#line 9463 "configure"
2608 +#line 9361 "configure"
2609 #include "confdefs.h"
2610 /* Override any gcc2 internal prototype to avoid an error. */
2611 /* We use char because int might match the return type of a gcc2
2612 @@ -9470,7 +9368,7 @@
2613 SmcCloseConnection()
2616 -if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2617 +if { (eval echo configure:9372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2619 eval "ac_cv_lib_$ac_lib_var=yes"
2621 @@ -9491,7 +9389,7 @@
2624 echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
2625 -echo "configure:9495: checking for XtFree in -lXt" >&5
2626 +echo "configure:9393: checking for XtFree in -lXt" >&5
2627 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
2628 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2629 echo $ac_n "(cached) $ac_c" 1>&6
2630 @@ -9499,7 +9397,7 @@
2631 ac_save_LIBS="$LIBS"
2632 LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
2633 cat > conftest.$ac_ext <<EOF
2634 -#line 9503 "configure"
2635 +#line 9401 "configure"
2636 #include "confdefs.h"
2637 /* Override any gcc2 internal prototype to avoid an error. */
2638 /* We use char because int might match the return type of a gcc2
2639 @@ -9510,7 +9408,7 @@
2643 -if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2644 +if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2646 eval "ac_cv_lib_$ac_lib_var=yes"
2648 @@ -9544,7 +9442,7 @@
2651 echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
2652 -echo "configure:9548: checking for XShmCreateImage in -lXext" >&5
2653 +echo "configure:9446: checking for XShmCreateImage in -lXext" >&5
2654 ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
2655 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2656 echo $ac_n "(cached) $ac_c" 1>&6
2657 @@ -9552,7 +9450,7 @@
2658 ac_save_LIBS="$LIBS"
2659 LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
2660 cat > conftest.$ac_ext <<EOF
2661 -#line 9556 "configure"
2662 +#line 9454 "configure"
2663 #include "confdefs.h"
2664 /* Override any gcc2 internal prototype to avoid an error. */
2665 /* We use char because int might match the return type of a gcc2
2666 @@ -9563,7 +9461,7 @@
2670 -if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2671 +if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2673 eval "ac_cv_lib_$ac_lib_var=yes"
2675 @@ -9585,17 +9483,17 @@
2677 ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
2678 echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
2679 -echo "configure:9589: checking for X11/extensions/XShm.h" >&5
2680 +echo "configure:9487: checking for X11/extensions/XShm.h" >&5
2681 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2682 echo $ac_n "(cached) $ac_c" 1>&6
2684 cat > conftest.$ac_ext <<EOF
2685 -#line 9594 "configure"
2686 +#line 9492 "configure"
2687 #include "confdefs.h"
2688 #include <X11/extensions/XShm.h>
2690 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2691 -{ (eval echo configure:9599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2692 +{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2693 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2694 if test -z "$ac_err"; then
2696 @@ -9625,7 +9523,7 @@
2699 echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
2700 -echo "configure:9629: checking for XieFloGeometry in -lXIE" >&5
2701 +echo "configure:9527: checking for XieFloGeometry in -lXIE" >&5
2702 ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`
2703 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2704 echo $ac_n "(cached) $ac_c" 1>&6
2705 @@ -9633,7 +9531,7 @@
2706 ac_save_LIBS="$LIBS"
2707 LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
2708 cat > conftest.$ac_ext <<EOF
2709 -#line 9637 "configure"
2710 +#line 9535 "configure"
2711 #include "confdefs.h"
2712 /* Override any gcc2 internal prototype to avoid an error. */
2713 /* We use char because int might match the return type of a gcc2
2714 @@ -9644,7 +9542,7 @@
2718 -if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2719 +if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2721 eval "ac_cv_lib_$ac_lib_var=yes"
2723 @@ -9666,17 +9564,17 @@
2725 ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
2726 echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
2727 -echo "configure:9670: checking for X11/extensions/XIElib.h" >&5
2728 +echo "configure:9568: checking for X11/extensions/XIElib.h" >&5
2729 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2730 echo $ac_n "(cached) $ac_c" 1>&6
2732 cat > conftest.$ac_ext <<EOF
2733 -#line 9675 "configure"
2734 +#line 9573 "configure"
2735 #include "confdefs.h"
2736 #include <X11/extensions/XIElib.h>
2738 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2739 -{ (eval echo configure:9680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2740 +{ (eval echo configure:9578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2741 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2742 if test -z "$ac_err"; then
2744 @@ -9750,7 +9648,7 @@
2745 # Extract the first word of "freetype-config", so it can be a program name with args.
2746 set dummy freetype-config; ac_word=$2
2747 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2748 -echo "configure:9754: checking for $ac_word" >&5
2749 +echo "configure:9652: checking for $ac_word" >&5
2750 if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
2751 echo $ac_n "(cached) $ac_c" 1>&6
2753 @@ -9786,7 +9684,7 @@
2755 min_ft_version=6.1.0
2756 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
2757 -echo "configure:9790: checking for FreeType - version >= $min_ft_version" >&5
2758 +echo "configure:9688: checking for FreeType - version >= $min_ft_version" >&5
2760 if test "$FT2_CONFIG" = "no" ; then
2762 @@ -9834,7 +9732,7 @@
2763 echo $ac_n "cross compiling; assumed OK... $ac_c"
2765 cat > conftest.$ac_ext <<EOF
2766 -#line 9838 "configure"
2767 +#line 9736 "configure"
2768 #include "confdefs.h"
2770 #include <ft2build.h>
2771 @@ -9860,7 +9758,7 @@
2775 -if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2776 +if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2780 @@ -9910,12 +9808,12 @@
2781 CFLAGS="$CFLAGS $FT2_CFLAGS"
2783 echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6
2784 -echo "configure:9914: checking for FT_Bitmap_Size.y_ppem" >&5
2785 +echo "configure:9812: checking for FT_Bitmap_Size.y_ppem" >&5
2786 if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then
2787 echo $ac_n "(cached) $ac_c" 1>&6
2789 cat > conftest.$ac_ext <<EOF
2790 -#line 9919 "configure"
2791 +#line 9817 "configure"
2792 #include "confdefs.h"
2793 #include <ft2build.h>
2794 #include FT_FREETYPE_H
2795 @@ -9925,7 +9823,7 @@
2799 -if { (eval echo configure:9929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2800 +if { (eval echo configure:9827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2802 ac_cv_member_FT_Bitmap_Size_y_ppem=yes
2804 @@ -9951,12 +9849,12 @@
2805 for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size
2807 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2808 -echo "configure:9955: checking for $ac_func" >&5
2809 +echo "configure:9853: checking for $ac_func" >&5
2810 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2811 echo $ac_n "(cached) $ac_c" 1>&6
2813 cat > conftest.$ac_ext <<EOF
2814 -#line 9960 "configure"
2815 +#line 9858 "configure"
2816 #include "confdefs.h"
2817 /* System header to define __stub macros and hopefully few prototypes,
2818 which can conflict with char $ac_func(); below. */
2819 @@ -9979,7 +9877,7 @@
2823 -if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2824 +if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2826 eval "ac_cv_func_$ac_func=yes"
2828 @@ -10022,7 +9920,7 @@
2831 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
2832 -echo "configure:10026: checking for pthread_create in -lpthreads" >&5
2833 +echo "configure:9924: checking for pthread_create in -lpthreads" >&5
2835 #include <pthread.h>
2837 @@ -10045,7 +9943,7 @@
2838 echo "$ac_t""no" 1>&6
2840 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2841 -echo "configure:10049: checking for pthread_create in -lpthread" >&5
2842 +echo "configure:9947: checking for pthread_create in -lpthread" >&5
2844 #include <pthread.h>
2846 @@ -10068,7 +9966,7 @@
2847 echo "$ac_t""no" 1>&6
2849 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2850 -echo "configure:10072: checking for pthread_create in -lc_r" >&5
2851 +echo "configure:9970: checking for pthread_create in -lc_r" >&5
2853 #include <pthread.h>
2855 @@ -10091,7 +9989,7 @@
2856 echo "$ac_t""no" 1>&6
2858 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
2859 -echo "configure:10095: checking for pthread_create in -lc" >&5
2860 +echo "configure:9993: checking for pthread_create in -lc" >&5
2862 #include <pthread.h>
2864 @@ -10150,7 +10048,7 @@
2866 ac_cv_have_dash_pthread=no
2867 echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
2868 -echo "configure:10154: checking whether ${CC-cc} accepts -pthread" >&5
2869 +echo "configure:10052: checking whether ${CC-cc} accepts -pthread" >&5
2870 echo 'int main() { return 0; }' | cat > conftest.c
2871 ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
2872 if test $? -eq 0; then
2873 @@ -10173,7 +10071,7 @@
2874 ac_cv_have_dash_pthreads=no
2875 if test "$ac_cv_have_dash_pthread" = "no"; then
2876 echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
2877 -echo "configure:10177: checking whether ${CC-cc} accepts -pthreads" >&5
2878 +echo "configure:10075: checking whether ${CC-cc} accepts -pthreads" >&5
2879 echo 'int main() { return 0; }' | cat > conftest.c
2880 ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
2881 if test $? -eq 0; then
2882 @@ -10268,7 +10166,7 @@
2885 echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
2886 -echo "configure:10272: checking whether mmap() sees write()s" >&5
2887 +echo "configure:10170: checking whether mmap() sees write()s" >&5
2891 @@ -10307,11 +10205,11 @@
2894 cat > conftest.$ac_ext <<EOF
2895 -#line 10311 "configure"
2896 +#line 10209 "configure"
2897 #include "confdefs.h"
2900 -if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2901 +if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2905 @@ -10336,13 +10234,13 @@
2907 if test $ac_cv_prog_gcc = yes; then
2908 echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
2909 -echo "configure:10340: checking whether ${CC-cc} needs -traditional" >&5
2910 +echo "configure:10238: checking whether ${CC-cc} needs -traditional" >&5
2911 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
2912 echo $ac_n "(cached) $ac_c" 1>&6
2914 ac_pattern="Autoconf.*'x'"
2915 cat > conftest.$ac_ext <<EOF
2916 -#line 10346 "configure"
2917 +#line 10244 "configure"
2918 #include "confdefs.h"
2921 @@ -10360,7 +10258,7 @@
2923 if test $ac_cv_prog_gcc_traditional = no; then
2924 cat > conftest.$ac_ext <<EOF
2925 -#line 10364 "configure"
2926 +#line 10262 "configure"
2927 #include "confdefs.h"
2930 @@ -10382,7 +10280,7 @@
2933 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
2934 -echo "configure:10386: checking for 8-bit clean memcmp" >&5
2935 +echo "configure:10284: checking for 8-bit clean memcmp" >&5
2936 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
2937 echo $ac_n "(cached) $ac_c" 1>&6
2939 @@ -10390,7 +10288,7 @@
2940 ac_cv_func_memcmp_clean=no
2942 cat > conftest.$ac_ext <<EOF
2943 -#line 10394 "configure"
2944 +#line 10292 "configure"
2945 #include "confdefs.h"
2948 @@ -10400,7 +10298,7 @@
2952 -if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2953 +if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2955 ac_cv_func_memcmp_clean=yes
2957 @@ -10420,12 +10318,12 @@
2958 for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64
2960 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2961 -echo "configure:10424: checking for $ac_func" >&5
2962 +echo "configure:10322: checking for $ac_func" >&5
2963 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2964 echo $ac_n "(cached) $ac_c" 1>&6
2966 cat > conftest.$ac_ext <<EOF
2967 -#line 10429 "configure"
2968 +#line 10327 "configure"
2969 #include "confdefs.h"
2970 /* System header to define __stub macros and hopefully few prototypes,
2971 which can conflict with char $ac_func(); below. */
2972 @@ -10448,7 +10346,7 @@
2976 -if { (eval echo configure:10452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2977 +if { (eval echo configure:10350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2979 eval "ac_cv_func_$ac_func=yes"
2981 @@ -10475,12 +10373,12 @@
2982 for ac_func in flockfile getpagesize
2984 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2985 -echo "configure:10479: checking for $ac_func" >&5
2986 +echo "configure:10377: checking for $ac_func" >&5
2987 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2988 echo $ac_n "(cached) $ac_c" 1>&6
2990 cat > conftest.$ac_ext <<EOF
2991 -#line 10484 "configure"
2992 +#line 10382 "configure"
2993 #include "confdefs.h"
2994 /* System header to define __stub macros and hopefully few prototypes,
2995 which can conflict with char $ac_func(); below. */
2996 @@ -10503,7 +10401,7 @@
3000 -if { (eval echo configure:10507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3001 +if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3003 eval "ac_cv_func_$ac_func=yes"
3005 @@ -10532,12 +10430,12 @@
3006 for ac_func in localtime_r strtok_r
3008 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3009 -echo "configure:10536: checking for $ac_func" >&5
3010 +echo "configure:10434: checking for $ac_func" >&5
3011 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3012 echo $ac_n "(cached) $ac_c" 1>&6
3014 cat > conftest.$ac_ext <<EOF
3015 -#line 10541 "configure"
3016 +#line 10439 "configure"
3017 #include "confdefs.h"
3018 /* System header to define __stub macros and hopefully few prototypes,
3019 which can conflict with char $ac_func(); below. */
3020 @@ -10560,7 +10458,7 @@
3024 -if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3025 +if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3027 eval "ac_cv_func_$ac_func=yes"
3029 @@ -10596,19 +10494,19 @@
3030 cross_compiling=$ac_cv_prog_cxx_cross
3032 echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
3033 -echo "configure:10600: checking for wcrtomb" >&5
3034 +echo "configure:10498: checking for wcrtomb" >&5
3035 if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
3036 echo $ac_n "(cached) $ac_c" 1>&6
3038 cat > conftest.$ac_ext <<EOF
3039 -#line 10605 "configure"
3040 +#line 10503 "configure"
3041 #include "confdefs.h"
3044 mbstate_t ps={0};wcrtomb(0,'f',&ps);
3047 -if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3048 +if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3050 ac_cv_have_wcrtomb="yes"
3052 @@ -10628,19 +10526,19 @@
3055 echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
3056 -echo "configure:10632: checking for mbrtowc" >&5
3057 +echo "configure:10530: checking for mbrtowc" >&5
3058 if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
3059 echo $ac_n "(cached) $ac_c" 1>&6
3061 cat > conftest.$ac_ext <<EOF
3062 -#line 10637 "configure"
3063 +#line 10535 "configure"
3064 #include "confdefs.h"
3067 mbstate_t ps={0};mbrtowc(0,0,0,&ps);
3070 -if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3071 +if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3073 ac_cv_have_mbrtowc="yes"
3075 @@ -10669,12 +10567,12 @@
3078 echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
3079 -echo "configure:10673: checking for res_ninit()" >&5
3080 +echo "configure:10571: checking for res_ninit()" >&5
3081 if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then
3082 echo $ac_n "(cached) $ac_c" 1>&6
3084 cat > conftest.$ac_ext <<EOF
3085 -#line 10678 "configure"
3086 +#line 10576 "configure"
3087 #include "confdefs.h"
3090 @@ -10686,7 +10584,7 @@
3091 int foo = res_ninit(&_res);
3094 -if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3095 +if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3097 ac_cv_func_res_ninit=yes
3099 @@ -10716,12 +10614,12 @@
3100 cross_compiling=$ac_cv_prog_cxx_cross
3102 echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
3103 -echo "configure:10720: checking for gnu_get_libc_version()" >&5
3104 +echo "configure:10618: checking for gnu_get_libc_version()" >&5
3105 if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then
3106 echo $ac_n "(cached) $ac_c" 1>&6
3108 cat > conftest.$ac_ext <<EOF
3109 -#line 10725 "configure"
3110 +#line 10623 "configure"
3111 #include "confdefs.h"
3113 #ifdef HAVE_GNU_LIBC_VERSION_H
3114 @@ -10732,7 +10630,7 @@
3115 const char *glibc_version = gnu_get_libc_version();
3118 -if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3119 +if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3121 ac_cv_func_gnu_get_libc_version=yes
3123 @@ -10761,7 +10659,7 @@
3126 echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
3127 -echo "configure:10765: checking for iconv in -lc" >&5
3128 +echo "configure:10663: checking for iconv in -lc" >&5
3129 ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`
3130 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3131 echo $ac_n "(cached) $ac_c" 1>&6
3132 @@ -10769,7 +10667,7 @@
3133 ac_save_LIBS="$LIBS"
3135 cat > conftest.$ac_ext <<EOF
3136 -#line 10773 "configure"
3137 +#line 10671 "configure"
3138 #include "confdefs.h"
3139 /* Override any gcc2 internal prototype to avoid an error. */
3141 @@ -10783,7 +10681,7 @@
3145 -if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3146 +if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3148 eval "ac_cv_lib_$ac_lib_var=yes"
3150 @@ -10802,7 +10700,7 @@
3152 echo "$ac_t""no" 1>&6
3153 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
3154 -echo "configure:10806: checking for iconv in -liconv" >&5
3155 +echo "configure:10704: checking for iconv in -liconv" >&5
3156 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
3157 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3158 echo $ac_n "(cached) $ac_c" 1>&6
3159 @@ -10810,7 +10708,7 @@
3160 ac_save_LIBS="$LIBS"
3161 LIBS="-liconv $LIBS"
3162 cat > conftest.$ac_ext <<EOF
3163 -#line 10814 "configure"
3164 +#line 10712 "configure"
3165 #include "confdefs.h"
3166 /* Override any gcc2 internal prototype to avoid an error. */
3168 @@ -10824,7 +10722,7 @@
3172 -if { (eval echo configure:10828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3173 +if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3175 eval "ac_cv_lib_$ac_lib_var=yes"
3177 @@ -10843,7 +10741,7 @@
3179 echo "$ac_t""no" 1>&6
3180 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
3181 -echo "configure:10847: checking for libiconv in -liconv" >&5
3182 +echo "configure:10745: checking for libiconv in -liconv" >&5
3183 ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
3184 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3185 echo $ac_n "(cached) $ac_c" 1>&6
3186 @@ -10851,7 +10749,7 @@
3187 ac_save_LIBS="$LIBS"
3188 LIBS="-liconv $LIBS"
3189 cat > conftest.$ac_ext <<EOF
3190 -#line 10855 "configure"
3191 +#line 10753 "configure"
3192 #include "confdefs.h"
3193 /* Override any gcc2 internal prototype to avoid an error. */
3195 @@ -10865,7 +10763,7 @@
3199 -if { (eval echo configure:10869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3200 +if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3202 eval "ac_cv_lib_$ac_lib_var=yes"
3204 @@ -10892,12 +10790,12 @@
3206 LIBS="$LIBS $_ICONV_LIBS"
3207 echo $ac_n "checking for iconv()""... $ac_c" 1>&6
3208 -echo "configure:10896: checking for iconv()" >&5
3209 +echo "configure:10794: checking for iconv()" >&5
3210 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
3211 echo $ac_n "(cached) $ac_c" 1>&6
3213 cat > conftest.$ac_ext <<EOF
3214 -#line 10901 "configure"
3215 +#line 10799 "configure"
3216 #include "confdefs.h"
3219 @@ -10911,7 +10809,7 @@
3223 -if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3224 +if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3226 ac_cv_func_iconv=yes
3228 @@ -10935,12 +10833,12 @@
3229 LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
3230 LIBICONV="$_ICONV_LIBS"
3231 echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
3232 -echo "configure:10939: checking for iconv() with const input" >&5
3233 +echo "configure:10837: checking for iconv() with const input" >&5
3234 if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
3235 echo $ac_n "(cached) $ac_c" 1>&6
3237 cat > conftest.$ac_ext <<EOF
3238 -#line 10944 "configure"
3239 +#line 10842 "configure"
3240 #include "confdefs.h"
3243 @@ -10955,7 +10853,7 @@
3247 -if { (eval echo configure:10959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3248 +if { (eval echo configure:10857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3250 ac_cv_func_const_iconv=yes
3252 @@ -10984,19 +10882,19 @@
3255 echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
3256 -echo "configure:10988: checking for nl_langinfo and CODESET" >&5
3257 +echo "configure:10886: checking for nl_langinfo and CODESET" >&5
3258 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
3259 echo $ac_n "(cached) $ac_c" 1>&6
3261 cat > conftest.$ac_ext <<EOF
3262 -#line 10993 "configure"
3263 +#line 10891 "configure"
3264 #include "confdefs.h"
3265 #include <langinfo.h>
3267 char* cs = nl_langinfo(CODESET);
3270 -if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3271 +if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3273 am_cv_langinfo_codeset=yes
3275 @@ -11028,7 +10926,7 @@
3278 echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
3279 -echo "configure:11032: checking for an implementation of va_copy()" >&5
3280 +echo "configure:10930: checking for an implementation of va_copy()" >&5
3281 if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
3282 echo $ac_n "(cached) $ac_c" 1>&6
3284 @@ -11038,7 +10936,7 @@
3287 cat > conftest.$ac_ext <<EOF
3288 -#line 11042 "configure"
3289 +#line 10940 "configure"
3290 #include "confdefs.h"
3293 @@ -11052,7 +10950,7 @@
3295 int main() { f (0, 42); return 0; }
3297 -if { (eval echo configure:11056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3298 +if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3302 @@ -11069,7 +10967,7 @@
3304 echo "$ac_t""$ac_cv_va_copy" 1>&6
3305 echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
3306 -echo "configure:11073: checking for an implementation of __va_copy()" >&5
3307 +echo "configure:10971: checking for an implementation of __va_copy()" >&5
3308 if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
3309 echo $ac_n "(cached) $ac_c" 1>&6
3311 @@ -11079,7 +10977,7 @@
3314 cat > conftest.$ac_ext <<EOF
3315 -#line 11083 "configure"
3316 +#line 10981 "configure"
3317 #include "confdefs.h"
3320 @@ -11093,7 +10991,7 @@
3322 int main() { f (0, 42); return 0; }
3324 -if { (eval echo configure:11097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3325 +if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3329 @@ -11110,7 +11008,7 @@
3331 echo "$ac_t""$ac_cv___va_copy" 1>&6
3332 echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
3333 -echo "configure:11114: checking whether va_lists can be copied by value" >&5
3334 +echo "configure:11012: checking whether va_lists can be copied by value" >&5
3335 if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
3336 echo $ac_n "(cached) $ac_c" 1>&6
3338 @@ -11120,7 +11018,7 @@
3341 cat > conftest.$ac_ext <<EOF
3342 -#line 11124 "configure"
3343 +#line 11022 "configure"
3344 #include "confdefs.h"
3347 @@ -11134,7 +11032,7 @@
3349 int main() { f (0, 42); return 0; }
3351 -if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3352 +if { (eval echo configure:11036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3354 ac_cv_va_val_copy=yes
3356 @@ -11233,7 +11131,7 @@
3357 if test "$GNU_CXX"; then
3359 echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
3360 -echo "configure:11237: checking for C++ exceptions flag" >&5
3361 +echo "configure:11135: checking for C++ exceptions flag" >&5
3363 if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
3364 echo $ac_n "(cached) $ac_c" 1>&6
3365 @@ -11268,12 +11166,12 @@
3367 if test "$GNU_CC"; then
3368 echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
3369 -echo "configure:11272: checking for gcc 3.0 ABI" >&5
3370 +echo "configure:11170: checking for gcc 3.0 ABI" >&5
3371 if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then
3372 echo $ac_n "(cached) $ac_c" 1>&6
3374 cat > conftest.$ac_ext <<EOF
3375 -#line 11277 "configure"
3376 +#line 11175 "configure"
3377 #include "confdefs.h"
3380 @@ -11286,7 +11184,7 @@
3384 -if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3385 +if { (eval echo configure:11188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3387 ac_cv_gcc_three_abi="yes"
3389 @@ -11310,12 +11208,12 @@
3392 echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
3393 -echo "configure:11314: checking for C++ \"explicit\" keyword" >&5
3394 +echo "configure:11212: checking for C++ \"explicit\" keyword" >&5
3395 if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then
3396 echo $ac_n "(cached) $ac_c" 1>&6
3398 cat > conftest.$ac_ext <<EOF
3399 -#line 11319 "configure"
3400 +#line 11217 "configure"
3401 #include "confdefs.h"
3403 public: explicit X(int i) : i_(i) {}
3404 @@ -11325,7 +11223,7 @@
3408 -if { (eval echo configure:11329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3409 +if { (eval echo configure:11227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3411 ac_cv_cpp_explicit=yes
3413 @@ -11346,12 +11244,12 @@
3416 echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
3417 -echo "configure:11350: checking for C++ \"typename\" keyword" >&5
3418 +echo "configure:11248: checking for C++ \"typename\" keyword" >&5
3419 if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then
3420 echo $ac_n "(cached) $ac_c" 1>&6
3422 cat > conftest.$ac_ext <<EOF
3423 -#line 11355 "configure"
3424 +#line 11253 "configure"
3425 #include "confdefs.h"
3428 @@ -11370,7 +11268,7 @@
3432 -if { (eval echo configure:11374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3433 +if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3435 ac_cv_cpp_typename=yes
3437 @@ -11391,12 +11289,12 @@
3440 echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
3441 -echo "configure:11395: checking for modern C++ template specialization syntax support" >&5
3442 +echo "configure:11293: checking for modern C++ template specialization syntax support" >&5
3443 if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
3444 echo $ac_n "(cached) $ac_c" 1>&6
3446 cat > conftest.$ac_ext <<EOF
3447 -#line 11400 "configure"
3448 +#line 11298 "configure"
3449 #include "confdefs.h"
3450 template <class T> struct X { int a; };
3452 @@ -11406,7 +11304,7 @@
3456 -if { (eval echo configure:11410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3457 +if { (eval echo configure:11308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3459 ac_cv_cpp_modern_specialize_template_syntax=yes
3461 @@ -11428,12 +11326,12 @@
3464 echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
3465 -echo "configure:11432: checking whether partial template specialization works" >&5
3466 +echo "configure:11330: checking whether partial template specialization works" >&5
3467 if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
3468 echo $ac_n "(cached) $ac_c" 1>&6
3470 cat > conftest.$ac_ext <<EOF
3471 -#line 11437 "configure"
3472 +#line 11335 "configure"
3473 #include "confdefs.h"
3474 template <class T> class Foo {};
3475 template <class T> class Foo<T*> {};
3476 @@ -11441,7 +11339,7 @@
3480 -if { (eval echo configure:11445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3481 +if { (eval echo configure:11343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3483 ac_cv_cpp_partial_specialization=yes
3485 @@ -11462,12 +11360,12 @@
3488 echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
3489 -echo "configure:11466: checking whether operators must be re-defined for templates derived from templates" >&5
3490 +echo "configure:11364: checking whether operators must be re-defined for templates derived from templates" >&5
3491 if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
3492 echo $ac_n "(cached) $ac_c" 1>&6
3494 cat > conftest.$ac_ext <<EOF
3495 -#line 11471 "configure"
3496 +#line 11369 "configure"
3497 #include "confdefs.h"
3498 template <class T> class Base { };
3500 @@ -11479,7 +11377,7 @@
3504 -if { (eval echo configure:11483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3505 +if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3507 ac_cv_need_derived_template_operators=no
3509 @@ -11501,12 +11399,12 @@
3512 echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
3513 -echo "configure:11505: checking whether we need to cast a derived template to pass as its base class" >&5
3514 +echo "configure:11403: checking whether we need to cast a derived template to pass as its base class" >&5
3515 if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
3516 echo $ac_n "(cached) $ac_c" 1>&6
3518 cat > conftest.$ac_ext <<EOF
3519 -#line 11510 "configure"
3520 +#line 11408 "configure"
3521 #include "confdefs.h"
3522 template <class T> class Base { };
3523 template <class T> class Derived : public Base<T> { };
3524 @@ -11515,7 +11413,7 @@
3525 Derived<char> bar; return foo(bar);
3528 -if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3529 +if { (eval echo configure:11417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3531 ac_cv_need_cpp_template_cast_to_base=no
3533 @@ -11536,12 +11434,12 @@
3536 echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
3537 -echo "configure:11540: checking whether the compiler can resolve const ambiguities for templates" >&5
3538 +echo "configure:11438: checking whether the compiler can resolve const ambiguities for templates" >&5
3539 if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
3540 echo $ac_n "(cached) $ac_c" 1>&6
3542 cat > conftest.$ac_ext <<EOF
3543 -#line 11545 "configure"
3544 +#line 11443 "configure"
3545 #include "confdefs.h"
3547 template <class T> class ptrClass {
3548 @@ -11562,7 +11460,7 @@
3552 -if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3553 +if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3555 ac_cv_can_resolve_const_ambiguity=yes
3557 @@ -11584,12 +11482,12 @@
3560 echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
3561 -echo "configure:11588: checking whether the C++ \"using\" keyword can change access" >&5
3562 +echo "configure:11486: checking whether the C++ \"using\" keyword can change access" >&5
3563 if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then
3564 echo $ac_n "(cached) $ac_c" 1>&6
3566 cat > conftest.$ac_ext <<EOF
3567 -#line 11593 "configure"
3568 +#line 11491 "configure"
3569 #include "confdefs.h"
3570 class A { protected: int foo() { return 0; } };
3571 class B : public A { public: using A::foo; };
3572 @@ -11597,10 +11495,10 @@
3573 B b; return b.foo();
3576 -if { (eval echo configure:11601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3577 +if { (eval echo configure:11499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3579 cat > conftest.$ac_ext <<EOF
3580 -#line 11604 "configure"
3581 +#line 11502 "configure"
3582 #include "confdefs.h"
3583 class A { public: int foo() { return 1; } };
3584 class B : public A { private: using A::foo; };
3585 @@ -11608,7 +11506,7 @@
3586 B b; return b.foo();
3589 -if { (eval echo configure:11612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3590 +if { (eval echo configure:11510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3592 ac_cv_cpp_access_changing_using2=no
3594 @@ -11636,12 +11534,12 @@
3597 echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
3598 -echo "configure:11640: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
3599 +echo "configure:11538: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
3600 if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
3601 echo $ac_n "(cached) $ac_c" 1>&6
3603 cat > conftest.$ac_ext <<EOF
3604 -#line 11645 "configure"
3605 +#line 11543 "configure"
3606 #include "confdefs.h"
3608 public: int go(const X&) {return 3;}
3609 @@ -11657,7 +11555,7 @@
3613 -if { (eval echo configure:11661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3614 +if { (eval echo configure:11559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3616 ac_cv_cpp_ambiguity_resolving_using=yes
3618 @@ -11678,19 +11576,19 @@
3621 echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
3622 -echo "configure:11682: checking for \"std::\" namespace" >&5
3623 +echo "configure:11580: checking for \"std::\" namespace" >&5
3624 if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
3625 echo $ac_n "(cached) $ac_c" 1>&6
3627 cat > conftest.$ac_ext <<EOF
3628 -#line 11687 "configure"
3629 +#line 11585 "configure"
3630 #include "confdefs.h"
3631 #include <algorithm>
3633 return std::min(0, 1);
3636 -if { (eval echo configure:11694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3637 +if { (eval echo configure:11592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3639 ac_cv_cpp_namespace_std=yes
3641 @@ -11711,12 +11609,12 @@
3644 echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
3645 -echo "configure:11715: checking whether standard template operator!=() is ambiguous" >&5
3646 +echo "configure:11613: checking whether standard template operator!=() is ambiguous" >&5
3647 if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
3648 echo $ac_n "(cached) $ac_c" 1>&6
3650 cat > conftest.$ac_ext <<EOF
3651 -#line 11720 "configure"
3652 +#line 11618 "configure"
3653 #include "confdefs.h"
3654 #include <algorithm>
3656 @@ -11726,7 +11624,7 @@
3657 T1 a,b; return a != b;
3660 -if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3661 +if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3663 ac_cv_cpp_unambiguous_std_notequal=unambiguous
3665 @@ -11748,12 +11646,12 @@
3668 echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
3669 -echo "configure:11752: checking for C++ reinterpret_cast" >&5
3670 +echo "configure:11650: checking for C++ reinterpret_cast" >&5
3671 if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
3672 echo $ac_n "(cached) $ac_c" 1>&6
3674 cat > conftest.$ac_ext <<EOF
3675 -#line 11757 "configure"
3676 +#line 11655 "configure"
3677 #include "confdefs.h"
3678 struct X { int i; };
3679 struct Y { int i; };
3680 @@ -11761,7 +11659,7 @@
3681 X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
3684 -if { (eval echo configure:11765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3685 +if { (eval echo configure:11663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3687 ac_cv_cpp_reinterpret_cast=yes
3689 @@ -11782,7 +11680,7 @@
3692 echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
3693 -echo "configure:11786: checking for C++ dynamic_cast to void*" >&5
3694 +echo "configure:11684: checking for C++ dynamic_cast to void*" >&5
3695 if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
3696 echo $ac_n "(cached) $ac_c" 1>&6
3698 @@ -11790,8 +11688,11 @@
3699 ac_cv_cpp_dynamic_cast_void_ptr=no
3701 cat > conftest.$ac_ext <<EOF
3702 -#line 11794 "configure"
3703 +#line 11692 "configure"
3704 #include "confdefs.h"
3706 +extern "C" void exit(int);
3708 class X { int i; public: virtual ~X() { } };
3709 class Y { int j; public: virtual ~Y() { } };
3710 class Z : public X, public Y { int k; };
3711 @@ -11806,7 +11707,7 @@
3712 ((void*)&mdo == dynamic_cast<void*>(suby))));
3715 -if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3716 +if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3718 ac_cv_cpp_dynamic_cast_void_ptr=yes
3720 @@ -11830,19 +11731,19 @@
3723 echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
3724 -echo "configure:11834: checking whether C++ requires implementation of unused virtual methods" >&5
3725 +echo "configure:11735: checking whether C++ requires implementation of unused virtual methods" >&5
3726 if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
3727 echo $ac_n "(cached) $ac_c" 1>&6
3729 cat > conftest.$ac_ext <<EOF
3730 -#line 11839 "configure"
3731 +#line 11740 "configure"
3732 #include "confdefs.h"
3733 class X {private: virtual void never_called();};
3738 -if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3739 +if { (eval echo configure:11747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3741 ac_cv_cpp_unused_required=no
3743 @@ -11865,12 +11766,12 @@
3746 echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
3747 -echo "configure:11869: checking for trouble comparing to zero near std::operator!=()" >&5
3748 +echo "configure:11770: checking for trouble comparing to zero near std::operator!=()" >&5
3749 if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
3750 echo $ac_n "(cached) $ac_c" 1>&6
3752 cat > conftest.$ac_ext <<EOF
3753 -#line 11874 "configure"
3754 +#line 11775 "configure"
3755 #include "confdefs.h"
3756 #include <algorithm>
3757 template <class T> class Foo {};
3758 @@ -11881,7 +11782,7 @@
3759 Foo<int> f; return (0 != f);
3762 -if { (eval echo configure:11885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3763 +if { (eval echo configure:11786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3765 ac_cv_trouble_comparing_to_zero=no
3767 @@ -11913,19 +11814,19 @@
3770 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
3771 -echo "configure:11917: checking for LC_MESSAGES" >&5
3772 +echo "configure:11818: checking for LC_MESSAGES" >&5
3773 if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
3774 echo $ac_n "(cached) $ac_c" 1>&6
3776 cat > conftest.$ac_ext <<EOF
3777 -#line 11922 "configure"
3778 +#line 11823 "configure"
3779 #include "confdefs.h"
3782 int category = LC_MESSAGES;
3785 -if { (eval echo configure:11929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3786 +if { (eval echo configure:11830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3788 ac_cv_i18n_lc_messages=yes
3790 @@ -12028,7 +11929,7 @@
3791 # Extract the first word of "nspr-config", so it can be a program name with args.
3792 set dummy nspr-config; ac_word=$2
3793 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3794 -echo "configure:12032: checking for $ac_word" >&5
3795 +echo "configure:11933: checking for $ac_word" >&5
3796 if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
3797 echo $ac_n "(cached) $ac_c" 1>&6
3799 @@ -12063,7 +11964,7 @@
3801 min_nspr_version=4.7.0
3802 echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
3803 -echo "configure:12067: checking for NSPR - version >= $min_nspr_version" >&5
3804 +echo "configure:11968: checking for NSPR - version >= $min_nspr_version" >&5
3807 if test "$NSPR_CONFIG" = "no"; then
3808 @@ -12114,7 +12015,7 @@
3809 _SAVE_CFLAGS=$CFLAGS
3810 CFLAGS="$CFLAGS $NSPR_CFLAGS"
3811 cat > conftest.$ac_ext <<EOF
3812 -#line 12118 "configure"
3813 +#line 12019 "configure"
3814 #include "confdefs.h"
3817 @@ -12123,7 +12024,7 @@
3821 -if { (eval echo configure:12127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3822 +if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3826 @@ -12135,6 +12036,10 @@
3828 CFLAGS=$_SAVE_CFLAGS
3830 + if test -n "$LIBXUL_SDK"; then
3831 + NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include"
3832 + NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION"
3834 NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`'
3835 # explicitly set libs for Visual Age C++ for OS/2
3836 if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
3837 @@ -12152,6 +12057,7 @@
3839 NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`'
3845 @@ -12205,7 +12111,7 @@
3846 # Extract the first word of "nss-config", so it can be a program name with args.
3847 set dummy nss-config; ac_word=$2
3848 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3849 -echo "configure:12209: checking for $ac_word" >&5
3850 +echo "configure:12115: checking for $ac_word" >&5
3851 if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
3852 echo $ac_n "(cached) $ac_c" 1>&6
3854 @@ -12240,7 +12146,7 @@
3856 min_nss_version=3.12.0
3857 echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
3858 -echo "configure:12244: checking for NSS - version >= $min_nss_version" >&5
3859 +echo "configure:12150: checking for NSS - version >= $min_nss_version" >&5
3862 if test "$NSS_CONFIG" = "no"; then
3863 @@ -12331,7 +12237,7 @@
3866 echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
3867 -echo "configure:12335: checking for jpeg_destroy_compress in -ljpeg" >&5
3868 +echo "configure:12241: checking for jpeg_destroy_compress in -ljpeg" >&5
3869 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
3870 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3871 echo $ac_n "(cached) $ac_c" 1>&6
3872 @@ -12339,7 +12245,7 @@
3873 ac_save_LIBS="$LIBS"
3874 LIBS="-ljpeg $JPEG_LIBS $LIBS"
3875 cat > conftest.$ac_ext <<EOF
3876 -#line 12343 "configure"
3877 +#line 12249 "configure"
3878 #include "confdefs.h"
3879 /* Override any gcc2 internal prototype to avoid an error. */
3880 /* We use char because int might match the return type of a gcc2
3881 @@ -12350,7 +12256,7 @@
3882 jpeg_destroy_compress()
3885 -if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3886 +if { (eval echo configure:12260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3888 eval "ac_cv_lib_$ac_lib_var=yes"
3890 @@ -12376,7 +12282,7 @@
3891 if test "$SYSTEM_JPEG" = 1; then
3892 LIBS="$JPEG_LIBS $LIBS"
3893 cat > conftest.$ac_ext <<EOF
3894 -#line 12380 "configure"
3895 +#line 12286 "configure"
3896 #include "confdefs.h"
3898 #include <sys/types.h>
3899 @@ -12387,7 +12293,7 @@
3903 -if { (eval echo configure:12391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3904 +if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3908 @@ -12425,7 +12331,7 @@
3911 echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
3912 -echo "configure:12429: checking for gzread in -lz" >&5
3913 +echo "configure:12335: checking for gzread in -lz" >&5
3914 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
3915 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3916 echo $ac_n "(cached) $ac_c" 1>&6
3917 @@ -12433,7 +12339,7 @@
3918 ac_save_LIBS="$LIBS"
3919 LIBS="-lz $ZLIB_LIBS $LIBS"
3920 cat > conftest.$ac_ext <<EOF
3921 -#line 12437 "configure"
3922 +#line 12343 "configure"
3923 #include "confdefs.h"
3924 /* Override any gcc2 internal prototype to avoid an error. */
3925 /* We use char because int might match the return type of a gcc2
3926 @@ -12444,7 +12350,7 @@
3930 -if { (eval echo configure:12448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3931 +if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3933 eval "ac_cv_lib_$ac_lib_var=yes"
3935 @@ -12469,7 +12375,7 @@
3936 if test "$SYSTEM_ZLIB" = 1; then
3937 LIBS="$ZLIB_LIBS $LIBS"
3938 cat > conftest.$ac_ext <<EOF
3939 -#line 12473 "configure"
3940 +#line 12379 "configure"
3941 #include "confdefs.h"
3944 @@ -12480,7 +12386,7 @@
3948 -if { (eval echo configure:12484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3949 +if { (eval echo configure:12390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3953 @@ -12518,7 +12424,7 @@
3956 echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6
3957 -echo "configure:12522: checking for BZ2_bzread in -lbz2" >&5
3958 +echo "configure:12428: checking for BZ2_bzread in -lbz2" >&5
3959 ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'`
3960 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3961 echo $ac_n "(cached) $ac_c" 1>&6
3962 @@ -12526,7 +12432,7 @@
3963 ac_save_LIBS="$LIBS"
3964 LIBS="-lbz2 $BZ2_LIBS $LIBS"
3965 cat > conftest.$ac_ext <<EOF
3966 -#line 12530 "configure"
3967 +#line 12436 "configure"
3968 #include "confdefs.h"
3969 /* Override any gcc2 internal prototype to avoid an error. */
3970 /* We use char because int might match the return type of a gcc2
3971 @@ -12537,7 +12443,7 @@
3975 -if { (eval echo configure:12541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3976 +if { (eval echo configure:12447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3978 eval "ac_cv_lib_$ac_lib_var=yes"
3980 @@ -12589,7 +12495,7 @@
3982 _SAVE_PNG_LIBS=$PNG_LIBS
3983 echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
3984 -echo "configure:12593: checking for png_get_valid in -lpng" >&5
3985 +echo "configure:12499: checking for png_get_valid in -lpng" >&5
3986 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
3987 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3988 echo $ac_n "(cached) $ac_c" 1>&6
3989 @@ -12597,7 +12503,7 @@
3990 ac_save_LIBS="$LIBS"
3991 LIBS="-lpng $PNG_LIBS $LIBS"
3992 cat > conftest.$ac_ext <<EOF
3993 -#line 12601 "configure"
3994 +#line 12507 "configure"
3995 #include "confdefs.h"
3996 /* Override any gcc2 internal prototype to avoid an error. */
3997 /* We use char because int might match the return type of a gcc2
3998 @@ -12608,7 +12514,7 @@
4002 -if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4003 +if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4005 eval "ac_cv_lib_$ac_lib_var=yes"
4007 @@ -12630,7 +12536,7 @@
4010 echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6
4011 -echo "configure:12634: checking for png_get_acTL in -lpng" >&5
4012 +echo "configure:12540: checking for png_get_acTL in -lpng" >&5
4013 ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'`
4014 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4015 echo $ac_n "(cached) $ac_c" 1>&6
4016 @@ -12638,7 +12544,7 @@
4017 ac_save_LIBS="$LIBS"
4018 LIBS="-lpng $_SAVE_PNG_LIBS $LIBS"
4019 cat > conftest.$ac_ext <<EOF
4020 -#line 12642 "configure"
4021 +#line 12548 "configure"
4022 #include "confdefs.h"
4023 /* Override any gcc2 internal prototype to avoid an error. */
4024 /* We use char because int might match the return type of a gcc2
4025 @@ -12649,7 +12555,7 @@
4029 -if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4030 +if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4032 eval "ac_cv_lib_$ac_lib_var=yes"
4034 @@ -12681,7 +12587,7 @@
4035 if test "$SYSTEM_PNG" = 1; then
4036 LIBS="$PNG_LIBS $LIBS"
4037 cat > conftest.$ac_ext <<EOF
4038 -#line 12685 "configure"
4039 +#line 12591 "configure"
4040 #include "confdefs.h"
4042 #include <sys/types.h>
4043 @@ -12695,7 +12601,7 @@
4047 -if { (eval echo configure:12699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4048 +if { (eval echo configure:12605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4052 @@ -12737,7 +12643,7 @@
4053 # Extract the first word of "pkg-config", so it can be a program name with args.
4054 set dummy pkg-config; ac_word=$2
4055 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4056 -echo "configure:12741: checking for $ac_word" >&5
4057 +echo "configure:12647: checking for $ac_word" >&5
4058 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4059 echo $ac_n "(cached) $ac_c" 1>&6
4061 @@ -12781,19 +12687,19 @@
4062 PKG_CONFIG_MIN_VERSION=0.9.0
4063 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4064 echo $ac_n "checking for hunspell""... $ac_c" 1>&6
4065 -echo "configure:12785: checking for hunspell" >&5
4066 +echo "configure:12691: checking for hunspell" >&5
4068 if $PKG_CONFIG --exists "hunspell" ; then
4069 echo "$ac_t""yes" 1>&6
4072 echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6
4073 -echo "configure:12792: checking MOZ_HUNSPELL_CFLAGS" >&5
4074 +echo "configure:12698: checking MOZ_HUNSPELL_CFLAGS" >&5
4075 MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
4076 echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6
4078 echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6
4079 -echo "configure:12797: checking MOZ_HUNSPELL_LIBS" >&5
4080 +echo "configure:12703: checking MOZ_HUNSPELL_LIBS" >&5
4081 ## Remove evil flags like -Wl,--export-dynamic
4082 MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`"
4083 echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6
4084 @@ -13161,7 +13067,7 @@
4085 # Allow the application to influence configure with a confvars.sh script.
4087 echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6
4088 -echo "configure:13165: checking if app-specific confvars.sh exists" >&5
4089 +echo "configure:13071: checking if app-specific confvars.sh exists" >&5
4090 if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
4091 echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6
4092 . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
4093 @@ -13284,6 +13190,10 @@
4097 +if test -n "$LIBXUL_SDK"; then
4098 + MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h`
4101 # Check whether --enable-default-toolkit or --disable-default-toolkit was given.
4102 if test "${enable_default_toolkit+set}" = set; then
4103 enableval="$enable_default_toolkit"
4104 @@ -13309,6 +13219,7 @@
4105 { echo "configure: error: Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported)." 1>&2; exit 1; }
4110 cat >> confdefs.h <<EOF
4111 #define MOZ_DEFAULT_TOOLKIT "$MOZ_WIDGET_TOOLKIT"
4112 @@ -13404,7 +13315,7 @@
4113 # Extract the first word of "pkg-config", so it can be a program name with args.
4114 set dummy pkg-config; ac_word=$2
4115 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4116 -echo "configure:13408: checking for $ac_word" >&5
4117 +echo "configure:13319: checking for $ac_word" >&5
4118 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4119 echo $ac_n "(cached) $ac_c" 1>&6
4121 @@ -13448,19 +13359,19 @@
4122 PKG_CONFIG_MIN_VERSION=0.9.0
4123 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4124 echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
4125 -echo "configure:13452: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
4126 +echo "configure:13363: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
4128 if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then
4129 echo "$ac_t""yes" 1>&6
4132 echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
4133 -echo "configure:13459: checking MOZ_GTK2_CFLAGS" >&5
4134 +echo "configure:13370: checking MOZ_GTK2_CFLAGS" >&5
4135 MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0"`
4136 echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
4138 echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
4139 -echo "configure:13464: checking MOZ_GTK2_LIBS" >&5
4140 +echo "configure:13375: checking MOZ_GTK2_LIBS" >&5
4141 ## Remove evil flags like -Wl,--export-dynamic
4142 MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
4143 echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
4144 @@ -13495,6 +13406,7 @@
4148 +if test -z "$LIBXUL_SDK"; then
4149 if test "$MOZ_ENABLE_GTK2"
4151 MOZ_ENABLE_STARTUP_NOTIFICATION=
4152 @@ -13519,7 +13431,7 @@
4153 # Extract the first word of "pkg-config", so it can be a program name with args.
4154 set dummy pkg-config; ac_word=$2
4155 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4156 -echo "configure:13523: checking for $ac_word" >&5
4157 +echo "configure:13435: checking for $ac_word" >&5
4158 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4159 echo $ac_n "(cached) $ac_c" 1>&6
4161 @@ -13563,19 +13475,19 @@
4162 PKG_CONFIG_MIN_VERSION=0.9.0
4163 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4164 echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
4165 -echo "configure:13567: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
4166 +echo "configure:13479: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
4168 if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
4169 echo "$ac_t""yes" 1>&6
4172 echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
4173 -echo "configure:13574: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
4174 +echo "configure:13486: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
4175 MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
4176 echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
4178 echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
4179 -echo "configure:13579: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
4180 +echo "configure:13491: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
4181 ## Remove evil flags like -Wl,--export-dynamic
4182 MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4183 echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
4184 @@ -13621,6 +13533,7 @@
4186 TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
4192 @@ -13639,7 +13552,7 @@
4196 -if test "$MOZ_ENABLE_GTK2"
4197 +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK"
4199 cat >> confdefs.h <<\EOF
4201 @@ -13779,7 +13692,7 @@
4205 -if test "$MOZ_ENABLE_GTK2"
4206 +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK"
4210 @@ -13787,7 +13700,7 @@
4211 # Extract the first word of "pkg-config", so it can be a program name with args.
4212 set dummy pkg-config; ac_word=$2
4213 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4214 -echo "configure:13791: checking for $ac_word" >&5
4215 +echo "configure:13704: checking for $ac_word" >&5
4216 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4217 echo $ac_n "(cached) $ac_c" 1>&6
4219 @@ -13831,19 +13744,19 @@
4220 PKG_CONFIG_MIN_VERSION=0.9.0
4221 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4222 echo $ac_n "checking for xft""... $ac_c" 1>&6
4223 -echo "configure:13835: checking for xft" >&5
4224 +echo "configure:13748: checking for xft" >&5
4226 if $PKG_CONFIG --exists "xft" ; then
4227 echo "$ac_t""yes" 1>&6
4230 echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
4231 -echo "configure:13842: checking MOZ_XFT_CFLAGS" >&5
4232 +echo "configure:13755: checking MOZ_XFT_CFLAGS" >&5
4233 MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
4234 echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
4236 echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
4237 -echo "configure:13847: checking MOZ_XFT_LIBS" >&5
4238 +echo "configure:13760: checking MOZ_XFT_LIBS" >&5
4239 ## Remove evil flags like -Wl,--export-dynamic
4240 MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`"
4241 echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
4242 @@ -13881,7 +13794,7 @@
4243 # Extract the first word of "pkg-config", so it can be a program name with args.
4244 set dummy pkg-config; ac_word=$2
4245 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4246 -echo "configure:13885: checking for $ac_word" >&5
4247 +echo "configure:13798: checking for $ac_word" >&5
4248 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4249 echo $ac_n "(cached) $ac_c" 1>&6
4251 @@ -13925,19 +13838,19 @@
4252 PKG_CONFIG_MIN_VERSION=0.9.0
4253 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4254 echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6
4255 -echo "configure:13929: checking for pango >= $PANGO_VERSION" >&5
4256 +echo "configure:13842: checking for pango >= $PANGO_VERSION" >&5
4258 if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then
4259 echo "$ac_t""yes" 1>&6
4262 echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
4263 -echo "configure:13936: checking _PANGOCHK_CFLAGS" >&5
4264 +echo "configure:13849: checking _PANGOCHK_CFLAGS" >&5
4265 _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"`
4266 echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
4268 echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
4269 -echo "configure:13941: checking _PANGOCHK_LIBS" >&5
4270 +echo "configure:13854: checking _PANGOCHK_LIBS" >&5
4271 ## Remove evil flags like -Wl,--export-dynamic
4272 _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4273 echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
4274 @@ -13972,7 +13885,7 @@
4275 # Extract the first word of "pkg-config", so it can be a program name with args.
4276 set dummy pkg-config; ac_word=$2
4277 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4278 -echo "configure:13976: checking for $ac_word" >&5
4279 +echo "configure:13889: checking for $ac_word" >&5
4280 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4281 echo $ac_n "(cached) $ac_c" 1>&6
4283 @@ -14016,19 +13929,19 @@
4284 PKG_CONFIG_MIN_VERSION=0.9.0
4285 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4286 echo $ac_n "checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION""... $ac_c" 1>&6
4287 -echo "configure:14020: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5
4288 +echo "configure:13933: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5
4290 if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" ; then
4291 echo "$ac_t""yes" 1>&6
4294 echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
4295 -echo "configure:14027: checking MOZ_PANGO_CFLAGS" >&5
4296 +echo "configure:13940: checking MOZ_PANGO_CFLAGS" >&5
4297 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"`
4298 echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
4300 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
4301 -echo "configure:14032: checking MOZ_PANGO_LIBS" >&5
4302 +echo "configure:13945: checking MOZ_PANGO_LIBS" >&5
4303 ## Remove evil flags like -Wl,--export-dynamic
4304 MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4305 echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
4306 @@ -14075,6 +13988,7 @@
4310 +if test -z "$LIBXUL_SDK"; then
4313 if test "$MOZ_ENABLE_GTK2"
4314 @@ -14105,7 +14019,7 @@
4315 # Extract the first word of "pkg-config", so it can be a program name with args.
4316 set dummy pkg-config; ac_word=$2
4317 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4318 -echo "configure:14109: checking for $ac_word" >&5
4319 +echo "configure:14023: checking for $ac_word" >&5
4320 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4321 echo $ac_n "(cached) $ac_c" 1>&6
4323 @@ -14149,19 +14063,19 @@
4324 PKG_CONFIG_MIN_VERSION=0.9.0
4325 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4326 echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
4327 -echo "configure:14153: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
4328 +echo "configure:14067: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
4330 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
4331 echo "$ac_t""yes" 1>&6
4334 echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
4335 -echo "configure:14160: checking MOZ_GNOMEVFS_CFLAGS" >&5
4336 +echo "configure:14074: checking MOZ_GNOMEVFS_CFLAGS" >&5
4337 MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
4338 echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
4340 echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
4341 -echo "configure:14165: checking MOZ_GNOMEVFS_LIBS" >&5
4342 +echo "configure:14079: checking MOZ_GNOMEVFS_LIBS" >&5
4343 ## Remove evil flags like -Wl,--export-dynamic
4344 MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4345 echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
4346 @@ -14212,7 +14126,7 @@
4347 # Extract the first word of "pkg-config", so it can be a program name with args.
4348 set dummy pkg-config; ac_word=$2
4349 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4350 -echo "configure:14216: checking for $ac_word" >&5
4351 +echo "configure:14130: checking for $ac_word" >&5
4352 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4353 echo $ac_n "(cached) $ac_c" 1>&6
4355 @@ -14256,19 +14170,19 @@
4356 PKG_CONFIG_MIN_VERSION=0.9.0
4357 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4358 echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
4359 -echo "configure:14260: checking for gconf-2.0 >= $GCONF_VERSION" >&5
4360 +echo "configure:14174: checking for gconf-2.0 >= $GCONF_VERSION" >&5
4362 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
4363 echo "$ac_t""yes" 1>&6
4366 echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
4367 -echo "configure:14267: checking MOZ_GCONF_CFLAGS" >&5
4368 +echo "configure:14181: checking MOZ_GCONF_CFLAGS" >&5
4369 MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
4370 echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
4372 echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
4373 -echo "configure:14272: checking MOZ_GCONF_LIBS" >&5
4374 +echo "configure:14186: checking MOZ_GCONF_LIBS" >&5
4375 ## Remove evil flags like -Wl,--export-dynamic
4376 MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4377 echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
4378 @@ -14323,7 +14237,7 @@
4379 # Extract the first word of "pkg-config", so it can be a program name with args.
4380 set dummy pkg-config; ac_word=$2
4381 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4382 -echo "configure:14327: checking for $ac_word" >&5
4383 +echo "configure:14241: checking for $ac_word" >&5
4384 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4385 echo $ac_n "(cached) $ac_c" 1>&6
4387 @@ -14367,19 +14281,19 @@
4388 PKG_CONFIG_MIN_VERSION=0.9.0
4389 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4390 echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
4391 -echo "configure:14371: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
4392 +echo "configure:14285: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
4394 if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
4395 echo "$ac_t""yes" 1>&6
4398 echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
4399 -echo "configure:14378: checking MOZ_LIBGNOME_CFLAGS" >&5
4400 +echo "configure:14292: checking MOZ_LIBGNOME_CFLAGS" >&5
4401 MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
4402 echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
4404 echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
4405 -echo "configure:14383: checking MOZ_LIBGNOME_LIBS" >&5
4406 +echo "configure:14297: checking MOZ_LIBGNOME_LIBS" >&5
4407 ## Remove evil flags like -Wl,--export-dynamic
4408 MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4409 echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6
4410 @@ -14457,7 +14371,7 @@
4411 # Extract the first word of "pkg-config", so it can be a program name with args.
4412 set dummy pkg-config; ac_word=$2
4413 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4414 -echo "configure:14461: checking for $ac_word" >&5
4415 +echo "configure:14375: checking for $ac_word" >&5
4416 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4417 echo $ac_n "(cached) $ac_c" 1>&6
4419 @@ -14501,19 +14415,19 @@
4420 PKG_CONFIG_MIN_VERSION=0.9.0
4421 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4422 echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
4423 -echo "configure:14505: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
4424 +echo "configure:14419: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
4426 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
4427 echo "$ac_t""yes" 1>&6
4430 echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
4431 -echo "configure:14512: checking MOZ_GNOMEUI_CFLAGS" >&5
4432 +echo "configure:14426: checking MOZ_GNOMEUI_CFLAGS" >&5
4433 MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
4434 echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
4436 echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
4437 -echo "configure:14517: checking MOZ_GNOMEUI_LIBS" >&5
4438 +echo "configure:14431: checking MOZ_GNOMEUI_LIBS" >&5
4439 ## Remove evil flags like -Wl,--export-dynamic
4440 MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4441 echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
4442 @@ -14590,7 +14504,7 @@
4443 # Extract the first word of "pkg-config", so it can be a program name with args.
4444 set dummy pkg-config; ac_word=$2
4445 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4446 -echo "configure:14594: checking for $ac_word" >&5
4447 +echo "configure:14508: checking for $ac_word" >&5
4448 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4449 echo $ac_n "(cached) $ac_c" 1>&6
4451 @@ -14634,19 +14548,19 @@
4452 PKG_CONFIG_MIN_VERSION=0.9.0
4453 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4454 echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6
4455 -echo "configure:14638: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
4456 +echo "configure:14552: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
4458 if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then
4459 echo "$ac_t""yes" 1>&6
4462 echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6
4463 -echo "configure:14645: checking MOZ_DBUS_GLIB_CFLAGS" >&5
4464 +echo "configure:14559: checking MOZ_DBUS_GLIB_CFLAGS" >&5
4465 MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"`
4466 echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6
4468 echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6
4469 -echo "configure:14650: checking MOZ_DBUS_GLIB_LIBS" >&5
4470 +echo "configure:14564: checking MOZ_DBUS_GLIB_LIBS" >&5
4471 ## Remove evil flags like -Wl,--export-dynamic
4472 MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4473 echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6
4474 @@ -14685,6 +14599,9 @@
4481 # Check whether --enable-crypto or --disable-crypto was given.
4482 if test "${enable_crypto+set}" = set; then
4483 enableval="$enable_crypto"
4484 @@ -15149,7 +15066,7 @@
4485 # Extract the first word of "java", so it can be a program name with args.
4486 set dummy java; ac_word=$2
4487 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4488 -echo "configure:15153: checking for $ac_word" >&5
4489 +echo "configure:15070: checking for $ac_word" >&5
4490 if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then
4491 echo $ac_n "(cached) $ac_c" 1>&6
4493 @@ -15185,7 +15102,7 @@
4494 # Extract the first word of "javac", so it can be a program name with args.
4495 set dummy javac; ac_word=$2
4496 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4497 -echo "configure:15189: checking for $ac_word" >&5
4498 +echo "configure:15106: checking for $ac_word" >&5
4499 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
4500 echo $ac_n "(cached) $ac_c" 1>&6
4502 @@ -15221,7 +15138,7 @@
4503 # Extract the first word of "jar", so it can be a program name with args.
4504 set dummy jar; ac_word=$2
4505 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4506 -echo "configure:15225: checking for $ac_word" >&5
4507 +echo "configure:15142: checking for $ac_word" >&5
4508 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
4509 echo $ac_n "(cached) $ac_c" 1>&6
4511 @@ -15295,7 +15212,7 @@
4512 # Extract the first word of "pkg-config", so it can be a program name with args.
4513 set dummy pkg-config; ac_word=$2
4514 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4515 -echo "configure:15299: checking for $ac_word" >&5
4516 +echo "configure:15216: checking for $ac_word" >&5
4517 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4518 echo $ac_n "(cached) $ac_c" 1>&6
4520 @@ -15339,19 +15256,19 @@
4521 PKG_CONFIG_MIN_VERSION=0.9.0
4522 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4523 echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6
4524 -echo "configure:15343: checking for gthread-2.0" >&5
4525 +echo "configure:15260: checking for gthread-2.0" >&5
4527 if $PKG_CONFIG --exists "gthread-2.0" ; then
4528 echo "$ac_t""yes" 1>&6
4531 echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6
4532 -echo "configure:15350: checking MOZ_GTHREAD_CFLAGS" >&5
4533 +echo "configure:15267: checking MOZ_GTHREAD_CFLAGS" >&5
4534 MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
4535 echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6
4537 echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6
4538 -echo "configure:15355: checking MOZ_GTHREAD_LIBS" >&5
4539 +echo "configure:15272: checking MOZ_GTHREAD_LIBS" >&5
4540 ## Remove evil flags like -Wl,--export-dynamic
4541 MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`"
4542 echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6
4543 @@ -15387,17 +15304,17 @@
4545 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4546 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
4547 -echo "configure:15391: checking for $ac_hdr" >&5
4548 +echo "configure:15308: checking for $ac_hdr" >&5
4549 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4550 echo $ac_n "(cached) $ac_c" 1>&6
4552 cat > conftest.$ac_ext <<EOF
4553 -#line 15396 "configure"
4554 +#line 15313 "configure"
4555 #include "confdefs.h"
4558 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4559 -{ (eval echo configure:15401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4560 +{ (eval echo configure:15318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4561 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4562 if test -z "$ac_err"; then
4564 @@ -15747,7 +15664,7 @@
4565 # Extract the first word of "$ac_prog", so it can be a program name with args.
4566 set dummy $ac_prog; ac_word=$2
4567 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4568 -echo "configure:15751: checking for $ac_word" >&5
4569 +echo "configure:15668: checking for $ac_word" >&5
4570 if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
4571 echo $ac_n "(cached) $ac_c" 1>&6
4573 @@ -15792,7 +15709,7 @@
4574 # Extract the first word of "$ac_prog", so it can be a program name with args.
4575 set dummy $ac_prog; ac_word=$2
4576 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4577 -echo "configure:15796: checking for $ac_word" >&5
4578 +echo "configure:15713: checking for $ac_word" >&5
4579 if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
4580 echo $ac_n "(cached) $ac_c" 1>&6
4582 @@ -15840,13 +15757,13 @@
4585 echo $ac_n "checking for tar archiver""... $ac_c" 1>&6
4586 -echo "configure:15844: checking for tar archiver" >&5
4587 +echo "configure:15761: checking for tar archiver" >&5
4588 for ac_prog in gnutar gtar tar
4590 # Extract the first word of "$ac_prog", so it can be a program name with args.
4591 set dummy $ac_prog; ac_word=$2
4592 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4593 -echo "configure:15850: checking for $ac_word" >&5
4594 +echo "configure:15767: checking for $ac_word" >&5
4595 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
4596 echo $ac_n "(cached) $ac_c" 1>&6
4598 @@ -15901,13 +15818,13 @@
4599 msvc*|mks*|cygwin*|mingw*|wince*)
4600 if test -n "$MOZ_UPDATER"; then
4601 echo $ac_n "checking for iconv""... $ac_c" 1>&6
4602 -echo "configure:15905: checking for iconv" >&5
4603 +echo "configure:15822: checking for iconv" >&5
4604 for ac_prog in $HOST_ICONV "iconv"
4606 # Extract the first word of "$ac_prog", so it can be a program name with args.
4607 set dummy $ac_prog; ac_word=$2
4608 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4609 -echo "configure:15911: checking for $ac_word" >&5
4610 +echo "configure:15828: checking for $ac_word" >&5
4611 if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
4612 echo $ac_n "(cached) $ac_c" 1>&6
4614 @@ -16247,7 +16164,7 @@
4615 # Extract the first word of "pkg-config", so it can be a program name with args.
4616 set dummy pkg-config; ac_word=$2
4617 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4618 -echo "configure:16251: checking for $ac_word" >&5
4619 +echo "configure:16168: checking for $ac_word" >&5
4620 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4621 echo $ac_n "(cached) $ac_c" 1>&6
4623 @@ -16291,19 +16208,19 @@
4624 PKG_CONFIG_MIN_VERSION=0.9.0
4625 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4626 echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6
4627 -echo "configure:16295: checking for sqlite3 >= $SQLITE_VERSION" >&5
4628 +echo "configure:16212: checking for sqlite3 >= $SQLITE_VERSION" >&5
4630 if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then
4631 echo "$ac_t""yes" 1>&6
4634 echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6
4635 -echo "configure:16302: checking SQLITE_CFLAGS" >&5
4636 +echo "configure:16219: checking SQLITE_CFLAGS" >&5
4637 SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"`
4638 echo "$ac_t""$SQLITE_CFLAGS" 1>&6
4640 echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6
4641 -echo "configure:16307: checking SQLITE_LIBS" >&5
4642 +echo "configure:16224: checking SQLITE_LIBS" >&5
4643 ## Remove evil flags like -Wl,--export-dynamic
4644 SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`"
4645 echo "$ac_t""$SQLITE_LIBS" 1>&6
4646 @@ -16493,18 +16410,18 @@
4648 if test -n "$MOZ_DEBUG"; then
4649 echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
4650 -echo "configure:16497: checking for valid debug flags" >&5
4651 +echo "configure:16414: checking for valid debug flags" >&5
4652 _SAVE_CFLAGS=$CFLAGS
4653 CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
4654 cat > conftest.$ac_ext <<EOF
4655 -#line 16501 "configure"
4656 +#line 16418 "configure"
4657 #include "confdefs.h"
4660 printf("Hello World\n");
4663 -if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4664 +if { (eval echo configure:16425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4668 @@ -16545,18 +16462,18 @@
4669 if test "$COMPILE_ENVIRONMENT"; then
4670 if test -n "$MOZ_OPTIMIZE"; then
4671 echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
4672 -echo "configure:16549: checking for valid optimization flags" >&5
4673 +echo "configure:16466: checking for valid optimization flags" >&5
4674 _SAVE_CFLAGS=$CFLAGS
4675 CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
4676 cat > conftest.$ac_ext <<EOF
4677 -#line 16553 "configure"
4678 +#line 16470 "configure"
4679 #include "confdefs.h"
4682 printf("Hello World\n");
4685 -if { (eval echo configure:16560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4686 +if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4690 @@ -16706,7 +16623,7 @@
4694 -if test "$NS_TRACE_MALLOC"; then
4695 +if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then
4699 @@ -16726,7 +16643,7 @@
4702 echo $ac_n "checking size of int *""... $ac_c" 1>&6
4703 -echo "configure:16730: checking size of int *" >&5
4704 +echo "configure:16647: checking size of int *" >&5
4705 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
4706 echo $ac_n "(cached) $ac_c" 1>&6
4708 @@ -16734,18 +16651,19 @@
4709 ac_cv_sizeof_int_p=4
4711 cat > conftest.$ac_ext <<EOF
4712 -#line 16738 "configure"
4713 +#line 16655 "configure"
4714 #include "confdefs.h"
4717 +#include <sys/types.h>
4720 FILE *f=fopen("conftestval", "w");
4721 - if (!f) return(1);
4723 fprintf(f, "%d\n", sizeof(int *));
4728 -if { (eval echo configure:16749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4729 +if { (eval echo configure:16667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4731 ac_cv_sizeof_int_p=`cat conftestval`
4733 @@ -16875,17 +16793,17 @@
4735 ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'`
4736 echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6
4737 -echo "configure:16879: checking for valgrind/valgrind.h" >&5
4738 +echo "configure:16797: checking for valgrind/valgrind.h" >&5
4739 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4740 echo $ac_n "(cached) $ac_c" 1>&6
4742 cat > conftest.$ac_ext <<EOF
4743 -#line 16884 "configure"
4744 +#line 16802 "configure"
4745 #include "confdefs.h"
4746 #include <valgrind/valgrind.h>
4748 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4749 -{ (eval echo configure:16889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4750 +{ (eval echo configure:16807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4751 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4752 if test -z "$ac_err"; then
4754 @@ -16962,7 +16880,7 @@
4756 if test -n "$_ENABLE_EFENCE"; then
4757 echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
4758 -echo "configure:16966: checking for malloc in -lefence" >&5
4759 +echo "configure:16884: checking for malloc in -lefence" >&5
4760 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
4761 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4762 echo $ac_n "(cached) $ac_c" 1>&6
4763 @@ -16970,7 +16888,7 @@
4764 ac_save_LIBS="$LIBS"
4765 LIBS="-lefence $LIBS"
4766 cat > conftest.$ac_ext <<EOF
4767 -#line 16974 "configure"
4768 +#line 16892 "configure"
4769 #include "confdefs.h"
4770 /* Override any gcc2 internal prototype to avoid an error. */
4771 /* We use char because int might match the return type of a gcc2
4772 @@ -16981,7 +16899,7 @@
4776 -if { (eval echo configure:16985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4777 +if { (eval echo configure:16903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4779 eval "ac_cv_lib_$ac_lib_var=yes"
4781 @@ -17113,12 +17031,12 @@
4782 for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
4784 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4785 -echo "configure:17117: checking for $ac_func" >&5
4786 +echo "configure:17035: checking for $ac_func" >&5
4787 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4788 echo $ac_n "(cached) $ac_c" 1>&6
4790 cat > conftest.$ac_ext <<EOF
4791 -#line 17122 "configure"
4792 +#line 17040 "configure"
4793 #include "confdefs.h"
4794 /* System header to define __stub macros and hopefully few prototypes,
4795 which can conflict with char $ac_func(); below. */
4796 @@ -17144,7 +17062,7 @@
4800 -if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4801 +if { (eval echo configure:17066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4803 eval "ac_cv_func_$ac_func=yes"
4805 @@ -17363,12 +17281,12 @@
4806 for ac_func in __cxa_demangle
4808 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4809 -echo "configure:17367: checking for $ac_func" >&5
4810 +echo "configure:17285: checking for $ac_func" >&5
4811 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4812 echo $ac_n "(cached) $ac_c" 1>&6
4814 cat > conftest.$ac_ext <<EOF
4815 -#line 17372 "configure"
4816 +#line 17290 "configure"
4817 #include "confdefs.h"
4818 /* System header to define __stub macros and hopefully few prototypes,
4819 which can conflict with char $ac_func(); below. */
4820 @@ -17394,7 +17312,7 @@
4824 -if { (eval echo configure:17398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4825 +if { (eval echo configure:17316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4827 eval "ac_cv_func_$ac_func=yes"
4829 @@ -17442,17 +17360,17 @@
4830 if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
4831 ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'`
4832 echo $ac_n "checking for unwind.h""... $ac_c" 1>&6
4833 -echo "configure:17446: checking for unwind.h" >&5
4834 +echo "configure:17364: checking for unwind.h" >&5
4835 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4836 echo $ac_n "(cached) $ac_c" 1>&6
4838 cat > conftest.$ac_ext <<EOF
4839 -#line 17451 "configure"
4840 +#line 17369 "configure"
4841 #include "confdefs.h"
4844 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4845 -{ (eval echo configure:17456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4846 +{ (eval echo configure:17374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4847 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4848 if test -z "$ac_err"; then
4850 @@ -17471,12 +17389,12 @@
4851 for ac_func in _Unwind_Backtrace
4853 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4854 -echo "configure:17475: checking for $ac_func" >&5
4855 +echo "configure:17393: checking for $ac_func" >&5
4856 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4857 echo $ac_n "(cached) $ac_c" 1>&6
4859 cat > conftest.$ac_ext <<EOF
4860 -#line 17480 "configure"
4861 +#line 17398 "configure"
4862 #include "confdefs.h"
4863 /* System header to define __stub macros and hopefully few prototypes,
4864 which can conflict with char $ac_func(); below. */
4865 @@ -17499,7 +17417,7 @@
4869 -if { (eval echo configure:17503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4870 +if { (eval echo configure:17421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4872 eval "ac_cv_func_$ac_func=yes"
4874 @@ -17621,7 +17539,7 @@
4877 echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
4878 -echo "configure:17625: checking for gcc -pipe support" >&5
4879 +echo "configure:17543: checking for gcc -pipe support" >&5
4880 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
4881 echo '#include <stdio.h>' > dummy-hello.c
4882 echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
4883 @@ -17636,14 +17554,14 @@
4884 _SAVE_CFLAGS=$CFLAGS
4885 CFLAGS="$CFLAGS -pipe"
4886 cat > conftest.$ac_ext <<EOF
4887 -#line 17640 "configure"
4888 +#line 17558 "configure"
4889 #include "confdefs.h"
4892 printf("Hello World\n");
4895 -if { (eval echo configure:17647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4896 +if { (eval echo configure:17565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4900 @@ -17685,16 +17603,16 @@
4901 _SAVE_CFLAGS="$CFLAGS"
4902 CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
4903 echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
4904 -echo "configure:17689: checking whether compiler supports -Wno-long-long" >&5
4905 +echo "configure:17607: checking whether compiler supports -Wno-long-long" >&5
4906 cat > conftest.$ac_ext <<EOF
4907 -#line 17691 "configure"
4908 +#line 17609 "configure"
4909 #include "confdefs.h"
4915 -if { (eval echo configure:17698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4916 +if { (eval echo configure:17616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4918 _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
4919 _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
4920 @@ -17730,16 +17648,16 @@
4921 CFLAGS="$CFLAGS -fprofile-generate"
4923 echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
4924 -echo "configure:17734: checking whether C compiler supports -fprofile-generate" >&5
4925 +echo "configure:17652: checking whether C compiler supports -fprofile-generate" >&5
4926 cat > conftest.$ac_ext <<EOF
4927 -#line 17736 "configure"
4928 +#line 17654 "configure"
4929 #include "confdefs.h"
4935 -if { (eval echo configure:17743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4936 +if { (eval echo configure:17661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4938 PROFILE_GEN_CFLAGS="-fprofile-generate"
4940 @@ -17759,16 +17677,16 @@
4942 CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
4943 echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
4944 -echo "configure:17763: checking whether C compiler supports -fprofile-arcs" >&5
4945 +echo "configure:17681: checking whether C compiler supports -fprofile-arcs" >&5
4946 cat > conftest.$ac_ext <<EOF
4947 -#line 17765 "configure"
4948 +#line 17683 "configure"
4949 #include "confdefs.h"
4955 -if { (eval echo configure:17772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4956 +if { (eval echo configure:17690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4958 PROFILE_GEN_CFLAGS="-fprofile-arcs"
4960 @@ -17838,16 +17756,16 @@
4961 _SAVE_CXXFLAGS=$CXXFLAGS
4962 CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
4963 echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
4964 -echo "configure:17842: checking whether C++ compiler has -pedantic long long bug" >&5
4965 +echo "configure:17760: checking whether C++ compiler has -pedantic long long bug" >&5
4966 cat > conftest.$ac_ext <<EOF
4967 -#line 17844 "configure"
4968 +#line 17762 "configure"
4969 #include "confdefs.h"
4970 $configure_static_assert_macros
4972 CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)
4975 -if { (eval echo configure:17851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4976 +if { (eval echo configure:17769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4980 @@ -17872,13 +17790,16 @@
4983 echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
4984 -echo "configure:17876: checking for correct temporary object destruction order" >&5
4985 +echo "configure:17794: checking for correct temporary object destruction order" >&5
4986 if test "$cross_compiling" = yes; then
4989 cat > conftest.$ac_ext <<EOF
4990 -#line 17881 "configure"
4991 +#line 17799 "configure"
4992 #include "confdefs.h"
4994 +extern "C" void exit(int);
4997 public: A(int& x) : mValue(x) {}
4999 @@ -17897,7 +17818,7 @@
5003 -if { (eval echo configure:17901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5004 +if { (eval echo configure:17822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5008 @@ -17918,12 +17839,12 @@
5009 _SAVE_CXXFLAGS=$CXXFLAGS
5010 CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
5011 echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
5012 -echo "configure:17922: checking for correct overload resolution with const and templates" >&5
5013 +echo "configure:17843: checking for correct overload resolution with const and templates" >&5
5014 if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
5015 echo $ac_n "(cached) $ac_c" 1>&6
5017 cat > conftest.$ac_ext <<EOF
5018 -#line 17927 "configure"
5019 +#line 17848 "configure"
5020 #include "confdefs.h"
5023 @@ -17953,7 +17874,7 @@
5027 -if { (eval echo configure:17957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5028 +if { (eval echo configure:17878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5030 ac_nscap_nonconst_opeq_bug="no"
5032 @@ -18216,7 +18137,7 @@
5036 -if test -z "$COMPILE_ENVIRONMENT"; then
5037 +if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then
5038 SKIP_IDL_CHECK="yes"
5041 @@ -18256,7 +18177,7 @@
5042 # Extract the first word of "pkg-config", so it can be a program name with args.
5043 set dummy pkg-config; ac_word=$2
5044 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5045 -echo "configure:18260: checking for $ac_word" >&5
5046 +echo "configure:18181: checking for $ac_word" >&5
5047 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5048 echo $ac_n "(cached) $ac_c" 1>&6
5050 @@ -18300,19 +18221,19 @@
5051 PKG_CONFIG_MIN_VERSION=0.9.0
5052 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5053 echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
5054 -echo "configure:18304: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
5055 +echo "configure:18225: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
5057 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then
5058 echo "$ac_t""yes" 1>&6
5061 echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
5062 -echo "configure:18311: checking LIBIDL_CFLAGS" >&5
5063 +echo "configure:18232: checking LIBIDL_CFLAGS" >&5
5064 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"`
5065 echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
5067 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
5068 -echo "configure:18316: checking LIBIDL_LIBS" >&5
5069 +echo "configure:18237: checking LIBIDL_LIBS" >&5
5070 ## Remove evil flags like -Wl,--export-dynamic
5071 LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
5072 echo "$ac_t""$LIBIDL_LIBS" 1>&6
5073 @@ -18436,7 +18357,7 @@
5074 # Extract the first word of "glib-config", so it can be a program name with args.
5075 set dummy glib-config; ac_word=$2
5076 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5077 -echo "configure:18440: checking for $ac_word" >&5
5078 +echo "configure:18361: checking for $ac_word" >&5
5079 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
5080 echo $ac_n "(cached) $ac_c" 1>&6
5082 @@ -18471,7 +18392,7 @@
5084 min_glib_version=1.2.0
5085 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
5086 -echo "configure:18475: checking for GLIB - version >= $min_glib_version" >&5
5087 +echo "configure:18396: checking for GLIB - version >= $min_glib_version" >&5
5089 if test "$GLIB_CONFIG" = "no" ; then
5091 @@ -18494,7 +18415,7 @@
5092 echo $ac_n "cross compiling; assumed OK... $ac_c"
5094 cat > conftest.$ac_ext <<EOF
5095 -#line 18498 "configure"
5096 +#line 18419 "configure"
5097 #include "confdefs.h"
5100 @@ -18570,7 +18491,7 @@
5104 -if { (eval echo configure:18574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5105 +if { (eval echo configure:18495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5109 @@ -18604,7 +18525,7 @@
5110 CFLAGS="$CFLAGS $GLIB_CFLAGS"
5111 LIBS="$LIBS $GLIB_LIBS"
5112 cat > conftest.$ac_ext <<EOF
5113 -#line 18608 "configure"
5114 +#line 18529 "configure"
5115 #include "confdefs.h"
5118 @@ -18614,7 +18535,7 @@
5119 return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
5122 -if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5123 +if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5125 echo "*** The test program compiled, but did not run. This usually means"
5126 echo "*** that the run-time linker is not finding GLIB or finding the wrong"
5127 @@ -18658,7 +18579,7 @@
5128 # Extract the first word of "libIDL-config", so it can be a program name with args.
5129 set dummy libIDL-config; ac_word=$2
5130 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5131 -echo "configure:18662: checking for $ac_word" >&5
5132 +echo "configure:18583: checking for $ac_word" >&5
5133 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
5134 echo $ac_n "(cached) $ac_c" 1>&6
5136 @@ -18693,7 +18614,7 @@
5138 min_libIDL_version=$LIBIDL_VERSION
5139 echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
5140 -echo "configure:18697: checking for libIDL - version >= $min_libIDL_version" >&5
5141 +echo "configure:18618: checking for libIDL - version >= $min_libIDL_version" >&5
5143 if test "$LIBIDL_CONFIG" = "no" ; then
5145 @@ -18720,7 +18641,7 @@
5146 echo $ac_n "cross compiling; assumed OK... $ac_c"
5148 cat > conftest.$ac_ext <<EOF
5149 -#line 18724 "configure"
5150 +#line 18645 "configure"
5151 #include "confdefs.h"
5154 @@ -18806,7 +18727,7 @@
5158 -if { (eval echo configure:18810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5159 +if { (eval echo configure:18731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5163 @@ -18840,7 +18761,7 @@
5164 CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
5165 LIBS="$LIBS $LIBIDL_LIBS"
5166 cat > conftest.$ac_ext <<EOF
5167 -#line 18844 "configure"
5168 +#line 18765 "configure"
5169 #include "confdefs.h"
5172 @@ -18851,7 +18772,7 @@
5173 return IDL_get_libver_string ? 1 : 0;
5176 -if { (eval echo configure:18855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5177 +if { (eval echo configure:18776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5179 echo "*** The test program compiled, but did not run. This usually means"
5180 echo "*** that the run-time linker is not finding libIDL or finding the wrong"
5181 @@ -18891,7 +18812,7 @@
5182 # Extract the first word of "pkg-config", so it can be a program name with args.
5183 set dummy pkg-config; ac_word=$2
5184 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5185 -echo "configure:18895: checking for $ac_word" >&5
5186 +echo "configure:18816: checking for $ac_word" >&5
5187 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5188 echo $ac_n "(cached) $ac_c" 1>&6
5190 @@ -18935,19 +18856,19 @@
5191 PKG_CONFIG_MIN_VERSION=0.9.0
5192 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5193 echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
5194 -echo "configure:18939: checking for libIDL-2.0 >= 0.8.0" >&5
5195 +echo "configure:18860: checking for libIDL-2.0 >= 0.8.0" >&5
5197 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
5198 echo "$ac_t""yes" 1>&6
5201 echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
5202 -echo "configure:18946: checking LIBIDL_CFLAGS" >&5
5203 +echo "configure:18867: checking LIBIDL_CFLAGS" >&5
5204 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
5205 echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
5207 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
5208 -echo "configure:18951: checking LIBIDL_LIBS" >&5
5209 +echo "configure:18872: checking LIBIDL_LIBS" >&5
5210 ## Remove evil flags like -Wl,--export-dynamic
5211 LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`"
5212 echo "$ac_t""$LIBIDL_LIBS" 1>&6
5213 @@ -18984,7 +18905,7 @@
5214 # Extract the first word of "$ac_prog", so it can be a program name with args.
5215 set dummy $ac_prog; ac_word=$2
5216 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5217 -echo "configure:18988: checking for $ac_word" >&5
5218 +echo "configure:18909: checking for $ac_word" >&5
5219 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
5220 echo $ac_n "(cached) $ac_c" 1>&6
5222 @@ -19021,7 +18942,7 @@
5224 if test -n "$ORBIT_CONFIG"; then
5225 echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
5226 -echo "configure:19025: checking for ORBit libIDL usability" >&5
5227 +echo "configure:18946: checking for ORBit libIDL usability" >&5
5228 _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
5229 _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
5230 _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
5231 @@ -19038,7 +18959,7 @@
5234 cat > conftest.$ac_ext <<EOF
5235 -#line 19042 "configure"
5236 +#line 18963 "configure"
5237 #include "confdefs.h"
5240 @@ -19053,7 +18974,7 @@
5244 -if { (eval echo configure:19057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5245 +if { (eval echo configure:18978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5249 @@ -19100,7 +19021,7 @@
5253 -if test -z "$SKIP_PATH_CHECKS"; then
5254 +if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then
5255 if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
5256 if test "$MOZ_ENABLE_GTK2"; then
5258 @@ -19109,7 +19030,7 @@
5259 # Extract the first word of "pkg-config", so it can be a program name with args.
5260 set dummy pkg-config; ac_word=$2
5261 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5262 -echo "configure:19113: checking for $ac_word" >&5
5263 +echo "configure:19034: checking for $ac_word" >&5
5264 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5265 echo $ac_n "(cached) $ac_c" 1>&6
5267 @@ -19153,19 +19074,19 @@
5268 PKG_CONFIG_MIN_VERSION=0.9.0
5269 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5270 echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6
5271 -echo "configure:19157: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
5272 +echo "configure:19078: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
5274 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then
5275 echo "$ac_t""yes" 1>&6
5278 echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
5279 -echo "configure:19164: checking GLIB_CFLAGS" >&5
5280 +echo "configure:19085: checking GLIB_CFLAGS" >&5
5281 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"`
5282 echo "$ac_t""$GLIB_CFLAGS" 1>&6
5284 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
5285 -echo "configure:19169: checking GLIB_LIBS" >&5
5286 +echo "configure:19090: checking GLIB_LIBS" >&5
5287 ## Remove evil flags like -Wl,--export-dynamic
5288 GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
5289 echo "$ac_t""$GLIB_LIBS" 1>&6
5290 @@ -19250,7 +19171,7 @@
5291 # Extract the first word of "glib-config", so it can be a program name with args.
5292 set dummy glib-config; ac_word=$2
5293 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5294 -echo "configure:19254: checking for $ac_word" >&5
5295 +echo "configure:19175: checking for $ac_word" >&5
5296 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
5297 echo $ac_n "(cached) $ac_c" 1>&6
5299 @@ -19285,7 +19206,7 @@
5301 min_glib_version=${GLIB_VERSION}
5302 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
5303 -echo "configure:19289: checking for GLIB - version >= $min_glib_version" >&5
5304 +echo "configure:19210: checking for GLIB - version >= $min_glib_version" >&5
5306 if test "$GLIB_CONFIG" = "no" ; then
5308 @@ -19308,7 +19229,7 @@
5309 echo $ac_n "cross compiling; assumed OK... $ac_c"
5311 cat > conftest.$ac_ext <<EOF
5312 -#line 19312 "configure"
5313 +#line 19233 "configure"
5314 #include "confdefs.h"
5317 @@ -19384,7 +19305,7 @@
5321 -if { (eval echo configure:19388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5322 +if { (eval echo configure:19309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5326 @@ -19418,7 +19339,7 @@
5327 CFLAGS="$CFLAGS $GLIB_CFLAGS"
5328 LIBS="$LIBS $GLIB_LIBS"
5329 cat > conftest.$ac_ext <<EOF
5330 -#line 19422 "configure"
5331 +#line 19343 "configure"
5332 #include "confdefs.h"
5335 @@ -19428,7 +19349,7 @@
5336 return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
5339 -if { (eval echo configure:19432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5340 +if { (eval echo configure:19353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5342 echo "*** The test program compiled, but did not run. This usually means"
5343 echo "*** that the run-time linker is not finding GLIB or finding the wrong"
5344 @@ -19508,19 +19429,19 @@
5345 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
5346 # for constant arguments. Useless!
5347 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
5348 -echo "configure:19512: checking for working alloca.h" >&5
5349 +echo "configure:19433: checking for working alloca.h" >&5
5350 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
5351 echo $ac_n "(cached) $ac_c" 1>&6
5353 cat > conftest.$ac_ext <<EOF
5354 -#line 19517 "configure"
5355 +#line 19438 "configure"
5356 #include "confdefs.h"
5359 char *p = alloca(2 * sizeof(int));
5362 -if { (eval echo configure:19524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5363 +if { (eval echo configure:19445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5365 ac_cv_header_alloca_h=yes
5367 @@ -19541,12 +19462,12 @@
5370 echo $ac_n "checking for alloca""... $ac_c" 1>&6
5371 -echo "configure:19545: checking for alloca" >&5
5372 +echo "configure:19466: checking for alloca" >&5
5373 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
5374 echo $ac_n "(cached) $ac_c" 1>&6
5376 cat > conftest.$ac_ext <<EOF
5377 -#line 19550 "configure"
5378 +#line 19471 "configure"
5379 #include "confdefs.h"
5382 @@ -19574,7 +19495,7 @@
5383 char *p = (char *) alloca(1);
5386 -if { (eval echo configure:19578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5387 +if { (eval echo configure:19499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5389 ac_cv_func_alloca_works=yes
5391 @@ -19606,12 +19527,12 @@
5394 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
5395 -echo "configure:19610: checking whether alloca needs Cray hooks" >&5
5396 +echo "configure:19531: checking whether alloca needs Cray hooks" >&5
5397 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
5398 echo $ac_n "(cached) $ac_c" 1>&6
5400 cat > conftest.$ac_ext <<EOF
5401 -#line 19615 "configure"
5402 +#line 19536 "configure"
5403 #include "confdefs.h"
5404 #if defined(CRAY) && ! defined(CRAY2)
5406 @@ -19636,12 +19557,12 @@
5407 if test $ac_cv_os_cray = yes; then
5408 for ac_func in _getb67 GETB67 getb67; do
5409 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5410 -echo "configure:19640: checking for $ac_func" >&5
5411 +echo "configure:19561: checking for $ac_func" >&5
5412 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5413 echo $ac_n "(cached) $ac_c" 1>&6
5415 cat > conftest.$ac_ext <<EOF
5416 -#line 19645 "configure"
5417 +#line 19566 "configure"
5418 #include "confdefs.h"
5419 /* System header to define __stub macros and hopefully few prototypes,
5420 which can conflict with char $ac_func(); below. */
5421 @@ -19664,7 +19585,7 @@
5425 -if { (eval echo configure:19668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5426 +if { (eval echo configure:19589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5428 eval "ac_cv_func_$ac_func=yes"
5430 @@ -19691,7 +19612,7 @@
5433 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
5434 -echo "configure:19695: checking stack direction for C alloca" >&5
5435 +echo "configure:19616: checking stack direction for C alloca" >&5
5436 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
5437 echo $ac_n "(cached) $ac_c" 1>&6
5439 @@ -19699,7 +19620,7 @@
5440 ac_cv_c_stack_direction=0
5442 cat > conftest.$ac_ext <<EOF
5443 -#line 19703 "configure"
5444 +#line 19624 "configure"
5445 #include "confdefs.h"
5446 find_stack_direction ()
5448 @@ -19718,7 +19639,7 @@
5449 exit (find_stack_direction() < 0);
5452 -if { (eval echo configure:19722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5453 +if { (eval echo configure:19643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5455 ac_cv_c_stack_direction=1
5457 @@ -19765,17 +19686,17 @@
5459 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
5460 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5461 -echo "configure:19769: checking for $ac_hdr" >&5
5462 +echo "configure:19690: checking for $ac_hdr" >&5
5463 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5464 echo $ac_n "(cached) $ac_c" 1>&6
5466 cat > conftest.$ac_ext <<EOF
5467 -#line 19774 "configure"
5468 +#line 19695 "configure"
5469 #include "confdefs.h"
5472 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5473 -{ (eval echo configure:19779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5474 +{ (eval echo configure:19700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5475 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5476 if test -z "$ac_err"; then
5478 @@ -19853,7 +19774,7 @@
5479 # Extract the first word of "pkg-config", so it can be a program name with args.
5480 set dummy pkg-config; ac_word=$2
5481 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5482 -echo "configure:19857: checking for $ac_word" >&5
5483 +echo "configure:19778: checking for $ac_word" >&5
5484 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5485 echo $ac_n "(cached) $ac_c" 1>&6
5487 @@ -19897,19 +19818,19 @@
5488 PKG_CONFIG_MIN_VERSION=0.9.0
5489 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5490 echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6
5491 -echo "configure:19901: checking for fontconfig freetype2" >&5
5492 +echo "configure:19822: checking for fontconfig freetype2" >&5
5494 if $PKG_CONFIG --exists "fontconfig freetype2" ; then
5495 echo "$ac_t""yes" 1>&6
5498 echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6
5499 -echo "configure:19908: checking CAIRO_FT_CFLAGS" >&5
5500 +echo "configure:19829: checking CAIRO_FT_CFLAGS" >&5
5501 CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"`
5502 echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6
5504 echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6
5505 -echo "configure:19913: checking CAIRO_FT_LIBS" >&5
5506 +echo "configure:19834: checking CAIRO_FT_LIBS" >&5
5507 ## Remove evil flags like -Wl,--export-dynamic
5508 CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`"
5509 echo "$ac_t""$CAIRO_FT_LIBS" 1>&6
5510 @@ -20000,7 +19921,7 @@
5511 # Extract the first word of "pkg-config", so it can be a program name with args.
5512 set dummy pkg-config; ac_word=$2
5513 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5514 -echo "configure:20004: checking for $ac_word" >&5
5515 +echo "configure:19925: checking for $ac_word" >&5
5516 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5517 echo $ac_n "(cached) $ac_c" 1>&6
5519 @@ -20044,19 +19965,19 @@
5520 PKG_CONFIG_MIN_VERSION=0.9.0
5521 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5522 echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6
5523 -echo "configure:20048: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
5524 +echo "configure:19969: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
5526 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then
5527 echo "$ac_t""yes" 1>&6
5530 echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
5531 -echo "configure:20055: checking CAIRO_CFLAGS" >&5
5532 +echo "configure:19976: checking CAIRO_CFLAGS" >&5
5533 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"`
5534 echo "$ac_t""$CAIRO_CFLAGS" 1>&6
5536 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
5537 -echo "configure:20060: checking CAIRO_LIBS" >&5
5538 +echo "configure:19981: checking CAIRO_LIBS" >&5
5539 ## Remove evil flags like -Wl,--export-dynamic
5540 CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`"
5541 echo "$ac_t""$CAIRO_LIBS" 1>&6
5542 @@ -20094,7 +20015,7 @@
5543 # Extract the first word of "pkg-config", so it can be a program name with args.
5544 set dummy pkg-config; ac_word=$2
5545 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5546 -echo "configure:20098: checking for $ac_word" >&5
5547 +echo "configure:20019: checking for $ac_word" >&5
5548 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5549 echo $ac_n "(cached) $ac_c" 1>&6
5551 @@ -20138,19 +20059,19 @@
5552 PKG_CONFIG_MIN_VERSION=0.9.0
5553 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5554 echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6
5555 -echo "configure:20142: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
5556 +echo "configure:20063: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
5558 if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then
5559 echo "$ac_t""yes" 1>&6
5562 echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6
5563 -echo "configure:20149: checking CAIRO_XRENDER_CFLAGS" >&5
5564 +echo "configure:20070: checking CAIRO_XRENDER_CFLAGS" >&5
5565 CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"`
5566 echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6
5568 echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6
5569 -echo "configure:20154: checking CAIRO_XRENDER_LIBS" >&5
5570 +echo "configure:20075: checking CAIRO_XRENDER_LIBS" >&5
5571 ## Remove evil flags like -Wl,--export-dynamic
5572 CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
5573 echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6
5574 @@ -20221,7 +20142,7 @@
5575 # Extract the first word of "pkg-config", so it can be a program name with args.
5576 set dummy pkg-config; ac_word=$2
5577 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5578 -echo "configure:20225: checking for $ac_word" >&5
5579 +echo "configure:20146: checking for $ac_word" >&5
5580 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
5581 echo $ac_n "(cached) $ac_c" 1>&6
5583 @@ -20265,19 +20186,19 @@
5584 PKG_CONFIG_MIN_VERSION=0.9.0
5585 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
5586 echo $ac_n "checking for lcms >= $LCMS_VERSION""... $ac_c" 1>&6
5587 -echo "configure:20269: checking for lcms >= $LCMS_VERSION" >&5
5588 +echo "configure:20190: checking for lcms >= $LCMS_VERSION" >&5
5590 if $PKG_CONFIG --exists "lcms >= $LCMS_VERSION" ; then
5591 echo "$ac_t""yes" 1>&6
5594 echo $ac_n "checking LCMS_CFLAGS""... $ac_c" 1>&6
5595 -echo "configure:20276: checking LCMS_CFLAGS" >&5
5596 +echo "configure:20197: checking LCMS_CFLAGS" >&5
5597 LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= $LCMS_VERSION"`
5598 echo "$ac_t""$LCMS_CFLAGS" 1>&6
5600 echo $ac_n "checking LCMS_LIBS""... $ac_c" 1>&6
5601 -echo "configure:20281: checking LCMS_LIBS" >&5
5602 +echo "configure:20202: checking LCMS_LIBS" >&5
5603 ## Remove evil flags like -Wl,--export-dynamic
5604 LCMS_LIBS="`$PKG_CONFIG --libs \"lcms >= $LCMS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
5605 echo "$ac_t""$LCMS_LIBS" 1>&6
5606 @@ -20625,14 +20546,14 @@
5607 cross_compiling=$ac_cv_prog_cc_cross
5609 cat > conftest.$ac_ext <<EOF
5610 -#line 20629 "configure"
5611 +#line 20550 "configure"
5612 #include "confdefs.h"
5613 #include <gmodule.h>
5618 -if { (eval echo configure:20636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5619 +if { (eval echo configure:20557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5622 echo "configure: failed program was:" >&5
5623 @@ -20946,7 +20867,7 @@
5624 _SAVE_CFLAGS=$CFLAGS
5625 CFLAGS="$CFLAGS $XCFLAGS"
5626 cat > conftest.$ac_ext <<EOF
5627 -#line 20950 "configure"
5628 +#line 20871 "configure"
5629 #include "confdefs.h"
5632 @@ -20964,7 +20885,7 @@
5636 -if { (eval echo configure:20968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5637 +if { (eval echo configure:20889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5640 echo "configure: failed program was:" >&5
5641 @@ -21187,34 +21108,15 @@
5642 # Transform confdefs.h into DEFS.
5643 # Protect against shell expansion while executing Makefile rules.
5644 # Protect against Makefile macro expansion.
5646 -# If the first sed substitution is executed (which looks for macros that
5647 -# take arguments), then we branch to the quote section. Otherwise,
5648 -# look for a macro that doesn't take arguments.
5649 -cat >confdef2opt.sed <<\_ACEOF
5652 -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
5654 -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
5658 -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
5664 -# We use echo to avoid assuming a particular line-breaking character.
5665 -# The extra dot is to prevent the shell from consuming trailing
5666 -# line-breaks from the sub-command output. A line-break within
5667 -# single-quotes doesn't work because, if this script is created in a
5668 -# platform that uses two characters for line-breaks (e.g., DOS), tr
5670 -ac_LF_and_DOT=`echo; echo .`
5671 -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
5672 -rm -f confdef2opt.sed
5673 +cat > conftest.defs <<\EOF
5674 +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
5675 +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
5680 +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
5681 +rm -f conftest.defs
5685 @@ -22081,7 +21983,7 @@
5689 -if test "$COMPILE_ENVIRONMENT"; then
5690 +if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then
5691 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
5692 ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
5693 if test -z "$MOZ_DEBUG"; then
5694 @@ -22190,7 +22092,7 @@
5703 @@ -22333,7 +22235,7 @@
5712 --- iceweasel-3.0.1.orig/configure.in
5713 +++ iceweasel-3.0.1/configure.in
5714 @@ -2759,7 +2759,7 @@
5715 if test "$ac_cv_have_usable_wchar_v2" = "yes"; then
5716 AC_DEFINE(HAVE_CPP_2BYTE_WCHAR_T)
5717 HAVE_CPP_2BYTE_WCHAR_T=1
5720 dnl This is really gcc-only
5721 dnl Do this test using CXX only since some versions of gcc
5722 dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions
5723 @@ -4000,6 +4000,10 @@
5724 AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
5725 CFLAGS=$_SAVE_CFLAGS
5727 + if test -n "$LIBXUL_SDK"; then
5728 + NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include"
5729 + NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION"
5731 NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`'
5732 # explicitly set libs for Visual Age C++ for OS/2
5733 if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
5734 @@ -4017,6 +4021,7 @@
5736 NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`'
5741 dnl ========================================================
5742 @@ -4641,6 +4646,10 @@
5743 dnl ========================================================
5744 MOZ_ARG_HEADER(Toolkit Options)
5746 +if test -n "$LIBXUL_SDK"; then
5747 + MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h`
5750 dnl ========================================================
5751 dnl = Select the default toolkit
5752 dnl ========================================================
5753 @@ -4676,6 +4685,7 @@
5754 AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).])
5759 AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
5761 @@ -4754,6 +4764,7 @@
5762 dnl = startup-notification support module
5763 dnl ========================================================
5765 +if test -z "$LIBXUL_SDK"; then
5766 if test "$MOZ_ENABLE_GTK2"
5768 MOZ_ENABLE_STARTUP_NOTIFICATION=
5769 @@ -4781,6 +4792,7 @@
5771 TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
5774 AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION)
5775 AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS)
5776 AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS)
5777 @@ -4799,7 +4811,7 @@
5781 -if test "$MOZ_ENABLE_GTK2"
5782 +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK"
5786 @@ -4921,7 +4933,7 @@
5787 dnl ========================================================
5789 dnl ========================================================
5790 -if test "$MOZ_ENABLE_GTK2"
5791 +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK"
5793 PKG_CHECK_MODULES(MOZ_XFT, xft)
5794 AC_SUBST(MOZ_XFT_CFLAGS)
5795 @@ -4945,6 +4957,7 @@
5796 dnl = GnomeVFS support module
5797 dnl ========================================================
5799 +if test -z "$LIBXUL_SDK"; then
5802 dnl build the gnomevfs extension by default only when the
5803 @@ -5081,6 +5094,9 @@
5804 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS)
5805 AC_SUBST(MOZ_DBUS_GLIB_LIBS)
5810 dnl ========================================================
5811 dnl = Build Personal Security Manager
5812 dnl ========================================================
5813 @@ -6245,7 +6261,7 @@
5817 -if test "$NS_TRACE_MALLOC"; then
5818 +if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then
5822 @@ -7113,7 +7129,7 @@
5826 -if test -z "$COMPILE_ENVIRONMENT"; then
5827 +if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then
5828 SKIP_IDL_CHECK="yes"
5831 @@ -7220,7 +7236,7 @@
5835 -if test -z "$SKIP_PATH_CHECKS"; then
5836 +if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then
5837 if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
5838 if test "$MOZ_ENABLE_GTK2"; then
5839 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
5840 @@ -8260,7 +8276,7 @@
5844 -if test "$COMPILE_ENVIRONMENT"; then
5845 +if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then
5846 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
5847 ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
5848 if test -z "$MOZ_DEBUG"; then