source: scripts/untested/autotools/patches/libtool-1.5.16-gentoo_fixes.patch@ fdfb73b

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since fdfb73b was d1afb9e, checked in by Jim Gifford <clfs@…>, 19 years ago

r587@server (orig r585): ryan | 2005-08-05 21:51:35 -0700
Add a sane autotools build to the mix.
Blatantly stolen from gentoo...
  • Property mode set to 100644
File size: 80.5 KB
RevLine 
[d1afb9e]1diff -uNr libtool-1.5.16/Makefile.in libtool-1.5.16-patched/Makefile.in
2--- libtool-1.5.16/Makefile.in 2005-04-25 03:54:15.000000000 +1000
3+++ libtool-1.5.16-patched/Makefile.in 2005-07-30 18:33:24.000000000 +1000
4@@ -1,4 +1,4 @@
5-# Makefile.in generated by automake 1.9.5 from Makefile.am.
6+# Makefile.in generated by automake 1.9.6 from Makefile.am.
7 # @configure_input@
8
9 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10diff -uNr libtool-1.5.16/aclocal.m4 libtool-1.5.16-patched/aclocal.m4
11--- libtool-1.5.16/aclocal.m4 2005-04-25 03:54:06.000000000 +1000
12+++ libtool-1.5.16-patched/aclocal.m4 2005-07-30 18:33:14.000000000 +1000
13@@ -1,4 +1,4 @@
14-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
15+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
16
17 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
18 # 2005 Free Software Foundation, Inc.
19@@ -28,7 +28,7 @@
20 # Call AM_AUTOMAKE_VERSION so it can be traced.
21 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
22 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
23- [AM_AUTOMAKE_VERSION([1.9.5])])
24+ [AM_AUTOMAKE_VERSION([1.9.6])])
25
26 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
27
28diff -uNr libtool-1.5.16/configure libtool-1.5.16-patched/configure
29--- libtool-1.5.16/configure 2005-04-25 03:54:17.000000000 +1000
30+++ libtool-1.5.16-patched/configure 2005-07-30 18:33:31.000000000 +1000
31@@ -878,13 +878,13 @@
32 /^X\(\/\).*/{ s//\1/; q; }
33 s/.*/./; q'`
34 srcdir=$ac_confdir
35- if test ! -r $srcdir/$ac_unique_file; then
36+ if test ! -r "$srcdir/$ac_unique_file"; then
37 srcdir=..
38 fi
39 else
40 ac_srcdir_defaulted=no
41 fi
42-if test ! -r $srcdir/$ac_unique_file; then
43+if test ! -r "$srcdir/$ac_unique_file"; then
44 if test "$ac_srcdir_defaulted" = yes; then
45 { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
46 { (exit 1); exit 1; }; }
47@@ -893,7 +893,7 @@
48 { (exit 1); exit 1; }; }
49 fi
50 fi
51-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
52+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
53 { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
54 { (exit 1); exit 1; }; }
55 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
56@@ -1156,7 +1156,7 @@
57 else
58 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
59 fi
60- cd "$ac_popdir"
61+ cd $ac_popdir
62 done
63 fi
64
65@@ -2592,7 +2592,8 @@
66 cat conftest.err >&5
67 echo "$as_me:$LINENO: \$? = $ac_status" >&5
68 (exit $ac_status); } &&
69- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
70+ { ac_try='test -z "$ac_c_werror_flag"
71+ || test ! -s conftest.err'
72 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
73 (eval $ac_try) 2>&5
74 ac_status=$?
75@@ -2650,7 +2651,8 @@
76 cat conftest.err >&5
77 echo "$as_me:$LINENO: \$? = $ac_status" >&5
78 (exit $ac_status); } &&
79- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
80+ { ac_try='test -z "$ac_c_werror_flag"
81+ || test ! -s conftest.err'
82 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
83 (eval $ac_try) 2>&5
84 ac_status=$?
85@@ -2766,7 +2768,8 @@
86 cat conftest.err >&5
87 echo "$as_me:$LINENO: \$? = $ac_status" >&5
88 (exit $ac_status); } &&
89- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
90+ { ac_try='test -z "$ac_c_werror_flag"
91+ || test ! -s conftest.err'
92 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
93 (eval $ac_try) 2>&5
94 ac_status=$?
95@@ -2820,7 +2823,8 @@
96 cat conftest.err >&5
97 echo "$as_me:$LINENO: \$? = $ac_status" >&5
98 (exit $ac_status); } &&
99- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
100+ { ac_try='test -z "$ac_c_werror_flag"
101+ || test ! -s conftest.err'
102 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
103 (eval $ac_try) 2>&5
104 ac_status=$?
105@@ -2865,7 +2869,8 @@
106 cat conftest.err >&5
107 echo "$as_me:$LINENO: \$? = $ac_status" >&5
108 (exit $ac_status); } &&
109- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
110+ { ac_try='test -z "$ac_c_werror_flag"
111+ || test ! -s conftest.err'
112 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
113 (eval $ac_try) 2>&5
114 ac_status=$?
115@@ -2909,7 +2914,8 @@
116 cat conftest.err >&5
117 echo "$as_me:$LINENO: \$? = $ac_status" >&5
118 (exit $ac_status); } &&
119- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
120+ { ac_try='test -z "$ac_c_werror_flag"
121+ || test ! -s conftest.err'
122 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
123 (eval $ac_try) 2>&5
124 ac_status=$?
125@@ -3562,7 +3568,8 @@
126 cat conftest.err >&5
127 echo "$as_me:$LINENO: \$? = $ac_status" >&5
128 (exit $ac_status); } &&
129- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
130+ { ac_try='test -z "$ac_cxx_werror_flag"
131+ || test ! -s conftest.err'
132 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
133 (eval $ac_try) 2>&5
134 ac_status=$?
135@@ -3620,7 +3627,8 @@
136 cat conftest.err >&5
137 echo "$as_me:$LINENO: \$? = $ac_status" >&5
138 (exit $ac_status); } &&
139- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
140+ { ac_try='test -z "$ac_cxx_werror_flag"
141+ || test ! -s conftest.err'
142 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
143 (eval $ac_try) 2>&5
144 ac_status=$?
145@@ -3691,7 +3699,8 @@
146 cat conftest.err >&5
147 echo "$as_me:$LINENO: \$? = $ac_status" >&5
148 (exit $ac_status); } &&
149- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
150+ { ac_try='test -z "$ac_cxx_werror_flag"
151+ || test ! -s conftest.err'
152 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
153 (eval $ac_try) 2>&5
154 ac_status=$?
155@@ -3735,7 +3744,8 @@
156 cat conftest.err >&5
157 echo "$as_me:$LINENO: \$? = $ac_status" >&5
158 (exit $ac_status); } &&
159- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
160+ { ac_try='test -z "$ac_cxx_werror_flag"
161+ || test ! -s conftest.err'
162 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
163 (eval $ac_try) 2>&5
164 ac_status=$?
165@@ -3984,7 +3994,7 @@
166
167
168 # Provide some information about the compiler.
169-echo "$as_me:3987:" \
170+echo "$as_me:3997:" \
171 "checking for Fortran 77 compiler version" >&5
172 ac_compiler=`set X $ac_compile; echo $2`
173 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
174@@ -4030,7 +4040,8 @@
175 cat conftest.err >&5
176 echo "$as_me:$LINENO: \$? = $ac_status" >&5
177 (exit $ac_status); } &&
178- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
179+ { ac_try='test -z "$ac_f77_werror_flag"
180+ || test ! -s conftest.err'
181 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
182 (eval $ac_try) 2>&5
183 ac_status=$?
184@@ -4079,7 +4090,8 @@
185 cat conftest.err >&5
186 echo "$as_me:$LINENO: \$? = $ac_status" >&5
187 (exit $ac_status); } &&
188- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
189+ { ac_try='test -z "$ac_f77_werror_flag"
190+ || test ! -s conftest.err'
191 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
192 (eval $ac_try) 2>&5
193 ac_status=$?
194@@ -4651,7 +4663,7 @@
195 ;;
196 *-*-irix6*)
197 # Find out which ABI we are using.
198- echo '#line 4654 "configure"' > conftest.$ac_ext
199+ echo '#line 4666 "configure"' > conftest.$ac_ext
200 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
201 (eval $ac_compile) 2>&5
202 ac_status=$?
203@@ -4771,7 +4783,8 @@
204 cat conftest.err >&5
205 echo "$as_me:$LINENO: \$? = $ac_status" >&5
206 (exit $ac_status); } &&
207- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
208+ { ac_try='test -z "$ac_c_werror_flag"
209+ || test ! -s conftest.err'
210 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
211 (eval $ac_try) 2>&5
212 ac_status=$?
213@@ -5322,7 +5335,8 @@
214 cat conftest.err >&5
215 echo "$as_me:$LINENO: \$? = $ac_status" >&5
216 (exit $ac_status); } &&
217- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
218+ { ac_try='test -z "$ac_c_werror_flag"
219+ || test ! -s conftest.err'
220 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
221 (eval $ac_try) 2>&5
222 ac_status=$?
223@@ -5492,7 +5506,8 @@
224 cat conftest.err >&5
225 echo "$as_me:$LINENO: \$? = $ac_status" >&5
226 (exit $ac_status); } &&
227- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
228+ { ac_try='test -z "$ac_c_werror_flag"
229+ || test ! -s conftest.err'
230 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
231 (eval $ac_try) 2>&5
232 ac_status=$?
233@@ -5559,7 +5574,8 @@
234 cat conftest.err >&5
235 echo "$as_me:$LINENO: \$? = $ac_status" >&5
236 (exit $ac_status); } &&
237- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
238+ { ac_try='test -z "$ac_c_werror_flag"
239+ || test ! -s conftest.err'
240 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
241 (eval $ac_try) 2>&5
242 ac_status=$?
243@@ -6870,11 +6886,11 @@
244 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
245 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
246 -e 's:$: $lt_compiler_flag:'`
247- (eval echo "\"\$as_me:6873: $lt_compile\"" >&5)
248+ (eval echo "\"\$as_me:6889: $lt_compile\"" >&5)
249 (eval "$lt_compile" 2>conftest.err)
250 ac_status=$?
251 cat conftest.err >&5
252- echo "$as_me:6877: \$? = $ac_status" >&5
253+ echo "$as_me:6893: \$? = $ac_status" >&5
254 if (exit $ac_status) && test -s "$ac_outfile"; then
255 # The compiler can only warn and ignore the option if not recognized
256 # So say no if there are warnings other than the usual output.
257@@ -7132,11 +7148,11 @@
258 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
259 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
260 -e 's:$: $lt_compiler_flag:'`
261- (eval echo "\"\$as_me:7135: $lt_compile\"" >&5)
262+ (eval echo "\"\$as_me:7151: $lt_compile\"" >&5)
263 (eval "$lt_compile" 2>conftest.err)
264 ac_status=$?
265 cat conftest.err >&5
266- echo "$as_me:7139: \$? = $ac_status" >&5
267+ echo "$as_me:7155: \$? = $ac_status" >&5
268 if (exit $ac_status) && test -s "$ac_outfile"; then
269 # The compiler can only warn and ignore the option if not recognized
270 # So say no if there are warnings other than the usual output.
271@@ -7194,11 +7210,11 @@
272 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
273 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
274 -e 's:$: $lt_compiler_flag:'`
275- (eval echo "\"\$as_me:7197: $lt_compile\"" >&5)
276+ (eval echo "\"\$as_me:7213: $lt_compile\"" >&5)
277 (eval "$lt_compile" 2>out/conftest.err)
278 ac_status=$?
279 cat out/conftest.err >&5
280- echo "$as_me:7201: \$? = $ac_status" >&5
281+ echo "$as_me:7217: \$? = $ac_status" >&5
282 if (exit $ac_status) && test -s out/conftest2.$ac_objext
283 then
284 # The compiler can only warn and ignore the option if not recognized
285@@ -7621,7 +7637,8 @@
286 cat conftest.err >&5
287 echo "$as_me:$LINENO: \$? = $ac_status" >&5
288 (exit $ac_status); } &&
289- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
290+ { ac_try='test -z "$ac_c_werror_flag"
291+ || test ! -s conftest.err'
292 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
293 (eval $ac_try) 2>&5
294 ac_status=$?
295@@ -7681,7 +7698,8 @@
296 cat conftest.err >&5
297 echo "$as_me:$LINENO: \$? = $ac_status" >&5
298 (exit $ac_status); } &&
299- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
300+ { ac_try='test -z "$ac_c_werror_flag"
301+ || test ! -s conftest.err'
302 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
303 (eval $ac_try) 2>&5
304 ac_status=$?
305@@ -8887,7 +8905,8 @@
306 cat conftest.err >&5
307 echo "$as_me:$LINENO: \$? = $ac_status" >&5
308 (exit $ac_status); } &&
309- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
310+ { ac_try='test -z "$ac_c_werror_flag"
311+ || test ! -s conftest.err'
312 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
313 (eval $ac_try) 2>&5
314 ac_status=$?
315@@ -8990,7 +9009,8 @@
316 cat conftest.err >&5
317 echo "$as_me:$LINENO: \$? = $ac_status" >&5
318 (exit $ac_status); } &&
319- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
320+ { ac_try='test -z "$ac_c_werror_flag"
321+ || test ! -s conftest.err'
322 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
323 (eval $ac_try) 2>&5
324 ac_status=$?
325@@ -9055,7 +9075,8 @@
326 cat conftest.err >&5
327 echo "$as_me:$LINENO: \$? = $ac_status" >&5
328 (exit $ac_status); } &&
329- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
330+ { ac_try='test -z "$ac_c_werror_flag"
331+ || test ! -s conftest.err'
332 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
333 (eval $ac_try) 2>&5
334 ac_status=$?
335@@ -9148,7 +9169,8 @@
336 cat conftest.err >&5
337 echo "$as_me:$LINENO: \$? = $ac_status" >&5
338 (exit $ac_status); } &&
339- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
340+ { ac_try='test -z "$ac_c_werror_flag"
341+ || test ! -s conftest.err'
342 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
343 (eval $ac_try) 2>&5
344 ac_status=$?
345@@ -9213,7 +9235,8 @@
346 cat conftest.err >&5
347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
348 (exit $ac_status); } &&
349- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
350+ { ac_try='test -z "$ac_c_werror_flag"
351+ || test ! -s conftest.err'
352 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
353 (eval $ac_try) 2>&5
354 ac_status=$?
355@@ -9279,7 +9302,8 @@
356 cat conftest.err >&5
357 echo "$as_me:$LINENO: \$? = $ac_status" >&5
358 (exit $ac_status); } &&
359- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
360+ { ac_try='test -z "$ac_c_werror_flag"
361+ || test ! -s conftest.err'
362 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
363 (eval $ac_try) 2>&5
364 ac_status=$?
365@@ -9345,7 +9369,8 @@
366 cat conftest.err >&5
367 echo "$as_me:$LINENO: \$? = $ac_status" >&5
368 (exit $ac_status); } &&
369- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
370+ { ac_try='test -z "$ac_c_werror_flag"
371+ || test ! -s conftest.err'
372 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
373 (eval $ac_try) 2>&5
374 ac_status=$?
375@@ -9420,7 +9445,7 @@
376 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
377 lt_status=$lt_dlunknown
378 cat > conftest.$ac_ext <<EOF
379-#line 9423 "configure"
380+#line 9448 "configure"
381 #include "confdefs.h"
382
383 #if HAVE_DLFCN_H
384@@ -9518,7 +9543,7 @@
385 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
386 lt_status=$lt_dlunknown
387 cat > conftest.$ac_ext <<EOF
388-#line 9521 "configure"
389+#line 9546 "configure"
390 #include "confdefs.h"
391
392 #if HAVE_DLFCN_H
393@@ -10587,7 +10612,8 @@
394 cat conftest.err >&5
395 echo "$as_me:$LINENO: \$? = $ac_status" >&5
396 (exit $ac_status); } &&
397- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
398+ { ac_try='test -z "$ac_cxx_werror_flag"
399+ || test ! -s conftest.err'
400 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
401 (eval $ac_try) 2>&5
402 ac_status=$?
403@@ -10648,7 +10674,8 @@
404 cat conftest.err >&5
405 echo "$as_me:$LINENO: \$? = $ac_status" >&5
406 (exit $ac_status); } &&
407- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
408+ { ac_try='test -z "$ac_cxx_werror_flag"
409+ || test ! -s conftest.err'
410 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
411 (eval $ac_try) 2>&5
412 ac_status=$?
413@@ -11768,11 +11795,11 @@
414 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
415 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
416 -e 's:$: $lt_compiler_flag:'`
417- (eval echo "\"\$as_me:11771: $lt_compile\"" >&5)
418+ (eval echo "\"\$as_me:11798: $lt_compile\"" >&5)
419 (eval "$lt_compile" 2>conftest.err)
420 ac_status=$?
421 cat conftest.err >&5
422- echo "$as_me:11775: \$? = $ac_status" >&5
423+ echo "$as_me:11802: \$? = $ac_status" >&5
424 if (exit $ac_status) && test -s "$ac_outfile"; then
425 # The compiler can only warn and ignore the option if not recognized
426 # So say no if there are warnings other than the usual output.
427@@ -11830,11 +11857,11 @@
428 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
429 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
430 -e 's:$: $lt_compiler_flag:'`
431- (eval echo "\"\$as_me:11833: $lt_compile\"" >&5)
432+ (eval echo "\"\$as_me:11860: $lt_compile\"" >&5)
433 (eval "$lt_compile" 2>out/conftest.err)
434 ac_status=$?
435 cat out/conftest.err >&5
436- echo "$as_me:11837: \$? = $ac_status" >&5
437+ echo "$as_me:11864: \$? = $ac_status" >&5
438 if (exit $ac_status) && test -s out/conftest2.$ac_objext
439 then
440 # The compiler can only warn and ignore the option if not recognized
441@@ -12655,7 +12682,8 @@
442 cat conftest.err >&5
443 echo "$as_me:$LINENO: \$? = $ac_status" >&5
444 (exit $ac_status); } &&
445- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
446+ { ac_try='test -z "$ac_cxx_werror_flag"
447+ || test ! -s conftest.err'
448 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
449 (eval $ac_try) 2>&5
450 ac_status=$?
451@@ -12758,7 +12786,8 @@
452 cat conftest.err >&5
453 echo "$as_me:$LINENO: \$? = $ac_status" >&5
454 (exit $ac_status); } &&
455- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
456+ { ac_try='test -z "$ac_cxx_werror_flag"
457+ || test ! -s conftest.err'
458 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
459 (eval $ac_try) 2>&5
460 ac_status=$?
461@@ -12823,7 +12852,8 @@
462 cat conftest.err >&5
463 echo "$as_me:$LINENO: \$? = $ac_status" >&5
464 (exit $ac_status); } &&
465- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
466+ { ac_try='test -z "$ac_cxx_werror_flag"
467+ || test ! -s conftest.err'
468 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
469 (eval $ac_try) 2>&5
470 ac_status=$?
471@@ -12916,7 +12946,8 @@
472 cat conftest.err >&5
473 echo "$as_me:$LINENO: \$? = $ac_status" >&5
474 (exit $ac_status); } &&
475- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
476+ { ac_try='test -z "$ac_cxx_werror_flag"
477+ || test ! -s conftest.err'
478 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
479 (eval $ac_try) 2>&5
480 ac_status=$?
481@@ -12981,7 +13012,8 @@
482 cat conftest.err >&5
483 echo "$as_me:$LINENO: \$? = $ac_status" >&5
484 (exit $ac_status); } &&
485- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
486+ { ac_try='test -z "$ac_cxx_werror_flag"
487+ || test ! -s conftest.err'
488 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
489 (eval $ac_try) 2>&5
490 ac_status=$?
491@@ -13047,7 +13079,8 @@
492 cat conftest.err >&5
493 echo "$as_me:$LINENO: \$? = $ac_status" >&5
494 (exit $ac_status); } &&
495- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
496+ { ac_try='test -z "$ac_cxx_werror_flag"
497+ || test ! -s conftest.err'
498 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
499 (eval $ac_try) 2>&5
500 ac_status=$?
501@@ -13113,7 +13146,8 @@
502 cat conftest.err >&5
503 echo "$as_me:$LINENO: \$? = $ac_status" >&5
504 (exit $ac_status); } &&
505- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
506+ { ac_try='test -z "$ac_cxx_werror_flag"
507+ || test ! -s conftest.err'
508 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
509 (eval $ac_try) 2>&5
510 ac_status=$?
511@@ -13188,7 +13222,7 @@
512 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
513 lt_status=$lt_dlunknown
514 cat > conftest.$ac_ext <<EOF
515-#line 13191 "configure"
516+#line 13225 "configure"
517 #include "confdefs.h"
518
519 #if HAVE_DLFCN_H
520@@ -13286,7 +13320,7 @@
521 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
522 lt_status=$lt_dlunknown
523 cat > conftest.$ac_ext <<EOF
524-#line 13289 "configure"
525+#line 13323 "configure"
526 #include "confdefs.h"
527
528 #if HAVE_DLFCN_H
529@@ -14171,11 +14205,11 @@
530 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
531 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
532 -e 's:$: $lt_compiler_flag:'`
533- (eval echo "\"\$as_me:14174: $lt_compile\"" >&5)
534+ (eval echo "\"\$as_me:14208: $lt_compile\"" >&5)
535 (eval "$lt_compile" 2>conftest.err)
536 ac_status=$?
537 cat conftest.err >&5
538- echo "$as_me:14178: \$? = $ac_status" >&5
539+ echo "$as_me:14212: \$? = $ac_status" >&5
540 if (exit $ac_status) && test -s "$ac_outfile"; then
541 # The compiler can only warn and ignore the option if not recognized
542 # So say no if there are warnings other than the usual output.
543@@ -14233,11 +14267,11 @@
544 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
545 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
546 -e 's:$: $lt_compiler_flag:'`
547- (eval echo "\"\$as_me:14236: $lt_compile\"" >&5)
548+ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
549 (eval "$lt_compile" 2>out/conftest.err)
550 ac_status=$?
551 cat out/conftest.err >&5
552- echo "$as_me:14240: \$? = $ac_status" >&5
553+ echo "$as_me:14274: \$? = $ac_status" >&5
554 if (exit $ac_status) && test -s out/conftest2.$ac_objext
555 then
556 # The compiler can only warn and ignore the option if not recognized
557@@ -14650,7 +14684,8 @@
558 cat conftest.err >&5
559 echo "$as_me:$LINENO: \$? = $ac_status" >&5
560 (exit $ac_status); } &&
561- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
562+ { ac_try='test -z "$ac_f77_werror_flag"
563+ || test ! -s conftest.err'
564 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
565 (eval $ac_try) 2>&5
566 ac_status=$?
567@@ -14700,7 +14735,8 @@
568 cat conftest.err >&5
569 echo "$as_me:$LINENO: \$? = $ac_status" >&5
570 (exit $ac_status); } &&
571- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
572+ { ac_try='test -z "$ac_f77_werror_flag"
573+ || test ! -s conftest.err'
574 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
575 (eval $ac_try) 2>&5
576 ac_status=$?
577@@ -16352,11 +16388,11 @@
578 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
579 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
580 -e 's:$: $lt_compiler_flag:'`
581- (eval echo "\"\$as_me:16355: $lt_compile\"" >&5)
582+ (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
583 (eval "$lt_compile" 2>conftest.err)
584 ac_status=$?
585 cat conftest.err >&5
586- echo "$as_me:16359: \$? = $ac_status" >&5
587+ echo "$as_me:16395: \$? = $ac_status" >&5
588 if (exit $ac_status) && test -s "$ac_outfile"; then
589 # The compiler can only warn and ignore the option if not recognized
590 # So say no if there are warnings other than the usual output.
591@@ -16614,11 +16650,11 @@
592 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
593 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
594 -e 's:$: $lt_compiler_flag:'`
595- (eval echo "\"\$as_me:16617: $lt_compile\"" >&5)
596+ (eval echo "\"\$as_me:16653: $lt_compile\"" >&5)
597 (eval "$lt_compile" 2>conftest.err)
598 ac_status=$?
599 cat conftest.err >&5
600- echo "$as_me:16621: \$? = $ac_status" >&5
601+ echo "$as_me:16657: \$? = $ac_status" >&5
602 if (exit $ac_status) && test -s "$ac_outfile"; then
603 # The compiler can only warn and ignore the option if not recognized
604 # So say no if there are warnings other than the usual output.
605@@ -16676,11 +16712,11 @@
606 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
607 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
608 -e 's:$: $lt_compiler_flag:'`
609- (eval echo "\"\$as_me:16679: $lt_compile\"" >&5)
610+ (eval echo "\"\$as_me:16715: $lt_compile\"" >&5)
611 (eval "$lt_compile" 2>out/conftest.err)
612 ac_status=$?
613 cat out/conftest.err >&5
614- echo "$as_me:16683: \$? = $ac_status" >&5
615+ echo "$as_me:16719: \$? = $ac_status" >&5
616 if (exit $ac_status) && test -s out/conftest2.$ac_objext
617 then
618 # The compiler can only warn and ignore the option if not recognized
619@@ -17103,7 +17139,8 @@
620 cat conftest.err >&5
621 echo "$as_me:$LINENO: \$? = $ac_status" >&5
622 (exit $ac_status); } &&
623- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
624+ { ac_try='test -z "$ac_c_werror_flag"
625+ || test ! -s conftest.err'
626 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
627 (eval $ac_try) 2>&5
628 ac_status=$?
629@@ -17163,7 +17200,8 @@
630 cat conftest.err >&5
631 echo "$as_me:$LINENO: \$? = $ac_status" >&5
632 (exit $ac_status); } &&
633- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
634+ { ac_try='test -z "$ac_c_werror_flag"
635+ || test ! -s conftest.err'
636 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
637 (eval $ac_try) 2>&5
638 ac_status=$?
639@@ -18369,7 +18407,8 @@
640 cat conftest.err >&5
641 echo "$as_me:$LINENO: \$? = $ac_status" >&5
642 (exit $ac_status); } &&
643- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
644+ { ac_try='test -z "$ac_c_werror_flag"
645+ || test ! -s conftest.err'
646 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
647 (eval $ac_try) 2>&5
648 ac_status=$?
649@@ -18472,7 +18511,8 @@
650 cat conftest.err >&5
651 echo "$as_me:$LINENO: \$? = $ac_status" >&5
652 (exit $ac_status); } &&
653- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
654+ { ac_try='test -z "$ac_c_werror_flag"
655+ || test ! -s conftest.err'
656 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
657 (eval $ac_try) 2>&5
658 ac_status=$?
659@@ -18537,7 +18577,8 @@
660 cat conftest.err >&5
661 echo "$as_me:$LINENO: \$? = $ac_status" >&5
662 (exit $ac_status); } &&
663- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
664+ { ac_try='test -z "$ac_c_werror_flag"
665+ || test ! -s conftest.err'
666 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
667 (eval $ac_try) 2>&5
668 ac_status=$?
669@@ -18630,7 +18671,8 @@
670 cat conftest.err >&5
671 echo "$as_me:$LINENO: \$? = $ac_status" >&5
672 (exit $ac_status); } &&
673- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
674+ { ac_try='test -z "$ac_c_werror_flag"
675+ || test ! -s conftest.err'
676 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
677 (eval $ac_try) 2>&5
678 ac_status=$?
679@@ -18695,7 +18737,8 @@
680 cat conftest.err >&5
681 echo "$as_me:$LINENO: \$? = $ac_status" >&5
682 (exit $ac_status); } &&
683- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
684+ { ac_try='test -z "$ac_c_werror_flag"
685+ || test ! -s conftest.err'
686 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
687 (eval $ac_try) 2>&5
688 ac_status=$?
689@@ -18761,7 +18804,8 @@
690 cat conftest.err >&5
691 echo "$as_me:$LINENO: \$? = $ac_status" >&5
692 (exit $ac_status); } &&
693- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
694+ { ac_try='test -z "$ac_c_werror_flag"
695+ || test ! -s conftest.err'
696 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
697 (eval $ac_try) 2>&5
698 ac_status=$?
699@@ -18827,7 +18871,8 @@
700 cat conftest.err >&5
701 echo "$as_me:$LINENO: \$? = $ac_status" >&5
702 (exit $ac_status); } &&
703- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
704+ { ac_try='test -z "$ac_c_werror_flag"
705+ || test ! -s conftest.err'
706 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
707 (eval $ac_try) 2>&5
708 ac_status=$?
709@@ -18902,7 +18947,7 @@
710 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
711 lt_status=$lt_dlunknown
712 cat > conftest.$ac_ext <<EOF
713-#line 18905 "configure"
714+#line 18950 "configure"
715 #include "confdefs.h"
716
717 #if HAVE_DLFCN_H
718@@ -19000,7 +19045,7 @@
719 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
720 lt_status=$lt_dlunknown
721 cat > conftest.$ac_ext <<EOF
722-#line 19003 "configure"
723+#line 19048 "configure"
724 #include "confdefs.h"
725
726 #if HAVE_DLFCN_H
727@@ -21020,6 +21065,11 @@
728 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
729 esac
730
731+ if test x"$ac_file" != x-; then
732+ { echo "$as_me:$LINENO: creating $ac_file" >&5
733+echo "$as_me: creating $ac_file" >&6;}
734+ rm -f "$ac_file"
735+ fi
736 # Let's still pretend it is `configure' which instantiates (i.e., don't
737 # use $as_me), people would be surprised to read:
738 # /* config.h. Generated by config.status. */
739@@ -21058,12 +21108,6 @@
740 fi;;
741 esac
742 done` || { (exit 1); exit 1; }
743-
744- if test x"$ac_file" != x-; then
745- { echo "$as_me:$LINENO: creating $ac_file" >&5
746-echo "$as_me: creating $ac_file" >&6;}
747- rm -f "$ac_file"
748- fi
749 _ACEOF
750 cat >>$CONFIG_STATUS <<_ACEOF
751 sed "$ac_vpsub
752@@ -21498,7 +21542,7 @@
753 { (exit 1); exit 1; }; }
754 fi
755
756- cd "$ac_popdir"
757+ cd $ac_popdir
758 done
759 fi
760
761diff -uNr libtool-1.5.16/doc/Makefile.in libtool-1.5.16-patched/doc/Makefile.in
762--- libtool-1.5.16/doc/Makefile.in 2005-04-25 03:54:14.000000000 +1000
763+++ libtool-1.5.16-patched/doc/Makefile.in 2005-07-30 18:33:24.000000000 +1000
764@@ -1,4 +1,4 @@
765-# Makefile.in generated by automake 1.9.5 from Makefile.am.
766+# Makefile.in generated by automake 1.9.6 from Makefile.am.
767 # @configure_input@
768
769 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
770@@ -235,9 +235,11 @@
771 restore=: && backupdir="$(am__leading_dot)am$$$$" && \
772 am__cwd=`pwd` && cd $(srcdir) && \
773 rm -rf $$backupdir && mkdir $$backupdir && \
774- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
775- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
776- done; \
777+ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
778+ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
779+ if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
780+ done; \
781+ else :; fi && \
782 cd "$$am__cwd"; \
783 if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
784 -o $@ $<; \
785@@ -298,6 +300,7 @@
786 maintainer-clean-vti:
787 -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
788 .dvi.ps:
789+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
790 $(DVIPS) -o $@ $<
791
792 uninstall-info-am:
793diff -uNr libtool-1.5.16/libltdl/Makefile.in libtool-1.5.16-patched/libltdl/Makefile.in
794--- libtool-1.5.16/libltdl/Makefile.in 2005-04-25 03:54:48.000000000 +1000
795+++ libtool-1.5.16-patched/libltdl/Makefile.in 2005-07-30 18:33:52.000000000 +1000
796@@ -1,4 +1,4 @@
797-# Makefile.in generated by automake 1.9.5 from Makefile.am.
798+# Makefile.in generated by automake 1.9.6 from Makefile.am.
799 # @configure_input@
800
801 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
802@@ -15,8 +15,6 @@
803 @SET_MAKE@
804
805
806-SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
807-
808 srcdir = @srcdir@
809 top_srcdir = @top_srcdir@
810 VPATH = @srcdir@
811diff -uNr libtool-1.5.16/libltdl/acinclude.m4 libtool-1.5.16-patched/libltdl/acinclude.m4
812--- libtool-1.5.16/libltdl/acinclude.m4 2005-04-25 03:54:17.000000000 +1000
813+++ libtool-1.5.16-patched/libltdl/acinclude.m4 2005-07-30 18:23:39.000000000 +1000
814@@ -1521,6 +1521,26 @@
815 # people can always --disable-shared, the test was removed, and we
816 # assume the GNU/Linux dynamic linker is in use.
817 dynamic_linker='GNU/Linux ld.so'
818+
819+ # Find out which ABI we are using (multilib Linux x86_64 hack).
820+ libsuff=
821+ case "$host_cpu" in
822+ x86_64*)
823+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
824+ if AC_TRY_EVAL(ac_compile); then
825+ case `/usr/bin/file conftest.$ac_objext` in
826+ *64-bit*)
827+ libsuff=64
828+ ;;
829+ esac
830+ fi
831+ rm -rf conftest*
832+ ;;
833+ *)
834+ ;;
835+ esac
836+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
837+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
838 ;;
839
840 knetbsd*-gnu)
841diff -uNr libtool-1.5.16/libltdl/aclocal.m4 libtool-1.5.16-patched/libltdl/aclocal.m4
842--- libtool-1.5.16/libltdl/aclocal.m4 2005-04-25 03:54:28.000000000 +1000
843+++ libtool-1.5.16-patched/libltdl/aclocal.m4 2005-07-30 18:33:43.000000000 +1000
844@@ -1,4 +1,4 @@
845-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
846+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
847
848 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
849 # 2005 Free Software Foundation, Inc.
850@@ -28,7 +28,7 @@
851 # Call AM_AUTOMAKE_VERSION so it can be traced.
852 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
853 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
854- [AM_AUTOMAKE_VERSION([1.9.5])])
855+ [AM_AUTOMAKE_VERSION([1.9.6])])
856
857 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
858
859diff -uNr libtool-1.5.16/libltdl/configure libtool-1.5.16-patched/libltdl/configure
860--- libtool-1.5.16/libltdl/configure 2005-04-25 03:54:50.000000000 +1000
861+++ libtool-1.5.16-patched/libltdl/configure 2005-07-30 18:33:59.000000000 +1000
862@@ -875,13 +875,13 @@
863 /^X\(\/\).*/{ s//\1/; q; }
864 s/.*/./; q'`
865 srcdir=$ac_confdir
866- if test ! -r $srcdir/$ac_unique_file; then
867+ if test ! -r "$srcdir/$ac_unique_file"; then
868 srcdir=..
869 fi
870 else
871 ac_srcdir_defaulted=no
872 fi
873-if test ! -r $srcdir/$ac_unique_file; then
874+if test ! -r "$srcdir/$ac_unique_file"; then
875 if test "$ac_srcdir_defaulted" = yes; then
876 { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
877 { (exit 1); exit 1; }; }
878@@ -890,7 +890,7 @@
879 { (exit 1); exit 1; }; }
880 fi
881 fi
882-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
883+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
884 { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
885 { (exit 1); exit 1; }; }
886 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
887@@ -1153,7 +1153,7 @@
888 else
889 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
890 fi
891- cd "$ac_popdir"
892+ cd $ac_popdir
893 done
894 fi
895
896@@ -2541,7 +2541,8 @@
897 cat conftest.err >&5
898 echo "$as_me:$LINENO: \$? = $ac_status" >&5
899 (exit $ac_status); } &&
900- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
901+ { ac_try='test -z "$ac_c_werror_flag"
902+ || test ! -s conftest.err'
903 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
904 (eval $ac_try) 2>&5
905 ac_status=$?
906@@ -2599,7 +2600,8 @@
907 cat conftest.err >&5
908 echo "$as_me:$LINENO: \$? = $ac_status" >&5
909 (exit $ac_status); } &&
910- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
911+ { ac_try='test -z "$ac_c_werror_flag"
912+ || test ! -s conftest.err'
913 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
914 (eval $ac_try) 2>&5
915 ac_status=$?
916@@ -2715,7 +2717,8 @@
917 cat conftest.err >&5
918 echo "$as_me:$LINENO: \$? = $ac_status" >&5
919 (exit $ac_status); } &&
920- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
921+ { ac_try='test -z "$ac_c_werror_flag"
922+ || test ! -s conftest.err'
923 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
924 (eval $ac_try) 2>&5
925 ac_status=$?
926@@ -2769,7 +2772,8 @@
927 cat conftest.err >&5
928 echo "$as_me:$LINENO: \$? = $ac_status" >&5
929 (exit $ac_status); } &&
930- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
931+ { ac_try='test -z "$ac_c_werror_flag"
932+ || test ! -s conftest.err'
933 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
934 (eval $ac_try) 2>&5
935 ac_status=$?
936@@ -2814,7 +2818,8 @@
937 cat conftest.err >&5
938 echo "$as_me:$LINENO: \$? = $ac_status" >&5
939 (exit $ac_status); } &&
940- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
941+ { ac_try='test -z "$ac_c_werror_flag"
942+ || test ! -s conftest.err'
943 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
944 (eval $ac_try) 2>&5
945 ac_status=$?
946@@ -2858,7 +2863,8 @@
947 cat conftest.err >&5
948 echo "$as_me:$LINENO: \$? = $ac_status" >&5
949 (exit $ac_status); } &&
950- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
951+ { ac_try='test -z "$ac_c_werror_flag"
952+ || test ! -s conftest.err'
953 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
954 (eval $ac_try) 2>&5
955 ac_status=$?
956@@ -3147,7 +3153,8 @@
957 cat conftest.err >&5
958 echo "$as_me:$LINENO: \$? = $ac_status" >&5
959 (exit $ac_status); } &&
960- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
961+ { ac_try='test -z "$ac_c_werror_flag"
962+ || test ! -s conftest.err'
963 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
964 (eval $ac_try) 2>&5
965 ac_status=$?
966@@ -3207,7 +3214,8 @@
967 cat conftest.err >&5
968 echo "$as_me:$LINENO: \$? = $ac_status" >&5
969 (exit $ac_status); } &&
970- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
971+ { ac_try='test -z "$ac_c_werror_flag"
972+ || test ! -s conftest.err'
973 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
974 (eval $ac_try) 2>&5
975 ac_status=$?
976@@ -3860,7 +3868,7 @@
977 ;;
978 *-*-irix6*)
979 # Find out which ABI we are using.
980- echo '#line 3863 "configure"' > conftest.$ac_ext
981+ echo '#line 3871 "configure"' > conftest.$ac_ext
982 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
983 (eval $ac_compile) 2>&5
984 ac_status=$?
985@@ -3980,7 +3988,8 @@
986 cat conftest.err >&5
987 echo "$as_me:$LINENO: \$? = $ac_status" >&5
988 (exit $ac_status); } &&
989- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
990+ { ac_try='test -z "$ac_c_werror_flag"
991+ || test ! -s conftest.err'
992 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
993 (eval $ac_try) 2>&5
994 ac_status=$?
995@@ -4531,7 +4540,8 @@
996 cat conftest.err >&5
997 echo "$as_me:$LINENO: \$? = $ac_status" >&5
998 (exit $ac_status); } &&
999- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1000+ { ac_try='test -z "$ac_c_werror_flag"
1001+ || test ! -s conftest.err'
1002 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1003 (eval $ac_try) 2>&5
1004 ac_status=$?
1005@@ -4701,7 +4711,8 @@
1006 cat conftest.err >&5
1007 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1008 (exit $ac_status); } &&
1009- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1010+ { ac_try='test -z "$ac_c_werror_flag"
1011+ || test ! -s conftest.err'
1012 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1013 (eval $ac_try) 2>&5
1014 ac_status=$?
1015@@ -4768,7 +4779,8 @@
1016 cat conftest.err >&5
1017 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1018 (exit $ac_status); } &&
1019- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1020+ { ac_try='test -z "$ac_c_werror_flag"
1021+ || test ! -s conftest.err'
1022 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1023 (eval $ac_try) 2>&5
1024 ac_status=$?
1025@@ -5028,7 +5040,8 @@
1026 cat conftest.err >&5
1027 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1028 (exit $ac_status); } &&
1029- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1030+ { ac_try='test -z "$ac_cxx_werror_flag"
1031+ || test ! -s conftest.err'
1032 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1033 (eval $ac_try) 2>&5
1034 ac_status=$?
1035@@ -5086,7 +5099,8 @@
1036 cat conftest.err >&5
1037 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1038 (exit $ac_status); } &&
1039- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1040+ { ac_try='test -z "$ac_cxx_werror_flag"
1041+ || test ! -s conftest.err'
1042 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1043 (eval $ac_try) 2>&5
1044 ac_status=$?
1045@@ -5157,7 +5171,8 @@
1046 cat conftest.err >&5
1047 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1048 (exit $ac_status); } &&
1049- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1050+ { ac_try='test -z "$ac_cxx_werror_flag"
1051+ || test ! -s conftest.err'
1052 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1053 (eval $ac_try) 2>&5
1054 ac_status=$?
1055@@ -5201,7 +5216,8 @@
1056 cat conftest.err >&5
1057 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1058 (exit $ac_status); } &&
1059- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1060+ { ac_try='test -z "$ac_cxx_werror_flag"
1061+ || test ! -s conftest.err'
1062 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1063 (eval $ac_try) 2>&5
1064 ac_status=$?
1065@@ -5673,7 +5689,7 @@
1066
1067
1068 # Provide some information about the compiler.
1069-echo "$as_me:5676:" \
1070+echo "$as_me:5692:" \
1071 "checking for Fortran 77 compiler version" >&5
1072 ac_compiler=`set X $ac_compile; echo $2`
1073 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
1074@@ -5719,7 +5735,8 @@
1075 cat conftest.err >&5
1076 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1077 (exit $ac_status); } &&
1078- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
1079+ { ac_try='test -z "$ac_f77_werror_flag"
1080+ || test ! -s conftest.err'
1081 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1082 (eval $ac_try) 2>&5
1083 ac_status=$?
1084@@ -5768,7 +5785,8 @@
1085 cat conftest.err >&5
1086 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1087 (exit $ac_status); } &&
1088- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
1089+ { ac_try='test -z "$ac_f77_werror_flag"
1090+ || test ! -s conftest.err'
1091 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1092 (eval $ac_try) 2>&5
1093 ac_status=$?
1094@@ -6773,11 +6791,11 @@
1095 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1096 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1097 -e 's:$: $lt_compiler_flag:'`
1098- (eval echo "\"\$as_me:6776: $lt_compile\"" >&5)
1099+ (eval echo "\"\$as_me:6794: $lt_compile\"" >&5)
1100 (eval "$lt_compile" 2>conftest.err)
1101 ac_status=$?
1102 cat conftest.err >&5
1103- echo "$as_me:6780: \$? = $ac_status" >&5
1104+ echo "$as_me:6798: \$? = $ac_status" >&5
1105 if (exit $ac_status) && test -s "$ac_outfile"; then
1106 # The compiler can only warn and ignore the option if not recognized
1107 # So say no if there are warnings other than the usual output.
1108@@ -7035,11 +7053,11 @@
1109 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1110 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1111 -e 's:$: $lt_compiler_flag:'`
1112- (eval echo "\"\$as_me:7038: $lt_compile\"" >&5)
1113+ (eval echo "\"\$as_me:7056: $lt_compile\"" >&5)
1114 (eval "$lt_compile" 2>conftest.err)
1115 ac_status=$?
1116 cat conftest.err >&5
1117- echo "$as_me:7042: \$? = $ac_status" >&5
1118+ echo "$as_me:7060: \$? = $ac_status" >&5
1119 if (exit $ac_status) && test -s "$ac_outfile"; then
1120 # The compiler can only warn and ignore the option if not recognized
1121 # So say no if there are warnings other than the usual output.
1122@@ -7097,11 +7115,11 @@
1123 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1124 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1125 -e 's:$: $lt_compiler_flag:'`
1126- (eval echo "\"\$as_me:7100: $lt_compile\"" >&5)
1127+ (eval echo "\"\$as_me:7118: $lt_compile\"" >&5)
1128 (eval "$lt_compile" 2>out/conftest.err)
1129 ac_status=$?
1130 cat out/conftest.err >&5
1131- echo "$as_me:7104: \$? = $ac_status" >&5
1132+ echo "$as_me:7122: \$? = $ac_status" >&5
1133 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1134 then
1135 # The compiler can only warn and ignore the option if not recognized
1136@@ -7524,7 +7542,8 @@
1137 cat conftest.err >&5
1138 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1139 (exit $ac_status); } &&
1140- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1141+ { ac_try='test -z "$ac_c_werror_flag"
1142+ || test ! -s conftest.err'
1143 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1144 (eval $ac_try) 2>&5
1145 ac_status=$?
1146@@ -7584,7 +7603,8 @@
1147 cat conftest.err >&5
1148 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1149 (exit $ac_status); } &&
1150- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1151+ { ac_try='test -z "$ac_c_werror_flag"
1152+ || test ! -s conftest.err'
1153 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1154 (eval $ac_try) 2>&5
1155 ac_status=$?
1156@@ -8489,6 +8509,30 @@
1157 # people can always --disable-shared, the test was removed, and we
1158 # assume the GNU/Linux dynamic linker is in use.
1159 dynamic_linker='GNU/Linux ld.so'
1160+
1161+ # Find out which ABI we are using (multilib Linux x86_64 hack).
1162+ libsuff=
1163+ case "$host_cpu" in
1164+ x86_64*)
1165+ echo '#line 8517 "configure"' > conftest.$ac_ext
1166+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1167+ (eval $ac_compile) 2>&5
1168+ ac_status=$?
1169+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1170+ (exit $ac_status); }; then
1171+ case `/usr/bin/file conftest.$ac_objext` in
1172+ *64-bit*)
1173+ libsuff=64
1174+ ;;
1175+ esac
1176+ fi
1177+ rm -rf conftest*
1178+ ;;
1179+ *)
1180+ ;;
1181+ esac
1182+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
1183+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
1184 ;;
1185
1186 knetbsd*-gnu)
1187@@ -8790,7 +8834,8 @@
1188 cat conftest.err >&5
1189 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1190 (exit $ac_status); } &&
1191- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1192+ { ac_try='test -z "$ac_c_werror_flag"
1193+ || test ! -s conftest.err'
1194 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1195 (eval $ac_try) 2>&5
1196 ac_status=$?
1197@@ -8893,7 +8938,8 @@
1198 cat conftest.err >&5
1199 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1200 (exit $ac_status); } &&
1201- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1202+ { ac_try='test -z "$ac_c_werror_flag"
1203+ || test ! -s conftest.err'
1204 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1205 (eval $ac_try) 2>&5
1206 ac_status=$?
1207@@ -8958,7 +9004,8 @@
1208 cat conftest.err >&5
1209 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1210 (exit $ac_status); } &&
1211- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1212+ { ac_try='test -z "$ac_c_werror_flag"
1213+ || test ! -s conftest.err'
1214 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1215 (eval $ac_try) 2>&5
1216 ac_status=$?
1217@@ -9051,7 +9098,8 @@
1218 cat conftest.err >&5
1219 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1220 (exit $ac_status); } &&
1221- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1222+ { ac_try='test -z "$ac_c_werror_flag"
1223+ || test ! -s conftest.err'
1224 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1225 (eval $ac_try) 2>&5
1226 ac_status=$?
1227@@ -9116,7 +9164,8 @@
1228 cat conftest.err >&5
1229 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1230 (exit $ac_status); } &&
1231- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1232+ { ac_try='test -z "$ac_c_werror_flag"
1233+ || test ! -s conftest.err'
1234 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1235 (eval $ac_try) 2>&5
1236 ac_status=$?
1237@@ -9182,7 +9231,8 @@
1238 cat conftest.err >&5
1239 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1240 (exit $ac_status); } &&
1241- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1242+ { ac_try='test -z "$ac_c_werror_flag"
1243+ || test ! -s conftest.err'
1244 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1245 (eval $ac_try) 2>&5
1246 ac_status=$?
1247@@ -9248,7 +9298,8 @@
1248 cat conftest.err >&5
1249 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1250 (exit $ac_status); } &&
1251- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1252+ { ac_try='test -z "$ac_c_werror_flag"
1253+ || test ! -s conftest.err'
1254 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1255 (eval $ac_try) 2>&5
1256 ac_status=$?
1257@@ -9323,7 +9374,7 @@
1258 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1259 lt_status=$lt_dlunknown
1260 cat > conftest.$ac_ext <<EOF
1261-#line 9326 "configure"
1262+#line 9377 "configure"
1263 #include "confdefs.h"
1264
1265 #if HAVE_DLFCN_H
1266@@ -9421,7 +9472,7 @@
1267 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1268 lt_status=$lt_dlunknown
1269 cat > conftest.$ac_ext <<EOF
1270-#line 9424 "configure"
1271+#line 9475 "configure"
1272 #include "confdefs.h"
1273
1274 #if HAVE_DLFCN_H
1275@@ -10490,7 +10541,8 @@
1276 cat conftest.err >&5
1277 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1278 (exit $ac_status); } &&
1279- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1280+ { ac_try='test -z "$ac_cxx_werror_flag"
1281+ || test ! -s conftest.err'
1282 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1283 (eval $ac_try) 2>&5
1284 ac_status=$?
1285@@ -10551,7 +10603,8 @@
1286 cat conftest.err >&5
1287 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1288 (exit $ac_status); } &&
1289- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1290+ { ac_try='test -z "$ac_cxx_werror_flag"
1291+ || test ! -s conftest.err'
1292 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1293 (eval $ac_try) 2>&5
1294 ac_status=$?
1295@@ -11671,11 +11724,11 @@
1296 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1297 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1298 -e 's:$: $lt_compiler_flag:'`
1299- (eval echo "\"\$as_me:11674: $lt_compile\"" >&5)
1300+ (eval echo "\"\$as_me:11727: $lt_compile\"" >&5)
1301 (eval "$lt_compile" 2>conftest.err)
1302 ac_status=$?
1303 cat conftest.err >&5
1304- echo "$as_me:11678: \$? = $ac_status" >&5
1305+ echo "$as_me:11731: \$? = $ac_status" >&5
1306 if (exit $ac_status) && test -s "$ac_outfile"; then
1307 # The compiler can only warn and ignore the option if not recognized
1308 # So say no if there are warnings other than the usual output.
1309@@ -11733,11 +11786,11 @@
1310 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1311 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1312 -e 's:$: $lt_compiler_flag:'`
1313- (eval echo "\"\$as_me:11736: $lt_compile\"" >&5)
1314+ (eval echo "\"\$as_me:11789: $lt_compile\"" >&5)
1315 (eval "$lt_compile" 2>out/conftest.err)
1316 ac_status=$?
1317 cat out/conftest.err >&5
1318- echo "$as_me:11740: \$? = $ac_status" >&5
1319+ echo "$as_me:11793: \$? = $ac_status" >&5
1320 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1321 then
1322 # The compiler can only warn and ignore the option if not recognized
1323@@ -12257,6 +12310,30 @@
1324 # people can always --disable-shared, the test was removed, and we
1325 # assume the GNU/Linux dynamic linker is in use.
1326 dynamic_linker='GNU/Linux ld.so'
1327+
1328+ # Find out which ABI we are using (multilib Linux x86_64 hack).
1329+ libsuff=
1330+ case "$host_cpu" in
1331+ x86_64*)
1332+ echo '#line 12318 "configure"' > conftest.$ac_ext
1333+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1334+ (eval $ac_compile) 2>&5
1335+ ac_status=$?
1336+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1337+ (exit $ac_status); }; then
1338+ case `/usr/bin/file conftest.$ac_objext` in
1339+ *64-bit*)
1340+ libsuff=64
1341+ ;;
1342+ esac
1343+ fi
1344+ rm -rf conftest*
1345+ ;;
1346+ *)
1347+ ;;
1348+ esac
1349+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
1350+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
1351 ;;
1352
1353 knetbsd*-gnu)
1354@@ -12558,7 +12635,8 @@
1355 cat conftest.err >&5
1356 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1357 (exit $ac_status); } &&
1358- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1359+ { ac_try='test -z "$ac_cxx_werror_flag"
1360+ || test ! -s conftest.err'
1361 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1362 (eval $ac_try) 2>&5
1363 ac_status=$?
1364@@ -12661,7 +12739,8 @@
1365 cat conftest.err >&5
1366 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1367 (exit $ac_status); } &&
1368- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1369+ { ac_try='test -z "$ac_cxx_werror_flag"
1370+ || test ! -s conftest.err'
1371 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1372 (eval $ac_try) 2>&5
1373 ac_status=$?
1374@@ -12726,7 +12805,8 @@
1375 cat conftest.err >&5
1376 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1377 (exit $ac_status); } &&
1378- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1379+ { ac_try='test -z "$ac_cxx_werror_flag"
1380+ || test ! -s conftest.err'
1381 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1382 (eval $ac_try) 2>&5
1383 ac_status=$?
1384@@ -12819,7 +12899,8 @@
1385 cat conftest.err >&5
1386 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1387 (exit $ac_status); } &&
1388- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1389+ { ac_try='test -z "$ac_cxx_werror_flag"
1390+ || test ! -s conftest.err'
1391 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1392 (eval $ac_try) 2>&5
1393 ac_status=$?
1394@@ -12884,7 +12965,8 @@
1395 cat conftest.err >&5
1396 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1397 (exit $ac_status); } &&
1398- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1399+ { ac_try='test -z "$ac_cxx_werror_flag"
1400+ || test ! -s conftest.err'
1401 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1402 (eval $ac_try) 2>&5
1403 ac_status=$?
1404@@ -12950,7 +13032,8 @@
1405 cat conftest.err >&5
1406 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1407 (exit $ac_status); } &&
1408- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1409+ { ac_try='test -z "$ac_cxx_werror_flag"
1410+ || test ! -s conftest.err'
1411 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1412 (eval $ac_try) 2>&5
1413 ac_status=$?
1414@@ -13016,7 +13099,8 @@
1415 cat conftest.err >&5
1416 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1417 (exit $ac_status); } &&
1418- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
1419+ { ac_try='test -z "$ac_cxx_werror_flag"
1420+ || test ! -s conftest.err'
1421 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1422 (eval $ac_try) 2>&5
1423 ac_status=$?
1424@@ -13091,7 +13175,7 @@
1425 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1426 lt_status=$lt_dlunknown
1427 cat > conftest.$ac_ext <<EOF
1428-#line 13094 "configure"
1429+#line 13178 "configure"
1430 #include "confdefs.h"
1431
1432 #if HAVE_DLFCN_H
1433@@ -13189,7 +13273,7 @@
1434 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1435 lt_status=$lt_dlunknown
1436 cat > conftest.$ac_ext <<EOF
1437-#line 13192 "configure"
1438+#line 13276 "configure"
1439 #include "confdefs.h"
1440
1441 #if HAVE_DLFCN_H
1442@@ -14074,11 +14158,11 @@
1443 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1444 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1445 -e 's:$: $lt_compiler_flag:'`
1446- (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
1447+ (eval echo "\"\$as_me:14161: $lt_compile\"" >&5)
1448 (eval "$lt_compile" 2>conftest.err)
1449 ac_status=$?
1450 cat conftest.err >&5
1451- echo "$as_me:14081: \$? = $ac_status" >&5
1452+ echo "$as_me:14165: \$? = $ac_status" >&5
1453 if (exit $ac_status) && test -s "$ac_outfile"; then
1454 # The compiler can only warn and ignore the option if not recognized
1455 # So say no if there are warnings other than the usual output.
1456@@ -14136,11 +14220,11 @@
1457 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1458 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1459 -e 's:$: $lt_compiler_flag:'`
1460- (eval echo "\"\$as_me:14139: $lt_compile\"" >&5)
1461+ (eval echo "\"\$as_me:14223: $lt_compile\"" >&5)
1462 (eval "$lt_compile" 2>out/conftest.err)
1463 ac_status=$?
1464 cat out/conftest.err >&5
1465- echo "$as_me:14143: \$? = $ac_status" >&5
1466+ echo "$as_me:14227: \$? = $ac_status" >&5
1467 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1468 then
1469 # The compiler can only warn and ignore the option if not recognized
1470@@ -14553,7 +14637,8 @@
1471 cat conftest.err >&5
1472 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1473 (exit $ac_status); } &&
1474- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
1475+ { ac_try='test -z "$ac_f77_werror_flag"
1476+ || test ! -s conftest.err'
1477 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1478 (eval $ac_try) 2>&5
1479 ac_status=$?
1480@@ -14603,7 +14688,8 @@
1481 cat conftest.err >&5
1482 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1483 (exit $ac_status); } &&
1484- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
1485+ { ac_try='test -z "$ac_f77_werror_flag"
1486+ || test ! -s conftest.err'
1487 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1488 (eval $ac_try) 2>&5
1489 ac_status=$?
1490@@ -15508,6 +15594,30 @@
1491 # people can always --disable-shared, the test was removed, and we
1492 # assume the GNU/Linux dynamic linker is in use.
1493 dynamic_linker='GNU/Linux ld.so'
1494+
1495+ # Find out which ABI we are using (multilib Linux x86_64 hack).
1496+ libsuff=
1497+ case "$host_cpu" in
1498+ x86_64*)
1499+ echo '#line 15602 "configure"' > conftest.$ac_ext
1500+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1501+ (eval $ac_compile) 2>&5
1502+ ac_status=$?
1503+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1504+ (exit $ac_status); }; then
1505+ case `/usr/bin/file conftest.$ac_objext` in
1506+ *64-bit*)
1507+ libsuff=64
1508+ ;;
1509+ esac
1510+ fi
1511+ rm -rf conftest*
1512+ ;;
1513+ *)
1514+ ;;
1515+ esac
1516+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
1517+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
1518 ;;
1519
1520 knetbsd*-gnu)
1521@@ -16255,11 +16365,11 @@
1522 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1523 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1524 -e 's:$: $lt_compiler_flag:'`
1525- (eval echo "\"\$as_me:16258: $lt_compile\"" >&5)
1526+ (eval echo "\"\$as_me:16368: $lt_compile\"" >&5)
1527 (eval "$lt_compile" 2>conftest.err)
1528 ac_status=$?
1529 cat conftest.err >&5
1530- echo "$as_me:16262: \$? = $ac_status" >&5
1531+ echo "$as_me:16372: \$? = $ac_status" >&5
1532 if (exit $ac_status) && test -s "$ac_outfile"; then
1533 # The compiler can only warn and ignore the option if not recognized
1534 # So say no if there are warnings other than the usual output.
1535@@ -16517,11 +16627,11 @@
1536 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1537 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1538 -e 's:$: $lt_compiler_flag:'`
1539- (eval echo "\"\$as_me:16520: $lt_compile\"" >&5)
1540+ (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
1541 (eval "$lt_compile" 2>conftest.err)
1542 ac_status=$?
1543 cat conftest.err >&5
1544- echo "$as_me:16524: \$? = $ac_status" >&5
1545+ echo "$as_me:16634: \$? = $ac_status" >&5
1546 if (exit $ac_status) && test -s "$ac_outfile"; then
1547 # The compiler can only warn and ignore the option if not recognized
1548 # So say no if there are warnings other than the usual output.
1549@@ -16579,11 +16689,11 @@
1550 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1551 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1552 -e 's:$: $lt_compiler_flag:'`
1553- (eval echo "\"\$as_me:16582: $lt_compile\"" >&5)
1554+ (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
1555 (eval "$lt_compile" 2>out/conftest.err)
1556 ac_status=$?
1557 cat out/conftest.err >&5
1558- echo "$as_me:16586: \$? = $ac_status" >&5
1559+ echo "$as_me:16696: \$? = $ac_status" >&5
1560 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1561 then
1562 # The compiler can only warn and ignore the option if not recognized
1563@@ -17006,7 +17116,8 @@
1564 cat conftest.err >&5
1565 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1566 (exit $ac_status); } &&
1567- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1568+ { ac_try='test -z "$ac_c_werror_flag"
1569+ || test ! -s conftest.err'
1570 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1571 (eval $ac_try) 2>&5
1572 ac_status=$?
1573@@ -17066,7 +17177,8 @@
1574 cat conftest.err >&5
1575 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1576 (exit $ac_status); } &&
1577- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1578+ { ac_try='test -z "$ac_c_werror_flag"
1579+ || test ! -s conftest.err'
1580 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1581 (eval $ac_try) 2>&5
1582 ac_status=$?
1583@@ -17971,6 +18083,30 @@
1584 # people can always --disable-shared, the test was removed, and we
1585 # assume the GNU/Linux dynamic linker is in use.
1586 dynamic_linker='GNU/Linux ld.so'
1587+
1588+ # Find out which ABI we are using (multilib Linux x86_64 hack).
1589+ libsuff=
1590+ case "$host_cpu" in
1591+ x86_64*)
1592+ echo '#line 18091 "configure"' > conftest.$ac_ext
1593+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1594+ (eval $ac_compile) 2>&5
1595+ ac_status=$?
1596+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1597+ (exit $ac_status); }; then
1598+ case `/usr/bin/file conftest.$ac_objext` in
1599+ *64-bit*)
1600+ libsuff=64
1601+ ;;
1602+ esac
1603+ fi
1604+ rm -rf conftest*
1605+ ;;
1606+ *)
1607+ ;;
1608+ esac
1609+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
1610+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
1611 ;;
1612
1613 knetbsd*-gnu)
1614@@ -18272,7 +18408,8 @@
1615 cat conftest.err >&5
1616 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1617 (exit $ac_status); } &&
1618- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1619+ { ac_try='test -z "$ac_c_werror_flag"
1620+ || test ! -s conftest.err'
1621 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1622 (eval $ac_try) 2>&5
1623 ac_status=$?
1624@@ -18375,7 +18512,8 @@
1625 cat conftest.err >&5
1626 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1627 (exit $ac_status); } &&
1628- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1629+ { ac_try='test -z "$ac_c_werror_flag"
1630+ || test ! -s conftest.err'
1631 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1632 (eval $ac_try) 2>&5
1633 ac_status=$?
1634@@ -18440,7 +18578,8 @@
1635 cat conftest.err >&5
1636 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1637 (exit $ac_status); } &&
1638- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1639+ { ac_try='test -z "$ac_c_werror_flag"
1640+ || test ! -s conftest.err'
1641 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1642 (eval $ac_try) 2>&5
1643 ac_status=$?
1644@@ -18533,7 +18672,8 @@
1645 cat conftest.err >&5
1646 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1647 (exit $ac_status); } &&
1648- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1649+ { ac_try='test -z "$ac_c_werror_flag"
1650+ || test ! -s conftest.err'
1651 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1652 (eval $ac_try) 2>&5
1653 ac_status=$?
1654@@ -18598,7 +18738,8 @@
1655 cat conftest.err >&5
1656 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1657 (exit $ac_status); } &&
1658- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1659+ { ac_try='test -z "$ac_c_werror_flag"
1660+ || test ! -s conftest.err'
1661 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1662 (eval $ac_try) 2>&5
1663 ac_status=$?
1664@@ -18664,7 +18805,8 @@
1665 cat conftest.err >&5
1666 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1667 (exit $ac_status); } &&
1668- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1669+ { ac_try='test -z "$ac_c_werror_flag"
1670+ || test ! -s conftest.err'
1671 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1672 (eval $ac_try) 2>&5
1673 ac_status=$?
1674@@ -18730,7 +18872,8 @@
1675 cat conftest.err >&5
1676 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1677 (exit $ac_status); } &&
1678- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1679+ { ac_try='test -z "$ac_c_werror_flag"
1680+ || test ! -s conftest.err'
1681 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1682 (eval $ac_try) 2>&5
1683 ac_status=$?
1684@@ -18805,7 +18948,7 @@
1685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1686 lt_status=$lt_dlunknown
1687 cat > conftest.$ac_ext <<EOF
1688-#line 18808 "configure"
1689+#line 18951 "configure"
1690 #include "confdefs.h"
1691
1692 #if HAVE_DLFCN_H
1693@@ -18903,7 +19046,7 @@
1694 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1695 lt_status=$lt_dlunknown
1696 cat > conftest.$ac_ext <<EOF
1697-#line 18906 "configure"
1698+#line 19049 "configure"
1699 #include "confdefs.h"
1700
1701 #if HAVE_DLFCN_H
1702@@ -19995,7 +20138,8 @@
1703 cat conftest.err >&5
1704 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1705 (exit $ac_status); } &&
1706- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1707+ { ac_try='test -z "$ac_c_werror_flag"
1708+ || test ! -s conftest.err'
1709 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1710 (eval $ac_try) 2>&5
1711 ac_status=$?
1712@@ -20067,7 +20211,8 @@
1713 cat conftest.err >&5
1714 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1715 (exit $ac_status); } &&
1716- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1717+ { ac_try='test -z "$ac_c_werror_flag"
1718+ || test ! -s conftest.err'
1719 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1720 (eval $ac_try) 2>&5
1721 ac_status=$?
1722@@ -20121,7 +20266,8 @@
1723 cat conftest.err >&5
1724 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1725 (exit $ac_status); } &&
1726- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1727+ { ac_try='test -z "$ac_c_werror_flag"
1728+ || test ! -s conftest.err'
1729 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1730 (eval $ac_try) 2>&5
1731 ac_status=$?
1732@@ -20192,7 +20338,8 @@
1733 cat conftest.err >&5
1734 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1735 (exit $ac_status); } &&
1736- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1737+ { ac_try='test -z "$ac_c_werror_flag"
1738+ || test ! -s conftest.err'
1739 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1740 (eval $ac_try) 2>&5
1741 ac_status=$?
1742@@ -20246,7 +20393,8 @@
1743 cat conftest.err >&5
1744 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1745 (exit $ac_status); } &&
1746- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1747+ { ac_try='test -z "$ac_c_werror_flag"
1748+ || test ! -s conftest.err'
1749 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1750 (eval $ac_try) 2>&5
1751 ac_status=$?
1752@@ -20498,7 +20646,8 @@
1753 cat conftest.err >&5
1754 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1755 (exit $ac_status); } &&
1756- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1757+ { ac_try='test -z "$ac_c_werror_flag"
1758+ || test ! -s conftest.err'
1759 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1760 (eval $ac_try) 2>&5
1761 ac_status=$?
1762@@ -20567,7 +20716,8 @@
1763 cat conftest.err >&5
1764 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1765 (exit $ac_status); } &&
1766- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1767+ { ac_try='test -z "$ac_c_werror_flag"
1768+ || test ! -s conftest.err'
1769 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1770 (eval $ac_try) 2>&5
1771 ac_status=$?
1772@@ -20638,7 +20788,8 @@
1773 cat conftest.err >&5
1774 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1775 (exit $ac_status); } &&
1776- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1777+ { ac_try='test -z "$ac_c_werror_flag"
1778+ || test ! -s conftest.err'
1779 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1780 (eval $ac_try) 2>&5
1781 ac_status=$?
1782@@ -20698,7 +20849,8 @@
1783 cat conftest.err >&5
1784 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1785 (exit $ac_status); } &&
1786- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1787+ { ac_try='test -z "$ac_c_werror_flag"
1788+ || test ! -s conftest.err'
1789 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1790 (eval $ac_try) 2>&5
1791 ac_status=$?
1792@@ -20757,7 +20909,8 @@
1793 cat conftest.err >&5
1794 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1795 (exit $ac_status); } &&
1796- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1797+ { ac_try='test -z "$ac_c_werror_flag"
1798+ || test ! -s conftest.err'
1799 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1800 (eval $ac_try) 2>&5
1801 ac_status=$?
1802@@ -20828,7 +20981,8 @@
1803 cat conftest.err >&5
1804 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1805 (exit $ac_status); } &&
1806- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1807+ { ac_try='test -z "$ac_c_werror_flag"
1808+ || test ! -s conftest.err'
1809 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1810 (eval $ac_try) 2>&5
1811 ac_status=$?
1812@@ -20926,7 +21080,8 @@
1813 cat conftest.err >&5
1814 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1815 (exit $ac_status); } &&
1816- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1817+ { ac_try='test -z "$ac_c_werror_flag"
1818+ || test ! -s conftest.err'
1819 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1820 (eval $ac_try) 2>&5
1821 ac_status=$?
1822@@ -21051,7 +21206,8 @@
1823 cat conftest.err >&5
1824 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1825 (exit $ac_status); } &&
1826- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1827+ { ac_try='test -z "$ac_c_werror_flag"
1828+ || test ! -s conftest.err'
1829 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1830 (eval $ac_try) 2>&5
1831 ac_status=$?
1832@@ -21156,7 +21312,7 @@
1833 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1834 lt_status=$lt_dlunknown
1835 cat > conftest.$ac_ext <<EOF
1836-#line 21159 "configure"
1837+#line 21315 "configure"
1838 #include "confdefs.h"
1839
1840 #if HAVE_DLFCN_H
1841@@ -21372,7 +21528,8 @@
1842 cat conftest.err >&5
1843 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1844 (exit $ac_status); } &&
1845- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1846+ { ac_try='test -z "$ac_c_werror_flag"
1847+ || test ! -s conftest.err'
1848 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1849 (eval $ac_try) 2>&5
1850 ac_status=$?
1851@@ -21523,7 +21680,8 @@
1852 cat conftest.err >&5
1853 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1854 (exit $ac_status); } &&
1855- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1856+ { ac_try='test -z "$ac_c_werror_flag"
1857+ || test ! -s conftest.err'
1858 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1859 (eval $ac_try) 2>&5
1860 ac_status=$?
1861@@ -21635,7 +21793,8 @@
1862 cat conftest.err >&5
1863 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1864 (exit $ac_status); } &&
1865- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1866+ { ac_try='test -z "$ac_c_werror_flag"
1867+ || test ! -s conftest.err'
1868 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1869 (eval $ac_try) 2>&5
1870 ac_status=$?
1871@@ -21728,7 +21887,8 @@
1872 cat conftest.err >&5
1873 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1874 (exit $ac_status); } &&
1875- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1876+ { ac_try='test -z "$ac_c_werror_flag"
1877+ || test ! -s conftest.err'
1878 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1879 (eval $ac_try) 2>&5
1880 ac_status=$?
1881@@ -21880,7 +22040,8 @@
1882 cat conftest.err >&5
1883 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1884 (exit $ac_status); } &&
1885- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1886+ { ac_try='test -z "$ac_c_werror_flag"
1887+ || test ! -s conftest.err'
1888 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1889 (eval $ac_try) 2>&5
1890 ac_status=$?
1891@@ -22030,7 +22191,8 @@
1892 cat conftest.err >&5
1893 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1894 (exit $ac_status); } &&
1895- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1896+ { ac_try='test -z "$ac_c_werror_flag"
1897+ || test ! -s conftest.err'
1898 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1899 (eval $ac_try) 2>&5
1900 ac_status=$?
1901@@ -22216,7 +22378,8 @@
1902 cat conftest.err >&5
1903 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1904 (exit $ac_status); } &&
1905- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1906+ { ac_try='test -z "$ac_c_werror_flag"
1907+ || test ! -s conftest.err'
1908 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1909 (eval $ac_try) 2>&5
1910 ac_status=$?
1911@@ -22318,7 +22481,8 @@
1912 cat conftest.err >&5
1913 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1914 (exit $ac_status); } &&
1915- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1916+ { ac_try='test -z "$ac_c_werror_flag"
1917+ || test ! -s conftest.err'
1918 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1919 (eval $ac_try) 2>&5
1920 ac_status=$?
1921@@ -22420,7 +22584,8 @@
1922 cat conftest.err >&5
1923 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1924 (exit $ac_status); } &&
1925- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1926+ { ac_try='test -z "$ac_c_werror_flag"
1927+ || test ! -s conftest.err'
1928 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1929 (eval $ac_try) 2>&5
1930 ac_status=$?
1931@@ -22522,7 +22687,8 @@
1932 cat conftest.err >&5
1933 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1934 (exit $ac_status); } &&
1935- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1936+ { ac_try='test -z "$ac_c_werror_flag"
1937+ || test ! -s conftest.err'
1938 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1939 (eval $ac_try) 2>&5
1940 ac_status=$?
1941@@ -22625,7 +22791,8 @@
1942 cat conftest.err >&5
1943 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1944 (exit $ac_status); } &&
1945- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1946+ { ac_try='test -z "$ac_c_werror_flag"
1947+ || test ! -s conftest.err'
1948 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1949 (eval $ac_try) 2>&5
1950 ac_status=$?
1951@@ -23568,6 +23735,11 @@
1952 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
1953 esac
1954
1955+ if test x"$ac_file" != x-; then
1956+ { echo "$as_me:$LINENO: creating $ac_file" >&5
1957+echo "$as_me: creating $ac_file" >&6;}
1958+ rm -f "$ac_file"
1959+ fi
1960 # Let's still pretend it is `configure' which instantiates (i.e., don't
1961 # use $as_me), people would be surprised to read:
1962 # /* config.h. Generated by config.status. */
1963@@ -23606,12 +23778,6 @@
1964 fi;;
1965 esac
1966 done` || { (exit 1); exit 1; }
1967-
1968- if test x"$ac_file" != x-; then
1969- { echo "$as_me:$LINENO: creating $ac_file" >&5
1970-echo "$as_me: creating $ac_file" >&6;}
1971- rm -f "$ac_file"
1972- fi
1973 _ACEOF
1974 cat >>$CONFIG_STATUS <<_ACEOF
1975 sed "$ac_vpsub
1976diff -uNr libtool-1.5.16/libtool.m4 libtool-1.5.16-patched/libtool.m4
1977--- libtool-1.5.16/libtool.m4 2005-04-25 03:23:35.000000000 +1000
1978+++ libtool-1.5.16-patched/libtool.m4 2005-07-30 18:24:50.000000000 +1000
1979@@ -561,6 +561,20 @@
1980 rm -rf conftest*
1981 ;;
1982
1983+*-*-linux*)
1984+ # Test if the compiler is 64bit
1985+ echo 'int i;' > conftest.$ac_ext
1986+ lt_cv_cc_64bit_output=no
1987+ if AC_TRY_EVAL(ac_compile); then
1988+ case `/usr/bin/file conftest.$ac_objext` in
1989+ *"ELF 64"*)
1990+ lt_cv_cc_64bit_output=yes
1991+ ;;
1992+ esac
1993+ fi
1994+ rm -rf conftest*
1995+ ;;
1996+
1997 *-*-sco3.2v5*)
1998 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
1999 SAVE_CFLAGS="$CFLAGS"
2000@@ -1310,6 +1324,30 @@
2001 esac
2002 ;;
2003
2004+ linux*)
2005+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
2006+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2007+ supports_anon_versioning=no
2008+ case `$LD -v 2>/dev/null` in
2009+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
2010+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
2011+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
2012+ *\ 2.11.*) ;; # other 2.11 versions
2013+ *) supports_anon_versioning=yes ;;
2014+ esac
2015+ if test $supports_anon_versioning = yes; then
2016+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
2017+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2018+$echo "local: *; };" >> $output_objdir/$libname.ver~
2019+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
2020+ else
2021+ $archive_expsym_cmds="$archive_cmds"
2022+ fi
2023+ else
2024+ ld_shlibs=no
2025+ fi
2026+ ;;
2027+
2028 *)
2029 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
2030 ;;
2031@@ -1514,6 +1552,13 @@
2032 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2033 fi
2034
2035+ case $host_cpu:$lt_cv_cc_64bit_output in
2036+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
2037+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
2038+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
2039+ ;;
2040+ esac
2041+
2042 # We used to test for /lib/ld.so.1 and disable shared libraries on
2043 # powerpc, because MkLinux only supported shared libraries with the
2044 # GNU dynamic linker. Since this was broken with cross compilers,
2045@@ -1521,6 +1566,26 @@
2046 # people can always --disable-shared, the test was removed, and we
2047 # assume the GNU/Linux dynamic linker is in use.
2048 dynamic_linker='GNU/Linux ld.so'
2049+
2050+ # Find out which ABI we are using (multilib Linux x86_64 hack).
2051+ libsuff=
2052+ case "$host_cpu" in
2053+ x86_64*)
2054+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
2055+ if AC_TRY_EVAL(ac_compile); then
2056+ case `/usr/bin/file conftest.$ac_objext` in
2057+ *64-bit*)
2058+ libsuff=64
2059+ ;;
2060+ esac
2061+ fi
2062+ rm -rf conftest*
2063+ ;;
2064+ *)
2065+ ;;
2066+ esac
2067+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
2068+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
2069 ;;
2070
2071 knetbsd*-gnu)
2072diff -uNr libtool-1.5.16/ltmain.in libtool-1.5.16-patched/ltmain.in
2073--- libtool-1.5.16/ltmain.in 2005-04-23 15:39:19.000000000 +1000
2074+++ libtool-1.5.16-patched/ltmain.in 2005-07-30 18:26:18.000000000 +1000
2075@@ -33,6 +33,9 @@
2076 # function.
2077 progpath="$0"
2078
2079+# define SED for historic ltconfig's generated by Libtool 1.3
2080+test -z "$SED" && SED=sed
2081+
2082 # The name of this program:
2083 progname=`echo "$progpath" | $SED $basename`
2084 modename="$progname"
2085@@ -51,6 +54,13 @@
2086 if test -n "${ZSH_VERSION+set}" ; then
2087 setopt NO_GLOB_SUBST
2088 fi
2089+# Same for EGREP, and just to be sure, do LTCC as well
2090+if test "X$EGREP" = X ; then
2091+ EGREP=egrep
2092+fi
2093+if test "X$LTCC" = X ; then
2094+ LTCC=${CC-gcc}
2095+fi
2096
2097 # Check that we have a working $echo.
2098 if test "X$1" = X--no-reexec; then
2099@@ -135,6 +145,30 @@
2100 o2lo="s/\\.${objext}\$/.lo/"
2101 quote_scanset='[[~#^*{};<>?'"'"' ]'
2102
2103+if test -z "$max_cmd_len"; then
2104+ i=0
2105+ testring="ABCD"
2106+ new_result=
2107+
2108+ # If test is not a shell built-in, we'll probably end up computing a
2109+ # maximum length that is only half of the actual maximum length, but
2110+ # we can't tell.
2111+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
2112+ = "XX$testring") >/dev/null 2>&1 &&
2113+ new_result=`expr "X$testring" : ".*" 2>&1` &&
2114+ max_cmd_len="$new_result" &&
2115+ test "$i" != 17 # 1/2 MB should be enough
2116+ do
2117+ i=`expr $i + 1`
2118+ testring="$testring$testring"
2119+ done
2120+ testring=
2121+ # Add a significant safety factor because C++ compilers can tack on massive
2122+ # amounts of additional arguments before passing them to the linker.
2123+ # It appears as though 1/2 is a usable value.
2124+ max_cmd_len=`expr $max_cmd_len \/ 2`
2125+fi
2126+
2127 #####################################
2128 # Shell function definitions:
2129 # This seems to be the best place for them
2130@@ -219,7 +253,17 @@
2131 esac
2132 CC_quoted="$CC_quoted $arg"
2133 done
2134+ # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
2135+ trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
2136+ # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
2137+ extendcc=${host}-${CC}
2138 case "$@ " in
2139+ "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
2140+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
2141+ tagname=CC
2142+ break ;;
2143+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
2144+ "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
2145 " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
2146 # The compiler in the base compile command matches
2147 # the one in the tagged configuration.
2148@@ -796,7 +840,7 @@
2149 # Lock this critical section if it is needed
2150 # We use this script file to make the link, it avoids creating a new file
2151 if test "$need_locks" = yes; then
2152- until $run ln "$progpath" "$lockfile" 2>/dev/null; do
2153+ until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
2154 $show "Waiting for $lockfile to be removed"
2155 sleep 2
2156 done
2157@@ -1700,6 +1744,11 @@
2158 continue
2159 ;;
2160
2161+ -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
2162+ compiler_flags="$compiler_flags $arg"
2163+ continue
2164+ ;;
2165+
2166 # Some other compiler flag.
2167 -* | +*)
2168 # Unknown arguments in both finalize_command and compile_command need
2169@@ -3539,6 +3588,13 @@
2170 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
2171 esac
2172 done
2173+ # It is ok to link against an archive when
2174+ # building a shared library.
2175+ if $AR -t $potlib > /dev/null 2>&1; then
2176+ newdeplibs="$newdeplibs $a_deplib"
2177+ a_deplib=""
2178+ break 2
2179+ fi
2180 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
2181 | ${SED} 10q \
2182 | $EGREP "$file_magic_regex" > /dev/null; then
2183diff -uNr libtool-1.5.16/ltmain.sh libtool-1.5.16-patched/ltmain.sh
2184--- libtool-1.5.16/ltmain.sh 2005-04-25 03:59:20.000000000 +1000
2185+++ libtool-1.5.16-patched/ltmain.sh 2005-07-30 18:30:10.000000000 +1000
2186@@ -33,6 +33,9 @@
2187 # function.
2188 progpath="$0"
2189
2190+# define SED for historic ltconfig's generated by Libtool 1.3
2191+test -z "$SED" && SED=sed
2192+
2193 # The name of this program:
2194 progname=`echo "$progpath" | $SED $basename`
2195 modename="$progname"
2196@@ -44,13 +47,20 @@
2197 PROGRAM=ltmain.sh
2198 PACKAGE=libtool
2199 VERSION=1.5.16
2200-TIMESTAMP=" (1.1220.2.234 2005/04/24 17:45:58)"
2201+TIMESTAMP=" (1.1220.2.235 2005/04/25 18:13:26)"
2202
2203 # See if we are running on zsh, and set the options which allow our
2204 # commands through without removal of \ escapes.
2205 if test -n "${ZSH_VERSION+set}" ; then
2206 setopt NO_GLOB_SUBST
2207 fi
2208+# Same for EGREP, and just to be sure, do LTCC as well
2209+if test "X$EGREP" = X ; then
2210+ EGREP=egrep
2211+fi
2212+if test "X$LTCC" = X ; then
2213+ LTCC=${CC-gcc}
2214+fi
2215
2216 # Check that we have a working $echo.
2217 if test "X$1" = X--no-reexec; then
2218@@ -135,6 +145,30 @@
2219 o2lo="s/\\.${objext}\$/.lo/"
2220 quote_scanset='[[~#^*{};<>?'"'"' ]'
2221
2222+if test -z "$max_cmd_len"; then
2223+ i=0
2224+ testring="ABCD"
2225+ new_result=
2226+
2227+ # If test is not a shell built-in, we'll probably end up computing a
2228+ # maximum length that is only half of the actual maximum length, but
2229+ # we can't tell.
2230+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
2231+ = "XX$testring") >/dev/null 2>&1 &&
2232+ new_result=`expr "X$testring" : ".*" 2>&1` &&
2233+ max_cmd_len="$new_result" &&
2234+ test "$i" != 17 # 1/2 MB should be enough
2235+ do
2236+ i=`expr $i + 1`
2237+ testring="$testring$testring"
2238+ done
2239+ testring=
2240+ # Add a significant safety factor because C++ compilers can tack on massive
2241+ # amounts of additional arguments before passing them to the linker.
2242+ # It appears as though 1/2 is a usable value.
2243+ max_cmd_len=`expr $max_cmd_len \/ 2`
2244+fi
2245+
2246 #####################################
2247 # Shell function definitions:
2248 # This seems to be the best place for them
2249@@ -219,7 +253,17 @@
2250 esac
2251 CC_quoted="$CC_quoted $arg"
2252 done
2253+ # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
2254+ trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
2255+ # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
2256+ extendcc=${host}-${CC}
2257 case "$@ " in
2258+ "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
2259+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
2260+ tagname=CC
2261+ break ;;
2262+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
2263+ "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
2264 " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
2265 # The compiler in the base compile command matches
2266 # the one in the tagged configuration.
2267@@ -796,7 +840,7 @@
2268 # Lock this critical section if it is needed
2269 # We use this script file to make the link, it avoids creating a new file
2270 if test "$need_locks" = yes; then
2271- until $run ln "$progpath" "$lockfile" 2>/dev/null; do
2272+ until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
2273 $show "Waiting for $lockfile to be removed"
2274 sleep 2
2275 done
2276@@ -1700,6 +1744,11 @@
2277 continue
2278 ;;
2279
2280+ -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
2281+ compiler_flags="$compiler_flags $arg"
2282+ continue
2283+ ;;
2284+
2285 # Some other compiler flag.
2286 -* | +*)
2287 # Unknown arguments in both finalize_command and compile_command need
2288@@ -3539,6 +3588,13 @@
2289 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
2290 esac
2291 done
2292+ # It is ok to link against an archive when
2293+ # building a shared library.
2294+ if $AR -t $potlib > /dev/null 2>&1; then
2295+ newdeplibs="$newdeplibs $a_deplib"
2296+ a_deplib=""
2297+ break 2
2298+ fi
2299 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
2300 | ${SED} 10q \
2301 | $EGREP "$file_magic_regex" > /dev/null; then
2302diff -uNr libtool-1.5.16/tests/Makefile.in libtool-1.5.16-patched/tests/Makefile.in
2303--- libtool-1.5.16/tests/Makefile.in 2005-04-25 03:54:15.000000000 +1000
2304+++ libtool-1.5.16-patched/tests/Makefile.in 2005-07-30 18:33:24.000000000 +1000
2305@@ -1,4 +1,4 @@
2306-# Makefile.in generated by automake 1.9.5 from Makefile.am.
2307+# Makefile.in generated by automake 1.9.6 from Makefile.am.
2308 # @configure_input@
2309
2310 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Note: See TracBrowser for help on using the repository browser.