Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-system-nspr-ldap.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 43110 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 43110 byte(s)
-import
1 | niro | 153 | Index: directory/c-sdk/configure.in |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v | ||
4 | retrieving revision 5.0.2.28 | ||
5 | diff -u -r5.0.2.28 configure.in | ||
6 | --- directory/c-sdk/configure.in 26 Aug 2004 23:03:00 -0000 5.0.2.28 | ||
7 | +++ directory/c-sdk/configure.in 28 Apr 2005 21:23:12 -0000 | ||
8 | @@ -43,6 +43,7 @@ | ||
9 | dnl ======================================================== | ||
10 | dnl = Defaults | ||
11 | dnl ======================================================== | ||
12 | +NSPR_VERSION=4 | ||
13 | _HAVE_PTHREADS= | ||
14 | USE_PTHREADS= | ||
15 | USE_USER_PTHREADS= | ||
16 | @@ -217,29 +223,27 @@ | ||
17 | AC_ARG_WITH(system-nspr, | ||
18 | [ --with-system-nspr Use system installed NSPR], | ||
19 | [ if test "$withval" = "yes"; then | ||
20 | - _NO_NSPR= | ||
21 | + _SYSTEM_NSPR=1 | ||
22 | else | ||
23 | - _NO_NSPR=1 | ||
24 | - fi]) | ||
25 | + _SYSTEM_NSPR= | ||
26 | + fi], _SYSTEM_NSPR= ) | ||
27 | |||
28 | if test "$_WIN32_MSVC"; then | ||
29 | - _NO_NSPR=1 | ||
30 | + _SYSTEM_NSPR= | ||
31 | fi | ||
32 | |||
33 | -if test -z "$_NO_NSPR"; then | ||
34 | +if test -n "$_SYSTEM_NSPR"; then | ||
35 | AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=]) | ||
36 | fi | ||
37 | |||
38 | if test -z "$MOZ_NATIVE_NSPR"; then | ||
39 | - NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' | ||
40 | + NSPR_CFLAGS='-I$(DIST)/include/nspr' | ||
41 | + NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION" | ||
42 | # explicitly set libs for Visual Age C++ for OS/2 | ||
43 | if test "$VACPP" = "yes"; then | ||
44 | NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' | ||
45 | elif test "$_WIN32_MSVC"; then | ||
46 | NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib ' | ||
47 | - NSPR_CFLAGS='-I$(DIST)/include/nspr' | ||
48 | - else | ||
49 | - NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`' | ||
50 | fi | ||
51 | fi | ||
52 | |||
53 | Index: directory/c-sdk/config/autoconf.mk.in | ||
54 | =================================================================== | ||
55 | RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf.mk.in,v | ||
56 | retrieving revision 5.0.2.3 | ||
57 | diff -u -r5.0.2.3 autoconf.mk.in | ||
58 | --- directory/c-sdk/config/autoconf.mk.in 7 Mar 2003 20:57:13 -0000 5.0.2.3 | ||
59 | +++ directory/c-sdk/config/autoconf.mk.in 28 Apr 2005 21:23:12 -0000 | ||
60 | @@ -45,6 +45,9 @@ | ||
61 | PTHREADS_USER = @USE_USER_PTHREADS@ | ||
62 | CLASSIC_NSPR = @USE_NSPR_THREADS@ | ||
63 | |||
64 | +NSPR_CFLAGS = @NSPR_CFLAGS@ | ||
65 | +NSPR_LIBS = @NSPR_LIBS@ | ||
66 | + | ||
67 | AS = @AS@ | ||
68 | ASFLAGS = @ASFLAGS@ | ||
69 | CC = @CC@ | ||
70 | Index: directory/c-sdk/ldap/include/Makefile.in | ||
71 | =================================================================== | ||
72 | RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/Makefile.in,v | ||
73 | retrieving revision 5.0.2.4 | ||
74 | diff -u -r5.0.2.4 Makefile.in | ||
75 | --- directory/c-sdk/ldap/include/Makefile.in 24 Apr 2002 23:03:25 -0000 5.0.2.4 | ||
76 | +++ directory/c-sdk/ldap/include/Makefile.in 28 Apr 2005 21:23:12 -0000 | ||
77 | @@ -63,7 +63,6 @@ | ||
78 | |||
79 | INCLUDEDIR = $(DIST)/public/ldap | ||
80 | PRIVATEINCDIR = $(DIST)/public/ldap-private | ||
81 | -NSPRINCDIR = $(DIST)/public/ldap-nspr | ||
82 | GENHEADERS = $(addprefix $(INCLUDEDIR)/, $(GENERATED_HEADERS)) | ||
83 | |||
84 | GARBAGE += sdkver.h dirver.h $(GENHEADERS) | ||
85 | @@ -72,11 +71,8 @@ | ||
86 | |||
87 | all export:: $(INCLUDEDIR) $(GENHEADERS) | ||
88 | $(NSINSTALL) -D $(PRIVATEINCDIR) | ||
89 | - $(NSINSTALL) -D $(NSPRINCDIR) | ||
90 | $(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR) | ||
91 | $(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR) | ||
92 | - rm -rf $(NSPRINCDIR)/* | ||
93 | - cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR) | ||
94 | |||
95 | $(INCLUDEDIR): FORCE | ||
96 | $(NSINSTALL) -D $(INCLUDEDIR) | ||
97 | Index: directory/c-sdk/ldap/libraries/libprldap/Makefile.in | ||
98 | =================================================================== | ||
99 | RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in,v | ||
100 | retrieving revision 5.0.2.16 | ||
101 | diff -u -r5.0.2.16 Makefile.in | ||
102 | --- directory/c-sdk/ldap/libraries/libprldap/Makefile.in 10 Mar 2004 18:47:26 -0000 5.0.2.16 | ||
103 | +++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 28 Apr 2005 21:23:12 -0000 | ||
104 | @@ -56,9 +56,9 @@ | ||
105 | |||
106 | GARBAGE += $(LIBPRLDAP) $(DLLPRLDAP) | ||
107 | |||
108 | -LOCAL_INCLUDES = -I$(PUBLIC)/nspr | ||
109 | +LOCAL_INCLUDES = | ||
110 | INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \ | ||
111 | - -I$(DIST)/include/nspr | ||
112 | + $(NSPR_CFLAGS) | ||
113 | DEFINES += $(DEFS) | ||
114 | |||
115 | PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS | ||
116 | Index: directory/c-sdk/configure | ||
117 | =================================================================== | ||
118 | RCS file: /cvsroot/mozilla/directory/c-sdk/configure,v | ||
119 | retrieving revision 5.0.2.25.2.1 | ||
120 | diff -d -u -p -r5.0.2.25.2.1 configure | ||
121 | --- directory/c-sdk/configure 14 Sep 2004 21:14:38 -0000 5.0.2.25.2.1 | ||
122 | +++ directory/c-sdk/configure 12 Jul 2005 22:23:32 -0000 | ||
123 | @@ -682,6 +682,7 @@ test "$host_alias" != "$target_alias" && | ||
124 | program_prefix=${target_alias}- | ||
125 | |||
126 | |||
127 | +NSPR_VERSION=4 | ||
128 | _HAVE_PTHREADS= | ||
129 | USE_PTHREADS= | ||
130 | USE_USER_PTHREADS= | ||
131 | @@ -718,7 +719,7 @@ do | ||
132 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
133 | set dummy $ac_prog; ac_word=$2 | ||
134 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
135 | -echo "configure:722: checking for $ac_word" >&5 | ||
136 | +echo "configure:723: checking for $ac_word" >&5 | ||
137 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
138 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
139 | else | ||
140 | @@ -903,18 +904,20 @@ fi | ||
141 | if test "${with_system_nspr+set}" = set; then | ||
142 | withval="$with_system_nspr" | ||
143 | if test "$withval" = "yes"; then | ||
144 | - _NO_NSPR= | ||
145 | + _SYSTEM_NSPR=1 | ||
146 | else | ||
147 | - _NO_NSPR=1 | ||
148 | + _SYSTEM_NSPR= | ||
149 | fi | ||
150 | +else | ||
151 | + _SYSTEM_NSPR= | ||
152 | fi | ||
153 | |||
154 | |||
155 | if test "$_WIN32_MSVC"; then | ||
156 | - _NO_NSPR=1 | ||
157 | + _SYSTEM_NSPR= | ||
158 | fi | ||
159 | |||
160 | -if test -z "$_NO_NSPR"; then | ||
161 | +if test -n "$_SYSTEM_NSPR"; then | ||
162 | |||
163 | # Check whether --with-nspr-prefix or --without-nspr-prefix was given. | ||
164 | if test "${with_nspr_prefix+set}" = set; then | ||
165 | @@ -951,7 +954,7 @@ fi | ||
166 | # Extract the first word of "nspr-config", so it can be a program name with args. | ||
167 | set dummy nspr-config; ac_word=$2 | ||
168 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
169 | -echo "configure:955: checking for $ac_word" >&5 | ||
170 | +echo "configure:958: checking for $ac_word" >&5 | ||
171 | if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then | ||
172 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
173 | else | ||
174 | @@ -986,7 +989,7 @@ fi | ||
175 | |||
176 | min_nspr_version=4.0.0 | ||
177 | echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 | ||
178 | -echo "configure:990: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 | ||
179 | +echo "configure:993: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 | ||
180 | |||
181 | no_nspr="" | ||
182 | if test "$NSPR_CONFIG" = "no"; then | ||
183 | @@ -1018,15 +1021,13 @@ echo "configure:990: checking for NSPR - | ||
184 | fi | ||
185 | |||
186 | if test -z "$MOZ_NATIVE_NSPR"; then | ||
187 | - NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' | ||
188 | + NSPR_CFLAGS='-I$(DIST)/include/nspr' | ||
189 | + NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION" | ||
190 | # explicitly set libs for Visual Age C++ for OS/2 | ||
191 | if test "$VACPP" = "yes"; then | ||
192 | NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' | ||
193 | elif test "$_WIN32_MSVC"; then | ||
194 | NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib ' | ||
195 | - NSPR_CFLAGS='-I$(DIST)/include/nspr' | ||
196 | - else | ||
197 | - NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`' | ||
198 | fi | ||
199 | fi | ||
200 | |||
201 | @@ -1119,7 +1120,7 @@ if test -z "$SKIP_PATH_CHECKS"; then | ||
202 | # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. | ||
203 | set dummy $WHOAMI whoami; ac_word=$2 | ||
204 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
205 | -echo "configure:1123: checking for $ac_word" >&5 | ||
206 | +echo "configure:1124: checking for $ac_word" >&5 | ||
207 | if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then | ||
208 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
209 | else | ||
210 | @@ -1194,13 +1195,13 @@ if test "$target" != "$host"; then | ||
211 | _SAVE_LDFLAGS="$LDFLAGS" | ||
212 | |||
213 | echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 | ||
214 | -echo "configure:1198: checking for $host compiler" >&5 | ||
215 | +echo "configure:1199: checking for $host compiler" >&5 | ||
216 | for ac_prog in gcc cc /usr/ucb/cc | ||
217 | do | ||
218 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
219 | set dummy $ac_prog; ac_word=$2 | ||
220 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
221 | -echo "configure:1204: checking for $ac_word" >&5 | ||
222 | +echo "configure:1205: checking for $ac_word" >&5 | ||
223 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then | ||
224 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
225 | else | ||
226 | @@ -1246,16 +1247,16 @@ test -n "$HOST_CC" || HOST_CC="""" | ||
227 | LDFLAGS="$HOST_LDFLAGS" | ||
228 | |||
229 | echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 | ||
230 | -echo "configure:1250: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | ||
231 | +echo "configure:1251: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | ||
232 | cat > conftest.$ac_ext <<EOF | ||
233 | -#line 1252 "configure" | ||
234 | +#line 1253 "configure" | ||
235 | #include "confdefs.h" | ||
236 | |||
237 | int main() { | ||
238 | return(0); | ||
239 | ; return 0; } | ||
240 | EOF | ||
241 | -if { (eval echo configure:1259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
242 | +if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
243 | rm -rf conftest* | ||
244 | ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 | ||
245 | else | ||
246 | @@ -1275,7 +1276,7 @@ do | ||
247 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
248 | set dummy $ac_prog; ac_word=$2 | ||
249 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
250 | -echo "configure:1279: checking for $ac_word" >&5 | ||
251 | +echo "configure:1280: checking for $ac_word" >&5 | ||
252 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
253 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
254 | else | ||
255 | @@ -1309,7 +1310,7 @@ test -n "$CC" || CC="echo" | ||
256 | # Extract the first word of "gcc", so it can be a program name with args. | ||
257 | set dummy gcc; ac_word=$2 | ||
258 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
259 | -echo "configure:1313: checking for $ac_word" >&5 | ||
260 | +echo "configure:1314: checking for $ac_word" >&5 | ||
261 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
262 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
263 | else | ||
264 | @@ -1339,7 +1340,7 @@ if test -z "$CC"; then | ||
265 | # Extract the first word of "cc", so it can be a program name with args. | ||
266 | set dummy cc; ac_word=$2 | ||
267 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
268 | -echo "configure:1343: checking for $ac_word" >&5 | ||
269 | +echo "configure:1344: checking for $ac_word" >&5 | ||
270 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
271 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
272 | else | ||
273 | @@ -1390,7 +1391,7 @@ fi | ||
274 | # Extract the first word of "cl", so it can be a program name with args. | ||
275 | set dummy cl; ac_word=$2 | ||
276 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
277 | -echo "configure:1394: checking for $ac_word" >&5 | ||
278 | +echo "configure:1395: checking for $ac_word" >&5 | ||
279 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
280 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
281 | else | ||
282 | @@ -1422,7 +1423,7 @@ fi | ||
283 | fi | ||
284 | |||
285 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
286 | -echo "configure:1426: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
287 | +echo "configure:1427: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
288 | |||
289 | ac_ext=c | ||
290 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
291 | @@ -1433,12 +1434,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
292 | |||
293 | cat > conftest.$ac_ext << EOF | ||
294 | |||
295 | -#line 1437 "configure" | ||
296 | +#line 1438 "configure" | ||
297 | #include "confdefs.h" | ||
298 | |||
299 | main(){return(0);} | ||
300 | EOF | ||
301 | -if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
302 | +if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
303 | ac_cv_prog_cc_works=yes | ||
304 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
305 | if (./conftest; exit) 2>/dev/null; then | ||
306 | @@ -1464,12 +1465,12 @@ if test $ac_cv_prog_cc_works = no; then | ||
307 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
308 | fi | ||
309 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
310 | -echo "configure:1468: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
311 | +echo "configure:1469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
312 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
313 | cross_compiling=$ac_cv_prog_cc_cross | ||
314 | |||
315 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
316 | -echo "configure:1473: checking whether we are using GNU C" >&5 | ||
317 | +echo "configure:1474: checking whether we are using GNU C" >&5 | ||
318 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
319 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
320 | else | ||
321 | @@ -1478,7 +1479,7 @@ else | ||
322 | yes; | ||
323 | #endif | ||
324 | EOF | ||
325 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
326 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
327 | ac_cv_prog_gcc=yes | ||
328 | else | ||
329 | ac_cv_prog_gcc=no | ||
330 | @@ -1497,7 +1498,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | ||
331 | ac_save_CFLAGS="$CFLAGS" | ||
332 | CFLAGS= | ||
333 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
334 | -echo "configure:1501: checking whether ${CC-cc} accepts -g" >&5 | ||
335 | +echo "configure:1502: checking whether ${CC-cc} accepts -g" >&5 | ||
336 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
337 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
338 | else | ||
339 | @@ -1533,7 +1534,7 @@ do | ||
340 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
341 | set dummy $ac_prog; ac_word=$2 | ||
342 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
343 | -echo "configure:1537: checking for $ac_word" >&5 | ||
344 | +echo "configure:1538: checking for $ac_word" >&5 | ||
345 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
346 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
347 | else | ||
348 | @@ -1569,7 +1570,7 @@ do | ||
349 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
350 | set dummy $ac_prog; ac_word=$2 | ||
351 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
352 | -echo "configure:1573: checking for $ac_word" >&5 | ||
353 | +echo "configure:1574: checking for $ac_word" >&5 | ||
354 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
355 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
356 | else | ||
357 | @@ -1601,7 +1602,7 @@ test -n "$CXX" || CXX="gcc" | ||
358 | |||
359 | |||
360 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
361 | -echo "configure:1605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
362 | +echo "configure:1606: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
363 | |||
364 | ac_ext=C | ||
365 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
366 | @@ -1612,12 +1613,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
367 | |||
368 | cat > conftest.$ac_ext << EOF | ||
369 | |||
370 | -#line 1616 "configure" | ||
371 | +#line 1617 "configure" | ||
372 | #include "confdefs.h" | ||
373 | |||
374 | int main(){return(0);} | ||
375 | EOF | ||
376 | -if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
377 | +if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
378 | ac_cv_prog_cxx_works=yes | ||
379 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
380 | if (./conftest; exit) 2>/dev/null; then | ||
381 | @@ -1643,12 +1644,12 @@ if test $ac_cv_prog_cxx_works = no; then | ||
382 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | ||
383 | fi | ||
384 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
385 | -echo "configure:1647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
386 | +echo "configure:1648: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
387 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | ||
388 | cross_compiling=$ac_cv_prog_cxx_cross | ||
389 | |||
390 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | ||
391 | -echo "configure:1652: checking whether we are using GNU C++" >&5 | ||
392 | +echo "configure:1653: checking whether we are using GNU C++" >&5 | ||
393 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | ||
394 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
395 | else | ||
396 | @@ -1657,7 +1658,7 @@ else | ||
397 | yes; | ||
398 | #endif | ||
399 | EOF | ||
400 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
401 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
402 | ac_cv_prog_gxx=yes | ||
403 | else | ||
404 | ac_cv_prog_gxx=no | ||
405 | @@ -1676,7 +1677,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" | ||
406 | ac_save_CXXFLAGS="$CXXFLAGS" | ||
407 | CXXFLAGS= | ||
408 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | ||
409 | -echo "configure:1680: checking whether ${CXX-g++} accepts -g" >&5 | ||
410 | +echo "configure:1681: checking whether ${CXX-g++} accepts -g" >&5 | ||
411 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | ||
412 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
413 | else | ||
414 | @@ -1717,7 +1718,7 @@ for ac_declaration in \ | ||
415 | 'void exit (int);' | ||
416 | do | ||
417 | cat > conftest.$ac_ext <<EOF | ||
418 | -#line 1721 "configure" | ||
419 | +#line 1722 "configure" | ||
420 | #include "confdefs.h" | ||
421 | #include <stdlib.h> | ||
422 | $ac_declaration | ||
423 | @@ -1725,7 +1726,7 @@ int main() { | ||
424 | exit (42); | ||
425 | ; return 0; } | ||
426 | EOF | ||
427 | -if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
428 | +if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
429 | : | ||
430 | else | ||
431 | echo "configure: failed program was:" >&5 | ||
432 | @@ -1735,14 +1736,14 @@ else | ||
433 | fi | ||
434 | rm -f conftest* | ||
435 | cat > conftest.$ac_ext <<EOF | ||
436 | -#line 1739 "configure" | ||
437 | +#line 1740 "configure" | ||
438 | #include "confdefs.h" | ||
439 | $ac_declaration | ||
440 | int main() { | ||
441 | exit (42); | ||
442 | ; return 0; } | ||
443 | EOF | ||
444 | -if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
445 | +if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
446 | rm -rf conftest* | ||
447 | break | ||
448 | else | ||
449 | @@ -1763,7 +1764,7 @@ do | ||
450 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
451 | set dummy $ac_prog; ac_word=$2 | ||
452 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
453 | -echo "configure:1767: checking for $ac_word" >&5 | ||
454 | +echo "configure:1768: checking for $ac_word" >&5 | ||
455 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
456 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
457 | else | ||
458 | @@ -1798,7 +1799,7 @@ do | ||
459 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
460 | set dummy $ac_prog; ac_word=$2 | ||
461 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
462 | -echo "configure:1802: checking for $ac_word" >&5 | ||
463 | +echo "configure:1803: checking for $ac_word" >&5 | ||
464 | if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then | ||
465 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
466 | else | ||
467 | @@ -1833,7 +1834,7 @@ do | ||
468 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
469 | set dummy $ac_prog; ac_word=$2 | ||
470 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
471 | -echo "configure:1837: checking for $ac_word" >&5 | ||
472 | +echo "configure:1838: checking for $ac_word" >&5 | ||
473 | if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then | ||
474 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
475 | else | ||
476 | @@ -1868,7 +1869,7 @@ do | ||
477 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
478 | set dummy $ac_prog; ac_word=$2 | ||
479 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
480 | -echo "configure:1872: checking for $ac_word" >&5 | ||
481 | +echo "configure:1873: checking for $ac_word" >&5 | ||
482 | if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then | ||
483 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
484 | else | ||
485 | @@ -1903,7 +1904,7 @@ do | ||
486 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
487 | set dummy $ac_prog; ac_word=$2 | ||
488 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
489 | -echo "configure:1907: checking for $ac_word" >&5 | ||
490 | +echo "configure:1908: checking for $ac_word" >&5 | ||
491 | if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then | ||
492 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
493 | else | ||
494 | @@ -1938,7 +1939,7 @@ do | ||
495 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
496 | set dummy $ac_prog; ac_word=$2 | ||
497 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
498 | -echo "configure:1942: checking for $ac_word" >&5 | ||
499 | +echo "configure:1943: checking for $ac_word" >&5 | ||
500 | if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then | ||
501 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
502 | else | ||
503 | @@ -1975,7 +1976,7 @@ do | ||
504 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
505 | set dummy $ac_prog; ac_word=$2 | ||
506 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
507 | -echo "configure:1979: checking for $ac_word" >&5 | ||
508 | +echo "configure:1980: checking for $ac_word" >&5 | ||
509 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
510 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
511 | else | ||
512 | @@ -2007,7 +2008,7 @@ test -n "$CXX" || CXX="gcc" | ||
513 | |||
514 | |||
515 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
516 | -echo "configure:2011: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
517 | +echo "configure:2012: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
518 | |||
519 | ac_ext=C | ||
520 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
521 | @@ -2018,12 +2019,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
522 | |||
523 | cat > conftest.$ac_ext << EOF | ||
524 | |||
525 | -#line 2022 "configure" | ||
526 | +#line 2023 "configure" | ||
527 | #include "confdefs.h" | ||
528 | |||
529 | int main(){return(0);} | ||
530 | EOF | ||
531 | -if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
532 | +if { (eval echo configure:2028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
533 | ac_cv_prog_cxx_works=yes | ||
534 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
535 | if (./conftest; exit) 2>/dev/null; then | ||
536 | @@ -2049,12 +2050,12 @@ if test $ac_cv_prog_cxx_works = no; then | ||
537 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | ||
538 | fi | ||
539 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
540 | -echo "configure:2053: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
541 | +echo "configure:2054: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
542 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | ||
543 | cross_compiling=$ac_cv_prog_cxx_cross | ||
544 | |||
545 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | ||
546 | -echo "configure:2058: checking whether we are using GNU C++" >&5 | ||
547 | +echo "configure:2059: checking whether we are using GNU C++" >&5 | ||
548 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | ||
549 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
550 | else | ||
551 | @@ -2063,7 +2064,7 @@ else | ||
552 | yes; | ||
553 | #endif | ||
554 | EOF | ||
555 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
556 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
557 | ac_cv_prog_gxx=yes | ||
558 | else | ||
559 | ac_cv_prog_gxx=no | ||
560 | @@ -2082,7 +2083,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" | ||
561 | ac_save_CXXFLAGS="$CXXFLAGS" | ||
562 | CXXFLAGS= | ||
563 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | ||
564 | -echo "configure:2086: checking whether ${CXX-g++} accepts -g" >&5 | ||
565 | +echo "configure:2087: checking whether ${CXX-g++} accepts -g" >&5 | ||
566 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | ||
567 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
568 | else | ||
569 | @@ -2123,7 +2124,7 @@ for ac_declaration in \ | ||
570 | 'void exit (int);' | ||
571 | do | ||
572 | cat > conftest.$ac_ext <<EOF | ||
573 | -#line 2127 "configure" | ||
574 | +#line 2128 "configure" | ||
575 | #include "confdefs.h" | ||
576 | #include <stdlib.h> | ||
577 | $ac_declaration | ||
578 | @@ -2131,7 +2132,7 @@ int main() { | ||
579 | exit (42); | ||
580 | ; return 0; } | ||
581 | EOF | ||
582 | -if { (eval echo configure:2135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
583 | +if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
584 | : | ||
585 | else | ||
586 | echo "configure: failed program was:" >&5 | ||
587 | @@ -2141,14 +2142,14 @@ else | ||
588 | fi | ||
589 | rm -f conftest* | ||
590 | cat > conftest.$ac_ext <<EOF | ||
591 | -#line 2145 "configure" | ||
592 | +#line 2146 "configure" | ||
593 | #include "confdefs.h" | ||
594 | $ac_declaration | ||
595 | int main() { | ||
596 | exit (42); | ||
597 | ; return 0; } | ||
598 | EOF | ||
599 | -if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
600 | +if { (eval echo configure:2153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
601 | rm -rf conftest* | ||
602 | break | ||
603 | else | ||
604 | @@ -2170,7 +2171,7 @@ fi | ||
605 | # Extract the first word of "gcc", so it can be a program name with args. | ||
606 | set dummy gcc; ac_word=$2 | ||
607 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
608 | -echo "configure:2174: checking for $ac_word" >&5 | ||
609 | +echo "configure:2175: checking for $ac_word" >&5 | ||
610 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
611 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
612 | else | ||
613 | @@ -2200,7 +2201,7 @@ if test -z "$CC"; then | ||
614 | # Extract the first word of "cc", so it can be a program name with args. | ||
615 | set dummy cc; ac_word=$2 | ||
616 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
617 | -echo "configure:2204: checking for $ac_word" >&5 | ||
618 | +echo "configure:2205: checking for $ac_word" >&5 | ||
619 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
620 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
621 | else | ||
622 | @@ -2251,7 +2252,7 @@ fi | ||
623 | # Extract the first word of "cl", so it can be a program name with args. | ||
624 | set dummy cl; ac_word=$2 | ||
625 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
626 | -echo "configure:2255: checking for $ac_word" >&5 | ||
627 | +echo "configure:2256: checking for $ac_word" >&5 | ||
628 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
629 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
630 | else | ||
631 | @@ -2283,7 +2284,7 @@ fi | ||
632 | fi | ||
633 | |||
634 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
635 | -echo "configure:2287: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
636 | +echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
637 | |||
638 | ac_ext=c | ||
639 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
640 | @@ -2294,12 +2295,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
641 | |||
642 | cat > conftest.$ac_ext << EOF | ||
643 | |||
644 | -#line 2298 "configure" | ||
645 | +#line 2299 "configure" | ||
646 | #include "confdefs.h" | ||
647 | |||
648 | main(){return(0);} | ||
649 | EOF | ||
650 | -if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
651 | +if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
652 | ac_cv_prog_cc_works=yes | ||
653 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
654 | if (./conftest; exit) 2>/dev/null; then | ||
655 | @@ -2325,12 +2326,12 @@ if test $ac_cv_prog_cc_works = no; then | ||
656 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
657 | fi | ||
658 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
659 | -echo "configure:2329: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
660 | +echo "configure:2330: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
661 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
662 | cross_compiling=$ac_cv_prog_cc_cross | ||
663 | |||
664 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
665 | -echo "configure:2334: checking whether we are using GNU C" >&5 | ||
666 | +echo "configure:2335: checking whether we are using GNU C" >&5 | ||
667 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
668 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
669 | else | ||
670 | @@ -2339,7 +2340,7 @@ else | ||
671 | yes; | ||
672 | #endif | ||
673 | EOF | ||
674 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
675 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
676 | ac_cv_prog_gcc=yes | ||
677 | else | ||
678 | ac_cv_prog_gcc=no | ||
679 | @@ -2358,7 +2359,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | ||
680 | ac_save_CFLAGS="$CFLAGS" | ||
681 | CFLAGS= | ||
682 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
683 | -echo "configure:2362: checking whether ${CC-cc} accepts -g" >&5 | ||
684 | +echo "configure:2363: checking whether ${CC-cc} accepts -g" >&5 | ||
685 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
686 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
687 | else | ||
688 | @@ -2391,7 +2392,7 @@ fi | ||
689 | |||
690 | fi | ||
691 | echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | ||
692 | -echo "configure:2395: checking how to run the C preprocessor" >&5 | ||
693 | +echo "configure:2396: checking how to run the C preprocessor" >&5 | ||
694 | # On Suns, sometimes $CPP names a directory. | ||
695 | if test -n "$CPP" && test -d "$CPP"; then | ||
696 | CPP= | ||
697 | @@ -2406,13 +2407,13 @@ else | ||
698 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
699 | # not just through cpp. | ||
700 | cat > conftest.$ac_ext <<EOF | ||
701 | -#line 2410 "configure" | ||
702 | +#line 2411 "configure" | ||
703 | #include "confdefs.h" | ||
704 | #include <assert.h> | ||
705 | Syntax Error | ||
706 | EOF | ||
707 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
708 | -{ (eval echo configure:2416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
709 | +{ (eval echo configure:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
710 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
711 | if test -z "$ac_err"; then | ||
712 | : | ||
713 | @@ -2423,13 +2424,13 @@ else | ||
714 | rm -rf conftest* | ||
715 | CPP="${CC-cc} -E -traditional-cpp" | ||
716 | cat > conftest.$ac_ext <<EOF | ||
717 | -#line 2427 "configure" | ||
718 | +#line 2428 "configure" | ||
719 | #include "confdefs.h" | ||
720 | #include <assert.h> | ||
721 | Syntax Error | ||
722 | EOF | ||
723 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
724 | -{ (eval echo configure:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
725 | +{ (eval echo configure:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
726 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
727 | if test -z "$ac_err"; then | ||
728 | : | ||
729 | @@ -2440,13 +2441,13 @@ else | ||
730 | rm -rf conftest* | ||
731 | CPP="${CC-cc} -nologo -E" | ||
732 | cat > conftest.$ac_ext <<EOF | ||
733 | -#line 2444 "configure" | ||
734 | +#line 2445 "configure" | ||
735 | #include "confdefs.h" | ||
736 | #include <assert.h> | ||
737 | Syntax Error | ||
738 | EOF | ||
739 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
740 | -{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
741 | +{ (eval echo configure:2451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
742 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
743 | if test -z "$ac_err"; then | ||
744 | : | ||
745 | @@ -2473,7 +2474,7 @@ echo "$ac_t""$CPP" 1>&6 | ||
746 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
747 | set dummy ranlib; ac_word=$2 | ||
748 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
749 | -echo "configure:2477: checking for $ac_word" >&5 | ||
750 | +echo "configure:2478: checking for $ac_word" >&5 | ||
751 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
752 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
753 | else | ||
754 | @@ -2505,7 +2506,7 @@ do | ||
755 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
756 | set dummy $ac_prog; ac_word=$2 | ||
757 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
758 | -echo "configure:2509: checking for $ac_word" >&5 | ||
759 | +echo "configure:2510: checking for $ac_word" >&5 | ||
760 | if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then | ||
761 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
762 | else | ||
763 | @@ -2546,7 +2547,7 @@ do | ||
764 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
765 | set dummy $ac_prog; ac_word=$2 | ||
766 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
767 | -echo "configure:2550: checking for $ac_word" >&5 | ||
768 | +echo "configure:2551: checking for $ac_word" >&5 | ||
769 | if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then | ||
770 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
771 | else | ||
772 | @@ -2587,7 +2588,7 @@ do | ||
773 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
774 | set dummy $ac_prog; ac_word=$2 | ||
775 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
776 | -echo "configure:2591: checking for $ac_word" >&5 | ||
777 | +echo "configure:2592: checking for $ac_word" >&5 | ||
778 | if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then | ||
779 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
780 | else | ||
781 | @@ -2628,7 +2629,7 @@ do | ||
782 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
783 | set dummy $ac_prog; ac_word=$2 | ||
784 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
785 | -echo "configure:2632: checking for $ac_word" >&5 | ||
786 | +echo "configure:2633: checking for $ac_word" >&5 | ||
787 | if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then | ||
788 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
789 | else | ||
790 | @@ -2669,7 +2670,7 @@ do | ||
791 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
792 | set dummy $ac_prog; ac_word=$2 | ||
793 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
794 | -echo "configure:2673: checking for $ac_word" >&5 | ||
795 | +echo "configure:2674: checking for $ac_word" >&5 | ||
796 | if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then | ||
797 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
798 | else | ||
799 | @@ -2731,7 +2732,7 @@ else | ||
800 | fi | ||
801 | |||
802 | echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 | ||
803 | -echo "configure:2735: checking for gcc -pipe support" >&5 | ||
804 | +echo "configure:2736: checking for gcc -pipe support" >&5 | ||
805 | if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then | ||
806 | echo '#include <stdio.h>' > dummy-hello.c | ||
807 | echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c | ||
808 | @@ -2746,14 +2747,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CX | ||
809 | _SAVE_CFLAGS=$CFLAGS | ||
810 | CFLAGS="$CFLAGS -pipe" | ||
811 | cat > conftest.$ac_ext <<EOF | ||
812 | -#line 2750 "configure" | ||
813 | +#line 2751 "configure" | ||
814 | #include "confdefs.h" | ||
815 | #include <stdio.h> | ||
816 | int main() { | ||
817 | printf("Hello World\n"); | ||
818 | ; return 0; } | ||
819 | EOF | ||
820 | -if { (eval echo configure:2757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
821 | +if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
822 | rm -rf conftest* | ||
823 | _res_gcc_pipe="yes" | ||
824 | else | ||
825 | @@ -2786,7 +2787,7 @@ do | ||
826 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
827 | set dummy $ac_prog; ac_word=$2 | ||
828 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
829 | -echo "configure:2790: checking for $ac_word" >&5 | ||
830 | +echo "configure:2791: checking for $ac_word" >&5 | ||
831 | if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then | ||
832 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
833 | else | ||
834 | @@ -3020,17 +3021,17 @@ EOF | ||
835 | DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' | ||
836 | ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` | ||
837 | echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 | ||
838 | -echo "configure:3024: checking for sys/atomic_op.h" >&5 | ||
839 | +echo "configure:3025: checking for sys/atomic_op.h" >&5 | ||
840 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
841 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
842 | else | ||
843 | cat > conftest.$ac_ext <<EOF | ||
844 | -#line 3029 "configure" | ||
845 | +#line 3030 "configure" | ||
846 | #include "confdefs.h" | ||
847 | #include <sys/atomic_op.h> | ||
848 | EOF | ||
849 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
850 | -{ (eval echo configure:3034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
851 | +{ (eval echo configure:3035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
852 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
853 | if test -z "$ac_err"; then | ||
854 | rm -rf conftest* | ||
855 | @@ -3188,7 +3189,7 @@ EOF | ||
856 | _DEBUG_FLAGS='-gdwarf-2 -O0' | ||
857 | MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' | ||
858 | echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 | ||
859 | -echo "configure:3192: checking for gethostbyaddr in -lbind" >&5 | ||
860 | +echo "configure:3193: checking for gethostbyaddr in -lbind" >&5 | ||
861 | ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` | ||
862 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
863 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
864 | @@ -3196,7 +3197,7 @@ else | ||
865 | ac_save_LIBS="$LIBS" | ||
866 | LIBS="-lbind $LIBS" | ||
867 | cat > conftest.$ac_ext <<EOF | ||
868 | -#line 3200 "configure" | ||
869 | +#line 3201 "configure" | ||
870 | #include "confdefs.h" | ||
871 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
872 | /* We use char because int might match the return type of a gcc2 | ||
873 | @@ -3207,7 +3208,7 @@ int main() { | ||
874 | gethostbyaddr() | ||
875 | ; return 0; } | ||
876 | EOF | ||
877 | -if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
878 | +if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
879 | rm -rf conftest* | ||
880 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
881 | else | ||
882 | @@ -4429,17 +4430,17 @@ EOF | ||
883 | |||
884 | ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` | ||
885 | echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 | ||
886 | -echo "configure:4433: checking for machine/builtins.h" >&5 | ||
887 | +echo "configure:4434: checking for machine/builtins.h" >&5 | ||
888 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
889 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
890 | else | ||
891 | cat > conftest.$ac_ext <<EOF | ||
892 | -#line 4438 "configure" | ||
893 | +#line 4439 "configure" | ||
894 | #include "confdefs.h" | ||
895 | #include <machine/builtins.h> | ||
896 | EOF | ||
897 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
898 | -{ (eval echo configure:4443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
899 | +{ (eval echo configure:4444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
900 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
901 | if test -z "$ac_err"; then | ||
902 | rm -rf conftest* | ||
903 | @@ -4837,12 +4838,12 @@ esac | ||
904 | if test -z "$SKIP_LIBRARY_CHECKS"; then | ||
905 | |||
906 | echo $ac_n "checking for dlopen""... $ac_c" 1>&6 | ||
907 | -echo "configure:4841: checking for dlopen" >&5 | ||
908 | +echo "configure:4842: checking for dlopen" >&5 | ||
909 | if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then | ||
910 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
911 | else | ||
912 | cat > conftest.$ac_ext <<EOF | ||
913 | -#line 4846 "configure" | ||
914 | +#line 4847 "configure" | ||
915 | #include "confdefs.h" | ||
916 | /* System header to define __stub macros and hopefully few prototypes, | ||
917 | which can conflict with char dlopen(); below. */ | ||
918 | @@ -4865,7 +4866,7 @@ dlopen(); | ||
919 | |||
920 | ; return 0; } | ||
921 | EOF | ||
922 | -if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
923 | +if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
924 | rm -rf conftest* | ||
925 | eval "ac_cv_func_dlopen=yes" | ||
926 | else | ||
927 | @@ -4884,7 +4885,7 @@ else | ||
928 | echo "$ac_t""no" 1>&6 | ||
929 | |||
930 | echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | ||
931 | -echo "configure:4888: checking for dlopen in -ldl" >&5 | ||
932 | +echo "configure:4889: checking for dlopen in -ldl" >&5 | ||
933 | ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` | ||
934 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
935 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
936 | @@ -4892,7 +4893,7 @@ else | ||
937 | ac_save_LIBS="$LIBS" | ||
938 | LIBS="-ldl $LIBS" | ||
939 | cat > conftest.$ac_ext <<EOF | ||
940 | -#line 4896 "configure" | ||
941 | +#line 4897 "configure" | ||
942 | #include "confdefs.h" | ||
943 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
944 | /* We use char because int might match the return type of a gcc2 | ||
945 | @@ -4903,7 +4904,7 @@ int main() { | ||
946 | dlopen() | ||
947 | ; return 0; } | ||
948 | EOF | ||
949 | -if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
950 | +if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
951 | rm -rf conftest* | ||
952 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
953 | else | ||
954 | @@ -4931,13 +4932,13 @@ fi | ||
955 | |||
956 | if test $ac_cv_prog_gcc = yes; then | ||
957 | echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 | ||
958 | -echo "configure:4935: checking whether ${CC-cc} needs -traditional" >&5 | ||
959 | +echo "configure:4936: checking whether ${CC-cc} needs -traditional" >&5 | ||
960 | if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then | ||
961 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
962 | else | ||
963 | ac_pattern="Autoconf.*'x'" | ||
964 | cat > conftest.$ac_ext <<EOF | ||
965 | -#line 4941 "configure" | ||
966 | +#line 4942 "configure" | ||
967 | #include "confdefs.h" | ||
968 | #include <sgtty.h> | ||
969 | Autoconf TIOCGETP | ||
970 | @@ -4955,7 +4956,7 @@ rm -f conftest* | ||
971 | |||
972 | if test $ac_cv_prog_gcc_traditional = no; then | ||
973 | cat > conftest.$ac_ext <<EOF | ||
974 | -#line 4959 "configure" | ||
975 | +#line 4960 "configure" | ||
976 | #include "confdefs.h" | ||
977 | #include <termio.h> | ||
978 | Autoconf TCGETA | ||
979 | @@ -4979,12 +4980,12 @@ fi | ||
980 | for ac_func in lchown strerror | ||
981 | do | ||
982 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
983 | -echo "configure:4983: checking for $ac_func" >&5 | ||
984 | +echo "configure:4984: checking for $ac_func" >&5 | ||
985 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
986 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
987 | else | ||
988 | cat > conftest.$ac_ext <<EOF | ||
989 | -#line 4988 "configure" | ||
990 | +#line 4989 "configure" | ||
991 | #include "confdefs.h" | ||
992 | /* System header to define __stub macros and hopefully few prototypes, | ||
993 | which can conflict with char $ac_func(); below. */ | ||
994 | @@ -5007,7 +5008,7 @@ $ac_func(); | ||
995 | |||
996 | ; return 0; } | ||
997 | EOF | ||
998 | -if { (eval echo configure:5011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
999 | +if { (eval echo configure:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1000 | rm -rf conftest* | ||
1001 | eval "ac_cv_func_$ac_func=yes" | ||
1002 | else | ||
1003 | @@ -5045,7 +5046,7 @@ fi | ||
1004 | |||
1005 | |||
1006 | echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 | ||
1007 | -echo "configure:5049: checking for pthread_create in -lpthreads" >&5 | ||
1008 | +echo "configure:5050: checking for pthread_create in -lpthreads" >&5 | ||
1009 | echo " | ||
1010 | #include <pthread.h> | ||
1011 | void *foo(void *v) { int a = 1; } | ||
1012 | @@ -5067,7 +5068,7 @@ echo " | ||
1013 | echo "$ac_t""no" 1>&6 | ||
1014 | |||
1015 | echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 | ||
1016 | -echo "configure:5071: checking for pthread_create in -lpthread" >&5 | ||
1017 | +echo "configure:5072: checking for pthread_create in -lpthread" >&5 | ||
1018 | echo " | ||
1019 | #include <pthread.h> | ||
1020 | void *foo(void *v) { int a = 1; } | ||
1021 | @@ -5089,7 +5090,7 @@ echo " | ||
1022 | echo "$ac_t""no" 1>&6 | ||
1023 | |||
1024 | echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 | ||
1025 | -echo "configure:5093: checking for pthread_create in -lc_r" >&5 | ||
1026 | +echo "configure:5094: checking for pthread_create in -lc_r" >&5 | ||
1027 | echo " | ||
1028 | #include <pthread.h> | ||
1029 | void *foo(void *v) { int a = 1; } | ||
1030 | @@ -5111,7 +5112,7 @@ echo " | ||
1031 | echo "$ac_t""no" 1>&6 | ||
1032 | |||
1033 | echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 | ||
1034 | -echo "configure:5115: checking for pthread_create in -lc" >&5 | ||
1035 | +echo "configure:5116: checking for pthread_create in -lc" >&5 | ||
1036 | echo " | ||
1037 | #include <pthread.h> | ||
1038 | void *foo(void *v) { int a = 1; } | ||
1039 | @@ -5261,7 +5262,7 @@ if test -n "$USE_PTHREADS"; then | ||
1040 | rm -f conftest* | ||
1041 | ac_cv_have_dash_pthread=no | ||
1042 | echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 | ||
1043 | -echo "configure:5265: checking whether ${CC-cc} accepts -pthread" >&5 | ||
1044 | +echo "configure:5266: checking whether ${CC-cc} accepts -pthread" >&5 | ||
1045 | echo 'int main() { return 0; }' | cat > conftest.c | ||
1046 | ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 | ||
1047 | if test $? -eq 0; then | ||
1048 | @@ -5277,7 +5278,7 @@ echo "configure:5265: checking whether $ | ||
1049 | ac_cv_have_dash_pthreads=no | ||
1050 | if test "$ac_cv_have_dash_pthread" = "no"; then | ||
1051 | echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 | ||
1052 | -echo "configure:5281: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
1053 | +echo "configure:5282: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
1054 | echo 'int main() { return 0; }' | cat > conftest.c | ||
1055 | ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 | ||
1056 | if test $? -eq 0; then |