summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-10 07:38:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:13 +0100
commit00ea0bf798e12ebf2323a85a63b7497892a2fba4 (patch)
treec511c3c3f9a4d225459204d87b2132cf3b188e84 /meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
parent034bff2ca431b49b7ca9b1e7b7c214ef94b0eb34 (diff)
downloadpoky-00ea0bf798e12ebf2323a85a63b7497892a2fba4.tar.gz
binutils: Upgrade to 2.29
(From OE-Core rev: 3bf990eb275f63190a2cf7253527d6d49fd93f1a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch21125
1 files changed, 0 insertions, 21125 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
deleted file mode 100644
index 4f0ef101db..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
+++ /dev/null
@@ -1,21125 +0,0 @@
1From 9a3651e120261c72090689ad770ad048b0baf506 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:28:33 -0800
4Subject: [PATCH 07/15] Use libtool 2.4
5
6get libtool sysroot support
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Inappropriate [ OE configuration Specific]
11
12 bfd/configure | 1318 +++++++++++++++++------
13 bfd/configure.ac | 2 +-
14 binutils/configure | 1316 +++++++++++++++++------
15 gas/configure | 1314 +++++++++++++++++------
16 gprof/configure | 1321 +++++++++++++++++------
17 ld/configure | 1691 +++++++++++++++++++++--------
18 libtool.m4 | 1080 +++++++++++++------
19 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
20 ltoptions.m4 | 2 +-
21 ltversion.m4 | 12 +-
22 lt~obsolete.m4 | 2 +-
23 opcodes/configure | 1318 +++++++++++++++++------
24 opcodes/configure.ac | 2 +-
25 zlib/configure | 1316 +++++++++++++++++------
26 14 files changed, 9926 insertions(+), 3693 deletions(-)
27
28diff --git a/bfd/configure b/bfd/configure
29index f30bfabef3..fa1a545e9d 100755
30--- a/bfd/configure
31+++ b/bfd/configure
32@@ -672,6 +672,9 @@ OTOOL
33 LIPO
34 NMEDIT
35 DSYMUTIL
36+MANIFEST_TOOL
37+ac_ct_AR
38+DLLTOOL
39 OBJDUMP
40 LN_S
41 NM
42@@ -785,6 +788,7 @@ enable_static
43 with_pic
44 enable_fast_install
45 with_gnu_ld
46+with_libtool_sysroot
47 enable_libtool_lock
48 enable_plugins
49 enable_largefile
50@@ -1461,6 +1465,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use
52 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
54+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
55+ (or the compiler's sysroot if not specified).
56 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR
59@@ -5393,8 +5399,8 @@ esac
60
61
62
63-macro_version='2.2.7a'
64-macro_revision='1.3134'
65+macro_version='2.4'
66+macro_revision='1.3293'
67
68
69
70@@ -5434,7 +5440,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present.
74-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
75+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6120,8 +6126,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
80 # Try some XSI features
81 xsi_shell=no
82 ( _lt_dummy="a/b/c"
83- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
84- = c,a/b,, \
85+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
86+ = c,a/b,b/c, \
87 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes
90@@ -6170,6 +6176,80 @@ esac
91
92
93
94+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
95+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
96+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
97+ $as_echo_n "(cached) " >&6
98+else
99+ case $host in
100+ *-*-mingw* )
101+ case $build in
102+ *-*-mingw* ) # actually msys
103+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
104+ ;;
105+ *-*-cygwin* )
106+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
107+ ;;
108+ * ) # otherwise, assume *nix
109+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
110+ ;;
111+ esac
112+ ;;
113+ *-*-cygwin* )
114+ case $build in
115+ *-*-mingw* ) # actually msys
116+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
117+ ;;
118+ *-*-cygwin* )
119+ lt_cv_to_host_file_cmd=func_convert_file_noop
120+ ;;
121+ * ) # otherwise, assume *nix
122+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
123+ ;;
124+ esac
125+ ;;
126+ * ) # unhandled hosts (and "normal" native builds)
127+ lt_cv_to_host_file_cmd=func_convert_file_noop
128+ ;;
129+esac
130+
131+fi
132+
133+to_host_file_cmd=$lt_cv_to_host_file_cmd
134+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
135+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
136+
137+
138+
139+
140+
141+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
142+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
143+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
144+ $as_echo_n "(cached) " >&6
145+else
146+ #assume ordinary cross tools, or native build.
147+lt_cv_to_tool_file_cmd=func_convert_file_noop
148+case $host in
149+ *-*-mingw* )
150+ case $build in
151+ *-*-mingw* ) # actually msys
152+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
153+ ;;
154+ esac
155+ ;;
156+esac
157+
158+fi
159+
160+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
161+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
162+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
163+
164+
165+
166+
167+
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
169 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if test "${lt_cv_ld_reload_flag+set}" = set; then :
171@@ -6186,6 +6266,11 @@ case $reload_flag in
172 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in
175+ cygwin* | mingw* | pw32* | cegcc*)
176+ if test "$GCC" != yes; then
177+ reload_cmds=false
178+ fi
179+ ;;
180 darwin*)
181 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -6354,7 +6439,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid'
186 else
187- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
188+ # Keep this pattern in sync with the one in func_win32_libid.
189+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
190 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi
192 ;;
193@@ -6508,6 +6594,21 @@ esac
194 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; }
197+
198+file_magic_glob=
199+want_nocaseglob=no
200+if test "$build" = "$host"; then
201+ case $host_os in
202+ mingw* | pw32*)
203+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
204+ want_nocaseglob=yes
205+ else
206+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
207+ fi
208+ ;;
209+ esac
210+fi
211+
212 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6523,9 +6624,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216
217
218
219+
220+
221+
222+
223+
224+
225+
226+
227+
228+
229 if test -n "$ac_tool_prefix"; then
230- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
231-set dummy ${ac_tool_prefix}ar; ac_word=$2
232+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
233+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
234+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
235+$as_echo_n "checking for $ac_word... " >&6; }
236+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
237+ $as_echo_n "(cached) " >&6
238+else
239+ if test -n "$DLLTOOL"; then
240+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
241+else
242+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
243+for as_dir in $PATH
244+do
245+ IFS=$as_save_IFS
246+ test -z "$as_dir" && as_dir=.
247+ for ac_exec_ext in '' $ac_executable_extensions; do
248+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
249+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
250+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
251+ break 2
252+ fi
253+done
254+ done
255+IFS=$as_save_IFS
256+
257+fi
258+fi
259+DLLTOOL=$ac_cv_prog_DLLTOOL
260+if test -n "$DLLTOOL"; then
261+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
262+$as_echo "$DLLTOOL" >&6; }
263+else
264+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
265+$as_echo "no" >&6; }
266+fi
267+
268+
269+fi
270+if test -z "$ac_cv_prog_DLLTOOL"; then
271+ ac_ct_DLLTOOL=$DLLTOOL
272+ # Extract the first word of "dlltool", so it can be a program name with args.
273+set dummy dlltool; ac_word=$2
274+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
275+$as_echo_n "checking for $ac_word... " >&6; }
276+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
277+ $as_echo_n "(cached) " >&6
278+else
279+ if test -n "$ac_ct_DLLTOOL"; then
280+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
281+else
282+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
283+for as_dir in $PATH
284+do
285+ IFS=$as_save_IFS
286+ test -z "$as_dir" && as_dir=.
287+ for ac_exec_ext in '' $ac_executable_extensions; do
288+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
289+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
290+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
291+ break 2
292+ fi
293+done
294+ done
295+IFS=$as_save_IFS
296+
297+fi
298+fi
299+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
300+if test -n "$ac_ct_DLLTOOL"; then
301+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
302+$as_echo "$ac_ct_DLLTOOL" >&6; }
303+else
304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
305+$as_echo "no" >&6; }
306+fi
307+
308+ if test "x$ac_ct_DLLTOOL" = x; then
309+ DLLTOOL="false"
310+ else
311+ case $cross_compiling:$ac_tool_warned in
312+yes:)
313+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
314+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
315+ac_tool_warned=yes ;;
316+esac
317+ DLLTOOL=$ac_ct_DLLTOOL
318+ fi
319+else
320+ DLLTOOL="$ac_cv_prog_DLLTOOL"
321+fi
322+
323+test -z "$DLLTOOL" && DLLTOOL=dlltool
324+
325+
326+
327+
328+
329+
330+
331+
332+
333+
334+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
335+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
336+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
337+ $as_echo_n "(cached) " >&6
338+else
339+ lt_cv_sharedlib_from_linklib_cmd='unknown'
340+
341+case $host_os in
342+cygwin* | mingw* | pw32* | cegcc*)
343+ # two different shell functions defined in ltmain.sh
344+ # decide which to use based on capabilities of $DLLTOOL
345+ case `$DLLTOOL --help 2>&1` in
346+ *--identify-strict*)
347+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
348+ ;;
349+ *)
350+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
351+ ;;
352+ esac
353+ ;;
354+*)
355+ # fallback: assume linklib IS sharedlib
356+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
357+ ;;
358+esac
359+
360+fi
361+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
362+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
363+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
364+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
365+
366+
367+
368+
369+
370+
371+
372+if test -n "$ac_tool_prefix"; then
373+ for ac_prog in ar
374+ do
375+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
376+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
378 $as_echo_n "checking for $ac_word... " >&6; }
379 if test "${ac_cv_prog_AR+set}" = set; then :
380@@ -6541,7 +6795,7 @@ do
381 test -z "$as_dir" && as_dir=.
382 for ac_exec_ext in '' $ac_executable_extensions; do
383 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
384- ac_cv_prog_AR="${ac_tool_prefix}ar"
385+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
387 break 2
388 fi
389@@ -6561,11 +6815,15 @@ $as_echo "no" >&6; }
390 fi
391
392
393+ test -n "$AR" && break
394+ done
395 fi
396-if test -z "$ac_cv_prog_AR"; then
397+if test -z "$AR"; then
398 ac_ct_AR=$AR
399- # Extract the first word of "ar", so it can be a program name with args.
400-set dummy ar; ac_word=$2
401+ for ac_prog in ar
402+do
403+ # Extract the first word of "$ac_prog", so it can be a program name with args.
404+set dummy $ac_prog; ac_word=$2
405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
406 $as_echo_n "checking for $ac_word... " >&6; }
407 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
408@@ -6581,7 +6839,7 @@ do
409 test -z "$as_dir" && as_dir=.
410 for ac_exec_ext in '' $ac_executable_extensions; do
411 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
412- ac_cv_prog_ac_ct_AR="ar"
413+ ac_cv_prog_ac_ct_AR="$ac_prog"
414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
415 break 2
416 fi
417@@ -6600,6 +6858,10 @@ else
418 $as_echo "no" >&6; }
419 fi
420
421+
422+ test -n "$ac_ct_AR" && break
423+done
424+
425 if test "x$ac_ct_AR" = x; then
426 AR="false"
427 else
428@@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;;
429 esac
430 AR=$ac_ct_AR
431 fi
432-else
433- AR="$ac_cv_prog_AR"
434 fi
435
436-test -z "$AR" && AR=ar
437-test -z "$AR_FLAGS" && AR_FLAGS=cru
438+: ${AR=ar}
439+: ${AR_FLAGS=cru}
440+
441+
442+
443+
444+
445+
446+
447+
448+
449+
450+
451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
452+$as_echo_n "checking for archiver @FILE support... " >&6; }
453+if test "${lt_cv_ar_at_file+set}" = set; then :
454+ $as_echo_n "(cached) " >&6
455+else
456+ lt_cv_ar_at_file=no
457+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
458+/* end confdefs.h. */
459+
460+int
461+main ()
462+{
463
464+ ;
465+ return 0;
466+}
467+_ACEOF
468+if ac_fn_c_try_compile "$LINENO"; then :
469+ echo conftest.$ac_objext > conftest.lst
470+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
471+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
472+ (eval $lt_ar_try) 2>&5
473+ ac_status=$?
474+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
475+ test $ac_status = 0; }
476+ if test "$ac_status" -eq 0; then
477+ # Ensure the archiver fails upon bogus file names.
478+ rm -f conftest.$ac_objext libconftest.a
479+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
480+ (eval $lt_ar_try) 2>&5
481+ ac_status=$?
482+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
483+ test $ac_status = 0; }
484+ if test "$ac_status" -ne 0; then
485+ lt_cv_ar_at_file=@
486+ fi
487+ fi
488+ rm -f conftest.* libconftest.a
489
490+fi
491+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
492
493+fi
494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
495+$as_echo "$lt_cv_ar_at_file" >&6; }
496
497+if test "x$lt_cv_ar_at_file" = xno; then
498+ archiver_list_spec=
499+else
500+ archiver_list_spec=$lt_cv_ar_at_file
501+fi
502
503
504
505@@ -6962,8 +7280,8 @@ esac
506 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
507
508 # Transform an extracted symbol line into symbol name and symbol address
509-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
510-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
511+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
512+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
513
514 # Handle CRLF in mingw tool chain
515 opt_cr=
516@@ -6999,6 +7317,7 @@ for ac_symprfx in "" "_"; do
517 else
518 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
519 fi
520+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
521
522 # Check to see that the pipe works correctly.
523 pipe_works=no
524@@ -7040,6 +7359,18 @@ _LT_EOF
525 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
526 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
527 cat <<_LT_EOF > conftest.$ac_ext
528+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
529+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
530+/* DATA imports from DLLs on WIN32 con't be const, because runtime
531+ relocations are performed -- see ld's documentation on pseudo-relocs. */
532+# define LT_DLSYM_CONST
533+#elif defined(__osf__)
534+/* This system does not cope well with relocations in const data. */
535+# define LT_DLSYM_CONST
536+#else
537+# define LT_DLSYM_CONST const
538+#endif
539+
540 #ifdef __cplusplus
541 extern "C" {
542 #endif
543@@ -7051,7 +7382,7 @@ _LT_EOF
544 cat <<_LT_EOF >> conftest.$ac_ext
545
546 /* The mapping between symbol names and symbols. */
547-const struct {
548+LT_DLSYM_CONST struct {
549 const char *name;
550 void *address;
551 }
552@@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() {
553 _LT_EOF
554 # Now try linking the two files.
555 mv conftest.$ac_objext conftstm.$ac_objext
556- lt_save_LIBS="$LIBS"
557- lt_save_CFLAGS="$CFLAGS"
558+ lt_globsym_save_LIBS=$LIBS
559+ lt_globsym_save_CFLAGS=$CFLAGS
560 LIBS="conftstm.$ac_objext"
561 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
562 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
563@@ -7088,8 +7419,8 @@ _LT_EOF
564 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
565 pipe_works=yes
566 fi
567- LIBS="$lt_save_LIBS"
568- CFLAGS="$lt_save_CFLAGS"
569+ LIBS=$lt_globsym_save_LIBS
570+ CFLAGS=$lt_globsym_save_CFLAGS
571 else
572 echo "cannot find nm_test_func in $nlist" >&5
573 fi
574@@ -7126,6 +7457,16 @@ else
575 $as_echo "ok" >&6; }
576 fi
577
578+# Response file support.
579+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
580+ nm_file_list_spec='@'
581+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
582+ nm_file_list_spec='@'
583+fi
584+
585+
586+
587+
588
589
590
591@@ -7147,6 +7488,45 @@ fi
592
593
594
595+
596+
597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
598+$as_echo_n "checking for sysroot... " >&6; }
599+
600+# Check whether --with-libtool-sysroot was given.
601+if test "${with_libtool_sysroot+set}" = set; then :
602+ withval=$with_libtool_sysroot;
603+else
604+ with_libtool_sysroot=no
605+fi
606+
607+
608+lt_sysroot=
609+case ${with_libtool_sysroot} in #(
610+ yes)
611+ if test "$GCC" = yes; then
612+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
613+ fi
614+ ;; #(
615+ /*)
616+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
617+ ;; #(
618+ no|'')
619+ ;; #(
620+ *)
621+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
622+$as_echo "${with_libtool_sysroot}" >&6; }
623+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
624+ ;;
625+esac
626+
627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
628+$as_echo "${lt_sysroot:-no}" >&6; }
629+
630+
631+
632+
633+
634 # Check whether --enable-libtool-lock was given.
635 if test "${enable_libtool_lock+set}" = set; then :
636 enableval=$enable_libtool_lock;
637@@ -7353,6 +7733,123 @@ esac
638
639 need_locks="$enable_libtool_lock"
640
641+if test -n "$ac_tool_prefix"; then
642+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
643+set dummy ${ac_tool_prefix}mt; ac_word=$2
644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
645+$as_echo_n "checking for $ac_word... " >&6; }
646+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
647+ $as_echo_n "(cached) " >&6
648+else
649+ if test -n "$MANIFEST_TOOL"; then
650+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
651+else
652+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
653+for as_dir in $PATH
654+do
655+ IFS=$as_save_IFS
656+ test -z "$as_dir" && as_dir=.
657+ for ac_exec_ext in '' $ac_executable_extensions; do
658+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
659+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
660+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
661+ break 2
662+ fi
663+done
664+ done
665+IFS=$as_save_IFS
666+
667+fi
668+fi
669+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
670+if test -n "$MANIFEST_TOOL"; then
671+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
672+$as_echo "$MANIFEST_TOOL" >&6; }
673+else
674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
675+$as_echo "no" >&6; }
676+fi
677+
678+
679+fi
680+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
681+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
682+ # Extract the first word of "mt", so it can be a program name with args.
683+set dummy mt; ac_word=$2
684+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
685+$as_echo_n "checking for $ac_word... " >&6; }
686+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
687+ $as_echo_n "(cached) " >&6
688+else
689+ if test -n "$ac_ct_MANIFEST_TOOL"; then
690+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
691+else
692+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
693+for as_dir in $PATH
694+do
695+ IFS=$as_save_IFS
696+ test -z "$as_dir" && as_dir=.
697+ for ac_exec_ext in '' $ac_executable_extensions; do
698+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
699+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
700+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
701+ break 2
702+ fi
703+done
704+ done
705+IFS=$as_save_IFS
706+
707+fi
708+fi
709+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
710+if test -n "$ac_ct_MANIFEST_TOOL"; then
711+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
712+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
713+else
714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
715+$as_echo "no" >&6; }
716+fi
717+
718+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
719+ MANIFEST_TOOL=":"
720+ else
721+ case $cross_compiling:$ac_tool_warned in
722+yes:)
723+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
724+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
725+ac_tool_warned=yes ;;
726+esac
727+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
728+ fi
729+else
730+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
731+fi
732+
733+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
734+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
735+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
736+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
737+ $as_echo_n "(cached) " >&6
738+else
739+ lt_cv_path_mainfest_tool=no
740+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
741+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
742+ cat conftest.err >&5
743+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
744+ lt_cv_path_mainfest_tool=yes
745+ fi
746+ rm -f conftest*
747+fi
748+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
749+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
750+if test "x$lt_cv_path_mainfest_tool" != xyes; then
751+ MANIFEST_TOOL=:
752+fi
753+
754+
755+
756+
757+
758
759 case $host_os in
760 rhapsody* | darwin*)
761@@ -7916,6 +8413,8 @@ _LT_EOF
762 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
763 echo "$AR cru libconftest.a conftest.o" >&5
764 $AR cru libconftest.a conftest.o 2>&5
765+ echo "$RANLIB libconftest.a" >&5
766+ $RANLIB libconftest.a 2>&5
767 cat > conftest.c << _LT_EOF
768 int main() { return 0;}
769 _LT_EOF
770@@ -8080,7 +8579,8 @@ fi
771 LIBTOOL_DEPS="$ltmain"
772
773 # Always use our own libtool.
774-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
775+LIBTOOL='$(SHELL) $(top_builddir)'
776+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
777
778
779
780@@ -8169,7 +8669,7 @@ aix3*)
781 esac
782
783 # Global variables:
784-ofile=libtool
785+ofile=${host_alias}-libtool
786 can_build_shared=yes
787
788 # All known linkers require a `.a' archive for static linking (except MSVC,
789@@ -8467,8 +8967,6 @@ fi
790 lt_prog_compiler_pic=
791 lt_prog_compiler_static=
792
793-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
794-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
795
796 if test "$GCC" = yes; then
797 lt_prog_compiler_wl='-Wl,'
798@@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
799 lt_prog_compiler_pic='--shared'
800 lt_prog_compiler_static='--static'
801 ;;
802+ nagfor*)
803+ # NAG Fortran compiler
804+ lt_prog_compiler_wl='-Wl,-Wl,,'
805+ lt_prog_compiler_pic='-PIC'
806+ lt_prog_compiler_static='-Bstatic'
807+ ;;
808 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
809 # Portland Group compilers (*not* the Pentium gcc compiler,
810 # which looks to be a dead project)
811@@ -8696,7 +9200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
812 lt_prog_compiler_pic='-KPIC'
813 lt_prog_compiler_static='-Bstatic'
814 case $cc_basename in
815- f77* | f90* | f95*)
816+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
817 lt_prog_compiler_wl='-Qoption ld ';;
818 *)
819 lt_prog_compiler_wl='-Wl,';;
820@@ -8753,13 +9257,17 @@ case $host_os in
821 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
822 ;;
823 esac
824-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
825-$as_echo "$lt_prog_compiler_pic" >&6; }
826-
827-
828-
829-
830
831+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
832+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
833+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
834+ $as_echo_n "(cached) " >&6
835+else
836+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
837+fi
838+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
839+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
840+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
841
842 #
843 # Check to make sure the PIC flag actually works.
844@@ -8820,6 +9328,11 @@ fi
845
846
847
848+
849+
850+
851+
852+
853 #
854 # Check to make sure the static flag actually works.
855 #
856@@ -9170,7 +9683,8 @@ _LT_EOF
857 allow_undefined_flag=unsupported
858 always_export_symbols=no
859 enable_shared_with_static_runtimes=yes
860- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
861+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
862+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
863
864 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
865 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
866@@ -9269,12 +9783,12 @@ _LT_EOF
867 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
868 hardcode_libdir_flag_spec=
869 hardcode_libdir_flag_spec_ld='-rpath $libdir'
870- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
871+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
872 if test "x$supports_anon_versioning" = xyes; then
873 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
874 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
875 echo "local: *; };" >> $output_objdir/$libname.ver~
876- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
877+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
878 fi
879 ;;
880 esac
881@@ -9288,8 +9802,8 @@ _LT_EOF
882 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
883 wlarc=
884 else
885- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
886- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
887+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
888+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
889 fi
890 ;;
891
892@@ -9307,8 +9821,8 @@ _LT_EOF
893
894 _LT_EOF
895 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
896- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
897- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
898+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
899+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
900 else
901 ld_shlibs=no
902 fi
903@@ -9354,8 +9868,8 @@ _LT_EOF
904
905 *)
906 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
907- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
908- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
909+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
910+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
911 else
912 ld_shlibs=no
913 fi
914@@ -9485,7 +9999,13 @@ _LT_EOF
915 allow_undefined_flag='-berok'
916 # Determine the default libpath from the value encoded in an
917 # empty executable.
918- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
919+ if test "${lt_cv_aix_libpath+set}" = set; then
920+ aix_libpath=$lt_cv_aix_libpath
921+else
922+ if test "${lt_cv_aix_libpath_+set}" = set; then :
923+ $as_echo_n "(cached) " >&6
924+else
925+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
926 /* end confdefs.h. */
927
928 int
929@@ -9498,22 +10018,29 @@ main ()
930 _ACEOF
931 if ac_fn_c_try_link "$LINENO"; then :
932
933-lt_aix_libpath_sed='
934- /Import File Strings/,/^$/ {
935- /^0/ {
936- s/^0 *\(.*\)$/\1/
937- p
938- }
939- }'
940-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
941-# Check for a 64-bit object if we didn't find anything.
942-if test -z "$aix_libpath"; then
943- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
944-fi
945+ lt_aix_libpath_sed='
946+ /Import File Strings/,/^$/ {
947+ /^0/ {
948+ s/^0 *\([^ ]*\) *$/\1/
949+ p
950+ }
951+ }'
952+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
953+ # Check for a 64-bit object if we didn't find anything.
954+ if test -z "$lt_cv_aix_libpath_"; then
955+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
956+ fi
957 fi
958 rm -f core conftest.err conftest.$ac_objext \
959 conftest$ac_exeext conftest.$ac_ext
960-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
961+ if test -z "$lt_cv_aix_libpath_"; then
962+ lt_cv_aix_libpath_="/usr/lib:/lib"
963+ fi
964+
965+fi
966+
967+ aix_libpath=$lt_cv_aix_libpath_
968+fi
969
970 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
971 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
972@@ -9525,7 +10052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
973 else
974 # Determine the default libpath from the value encoded in an
975 # empty executable.
976- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
977+ if test "${lt_cv_aix_libpath+set}" = set; then
978+ aix_libpath=$lt_cv_aix_libpath
979+else
980+ if test "${lt_cv_aix_libpath_+set}" = set; then :
981+ $as_echo_n "(cached) " >&6
982+else
983+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
984 /* end confdefs.h. */
985
986 int
987@@ -9538,22 +10071,29 @@ main ()
988 _ACEOF
989 if ac_fn_c_try_link "$LINENO"; then :
990
991-lt_aix_libpath_sed='
992- /Import File Strings/,/^$/ {
993- /^0/ {
994- s/^0 *\(.*\)$/\1/
995- p
996- }
997- }'
998-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
999-# Check for a 64-bit object if we didn't find anything.
1000-if test -z "$aix_libpath"; then
1001- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1002-fi
1003+ lt_aix_libpath_sed='
1004+ /Import File Strings/,/^$/ {
1005+ /^0/ {
1006+ s/^0 *\([^ ]*\) *$/\1/
1007+ p
1008+ }
1009+ }'
1010+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1011+ # Check for a 64-bit object if we didn't find anything.
1012+ if test -z "$lt_cv_aix_libpath_"; then
1013+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1014+ fi
1015 fi
1016 rm -f core conftest.err conftest.$ac_objext \
1017 conftest$ac_exeext conftest.$ac_ext
1018-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1019+ if test -z "$lt_cv_aix_libpath_"; then
1020+ lt_cv_aix_libpath_="/usr/lib:/lib"
1021+ fi
1022+
1023+fi
1024+
1025+ aix_libpath=$lt_cv_aix_libpath_
1026+fi
1027
1028 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1029 # Warning - without using the other run time loading flags,
1030@@ -9598,20 +10138,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1031 # Microsoft Visual C++.
1032 # hardcode_libdir_flag_spec is actually meaningless, as there is
1033 # no search path for DLLs.
1034- hardcode_libdir_flag_spec=' '
1035- allow_undefined_flag=unsupported
1036- # Tell ltmain to make .lib files, not .a files.
1037- libext=lib
1038- # Tell ltmain to make .dll files, not .so files.
1039- shrext_cmds=".dll"
1040- # FIXME: Setting linknames here is a bad hack.
1041- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1042- # The linker will automatically build a .lib file if we build a DLL.
1043- old_archive_from_new_cmds='true'
1044- # FIXME: Should let the user specify the lib program.
1045- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1046- fix_srcfile_path='`cygpath -w "$srcfile"`'
1047- enable_shared_with_static_runtimes=yes
1048+ case $cc_basename in
1049+ cl*)
1050+ # Native MSVC
1051+ hardcode_libdir_flag_spec=' '
1052+ allow_undefined_flag=unsupported
1053+ always_export_symbols=yes
1054+ file_list_spec='@'
1055+ # Tell ltmain to make .lib files, not .a files.
1056+ libext=lib
1057+ # Tell ltmain to make .dll files, not .so files.
1058+ shrext_cmds=".dll"
1059+ # FIXME: Setting linknames here is a bad hack.
1060+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1061+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1062+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1063+ else
1064+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1065+ fi~
1066+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1067+ linknames='
1068+ # The linker will not automatically build a static lib if we build a DLL.
1069+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1070+ enable_shared_with_static_runtimes=yes
1071+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1072+ # Don't use ranlib
1073+ old_postinstall_cmds='chmod 644 $oldlib'
1074+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1075+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1076+ case $lt_outputfile in
1077+ *.exe|*.EXE) ;;
1078+ *)
1079+ lt_outputfile="$lt_outputfile.exe"
1080+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1081+ ;;
1082+ esac~
1083+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1084+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1085+ $RM "$lt_outputfile.manifest";
1086+ fi'
1087+ ;;
1088+ *)
1089+ # Assume MSVC wrapper
1090+ hardcode_libdir_flag_spec=' '
1091+ allow_undefined_flag=unsupported
1092+ # Tell ltmain to make .lib files, not .a files.
1093+ libext=lib
1094+ # Tell ltmain to make .dll files, not .so files.
1095+ shrext_cmds=".dll"
1096+ # FIXME: Setting linknames here is a bad hack.
1097+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1098+ # The linker will automatically build a .lib file if we build a DLL.
1099+ old_archive_from_new_cmds='true'
1100+ # FIXME: Should let the user specify the lib program.
1101+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1102+ enable_shared_with_static_runtimes=yes
1103+ ;;
1104+ esac
1105 ;;
1106
1107 darwin* | rhapsody*)
1108@@ -9672,7 +10255,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1109
1110 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1111 freebsd* | dragonfly*)
1112- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1113+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1114 hardcode_libdir_flag_spec='-R$libdir'
1115 hardcode_direct=yes
1116 hardcode_shlibpath_var=no
1117@@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1118
1119 hpux9*)
1120 if test "$GCC" = yes; then
1121- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1122+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1123 else
1124 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1125 fi
1126@@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1127
1128 hpux10*)
1129 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1130- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1131+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1132 else
1133 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1134 fi
1135@@ -9720,10 +10303,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1136 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1137 ;;
1138 ia64*)
1139- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1140+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1141 ;;
1142 *)
1143- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1144+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1145 ;;
1146 esac
1147 else
1148@@ -9802,23 +10385,36 @@ fi
1149
1150 irix5* | irix6* | nonstopux*)
1151 if test "$GCC" = yes; then
1152- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1153+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1154 # Try to use the -exported_symbol ld option, if it does not
1155 # work, assume that -exports_file does not work either and
1156 # implicitly export all symbols.
1157- save_LDFLAGS="$LDFLAGS"
1158- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1159- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1160+ # This should be the same for all languages, so no per-tag cache variable.
1161+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1162+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1163+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
1164+ $as_echo_n "(cached) " >&6
1165+else
1166+ save_LDFLAGS="$LDFLAGS"
1167+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1168+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1169 /* end confdefs.h. */
1170-int foo(void) {}
1171+int foo (void) { return 0; }
1172 _ACEOF
1173 if ac_fn_c_try_link "$LINENO"; then :
1174- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
1175-
1176+ lt_cv_irix_exported_symbol=yes
1177+else
1178+ lt_cv_irix_exported_symbol=no
1179 fi
1180 rm -f core conftest.err conftest.$ac_objext \
1181 conftest$ac_exeext conftest.$ac_ext
1182- LDFLAGS="$save_LDFLAGS"
1183+ LDFLAGS="$save_LDFLAGS"
1184+fi
1185+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1186+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1187+ if test "$lt_cv_irix_exported_symbol" = yes; then
1188+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
1189+ fi
1190 else
1191 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1192 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1193@@ -9903,7 +10499,7 @@ rm -f core conftest.err conftest.$ac_objext \
1194 osf4* | osf5*) # as osf3* with the addition of -msym flag
1195 if test "$GCC" = yes; then
1196 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1197- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1198+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1199 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1200 else
1201 allow_undefined_flag=' -expect_unresolved \*'
1202@@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \
1203 no_undefined_flag=' -z defs'
1204 if test "$GCC" = yes; then
1205 wlarc='${wl}'
1206- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1207+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1208 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1209- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1210+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1211 else
1212 case `$CC -V 2>&1` in
1213 *"Compilers 5.0"*)
1214@@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1215 need_version=no
1216 need_lib_prefix=no
1217
1218- case $GCC,$host_os in
1219- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1220+ case $GCC,$cc_basename in
1221+ yes,*)
1222+ # gcc
1223 library_names_spec='$libname.dll.a'
1224 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1225 postinstall_cmds='base_file=`basename \${file}`~
1226@@ -10534,13 +11131,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1227 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1228 ;;
1229 esac
1230+ dynamic_linker='Win32 ld.exe'
1231+ ;;
1232+
1233+ *,cl*)
1234+ # Native MSVC
1235+ libname_spec='$name'
1236+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1237+ library_names_spec='${libname}.dll.lib'
1238+
1239+ case $build_os in
1240+ mingw*)
1241+ sys_lib_search_path_spec=
1242+ lt_save_ifs=$IFS
1243+ IFS=';'
1244+ for lt_path in $LIB
1245+ do
1246+ IFS=$lt_save_ifs
1247+ # Let DOS variable expansion print the short 8.3 style file name.
1248+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1249+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1250+ done
1251+ IFS=$lt_save_ifs
1252+ # Convert to MSYS style.
1253+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1254+ ;;
1255+ cygwin*)
1256+ # Convert to unix form, then to dos form, then back to unix form
1257+ # but this time dos style (no spaces!) so that the unix form looks
1258+ # like /cygdrive/c/PROGRA~1:/cygdr...
1259+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1260+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1261+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1262+ ;;
1263+ *)
1264+ sys_lib_search_path_spec="$LIB"
1265+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1266+ # It is most probably a Windows format PATH.
1267+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1268+ else
1269+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1270+ fi
1271+ # FIXME: find the short name or the path components, as spaces are
1272+ # common. (e.g. "Program Files" -> "PROGRA~1")
1273+ ;;
1274+ esac
1275+
1276+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1277+ postinstall_cmds='base_file=`basename \${file}`~
1278+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1279+ dldir=$destdir/`dirname \$dlpath`~
1280+ test -d \$dldir || mkdir -p \$dldir~
1281+ $install_prog $dir/$dlname \$dldir/$dlname'
1282+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1283+ dlpath=$dir/\$dldll~
1284+ $RM \$dlpath'
1285+ shlibpath_overrides_runpath=yes
1286+ dynamic_linker='Win32 link.exe'
1287 ;;
1288
1289 *)
1290+ # Assume MSVC wrapper
1291 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1292+ dynamic_linker='Win32 ld.exe'
1293 ;;
1294 esac
1295- dynamic_linker='Win32 ld.exe'
1296 # FIXME: first we should search . and the directory the executable is in
1297 shlibpath_var=PATH
1298 ;;
1299@@ -10632,7 +11287,7 @@ haiku*)
1300 soname_spec='${libname}${release}${shared_ext}$major'
1301 shlibpath_var=LIBRARY_PATH
1302 shlibpath_overrides_runpath=yes
1303- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1304+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1305 hardcode_into_libs=yes
1306 ;;
1307
1308@@ -11472,10 +12127,10 @@ else
1309 /* When -fvisbility=hidden is used, assume the code has been annotated
1310 correspondingly for the symbols needed. */
1311 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1312-void fnord () __attribute__((visibility("default")));
1313+int fnord () __attribute__((visibility("default")));
1314 #endif
1315
1316-void fnord () { int i=42; }
1317+int fnord () { return 42; }
1318 int main ()
1319 {
1320 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1321@@ -11578,10 +12233,10 @@ else
1322 /* When -fvisbility=hidden is used, assume the code has been annotated
1323 correspondingly for the symbols needed. */
1324 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1325-void fnord () __attribute__((visibility("default")));
1326+int fnord () __attribute__((visibility("default")));
1327 #endif
1328
1329-void fnord () { int i=42; }
1330+int fnord () { return 42; }
1331 int main ()
1332 {
1333 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1334@@ -14122,7 +14777,7 @@ SHARED_LDFLAGS=
1335 if test "$enable_shared" = "yes"; then
1336 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1337 if test -n "$x"; then
1338- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1339+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1340 fi
1341
1342 # More hacks to build DLLs on Windows.
1343@@ -16826,13 +17481,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1344 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1345 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1346 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1347+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1348+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1349 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1350 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1351 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1352 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1353 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1354+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1355+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1356+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1357+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1358 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1359 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1360+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1361 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1362 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1363 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1364@@ -16847,14 +17509,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1365 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1366 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1367 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
1368+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1369+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1370 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1371 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1372 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1373-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1374 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1375+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1376 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1377 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1378 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1379+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1380 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1381 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1382 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1383@@ -16887,12 +17552,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1384 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1385 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1386 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1387-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1388 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1389 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1390 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1391 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1392 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1393+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1394 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1395 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1396 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1397@@ -16947,8 +17612,13 @@ reload_flag \
1398 OBJDUMP \
1399 deplibs_check_method \
1400 file_magic_cmd \
1401+file_magic_glob \
1402+want_nocaseglob \
1403+DLLTOOL \
1404+sharedlib_from_linklib_cmd \
1405 AR \
1406 AR_FLAGS \
1407+archiver_list_spec \
1408 STRIP \
1409 RANLIB \
1410 CC \
1411@@ -16958,12 +17628,14 @@ lt_cv_sys_global_symbol_pipe \
1412 lt_cv_sys_global_symbol_to_cdecl \
1413 lt_cv_sys_global_symbol_to_c_name_address \
1414 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1415+nm_file_list_spec \
1416 lt_prog_compiler_no_builtin_flag \
1417-lt_prog_compiler_wl \
1418 lt_prog_compiler_pic \
1419+lt_prog_compiler_wl \
1420 lt_prog_compiler_static \
1421 lt_cv_prog_compiler_c_o \
1422 need_locks \
1423+MANIFEST_TOOL \
1424 DSYMUTIL \
1425 NMEDIT \
1426 LIPO \
1427@@ -16979,7 +17651,6 @@ no_undefined_flag \
1428 hardcode_libdir_flag_spec \
1429 hardcode_libdir_flag_spec_ld \
1430 hardcode_libdir_separator \
1431-fix_srcfile_path \
1432 exclude_expsyms \
1433 include_expsyms \
1434 file_list_spec \
1435@@ -17015,6 +17686,7 @@ module_cmds \
1436 module_expsym_cmds \
1437 export_symbols_cmds \
1438 prelink_cmds \
1439+postlink_cmds \
1440 postinstall_cmds \
1441 postuninstall_cmds \
1442 finish_cmds \
1443@@ -17794,7 +18466,8 @@ $as_echo X"$file" |
1444 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1445 #
1446 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1447-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1448+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1449+# Inc.
1450 # Written by Gordon Matzigkeit, 1996
1451 #
1452 # This file is part of GNU Libtool.
1453@@ -17897,19 +18570,42 @@ SP2NL=$lt_lt_SP2NL
1454 # turn newlines into spaces.
1455 NL2SP=$lt_lt_NL2SP
1456
1457+# convert \$build file names to \$host format.
1458+to_host_file_cmd=$lt_cv_to_host_file_cmd
1459+
1460+# convert \$build files to toolchain format.
1461+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1462+
1463 # An object symbol dumper.
1464 OBJDUMP=$lt_OBJDUMP
1465
1466 # Method to check whether dependent libraries are shared objects.
1467 deplibs_check_method=$lt_deplibs_check_method
1468
1469-# Command to use when deplibs_check_method == "file_magic".
1470+# Command to use when deplibs_check_method = "file_magic".
1471 file_magic_cmd=$lt_file_magic_cmd
1472
1473+# How to find potential files when deplibs_check_method = "file_magic".
1474+file_magic_glob=$lt_file_magic_glob
1475+
1476+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1477+want_nocaseglob=$lt_want_nocaseglob
1478+
1479+# DLL creation program.
1480+DLLTOOL=$lt_DLLTOOL
1481+
1482+# Command to associate shared and link libraries.
1483+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1484+
1485 # The archiver.
1486 AR=$lt_AR
1487+
1488+# Flags to create an archive.
1489 AR_FLAGS=$lt_AR_FLAGS
1490
1491+# How to feed a file listing to the archiver.
1492+archiver_list_spec=$lt_archiver_list_spec
1493+
1494 # A symbol stripping program.
1495 STRIP=$lt_STRIP
1496
1497@@ -17939,6 +18635,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1498 # Transform the output of nm in a C name address pair when lib prefix is needed.
1499 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1500
1501+# Specify filename containing input files for \$NM.
1502+nm_file_list_spec=$lt_nm_file_list_spec
1503+
1504+# The root where to search for dependent libraries,and in which our libraries should be installed.
1505+lt_sysroot=$lt_sysroot
1506+
1507 # The name of the directory that contains temporary libtool files.
1508 objdir=$objdir
1509
1510@@ -17948,6 +18650,9 @@ MAGIC_CMD=$MAGIC_CMD
1511 # Must we lock files when doing compilation?
1512 need_locks=$lt_need_locks
1513
1514+# Manifest tool.
1515+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1516+
1517 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1518 DSYMUTIL=$lt_DSYMUTIL
1519
1520@@ -18062,12 +18767,12 @@ with_gcc=$GCC
1521 # Compiler flag to turn off builtin functions.
1522 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1523
1524-# How to pass a linker flag through the compiler.
1525-wl=$lt_lt_prog_compiler_wl
1526-
1527 # Additional compiler flags for building library objects.
1528 pic_flag=$lt_lt_prog_compiler_pic
1529
1530+# How to pass a linker flag through the compiler.
1531+wl=$lt_lt_prog_compiler_wl
1532+
1533 # Compiler flag to prevent dynamic linking.
1534 link_static_flag=$lt_lt_prog_compiler_static
1535
1536@@ -18154,9 +18859,6 @@ inherit_rpath=$inherit_rpath
1537 # Whether libtool must link a program against all its dependency libraries.
1538 link_all_deplibs=$link_all_deplibs
1539
1540-# Fix the shell variable \$srcfile for the compiler.
1541-fix_srcfile_path=$lt_fix_srcfile_path
1542-
1543 # Set to "yes" if exported symbols are required.
1544 always_export_symbols=$always_export_symbols
1545
1546@@ -18172,6 +18874,9 @@ include_expsyms=$lt_include_expsyms
1547 # Commands necessary for linking programs (against libraries) with templates.
1548 prelink_cmds=$lt_prelink_cmds
1549
1550+# Commands necessary for finishing linking programs.
1551+postlink_cmds=$lt_postlink_cmds
1552+
1553 # Specify filename containing input files.
1554 file_list_spec=$lt_file_list_spec
1555
1556@@ -18204,210 +18909,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1557 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1558 # text mode, it properly converts lines to CR/LF. This bash problem
1559 # is reportedly fixed, but why not run on old versions too?
1560- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1561- || (rm -f "$cfgfile"; exit 1)
1562-
1563- case $xsi_shell in
1564- yes)
1565- cat << \_LT_EOF >> "$cfgfile"
1566-
1567-# func_dirname file append nondir_replacement
1568-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1569-# otherwise set result to NONDIR_REPLACEMENT.
1570-func_dirname ()
1571-{
1572- case ${1} in
1573- */*) func_dirname_result="${1%/*}${2}" ;;
1574- * ) func_dirname_result="${3}" ;;
1575- esac
1576-}
1577-
1578-# func_basename file
1579-func_basename ()
1580-{
1581- func_basename_result="${1##*/}"
1582-}
1583-
1584-# func_dirname_and_basename file append nondir_replacement
1585-# perform func_basename and func_dirname in a single function
1586-# call:
1587-# dirname: Compute the dirname of FILE. If nonempty,
1588-# add APPEND to the result, otherwise set result
1589-# to NONDIR_REPLACEMENT.
1590-# value returned in "$func_dirname_result"
1591-# basename: Compute filename of FILE.
1592-# value retuned in "$func_basename_result"
1593-# Implementation must be kept synchronized with func_dirname
1594-# and func_basename. For efficiency, we do not delegate to
1595-# those functions but instead duplicate the functionality here.
1596-func_dirname_and_basename ()
1597-{
1598- case ${1} in
1599- */*) func_dirname_result="${1%/*}${2}" ;;
1600- * ) func_dirname_result="${3}" ;;
1601- esac
1602- func_basename_result="${1##*/}"
1603-}
1604-
1605-# func_stripname prefix suffix name
1606-# strip PREFIX and SUFFIX off of NAME.
1607-# PREFIX and SUFFIX must not contain globbing or regex special
1608-# characters, hashes, percent signs, but SUFFIX may contain a leading
1609-# dot (in which case that matches only a dot).
1610-func_stripname ()
1611-{
1612- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1613- # positional parameters, so assign one to ordinary parameter first.
1614- func_stripname_result=${3}
1615- func_stripname_result=${func_stripname_result#"${1}"}
1616- func_stripname_result=${func_stripname_result%"${2}"}
1617-}
1618-
1619-# func_opt_split
1620-func_opt_split ()
1621-{
1622- func_opt_split_opt=${1%%=*}
1623- func_opt_split_arg=${1#*=}
1624-}
1625-
1626-# func_lo2o object
1627-func_lo2o ()
1628-{
1629- case ${1} in
1630- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1631- *) func_lo2o_result=${1} ;;
1632- esac
1633-}
1634-
1635-# func_xform libobj-or-source
1636-func_xform ()
1637-{
1638- func_xform_result=${1%.*}.lo
1639-}
1640-
1641-# func_arith arithmetic-term...
1642-func_arith ()
1643-{
1644- func_arith_result=$(( $* ))
1645-}
1646-
1647-# func_len string
1648-# STRING may not start with a hyphen.
1649-func_len ()
1650-{
1651- func_len_result=${#1}
1652-}
1653-
1654-_LT_EOF
1655- ;;
1656- *) # Bourne compatible functions.
1657- cat << \_LT_EOF >> "$cfgfile"
1658-
1659-# func_dirname file append nondir_replacement
1660-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1661-# otherwise set result to NONDIR_REPLACEMENT.
1662-func_dirname ()
1663-{
1664- # Extract subdirectory from the argument.
1665- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1666- if test "X$func_dirname_result" = "X${1}"; then
1667- func_dirname_result="${3}"
1668- else
1669- func_dirname_result="$func_dirname_result${2}"
1670- fi
1671-}
1672-
1673-# func_basename file
1674-func_basename ()
1675-{
1676- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1677-}
1678-
1679-
1680-# func_stripname prefix suffix name
1681-# strip PREFIX and SUFFIX off of NAME.
1682-# PREFIX and SUFFIX must not contain globbing or regex special
1683-# characters, hashes, percent signs, but SUFFIX may contain a leading
1684-# dot (in which case that matches only a dot).
1685-# func_strip_suffix prefix name
1686-func_stripname ()
1687-{
1688- case ${2} in
1689- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1690- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1691- esac
1692-}
1693-
1694-# sed scripts:
1695-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1696-my_sed_long_arg='1s/^-[^=]*=//'
1697-
1698-# func_opt_split
1699-func_opt_split ()
1700-{
1701- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1702- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1703-}
1704-
1705-# func_lo2o object
1706-func_lo2o ()
1707-{
1708- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1709-}
1710-
1711-# func_xform libobj-or-source
1712-func_xform ()
1713-{
1714- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1715-}
1716-
1717-# func_arith arithmetic-term...
1718-func_arith ()
1719-{
1720- func_arith_result=`expr "$@"`
1721-}
1722-
1723-# func_len string
1724-# STRING may not start with a hyphen.
1725-func_len ()
1726-{
1727- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1728-}
1729-
1730-_LT_EOF
1731-esac
1732-
1733-case $lt_shell_append in
1734- yes)
1735- cat << \_LT_EOF >> "$cfgfile"
1736-
1737-# func_append var value
1738-# Append VALUE to the end of shell variable VAR.
1739-func_append ()
1740-{
1741- eval "$1+=\$2"
1742-}
1743-_LT_EOF
1744- ;;
1745- *)
1746- cat << \_LT_EOF >> "$cfgfile"
1747-
1748-# func_append var value
1749-# Append VALUE to the end of shell variable VAR.
1750-func_append ()
1751-{
1752- eval "$1=\$$1\$2"
1753-}
1754-
1755-_LT_EOF
1756- ;;
1757- esac
1758-
1759-
1760- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1761- || (rm -f "$cfgfile"; exit 1)
1762-
1763- mv -f "$cfgfile" "$ofile" ||
1764+ sed '$q' "$ltmain" >> "$cfgfile" \
1765+ || (rm -f "$cfgfile"; exit 1)
1766+
1767+ if test x"$xsi_shell" = xyes; then
1768+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1769+func_dirname ()\
1770+{\
1771+\ case ${1} in\
1772+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1773+\ * ) func_dirname_result="${3}" ;;\
1774+\ esac\
1775+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1776+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1777+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1778+test 0 -eq $? || _lt_function_replace_fail=:
1779+
1780+
1781+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1782+func_basename ()\
1783+{\
1784+\ func_basename_result="${1##*/}"\
1785+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1786+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1787+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1788+test 0 -eq $? || _lt_function_replace_fail=:
1789+
1790+
1791+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1792+func_dirname_and_basename ()\
1793+{\
1794+\ case ${1} in\
1795+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1796+\ * ) func_dirname_result="${3}" ;;\
1797+\ esac\
1798+\ func_basename_result="${1##*/}"\
1799+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1800+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1801+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1802+test 0 -eq $? || _lt_function_replace_fail=:
1803+
1804+
1805+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1806+func_stripname ()\
1807+{\
1808+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1809+\ # positional parameters, so assign one to ordinary parameter first.\
1810+\ func_stripname_result=${3}\
1811+\ func_stripname_result=${func_stripname_result#"${1}"}\
1812+\ func_stripname_result=${func_stripname_result%"${2}"}\
1813+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1814+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1815+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1816+test 0 -eq $? || _lt_function_replace_fail=:
1817+
1818+
1819+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1820+func_split_long_opt ()\
1821+{\
1822+\ func_split_long_opt_name=${1%%=*}\
1823+\ func_split_long_opt_arg=${1#*=}\
1824+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1825+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1826+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1827+test 0 -eq $? || _lt_function_replace_fail=:
1828+
1829+
1830+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1831+func_split_short_opt ()\
1832+{\
1833+\ func_split_short_opt_arg=${1#??}\
1834+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1835+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1836+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1837+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1838+test 0 -eq $? || _lt_function_replace_fail=:
1839+
1840+
1841+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1842+func_lo2o ()\
1843+{\
1844+\ case ${1} in\
1845+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1846+\ *) func_lo2o_result=${1} ;;\
1847+\ esac\
1848+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1849+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1850+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1851+test 0 -eq $? || _lt_function_replace_fail=:
1852+
1853+
1854+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1855+func_xform ()\
1856+{\
1857+ func_xform_result=${1%.*}.lo\
1858+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1859+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1860+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1861+test 0 -eq $? || _lt_function_replace_fail=:
1862+
1863+
1864+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1865+func_arith ()\
1866+{\
1867+ func_arith_result=$(( $* ))\
1868+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1869+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1870+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1871+test 0 -eq $? || _lt_function_replace_fail=:
1872+
1873+
1874+ sed -e '/^func_len ()$/,/^} # func_len /c\
1875+func_len ()\
1876+{\
1877+ func_len_result=${#1}\
1878+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1879+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1880+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1881+test 0 -eq $? || _lt_function_replace_fail=:
1882+
1883+fi
1884+
1885+if test x"$lt_shell_append" = xyes; then
1886+ sed -e '/^func_append ()$/,/^} # func_append /c\
1887+func_append ()\
1888+{\
1889+ eval "${1}+=\\${2}"\
1890+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1891+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1892+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1893+test 0 -eq $? || _lt_function_replace_fail=:
1894+
1895+
1896+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1897+func_append_quoted ()\
1898+{\
1899+\ func_quote_for_eval "${2}"\
1900+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1901+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1902+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1903+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1904+test 0 -eq $? || _lt_function_replace_fail=:
1905+
1906+
1907+ # Save a `func_append' function call where possible by direct use of '+='
1908+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1909+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1910+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1911+ test 0 -eq $? || _lt_function_replace_fail=:
1912+else
1913+ # Save a `func_append' function call even when '+=' is not available
1914+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1915+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1916+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1917+ test 0 -eq $? || _lt_function_replace_fail=:
1918+fi
1919+
1920+if test x"$_lt_function_replace_fail" = x":"; then
1921+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1922+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1923+fi
1924+
1925+
1926+ mv -f "$cfgfile" "$ofile" ||
1927 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1928 chmod +x "$ofile"
1929
1930diff --git a/bfd/configure.ac b/bfd/configure.ac
1931index 9a183c1628..3d8ea07836 100644
1932--- a/bfd/configure.ac
1933+++ b/bfd/configure.ac
1934@@ -253,7 +253,7 @@ changequote(,)dnl
1935 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1936 changequote([,])dnl
1937 if test -n "$x"; then
1938- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1939+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1940 fi
1941
1942 # More hacks to build DLLs on Windows.
1943diff --git a/binutils/configure b/binutils/configure
1944index 82119efe72..4a98918ce1 100755
1945--- a/binutils/configure
1946+++ b/binutils/configure
1947@@ -659,8 +659,11 @@ OTOOL
1948 LIPO
1949 NMEDIT
1950 DSYMUTIL
1951+MANIFEST_TOOL
1952 RANLIB
1953+ac_ct_AR
1954 AR
1955+DLLTOOL
1956 OBJDUMP
1957 LN_S
1958 NM
1959@@ -772,6 +775,7 @@ enable_static
1960 with_pic
1961 enable_fast_install
1962 with_gnu_ld
1963+with_libtool_sysroot
1964 enable_libtool_lock
1965 enable_plugins
1966 enable_largefile
1967@@ -1444,6 +1448,8 @@ Optional Packages:
1968 --with-pic try to use only PIC/non-PIC objects [default=use
1969 both]
1970 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1971+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1972+ (or the compiler's sysroot if not specified).
1973 --with-system-zlib use installed libz
1974 --with-gnu-ld assume the C compiler uses GNU ld default=no
1975 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1976@@ -5160,8 +5166,8 @@ esac
1977
1978
1979
1980-macro_version='2.2.7a'
1981-macro_revision='1.3134'
1982+macro_version='2.4'
1983+macro_revision='1.3293'
1984
1985
1986
1987@@ -5201,7 +5207,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1989 $as_echo_n "checking how to print strings... " >&6; }
1990 # Test print first, because it will be a builtin if present.
1991-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1992+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
1993 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1994 ECHO='print -r --'
1995 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1996@@ -5887,8 +5893,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
1997 # Try some XSI features
1998 xsi_shell=no
1999 ( _lt_dummy="a/b/c"
2000- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2001- = c,a/b,, \
2002+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2003+ = c,a/b,b/c, \
2004 && eval 'test $(( 1 + 1 )) -eq 2 \
2005 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2006 && xsi_shell=yes
2007@@ -5937,6 +5943,80 @@ esac
2008
2009
2010
2011+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2012+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2013+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
2014+ $as_echo_n "(cached) " >&6
2015+else
2016+ case $host in
2017+ *-*-mingw* )
2018+ case $build in
2019+ *-*-mingw* ) # actually msys
2020+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2021+ ;;
2022+ *-*-cygwin* )
2023+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2024+ ;;
2025+ * ) # otherwise, assume *nix
2026+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2027+ ;;
2028+ esac
2029+ ;;
2030+ *-*-cygwin* )
2031+ case $build in
2032+ *-*-mingw* ) # actually msys
2033+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2034+ ;;
2035+ *-*-cygwin* )
2036+ lt_cv_to_host_file_cmd=func_convert_file_noop
2037+ ;;
2038+ * ) # otherwise, assume *nix
2039+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2040+ ;;
2041+ esac
2042+ ;;
2043+ * ) # unhandled hosts (and "normal" native builds)
2044+ lt_cv_to_host_file_cmd=func_convert_file_noop
2045+ ;;
2046+esac
2047+
2048+fi
2049+
2050+to_host_file_cmd=$lt_cv_to_host_file_cmd
2051+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2052+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2053+
2054+
2055+
2056+
2057+
2058+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2059+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2060+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
2061+ $as_echo_n "(cached) " >&6
2062+else
2063+ #assume ordinary cross tools, or native build.
2064+lt_cv_to_tool_file_cmd=func_convert_file_noop
2065+case $host in
2066+ *-*-mingw* )
2067+ case $build in
2068+ *-*-mingw* ) # actually msys
2069+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2070+ ;;
2071+ esac
2072+ ;;
2073+esac
2074+
2075+fi
2076+
2077+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2078+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2079+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2080+
2081+
2082+
2083+
2084+
2085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2086 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2087 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2088@@ -5953,6 +6033,11 @@ case $reload_flag in
2089 esac
2090 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2091 case $host_os in
2092+ cygwin* | mingw* | pw32* | cegcc*)
2093+ if test "$GCC" != yes; then
2094+ reload_cmds=false
2095+ fi
2096+ ;;
2097 darwin*)
2098 if test "$GCC" = yes; then
2099 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2100@@ -6121,7 +6206,8 @@ mingw* | pw32*)
2101 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2102 lt_cv_file_magic_cmd='func_win32_libid'
2103 else
2104- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2105+ # Keep this pattern in sync with the one in func_win32_libid.
2106+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2107 lt_cv_file_magic_cmd='$OBJDUMP -f'
2108 fi
2109 ;;
2110@@ -6275,6 +6361,21 @@ esac
2111 fi
2112 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2113 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2114+
2115+file_magic_glob=
2116+want_nocaseglob=no
2117+if test "$build" = "$host"; then
2118+ case $host_os in
2119+ mingw* | pw32*)
2120+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2121+ want_nocaseglob=yes
2122+ else
2123+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2124+ fi
2125+ ;;
2126+ esac
2127+fi
2128+
2129 file_magic_cmd=$lt_cv_file_magic_cmd
2130 deplibs_check_method=$lt_cv_deplibs_check_method
2131 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2132@@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2133
2134
2135
2136+
2137+
2138+
2139+
2140+
2141+
2142+
2143+
2144+
2145+
2146+if test -n "$ac_tool_prefix"; then
2147+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2148+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2149+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2150+$as_echo_n "checking for $ac_word... " >&6; }
2151+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
2152+ $as_echo_n "(cached) " >&6
2153+else
2154+ if test -n "$DLLTOOL"; then
2155+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2156+else
2157+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2158+for as_dir in $PATH
2159+do
2160+ IFS=$as_save_IFS
2161+ test -z "$as_dir" && as_dir=.
2162+ for ac_exec_ext in '' $ac_executable_extensions; do
2163+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2164+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2165+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2166+ break 2
2167+ fi
2168+done
2169+ done
2170+IFS=$as_save_IFS
2171+
2172+fi
2173+fi
2174+DLLTOOL=$ac_cv_prog_DLLTOOL
2175+if test -n "$DLLTOOL"; then
2176+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2177+$as_echo "$DLLTOOL" >&6; }
2178+else
2179+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2180+$as_echo "no" >&6; }
2181+fi
2182+
2183+
2184+fi
2185+if test -z "$ac_cv_prog_DLLTOOL"; then
2186+ ac_ct_DLLTOOL=$DLLTOOL
2187+ # Extract the first word of "dlltool", so it can be a program name with args.
2188+set dummy dlltool; ac_word=$2
2189+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2190+$as_echo_n "checking for $ac_word... " >&6; }
2191+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
2192+ $as_echo_n "(cached) " >&6
2193+else
2194+ if test -n "$ac_ct_DLLTOOL"; then
2195+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2196+else
2197+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2198+for as_dir in $PATH
2199+do
2200+ IFS=$as_save_IFS
2201+ test -z "$as_dir" && as_dir=.
2202+ for ac_exec_ext in '' $ac_executable_extensions; do
2203+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2204+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2205+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2206+ break 2
2207+ fi
2208+done
2209+ done
2210+IFS=$as_save_IFS
2211+
2212+fi
2213+fi
2214+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2215+if test -n "$ac_ct_DLLTOOL"; then
2216+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2217+$as_echo "$ac_ct_DLLTOOL" >&6; }
2218+else
2219+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2220+$as_echo "no" >&6; }
2221+fi
2222+
2223+ if test "x$ac_ct_DLLTOOL" = x; then
2224+ DLLTOOL="false"
2225+ else
2226+ case $cross_compiling:$ac_tool_warned in
2227+yes:)
2228+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2229+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2230+ac_tool_warned=yes ;;
2231+esac
2232+ DLLTOOL=$ac_ct_DLLTOOL
2233+ fi
2234+else
2235+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2236+fi
2237+
2238+test -z "$DLLTOOL" && DLLTOOL=dlltool
2239+
2240+
2241+
2242+
2243+
2244+
2245+
2246+
2247+
2248+
2249+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2250+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2251+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
2252+ $as_echo_n "(cached) " >&6
2253+else
2254+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2255+
2256+case $host_os in
2257+cygwin* | mingw* | pw32* | cegcc*)
2258+ # two different shell functions defined in ltmain.sh
2259+ # decide which to use based on capabilities of $DLLTOOL
2260+ case `$DLLTOOL --help 2>&1` in
2261+ *--identify-strict*)
2262+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2263+ ;;
2264+ *)
2265+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2266+ ;;
2267+ esac
2268+ ;;
2269+*)
2270+ # fallback: assume linklib IS sharedlib
2271+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2272+ ;;
2273+esac
2274+
2275+fi
2276+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2277+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2278+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2279+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2280+
2281+
2282+
2283+
2284+
2285+
2286+
2287 if test -n "$ac_tool_prefix"; then
2288- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2289-set dummy ${ac_tool_prefix}ar; ac_word=$2
2290+ for ac_prog in ar
2291+ do
2292+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2293+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2294 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2295 $as_echo_n "checking for $ac_word... " >&6; }
2296 if test "${ac_cv_prog_AR+set}" = set; then :
2297@@ -6308,7 +6562,7 @@ do
2298 test -z "$as_dir" && as_dir=.
2299 for ac_exec_ext in '' $ac_executable_extensions; do
2300 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2301- ac_cv_prog_AR="${ac_tool_prefix}ar"
2302+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2303 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2304 break 2
2305 fi
2306@@ -6328,11 +6582,15 @@ $as_echo "no" >&6; }
2307 fi
2308
2309
2310+ test -n "$AR" && break
2311+ done
2312 fi
2313-if test -z "$ac_cv_prog_AR"; then
2314+if test -z "$AR"; then
2315 ac_ct_AR=$AR
2316- # Extract the first word of "ar", so it can be a program name with args.
2317-set dummy ar; ac_word=$2
2318+ for ac_prog in ar
2319+do
2320+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2321+set dummy $ac_prog; ac_word=$2
2322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2323 $as_echo_n "checking for $ac_word... " >&6; }
2324 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2325@@ -6348,7 +6606,7 @@ do
2326 test -z "$as_dir" && as_dir=.
2327 for ac_exec_ext in '' $ac_executable_extensions; do
2328 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2329- ac_cv_prog_ac_ct_AR="ar"
2330+ ac_cv_prog_ac_ct_AR="$ac_prog"
2331 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2332 break 2
2333 fi
2334@@ -6367,6 +6625,10 @@ else
2335 $as_echo "no" >&6; }
2336 fi
2337
2338+
2339+ test -n "$ac_ct_AR" && break
2340+done
2341+
2342 if test "x$ac_ct_AR" = x; then
2343 AR="false"
2344 else
2345@@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;;
2346 esac
2347 AR=$ac_ct_AR
2348 fi
2349-else
2350- AR="$ac_cv_prog_AR"
2351 fi
2352
2353-test -z "$AR" && AR=ar
2354-test -z "$AR_FLAGS" && AR_FLAGS=cru
2355+: ${AR=ar}
2356+: ${AR_FLAGS=cru}
2357
2358
2359
2360@@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2361
2362
2363
2364+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2365+$as_echo_n "checking for archiver @FILE support... " >&6; }
2366+if test "${lt_cv_ar_at_file+set}" = set; then :
2367+ $as_echo_n "(cached) " >&6
2368+else
2369+ lt_cv_ar_at_file=no
2370+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2371+/* end confdefs.h. */
2372+
2373+int
2374+main ()
2375+{
2376+
2377+ ;
2378+ return 0;
2379+}
2380+_ACEOF
2381+if ac_fn_c_try_compile "$LINENO"; then :
2382+ echo conftest.$ac_objext > conftest.lst
2383+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2384+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2385+ (eval $lt_ar_try) 2>&5
2386+ ac_status=$?
2387+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2388+ test $ac_status = 0; }
2389+ if test "$ac_status" -eq 0; then
2390+ # Ensure the archiver fails upon bogus file names.
2391+ rm -f conftest.$ac_objext libconftest.a
2392+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2393+ (eval $lt_ar_try) 2>&5
2394+ ac_status=$?
2395+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2396+ test $ac_status = 0; }
2397+ if test "$ac_status" -ne 0; then
2398+ lt_cv_ar_at_file=@
2399+ fi
2400+ fi
2401+ rm -f conftest.* libconftest.a
2402+
2403+fi
2404+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2405+
2406+fi
2407+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2408+$as_echo "$lt_cv_ar_at_file" >&6; }
2409+
2410+if test "x$lt_cv_ar_at_file" = xno; then
2411+ archiver_list_spec=
2412+else
2413+ archiver_list_spec=$lt_cv_ar_at_file
2414+fi
2415+
2416+
2417+
2418+
2419+
2420+
2421+
2422 if test -n "$ac_tool_prefix"; then
2423 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2424 set dummy ${ac_tool_prefix}strip; ac_word=$2
2425@@ -6729,8 +7047,8 @@ esac
2426 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2427
2428 # Transform an extracted symbol line into symbol name and symbol address
2429-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2430-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
2431+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2432+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
2433
2434 # Handle CRLF in mingw tool chain
2435 opt_cr=
2436@@ -6766,6 +7084,7 @@ for ac_symprfx in "" "_"; do
2437 else
2438 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2439 fi
2440+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2441
2442 # Check to see that the pipe works correctly.
2443 pipe_works=no
2444@@ -6807,6 +7126,18 @@ _LT_EOF
2445 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2446 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2447 cat <<_LT_EOF > conftest.$ac_ext
2448+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2449+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2450+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2451+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2452+# define LT_DLSYM_CONST
2453+#elif defined(__osf__)
2454+/* This system does not cope well with relocations in const data. */
2455+# define LT_DLSYM_CONST
2456+#else
2457+# define LT_DLSYM_CONST const
2458+#endif
2459+
2460 #ifdef __cplusplus
2461 extern "C" {
2462 #endif
2463@@ -6818,7 +7149,7 @@ _LT_EOF
2464 cat <<_LT_EOF >> conftest.$ac_ext
2465
2466 /* The mapping between symbol names and symbols. */
2467-const struct {
2468+LT_DLSYM_CONST struct {
2469 const char *name;
2470 void *address;
2471 }
2472@@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() {
2473 _LT_EOF
2474 # Now try linking the two files.
2475 mv conftest.$ac_objext conftstm.$ac_objext
2476- lt_save_LIBS="$LIBS"
2477- lt_save_CFLAGS="$CFLAGS"
2478+ lt_globsym_save_LIBS=$LIBS
2479+ lt_globsym_save_CFLAGS=$CFLAGS
2480 LIBS="conftstm.$ac_objext"
2481 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2482 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2483@@ -6855,8 +7186,8 @@ _LT_EOF
2484 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2485 pipe_works=yes
2486 fi
2487- LIBS="$lt_save_LIBS"
2488- CFLAGS="$lt_save_CFLAGS"
2489+ LIBS=$lt_globsym_save_LIBS
2490+ CFLAGS=$lt_globsym_save_CFLAGS
2491 else
2492 echo "cannot find nm_test_func in $nlist" >&5
2493 fi
2494@@ -6893,6 +7224,21 @@ else
2495 $as_echo "ok" >&6; }
2496 fi
2497
2498+# Response file support.
2499+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2500+ nm_file_list_spec='@'
2501+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2502+ nm_file_list_spec='@'
2503+fi
2504+
2505+
2506+
2507+
2508+
2509+
2510+
2511+
2512+
2513
2514
2515
2516@@ -6910,6 +7256,40 @@ fi
2517
2518
2519
2520+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2521+$as_echo_n "checking for sysroot... " >&6; }
2522+
2523+# Check whether --with-libtool-sysroot was given.
2524+if test "${with_libtool_sysroot+set}" = set; then :
2525+ withval=$with_libtool_sysroot;
2526+else
2527+ with_libtool_sysroot=no
2528+fi
2529+
2530+
2531+lt_sysroot=
2532+case ${with_libtool_sysroot} in #(
2533+ yes)
2534+ if test "$GCC" = yes; then
2535+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2536+ fi
2537+ ;; #(
2538+ /*)
2539+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2540+ ;; #(
2541+ no|'')
2542+ ;; #(
2543+ *)
2544+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2545+$as_echo "${with_libtool_sysroot}" >&6; }
2546+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
2547+ ;;
2548+esac
2549+
2550+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2551+$as_echo "${lt_sysroot:-no}" >&6; }
2552+
2553+
2554
2555
2556
2557@@ -7120,6 +7500,123 @@ esac
2558
2559 need_locks="$enable_libtool_lock"
2560
2561+if test -n "$ac_tool_prefix"; then
2562+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2563+set dummy ${ac_tool_prefix}mt; ac_word=$2
2564+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2565+$as_echo_n "checking for $ac_word... " >&6; }
2566+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
2567+ $as_echo_n "(cached) " >&6
2568+else
2569+ if test -n "$MANIFEST_TOOL"; then
2570+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2571+else
2572+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2573+for as_dir in $PATH
2574+do
2575+ IFS=$as_save_IFS
2576+ test -z "$as_dir" && as_dir=.
2577+ for ac_exec_ext in '' $ac_executable_extensions; do
2578+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2579+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2580+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2581+ break 2
2582+ fi
2583+done
2584+ done
2585+IFS=$as_save_IFS
2586+
2587+fi
2588+fi
2589+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2590+if test -n "$MANIFEST_TOOL"; then
2591+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2592+$as_echo "$MANIFEST_TOOL" >&6; }
2593+else
2594+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2595+$as_echo "no" >&6; }
2596+fi
2597+
2598+
2599+fi
2600+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2601+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2602+ # Extract the first word of "mt", so it can be a program name with args.
2603+set dummy mt; ac_word=$2
2604+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2605+$as_echo_n "checking for $ac_word... " >&6; }
2606+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
2607+ $as_echo_n "(cached) " >&6
2608+else
2609+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2610+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2611+else
2612+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2613+for as_dir in $PATH
2614+do
2615+ IFS=$as_save_IFS
2616+ test -z "$as_dir" && as_dir=.
2617+ for ac_exec_ext in '' $ac_executable_extensions; do
2618+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2619+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2620+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2621+ break 2
2622+ fi
2623+done
2624+ done
2625+IFS=$as_save_IFS
2626+
2627+fi
2628+fi
2629+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2630+if test -n "$ac_ct_MANIFEST_TOOL"; then
2631+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2632+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2633+else
2634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2635+$as_echo "no" >&6; }
2636+fi
2637+
2638+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2639+ MANIFEST_TOOL=":"
2640+ else
2641+ case $cross_compiling:$ac_tool_warned in
2642+yes:)
2643+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2644+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2645+ac_tool_warned=yes ;;
2646+esac
2647+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2648+ fi
2649+else
2650+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2651+fi
2652+
2653+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2654+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2655+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2656+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
2657+ $as_echo_n "(cached) " >&6
2658+else
2659+ lt_cv_path_mainfest_tool=no
2660+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2661+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2662+ cat conftest.err >&5
2663+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2664+ lt_cv_path_mainfest_tool=yes
2665+ fi
2666+ rm -f conftest*
2667+fi
2668+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2669+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2670+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2671+ MANIFEST_TOOL=:
2672+fi
2673+
2674+
2675+
2676+
2677+
2678
2679 case $host_os in
2680 rhapsody* | darwin*)
2681@@ -7683,6 +8180,8 @@ _LT_EOF
2682 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2683 echo "$AR cru libconftest.a conftest.o" >&5
2684 $AR cru libconftest.a conftest.o 2>&5
2685+ echo "$RANLIB libconftest.a" >&5
2686+ $RANLIB libconftest.a 2>&5
2687 cat > conftest.c << _LT_EOF
2688 int main() { return 0;}
2689 _LT_EOF
2690@@ -7878,7 +8377,8 @@ fi
2691 LIBTOOL_DEPS="$ltmain"
2692
2693 # Always use our own libtool.
2694-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2695+LIBTOOL='$(SHELL) $(top_builddir)'
2696+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2697
2698
2699
2700@@ -7967,7 +8467,7 @@ aix3*)
2701 esac
2702
2703 # Global variables:
2704-ofile=libtool
2705+ofile=${host_alias}-libtool
2706 can_build_shared=yes
2707
2708 # All known linkers require a `.a' archive for static linking (except MSVC,
2709@@ -8265,8 +8765,6 @@ fi
2710 lt_prog_compiler_pic=
2711 lt_prog_compiler_static=
2712
2713-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2714-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2715
2716 if test "$GCC" = yes; then
2717 lt_prog_compiler_wl='-Wl,'
2718@@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2719 lt_prog_compiler_pic='--shared'
2720 lt_prog_compiler_static='--static'
2721 ;;
2722+ nagfor*)
2723+ # NAG Fortran compiler
2724+ lt_prog_compiler_wl='-Wl,-Wl,,'
2725+ lt_prog_compiler_pic='-PIC'
2726+ lt_prog_compiler_static='-Bstatic'
2727+ ;;
2728 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2729 # Portland Group compilers (*not* the Pentium gcc compiler,
2730 # which looks to be a dead project)
2731@@ -8494,7 +8998,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2732 lt_prog_compiler_pic='-KPIC'
2733 lt_prog_compiler_static='-Bstatic'
2734 case $cc_basename in
2735- f77* | f90* | f95*)
2736+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2737 lt_prog_compiler_wl='-Qoption ld ';;
2738 *)
2739 lt_prog_compiler_wl='-Wl,';;
2740@@ -8551,13 +9055,17 @@ case $host_os in
2741 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2742 ;;
2743 esac
2744-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2745-$as_echo "$lt_prog_compiler_pic" >&6; }
2746-
2747-
2748-
2749-
2750
2751+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2752+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2753+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
2754+ $as_echo_n "(cached) " >&6
2755+else
2756+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2757+fi
2758+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2759+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2760+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2761
2762 #
2763 # Check to make sure the PIC flag actually works.
2764@@ -8618,6 +9126,11 @@ fi
2765
2766
2767
2768+
2769+
2770+
2771+
2772+
2773 #
2774 # Check to make sure the static flag actually works.
2775 #
2776@@ -8968,7 +9481,8 @@ _LT_EOF
2777 allow_undefined_flag=unsupported
2778 always_export_symbols=no
2779 enable_shared_with_static_runtimes=yes
2780- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2781+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
2782+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2783
2784 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2785 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2786@@ -9067,12 +9581,12 @@ _LT_EOF
2787 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2788 hardcode_libdir_flag_spec=
2789 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2790- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2791+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2792 if test "x$supports_anon_versioning" = xyes; then
2793 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2794 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2795 echo "local: *; };" >> $output_objdir/$libname.ver~
2796- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2797+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2798 fi
2799 ;;
2800 esac
2801@@ -9086,8 +9600,8 @@ _LT_EOF
2802 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2803 wlarc=
2804 else
2805- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2806- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2807+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2808+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2809 fi
2810 ;;
2811
2812@@ -9105,8 +9619,8 @@ _LT_EOF
2813
2814 _LT_EOF
2815 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2816- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2817- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2818+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2819+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2820 else
2821 ld_shlibs=no
2822 fi
2823@@ -9152,8 +9666,8 @@ _LT_EOF
2824
2825 *)
2826 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2827- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2828- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2829+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2830+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2831 else
2832 ld_shlibs=no
2833 fi
2834@@ -9283,7 +9797,13 @@ _LT_EOF
2835 allow_undefined_flag='-berok'
2836 # Determine the default libpath from the value encoded in an
2837 # empty executable.
2838- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2839+ if test "${lt_cv_aix_libpath+set}" = set; then
2840+ aix_libpath=$lt_cv_aix_libpath
2841+else
2842+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2843+ $as_echo_n "(cached) " >&6
2844+else
2845+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2846 /* end confdefs.h. */
2847
2848 int
2849@@ -9296,22 +9816,29 @@ main ()
2850 _ACEOF
2851 if ac_fn_c_try_link "$LINENO"; then :
2852
2853-lt_aix_libpath_sed='
2854- /Import File Strings/,/^$/ {
2855- /^0/ {
2856- s/^0 *\(.*\)$/\1/
2857- p
2858- }
2859- }'
2860-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2861-# Check for a 64-bit object if we didn't find anything.
2862-if test -z "$aix_libpath"; then
2863- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2864-fi
2865+ lt_aix_libpath_sed='
2866+ /Import File Strings/,/^$/ {
2867+ /^0/ {
2868+ s/^0 *\([^ ]*\) *$/\1/
2869+ p
2870+ }
2871+ }'
2872+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2873+ # Check for a 64-bit object if we didn't find anything.
2874+ if test -z "$lt_cv_aix_libpath_"; then
2875+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2876+ fi
2877 fi
2878 rm -f core conftest.err conftest.$ac_objext \
2879 conftest$ac_exeext conftest.$ac_ext
2880-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2881+ if test -z "$lt_cv_aix_libpath_"; then
2882+ lt_cv_aix_libpath_="/usr/lib:/lib"
2883+ fi
2884+
2885+fi
2886+
2887+ aix_libpath=$lt_cv_aix_libpath_
2888+fi
2889
2890 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2891 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2892@@ -9323,7 +9850,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2893 else
2894 # Determine the default libpath from the value encoded in an
2895 # empty executable.
2896- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2897+ if test "${lt_cv_aix_libpath+set}" = set; then
2898+ aix_libpath=$lt_cv_aix_libpath
2899+else
2900+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2901+ $as_echo_n "(cached) " >&6
2902+else
2903+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2904 /* end confdefs.h. */
2905
2906 int
2907@@ -9336,22 +9869,29 @@ main ()
2908 _ACEOF
2909 if ac_fn_c_try_link "$LINENO"; then :
2910
2911-lt_aix_libpath_sed='
2912- /Import File Strings/,/^$/ {
2913- /^0/ {
2914- s/^0 *\(.*\)$/\1/
2915- p
2916- }
2917- }'
2918-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2919-# Check for a 64-bit object if we didn't find anything.
2920-if test -z "$aix_libpath"; then
2921- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2922-fi
2923+ lt_aix_libpath_sed='
2924+ /Import File Strings/,/^$/ {
2925+ /^0/ {
2926+ s/^0 *\([^ ]*\) *$/\1/
2927+ p
2928+ }
2929+ }'
2930+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2931+ # Check for a 64-bit object if we didn't find anything.
2932+ if test -z "$lt_cv_aix_libpath_"; then
2933+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2934+ fi
2935 fi
2936 rm -f core conftest.err conftest.$ac_objext \
2937 conftest$ac_exeext conftest.$ac_ext
2938-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2939+ if test -z "$lt_cv_aix_libpath_"; then
2940+ lt_cv_aix_libpath_="/usr/lib:/lib"
2941+ fi
2942+
2943+fi
2944+
2945+ aix_libpath=$lt_cv_aix_libpath_
2946+fi
2947
2948 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2949 # Warning - without using the other run time loading flags,
2950@@ -9396,20 +9936,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2951 # Microsoft Visual C++.
2952 # hardcode_libdir_flag_spec is actually meaningless, as there is
2953 # no search path for DLLs.
2954- hardcode_libdir_flag_spec=' '
2955- allow_undefined_flag=unsupported
2956- # Tell ltmain to make .lib files, not .a files.
2957- libext=lib
2958- # Tell ltmain to make .dll files, not .so files.
2959- shrext_cmds=".dll"
2960- # FIXME: Setting linknames here is a bad hack.
2961- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2962- # The linker will automatically build a .lib file if we build a DLL.
2963- old_archive_from_new_cmds='true'
2964- # FIXME: Should let the user specify the lib program.
2965- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2966- fix_srcfile_path='`cygpath -w "$srcfile"`'
2967- enable_shared_with_static_runtimes=yes
2968+ case $cc_basename in
2969+ cl*)
2970+ # Native MSVC
2971+ hardcode_libdir_flag_spec=' '
2972+ allow_undefined_flag=unsupported
2973+ always_export_symbols=yes
2974+ file_list_spec='@'
2975+ # Tell ltmain to make .lib files, not .a files.
2976+ libext=lib
2977+ # Tell ltmain to make .dll files, not .so files.
2978+ shrext_cmds=".dll"
2979+ # FIXME: Setting linknames here is a bad hack.
2980+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2981+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2982+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2983+ else
2984+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2985+ fi~
2986+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2987+ linknames='
2988+ # The linker will not automatically build a static lib if we build a DLL.
2989+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
2990+ enable_shared_with_static_runtimes=yes
2991+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2992+ # Don't use ranlib
2993+ old_postinstall_cmds='chmod 644 $oldlib'
2994+ postlink_cmds='lt_outputfile="@OUTPUT@"~
2995+ lt_tool_outputfile="@TOOL_OUTPUT@"~
2996+ case $lt_outputfile in
2997+ *.exe|*.EXE) ;;
2998+ *)
2999+ lt_outputfile="$lt_outputfile.exe"
3000+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3001+ ;;
3002+ esac~
3003+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3004+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3005+ $RM "$lt_outputfile.manifest";
3006+ fi'
3007+ ;;
3008+ *)
3009+ # Assume MSVC wrapper
3010+ hardcode_libdir_flag_spec=' '
3011+ allow_undefined_flag=unsupported
3012+ # Tell ltmain to make .lib files, not .a files.
3013+ libext=lib
3014+ # Tell ltmain to make .dll files, not .so files.
3015+ shrext_cmds=".dll"
3016+ # FIXME: Setting linknames here is a bad hack.
3017+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3018+ # The linker will automatically build a .lib file if we build a DLL.
3019+ old_archive_from_new_cmds='true'
3020+ # FIXME: Should let the user specify the lib program.
3021+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3022+ enable_shared_with_static_runtimes=yes
3023+ ;;
3024+ esac
3025 ;;
3026
3027 darwin* | rhapsody*)
3028@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3029
3030 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3031 freebsd* | dragonfly*)
3032- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3033+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3034 hardcode_libdir_flag_spec='-R$libdir'
3035 hardcode_direct=yes
3036 hardcode_shlibpath_var=no
3037@@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3038
3039 hpux9*)
3040 if test "$GCC" = yes; then
3041- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3042+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3043 else
3044 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3045 fi
3046@@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3047
3048 hpux10*)
3049 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3050- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3051+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3052 else
3053 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3054 fi
3055@@ -9518,10 +10101,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3056 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3057 ;;
3058 ia64*)
3059- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3060+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3061 ;;
3062 *)
3063- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3064+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3065 ;;
3066 esac
3067 else
3068@@ -9600,23 +10183,36 @@ fi
3069
3070 irix5* | irix6* | nonstopux*)
3071 if test "$GCC" = yes; then
3072- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3073+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3074 # Try to use the -exported_symbol ld option, if it does not
3075 # work, assume that -exports_file does not work either and
3076 # implicitly export all symbols.
3077- save_LDFLAGS="$LDFLAGS"
3078- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3079- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3080+ # This should be the same for all languages, so no per-tag cache variable.
3081+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3082+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3083+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
3084+ $as_echo_n "(cached) " >&6
3085+else
3086+ save_LDFLAGS="$LDFLAGS"
3087+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3088+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3089 /* end confdefs.h. */
3090-int foo(void) {}
3091+int foo (void) { return 0; }
3092 _ACEOF
3093 if ac_fn_c_try_link "$LINENO"; then :
3094- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
3095-
3096+ lt_cv_irix_exported_symbol=yes
3097+else
3098+ lt_cv_irix_exported_symbol=no
3099 fi
3100 rm -f core conftest.err conftest.$ac_objext \
3101 conftest$ac_exeext conftest.$ac_ext
3102- LDFLAGS="$save_LDFLAGS"
3103+ LDFLAGS="$save_LDFLAGS"
3104+fi
3105+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3106+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3107+ if test "$lt_cv_irix_exported_symbol" = yes; then
3108+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
3109+ fi
3110 else
3111 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
3112 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
3113@@ -9701,7 +10297,7 @@ rm -f core conftest.err conftest.$ac_objext \
3114 osf4* | osf5*) # as osf3* with the addition of -msym flag
3115 if test "$GCC" = yes; then
3116 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3117- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3118+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3119 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3120 else
3121 allow_undefined_flag=' -expect_unresolved \*'
3122@@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \
3123 no_undefined_flag=' -z defs'
3124 if test "$GCC" = yes; then
3125 wlarc='${wl}'
3126- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3127+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3128 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3129- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3130+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3131 else
3132 case `$CC -V 2>&1` in
3133 *"Compilers 5.0"*)
3134@@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3135 need_version=no
3136 need_lib_prefix=no
3137
3138- case $GCC,$host_os in
3139- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3140+ case $GCC,$cc_basename in
3141+ yes,*)
3142+ # gcc
3143 library_names_spec='$libname.dll.a'
3144 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3145 postinstall_cmds='base_file=`basename \${file}`~
3146@@ -10332,13 +10929,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3147 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3148 ;;
3149 esac
3150+ dynamic_linker='Win32 ld.exe'
3151+ ;;
3152+
3153+ *,cl*)
3154+ # Native MSVC
3155+ libname_spec='$name'
3156+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3157+ library_names_spec='${libname}.dll.lib'
3158+
3159+ case $build_os in
3160+ mingw*)
3161+ sys_lib_search_path_spec=
3162+ lt_save_ifs=$IFS
3163+ IFS=';'
3164+ for lt_path in $LIB
3165+ do
3166+ IFS=$lt_save_ifs
3167+ # Let DOS variable expansion print the short 8.3 style file name.
3168+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3169+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3170+ done
3171+ IFS=$lt_save_ifs
3172+ # Convert to MSYS style.
3173+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3174+ ;;
3175+ cygwin*)
3176+ # Convert to unix form, then to dos form, then back to unix form
3177+ # but this time dos style (no spaces!) so that the unix form looks
3178+ # like /cygdrive/c/PROGRA~1:/cygdr...
3179+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3180+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3181+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3182+ ;;
3183+ *)
3184+ sys_lib_search_path_spec="$LIB"
3185+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3186+ # It is most probably a Windows format PATH.
3187+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3188+ else
3189+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3190+ fi
3191+ # FIXME: find the short name or the path components, as spaces are
3192+ # common. (e.g. "Program Files" -> "PROGRA~1")
3193+ ;;
3194+ esac
3195+
3196+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3197+ postinstall_cmds='base_file=`basename \${file}`~
3198+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3199+ dldir=$destdir/`dirname \$dlpath`~
3200+ test -d \$dldir || mkdir -p \$dldir~
3201+ $install_prog $dir/$dlname \$dldir/$dlname'
3202+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3203+ dlpath=$dir/\$dldll~
3204+ $RM \$dlpath'
3205+ shlibpath_overrides_runpath=yes
3206+ dynamic_linker='Win32 link.exe'
3207 ;;
3208
3209 *)
3210+ # Assume MSVC wrapper
3211 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3212+ dynamic_linker='Win32 ld.exe'
3213 ;;
3214 esac
3215- dynamic_linker='Win32 ld.exe'
3216 # FIXME: first we should search . and the directory the executable is in
3217 shlibpath_var=PATH
3218 ;;
3219@@ -10430,7 +11085,7 @@ haiku*)
3220 soname_spec='${libname}${release}${shared_ext}$major'
3221 shlibpath_var=LIBRARY_PATH
3222 shlibpath_overrides_runpath=yes
3223- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3224+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3225 hardcode_into_libs=yes
3226 ;;
3227
3228@@ -11270,10 +11925,10 @@ else
3229 /* When -fvisbility=hidden is used, assume the code has been annotated
3230 correspondingly for the symbols needed. */
3231 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3232-void fnord () __attribute__((visibility("default")));
3233+int fnord () __attribute__((visibility("default")));
3234 #endif
3235
3236-void fnord () { int i=42; }
3237+int fnord () { return 42; }
3238 int main ()
3239 {
3240 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3241@@ -11376,10 +12031,10 @@ else
3242 /* When -fvisbility=hidden is used, assume the code has been annotated
3243 correspondingly for the symbols needed. */
3244 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3245-void fnord () __attribute__((visibility("default")));
3246+int fnord () __attribute__((visibility("default")));
3247 #endif
3248
3249-void fnord () { int i=42; }
3250+int fnord () { return 42; }
3251 int main ()
3252 {
3253 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3254@@ -15436,13 +16091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3255 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3256 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3257 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3258+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3259+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3260 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3261 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3262 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3263 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3264 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3265+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3266+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3267+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3268+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3269 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3270 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3271+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3272 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3273 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3274 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3275@@ -15457,14 +16119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3276 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3277 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3278 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
3279+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3280+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3281 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3282 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3283 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3284-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3285 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3286+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3287 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3288 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3289 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3290+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3291 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3292 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3293 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3294@@ -15497,12 +16162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3295 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3296 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3297 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3298-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3299 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3300 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3301 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3302 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3303 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3304+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3305 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3306 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3307 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3308@@ -15557,8 +16222,13 @@ reload_flag \
3309 OBJDUMP \
3310 deplibs_check_method \
3311 file_magic_cmd \
3312+file_magic_glob \
3313+want_nocaseglob \
3314+DLLTOOL \
3315+sharedlib_from_linklib_cmd \
3316 AR \
3317 AR_FLAGS \
3318+archiver_list_spec \
3319 STRIP \
3320 RANLIB \
3321 CC \
3322@@ -15568,12 +16238,14 @@ lt_cv_sys_global_symbol_pipe \
3323 lt_cv_sys_global_symbol_to_cdecl \
3324 lt_cv_sys_global_symbol_to_c_name_address \
3325 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3326+nm_file_list_spec \
3327 lt_prog_compiler_no_builtin_flag \
3328-lt_prog_compiler_wl \
3329 lt_prog_compiler_pic \
3330+lt_prog_compiler_wl \
3331 lt_prog_compiler_static \
3332 lt_cv_prog_compiler_c_o \
3333 need_locks \
3334+MANIFEST_TOOL \
3335 DSYMUTIL \
3336 NMEDIT \
3337 LIPO \
3338@@ -15589,7 +16261,6 @@ no_undefined_flag \
3339 hardcode_libdir_flag_spec \
3340 hardcode_libdir_flag_spec_ld \
3341 hardcode_libdir_separator \
3342-fix_srcfile_path \
3343 exclude_expsyms \
3344 include_expsyms \
3345 file_list_spec \
3346@@ -15625,6 +16296,7 @@ module_cmds \
3347 module_expsym_cmds \
3348 export_symbols_cmds \
3349 prelink_cmds \
3350+postlink_cmds \
3351 postinstall_cmds \
3352 postuninstall_cmds \
3353 finish_cmds \
3354@@ -16382,7 +17054,8 @@ $as_echo X"$file" |
3355 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3356 #
3357 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3358-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3359+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3360+# Inc.
3361 # Written by Gordon Matzigkeit, 1996
3362 #
3363 # This file is part of GNU Libtool.
3364@@ -16485,19 +17158,42 @@ SP2NL=$lt_lt_SP2NL
3365 # turn newlines into spaces.
3366 NL2SP=$lt_lt_NL2SP
3367
3368+# convert \$build file names to \$host format.
3369+to_host_file_cmd=$lt_cv_to_host_file_cmd
3370+
3371+# convert \$build files to toolchain format.
3372+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3373+
3374 # An object symbol dumper.
3375 OBJDUMP=$lt_OBJDUMP
3376
3377 # Method to check whether dependent libraries are shared objects.
3378 deplibs_check_method=$lt_deplibs_check_method
3379
3380-# Command to use when deplibs_check_method == "file_magic".
3381+# Command to use when deplibs_check_method = "file_magic".
3382 file_magic_cmd=$lt_file_magic_cmd
3383
3384+# How to find potential files when deplibs_check_method = "file_magic".
3385+file_magic_glob=$lt_file_magic_glob
3386+
3387+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3388+want_nocaseglob=$lt_want_nocaseglob
3389+
3390+# DLL creation program.
3391+DLLTOOL=$lt_DLLTOOL
3392+
3393+# Command to associate shared and link libraries.
3394+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3395+
3396 # The archiver.
3397 AR=$lt_AR
3398+
3399+# Flags to create an archive.
3400 AR_FLAGS=$lt_AR_FLAGS
3401
3402+# How to feed a file listing to the archiver.
3403+archiver_list_spec=$lt_archiver_list_spec
3404+
3405 # A symbol stripping program.
3406 STRIP=$lt_STRIP
3407
3408@@ -16527,6 +17223,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3409 # Transform the output of nm in a C name address pair when lib prefix is needed.
3410 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3411
3412+# Specify filename containing input files for \$NM.
3413+nm_file_list_spec=$lt_nm_file_list_spec
3414+
3415+# The root where to search for dependent libraries,and in which our libraries should be installed.
3416+lt_sysroot=$lt_sysroot
3417+
3418 # The name of the directory that contains temporary libtool files.
3419 objdir=$objdir
3420
3421@@ -16536,6 +17238,9 @@ MAGIC_CMD=$MAGIC_CMD
3422 # Must we lock files when doing compilation?
3423 need_locks=$lt_need_locks
3424
3425+# Manifest tool.
3426+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3427+
3428 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3429 DSYMUTIL=$lt_DSYMUTIL
3430
3431@@ -16650,12 +17355,12 @@ with_gcc=$GCC
3432 # Compiler flag to turn off builtin functions.
3433 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3434
3435-# How to pass a linker flag through the compiler.
3436-wl=$lt_lt_prog_compiler_wl
3437-
3438 # Additional compiler flags for building library objects.
3439 pic_flag=$lt_lt_prog_compiler_pic
3440
3441+# How to pass a linker flag through the compiler.
3442+wl=$lt_lt_prog_compiler_wl
3443+
3444 # Compiler flag to prevent dynamic linking.
3445 link_static_flag=$lt_lt_prog_compiler_static
3446
3447@@ -16742,9 +17447,6 @@ inherit_rpath=$inherit_rpath
3448 # Whether libtool must link a program against all its dependency libraries.
3449 link_all_deplibs=$link_all_deplibs
3450
3451-# Fix the shell variable \$srcfile for the compiler.
3452-fix_srcfile_path=$lt_fix_srcfile_path
3453-
3454 # Set to "yes" if exported symbols are required.
3455 always_export_symbols=$always_export_symbols
3456
3457@@ -16760,6 +17462,9 @@ include_expsyms=$lt_include_expsyms
3458 # Commands necessary for linking programs (against libraries) with templates.
3459 prelink_cmds=$lt_prelink_cmds
3460
3461+# Commands necessary for finishing linking programs.
3462+postlink_cmds=$lt_postlink_cmds
3463+
3464 # Specify filename containing input files.
3465 file_list_spec=$lt_file_list_spec
3466
3467@@ -16792,210 +17497,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3468 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3469 # text mode, it properly converts lines to CR/LF. This bash problem
3470 # is reportedly fixed, but why not run on old versions too?
3471- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3472- || (rm -f "$cfgfile"; exit 1)
3473-
3474- case $xsi_shell in
3475- yes)
3476- cat << \_LT_EOF >> "$cfgfile"
3477-
3478-# func_dirname file append nondir_replacement
3479-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3480-# otherwise set result to NONDIR_REPLACEMENT.
3481-func_dirname ()
3482-{
3483- case ${1} in
3484- */*) func_dirname_result="${1%/*}${2}" ;;
3485- * ) func_dirname_result="${3}" ;;
3486- esac
3487-}
3488-
3489-# func_basename file
3490-func_basename ()
3491-{
3492- func_basename_result="${1##*/}"
3493-}
3494-
3495-# func_dirname_and_basename file append nondir_replacement
3496-# perform func_basename and func_dirname in a single function
3497-# call:
3498-# dirname: Compute the dirname of FILE. If nonempty,
3499-# add APPEND to the result, otherwise set result
3500-# to NONDIR_REPLACEMENT.
3501-# value returned in "$func_dirname_result"
3502-# basename: Compute filename of FILE.
3503-# value retuned in "$func_basename_result"
3504-# Implementation must be kept synchronized with func_dirname
3505-# and func_basename. For efficiency, we do not delegate to
3506-# those functions but instead duplicate the functionality here.
3507-func_dirname_and_basename ()
3508-{
3509- case ${1} in
3510- */*) func_dirname_result="${1%/*}${2}" ;;
3511- * ) func_dirname_result="${3}" ;;
3512- esac
3513- func_basename_result="${1##*/}"
3514-}
3515-
3516-# func_stripname prefix suffix name
3517-# strip PREFIX and SUFFIX off of NAME.
3518-# PREFIX and SUFFIX must not contain globbing or regex special
3519-# characters, hashes, percent signs, but SUFFIX may contain a leading
3520-# dot (in which case that matches only a dot).
3521-func_stripname ()
3522-{
3523- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3524- # positional parameters, so assign one to ordinary parameter first.
3525- func_stripname_result=${3}
3526- func_stripname_result=${func_stripname_result#"${1}"}
3527- func_stripname_result=${func_stripname_result%"${2}"}
3528-}
3529-
3530-# func_opt_split
3531-func_opt_split ()
3532-{
3533- func_opt_split_opt=${1%%=*}
3534- func_opt_split_arg=${1#*=}
3535-}
3536-
3537-# func_lo2o object
3538-func_lo2o ()
3539-{
3540- case ${1} in
3541- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3542- *) func_lo2o_result=${1} ;;
3543- esac
3544-}
3545-
3546-# func_xform libobj-or-source
3547-func_xform ()
3548-{
3549- func_xform_result=${1%.*}.lo
3550-}
3551-
3552-# func_arith arithmetic-term...
3553-func_arith ()
3554-{
3555- func_arith_result=$(( $* ))
3556-}
3557-
3558-# func_len string
3559-# STRING may not start with a hyphen.
3560-func_len ()
3561-{
3562- func_len_result=${#1}
3563-}
3564-
3565-_LT_EOF
3566- ;;
3567- *) # Bourne compatible functions.
3568- cat << \_LT_EOF >> "$cfgfile"
3569-
3570-# func_dirname file append nondir_replacement
3571-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3572-# otherwise set result to NONDIR_REPLACEMENT.
3573-func_dirname ()
3574-{
3575- # Extract subdirectory from the argument.
3576- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3577- if test "X$func_dirname_result" = "X${1}"; then
3578- func_dirname_result="${3}"
3579- else
3580- func_dirname_result="$func_dirname_result${2}"
3581- fi
3582-}
3583-
3584-# func_basename file
3585-func_basename ()
3586-{
3587- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3588-}
3589-
3590-
3591-# func_stripname prefix suffix name
3592-# strip PREFIX and SUFFIX off of NAME.
3593-# PREFIX and SUFFIX must not contain globbing or regex special
3594-# characters, hashes, percent signs, but SUFFIX may contain a leading
3595-# dot (in which case that matches only a dot).
3596-# func_strip_suffix prefix name
3597-func_stripname ()
3598-{
3599- case ${2} in
3600- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3601- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3602- esac
3603-}
3604-
3605-# sed scripts:
3606-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3607-my_sed_long_arg='1s/^-[^=]*=//'
3608-
3609-# func_opt_split
3610-func_opt_split ()
3611-{
3612- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3613- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3614-}
3615-
3616-# func_lo2o object
3617-func_lo2o ()
3618-{
3619- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3620-}
3621-
3622-# func_xform libobj-or-source
3623-func_xform ()
3624-{
3625- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3626-}
3627-
3628-# func_arith arithmetic-term...
3629-func_arith ()
3630-{
3631- func_arith_result=`expr "$@"`
3632-}
3633-
3634-# func_len string
3635-# STRING may not start with a hyphen.
3636-func_len ()
3637-{
3638- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3639-}
3640-
3641-_LT_EOF
3642-esac
3643-
3644-case $lt_shell_append in
3645- yes)
3646- cat << \_LT_EOF >> "$cfgfile"
3647-
3648-# func_append var value
3649-# Append VALUE to the end of shell variable VAR.
3650-func_append ()
3651-{
3652- eval "$1+=\$2"
3653-}
3654-_LT_EOF
3655- ;;
3656- *)
3657- cat << \_LT_EOF >> "$cfgfile"
3658-
3659-# func_append var value
3660-# Append VALUE to the end of shell variable VAR.
3661-func_append ()
3662-{
3663- eval "$1=\$$1\$2"
3664-}
3665-
3666-_LT_EOF
3667- ;;
3668- esac
3669-
3670-
3671- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3672- || (rm -f "$cfgfile"; exit 1)
3673-
3674- mv -f "$cfgfile" "$ofile" ||
3675+ sed '$q' "$ltmain" >> "$cfgfile" \
3676+ || (rm -f "$cfgfile"; exit 1)
3677+
3678+ if test x"$xsi_shell" = xyes; then
3679+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3680+func_dirname ()\
3681+{\
3682+\ case ${1} in\
3683+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3684+\ * ) func_dirname_result="${3}" ;;\
3685+\ esac\
3686+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3687+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3688+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3689+test 0 -eq $? || _lt_function_replace_fail=:
3690+
3691+
3692+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3693+func_basename ()\
3694+{\
3695+\ func_basename_result="${1##*/}"\
3696+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3697+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3698+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3699+test 0 -eq $? || _lt_function_replace_fail=:
3700+
3701+
3702+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3703+func_dirname_and_basename ()\
3704+{\
3705+\ case ${1} in\
3706+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3707+\ * ) func_dirname_result="${3}" ;;\
3708+\ esac\
3709+\ func_basename_result="${1##*/}"\
3710+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3711+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3712+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3713+test 0 -eq $? || _lt_function_replace_fail=:
3714+
3715+
3716+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3717+func_stripname ()\
3718+{\
3719+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3720+\ # positional parameters, so assign one to ordinary parameter first.\
3721+\ func_stripname_result=${3}\
3722+\ func_stripname_result=${func_stripname_result#"${1}"}\
3723+\ func_stripname_result=${func_stripname_result%"${2}"}\
3724+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3727+test 0 -eq $? || _lt_function_replace_fail=:
3728+
3729+
3730+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3731+func_split_long_opt ()\
3732+{\
3733+\ func_split_long_opt_name=${1%%=*}\
3734+\ func_split_long_opt_arg=${1#*=}\
3735+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3736+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3737+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3738+test 0 -eq $? || _lt_function_replace_fail=:
3739+
3740+
3741+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3742+func_split_short_opt ()\
3743+{\
3744+\ func_split_short_opt_arg=${1#??}\
3745+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3746+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3747+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3748+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3749+test 0 -eq $? || _lt_function_replace_fail=:
3750+
3751+
3752+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3753+func_lo2o ()\
3754+{\
3755+\ case ${1} in\
3756+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3757+\ *) func_lo2o_result=${1} ;;\
3758+\ esac\
3759+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3760+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3761+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3762+test 0 -eq $? || _lt_function_replace_fail=:
3763+
3764+
3765+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3766+func_xform ()\
3767+{\
3768+ func_xform_result=${1%.*}.lo\
3769+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3770+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3771+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3772+test 0 -eq $? || _lt_function_replace_fail=:
3773+
3774+
3775+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3776+func_arith ()\
3777+{\
3778+ func_arith_result=$(( $* ))\
3779+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3780+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3781+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3782+test 0 -eq $? || _lt_function_replace_fail=:
3783+
3784+
3785+ sed -e '/^func_len ()$/,/^} # func_len /c\
3786+func_len ()\
3787+{\
3788+ func_len_result=${#1}\
3789+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3790+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3791+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3792+test 0 -eq $? || _lt_function_replace_fail=:
3793+
3794+fi
3795+
3796+if test x"$lt_shell_append" = xyes; then
3797+ sed -e '/^func_append ()$/,/^} # func_append /c\
3798+func_append ()\
3799+{\
3800+ eval "${1}+=\\${2}"\
3801+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3802+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3803+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3804+test 0 -eq $? || _lt_function_replace_fail=:
3805+
3806+
3807+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3808+func_append_quoted ()\
3809+{\
3810+\ func_quote_for_eval "${2}"\
3811+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3812+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3813+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3814+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3815+test 0 -eq $? || _lt_function_replace_fail=:
3816+
3817+
3818+ # Save a `func_append' function call where possible by direct use of '+='
3819+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3820+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3821+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3822+ test 0 -eq $? || _lt_function_replace_fail=:
3823+else
3824+ # Save a `func_append' function call even when '+=' is not available
3825+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3826+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3827+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3828+ test 0 -eq $? || _lt_function_replace_fail=:
3829+fi
3830+
3831+if test x"$_lt_function_replace_fail" = x":"; then
3832+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3833+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3834+fi
3835+
3836+
3837+ mv -f "$cfgfile" "$ofile" ||
3838 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3839 chmod +x "$ofile"
3840
3841diff --git a/gas/configure b/gas/configure
3842index e574cb8514..a36f1ae161 100755
3843--- a/gas/configure
3844+++ b/gas/configure
3845@@ -650,8 +650,11 @@ OTOOL
3846 LIPO
3847 NMEDIT
3848 DSYMUTIL
3849+MANIFEST_TOOL
3850 RANLIB
3851+ac_ct_AR
3852 AR
3853+DLLTOOL
3854 OBJDUMP
3855 LN_S
3856 NM
3857@@ -763,6 +766,7 @@ enable_static
3858 with_pic
3859 enable_fast_install
3860 with_gnu_ld
3861+with_libtool_sysroot
3862 enable_libtool_lock
3863 enable_plugins
3864 enable_largefile
3865@@ -4921,8 +4925,8 @@ esac
3866
3867
3868
3869-macro_version='2.2.7a'
3870-macro_revision='1.3134'
3871+macro_version='2.4'
3872+macro_revision='1.3293'
3873
3874
3875
3876@@ -4962,7 +4966,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3877 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3878 $as_echo_n "checking how to print strings... " >&6; }
3879 # Test print first, because it will be a builtin if present.
3880-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3881+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3882 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3883 ECHO='print -r --'
3884 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3885@@ -5648,8 +5652,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3886 # Try some XSI features
3887 xsi_shell=no
3888 ( _lt_dummy="a/b/c"
3889- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3890- = c,a/b,, \
3891+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3892+ = c,a/b,b/c, \
3893 && eval 'test $(( 1 + 1 )) -eq 2 \
3894 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3895 && xsi_shell=yes
3896@@ -5698,6 +5702,80 @@ esac
3897
3898
3899
3900+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3901+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3902+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
3903+ $as_echo_n "(cached) " >&6
3904+else
3905+ case $host in
3906+ *-*-mingw* )
3907+ case $build in
3908+ *-*-mingw* ) # actually msys
3909+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3910+ ;;
3911+ *-*-cygwin* )
3912+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3913+ ;;
3914+ * ) # otherwise, assume *nix
3915+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3916+ ;;
3917+ esac
3918+ ;;
3919+ *-*-cygwin* )
3920+ case $build in
3921+ *-*-mingw* ) # actually msys
3922+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3923+ ;;
3924+ *-*-cygwin* )
3925+ lt_cv_to_host_file_cmd=func_convert_file_noop
3926+ ;;
3927+ * ) # otherwise, assume *nix
3928+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3929+ ;;
3930+ esac
3931+ ;;
3932+ * ) # unhandled hosts (and "normal" native builds)
3933+ lt_cv_to_host_file_cmd=func_convert_file_noop
3934+ ;;
3935+esac
3936+
3937+fi
3938+
3939+to_host_file_cmd=$lt_cv_to_host_file_cmd
3940+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3941+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3942+
3943+
3944+
3945+
3946+
3947+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3948+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3949+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
3950+ $as_echo_n "(cached) " >&6
3951+else
3952+ #assume ordinary cross tools, or native build.
3953+lt_cv_to_tool_file_cmd=func_convert_file_noop
3954+case $host in
3955+ *-*-mingw* )
3956+ case $build in
3957+ *-*-mingw* ) # actually msys
3958+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3959+ ;;
3960+ esac
3961+ ;;
3962+esac
3963+
3964+fi
3965+
3966+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3967+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
3968+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
3969+
3970+
3971+
3972+
3973+
3974 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3975 $as_echo_n "checking for $LD option to reload object files... " >&6; }
3976 if test "${lt_cv_ld_reload_flag+set}" = set; then :
3977@@ -5714,6 +5792,11 @@ case $reload_flag in
3978 esac
3979 reload_cmds='$LD$reload_flag -o $output$reload_objs'
3980 case $host_os in
3981+ cygwin* | mingw* | pw32* | cegcc*)
3982+ if test "$GCC" != yes; then
3983+ reload_cmds=false
3984+ fi
3985+ ;;
3986 darwin*)
3987 if test "$GCC" = yes; then
3988 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
3989@@ -5882,7 +5965,8 @@ mingw* | pw32*)
3990 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
3991 lt_cv_file_magic_cmd='func_win32_libid'
3992 else
3993- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
3994+ # Keep this pattern in sync with the one in func_win32_libid.
3995+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
3996 lt_cv_file_magic_cmd='$OBJDUMP -f'
3997 fi
3998 ;;
3999@@ -6036,6 +6120,21 @@ esac
4000 fi
4001 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4002 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4003+
4004+file_magic_glob=
4005+want_nocaseglob=no
4006+if test "$build" = "$host"; then
4007+ case $host_os in
4008+ mingw* | pw32*)
4009+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4010+ want_nocaseglob=yes
4011+ else
4012+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4013+ fi
4014+ ;;
4015+ esac
4016+fi
4017+
4018 file_magic_cmd=$lt_cv_file_magic_cmd
4019 deplibs_check_method=$lt_cv_deplibs_check_method
4020 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4021@@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4022
4023
4024
4025+
4026+
4027+
4028+
4029+
4030+
4031+
4032+
4033+
4034+
4035+if test -n "$ac_tool_prefix"; then
4036+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4037+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4038+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4039+$as_echo_n "checking for $ac_word... " >&6; }
4040+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
4041+ $as_echo_n "(cached) " >&6
4042+else
4043+ if test -n "$DLLTOOL"; then
4044+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4045+else
4046+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4047+for as_dir in $PATH
4048+do
4049+ IFS=$as_save_IFS
4050+ test -z "$as_dir" && as_dir=.
4051+ for ac_exec_ext in '' $ac_executable_extensions; do
4052+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4053+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4054+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4055+ break 2
4056+ fi
4057+done
4058+ done
4059+IFS=$as_save_IFS
4060+
4061+fi
4062+fi
4063+DLLTOOL=$ac_cv_prog_DLLTOOL
4064+if test -n "$DLLTOOL"; then
4065+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4066+$as_echo "$DLLTOOL" >&6; }
4067+else
4068+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4069+$as_echo "no" >&6; }
4070+fi
4071+
4072+
4073+fi
4074+if test -z "$ac_cv_prog_DLLTOOL"; then
4075+ ac_ct_DLLTOOL=$DLLTOOL
4076+ # Extract the first word of "dlltool", so it can be a program name with args.
4077+set dummy dlltool; ac_word=$2
4078+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4079+$as_echo_n "checking for $ac_word... " >&6; }
4080+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
4081+ $as_echo_n "(cached) " >&6
4082+else
4083+ if test -n "$ac_ct_DLLTOOL"; then
4084+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4085+else
4086+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4087+for as_dir in $PATH
4088+do
4089+ IFS=$as_save_IFS
4090+ test -z "$as_dir" && as_dir=.
4091+ for ac_exec_ext in '' $ac_executable_extensions; do
4092+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4093+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4094+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4095+ break 2
4096+ fi
4097+done
4098+ done
4099+IFS=$as_save_IFS
4100+
4101+fi
4102+fi
4103+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4104+if test -n "$ac_ct_DLLTOOL"; then
4105+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4106+$as_echo "$ac_ct_DLLTOOL" >&6; }
4107+else
4108+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4109+$as_echo "no" >&6; }
4110+fi
4111+
4112+ if test "x$ac_ct_DLLTOOL" = x; then
4113+ DLLTOOL="false"
4114+ else
4115+ case $cross_compiling:$ac_tool_warned in
4116+yes:)
4117+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4118+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4119+ac_tool_warned=yes ;;
4120+esac
4121+ DLLTOOL=$ac_ct_DLLTOOL
4122+ fi
4123+else
4124+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4125+fi
4126+
4127+test -z "$DLLTOOL" && DLLTOOL=dlltool
4128+
4129+
4130+
4131+
4132+
4133+
4134+
4135+
4136+
4137+
4138+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4139+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4140+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
4141+ $as_echo_n "(cached) " >&6
4142+else
4143+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4144+
4145+case $host_os in
4146+cygwin* | mingw* | pw32* | cegcc*)
4147+ # two different shell functions defined in ltmain.sh
4148+ # decide which to use based on capabilities of $DLLTOOL
4149+ case `$DLLTOOL --help 2>&1` in
4150+ *--identify-strict*)
4151+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4152+ ;;
4153+ *)
4154+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4155+ ;;
4156+ esac
4157+ ;;
4158+*)
4159+ # fallback: assume linklib IS sharedlib
4160+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4161+ ;;
4162+esac
4163+
4164+fi
4165+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4166+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4167+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4168+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4169+
4170+
4171+
4172+
4173+
4174+
4175+
4176 if test -n "$ac_tool_prefix"; then
4177- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4178-set dummy ${ac_tool_prefix}ar; ac_word=$2
4179+ for ac_prog in ar
4180+ do
4181+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4182+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4183 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4184 $as_echo_n "checking for $ac_word... " >&6; }
4185 if test "${ac_cv_prog_AR+set}" = set; then :
4186@@ -6069,7 +6321,7 @@ do
4187 test -z "$as_dir" && as_dir=.
4188 for ac_exec_ext in '' $ac_executable_extensions; do
4189 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4190- ac_cv_prog_AR="${ac_tool_prefix}ar"
4191+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4192 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4193 break 2
4194 fi
4195@@ -6089,11 +6341,15 @@ $as_echo "no" >&6; }
4196 fi
4197
4198
4199+ test -n "$AR" && break
4200+ done
4201 fi
4202-if test -z "$ac_cv_prog_AR"; then
4203+if test -z "$AR"; then
4204 ac_ct_AR=$AR
4205- # Extract the first word of "ar", so it can be a program name with args.
4206-set dummy ar; ac_word=$2
4207+ for ac_prog in ar
4208+do
4209+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4210+set dummy $ac_prog; ac_word=$2
4211 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4212 $as_echo_n "checking for $ac_word... " >&6; }
4213 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4214@@ -6109,7 +6365,7 @@ do
4215 test -z "$as_dir" && as_dir=.
4216 for ac_exec_ext in '' $ac_executable_extensions; do
4217 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4218- ac_cv_prog_ac_ct_AR="ar"
4219+ ac_cv_prog_ac_ct_AR="$ac_prog"
4220 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4221 break 2
4222 fi
4223@@ -6128,6 +6384,10 @@ else
4224 $as_echo "no" >&6; }
4225 fi
4226
4227+
4228+ test -n "$ac_ct_AR" && break
4229+done
4230+
4231 if test "x$ac_ct_AR" = x; then
4232 AR="false"
4233 else
4234@@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;;
4235 esac
4236 AR=$ac_ct_AR
4237 fi
4238-else
4239- AR="$ac_cv_prog_AR"
4240 fi
4241
4242-test -z "$AR" && AR=ar
4243-test -z "$AR_FLAGS" && AR_FLAGS=cru
4244+: ${AR=ar}
4245+: ${AR_FLAGS=cru}
4246
4247
4248
4249@@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4250
4251
4252
4253+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4254+$as_echo_n "checking for archiver @FILE support... " >&6; }
4255+if test "${lt_cv_ar_at_file+set}" = set; then :
4256+ $as_echo_n "(cached) " >&6
4257+else
4258+ lt_cv_ar_at_file=no
4259+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4260+/* end confdefs.h. */
4261+
4262+int
4263+main ()
4264+{
4265+
4266+ ;
4267+ return 0;
4268+}
4269+_ACEOF
4270+if ac_fn_c_try_compile "$LINENO"; then :
4271+ echo conftest.$ac_objext > conftest.lst
4272+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4273+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4274+ (eval $lt_ar_try) 2>&5
4275+ ac_status=$?
4276+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4277+ test $ac_status = 0; }
4278+ if test "$ac_status" -eq 0; then
4279+ # Ensure the archiver fails upon bogus file names.
4280+ rm -f conftest.$ac_objext libconftest.a
4281+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4282+ (eval $lt_ar_try) 2>&5
4283+ ac_status=$?
4284+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4285+ test $ac_status = 0; }
4286+ if test "$ac_status" -ne 0; then
4287+ lt_cv_ar_at_file=@
4288+ fi
4289+ fi
4290+ rm -f conftest.* libconftest.a
4291+
4292+fi
4293+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4294+
4295+fi
4296+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4297+$as_echo "$lt_cv_ar_at_file" >&6; }
4298+
4299+if test "x$lt_cv_ar_at_file" = xno; then
4300+ archiver_list_spec=
4301+else
4302+ archiver_list_spec=$lt_cv_ar_at_file
4303+fi
4304+
4305+
4306+
4307+
4308+
4309+
4310+
4311 if test -n "$ac_tool_prefix"; then
4312 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4313 set dummy ${ac_tool_prefix}strip; ac_word=$2
4314@@ -6490,8 +6806,8 @@ esac
4315 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4316
4317 # Transform an extracted symbol line into symbol name and symbol address
4318-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4319-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
4320+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4321+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
4322
4323 # Handle CRLF in mingw tool chain
4324 opt_cr=
4325@@ -6527,6 +6843,7 @@ for ac_symprfx in "" "_"; do
4326 else
4327 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4328 fi
4329+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4330
4331 # Check to see that the pipe works correctly.
4332 pipe_works=no
4333@@ -6568,6 +6885,18 @@ _LT_EOF
4334 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4335 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4336 cat <<_LT_EOF > conftest.$ac_ext
4337+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4338+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4339+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4340+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4341+# define LT_DLSYM_CONST
4342+#elif defined(__osf__)
4343+/* This system does not cope well with relocations in const data. */
4344+# define LT_DLSYM_CONST
4345+#else
4346+# define LT_DLSYM_CONST const
4347+#endif
4348+
4349 #ifdef __cplusplus
4350 extern "C" {
4351 #endif
4352@@ -6579,7 +6908,7 @@ _LT_EOF
4353 cat <<_LT_EOF >> conftest.$ac_ext
4354
4355 /* The mapping between symbol names and symbols. */
4356-const struct {
4357+LT_DLSYM_CONST struct {
4358 const char *name;
4359 void *address;
4360 }
4361@@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() {
4362 _LT_EOF
4363 # Now try linking the two files.
4364 mv conftest.$ac_objext conftstm.$ac_objext
4365- lt_save_LIBS="$LIBS"
4366- lt_save_CFLAGS="$CFLAGS"
4367+ lt_globsym_save_LIBS=$LIBS
4368+ lt_globsym_save_CFLAGS=$CFLAGS
4369 LIBS="conftstm.$ac_objext"
4370 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4371 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4372@@ -6616,8 +6945,8 @@ _LT_EOF
4373 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4374 pipe_works=yes
4375 fi
4376- LIBS="$lt_save_LIBS"
4377- CFLAGS="$lt_save_CFLAGS"
4378+ LIBS=$lt_globsym_save_LIBS
4379+ CFLAGS=$lt_globsym_save_CFLAGS
4380 else
4381 echo "cannot find nm_test_func in $nlist" >&5
4382 fi
4383@@ -6654,6 +6983,21 @@ else
4384 $as_echo "ok" >&6; }
4385 fi
4386
4387+# Response file support.
4388+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4389+ nm_file_list_spec='@'
4390+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4391+ nm_file_list_spec='@'
4392+fi
4393+
4394+
4395+
4396+
4397+
4398+
4399+
4400+
4401+
4402
4403
4404
4405@@ -6671,6 +7015,40 @@ fi
4406
4407
4408
4409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4410+$as_echo_n "checking for sysroot... " >&6; }
4411+
4412+# Check whether --with-libtool-sysroot was given.
4413+if test "${with_libtool_sysroot+set}" = set; then :
4414+ withval=$with_libtool_sysroot;
4415+else
4416+ with_libtool_sysroot=no
4417+fi
4418+
4419+
4420+lt_sysroot=
4421+case ${with_libtool_sysroot} in #(
4422+ yes)
4423+ if test "$GCC" = yes; then
4424+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4425+ fi
4426+ ;; #(
4427+ /*)
4428+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4429+ ;; #(
4430+ no|'')
4431+ ;; #(
4432+ *)
4433+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4434+$as_echo "${with_libtool_sysroot}" >&6; }
4435+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
4436+ ;;
4437+esac
4438+
4439+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4440+$as_echo "${lt_sysroot:-no}" >&6; }
4441+
4442+
4443
4444
4445
4446@@ -6881,6 +7259,123 @@ esac
4447
4448 need_locks="$enable_libtool_lock"
4449
4450+if test -n "$ac_tool_prefix"; then
4451+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4452+set dummy ${ac_tool_prefix}mt; ac_word=$2
4453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4454+$as_echo_n "checking for $ac_word... " >&6; }
4455+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
4456+ $as_echo_n "(cached) " >&6
4457+else
4458+ if test -n "$MANIFEST_TOOL"; then
4459+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4460+else
4461+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4462+for as_dir in $PATH
4463+do
4464+ IFS=$as_save_IFS
4465+ test -z "$as_dir" && as_dir=.
4466+ for ac_exec_ext in '' $ac_executable_extensions; do
4467+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4468+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4469+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4470+ break 2
4471+ fi
4472+done
4473+ done
4474+IFS=$as_save_IFS
4475+
4476+fi
4477+fi
4478+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4479+if test -n "$MANIFEST_TOOL"; then
4480+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4481+$as_echo "$MANIFEST_TOOL" >&6; }
4482+else
4483+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4484+$as_echo "no" >&6; }
4485+fi
4486+
4487+
4488+fi
4489+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4490+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4491+ # Extract the first word of "mt", so it can be a program name with args.
4492+set dummy mt; ac_word=$2
4493+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4494+$as_echo_n "checking for $ac_word... " >&6; }
4495+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
4496+ $as_echo_n "(cached) " >&6
4497+else
4498+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4499+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4500+else
4501+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4502+for as_dir in $PATH
4503+do
4504+ IFS=$as_save_IFS
4505+ test -z "$as_dir" && as_dir=.
4506+ for ac_exec_ext in '' $ac_executable_extensions; do
4507+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4508+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4509+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4510+ break 2
4511+ fi
4512+done
4513+ done
4514+IFS=$as_save_IFS
4515+
4516+fi
4517+fi
4518+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4519+if test -n "$ac_ct_MANIFEST_TOOL"; then
4520+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4521+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4522+else
4523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4524+$as_echo "no" >&6; }
4525+fi
4526+
4527+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4528+ MANIFEST_TOOL=":"
4529+ else
4530+ case $cross_compiling:$ac_tool_warned in
4531+yes:)
4532+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4533+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4534+ac_tool_warned=yes ;;
4535+esac
4536+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4537+ fi
4538+else
4539+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4540+fi
4541+
4542+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4543+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4544+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4545+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
4546+ $as_echo_n "(cached) " >&6
4547+else
4548+ lt_cv_path_mainfest_tool=no
4549+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4550+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4551+ cat conftest.err >&5
4552+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4553+ lt_cv_path_mainfest_tool=yes
4554+ fi
4555+ rm -f conftest*
4556+fi
4557+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4558+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4559+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4560+ MANIFEST_TOOL=:
4561+fi
4562+
4563+
4564+
4565+
4566+
4567
4568 case $host_os in
4569 rhapsody* | darwin*)
4570@@ -7444,6 +7939,8 @@ _LT_EOF
4571 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4572 echo "$AR cru libconftest.a conftest.o" >&5
4573 $AR cru libconftest.a conftest.o 2>&5
4574+ echo "$RANLIB libconftest.a" >&5
4575+ $RANLIB libconftest.a 2>&5
4576 cat > conftest.c << _LT_EOF
4577 int main() { return 0;}
4578 _LT_EOF
4579@@ -7639,7 +8136,8 @@ fi
4580 LIBTOOL_DEPS="$ltmain"
4581
4582 # Always use our own libtool.
4583-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4584+LIBTOOL='$(SHELL) $(top_builddir)'
4585+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4586
4587
4588
4589@@ -7728,7 +8226,7 @@ aix3*)
4590 esac
4591
4592 # Global variables:
4593-ofile=libtool
4594+ofile=${host_alias}-libtool
4595 can_build_shared=yes
4596
4597 # All known linkers require a `.a' archive for static linking (except MSVC,
4598@@ -8026,8 +8524,6 @@ fi
4599 lt_prog_compiler_pic=
4600 lt_prog_compiler_static=
4601
4602-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4603-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4604
4605 if test "$GCC" = yes; then
4606 lt_prog_compiler_wl='-Wl,'
4607@@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4608 lt_prog_compiler_pic='--shared'
4609 lt_prog_compiler_static='--static'
4610 ;;
4611+ nagfor*)
4612+ # NAG Fortran compiler
4613+ lt_prog_compiler_wl='-Wl,-Wl,,'
4614+ lt_prog_compiler_pic='-PIC'
4615+ lt_prog_compiler_static='-Bstatic'
4616+ ;;
4617 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4618 # Portland Group compilers (*not* the Pentium gcc compiler,
4619 # which looks to be a dead project)
4620@@ -8255,7 +8757,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4621 lt_prog_compiler_pic='-KPIC'
4622 lt_prog_compiler_static='-Bstatic'
4623 case $cc_basename in
4624- f77* | f90* | f95*)
4625+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4626 lt_prog_compiler_wl='-Qoption ld ';;
4627 *)
4628 lt_prog_compiler_wl='-Wl,';;
4629@@ -8312,13 +8814,17 @@ case $host_os in
4630 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4631 ;;
4632 esac
4633-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4634-$as_echo "$lt_prog_compiler_pic" >&6; }
4635-
4636-
4637-
4638-
4639
4640+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4641+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4642+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
4643+ $as_echo_n "(cached) " >&6
4644+else
4645+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4646+fi
4647+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4648+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4649+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4650
4651 #
4652 # Check to make sure the PIC flag actually works.
4653@@ -8379,6 +8885,11 @@ fi
4654
4655
4656
4657+
4658+
4659+
4660+
4661+
4662 #
4663 # Check to make sure the static flag actually works.
4664 #
4665@@ -8729,7 +9240,8 @@ _LT_EOF
4666 allow_undefined_flag=unsupported
4667 always_export_symbols=no
4668 enable_shared_with_static_runtimes=yes
4669- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4670+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
4671+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4672
4673 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4674 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4675@@ -8828,12 +9340,12 @@ _LT_EOF
4676 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4677 hardcode_libdir_flag_spec=
4678 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4679- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4680+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4681 if test "x$supports_anon_versioning" = xyes; then
4682 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4683 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4684 echo "local: *; };" >> $output_objdir/$libname.ver~
4685- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4686+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4687 fi
4688 ;;
4689 esac
4690@@ -8847,8 +9359,8 @@ _LT_EOF
4691 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4692 wlarc=
4693 else
4694- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4695- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4696+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4697+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4698 fi
4699 ;;
4700
4701@@ -8866,8 +9378,8 @@ _LT_EOF
4702
4703 _LT_EOF
4704 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4705- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4706- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4707+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4708+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4709 else
4710 ld_shlibs=no
4711 fi
4712@@ -8913,8 +9425,8 @@ _LT_EOF
4713
4714 *)
4715 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4716- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4717- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4718+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4719+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4720 else
4721 ld_shlibs=no
4722 fi
4723@@ -9044,7 +9556,13 @@ _LT_EOF
4724 allow_undefined_flag='-berok'
4725 # Determine the default libpath from the value encoded in an
4726 # empty executable.
4727- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4728+ if test "${lt_cv_aix_libpath+set}" = set; then
4729+ aix_libpath=$lt_cv_aix_libpath
4730+else
4731+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4732+ $as_echo_n "(cached) " >&6
4733+else
4734+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4735 /* end confdefs.h. */
4736
4737 int
4738@@ -9057,22 +9575,29 @@ main ()
4739 _ACEOF
4740 if ac_fn_c_try_link "$LINENO"; then :
4741
4742-lt_aix_libpath_sed='
4743- /Import File Strings/,/^$/ {
4744- /^0/ {
4745- s/^0 *\(.*\)$/\1/
4746- p
4747- }
4748- }'
4749-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4750-# Check for a 64-bit object if we didn't find anything.
4751-if test -z "$aix_libpath"; then
4752- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4753-fi
4754+ lt_aix_libpath_sed='
4755+ /Import File Strings/,/^$/ {
4756+ /^0/ {
4757+ s/^0 *\([^ ]*\) *$/\1/
4758+ p
4759+ }
4760+ }'
4761+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4762+ # Check for a 64-bit object if we didn't find anything.
4763+ if test -z "$lt_cv_aix_libpath_"; then
4764+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4765+ fi
4766 fi
4767 rm -f core conftest.err conftest.$ac_objext \
4768 conftest$ac_exeext conftest.$ac_ext
4769-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4770+ if test -z "$lt_cv_aix_libpath_"; then
4771+ lt_cv_aix_libpath_="/usr/lib:/lib"
4772+ fi
4773+
4774+fi
4775+
4776+ aix_libpath=$lt_cv_aix_libpath_
4777+fi
4778
4779 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4780 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4781@@ -9084,7 +9609,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4782 else
4783 # Determine the default libpath from the value encoded in an
4784 # empty executable.
4785- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4786+ if test "${lt_cv_aix_libpath+set}" = set; then
4787+ aix_libpath=$lt_cv_aix_libpath
4788+else
4789+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4790+ $as_echo_n "(cached) " >&6
4791+else
4792+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4793 /* end confdefs.h. */
4794
4795 int
4796@@ -9097,22 +9628,29 @@ main ()
4797 _ACEOF
4798 if ac_fn_c_try_link "$LINENO"; then :
4799
4800-lt_aix_libpath_sed='
4801- /Import File Strings/,/^$/ {
4802- /^0/ {
4803- s/^0 *\(.*\)$/\1/
4804- p
4805- }
4806- }'
4807-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4808-# Check for a 64-bit object if we didn't find anything.
4809-if test -z "$aix_libpath"; then
4810- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4811-fi
4812+ lt_aix_libpath_sed='
4813+ /Import File Strings/,/^$/ {
4814+ /^0/ {
4815+ s/^0 *\([^ ]*\) *$/\1/
4816+ p
4817+ }
4818+ }'
4819+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4820+ # Check for a 64-bit object if we didn't find anything.
4821+ if test -z "$lt_cv_aix_libpath_"; then
4822+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4823+ fi
4824 fi
4825 rm -f core conftest.err conftest.$ac_objext \
4826 conftest$ac_exeext conftest.$ac_ext
4827-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4828+ if test -z "$lt_cv_aix_libpath_"; then
4829+ lt_cv_aix_libpath_="/usr/lib:/lib"
4830+ fi
4831+
4832+fi
4833+
4834+ aix_libpath=$lt_cv_aix_libpath_
4835+fi
4836
4837 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4838 # Warning - without using the other run time loading flags,
4839@@ -9157,20 +9695,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4840 # Microsoft Visual C++.
4841 # hardcode_libdir_flag_spec is actually meaningless, as there is
4842 # no search path for DLLs.
4843- hardcode_libdir_flag_spec=' '
4844- allow_undefined_flag=unsupported
4845- # Tell ltmain to make .lib files, not .a files.
4846- libext=lib
4847- # Tell ltmain to make .dll files, not .so files.
4848- shrext_cmds=".dll"
4849- # FIXME: Setting linknames here is a bad hack.
4850- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4851- # The linker will automatically build a .lib file if we build a DLL.
4852- old_archive_from_new_cmds='true'
4853- # FIXME: Should let the user specify the lib program.
4854- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4855- fix_srcfile_path='`cygpath -w "$srcfile"`'
4856- enable_shared_with_static_runtimes=yes
4857+ case $cc_basename in
4858+ cl*)
4859+ # Native MSVC
4860+ hardcode_libdir_flag_spec=' '
4861+ allow_undefined_flag=unsupported
4862+ always_export_symbols=yes
4863+ file_list_spec='@'
4864+ # Tell ltmain to make .lib files, not .a files.
4865+ libext=lib
4866+ # Tell ltmain to make .dll files, not .so files.
4867+ shrext_cmds=".dll"
4868+ # FIXME: Setting linknames here is a bad hack.
4869+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4870+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4871+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4872+ else
4873+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4874+ fi~
4875+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4876+ linknames='
4877+ # The linker will not automatically build a static lib if we build a DLL.
4878+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4879+ enable_shared_with_static_runtimes=yes
4880+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4881+ # Don't use ranlib
4882+ old_postinstall_cmds='chmod 644 $oldlib'
4883+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4884+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4885+ case $lt_outputfile in
4886+ *.exe|*.EXE) ;;
4887+ *)
4888+ lt_outputfile="$lt_outputfile.exe"
4889+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4890+ ;;
4891+ esac~
4892+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4893+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4894+ $RM "$lt_outputfile.manifest";
4895+ fi'
4896+ ;;
4897+ *)
4898+ # Assume MSVC wrapper
4899+ hardcode_libdir_flag_spec=' '
4900+ allow_undefined_flag=unsupported
4901+ # Tell ltmain to make .lib files, not .a files.
4902+ libext=lib
4903+ # Tell ltmain to make .dll files, not .so files.
4904+ shrext_cmds=".dll"
4905+ # FIXME: Setting linknames here is a bad hack.
4906+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4907+ # The linker will automatically build a .lib file if we build a DLL.
4908+ old_archive_from_new_cmds='true'
4909+ # FIXME: Should let the user specify the lib program.
4910+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4911+ enable_shared_with_static_runtimes=yes
4912+ ;;
4913+ esac
4914 ;;
4915
4916 darwin* | rhapsody*)
4917@@ -9231,7 +9812,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4918
4919 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4920 freebsd* | dragonfly*)
4921- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4922+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4923 hardcode_libdir_flag_spec='-R$libdir'
4924 hardcode_direct=yes
4925 hardcode_shlibpath_var=no
4926@@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4927
4928 hpux9*)
4929 if test "$GCC" = yes; then
4930- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4931+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4932 else
4933 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4934 fi
4935@@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4936
4937 hpux10*)
4938 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4939- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4940+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4941 else
4942 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4943 fi
4944@@ -9279,10 +9860,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4945 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4946 ;;
4947 ia64*)
4948- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4949+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4950 ;;
4951 *)
4952- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4953+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4954 ;;
4955 esac
4956 else
4957@@ -9361,23 +9942,36 @@ fi
4958
4959 irix5* | irix6* | nonstopux*)
4960 if test "$GCC" = yes; then
4961- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4962+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4963 # Try to use the -exported_symbol ld option, if it does not
4964 # work, assume that -exports_file does not work either and
4965 # implicitly export all symbols.
4966- save_LDFLAGS="$LDFLAGS"
4967- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4968- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4969+ # This should be the same for all languages, so no per-tag cache variable.
4970+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
4971+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
4972+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
4973+ $as_echo_n "(cached) " >&6
4974+else
4975+ save_LDFLAGS="$LDFLAGS"
4976+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4977+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4978 /* end confdefs.h. */
4979-int foo(void) {}
4980+int foo (void) { return 0; }
4981 _ACEOF
4982 if ac_fn_c_try_link "$LINENO"; then :
4983- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
4984-
4985+ lt_cv_irix_exported_symbol=yes
4986+else
4987+ lt_cv_irix_exported_symbol=no
4988 fi
4989 rm -f core conftest.err conftest.$ac_objext \
4990 conftest$ac_exeext conftest.$ac_ext
4991- LDFLAGS="$save_LDFLAGS"
4992+ LDFLAGS="$save_LDFLAGS"
4993+fi
4994+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
4995+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
4996+ if test "$lt_cv_irix_exported_symbol" = yes; then
4997+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
4998+ fi
4999 else
5000 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5001 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5002@@ -9462,7 +10056,7 @@ rm -f core conftest.err conftest.$ac_objext \
5003 osf4* | osf5*) # as osf3* with the addition of -msym flag
5004 if test "$GCC" = yes; then
5005 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5006- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5007+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5008 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5009 else
5010 allow_undefined_flag=' -expect_unresolved \*'
5011@@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \
5012 no_undefined_flag=' -z defs'
5013 if test "$GCC" = yes; then
5014 wlarc='${wl}'
5015- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5016+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5017 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5018- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5019+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5020 else
5021 case `$CC -V 2>&1` in
5022 *"Compilers 5.0"*)
5023@@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5024 need_version=no
5025 need_lib_prefix=no
5026
5027- case $GCC,$host_os in
5028- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5029+ case $GCC,$cc_basename in
5030+ yes,*)
5031+ # gcc
5032 library_names_spec='$libname.dll.a'
5033 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5034 postinstall_cmds='base_file=`basename \${file}`~
5035@@ -10093,13 +10688,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5036 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5037 ;;
5038 esac
5039+ dynamic_linker='Win32 ld.exe'
5040+ ;;
5041+
5042+ *,cl*)
5043+ # Native MSVC
5044+ libname_spec='$name'
5045+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5046+ library_names_spec='${libname}.dll.lib'
5047+
5048+ case $build_os in
5049+ mingw*)
5050+ sys_lib_search_path_spec=
5051+ lt_save_ifs=$IFS
5052+ IFS=';'
5053+ for lt_path in $LIB
5054+ do
5055+ IFS=$lt_save_ifs
5056+ # Let DOS variable expansion print the short 8.3 style file name.
5057+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5058+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5059+ done
5060+ IFS=$lt_save_ifs
5061+ # Convert to MSYS style.
5062+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5063+ ;;
5064+ cygwin*)
5065+ # Convert to unix form, then to dos form, then back to unix form
5066+ # but this time dos style (no spaces!) so that the unix form looks
5067+ # like /cygdrive/c/PROGRA~1:/cygdr...
5068+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5069+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5070+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5071+ ;;
5072+ *)
5073+ sys_lib_search_path_spec="$LIB"
5074+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5075+ # It is most probably a Windows format PATH.
5076+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5077+ else
5078+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5079+ fi
5080+ # FIXME: find the short name or the path components, as spaces are
5081+ # common. (e.g. "Program Files" -> "PROGRA~1")
5082+ ;;
5083+ esac
5084+
5085+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5086+ postinstall_cmds='base_file=`basename \${file}`~
5087+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5088+ dldir=$destdir/`dirname \$dlpath`~
5089+ test -d \$dldir || mkdir -p \$dldir~
5090+ $install_prog $dir/$dlname \$dldir/$dlname'
5091+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5092+ dlpath=$dir/\$dldll~
5093+ $RM \$dlpath'
5094+ shlibpath_overrides_runpath=yes
5095+ dynamic_linker='Win32 link.exe'
5096 ;;
5097
5098 *)
5099+ # Assume MSVC wrapper
5100 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5101+ dynamic_linker='Win32 ld.exe'
5102 ;;
5103 esac
5104- dynamic_linker='Win32 ld.exe'
5105 # FIXME: first we should search . and the directory the executable is in
5106 shlibpath_var=PATH
5107 ;;
5108@@ -10191,7 +10844,7 @@ haiku*)
5109 soname_spec='${libname}${release}${shared_ext}$major'
5110 shlibpath_var=LIBRARY_PATH
5111 shlibpath_overrides_runpath=yes
5112- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5113+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5114 hardcode_into_libs=yes
5115 ;;
5116
5117@@ -11031,10 +11684,10 @@ else
5118 /* When -fvisbility=hidden is used, assume the code has been annotated
5119 correspondingly for the symbols needed. */
5120 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5121-void fnord () __attribute__((visibility("default")));
5122+int fnord () __attribute__((visibility("default")));
5123 #endif
5124
5125-void fnord () { int i=42; }
5126+int fnord () { return 42; }
5127 int main ()
5128 {
5129 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5130@@ -11137,10 +11790,10 @@ else
5131 /* When -fvisbility=hidden is used, assume the code has been annotated
5132 correspondingly for the symbols needed. */
5133 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5134-void fnord () __attribute__((visibility("default")));
5135+int fnord () __attribute__((visibility("default")));
5136 #endif
5137
5138-void fnord () { int i=42; }
5139+int fnord () { return 42; }
5140 int main ()
5141 {
5142 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5143@@ -15425,13 +16078,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5144 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5145 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5146 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5147+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5148+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5149 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5150 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5151 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5152 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5153 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5154+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5155+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5156+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5157+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5158 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5159 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5160+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5161 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5162 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5163 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5164@@ -15446,14 +16106,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5165 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5166 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5167 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
5168+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5169+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5170 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5171 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5172 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5173-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5174 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5175+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5176 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5177 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5178 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5179+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5180 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5181 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5182 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5183@@ -15486,12 +16149,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5184 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5185 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5186 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5187-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5188 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5189 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5190 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5191 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5192 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5193+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5194 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5195 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5196 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5197@@ -15546,8 +16209,13 @@ reload_flag \
5198 OBJDUMP \
5199 deplibs_check_method \
5200 file_magic_cmd \
5201+file_magic_glob \
5202+want_nocaseglob \
5203+DLLTOOL \
5204+sharedlib_from_linklib_cmd \
5205 AR \
5206 AR_FLAGS \
5207+archiver_list_spec \
5208 STRIP \
5209 RANLIB \
5210 CC \
5211@@ -15557,12 +16225,14 @@ lt_cv_sys_global_symbol_pipe \
5212 lt_cv_sys_global_symbol_to_cdecl \
5213 lt_cv_sys_global_symbol_to_c_name_address \
5214 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5215+nm_file_list_spec \
5216 lt_prog_compiler_no_builtin_flag \
5217-lt_prog_compiler_wl \
5218 lt_prog_compiler_pic \
5219+lt_prog_compiler_wl \
5220 lt_prog_compiler_static \
5221 lt_cv_prog_compiler_c_o \
5222 need_locks \
5223+MANIFEST_TOOL \
5224 DSYMUTIL \
5225 NMEDIT \
5226 LIPO \
5227@@ -15578,7 +16248,6 @@ no_undefined_flag \
5228 hardcode_libdir_flag_spec \
5229 hardcode_libdir_flag_spec_ld \
5230 hardcode_libdir_separator \
5231-fix_srcfile_path \
5232 exclude_expsyms \
5233 include_expsyms \
5234 file_list_spec \
5235@@ -15614,6 +16283,7 @@ module_cmds \
5236 module_expsym_cmds \
5237 export_symbols_cmds \
5238 prelink_cmds \
5239+postlink_cmds \
5240 postinstall_cmds \
5241 postuninstall_cmds \
5242 finish_cmds \
5243@@ -16378,7 +17048,8 @@ $as_echo X"$file" |
5244 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5245 #
5246 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5247-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5248+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5249+# Inc.
5250 # Written by Gordon Matzigkeit, 1996
5251 #
5252 # This file is part of GNU Libtool.
5253@@ -16481,19 +17152,42 @@ SP2NL=$lt_lt_SP2NL
5254 # turn newlines into spaces.
5255 NL2SP=$lt_lt_NL2SP
5256
5257+# convert \$build file names to \$host format.
5258+to_host_file_cmd=$lt_cv_to_host_file_cmd
5259+
5260+# convert \$build files to toolchain format.
5261+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5262+
5263 # An object symbol dumper.
5264 OBJDUMP=$lt_OBJDUMP
5265
5266 # Method to check whether dependent libraries are shared objects.
5267 deplibs_check_method=$lt_deplibs_check_method
5268
5269-# Command to use when deplibs_check_method == "file_magic".
5270+# Command to use when deplibs_check_method = "file_magic".
5271 file_magic_cmd=$lt_file_magic_cmd
5272
5273+# How to find potential files when deplibs_check_method = "file_magic".
5274+file_magic_glob=$lt_file_magic_glob
5275+
5276+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5277+want_nocaseglob=$lt_want_nocaseglob
5278+
5279+# DLL creation program.
5280+DLLTOOL=$lt_DLLTOOL
5281+
5282+# Command to associate shared and link libraries.
5283+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5284+
5285 # The archiver.
5286 AR=$lt_AR
5287+
5288+# Flags to create an archive.
5289 AR_FLAGS=$lt_AR_FLAGS
5290
5291+# How to feed a file listing to the archiver.
5292+archiver_list_spec=$lt_archiver_list_spec
5293+
5294 # A symbol stripping program.
5295 STRIP=$lt_STRIP
5296
5297@@ -16523,6 +17217,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5298 # Transform the output of nm in a C name address pair when lib prefix is needed.
5299 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5300
5301+# Specify filename containing input files for \$NM.
5302+nm_file_list_spec=$lt_nm_file_list_spec
5303+
5304+# The root where to search for dependent libraries,and in which our libraries should be installed.
5305+lt_sysroot=$lt_sysroot
5306+
5307 # The name of the directory that contains temporary libtool files.
5308 objdir=$objdir
5309
5310@@ -16532,6 +17232,9 @@ MAGIC_CMD=$MAGIC_CMD
5311 # Must we lock files when doing compilation?
5312 need_locks=$lt_need_locks
5313
5314+# Manifest tool.
5315+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5316+
5317 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5318 DSYMUTIL=$lt_DSYMUTIL
5319
5320@@ -16646,12 +17349,12 @@ with_gcc=$GCC
5321 # Compiler flag to turn off builtin functions.
5322 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5323
5324-# How to pass a linker flag through the compiler.
5325-wl=$lt_lt_prog_compiler_wl
5326-
5327 # Additional compiler flags for building library objects.
5328 pic_flag=$lt_lt_prog_compiler_pic
5329
5330+# How to pass a linker flag through the compiler.
5331+wl=$lt_lt_prog_compiler_wl
5332+
5333 # Compiler flag to prevent dynamic linking.
5334 link_static_flag=$lt_lt_prog_compiler_static
5335
5336@@ -16738,9 +17441,6 @@ inherit_rpath=$inherit_rpath
5337 # Whether libtool must link a program against all its dependency libraries.
5338 link_all_deplibs=$link_all_deplibs
5339
5340-# Fix the shell variable \$srcfile for the compiler.
5341-fix_srcfile_path=$lt_fix_srcfile_path
5342-
5343 # Set to "yes" if exported symbols are required.
5344 always_export_symbols=$always_export_symbols
5345
5346@@ -16756,6 +17456,9 @@ include_expsyms=$lt_include_expsyms
5347 # Commands necessary for linking programs (against libraries) with templates.
5348 prelink_cmds=$lt_prelink_cmds
5349
5350+# Commands necessary for finishing linking programs.
5351+postlink_cmds=$lt_postlink_cmds
5352+
5353 # Specify filename containing input files.
5354 file_list_spec=$lt_file_list_spec
5355
5356@@ -16788,210 +17491,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5357 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5358 # text mode, it properly converts lines to CR/LF. This bash problem
5359 # is reportedly fixed, but why not run on old versions too?
5360- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5361- || (rm -f "$cfgfile"; exit 1)
5362-
5363- case $xsi_shell in
5364- yes)
5365- cat << \_LT_EOF >> "$cfgfile"
5366-
5367-# func_dirname file append nondir_replacement
5368-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5369-# otherwise set result to NONDIR_REPLACEMENT.
5370-func_dirname ()
5371-{
5372- case ${1} in
5373- */*) func_dirname_result="${1%/*}${2}" ;;
5374- * ) func_dirname_result="${3}" ;;
5375- esac
5376-}
5377-
5378-# func_basename file
5379-func_basename ()
5380-{
5381- func_basename_result="${1##*/}"
5382-}
5383-
5384-# func_dirname_and_basename file append nondir_replacement
5385-# perform func_basename and func_dirname in a single function
5386-# call:
5387-# dirname: Compute the dirname of FILE. If nonempty,
5388-# add APPEND to the result, otherwise set result
5389-# to NONDIR_REPLACEMENT.
5390-# value returned in "$func_dirname_result"
5391-# basename: Compute filename of FILE.
5392-# value retuned in "$func_basename_result"
5393-# Implementation must be kept synchronized with func_dirname
5394-# and func_basename. For efficiency, we do not delegate to
5395-# those functions but instead duplicate the functionality here.
5396-func_dirname_and_basename ()
5397-{
5398- case ${1} in
5399- */*) func_dirname_result="${1%/*}${2}" ;;
5400- * ) func_dirname_result="${3}" ;;
5401- esac
5402- func_basename_result="${1##*/}"
5403-}
5404-
5405-# func_stripname prefix suffix name
5406-# strip PREFIX and SUFFIX off of NAME.
5407-# PREFIX and SUFFIX must not contain globbing or regex special
5408-# characters, hashes, percent signs, but SUFFIX may contain a leading
5409-# dot (in which case that matches only a dot).
5410-func_stripname ()
5411-{
5412- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5413- # positional parameters, so assign one to ordinary parameter first.
5414- func_stripname_result=${3}
5415- func_stripname_result=${func_stripname_result#"${1}"}
5416- func_stripname_result=${func_stripname_result%"${2}"}
5417-}
5418-
5419-# func_opt_split
5420-func_opt_split ()
5421-{
5422- func_opt_split_opt=${1%%=*}
5423- func_opt_split_arg=${1#*=}
5424-}
5425-
5426-# func_lo2o object
5427-func_lo2o ()
5428-{
5429- case ${1} in
5430- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5431- *) func_lo2o_result=${1} ;;
5432- esac
5433-}
5434-
5435-# func_xform libobj-or-source
5436-func_xform ()
5437-{
5438- func_xform_result=${1%.*}.lo
5439-}
5440-
5441-# func_arith arithmetic-term...
5442-func_arith ()
5443-{
5444- func_arith_result=$(( $* ))
5445-}
5446-
5447-# func_len string
5448-# STRING may not start with a hyphen.
5449-func_len ()
5450-{
5451- func_len_result=${#1}
5452-}
5453-
5454-_LT_EOF
5455- ;;
5456- *) # Bourne compatible functions.
5457- cat << \_LT_EOF >> "$cfgfile"
5458-
5459-# func_dirname file append nondir_replacement
5460-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5461-# otherwise set result to NONDIR_REPLACEMENT.
5462-func_dirname ()
5463-{
5464- # Extract subdirectory from the argument.
5465- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5466- if test "X$func_dirname_result" = "X${1}"; then
5467- func_dirname_result="${3}"
5468- else
5469- func_dirname_result="$func_dirname_result${2}"
5470- fi
5471-}
5472-
5473-# func_basename file
5474-func_basename ()
5475-{
5476- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5477-}
5478-
5479-
5480-# func_stripname prefix suffix name
5481-# strip PREFIX and SUFFIX off of NAME.
5482-# PREFIX and SUFFIX must not contain globbing or regex special
5483-# characters, hashes, percent signs, but SUFFIX may contain a leading
5484-# dot (in which case that matches only a dot).
5485-# func_strip_suffix prefix name
5486-func_stripname ()
5487-{
5488- case ${2} in
5489- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5490- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5491- esac
5492-}
5493-
5494-# sed scripts:
5495-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5496-my_sed_long_arg='1s/^-[^=]*=//'
5497-
5498-# func_opt_split
5499-func_opt_split ()
5500-{
5501- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5502- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5503-}
5504-
5505-# func_lo2o object
5506-func_lo2o ()
5507-{
5508- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5509-}
5510-
5511-# func_xform libobj-or-source
5512-func_xform ()
5513-{
5514- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5515-}
5516-
5517-# func_arith arithmetic-term...
5518-func_arith ()
5519-{
5520- func_arith_result=`expr "$@"`
5521-}
5522-
5523-# func_len string
5524-# STRING may not start with a hyphen.
5525-func_len ()
5526-{
5527- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5528-}
5529-
5530-_LT_EOF
5531-esac
5532-
5533-case $lt_shell_append in
5534- yes)
5535- cat << \_LT_EOF >> "$cfgfile"
5536-
5537-# func_append var value
5538-# Append VALUE to the end of shell variable VAR.
5539-func_append ()
5540-{
5541- eval "$1+=\$2"
5542-}
5543-_LT_EOF
5544- ;;
5545- *)
5546- cat << \_LT_EOF >> "$cfgfile"
5547-
5548-# func_append var value
5549-# Append VALUE to the end of shell variable VAR.
5550-func_append ()
5551-{
5552- eval "$1=\$$1\$2"
5553-}
5554-
5555-_LT_EOF
5556- ;;
5557- esac
5558-
5559-
5560- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5561- || (rm -f "$cfgfile"; exit 1)
5562-
5563- mv -f "$cfgfile" "$ofile" ||
5564+ sed '$q' "$ltmain" >> "$cfgfile" \
5565+ || (rm -f "$cfgfile"; exit 1)
5566+
5567+ if test x"$xsi_shell" = xyes; then
5568+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5569+func_dirname ()\
5570+{\
5571+\ case ${1} in\
5572+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5573+\ * ) func_dirname_result="${3}" ;;\
5574+\ esac\
5575+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5576+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5577+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5578+test 0 -eq $? || _lt_function_replace_fail=:
5579+
5580+
5581+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5582+func_basename ()\
5583+{\
5584+\ func_basename_result="${1##*/}"\
5585+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5586+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5587+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5588+test 0 -eq $? || _lt_function_replace_fail=:
5589+
5590+
5591+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5592+func_dirname_and_basename ()\
5593+{\
5594+\ case ${1} in\
5595+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5596+\ * ) func_dirname_result="${3}" ;;\
5597+\ esac\
5598+\ func_basename_result="${1##*/}"\
5599+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5600+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5601+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5602+test 0 -eq $? || _lt_function_replace_fail=:
5603+
5604+
5605+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5606+func_stripname ()\
5607+{\
5608+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5609+\ # positional parameters, so assign one to ordinary parameter first.\
5610+\ func_stripname_result=${3}\
5611+\ func_stripname_result=${func_stripname_result#"${1}"}\
5612+\ func_stripname_result=${func_stripname_result%"${2}"}\
5613+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5614+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5615+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5616+test 0 -eq $? || _lt_function_replace_fail=:
5617+
5618+
5619+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5620+func_split_long_opt ()\
5621+{\
5622+\ func_split_long_opt_name=${1%%=*}\
5623+\ func_split_long_opt_arg=${1#*=}\
5624+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5625+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5626+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5627+test 0 -eq $? || _lt_function_replace_fail=:
5628+
5629+
5630+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5631+func_split_short_opt ()\
5632+{\
5633+\ func_split_short_opt_arg=${1#??}\
5634+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5635+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5636+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5637+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5638+test 0 -eq $? || _lt_function_replace_fail=:
5639+
5640+
5641+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5642+func_lo2o ()\
5643+{\
5644+\ case ${1} in\
5645+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5646+\ *) func_lo2o_result=${1} ;;\
5647+\ esac\
5648+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5649+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5650+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5651+test 0 -eq $? || _lt_function_replace_fail=:
5652+
5653+
5654+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5655+func_xform ()\
5656+{\
5657+ func_xform_result=${1%.*}.lo\
5658+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5659+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5660+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5661+test 0 -eq $? || _lt_function_replace_fail=:
5662+
5663+
5664+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5665+func_arith ()\
5666+{\
5667+ func_arith_result=$(( $* ))\
5668+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5669+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5670+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5671+test 0 -eq $? || _lt_function_replace_fail=:
5672+
5673+
5674+ sed -e '/^func_len ()$/,/^} # func_len /c\
5675+func_len ()\
5676+{\
5677+ func_len_result=${#1}\
5678+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5679+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5680+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5681+test 0 -eq $? || _lt_function_replace_fail=:
5682+
5683+fi
5684+
5685+if test x"$lt_shell_append" = xyes; then
5686+ sed -e '/^func_append ()$/,/^} # func_append /c\
5687+func_append ()\
5688+{\
5689+ eval "${1}+=\\${2}"\
5690+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5691+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5692+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5693+test 0 -eq $? || _lt_function_replace_fail=:
5694+
5695+
5696+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5697+func_append_quoted ()\
5698+{\
5699+\ func_quote_for_eval "${2}"\
5700+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5701+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5702+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5703+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5704+test 0 -eq $? || _lt_function_replace_fail=:
5705+
5706+
5707+ # Save a `func_append' function call where possible by direct use of '+='
5708+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5709+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5710+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5711+ test 0 -eq $? || _lt_function_replace_fail=:
5712+else
5713+ # Save a `func_append' function call even when '+=' is not available
5714+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5715+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5716+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5717+ test 0 -eq $? || _lt_function_replace_fail=:
5718+fi
5719+
5720+if test x"$_lt_function_replace_fail" = x":"; then
5721+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5722+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5723+fi
5724+
5725+
5726+ mv -f "$cfgfile" "$ofile" ||
5727 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5728 chmod +x "$ofile"
5729
5730diff --git a/gprof/configure b/gprof/configure
5731index 38a4c0b0e5..38d1f699c7 100755
5732--- a/gprof/configure
5733+++ b/gprof/configure
5734@@ -631,8 +631,11 @@ OTOOL
5735 LIPO
5736 NMEDIT
5737 DSYMUTIL
5738+MANIFEST_TOOL
5739 RANLIB
5740+ac_ct_AR
5741 AR
5742+DLLTOOL
5743 OBJDUMP
5744 LN_S
5745 NM
5746@@ -744,6 +747,7 @@ enable_static
5747 with_pic
5748 enable_fast_install
5749 with_gnu_ld
5750+with_libtool_sysroot
5751 enable_libtool_lock
5752 enable_plugins
5753 enable_largefile
5754@@ -1402,6 +1406,8 @@ Optional Packages:
5755 --with-pic try to use only PIC/non-PIC objects [default=use
5756 both]
5757 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5758+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5759+ (or the compiler's sysroot if not specified).
5760
5761 Some influential environment variables:
5762 CC C compiler command
5763@@ -4836,8 +4842,8 @@ esac
5764
5765
5766
5767-macro_version='2.2.7a'
5768-macro_revision='1.3134'
5769+macro_version='2.4'
5770+macro_revision='1.3293'
5771
5772
5773
5774@@ -4877,7 +4883,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5775 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5776 $as_echo_n "checking how to print strings... " >&6; }
5777 # Test print first, because it will be a builtin if present.
5778-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5779+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5780 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5781 ECHO='print -r --'
5782 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5783@@ -5563,8 +5569,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5784 # Try some XSI features
5785 xsi_shell=no
5786 ( _lt_dummy="a/b/c"
5787- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5788- = c,a/b,, \
5789+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5790+ = c,a/b,b/c, \
5791 && eval 'test $(( 1 + 1 )) -eq 2 \
5792 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5793 && xsi_shell=yes
5794@@ -5613,6 +5619,80 @@ esac
5795
5796
5797
5798+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5799+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5800+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
5801+ $as_echo_n "(cached) " >&6
5802+else
5803+ case $host in
5804+ *-*-mingw* )
5805+ case $build in
5806+ *-*-mingw* ) # actually msys
5807+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5808+ ;;
5809+ *-*-cygwin* )
5810+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5811+ ;;
5812+ * ) # otherwise, assume *nix
5813+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5814+ ;;
5815+ esac
5816+ ;;
5817+ *-*-cygwin* )
5818+ case $build in
5819+ *-*-mingw* ) # actually msys
5820+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5821+ ;;
5822+ *-*-cygwin* )
5823+ lt_cv_to_host_file_cmd=func_convert_file_noop
5824+ ;;
5825+ * ) # otherwise, assume *nix
5826+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5827+ ;;
5828+ esac
5829+ ;;
5830+ * ) # unhandled hosts (and "normal" native builds)
5831+ lt_cv_to_host_file_cmd=func_convert_file_noop
5832+ ;;
5833+esac
5834+
5835+fi
5836+
5837+to_host_file_cmd=$lt_cv_to_host_file_cmd
5838+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5839+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5840+
5841+
5842+
5843+
5844+
5845+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5846+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5847+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
5848+ $as_echo_n "(cached) " >&6
5849+else
5850+ #assume ordinary cross tools, or native build.
5851+lt_cv_to_tool_file_cmd=func_convert_file_noop
5852+case $host in
5853+ *-*-mingw* )
5854+ case $build in
5855+ *-*-mingw* ) # actually msys
5856+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5857+ ;;
5858+ esac
5859+ ;;
5860+esac
5861+
5862+fi
5863+
5864+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5865+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5866+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5867+
5868+
5869+
5870+
5871+
5872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5873 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5874 if test "${lt_cv_ld_reload_flag+set}" = set; then :
5875@@ -5629,6 +5709,11 @@ case $reload_flag in
5876 esac
5877 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5878 case $host_os in
5879+ cygwin* | mingw* | pw32* | cegcc*)
5880+ if test "$GCC" != yes; then
5881+ reload_cmds=false
5882+ fi
5883+ ;;
5884 darwin*)
5885 if test "$GCC" = yes; then
5886 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5887@@ -5797,7 +5882,8 @@ mingw* | pw32*)
5888 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5889 lt_cv_file_magic_cmd='func_win32_libid'
5890 else
5891- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5892+ # Keep this pattern in sync with the one in func_win32_libid.
5893+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5894 lt_cv_file_magic_cmd='$OBJDUMP -f'
5895 fi
5896 ;;
5897@@ -5956,6 +6037,21 @@ esac
5898 fi
5899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5900 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5901+
5902+file_magic_glob=
5903+want_nocaseglob=no
5904+if test "$build" = "$host"; then
5905+ case $host_os in
5906+ mingw* | pw32*)
5907+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5908+ want_nocaseglob=yes
5909+ else
5910+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5911+ fi
5912+ ;;
5913+ esac
5914+fi
5915+
5916 file_magic_cmd=$lt_cv_file_magic_cmd
5917 deplibs_check_method=$lt_cv_deplibs_check_method
5918 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5919@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5920
5921
5922
5923+
5924+
5925+
5926+
5927+
5928+
5929+
5930+
5931+
5932+
5933+if test -n "$ac_tool_prefix"; then
5934+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5935+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5936+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5937+$as_echo_n "checking for $ac_word... " >&6; }
5938+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5939+ $as_echo_n "(cached) " >&6
5940+else
5941+ if test -n "$DLLTOOL"; then
5942+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
5943+else
5944+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5945+for as_dir in $PATH
5946+do
5947+ IFS=$as_save_IFS
5948+ test -z "$as_dir" && as_dir=.
5949+ for ac_exec_ext in '' $ac_executable_extensions; do
5950+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5951+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5952+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5953+ break 2
5954+ fi
5955+done
5956+ done
5957+IFS=$as_save_IFS
5958+
5959+fi
5960+fi
5961+DLLTOOL=$ac_cv_prog_DLLTOOL
5962+if test -n "$DLLTOOL"; then
5963+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
5964+$as_echo "$DLLTOOL" >&6; }
5965+else
5966+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5967+$as_echo "no" >&6; }
5968+fi
5969+
5970+
5971+fi
5972+if test -z "$ac_cv_prog_DLLTOOL"; then
5973+ ac_ct_DLLTOOL=$DLLTOOL
5974+ # Extract the first word of "dlltool", so it can be a program name with args.
5975+set dummy dlltool; ac_word=$2
5976+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5977+$as_echo_n "checking for $ac_word... " >&6; }
5978+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
5979+ $as_echo_n "(cached) " >&6
5980+else
5981+ if test -n "$ac_ct_DLLTOOL"; then
5982+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
5983+else
5984+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5985+for as_dir in $PATH
5986+do
5987+ IFS=$as_save_IFS
5988+ test -z "$as_dir" && as_dir=.
5989+ for ac_exec_ext in '' $ac_executable_extensions; do
5990+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5991+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
5992+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5993+ break 2
5994+ fi
5995+done
5996+ done
5997+IFS=$as_save_IFS
5998+
5999+fi
6000+fi
6001+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6002+if test -n "$ac_ct_DLLTOOL"; then
6003+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6004+$as_echo "$ac_ct_DLLTOOL" >&6; }
6005+else
6006+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6007+$as_echo "no" >&6; }
6008+fi
6009+
6010+ if test "x$ac_ct_DLLTOOL" = x; then
6011+ DLLTOOL="false"
6012+ else
6013+ case $cross_compiling:$ac_tool_warned in
6014+yes:)
6015+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6016+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6017+ac_tool_warned=yes ;;
6018+esac
6019+ DLLTOOL=$ac_ct_DLLTOOL
6020+ fi
6021+else
6022+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6023+fi
6024+
6025+test -z "$DLLTOOL" && DLLTOOL=dlltool
6026+
6027+
6028+
6029+
6030+
6031+
6032+
6033+
6034+
6035+
6036+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6037+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6038+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6039+ $as_echo_n "(cached) " >&6
6040+else
6041+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6042+
6043+case $host_os in
6044+cygwin* | mingw* | pw32* | cegcc*)
6045+ # two different shell functions defined in ltmain.sh
6046+ # decide which to use based on capabilities of $DLLTOOL
6047+ case `$DLLTOOL --help 2>&1` in
6048+ *--identify-strict*)
6049+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6050+ ;;
6051+ *)
6052+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6053+ ;;
6054+ esac
6055+ ;;
6056+*)
6057+ # fallback: assume linklib IS sharedlib
6058+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6059+ ;;
6060+esac
6061+
6062+fi
6063+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6064+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6065+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6066+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6067+
6068+
6069+
6070+
6071+
6072+
6073+
6074 if test -n "$ac_tool_prefix"; then
6075- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6076-set dummy ${ac_tool_prefix}ar; ac_word=$2
6077+ for ac_prog in ar
6078+ do
6079+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6080+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6081 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6082 $as_echo_n "checking for $ac_word... " >&6; }
6083 if test "${ac_cv_prog_AR+set}" = set; then :
6084@@ -5989,7 +6238,7 @@ do
6085 test -z "$as_dir" && as_dir=.
6086 for ac_exec_ext in '' $ac_executable_extensions; do
6087 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6088- ac_cv_prog_AR="${ac_tool_prefix}ar"
6089+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6090 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6091 break 2
6092 fi
6093@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; }
6094 fi
6095
6096
6097+ test -n "$AR" && break
6098+ done
6099 fi
6100-if test -z "$ac_cv_prog_AR"; then
6101+if test -z "$AR"; then
6102 ac_ct_AR=$AR
6103- # Extract the first word of "ar", so it can be a program name with args.
6104-set dummy ar; ac_word=$2
6105+ for ac_prog in ar
6106+do
6107+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6108+set dummy $ac_prog; ac_word=$2
6109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6110 $as_echo_n "checking for $ac_word... " >&6; }
6111 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6112@@ -6029,7 +6282,7 @@ do
6113 test -z "$as_dir" && as_dir=.
6114 for ac_exec_ext in '' $ac_executable_extensions; do
6115 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6116- ac_cv_prog_ac_ct_AR="ar"
6117+ ac_cv_prog_ac_ct_AR="$ac_prog"
6118 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6119 break 2
6120 fi
6121@@ -6048,6 +6301,10 @@ else
6122 $as_echo "no" >&6; }
6123 fi
6124
6125+
6126+ test -n "$ac_ct_AR" && break
6127+done
6128+
6129 if test "x$ac_ct_AR" = x; then
6130 AR="false"
6131 else
6132@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;;
6133 esac
6134 AR=$ac_ct_AR
6135 fi
6136-else
6137- AR="$ac_cv_prog_AR"
6138 fi
6139
6140-test -z "$AR" && AR=ar
6141-test -z "$AR_FLAGS" && AR_FLAGS=cru
6142+: ${AR=ar}
6143+: ${AR_FLAGS=cru}
6144
6145
6146
6147@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6148
6149
6150
6151+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6152+$as_echo_n "checking for archiver @FILE support... " >&6; }
6153+if test "${lt_cv_ar_at_file+set}" = set; then :
6154+ $as_echo_n "(cached) " >&6
6155+else
6156+ lt_cv_ar_at_file=no
6157+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6158+/* end confdefs.h. */
6159+
6160+int
6161+main ()
6162+{
6163+
6164+ ;
6165+ return 0;
6166+}
6167+_ACEOF
6168+if ac_fn_c_try_compile "$LINENO"; then :
6169+ echo conftest.$ac_objext > conftest.lst
6170+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6171+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6172+ (eval $lt_ar_try) 2>&5
6173+ ac_status=$?
6174+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6175+ test $ac_status = 0; }
6176+ if test "$ac_status" -eq 0; then
6177+ # Ensure the archiver fails upon bogus file names.
6178+ rm -f conftest.$ac_objext libconftest.a
6179+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6180+ (eval $lt_ar_try) 2>&5
6181+ ac_status=$?
6182+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6183+ test $ac_status = 0; }
6184+ if test "$ac_status" -ne 0; then
6185+ lt_cv_ar_at_file=@
6186+ fi
6187+ fi
6188+ rm -f conftest.* libconftest.a
6189+
6190+fi
6191+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6192+
6193+fi
6194+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6195+$as_echo "$lt_cv_ar_at_file" >&6; }
6196+
6197+if test "x$lt_cv_ar_at_file" = xno; then
6198+ archiver_list_spec=
6199+else
6200+ archiver_list_spec=$lt_cv_ar_at_file
6201+fi
6202+
6203+
6204+
6205+
6206+
6207+
6208+
6209 if test -n "$ac_tool_prefix"; then
6210 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6211 set dummy ${ac_tool_prefix}strip; ac_word=$2
6212@@ -6410,8 +6723,8 @@ esac
6213 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6214
6215 # Transform an extracted symbol line into symbol name and symbol address
6216-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6217-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
6218+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6219+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
6220
6221 # Handle CRLF in mingw tool chain
6222 opt_cr=
6223@@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do
6224 else
6225 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6226 fi
6227+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6228
6229 # Check to see that the pipe works correctly.
6230 pipe_works=no
6231@@ -6488,6 +6802,18 @@ _LT_EOF
6232 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6233 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6234 cat <<_LT_EOF > conftest.$ac_ext
6235+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6236+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6237+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6238+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6239+# define LT_DLSYM_CONST
6240+#elif defined(__osf__)
6241+/* This system does not cope well with relocations in const data. */
6242+# define LT_DLSYM_CONST
6243+#else
6244+# define LT_DLSYM_CONST const
6245+#endif
6246+
6247 #ifdef __cplusplus
6248 extern "C" {
6249 #endif
6250@@ -6499,7 +6825,7 @@ _LT_EOF
6251 cat <<_LT_EOF >> conftest.$ac_ext
6252
6253 /* The mapping between symbol names and symbols. */
6254-const struct {
6255+LT_DLSYM_CONST struct {
6256 const char *name;
6257 void *address;
6258 }
6259@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() {
6260 _LT_EOF
6261 # Now try linking the two files.
6262 mv conftest.$ac_objext conftstm.$ac_objext
6263- lt_save_LIBS="$LIBS"
6264- lt_save_CFLAGS="$CFLAGS"
6265+ lt_globsym_save_LIBS=$LIBS
6266+ lt_globsym_save_CFLAGS=$CFLAGS
6267 LIBS="conftstm.$ac_objext"
6268 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6269 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6270@@ -6536,8 +6862,8 @@ _LT_EOF
6271 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6272 pipe_works=yes
6273 fi
6274- LIBS="$lt_save_LIBS"
6275- CFLAGS="$lt_save_CFLAGS"
6276+ LIBS=$lt_globsym_save_LIBS
6277+ CFLAGS=$lt_globsym_save_CFLAGS
6278 else
6279 echo "cannot find nm_test_func in $nlist" >&5
6280 fi
6281@@ -6574,6 +6900,18 @@ else
6282 $as_echo "ok" >&6; }
6283 fi
6284
6285+# Response file support.
6286+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6287+ nm_file_list_spec='@'
6288+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6289+ nm_file_list_spec='@'
6290+fi
6291+
6292+
6293+
6294+
6295+
6296+
6297
6298
6299
6300@@ -6595,6 +6933,43 @@ fi
6301
6302
6303
6304+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6305+$as_echo_n "checking for sysroot... " >&6; }
6306+
6307+# Check whether --with-libtool-sysroot was given.
6308+if test "${with_libtool_sysroot+set}" = set; then :
6309+ withval=$with_libtool_sysroot;
6310+else
6311+ with_libtool_sysroot=no
6312+fi
6313+
6314+
6315+lt_sysroot=
6316+case ${with_libtool_sysroot} in #(
6317+ yes)
6318+ if test "$GCC" = yes; then
6319+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6320+ fi
6321+ ;; #(
6322+ /*)
6323+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6324+ ;; #(
6325+ no|'')
6326+ ;; #(
6327+ *)
6328+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6329+$as_echo "${with_libtool_sysroot}" >&6; }
6330+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6331+ ;;
6332+esac
6333+
6334+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6335+$as_echo "${lt_sysroot:-no}" >&6; }
6336+
6337+
6338+
6339+
6340+
6341 # Check whether --enable-libtool-lock was given.
6342 if test "${enable_libtool_lock+set}" = set; then :
6343 enableval=$enable_libtool_lock;
6344@@ -6801,6 +7176,123 @@ esac
6345
6346 need_locks="$enable_libtool_lock"
6347
6348+if test -n "$ac_tool_prefix"; then
6349+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6350+set dummy ${ac_tool_prefix}mt; ac_word=$2
6351+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6352+$as_echo_n "checking for $ac_word... " >&6; }
6353+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6354+ $as_echo_n "(cached) " >&6
6355+else
6356+ if test -n "$MANIFEST_TOOL"; then
6357+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6358+else
6359+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6360+for as_dir in $PATH
6361+do
6362+ IFS=$as_save_IFS
6363+ test -z "$as_dir" && as_dir=.
6364+ for ac_exec_ext in '' $ac_executable_extensions; do
6365+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6366+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6367+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6368+ break 2
6369+ fi
6370+done
6371+ done
6372+IFS=$as_save_IFS
6373+
6374+fi
6375+fi
6376+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6377+if test -n "$MANIFEST_TOOL"; then
6378+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6379+$as_echo "$MANIFEST_TOOL" >&6; }
6380+else
6381+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6382+$as_echo "no" >&6; }
6383+fi
6384+
6385+
6386+fi
6387+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6388+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6389+ # Extract the first word of "mt", so it can be a program name with args.
6390+set dummy mt; ac_word=$2
6391+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6392+$as_echo_n "checking for $ac_word... " >&6; }
6393+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6394+ $as_echo_n "(cached) " >&6
6395+else
6396+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6397+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6398+else
6399+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6400+for as_dir in $PATH
6401+do
6402+ IFS=$as_save_IFS
6403+ test -z "$as_dir" && as_dir=.
6404+ for ac_exec_ext in '' $ac_executable_extensions; do
6405+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6406+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6407+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6408+ break 2
6409+ fi
6410+done
6411+ done
6412+IFS=$as_save_IFS
6413+
6414+fi
6415+fi
6416+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6417+if test -n "$ac_ct_MANIFEST_TOOL"; then
6418+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6419+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6420+else
6421+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6422+$as_echo "no" >&6; }
6423+fi
6424+
6425+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6426+ MANIFEST_TOOL=":"
6427+ else
6428+ case $cross_compiling:$ac_tool_warned in
6429+yes:)
6430+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6431+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6432+ac_tool_warned=yes ;;
6433+esac
6434+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6435+ fi
6436+else
6437+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6438+fi
6439+
6440+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6441+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6442+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6443+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6444+ $as_echo_n "(cached) " >&6
6445+else
6446+ lt_cv_path_mainfest_tool=no
6447+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6448+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6449+ cat conftest.err >&5
6450+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6451+ lt_cv_path_mainfest_tool=yes
6452+ fi
6453+ rm -f conftest*
6454+fi
6455+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6456+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6457+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6458+ MANIFEST_TOOL=:
6459+fi
6460+
6461+
6462+
6463+
6464+
6465
6466 case $host_os in
6467 rhapsody* | darwin*)
6468@@ -7364,6 +7856,8 @@ _LT_EOF
6469 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6470 echo "$AR cru libconftest.a conftest.o" >&5
6471 $AR cru libconftest.a conftest.o 2>&5
6472+ echo "$RANLIB libconftest.a" >&5
6473+ $RANLIB libconftest.a 2>&5
6474 cat > conftest.c << _LT_EOF
6475 int main() { return 0;}
6476 _LT_EOF
6477@@ -7559,7 +8053,8 @@ fi
6478 LIBTOOL_DEPS="$ltmain"
6479
6480 # Always use our own libtool.
6481-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6482+LIBTOOL='$(SHELL) $(top_builddir)'
6483+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6484
6485
6486
6487@@ -7648,7 +8143,7 @@ aix3*)
6488 esac
6489
6490 # Global variables:
6491-ofile=libtool
6492+ofile=${host_alias}-libtool
6493 can_build_shared=yes
6494
6495 # All known linkers require a `.a' archive for static linking (except MSVC,
6496@@ -7946,8 +8441,6 @@ fi
6497 lt_prog_compiler_pic=
6498 lt_prog_compiler_static=
6499
6500-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6501-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6502
6503 if test "$GCC" = yes; then
6504 lt_prog_compiler_wl='-Wl,'
6505@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6506 lt_prog_compiler_pic='--shared'
6507 lt_prog_compiler_static='--static'
6508 ;;
6509+ nagfor*)
6510+ # NAG Fortran compiler
6511+ lt_prog_compiler_wl='-Wl,-Wl,,'
6512+ lt_prog_compiler_pic='-PIC'
6513+ lt_prog_compiler_static='-Bstatic'
6514+ ;;
6515 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6516 # Portland Group compilers (*not* the Pentium gcc compiler,
6517 # which looks to be a dead project)
6518@@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6519 lt_prog_compiler_pic='-KPIC'
6520 lt_prog_compiler_static='-Bstatic'
6521 case $cc_basename in
6522- f77* | f90* | f95*)
6523+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6524 lt_prog_compiler_wl='-Qoption ld ';;
6525 *)
6526 lt_prog_compiler_wl='-Wl,';;
6527@@ -8232,13 +8731,17 @@ case $host_os in
6528 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6529 ;;
6530 esac
6531-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6532-$as_echo "$lt_prog_compiler_pic" >&6; }
6533-
6534-
6535-
6536-
6537
6538+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6539+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6540+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6541+ $as_echo_n "(cached) " >&6
6542+else
6543+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6544+fi
6545+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6546+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6547+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6548
6549 #
6550 # Check to make sure the PIC flag actually works.
6551@@ -8299,6 +8802,11 @@ fi
6552
6553
6554
6555+
6556+
6557+
6558+
6559+
6560 #
6561 # Check to make sure the static flag actually works.
6562 #
6563@@ -8649,7 +9157,8 @@ _LT_EOF
6564 allow_undefined_flag=unsupported
6565 always_export_symbols=no
6566 enable_shared_with_static_runtimes=yes
6567- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6568+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
6569+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6570
6571 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6572 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6573@@ -8748,12 +9257,12 @@ _LT_EOF
6574 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6575 hardcode_libdir_flag_spec=
6576 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6577- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6578+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6579 if test "x$supports_anon_versioning" = xyes; then
6580 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6581 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6582 echo "local: *; };" >> $output_objdir/$libname.ver~
6583- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6584+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6585 fi
6586 ;;
6587 esac
6588@@ -8767,8 +9276,8 @@ _LT_EOF
6589 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6590 wlarc=
6591 else
6592- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6593- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6594+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6595+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6596 fi
6597 ;;
6598
6599@@ -8786,8 +9295,8 @@ _LT_EOF
6600
6601 _LT_EOF
6602 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6603- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6604- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6605+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6606+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6607 else
6608 ld_shlibs=no
6609 fi
6610@@ -8833,8 +9342,8 @@ _LT_EOF
6611
6612 *)
6613 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6614- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6615- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6616+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6617+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6618 else
6619 ld_shlibs=no
6620 fi
6621@@ -8964,7 +9473,13 @@ _LT_EOF
6622 allow_undefined_flag='-berok'
6623 # Determine the default libpath from the value encoded in an
6624 # empty executable.
6625- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6626+ if test "${lt_cv_aix_libpath+set}" = set; then
6627+ aix_libpath=$lt_cv_aix_libpath
6628+else
6629+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6630+ $as_echo_n "(cached) " >&6
6631+else
6632+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6633 /* end confdefs.h. */
6634
6635 int
6636@@ -8977,22 +9492,29 @@ main ()
6637 _ACEOF
6638 if ac_fn_c_try_link "$LINENO"; then :
6639
6640-lt_aix_libpath_sed='
6641- /Import File Strings/,/^$/ {
6642- /^0/ {
6643- s/^0 *\(.*\)$/\1/
6644- p
6645- }
6646- }'
6647-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6648-# Check for a 64-bit object if we didn't find anything.
6649-if test -z "$aix_libpath"; then
6650- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6651-fi
6652+ lt_aix_libpath_sed='
6653+ /Import File Strings/,/^$/ {
6654+ /^0/ {
6655+ s/^0 *\([^ ]*\) *$/\1/
6656+ p
6657+ }
6658+ }'
6659+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6660+ # Check for a 64-bit object if we didn't find anything.
6661+ if test -z "$lt_cv_aix_libpath_"; then
6662+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6663+ fi
6664 fi
6665 rm -f core conftest.err conftest.$ac_objext \
6666 conftest$ac_exeext conftest.$ac_ext
6667-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6668+ if test -z "$lt_cv_aix_libpath_"; then
6669+ lt_cv_aix_libpath_="/usr/lib:/lib"
6670+ fi
6671+
6672+fi
6673+
6674+ aix_libpath=$lt_cv_aix_libpath_
6675+fi
6676
6677 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6678 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6679@@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6680 else
6681 # Determine the default libpath from the value encoded in an
6682 # empty executable.
6683- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6684+ if test "${lt_cv_aix_libpath+set}" = set; then
6685+ aix_libpath=$lt_cv_aix_libpath
6686+else
6687+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6688+ $as_echo_n "(cached) " >&6
6689+else
6690+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6691 /* end confdefs.h. */
6692
6693 int
6694@@ -9017,22 +9545,29 @@ main ()
6695 _ACEOF
6696 if ac_fn_c_try_link "$LINENO"; then :
6697
6698-lt_aix_libpath_sed='
6699- /Import File Strings/,/^$/ {
6700- /^0/ {
6701- s/^0 *\(.*\)$/\1/
6702- p
6703- }
6704- }'
6705-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6706-# Check for a 64-bit object if we didn't find anything.
6707-if test -z "$aix_libpath"; then
6708- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6709-fi
6710+ lt_aix_libpath_sed='
6711+ /Import File Strings/,/^$/ {
6712+ /^0/ {
6713+ s/^0 *\([^ ]*\) *$/\1/
6714+ p
6715+ }
6716+ }'
6717+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6718+ # Check for a 64-bit object if we didn't find anything.
6719+ if test -z "$lt_cv_aix_libpath_"; then
6720+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6721+ fi
6722 fi
6723 rm -f core conftest.err conftest.$ac_objext \
6724 conftest$ac_exeext conftest.$ac_ext
6725-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6726+ if test -z "$lt_cv_aix_libpath_"; then
6727+ lt_cv_aix_libpath_="/usr/lib:/lib"
6728+ fi
6729+
6730+fi
6731+
6732+ aix_libpath=$lt_cv_aix_libpath_
6733+fi
6734
6735 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6736 # Warning - without using the other run time loading flags,
6737@@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6738 # Microsoft Visual C++.
6739 # hardcode_libdir_flag_spec is actually meaningless, as there is
6740 # no search path for DLLs.
6741- hardcode_libdir_flag_spec=' '
6742- allow_undefined_flag=unsupported
6743- # Tell ltmain to make .lib files, not .a files.
6744- libext=lib
6745- # Tell ltmain to make .dll files, not .so files.
6746- shrext_cmds=".dll"
6747- # FIXME: Setting linknames here is a bad hack.
6748- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6749- # The linker will automatically build a .lib file if we build a DLL.
6750- old_archive_from_new_cmds='true'
6751- # FIXME: Should let the user specify the lib program.
6752- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6753- fix_srcfile_path='`cygpath -w "$srcfile"`'
6754- enable_shared_with_static_runtimes=yes
6755+ case $cc_basename in
6756+ cl*)
6757+ # Native MSVC
6758+ hardcode_libdir_flag_spec=' '
6759+ allow_undefined_flag=unsupported
6760+ always_export_symbols=yes
6761+ file_list_spec='@'
6762+ # Tell ltmain to make .lib files, not .a files.
6763+ libext=lib
6764+ # Tell ltmain to make .dll files, not .so files.
6765+ shrext_cmds=".dll"
6766+ # FIXME: Setting linknames here is a bad hack.
6767+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6768+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6769+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6770+ else
6771+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6772+ fi~
6773+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6774+ linknames='
6775+ # The linker will not automatically build a static lib if we build a DLL.
6776+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6777+ enable_shared_with_static_runtimes=yes
6778+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6779+ # Don't use ranlib
6780+ old_postinstall_cmds='chmod 644 $oldlib'
6781+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6782+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6783+ case $lt_outputfile in
6784+ *.exe|*.EXE) ;;
6785+ *)
6786+ lt_outputfile="$lt_outputfile.exe"
6787+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6788+ ;;
6789+ esac~
6790+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6791+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6792+ $RM "$lt_outputfile.manifest";
6793+ fi'
6794+ ;;
6795+ *)
6796+ # Assume MSVC wrapper
6797+ hardcode_libdir_flag_spec=' '
6798+ allow_undefined_flag=unsupported
6799+ # Tell ltmain to make .lib files, not .a files.
6800+ libext=lib
6801+ # Tell ltmain to make .dll files, not .so files.
6802+ shrext_cmds=".dll"
6803+ # FIXME: Setting linknames here is a bad hack.
6804+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6805+ # The linker will automatically build a .lib file if we build a DLL.
6806+ old_archive_from_new_cmds='true'
6807+ # FIXME: Should let the user specify the lib program.
6808+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6809+ enable_shared_with_static_runtimes=yes
6810+ ;;
6811+ esac
6812 ;;
6813
6814 darwin* | rhapsody*)
6815@@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6816
6817 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6818 freebsd* | dragonfly*)
6819- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6820+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6821 hardcode_libdir_flag_spec='-R$libdir'
6822 hardcode_direct=yes
6823 hardcode_shlibpath_var=no
6824@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6825
6826 hpux9*)
6827 if test "$GCC" = yes; then
6828- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6829+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6830 else
6831 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6832 fi
6833@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6834
6835 hpux10*)
6836 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6837- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6838+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6839 else
6840 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6841 fi
6842@@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6843 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6844 ;;
6845 ia64*)
6846- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6847+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6848 ;;
6849 *)
6850- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6851+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6852 ;;
6853 esac
6854 else
6855@@ -9281,23 +9859,36 @@ fi
6856
6857 irix5* | irix6* | nonstopux*)
6858 if test "$GCC" = yes; then
6859- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6860+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6861 # Try to use the -exported_symbol ld option, if it does not
6862 # work, assume that -exports_file does not work either and
6863 # implicitly export all symbols.
6864- save_LDFLAGS="$LDFLAGS"
6865- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6866- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6867+ # This should be the same for all languages, so no per-tag cache variable.
6868+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6869+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6870+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6871+ $as_echo_n "(cached) " >&6
6872+else
6873+ save_LDFLAGS="$LDFLAGS"
6874+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6875+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6876 /* end confdefs.h. */
6877-int foo(void) {}
6878+int foo (void) { return 0; }
6879 _ACEOF
6880 if ac_fn_c_try_link "$LINENO"; then :
6881- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
6882-
6883+ lt_cv_irix_exported_symbol=yes
6884+else
6885+ lt_cv_irix_exported_symbol=no
6886 fi
6887 rm -f core conftest.err conftest.$ac_objext \
6888 conftest$ac_exeext conftest.$ac_ext
6889- LDFLAGS="$save_LDFLAGS"
6890+ LDFLAGS="$save_LDFLAGS"
6891+fi
6892+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6893+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6894+ if test "$lt_cv_irix_exported_symbol" = yes; then
6895+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
6896+ fi
6897 else
6898 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6899 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
6900@@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \
6901 osf4* | osf5*) # as osf3* with the addition of -msym flag
6902 if test "$GCC" = yes; then
6903 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6904- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6905+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6906 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6907 else
6908 allow_undefined_flag=' -expect_unresolved \*'
6909@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \
6910 no_undefined_flag=' -z defs'
6911 if test "$GCC" = yes; then
6912 wlarc='${wl}'
6913- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6914+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6915 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6916- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6917+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6918 else
6919 case `$CC -V 2>&1` in
6920 *"Compilers 5.0"*)
6921@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6922 need_version=no
6923 need_lib_prefix=no
6924
6925- case $GCC,$host_os in
6926- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6927+ case $GCC,$cc_basename in
6928+ yes,*)
6929+ # gcc
6930 library_names_spec='$libname.dll.a'
6931 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6932 postinstall_cmds='base_file=`basename \${file}`~
6933@@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6934 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6935 ;;
6936 esac
6937+ dynamic_linker='Win32 ld.exe'
6938+ ;;
6939+
6940+ *,cl*)
6941+ # Native MSVC
6942+ libname_spec='$name'
6943+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6944+ library_names_spec='${libname}.dll.lib'
6945+
6946+ case $build_os in
6947+ mingw*)
6948+ sys_lib_search_path_spec=
6949+ lt_save_ifs=$IFS
6950+ IFS=';'
6951+ for lt_path in $LIB
6952+ do
6953+ IFS=$lt_save_ifs
6954+ # Let DOS variable expansion print the short 8.3 style file name.
6955+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
6956+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
6957+ done
6958+ IFS=$lt_save_ifs
6959+ # Convert to MSYS style.
6960+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
6961+ ;;
6962+ cygwin*)
6963+ # Convert to unix form, then to dos form, then back to unix form
6964+ # but this time dos style (no spaces!) so that the unix form looks
6965+ # like /cygdrive/c/PROGRA~1:/cygdr...
6966+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
6967+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
6968+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
6969+ ;;
6970+ *)
6971+ sys_lib_search_path_spec="$LIB"
6972+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
6973+ # It is most probably a Windows format PATH.
6974+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
6975+ else
6976+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
6977+ fi
6978+ # FIXME: find the short name or the path components, as spaces are
6979+ # common. (e.g. "Program Files" -> "PROGRA~1")
6980+ ;;
6981+ esac
6982+
6983+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
6984+ postinstall_cmds='base_file=`basename \${file}`~
6985+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
6986+ dldir=$destdir/`dirname \$dlpath`~
6987+ test -d \$dldir || mkdir -p \$dldir~
6988+ $install_prog $dir/$dlname \$dldir/$dlname'
6989+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
6990+ dlpath=$dir/\$dldll~
6991+ $RM \$dlpath'
6992+ shlibpath_overrides_runpath=yes
6993+ dynamic_linker='Win32 link.exe'
6994 ;;
6995
6996 *)
6997+ # Assume MSVC wrapper
6998 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
6999+ dynamic_linker='Win32 ld.exe'
7000 ;;
7001 esac
7002- dynamic_linker='Win32 ld.exe'
7003 # FIXME: first we should search . and the directory the executable is in
7004 shlibpath_var=PATH
7005 ;;
7006@@ -10111,7 +10761,7 @@ haiku*)
7007 soname_spec='${libname}${release}${shared_ext}$major'
7008 shlibpath_var=LIBRARY_PATH
7009 shlibpath_overrides_runpath=yes
7010- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7011+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7012 hardcode_into_libs=yes
7013 ;;
7014
7015@@ -10951,10 +11601,10 @@ else
7016 /* When -fvisbility=hidden is used, assume the code has been annotated
7017 correspondingly for the symbols needed. */
7018 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7019-void fnord () __attribute__((visibility("default")));
7020+int fnord () __attribute__((visibility("default")));
7021 #endif
7022
7023-void fnord () { int i=42; }
7024+int fnord () { return 42; }
7025 int main ()
7026 {
7027 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7028@@ -11057,10 +11707,10 @@ else
7029 /* When -fvisbility=hidden is used, assume the code has been annotated
7030 correspondingly for the symbols needed. */
7031 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7032-void fnord () __attribute__((visibility("default")));
7033+int fnord () __attribute__((visibility("default")));
7034 #endif
7035
7036-void fnord () { int i=42; }
7037+int fnord () { return 42; }
7038 int main ()
7039 {
7040 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7041@@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7042 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7043 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7044 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7045+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7046+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7047 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7048 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7049 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7050 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7051 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7052+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7053+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7054+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7055+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7056 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7057 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7058+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7059 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7060 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7061 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7062@@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7063 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7064 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7065 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
7066+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7067+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7068 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7069 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7070 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7071-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7072 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7073+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7074 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7075 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7076 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7077+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7078 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7079 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7080 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7081@@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7082 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7083 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7084 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7085-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7086 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7087 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7088 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7089 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7090 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7091+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7092 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7093 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7094 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7095@@ -13126,8 +13786,13 @@ reload_flag \
7096 OBJDUMP \
7097 deplibs_check_method \
7098 file_magic_cmd \
7099+file_magic_glob \
7100+want_nocaseglob \
7101+DLLTOOL \
7102+sharedlib_from_linklib_cmd \
7103 AR \
7104 AR_FLAGS \
7105+archiver_list_spec \
7106 STRIP \
7107 RANLIB \
7108 CC \
7109@@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \
7110 lt_cv_sys_global_symbol_to_cdecl \
7111 lt_cv_sys_global_symbol_to_c_name_address \
7112 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7113+nm_file_list_spec \
7114 lt_prog_compiler_no_builtin_flag \
7115-lt_prog_compiler_wl \
7116 lt_prog_compiler_pic \
7117+lt_prog_compiler_wl \
7118 lt_prog_compiler_static \
7119 lt_cv_prog_compiler_c_o \
7120 need_locks \
7121+MANIFEST_TOOL \
7122 DSYMUTIL \
7123 NMEDIT \
7124 LIPO \
7125@@ -13158,7 +13825,6 @@ no_undefined_flag \
7126 hardcode_libdir_flag_spec \
7127 hardcode_libdir_flag_spec_ld \
7128 hardcode_libdir_separator \
7129-fix_srcfile_path \
7130 exclude_expsyms \
7131 include_expsyms \
7132 file_list_spec \
7133@@ -13194,6 +13860,7 @@ module_cmds \
7134 module_expsym_cmds \
7135 export_symbols_cmds \
7136 prelink_cmds \
7137+postlink_cmds \
7138 postinstall_cmds \
7139 postuninstall_cmds \
7140 finish_cmds \
7141@@ -13950,7 +14617,8 @@ $as_echo X"$file" |
7142 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7143 #
7144 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7145-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7146+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7147+# Inc.
7148 # Written by Gordon Matzigkeit, 1996
7149 #
7150 # This file is part of GNU Libtool.
7151@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL
7152 # turn newlines into spaces.
7153 NL2SP=$lt_lt_NL2SP
7154
7155+# convert \$build file names to \$host format.
7156+to_host_file_cmd=$lt_cv_to_host_file_cmd
7157+
7158+# convert \$build files to toolchain format.
7159+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7160+
7161 # An object symbol dumper.
7162 OBJDUMP=$lt_OBJDUMP
7163
7164 # Method to check whether dependent libraries are shared objects.
7165 deplibs_check_method=$lt_deplibs_check_method
7166
7167-# Command to use when deplibs_check_method == "file_magic".
7168+# Command to use when deplibs_check_method = "file_magic".
7169 file_magic_cmd=$lt_file_magic_cmd
7170
7171+# How to find potential files when deplibs_check_method = "file_magic".
7172+file_magic_glob=$lt_file_magic_glob
7173+
7174+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7175+want_nocaseglob=$lt_want_nocaseglob
7176+
7177+# DLL creation program.
7178+DLLTOOL=$lt_DLLTOOL
7179+
7180+# Command to associate shared and link libraries.
7181+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7182+
7183 # The archiver.
7184 AR=$lt_AR
7185+
7186+# Flags to create an archive.
7187 AR_FLAGS=$lt_AR_FLAGS
7188
7189+# How to feed a file listing to the archiver.
7190+archiver_list_spec=$lt_archiver_list_spec
7191+
7192 # A symbol stripping program.
7193 STRIP=$lt_STRIP
7194
7195@@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7196 # Transform the output of nm in a C name address pair when lib prefix is needed.
7197 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7198
7199+# Specify filename containing input files for \$NM.
7200+nm_file_list_spec=$lt_nm_file_list_spec
7201+
7202+# The root where to search for dependent libraries,and in which our libraries should be installed.
7203+lt_sysroot=$lt_sysroot
7204+
7205 # The name of the directory that contains temporary libtool files.
7206 objdir=$objdir
7207
7208@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD
7209 # Must we lock files when doing compilation?
7210 need_locks=$lt_need_locks
7211
7212+# Manifest tool.
7213+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7214+
7215 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7216 DSYMUTIL=$lt_DSYMUTIL
7217
7218@@ -14218,12 +14918,12 @@ with_gcc=$GCC
7219 # Compiler flag to turn off builtin functions.
7220 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7221
7222-# How to pass a linker flag through the compiler.
7223-wl=$lt_lt_prog_compiler_wl
7224-
7225 # Additional compiler flags for building library objects.
7226 pic_flag=$lt_lt_prog_compiler_pic
7227
7228+# How to pass a linker flag through the compiler.
7229+wl=$lt_lt_prog_compiler_wl
7230+
7231 # Compiler flag to prevent dynamic linking.
7232 link_static_flag=$lt_lt_prog_compiler_static
7233
7234@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath
7235 # Whether libtool must link a program against all its dependency libraries.
7236 link_all_deplibs=$link_all_deplibs
7237
7238-# Fix the shell variable \$srcfile for the compiler.
7239-fix_srcfile_path=$lt_fix_srcfile_path
7240-
7241 # Set to "yes" if exported symbols are required.
7242 always_export_symbols=$always_export_symbols
7243
7244@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms
7245 # Commands necessary for linking programs (against libraries) with templates.
7246 prelink_cmds=$lt_prelink_cmds
7247
7248+# Commands necessary for finishing linking programs.
7249+postlink_cmds=$lt_postlink_cmds
7250+
7251 # Specify filename containing input files.
7252 file_list_spec=$lt_file_list_spec
7253
7254@@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7255 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7256 # text mode, it properly converts lines to CR/LF. This bash problem
7257 # is reportedly fixed, but why not run on old versions too?
7258- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7259- || (rm -f "$cfgfile"; exit 1)
7260-
7261- case $xsi_shell in
7262- yes)
7263- cat << \_LT_EOF >> "$cfgfile"
7264-
7265-# func_dirname file append nondir_replacement
7266-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7267-# otherwise set result to NONDIR_REPLACEMENT.
7268-func_dirname ()
7269-{
7270- case ${1} in
7271- */*) func_dirname_result="${1%/*}${2}" ;;
7272- * ) func_dirname_result="${3}" ;;
7273- esac
7274-}
7275-
7276-# func_basename file
7277-func_basename ()
7278-{
7279- func_basename_result="${1##*/}"
7280-}
7281-
7282-# func_dirname_and_basename file append nondir_replacement
7283-# perform func_basename and func_dirname in a single function
7284-# call:
7285-# dirname: Compute the dirname of FILE. If nonempty,
7286-# add APPEND to the result, otherwise set result
7287-# to NONDIR_REPLACEMENT.
7288-# value returned in "$func_dirname_result"
7289-# basename: Compute filename of FILE.
7290-# value retuned in "$func_basename_result"
7291-# Implementation must be kept synchronized with func_dirname
7292-# and func_basename. For efficiency, we do not delegate to
7293-# those functions but instead duplicate the functionality here.
7294-func_dirname_and_basename ()
7295-{
7296- case ${1} in
7297- */*) func_dirname_result="${1%/*}${2}" ;;
7298- * ) func_dirname_result="${3}" ;;
7299- esac
7300- func_basename_result="${1##*/}"
7301-}
7302-
7303-# func_stripname prefix suffix name
7304-# strip PREFIX and SUFFIX off of NAME.
7305-# PREFIX and SUFFIX must not contain globbing or regex special
7306-# characters, hashes, percent signs, but SUFFIX may contain a leading
7307-# dot (in which case that matches only a dot).
7308-func_stripname ()
7309-{
7310- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7311- # positional parameters, so assign one to ordinary parameter first.
7312- func_stripname_result=${3}
7313- func_stripname_result=${func_stripname_result#"${1}"}
7314- func_stripname_result=${func_stripname_result%"${2}"}
7315-}
7316-
7317-# func_opt_split
7318-func_opt_split ()
7319-{
7320- func_opt_split_opt=${1%%=*}
7321- func_opt_split_arg=${1#*=}
7322-}
7323-
7324-# func_lo2o object
7325-func_lo2o ()
7326-{
7327- case ${1} in
7328- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7329- *) func_lo2o_result=${1} ;;
7330- esac
7331-}
7332-
7333-# func_xform libobj-or-source
7334-func_xform ()
7335-{
7336- func_xform_result=${1%.*}.lo
7337-}
7338-
7339-# func_arith arithmetic-term...
7340-func_arith ()
7341-{
7342- func_arith_result=$(( $* ))
7343-}
7344-
7345-# func_len string
7346-# STRING may not start with a hyphen.
7347-func_len ()
7348-{
7349- func_len_result=${#1}
7350-}
7351-
7352-_LT_EOF
7353- ;;
7354- *) # Bourne compatible functions.
7355- cat << \_LT_EOF >> "$cfgfile"
7356-
7357-# func_dirname file append nondir_replacement
7358-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7359-# otherwise set result to NONDIR_REPLACEMENT.
7360-func_dirname ()
7361-{
7362- # Extract subdirectory from the argument.
7363- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7364- if test "X$func_dirname_result" = "X${1}"; then
7365- func_dirname_result="${3}"
7366- else
7367- func_dirname_result="$func_dirname_result${2}"
7368- fi
7369-}
7370-
7371-# func_basename file
7372-func_basename ()
7373-{
7374- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7375-}
7376-
7377-
7378-# func_stripname prefix suffix name
7379-# strip PREFIX and SUFFIX off of NAME.
7380-# PREFIX and SUFFIX must not contain globbing or regex special
7381-# characters, hashes, percent signs, but SUFFIX may contain a leading
7382-# dot (in which case that matches only a dot).
7383-# func_strip_suffix prefix name
7384-func_stripname ()
7385-{
7386- case ${2} in
7387- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7388- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7389- esac
7390-}
7391-
7392-# sed scripts:
7393-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7394-my_sed_long_arg='1s/^-[^=]*=//'
7395-
7396-# func_opt_split
7397-func_opt_split ()
7398-{
7399- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7400- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7401-}
7402-
7403-# func_lo2o object
7404-func_lo2o ()
7405-{
7406- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7407-}
7408-
7409-# func_xform libobj-or-source
7410-func_xform ()
7411-{
7412- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7413-}
7414-
7415-# func_arith arithmetic-term...
7416-func_arith ()
7417-{
7418- func_arith_result=`expr "$@"`
7419-}
7420-
7421-# func_len string
7422-# STRING may not start with a hyphen.
7423-func_len ()
7424-{
7425- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7426-}
7427-
7428-_LT_EOF
7429-esac
7430-
7431-case $lt_shell_append in
7432- yes)
7433- cat << \_LT_EOF >> "$cfgfile"
7434-
7435-# func_append var value
7436-# Append VALUE to the end of shell variable VAR.
7437-func_append ()
7438-{
7439- eval "$1+=\$2"
7440-}
7441-_LT_EOF
7442- ;;
7443- *)
7444- cat << \_LT_EOF >> "$cfgfile"
7445-
7446-# func_append var value
7447-# Append VALUE to the end of shell variable VAR.
7448-func_append ()
7449-{
7450- eval "$1=\$$1\$2"
7451-}
7452-
7453-_LT_EOF
7454- ;;
7455- esac
7456-
7457-
7458- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7459- || (rm -f "$cfgfile"; exit 1)
7460-
7461- mv -f "$cfgfile" "$ofile" ||
7462+ sed '$q' "$ltmain" >> "$cfgfile" \
7463+ || (rm -f "$cfgfile"; exit 1)
7464+
7465+ if test x"$xsi_shell" = xyes; then
7466+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7467+func_dirname ()\
7468+{\
7469+\ case ${1} in\
7470+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7471+\ * ) func_dirname_result="${3}" ;;\
7472+\ esac\
7473+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7474+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7475+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7476+test 0 -eq $? || _lt_function_replace_fail=:
7477+
7478+
7479+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7480+func_basename ()\
7481+{\
7482+\ func_basename_result="${1##*/}"\
7483+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7484+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7485+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7486+test 0 -eq $? || _lt_function_replace_fail=:
7487+
7488+
7489+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7490+func_dirname_and_basename ()\
7491+{\
7492+\ case ${1} in\
7493+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7494+\ * ) func_dirname_result="${3}" ;;\
7495+\ esac\
7496+\ func_basename_result="${1##*/}"\
7497+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7498+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7499+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7500+test 0 -eq $? || _lt_function_replace_fail=:
7501+
7502+
7503+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7504+func_stripname ()\
7505+{\
7506+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7507+\ # positional parameters, so assign one to ordinary parameter first.\
7508+\ func_stripname_result=${3}\
7509+\ func_stripname_result=${func_stripname_result#"${1}"}\
7510+\ func_stripname_result=${func_stripname_result%"${2}"}\
7511+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7512+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7513+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7514+test 0 -eq $? || _lt_function_replace_fail=:
7515+
7516+
7517+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7518+func_split_long_opt ()\
7519+{\
7520+\ func_split_long_opt_name=${1%%=*}\
7521+\ func_split_long_opt_arg=${1#*=}\
7522+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7523+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7524+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7525+test 0 -eq $? || _lt_function_replace_fail=:
7526+
7527+
7528+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7529+func_split_short_opt ()\
7530+{\
7531+\ func_split_short_opt_arg=${1#??}\
7532+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7533+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7534+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7535+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7536+test 0 -eq $? || _lt_function_replace_fail=:
7537+
7538+
7539+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7540+func_lo2o ()\
7541+{\
7542+\ case ${1} in\
7543+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7544+\ *) func_lo2o_result=${1} ;;\
7545+\ esac\
7546+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7547+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7548+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7549+test 0 -eq $? || _lt_function_replace_fail=:
7550+
7551+
7552+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7553+func_xform ()\
7554+{\
7555+ func_xform_result=${1%.*}.lo\
7556+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7557+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7558+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7559+test 0 -eq $? || _lt_function_replace_fail=:
7560+
7561+
7562+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7563+func_arith ()\
7564+{\
7565+ func_arith_result=$(( $* ))\
7566+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7567+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7568+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7569+test 0 -eq $? || _lt_function_replace_fail=:
7570+
7571+
7572+ sed -e '/^func_len ()$/,/^} # func_len /c\
7573+func_len ()\
7574+{\
7575+ func_len_result=${#1}\
7576+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7577+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7578+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7579+test 0 -eq $? || _lt_function_replace_fail=:
7580+
7581+fi
7582+
7583+if test x"$lt_shell_append" = xyes; then
7584+ sed -e '/^func_append ()$/,/^} # func_append /c\
7585+func_append ()\
7586+{\
7587+ eval "${1}+=\\${2}"\
7588+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7589+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7590+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7591+test 0 -eq $? || _lt_function_replace_fail=:
7592+
7593+
7594+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7595+func_append_quoted ()\
7596+{\
7597+\ func_quote_for_eval "${2}"\
7598+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7599+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7600+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7601+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7602+test 0 -eq $? || _lt_function_replace_fail=:
7603+
7604+
7605+ # Save a `func_append' function call where possible by direct use of '+='
7606+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7607+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7608+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7609+ test 0 -eq $? || _lt_function_replace_fail=:
7610+else
7611+ # Save a `func_append' function call even when '+=' is not available
7612+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7613+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7614+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7615+ test 0 -eq $? || _lt_function_replace_fail=:
7616+fi
7617+
7618+if test x"$_lt_function_replace_fail" = x":"; then
7619+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7620+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7621+fi
7622+
7623+
7624+ mv -f "$cfgfile" "$ofile" ||
7625 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7626 chmod +x "$ofile"
7627
7628diff --git a/ld/configure b/ld/configure
7629index a16c6db059..4277b74bad 100755
7630--- a/ld/configure
7631+++ b/ld/configure
7632@@ -659,8 +659,11 @@ OTOOL
7633 LIPO
7634 NMEDIT
7635 DSYMUTIL
7636+MANIFEST_TOOL
7637 RANLIB
7638+ac_ct_AR
7639 AR
7640+DLLTOOL
7641 OBJDUMP
7642 LN_S
7643 NM
7644@@ -782,6 +785,7 @@ enable_static
7645 with_pic
7646 enable_fast_install
7647 with_gnu_ld
7648+with_libtool_sysroot
7649 enable_libtool_lock
7650 enable_plugins
7651 enable_largefile
7652@@ -1463,6 +1467,8 @@ Optional Packages:
7653 --with-pic try to use only PIC/non-PIC objects [default=use
7654 both]
7655 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7656+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7657+ (or the compiler's sysroot if not specified).
7658 --with-lib-path=dir1:dir2... set default LIB_PATH
7659 --with-sysroot=DIR Search for usr/lib et al within DIR.
7660
7661@@ -5657,8 +5663,8 @@ esac
7662
7663
7664
7665-macro_version='2.2.7a'
7666-macro_revision='1.3134'
7667+macro_version='2.4'
7668+macro_revision='1.3293'
7669
7670
7671
7672@@ -5698,7 +5704,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7674 $as_echo_n "checking how to print strings... " >&6; }
7675 # Test print first, because it will be a builtin if present.
7676-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7677+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7678 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7679 ECHO='print -r --'
7680 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7681@@ -6384,8 +6390,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7682 # Try some XSI features
7683 xsi_shell=no
7684 ( _lt_dummy="a/b/c"
7685- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7686- = c,a/b,, \
7687+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7688+ = c,a/b,b/c, \
7689 && eval 'test $(( 1 + 1 )) -eq 2 \
7690 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7691 && xsi_shell=yes
7692@@ -6434,6 +6440,80 @@ esac
7693
7694
7695
7696+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7697+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7698+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7699+ $as_echo_n "(cached) " >&6
7700+else
7701+ case $host in
7702+ *-*-mingw* )
7703+ case $build in
7704+ *-*-mingw* ) # actually msys
7705+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7706+ ;;
7707+ *-*-cygwin* )
7708+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7709+ ;;
7710+ * ) # otherwise, assume *nix
7711+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7712+ ;;
7713+ esac
7714+ ;;
7715+ *-*-cygwin* )
7716+ case $build in
7717+ *-*-mingw* ) # actually msys
7718+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7719+ ;;
7720+ *-*-cygwin* )
7721+ lt_cv_to_host_file_cmd=func_convert_file_noop
7722+ ;;
7723+ * ) # otherwise, assume *nix
7724+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7725+ ;;
7726+ esac
7727+ ;;
7728+ * ) # unhandled hosts (and "normal" native builds)
7729+ lt_cv_to_host_file_cmd=func_convert_file_noop
7730+ ;;
7731+esac
7732+
7733+fi
7734+
7735+to_host_file_cmd=$lt_cv_to_host_file_cmd
7736+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7737+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7738+
7739+
7740+
7741+
7742+
7743+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7744+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7745+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7746+ $as_echo_n "(cached) " >&6
7747+else
7748+ #assume ordinary cross tools, or native build.
7749+lt_cv_to_tool_file_cmd=func_convert_file_noop
7750+case $host in
7751+ *-*-mingw* )
7752+ case $build in
7753+ *-*-mingw* ) # actually msys
7754+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7755+ ;;
7756+ esac
7757+ ;;
7758+esac
7759+
7760+fi
7761+
7762+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7763+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7764+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7765+
7766+
7767+
7768+
7769+
7770 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7771 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7772 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7773@@ -6450,6 +6530,11 @@ case $reload_flag in
7774 esac
7775 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7776 case $host_os in
7777+ cygwin* | mingw* | pw32* | cegcc*)
7778+ if test "$GCC" != yes; then
7779+ reload_cmds=false
7780+ fi
7781+ ;;
7782 darwin*)
7783 if test "$GCC" = yes; then
7784 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7785@@ -6618,7 +6703,8 @@ mingw* | pw32*)
7786 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7787 lt_cv_file_magic_cmd='func_win32_libid'
7788 else
7789- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7790+ # Keep this pattern in sync with the one in func_win32_libid.
7791+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7792 lt_cv_file_magic_cmd='$OBJDUMP -f'
7793 fi
7794 ;;
7795@@ -6772,6 +6858,21 @@ esac
7796 fi
7797 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7798 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7799+
7800+file_magic_glob=
7801+want_nocaseglob=no
7802+if test "$build" = "$host"; then
7803+ case $host_os in
7804+ mingw* | pw32*)
7805+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7806+ want_nocaseglob=yes
7807+ else
7808+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7809+ fi
7810+ ;;
7811+ esac
7812+fi
7813+
7814 file_magic_cmd=$lt_cv_file_magic_cmd
7815 deplibs_check_method=$lt_cv_deplibs_check_method
7816 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7817@@ -6787,9 +6888,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7818
7819
7820
7821+
7822+
7823+
7824+
7825+
7826+
7827+
7828+
7829+
7830+
7831+if test -n "$ac_tool_prefix"; then
7832+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7833+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7834+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7835+$as_echo_n "checking for $ac_word... " >&6; }
7836+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7837+ $as_echo_n "(cached) " >&6
7838+else
7839+ if test -n "$DLLTOOL"; then
7840+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7841+else
7842+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7843+for as_dir in $PATH
7844+do
7845+ IFS=$as_save_IFS
7846+ test -z "$as_dir" && as_dir=.
7847+ for ac_exec_ext in '' $ac_executable_extensions; do
7848+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7849+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7850+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7851+ break 2
7852+ fi
7853+done
7854+ done
7855+IFS=$as_save_IFS
7856+
7857+fi
7858+fi
7859+DLLTOOL=$ac_cv_prog_DLLTOOL
7860+if test -n "$DLLTOOL"; then
7861+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7862+$as_echo "$DLLTOOL" >&6; }
7863+else
7864+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7865+$as_echo "no" >&6; }
7866+fi
7867+
7868+
7869+fi
7870+if test -z "$ac_cv_prog_DLLTOOL"; then
7871+ ac_ct_DLLTOOL=$DLLTOOL
7872+ # Extract the first word of "dlltool", so it can be a program name with args.
7873+set dummy dlltool; ac_word=$2
7874+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7875+$as_echo_n "checking for $ac_word... " >&6; }
7876+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7877+ $as_echo_n "(cached) " >&6
7878+else
7879+ if test -n "$ac_ct_DLLTOOL"; then
7880+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7881+else
7882+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7883+for as_dir in $PATH
7884+do
7885+ IFS=$as_save_IFS
7886+ test -z "$as_dir" && as_dir=.
7887+ for ac_exec_ext in '' $ac_executable_extensions; do
7888+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7889+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7890+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7891+ break 2
7892+ fi
7893+done
7894+ done
7895+IFS=$as_save_IFS
7896+
7897+fi
7898+fi
7899+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7900+if test -n "$ac_ct_DLLTOOL"; then
7901+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7902+$as_echo "$ac_ct_DLLTOOL" >&6; }
7903+else
7904+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7905+$as_echo "no" >&6; }
7906+fi
7907+
7908+ if test "x$ac_ct_DLLTOOL" = x; then
7909+ DLLTOOL="false"
7910+ else
7911+ case $cross_compiling:$ac_tool_warned in
7912+yes:)
7913+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7914+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7915+ac_tool_warned=yes ;;
7916+esac
7917+ DLLTOOL=$ac_ct_DLLTOOL
7918+ fi
7919+else
7920+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7921+fi
7922+
7923+test -z "$DLLTOOL" && DLLTOOL=dlltool
7924+
7925+
7926+
7927+
7928+
7929+
7930+
7931+
7932+
7933+
7934+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7935+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7936+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7937+ $as_echo_n "(cached) " >&6
7938+else
7939+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7940+
7941+case $host_os in
7942+cygwin* | mingw* | pw32* | cegcc*)
7943+ # two different shell functions defined in ltmain.sh
7944+ # decide which to use based on capabilities of $DLLTOOL
7945+ case `$DLLTOOL --help 2>&1` in
7946+ *--identify-strict*)
7947+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7948+ ;;
7949+ *)
7950+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7951+ ;;
7952+ esac
7953+ ;;
7954+*)
7955+ # fallback: assume linklib IS sharedlib
7956+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7957+ ;;
7958+esac
7959+
7960+fi
7961+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7962+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7963+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7964+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7965+
7966+
7967+
7968+
7969+
7970+
7971+
7972 if test -n "$ac_tool_prefix"; then
7973- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
7974-set dummy ${ac_tool_prefix}ar; ac_word=$2
7975+ for ac_prog in ar
7976+ do
7977+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7978+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7979 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7980 $as_echo_n "checking for $ac_word... " >&6; }
7981 if test "${ac_cv_prog_AR+set}" = set; then :
7982@@ -6805,7 +7059,7 @@ do
7983 test -z "$as_dir" && as_dir=.
7984 for ac_exec_ext in '' $ac_executable_extensions; do
7985 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7986- ac_cv_prog_AR="${ac_tool_prefix}ar"
7987+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
7988 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7989 break 2
7990 fi
7991@@ -6825,11 +7079,15 @@ $as_echo "no" >&6; }
7992 fi
7993
7994
7995+ test -n "$AR" && break
7996+ done
7997 fi
7998-if test -z "$ac_cv_prog_AR"; then
7999+if test -z "$AR"; then
8000 ac_ct_AR=$AR
8001- # Extract the first word of "ar", so it can be a program name with args.
8002-set dummy ar; ac_word=$2
8003+ for ac_prog in ar
8004+do
8005+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8006+set dummy $ac_prog; ac_word=$2
8007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8008 $as_echo_n "checking for $ac_word... " >&6; }
8009 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8010@@ -6845,7 +7103,7 @@ do
8011 test -z "$as_dir" && as_dir=.
8012 for ac_exec_ext in '' $ac_executable_extensions; do
8013 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8014- ac_cv_prog_ac_ct_AR="ar"
8015+ ac_cv_prog_ac_ct_AR="$ac_prog"
8016 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8017 break 2
8018 fi
8019@@ -6864,6 +7122,10 @@ else
8020 $as_echo "no" >&6; }
8021 fi
8022
8023+
8024+ test -n "$ac_ct_AR" && break
8025+done
8026+
8027 if test "x$ac_ct_AR" = x; then
8028 AR="false"
8029 else
8030@@ -6875,12 +7137,12 @@ ac_tool_warned=yes ;;
8031 esac
8032 AR=$ac_ct_AR
8033 fi
8034-else
8035- AR="$ac_cv_prog_AR"
8036 fi
8037
8038-test -z "$AR" && AR=ar
8039-test -z "$AR_FLAGS" && AR_FLAGS=cru
8040+: ${AR=ar}
8041+: ${AR_FLAGS=cru}
8042+
8043+
8044
8045
8046
8047@@ -6890,6 +7152,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8048
8049
8050
8051+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8052+$as_echo_n "checking for archiver @FILE support... " >&6; }
8053+if test "${lt_cv_ar_at_file+set}" = set; then :
8054+ $as_echo_n "(cached) " >&6
8055+else
8056+ lt_cv_ar_at_file=no
8057+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8058+/* end confdefs.h. */
8059+
8060+int
8061+main ()
8062+{
8063+
8064+ ;
8065+ return 0;
8066+}
8067+_ACEOF
8068+if ac_fn_c_try_compile "$LINENO"; then :
8069+ echo conftest.$ac_objext > conftest.lst
8070+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8071+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8072+ (eval $lt_ar_try) 2>&5
8073+ ac_status=$?
8074+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8075+ test $ac_status = 0; }
8076+ if test "$ac_status" -eq 0; then
8077+ # Ensure the archiver fails upon bogus file names.
8078+ rm -f conftest.$ac_objext libconftest.a
8079+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8080+ (eval $lt_ar_try) 2>&5
8081+ ac_status=$?
8082+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8083+ test $ac_status = 0; }
8084+ if test "$ac_status" -ne 0; then
8085+ lt_cv_ar_at_file=@
8086+ fi
8087+ fi
8088+ rm -f conftest.* libconftest.a
8089+
8090+fi
8091+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8092+
8093+fi
8094+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8095+$as_echo "$lt_cv_ar_at_file" >&6; }
8096+
8097+if test "x$lt_cv_ar_at_file" = xno; then
8098+ archiver_list_spec=
8099+else
8100+ archiver_list_spec=$lt_cv_ar_at_file
8101+fi
8102+
8103+
8104+
8105+
8106+
8107
8108
8109 if test -n "$ac_tool_prefix"; then
8110@@ -7226,8 +7544,8 @@ esac
8111 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8112
8113 # Transform an extracted symbol line into symbol name and symbol address
8114-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8115-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
8116+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8117+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
8118
8119 # Handle CRLF in mingw tool chain
8120 opt_cr=
8121@@ -7263,6 +7581,7 @@ for ac_symprfx in "" "_"; do
8122 else
8123 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8124 fi
8125+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8126
8127 # Check to see that the pipe works correctly.
8128 pipe_works=no
8129@@ -7304,6 +7623,18 @@ _LT_EOF
8130 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8131 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8132 cat <<_LT_EOF > conftest.$ac_ext
8133+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8134+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8135+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8136+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8137+# define LT_DLSYM_CONST
8138+#elif defined(__osf__)
8139+/* This system does not cope well with relocations in const data. */
8140+# define LT_DLSYM_CONST
8141+#else
8142+# define LT_DLSYM_CONST const
8143+#endif
8144+
8145 #ifdef __cplusplus
8146 extern "C" {
8147 #endif
8148@@ -7315,7 +7646,7 @@ _LT_EOF
8149 cat <<_LT_EOF >> conftest.$ac_ext
8150
8151 /* The mapping between symbol names and symbols. */
8152-const struct {
8153+LT_DLSYM_CONST struct {
8154 const char *name;
8155 void *address;
8156 }
8157@@ -7341,8 +7672,8 @@ static const void *lt_preloaded_setup() {
8158 _LT_EOF
8159 # Now try linking the two files.
8160 mv conftest.$ac_objext conftstm.$ac_objext
8161- lt_save_LIBS="$LIBS"
8162- lt_save_CFLAGS="$CFLAGS"
8163+ lt_globsym_save_LIBS=$LIBS
8164+ lt_globsym_save_CFLAGS=$CFLAGS
8165 LIBS="conftstm.$ac_objext"
8166 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8167 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8168@@ -7352,8 +7683,8 @@ _LT_EOF
8169 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8170 pipe_works=yes
8171 fi
8172- LIBS="$lt_save_LIBS"
8173- CFLAGS="$lt_save_CFLAGS"
8174+ LIBS=$lt_globsym_save_LIBS
8175+ CFLAGS=$lt_globsym_save_CFLAGS
8176 else
8177 echo "cannot find nm_test_func in $nlist" >&5
8178 fi
8179@@ -7390,6 +7721,19 @@ else
8180 $as_echo "ok" >&6; }
8181 fi
8182
8183+# Response file support.
8184+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8185+ nm_file_list_spec='@'
8186+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8187+ nm_file_list_spec='@'
8188+fi
8189+
8190+
8191+
8192+
8193+
8194+
8195+
8196
8197
8198
8199@@ -7410,6 +7754,42 @@ fi
8200
8201
8202
8203+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8204+$as_echo_n "checking for sysroot... " >&6; }
8205+
8206+# Check whether --with-libtool-sysroot was given.
8207+if test "${with_libtool_sysroot+set}" = set; then :
8208+ withval=$with_libtool_sysroot;
8209+else
8210+ with_libtool_sysroot=no
8211+fi
8212+
8213+
8214+lt_sysroot=
8215+case ${with_libtool_sysroot} in #(
8216+ yes)
8217+ if test "$GCC" = yes; then
8218+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8219+ fi
8220+ ;; #(
8221+ /*)
8222+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8223+ ;; #(
8224+ no|'')
8225+ ;; #(
8226+ *)
8227+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8228+$as_echo "${with_libtool_sysroot}" >&6; }
8229+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
8230+ ;;
8231+esac
8232+
8233+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8234+$as_echo "${lt_sysroot:-no}" >&6; }
8235+
8236+
8237+
8238+
8239
8240 # Check whether --enable-libtool-lock was given.
8241 if test "${enable_libtool_lock+set}" = set; then :
8242@@ -7617,6 +7997,123 @@ esac
8243
8244 need_locks="$enable_libtool_lock"
8245
8246+if test -n "$ac_tool_prefix"; then
8247+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8248+set dummy ${ac_tool_prefix}mt; ac_word=$2
8249+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8250+$as_echo_n "checking for $ac_word... " >&6; }
8251+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
8252+ $as_echo_n "(cached) " >&6
8253+else
8254+ if test -n "$MANIFEST_TOOL"; then
8255+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8256+else
8257+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8258+for as_dir in $PATH
8259+do
8260+ IFS=$as_save_IFS
8261+ test -z "$as_dir" && as_dir=.
8262+ for ac_exec_ext in '' $ac_executable_extensions; do
8263+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8264+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8265+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8266+ break 2
8267+ fi
8268+done
8269+ done
8270+IFS=$as_save_IFS
8271+
8272+fi
8273+fi
8274+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8275+if test -n "$MANIFEST_TOOL"; then
8276+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8277+$as_echo "$MANIFEST_TOOL" >&6; }
8278+else
8279+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8280+$as_echo "no" >&6; }
8281+fi
8282+
8283+
8284+fi
8285+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8286+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8287+ # Extract the first word of "mt", so it can be a program name with args.
8288+set dummy mt; ac_word=$2
8289+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8290+$as_echo_n "checking for $ac_word... " >&6; }
8291+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
8292+ $as_echo_n "(cached) " >&6
8293+else
8294+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8295+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8296+else
8297+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8298+for as_dir in $PATH
8299+do
8300+ IFS=$as_save_IFS
8301+ test -z "$as_dir" && as_dir=.
8302+ for ac_exec_ext in '' $ac_executable_extensions; do
8303+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8304+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8305+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8306+ break 2
8307+ fi
8308+done
8309+ done
8310+IFS=$as_save_IFS
8311+
8312+fi
8313+fi
8314+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8315+if test -n "$ac_ct_MANIFEST_TOOL"; then
8316+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8317+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8318+else
8319+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8320+$as_echo "no" >&6; }
8321+fi
8322+
8323+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8324+ MANIFEST_TOOL=":"
8325+ else
8326+ case $cross_compiling:$ac_tool_warned in
8327+yes:)
8328+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8329+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8330+ac_tool_warned=yes ;;
8331+esac
8332+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8333+ fi
8334+else
8335+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8336+fi
8337+
8338+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8339+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8340+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8341+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
8342+ $as_echo_n "(cached) " >&6
8343+else
8344+ lt_cv_path_mainfest_tool=no
8345+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8346+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8347+ cat conftest.err >&5
8348+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8349+ lt_cv_path_mainfest_tool=yes
8350+ fi
8351+ rm -f conftest*
8352+fi
8353+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8354+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8355+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8356+ MANIFEST_TOOL=:
8357+fi
8358+
8359+
8360+
8361+
8362+
8363
8364 case $host_os in
8365 rhapsody* | darwin*)
8366@@ -8180,6 +8677,8 @@ _LT_EOF
8367 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8368 echo "$AR cru libconftest.a conftest.o" >&5
8369 $AR cru libconftest.a conftest.o 2>&5
8370+ echo "$RANLIB libconftest.a" >&5
8371+ $RANLIB libconftest.a 2>&5
8372 cat > conftest.c << _LT_EOF
8373 int main() { return 0;}
8374 _LT_EOF
8375@@ -8248,6 +8747,16 @@ done
8376
8377
8378
8379+func_stripname_cnf ()
8380+{
8381+ case ${2} in
8382+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8383+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8384+ esac
8385+} # func_stripname_cnf
8386+
8387+
8388+
8389
8390
8391 # Set options
8392@@ -8376,7 +8885,8 @@ fi
8393 LIBTOOL_DEPS="$ltmain"
8394
8395 # Always use our own libtool.
8396-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8397+LIBTOOL='$(SHELL) $(top_builddir)'
8398+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8399
8400
8401
8402@@ -8465,7 +8975,7 @@ aix3*)
8403 esac
8404
8405 # Global variables:
8406-ofile=libtool
8407+ofile=${host_alias}-libtool
8408 can_build_shared=yes
8409
8410 # All known linkers require a `.a' archive for static linking (except MSVC,
8411@@ -8763,8 +9273,6 @@ fi
8412 lt_prog_compiler_pic=
8413 lt_prog_compiler_static=
8414
8415-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8416-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8417
8418 if test "$GCC" = yes; then
8419 lt_prog_compiler_wl='-Wl,'
8420@@ -8930,6 +9438,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8421 lt_prog_compiler_pic='--shared'
8422 lt_prog_compiler_static='--static'
8423 ;;
8424+ nagfor*)
8425+ # NAG Fortran compiler
8426+ lt_prog_compiler_wl='-Wl,-Wl,,'
8427+ lt_prog_compiler_pic='-PIC'
8428+ lt_prog_compiler_static='-Bstatic'
8429+ ;;
8430 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8431 # Portland Group compilers (*not* the Pentium gcc compiler,
8432 # which looks to be a dead project)
8433@@ -8992,7 +9506,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8434 lt_prog_compiler_pic='-KPIC'
8435 lt_prog_compiler_static='-Bstatic'
8436 case $cc_basename in
8437- f77* | f90* | f95*)
8438+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8439 lt_prog_compiler_wl='-Qoption ld ';;
8440 *)
8441 lt_prog_compiler_wl='-Wl,';;
8442@@ -9049,13 +9563,17 @@ case $host_os in
8443 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8444 ;;
8445 esac
8446-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8447-$as_echo "$lt_prog_compiler_pic" >&6; }
8448-
8449-
8450-
8451-
8452
8453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8454+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8455+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
8456+ $as_echo_n "(cached) " >&6
8457+else
8458+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8459+fi
8460+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8461+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8462+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8463
8464 #
8465 # Check to make sure the PIC flag actually works.
8466@@ -9116,6 +9634,11 @@ fi
8467
8468
8469
8470+
8471+
8472+
8473+
8474+
8475 #
8476 # Check to make sure the static flag actually works.
8477 #
8478@@ -9466,7 +9989,8 @@ _LT_EOF
8479 allow_undefined_flag=unsupported
8480 always_export_symbols=no
8481 enable_shared_with_static_runtimes=yes
8482- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8483+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
8484+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8485
8486 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8487 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8488@@ -9565,12 +10089,12 @@ _LT_EOF
8489 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8490 hardcode_libdir_flag_spec=
8491 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8492- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8493+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8494 if test "x$supports_anon_versioning" = xyes; then
8495 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8496 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8497 echo "local: *; };" >> $output_objdir/$libname.ver~
8498- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8499+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8500 fi
8501 ;;
8502 esac
8503@@ -9584,8 +10108,8 @@ _LT_EOF
8504 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8505 wlarc=
8506 else
8507- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8508- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8509+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8510+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8511 fi
8512 ;;
8513
8514@@ -9603,8 +10127,8 @@ _LT_EOF
8515
8516 _LT_EOF
8517 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8518- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8519- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8520+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8521+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8522 else
8523 ld_shlibs=no
8524 fi
8525@@ -9650,8 +10174,8 @@ _LT_EOF
8526
8527 *)
8528 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8529- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8530- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8531+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8532+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8533 else
8534 ld_shlibs=no
8535 fi
8536@@ -9781,7 +10305,13 @@ _LT_EOF
8537 allow_undefined_flag='-berok'
8538 # Determine the default libpath from the value encoded in an
8539 # empty executable.
8540- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8541+ if test "${lt_cv_aix_libpath+set}" = set; then
8542+ aix_libpath=$lt_cv_aix_libpath
8543+else
8544+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8545+ $as_echo_n "(cached) " >&6
8546+else
8547+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8548 /* end confdefs.h. */
8549
8550 int
8551@@ -9794,22 +10324,29 @@ main ()
8552 _ACEOF
8553 if ac_fn_c_try_link "$LINENO"; then :
8554
8555-lt_aix_libpath_sed='
8556- /Import File Strings/,/^$/ {
8557- /^0/ {
8558- s/^0 *\(.*\)$/\1/
8559- p
8560- }
8561- }'
8562-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8563-# Check for a 64-bit object if we didn't find anything.
8564-if test -z "$aix_libpath"; then
8565- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8566-fi
8567+ lt_aix_libpath_sed='
8568+ /Import File Strings/,/^$/ {
8569+ /^0/ {
8570+ s/^0 *\([^ ]*\) *$/\1/
8571+ p
8572+ }
8573+ }'
8574+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8575+ # Check for a 64-bit object if we didn't find anything.
8576+ if test -z "$lt_cv_aix_libpath_"; then
8577+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8578+ fi
8579 fi
8580 rm -f core conftest.err conftest.$ac_objext \
8581 conftest$ac_exeext conftest.$ac_ext
8582-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8583+ if test -z "$lt_cv_aix_libpath_"; then
8584+ lt_cv_aix_libpath_="/usr/lib:/lib"
8585+ fi
8586+
8587+fi
8588+
8589+ aix_libpath=$lt_cv_aix_libpath_
8590+fi
8591
8592 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8593 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
8594@@ -9821,7 +10358,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8595 else
8596 # Determine the default libpath from the value encoded in an
8597 # empty executable.
8598- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8599+ if test "${lt_cv_aix_libpath+set}" = set; then
8600+ aix_libpath=$lt_cv_aix_libpath
8601+else
8602+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8603+ $as_echo_n "(cached) " >&6
8604+else
8605+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8606 /* end confdefs.h. */
8607
8608 int
8609@@ -9834,22 +10377,29 @@ main ()
8610 _ACEOF
8611 if ac_fn_c_try_link "$LINENO"; then :
8612
8613-lt_aix_libpath_sed='
8614- /Import File Strings/,/^$/ {
8615- /^0/ {
8616- s/^0 *\(.*\)$/\1/
8617- p
8618- }
8619- }'
8620-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8621-# Check for a 64-bit object if we didn't find anything.
8622-if test -z "$aix_libpath"; then
8623- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8624-fi
8625+ lt_aix_libpath_sed='
8626+ /Import File Strings/,/^$/ {
8627+ /^0/ {
8628+ s/^0 *\([^ ]*\) *$/\1/
8629+ p
8630+ }
8631+ }'
8632+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8633+ # Check for a 64-bit object if we didn't find anything.
8634+ if test -z "$lt_cv_aix_libpath_"; then
8635+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8636+ fi
8637 fi
8638 rm -f core conftest.err conftest.$ac_objext \
8639 conftest$ac_exeext conftest.$ac_ext
8640-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8641+ if test -z "$lt_cv_aix_libpath_"; then
8642+ lt_cv_aix_libpath_="/usr/lib:/lib"
8643+ fi
8644+
8645+fi
8646+
8647+ aix_libpath=$lt_cv_aix_libpath_
8648+fi
8649
8650 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8651 # Warning - without using the other run time loading flags,
8652@@ -9893,21 +10443,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8653 # When not using gcc, we currently assume that we are using
8654 # Microsoft Visual C++.
8655 # hardcode_libdir_flag_spec is actually meaningless, as there is
8656- # no search path for DLLs.
8657- hardcode_libdir_flag_spec=' '
8658- allow_undefined_flag=unsupported
8659- # Tell ltmain to make .lib files, not .a files.
8660- libext=lib
8661- # Tell ltmain to make .dll files, not .so files.
8662- shrext_cmds=".dll"
8663- # FIXME: Setting linknames here is a bad hack.
8664- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8665- # The linker will automatically build a .lib file if we build a DLL.
8666- old_archive_from_new_cmds='true'
8667- # FIXME: Should let the user specify the lib program.
8668- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8669- fix_srcfile_path='`cygpath -w "$srcfile"`'
8670- enable_shared_with_static_runtimes=yes
8671+ # no search path for DLLs.
8672+ case $cc_basename in
8673+ cl*)
8674+ # Native MSVC
8675+ hardcode_libdir_flag_spec=' '
8676+ allow_undefined_flag=unsupported
8677+ always_export_symbols=yes
8678+ file_list_spec='@'
8679+ # Tell ltmain to make .lib files, not .a files.
8680+ libext=lib
8681+ # Tell ltmain to make .dll files, not .so files.
8682+ shrext_cmds=".dll"
8683+ # FIXME: Setting linknames here is a bad hack.
8684+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8685+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8686+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8687+ else
8688+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8689+ fi~
8690+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8691+ linknames='
8692+ # The linker will not automatically build a static lib if we build a DLL.
8693+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8694+ enable_shared_with_static_runtimes=yes
8695+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8696+ # Don't use ranlib
8697+ old_postinstall_cmds='chmod 644 $oldlib'
8698+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8699+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8700+ case $lt_outputfile in
8701+ *.exe|*.EXE) ;;
8702+ *)
8703+ lt_outputfile="$lt_outputfile.exe"
8704+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8705+ ;;
8706+ esac~
8707+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8708+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8709+ $RM "$lt_outputfile.manifest";
8710+ fi'
8711+ ;;
8712+ *)
8713+ # Assume MSVC wrapper
8714+ hardcode_libdir_flag_spec=' '
8715+ allow_undefined_flag=unsupported
8716+ # Tell ltmain to make .lib files, not .a files.
8717+ libext=lib
8718+ # Tell ltmain to make .dll files, not .so files.
8719+ shrext_cmds=".dll"
8720+ # FIXME: Setting linknames here is a bad hack.
8721+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8722+ # The linker will automatically build a .lib file if we build a DLL.
8723+ old_archive_from_new_cmds='true'
8724+ # FIXME: Should let the user specify the lib program.
8725+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8726+ enable_shared_with_static_runtimes=yes
8727+ ;;
8728+ esac
8729 ;;
8730
8731 darwin* | rhapsody*)
8732@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8733
8734 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8735 freebsd* | dragonfly*)
8736- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8737+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8738 hardcode_libdir_flag_spec='-R$libdir'
8739 hardcode_direct=yes
8740 hardcode_shlibpath_var=no
8741@@ -9976,7 +10569,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8742
8743 hpux9*)
8744 if test "$GCC" = yes; then
8745- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8746+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8747 else
8748 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8749 fi
8750@@ -9992,7 +10585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8751
8752 hpux10*)
8753 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8754- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8755+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8756 else
8757 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8758 fi
8759@@ -10016,10 +10609,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8760 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8761 ;;
8762 ia64*)
8763- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8764+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8765 ;;
8766 *)
8767- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8768+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8769 ;;
8770 esac
8771 else
8772@@ -10098,23 +10691,36 @@ fi
8773
8774 irix5* | irix6* | nonstopux*)
8775 if test "$GCC" = yes; then
8776- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8777+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8778 # Try to use the -exported_symbol ld option, if it does not
8779 # work, assume that -exports_file does not work either and
8780 # implicitly export all symbols.
8781- save_LDFLAGS="$LDFLAGS"
8782- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8783- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8784+ # This should be the same for all languages, so no per-tag cache variable.
8785+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8786+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8787+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8788+ $as_echo_n "(cached) " >&6
8789+else
8790+ save_LDFLAGS="$LDFLAGS"
8791+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8792+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8793 /* end confdefs.h. */
8794-int foo(void) {}
8795+int foo (void) { return 0; }
8796 _ACEOF
8797 if ac_fn_c_try_link "$LINENO"; then :
8798- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
8799-
8800+ lt_cv_irix_exported_symbol=yes
8801+else
8802+ lt_cv_irix_exported_symbol=no
8803 fi
8804 rm -f core conftest.err conftest.$ac_objext \
8805 conftest$ac_exeext conftest.$ac_ext
8806- LDFLAGS="$save_LDFLAGS"
8807+ LDFLAGS="$save_LDFLAGS"
8808+fi
8809+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8810+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8811+ if test "$lt_cv_irix_exported_symbol" = yes; then
8812+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
8813+ fi
8814 else
8815 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
8816 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
8817@@ -10199,7 +10805,7 @@ rm -f core conftest.err conftest.$ac_objext \
8818 osf4* | osf5*) # as osf3* with the addition of -msym flag
8819 if test "$GCC" = yes; then
8820 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8821- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8822+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8823 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8824 else
8825 allow_undefined_flag=' -expect_unresolved \*'
8826@@ -10218,9 +10824,9 @@ rm -f core conftest.err conftest.$ac_objext \
8827 no_undefined_flag=' -z defs'
8828 if test "$GCC" = yes; then
8829 wlarc='${wl}'
8830- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8831+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8832 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8833- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8834+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8835 else
8836 case `$CC -V 2>&1` in
8837 *"Compilers 5.0"*)
8838@@ -10796,8 +11402,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8839 need_version=no
8840 need_lib_prefix=no
8841
8842- case $GCC,$host_os in
8843- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8844+ case $GCC,$cc_basename in
8845+ yes,*)
8846+ # gcc
8847 library_names_spec='$libname.dll.a'
8848 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8849 postinstall_cmds='base_file=`basename \${file}`~
8850@@ -10830,13 +11437,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8851 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8852 ;;
8853 esac
8854+ dynamic_linker='Win32 ld.exe'
8855+ ;;
8856+
8857+ *,cl*)
8858+ # Native MSVC
8859+ libname_spec='$name'
8860+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8861+ library_names_spec='${libname}.dll.lib'
8862+
8863+ case $build_os in
8864+ mingw*)
8865+ sys_lib_search_path_spec=
8866+ lt_save_ifs=$IFS
8867+ IFS=';'
8868+ for lt_path in $LIB
8869+ do
8870+ IFS=$lt_save_ifs
8871+ # Let DOS variable expansion print the short 8.3 style file name.
8872+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8873+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8874+ done
8875+ IFS=$lt_save_ifs
8876+ # Convert to MSYS style.
8877+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8878+ ;;
8879+ cygwin*)
8880+ # Convert to unix form, then to dos form, then back to unix form
8881+ # but this time dos style (no spaces!) so that the unix form looks
8882+ # like /cygdrive/c/PROGRA~1:/cygdr...
8883+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8884+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8885+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8886+ ;;
8887+ *)
8888+ sys_lib_search_path_spec="$LIB"
8889+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8890+ # It is most probably a Windows format PATH.
8891+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8892+ else
8893+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8894+ fi
8895+ # FIXME: find the short name or the path components, as spaces are
8896+ # common. (e.g. "Program Files" -> "PROGRA~1")
8897+ ;;
8898+ esac
8899+
8900+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8901+ postinstall_cmds='base_file=`basename \${file}`~
8902+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8903+ dldir=$destdir/`dirname \$dlpath`~
8904+ test -d \$dldir || mkdir -p \$dldir~
8905+ $install_prog $dir/$dlname \$dldir/$dlname'
8906+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8907+ dlpath=$dir/\$dldll~
8908+ $RM \$dlpath'
8909+ shlibpath_overrides_runpath=yes
8910+ dynamic_linker='Win32 link.exe'
8911 ;;
8912
8913 *)
8914+ # Assume MSVC wrapper
8915 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8916+ dynamic_linker='Win32 ld.exe'
8917 ;;
8918 esac
8919- dynamic_linker='Win32 ld.exe'
8920 # FIXME: first we should search . and the directory the executable is in
8921 shlibpath_var=PATH
8922 ;;
8923@@ -10928,7 +11593,7 @@ haiku*)
8924 soname_spec='${libname}${release}${shared_ext}$major'
8925 shlibpath_var=LIBRARY_PATH
8926 shlibpath_overrides_runpath=yes
8927- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8928+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8929 hardcode_into_libs=yes
8930 ;;
8931
8932@@ -11768,10 +12433,10 @@ else
8933 /* When -fvisbility=hidden is used, assume the code has been annotated
8934 correspondingly for the symbols needed. */
8935 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8936-void fnord () __attribute__((visibility("default")));
8937+int fnord () __attribute__((visibility("default")));
8938 #endif
8939
8940-void fnord () { int i=42; }
8941+int fnord () { return 42; }
8942 int main ()
8943 {
8944 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8945@@ -11874,10 +12539,10 @@ else
8946 /* When -fvisbility=hidden is used, assume the code has been annotated
8947 correspondingly for the symbols needed. */
8948 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8949-void fnord () __attribute__((visibility("default")));
8950+int fnord () __attribute__((visibility("default")));
8951 #endif
8952
8953-void fnord () { int i=42; }
8954+int fnord () { return 42; }
8955 int main ()
8956 {
8957 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8958@@ -12269,6 +12934,7 @@ $RM -r conftest*
8959
8960 # Allow CC to be a program name with arguments.
8961 lt_save_CC=$CC
8962+ lt_save_CFLAGS=$CFLAGS
8963 lt_save_LD=$LD
8964 lt_save_GCC=$GCC
8965 GCC=$GXX
8966@@ -12286,6 +12952,7 @@ $RM -r conftest*
8967 fi
8968 test -z "${LDCXX+set}" || LD=$LDCXX
8969 CC=${CXX-"c++"}
8970+ CFLAGS=$CXXFLAGS
8971 compiler=$CC
8972 compiler_CXX=$CC
8973 for cc_temp in $compiler""; do
8974@@ -12568,7 +13235,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8975 allow_undefined_flag_CXX='-berok'
8976 # Determine the default libpath from the value encoded in an empty
8977 # executable.
8978- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8979+ if test "${lt_cv_aix_libpath+set}" = set; then
8980+ aix_libpath=$lt_cv_aix_libpath
8981+else
8982+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
8983+ $as_echo_n "(cached) " >&6
8984+else
8985+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8986 /* end confdefs.h. */
8987
8988 int
8989@@ -12581,22 +13254,29 @@ main ()
8990 _ACEOF
8991 if ac_fn_cxx_try_link "$LINENO"; then :
8992
8993-lt_aix_libpath_sed='
8994- /Import File Strings/,/^$/ {
8995- /^0/ {
8996- s/^0 *\(.*\)$/\1/
8997- p
8998- }
8999- }'
9000-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9001-# Check for a 64-bit object if we didn't find anything.
9002-if test -z "$aix_libpath"; then
9003- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9004-fi
9005+ lt_aix_libpath_sed='
9006+ /Import File Strings/,/^$/ {
9007+ /^0/ {
9008+ s/^0 *\([^ ]*\) *$/\1/
9009+ p
9010+ }
9011+ }'
9012+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9013+ # Check for a 64-bit object if we didn't find anything.
9014+ if test -z "$lt_cv_aix_libpath__CXX"; then
9015+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9016+ fi
9017 fi
9018 rm -f core conftest.err conftest.$ac_objext \
9019 conftest$ac_exeext conftest.$ac_ext
9020-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9021+ if test -z "$lt_cv_aix_libpath__CXX"; then
9022+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9023+ fi
9024+
9025+fi
9026+
9027+ aix_libpath=$lt_cv_aix_libpath__CXX
9028+fi
9029
9030 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9031
9032@@ -12609,7 +13289,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9033 else
9034 # Determine the default libpath from the value encoded in an
9035 # empty executable.
9036- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9037+ if test "${lt_cv_aix_libpath+set}" = set; then
9038+ aix_libpath=$lt_cv_aix_libpath
9039+else
9040+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9041+ $as_echo_n "(cached) " >&6
9042+else
9043+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9044 /* end confdefs.h. */
9045
9046 int
9047@@ -12622,22 +13308,29 @@ main ()
9048 _ACEOF
9049 if ac_fn_cxx_try_link "$LINENO"; then :
9050
9051-lt_aix_libpath_sed='
9052- /Import File Strings/,/^$/ {
9053- /^0/ {
9054- s/^0 *\(.*\)$/\1/
9055- p
9056- }
9057- }'
9058-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9059-# Check for a 64-bit object if we didn't find anything.
9060-if test -z "$aix_libpath"; then
9061- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9062-fi
9063+ lt_aix_libpath_sed='
9064+ /Import File Strings/,/^$/ {
9065+ /^0/ {
9066+ s/^0 *\([^ ]*\) *$/\1/
9067+ p
9068+ }
9069+ }'
9070+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9071+ # Check for a 64-bit object if we didn't find anything.
9072+ if test -z "$lt_cv_aix_libpath__CXX"; then
9073+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9074+ fi
9075 fi
9076 rm -f core conftest.err conftest.$ac_objext \
9077 conftest$ac_exeext conftest.$ac_ext
9078-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9079+ if test -z "$lt_cv_aix_libpath__CXX"; then
9080+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9081+ fi
9082+
9083+fi
9084+
9085+ aix_libpath=$lt_cv_aix_libpath__CXX
9086+fi
9087
9088 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9089 # Warning - without using the other run time loading flags,
9090@@ -12680,29 +13373,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9091 ;;
9092
9093 cygwin* | mingw* | pw32* | cegcc*)
9094- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9095- # as there is no search path for DLLs.
9096- hardcode_libdir_flag_spec_CXX='-L$libdir'
9097- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9098- allow_undefined_flag_CXX=unsupported
9099- always_export_symbols_CXX=no
9100- enable_shared_with_static_runtimes_CXX=yes
9101-
9102- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9103- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9104- # If the export-symbols file already is a .def file (1st line
9105- # is EXPORTS), use it as is; otherwise, prepend...
9106- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9107- cp $export_symbols $output_objdir/$soname.def;
9108- else
9109- echo EXPORTS > $output_objdir/$soname.def;
9110- cat $export_symbols >> $output_objdir/$soname.def;
9111- fi~
9112- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9113- else
9114- ld_shlibs_CXX=no
9115- fi
9116- ;;
9117+ case $GXX,$cc_basename in
9118+ ,cl* | no,cl*)
9119+ # Native MSVC
9120+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9121+ # no search path for DLLs.
9122+ hardcode_libdir_flag_spec_CXX=' '
9123+ allow_undefined_flag_CXX=unsupported
9124+ always_export_symbols_CXX=yes
9125+ file_list_spec_CXX='@'
9126+ # Tell ltmain to make .lib files, not .a files.
9127+ libext=lib
9128+ # Tell ltmain to make .dll files, not .so files.
9129+ shrext_cmds=".dll"
9130+ # FIXME: Setting linknames here is a bad hack.
9131+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9132+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9133+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9134+ else
9135+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9136+ fi~
9137+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9138+ linknames='
9139+ # The linker will not automatically build a static lib if we build a DLL.
9140+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9141+ enable_shared_with_static_runtimes_CXX=yes
9142+ # Don't use ranlib
9143+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9144+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9145+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9146+ case $lt_outputfile in
9147+ *.exe|*.EXE) ;;
9148+ *)
9149+ lt_outputfile="$lt_outputfile.exe"
9150+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9151+ ;;
9152+ esac~
9153+ func_to_tool_file "$lt_outputfile"~
9154+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9155+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9156+ $RM "$lt_outputfile.manifest";
9157+ fi'
9158+ ;;
9159+ *)
9160+ # g++
9161+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9162+ # as there is no search path for DLLs.
9163+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9164+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9165+ allow_undefined_flag_CXX=unsupported
9166+ always_export_symbols_CXX=no
9167+ enable_shared_with_static_runtimes_CXX=yes
9168+
9169+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9170+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9171+ # If the export-symbols file already is a .def file (1st line
9172+ # is EXPORTS), use it as is; otherwise, prepend...
9173+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9174+ cp $export_symbols $output_objdir/$soname.def;
9175+ else
9176+ echo EXPORTS > $output_objdir/$soname.def;
9177+ cat $export_symbols >> $output_objdir/$soname.def;
9178+ fi~
9179+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9180+ else
9181+ ld_shlibs_CXX=no
9182+ fi
9183+ ;;
9184+ esac
9185+ ;;
9186 darwin* | rhapsody*)
9187
9188
9189@@ -12808,7 +13547,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9190 ;;
9191 *)
9192 if test "$GXX" = yes; then
9193- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9194+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9195 else
9196 # FIXME: insert proper C++ library support
9197 ld_shlibs_CXX=no
9198@@ -12879,10 +13618,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9199 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9200 ;;
9201 ia64*)
9202- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9203+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9204 ;;
9205 *)
9206- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9207+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9208 ;;
9209 esac
9210 fi
9211@@ -12923,9 +13662,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9212 *)
9213 if test "$GXX" = yes; then
9214 if test "$with_gnu_ld" = no; then
9215- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9216+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9217 else
9218- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9219+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9220 fi
9221 fi
9222 link_all_deplibs_CXX=yes
9223@@ -12995,20 +13734,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9224 prelink_cmds_CXX='tpldir=Template.dir~
9225 rm -rf $tpldir~
9226 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9227- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9228+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9229 old_archive_cmds_CXX='tpldir=Template.dir~
9230 rm -rf $tpldir~
9231 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9232- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9233+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9234 $RANLIB $oldlib'
9235 archive_cmds_CXX='tpldir=Template.dir~
9236 rm -rf $tpldir~
9237 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9238- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9239+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9240 archive_expsym_cmds_CXX='tpldir=Template.dir~
9241 rm -rf $tpldir~
9242 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9243- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9244+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9245 ;;
9246 *) # Version 6 and above use weak symbols
9247 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9248@@ -13203,7 +13942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9249 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9250 ;;
9251 *)
9252- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9253+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9254 ;;
9255 esac
9256
9257@@ -13249,7 +13988,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9258
9259 solaris*)
9260 case $cc_basename in
9261- CC*)
9262+ CC* | sunCC*)
9263 # Sun C++ 4.2, 5.x and Centerline C++
9264 archive_cmds_need_lc_CXX=yes
9265 no_undefined_flag_CXX=' -zdefs'
9266@@ -13290,9 +14029,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9267 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9268 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9269 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9270- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9271+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9272 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9273- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9274+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9275
9276 # Commands to make compiler produce verbose output that lists
9277 # what "hidden" libraries, object files and flags are used when
9278@@ -13427,6 +14166,13 @@ private:
9279 };
9280 _LT_EOF
9281
9282+
9283+_lt_libdeps_save_CFLAGS=$CFLAGS
9284+case "$CC $CFLAGS " in #(
9285+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9286+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9287+esac
9288+
9289 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9290 (eval $ac_compile) 2>&5
9291 ac_status=$?
9292@@ -13440,7 +14186,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9293 pre_test_object_deps_done=no
9294
9295 for p in `eval "$output_verbose_link_cmd"`; do
9296- case $p in
9297+ case ${prev}${p} in
9298
9299 -L* | -R* | -l*)
9300 # Some compilers place space between "-{L,R}" and the path.
9301@@ -13449,13 +14195,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9302 test $p = "-R"; then
9303 prev=$p
9304 continue
9305- else
9306- prev=
9307 fi
9308
9309+ # Expand the sysroot to ease extracting the directories later.
9310+ if test -z "$prev"; then
9311+ case $p in
9312+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9313+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9314+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9315+ esac
9316+ fi
9317+ case $p in
9318+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9319+ esac
9320 if test "$pre_test_object_deps_done" = no; then
9321- case $p in
9322- -L* | -R*)
9323+ case ${prev} in
9324+ -L | -R)
9325 # Internal compiler library paths should come after those
9326 # provided the user. The postdeps already come after the
9327 # user supplied libs so there is no need to process them.
9328@@ -13475,8 +14230,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9329 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9330 fi
9331 fi
9332+ prev=
9333 ;;
9334
9335+ *.lto.$objext) ;; # Ignore GCC LTO objects
9336 *.$objext)
9337 # This assumes that the test object file only shows up
9338 # once in the compiler output.
9339@@ -13512,6 +14269,7 @@ else
9340 fi
9341
9342 $RM -f confest.$objext
9343+CFLAGS=$_lt_libdeps_save_CFLAGS
9344
9345 # PORTME: override above test on systems where it is broken
9346 case $host_os in
9347@@ -13547,7 +14305,7 @@ linux*)
9348
9349 solaris*)
9350 case $cc_basename in
9351- CC*)
9352+ CC* | sunCC*)
9353 # The more standards-conforming stlport4 library is
9354 # incompatible with the Cstd library. Avoid specifying
9355 # it if it's in CXXFLAGS. Ignore libCrun as
9356@@ -13612,8 +14370,6 @@ fi
9357 lt_prog_compiler_pic_CXX=
9358 lt_prog_compiler_static_CXX=
9359
9360-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9361-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9362
9363 # C++ specific cases for pic, static, wl, etc.
9364 if test "$GXX" = yes; then
9365@@ -13718,6 +14474,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9366 ;;
9367 esac
9368 ;;
9369+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9370+ # This hack is so that the source file can tell whether it is being
9371+ # built for inclusion in a dll (and should export symbols for example).
9372+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9373+ ;;
9374 dgux*)
9375 case $cc_basename in
9376 ec++*)
9377@@ -13870,7 +14631,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9378 ;;
9379 solaris*)
9380 case $cc_basename in
9381- CC*)
9382+ CC* | sunCC*)
9383 # Sun C++ 4.2, 5.x and Centerline C++
9384 lt_prog_compiler_pic_CXX='-KPIC'
9385 lt_prog_compiler_static_CXX='-Bstatic'
9386@@ -13935,10 +14696,17 @@ case $host_os in
9387 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9388 ;;
9389 esac
9390-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9391-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9392-
9393
9394+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9395+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9396+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
9397+ $as_echo_n "(cached) " >&6
9398+else
9399+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9400+fi
9401+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9402+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9403+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9404
9405 #
9406 # Check to make sure the PIC flag actually works.
9407@@ -13996,6 +14764,8 @@ fi
9408
9409
9410
9411+
9412+
9413 #
9414 # Check to make sure the static flag actually works.
9415 #
9416@@ -14173,6 +14943,7 @@ fi
9417 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9418
9419 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9420+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9421 case $host_os in
9422 aix[4-9]*)
9423 # If we're using GNU nm, then we don't want the "-C" option.
9424@@ -14187,15 +14958,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9425 ;;
9426 pw32*)
9427 export_symbols_cmds_CXX="$ltdll_cmds"
9428- ;;
9429+ ;;
9430 cygwin* | mingw* | cegcc*)
9431- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9432- ;;
9433+ case $cc_basename in
9434+ cl*) ;;
9435+ *)
9436+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9437+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9438+ ;;
9439+ esac
9440+ ;;
9441 *)
9442 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9443- ;;
9444+ ;;
9445 esac
9446- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9447
9448 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9449 $as_echo "$ld_shlibs_CXX" >&6; }
9450@@ -14458,8 +15234,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9451 need_version=no
9452 need_lib_prefix=no
9453
9454- case $GCC,$host_os in
9455- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9456+ case $GCC,$cc_basename in
9457+ yes,*)
9458+ # gcc
9459 library_names_spec='$libname.dll.a'
9460 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9461 postinstall_cmds='base_file=`basename \${file}`~
9462@@ -14491,13 +15268,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9463 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9464 ;;
9465 esac
9466+ dynamic_linker='Win32 ld.exe'
9467+ ;;
9468+
9469+ *,cl*)
9470+ # Native MSVC
9471+ libname_spec='$name'
9472+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9473+ library_names_spec='${libname}.dll.lib'
9474+
9475+ case $build_os in
9476+ mingw*)
9477+ sys_lib_search_path_spec=
9478+ lt_save_ifs=$IFS
9479+ IFS=';'
9480+ for lt_path in $LIB
9481+ do
9482+ IFS=$lt_save_ifs
9483+ # Let DOS variable expansion print the short 8.3 style file name.
9484+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9485+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9486+ done
9487+ IFS=$lt_save_ifs
9488+ # Convert to MSYS style.
9489+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9490+ ;;
9491+ cygwin*)
9492+ # Convert to unix form, then to dos form, then back to unix form
9493+ # but this time dos style (no spaces!) so that the unix form looks
9494+ # like /cygdrive/c/PROGRA~1:/cygdr...
9495+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9496+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9497+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9498+ ;;
9499+ *)
9500+ sys_lib_search_path_spec="$LIB"
9501+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9502+ # It is most probably a Windows format PATH.
9503+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9504+ else
9505+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9506+ fi
9507+ # FIXME: find the short name or the path components, as spaces are
9508+ # common. (e.g. "Program Files" -> "PROGRA~1")
9509+ ;;
9510+ esac
9511+
9512+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9513+ postinstall_cmds='base_file=`basename \${file}`~
9514+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9515+ dldir=$destdir/`dirname \$dlpath`~
9516+ test -d \$dldir || mkdir -p \$dldir~
9517+ $install_prog $dir/$dlname \$dldir/$dlname'
9518+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9519+ dlpath=$dir/\$dldll~
9520+ $RM \$dlpath'
9521+ shlibpath_overrides_runpath=yes
9522+ dynamic_linker='Win32 link.exe'
9523 ;;
9524
9525 *)
9526+ # Assume MSVC wrapper
9527 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9528+ dynamic_linker='Win32 ld.exe'
9529 ;;
9530 esac
9531- dynamic_linker='Win32 ld.exe'
9532 # FIXME: first we should search . and the directory the executable is in
9533 shlibpath_var=PATH
9534 ;;
9535@@ -14588,7 +15423,7 @@ haiku*)
9536 soname_spec='${libname}${release}${shared_ext}$major'
9537 shlibpath_var=LIBRARY_PATH
9538 shlibpath_overrides_runpath=yes
9539- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9540+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9541 hardcode_into_libs=yes
9542 ;;
9543
9544@@ -15047,6 +15882,7 @@ fi
9545 fi # test -n "$compiler"
9546
9547 CC=$lt_save_CC
9548+ CFLAGS=$lt_save_CFLAGS
9549 LDCXX=$LD
9550 LD=$lt_save_LD
9551 GCC=$lt_save_GCC
9552@@ -18026,13 +18862,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9553 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9554 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9555 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9556+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9557+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9558 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9559 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9560 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9561 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9562 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9563+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9564+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9565+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9566+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9567 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9568 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9569+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9570 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9571 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9572 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9573@@ -18047,14 +18890,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9574 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9575 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9576 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
9577+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9578+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9579 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9580 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9581 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9582-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9583 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9584+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9585 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9586 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9587 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9588+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9589 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9590 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9591 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9592@@ -18087,12 +18933,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9593 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9594 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9595 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9596-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9597 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9598 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9599 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9600 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9601 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9602+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9603 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9604 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9605 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9606@@ -18131,8 +18977,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9607 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9608 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9609 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9610-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9611 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9612+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9613 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9614 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9615 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9616@@ -18159,12 +19005,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9617 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9618 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9619 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9620-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9621 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9622 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9623 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9624 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9625 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9626+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9627 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9628 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9629 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9630@@ -18202,8 +19048,13 @@ reload_flag \
9631 OBJDUMP \
9632 deplibs_check_method \
9633 file_magic_cmd \
9634+file_magic_glob \
9635+want_nocaseglob \
9636+DLLTOOL \
9637+sharedlib_from_linklib_cmd \
9638 AR \
9639 AR_FLAGS \
9640+archiver_list_spec \
9641 STRIP \
9642 RANLIB \
9643 CC \
9644@@ -18213,12 +19064,14 @@ lt_cv_sys_global_symbol_pipe \
9645 lt_cv_sys_global_symbol_to_cdecl \
9646 lt_cv_sys_global_symbol_to_c_name_address \
9647 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9648+nm_file_list_spec \
9649 lt_prog_compiler_no_builtin_flag \
9650-lt_prog_compiler_wl \
9651 lt_prog_compiler_pic \
9652+lt_prog_compiler_wl \
9653 lt_prog_compiler_static \
9654 lt_cv_prog_compiler_c_o \
9655 need_locks \
9656+MANIFEST_TOOL \
9657 DSYMUTIL \
9658 NMEDIT \
9659 LIPO \
9660@@ -18234,7 +19087,6 @@ no_undefined_flag \
9661 hardcode_libdir_flag_spec \
9662 hardcode_libdir_flag_spec_ld \
9663 hardcode_libdir_separator \
9664-fix_srcfile_path \
9665 exclude_expsyms \
9666 include_expsyms \
9667 file_list_spec \
9668@@ -18256,8 +19108,8 @@ LD_CXX \
9669 reload_flag_CXX \
9670 compiler_CXX \
9671 lt_prog_compiler_no_builtin_flag_CXX \
9672-lt_prog_compiler_wl_CXX \
9673 lt_prog_compiler_pic_CXX \
9674+lt_prog_compiler_wl_CXX \
9675 lt_prog_compiler_static_CXX \
9676 lt_cv_prog_compiler_c_o_CXX \
9677 export_dynamic_flag_spec_CXX \
9678@@ -18269,7 +19121,6 @@ no_undefined_flag_CXX \
9679 hardcode_libdir_flag_spec_CXX \
9680 hardcode_libdir_flag_spec_ld_CXX \
9681 hardcode_libdir_separator_CXX \
9682-fix_srcfile_path_CXX \
9683 exclude_expsyms_CXX \
9684 include_expsyms_CXX \
9685 file_list_spec_CXX \
9686@@ -18303,6 +19154,7 @@ module_cmds \
9687 module_expsym_cmds \
9688 export_symbols_cmds \
9689 prelink_cmds \
9690+postlink_cmds \
9691 postinstall_cmds \
9692 postuninstall_cmds \
9693 finish_cmds \
9694@@ -18317,7 +19169,8 @@ archive_expsym_cmds_CXX \
9695 module_cmds_CXX \
9696 module_expsym_cmds_CXX \
9697 export_symbols_cmds_CXX \
9698-prelink_cmds_CXX; do
9699+prelink_cmds_CXX \
9700+postlink_cmds_CXX; do
9701 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9702 *[\\\\\\\`\\"\\\$]*)
9703 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9704@@ -19110,7 +19963,8 @@ $as_echo X"$file" |
9705 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9706 #
9707 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9708-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9709+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9710+# Inc.
9711 # Written by Gordon Matzigkeit, 1996
9712 #
9713 # This file is part of GNU Libtool.
9714@@ -19213,19 +20067,42 @@ SP2NL=$lt_lt_SP2NL
9715 # turn newlines into spaces.
9716 NL2SP=$lt_lt_NL2SP
9717
9718+# convert \$build file names to \$host format.
9719+to_host_file_cmd=$lt_cv_to_host_file_cmd
9720+
9721+# convert \$build files to toolchain format.
9722+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9723+
9724 # An object symbol dumper.
9725 OBJDUMP=$lt_OBJDUMP
9726
9727 # Method to check whether dependent libraries are shared objects.
9728 deplibs_check_method=$lt_deplibs_check_method
9729
9730-# Command to use when deplibs_check_method == "file_magic".
9731+# Command to use when deplibs_check_method = "file_magic".
9732 file_magic_cmd=$lt_file_magic_cmd
9733
9734+# How to find potential files when deplibs_check_method = "file_magic".
9735+file_magic_glob=$lt_file_magic_glob
9736+
9737+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9738+want_nocaseglob=$lt_want_nocaseglob
9739+
9740+# DLL creation program.
9741+DLLTOOL=$lt_DLLTOOL
9742+
9743+# Command to associate shared and link libraries.
9744+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9745+
9746 # The archiver.
9747 AR=$lt_AR
9748+
9749+# Flags to create an archive.
9750 AR_FLAGS=$lt_AR_FLAGS
9751
9752+# How to feed a file listing to the archiver.
9753+archiver_list_spec=$lt_archiver_list_spec
9754+
9755 # A symbol stripping program.
9756 STRIP=$lt_STRIP
9757
9758@@ -19255,6 +20132,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9759 # Transform the output of nm in a C name address pair when lib prefix is needed.
9760 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9761
9762+# Specify filename containing input files for \$NM.
9763+nm_file_list_spec=$lt_nm_file_list_spec
9764+
9765+# The root where to search for dependent libraries,and in which our libraries should be installed.
9766+lt_sysroot=$lt_sysroot
9767+
9768 # The name of the directory that contains temporary libtool files.
9769 objdir=$objdir
9770
9771@@ -19264,6 +20147,9 @@ MAGIC_CMD=$MAGIC_CMD
9772 # Must we lock files when doing compilation?
9773 need_locks=$lt_need_locks
9774
9775+# Manifest tool.
9776+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9777+
9778 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9779 DSYMUTIL=$lt_DSYMUTIL
9780
9781@@ -19378,12 +20264,12 @@ with_gcc=$GCC
9782 # Compiler flag to turn off builtin functions.
9783 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9784
9785-# How to pass a linker flag through the compiler.
9786-wl=$lt_lt_prog_compiler_wl
9787-
9788 # Additional compiler flags for building library objects.
9789 pic_flag=$lt_lt_prog_compiler_pic
9790
9791+# How to pass a linker flag through the compiler.
9792+wl=$lt_lt_prog_compiler_wl
9793+
9794 # Compiler flag to prevent dynamic linking.
9795 link_static_flag=$lt_lt_prog_compiler_static
9796
9797@@ -19470,9 +20356,6 @@ inherit_rpath=$inherit_rpath
9798 # Whether libtool must link a program against all its dependency libraries.
9799 link_all_deplibs=$link_all_deplibs
9800
9801-# Fix the shell variable \$srcfile for the compiler.
9802-fix_srcfile_path=$lt_fix_srcfile_path
9803-
9804 # Set to "yes" if exported symbols are required.
9805 always_export_symbols=$always_export_symbols
9806
9807@@ -19488,6 +20371,9 @@ include_expsyms=$lt_include_expsyms
9808 # Commands necessary for linking programs (against libraries) with templates.
9809 prelink_cmds=$lt_prelink_cmds
9810
9811+# Commands necessary for finishing linking programs.
9812+postlink_cmds=$lt_postlink_cmds
9813+
9814 # Specify filename containing input files.
9815 file_list_spec=$lt_file_list_spec
9816
9817@@ -19534,210 +20420,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9818 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9819 # text mode, it properly converts lines to CR/LF. This bash problem
9820 # is reportedly fixed, but why not run on old versions too?
9821- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9822- || (rm -f "$cfgfile"; exit 1)
9823-
9824- case $xsi_shell in
9825- yes)
9826- cat << \_LT_EOF >> "$cfgfile"
9827-
9828-# func_dirname file append nondir_replacement
9829-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9830-# otherwise set result to NONDIR_REPLACEMENT.
9831-func_dirname ()
9832-{
9833- case ${1} in
9834- */*) func_dirname_result="${1%/*}${2}" ;;
9835- * ) func_dirname_result="${3}" ;;
9836- esac
9837-}
9838-
9839-# func_basename file
9840-func_basename ()
9841-{
9842- func_basename_result="${1##*/}"
9843-}
9844-
9845-# func_dirname_and_basename file append nondir_replacement
9846-# perform func_basename and func_dirname in a single function
9847-# call:
9848-# dirname: Compute the dirname of FILE. If nonempty,
9849-# add APPEND to the result, otherwise set result
9850-# to NONDIR_REPLACEMENT.
9851-# value returned in "$func_dirname_result"
9852-# basename: Compute filename of FILE.
9853-# value retuned in "$func_basename_result"
9854-# Implementation must be kept synchronized with func_dirname
9855-# and func_basename. For efficiency, we do not delegate to
9856-# those functions but instead duplicate the functionality here.
9857-func_dirname_and_basename ()
9858-{
9859- case ${1} in
9860- */*) func_dirname_result="${1%/*}${2}" ;;
9861- * ) func_dirname_result="${3}" ;;
9862- esac
9863- func_basename_result="${1##*/}"
9864-}
9865-
9866-# func_stripname prefix suffix name
9867-# strip PREFIX and SUFFIX off of NAME.
9868-# PREFIX and SUFFIX must not contain globbing or regex special
9869-# characters, hashes, percent signs, but SUFFIX may contain a leading
9870-# dot (in which case that matches only a dot).
9871-func_stripname ()
9872-{
9873- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9874- # positional parameters, so assign one to ordinary parameter first.
9875- func_stripname_result=${3}
9876- func_stripname_result=${func_stripname_result#"${1}"}
9877- func_stripname_result=${func_stripname_result%"${2}"}
9878-}
9879-
9880-# func_opt_split
9881-func_opt_split ()
9882-{
9883- func_opt_split_opt=${1%%=*}
9884- func_opt_split_arg=${1#*=}
9885-}
9886-
9887-# func_lo2o object
9888-func_lo2o ()
9889-{
9890- case ${1} in
9891- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9892- *) func_lo2o_result=${1} ;;
9893- esac
9894-}
9895-
9896-# func_xform libobj-or-source
9897-func_xform ()
9898-{
9899- func_xform_result=${1%.*}.lo
9900-}
9901-
9902-# func_arith arithmetic-term...
9903-func_arith ()
9904-{
9905- func_arith_result=$(( $* ))
9906-}
9907-
9908-# func_len string
9909-# STRING may not start with a hyphen.
9910-func_len ()
9911-{
9912- func_len_result=${#1}
9913-}
9914-
9915-_LT_EOF
9916- ;;
9917- *) # Bourne compatible functions.
9918- cat << \_LT_EOF >> "$cfgfile"
9919-
9920-# func_dirname file append nondir_replacement
9921-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9922-# otherwise set result to NONDIR_REPLACEMENT.
9923-func_dirname ()
9924-{
9925- # Extract subdirectory from the argument.
9926- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9927- if test "X$func_dirname_result" = "X${1}"; then
9928- func_dirname_result="${3}"
9929- else
9930- func_dirname_result="$func_dirname_result${2}"
9931- fi
9932-}
9933-
9934-# func_basename file
9935-func_basename ()
9936-{
9937- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9938-}
9939-
9940-
9941-# func_stripname prefix suffix name
9942-# strip PREFIX and SUFFIX off of NAME.
9943-# PREFIX and SUFFIX must not contain globbing or regex special
9944-# characters, hashes, percent signs, but SUFFIX may contain a leading
9945-# dot (in which case that matches only a dot).
9946-# func_strip_suffix prefix name
9947-func_stripname ()
9948-{
9949- case ${2} in
9950- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
9951- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
9952- esac
9953-}
9954-
9955-# sed scripts:
9956-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
9957-my_sed_long_arg='1s/^-[^=]*=//'
9958-
9959-# func_opt_split
9960-func_opt_split ()
9961-{
9962- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
9963- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
9964-}
9965-
9966-# func_lo2o object
9967-func_lo2o ()
9968-{
9969- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
9970-}
9971-
9972-# func_xform libobj-or-source
9973-func_xform ()
9974-{
9975- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
9976-}
9977-
9978-# func_arith arithmetic-term...
9979-func_arith ()
9980-{
9981- func_arith_result=`expr "$@"`
9982-}
9983-
9984-# func_len string
9985-# STRING may not start with a hyphen.
9986-func_len ()
9987-{
9988- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
9989-}
9990-
9991-_LT_EOF
9992-esac
9993-
9994-case $lt_shell_append in
9995- yes)
9996- cat << \_LT_EOF >> "$cfgfile"
9997-
9998-# func_append var value
9999-# Append VALUE to the end of shell variable VAR.
10000-func_append ()
10001-{
10002- eval "$1+=\$2"
10003-}
10004-_LT_EOF
10005- ;;
10006- *)
10007- cat << \_LT_EOF >> "$cfgfile"
10008-
10009-# func_append var value
10010-# Append VALUE to the end of shell variable VAR.
10011-func_append ()
10012-{
10013- eval "$1=\$$1\$2"
10014-}
10015-
10016-_LT_EOF
10017- ;;
10018- esac
10019-
10020-
10021- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10022- || (rm -f "$cfgfile"; exit 1)
10023-
10024- mv -f "$cfgfile" "$ofile" ||
10025+ sed '$q' "$ltmain" >> "$cfgfile" \
10026+ || (rm -f "$cfgfile"; exit 1)
10027+
10028+ if test x"$xsi_shell" = xyes; then
10029+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10030+func_dirname ()\
10031+{\
10032+\ case ${1} in\
10033+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10034+\ * ) func_dirname_result="${3}" ;;\
10035+\ esac\
10036+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10037+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10038+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10039+test 0 -eq $? || _lt_function_replace_fail=:
10040+
10041+
10042+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10043+func_basename ()\
10044+{\
10045+\ func_basename_result="${1##*/}"\
10046+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10047+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10048+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10049+test 0 -eq $? || _lt_function_replace_fail=:
10050+
10051+
10052+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10053+func_dirname_and_basename ()\
10054+{\
10055+\ case ${1} in\
10056+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10057+\ * ) func_dirname_result="${3}" ;;\
10058+\ esac\
10059+\ func_basename_result="${1##*/}"\
10060+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10061+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10062+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10063+test 0 -eq $? || _lt_function_replace_fail=:
10064+
10065+
10066+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10067+func_stripname ()\
10068+{\
10069+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10070+\ # positional parameters, so assign one to ordinary parameter first.\
10071+\ func_stripname_result=${3}\
10072+\ func_stripname_result=${func_stripname_result#"${1}"}\
10073+\ func_stripname_result=${func_stripname_result%"${2}"}\
10074+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10075+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10076+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10077+test 0 -eq $? || _lt_function_replace_fail=:
10078+
10079+
10080+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10081+func_split_long_opt ()\
10082+{\
10083+\ func_split_long_opt_name=${1%%=*}\
10084+\ func_split_long_opt_arg=${1#*=}\
10085+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10086+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10087+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10088+test 0 -eq $? || _lt_function_replace_fail=:
10089+
10090+
10091+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10092+func_split_short_opt ()\
10093+{\
10094+\ func_split_short_opt_arg=${1#??}\
10095+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10096+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10097+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10098+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10099+test 0 -eq $? || _lt_function_replace_fail=:
10100+
10101+
10102+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10103+func_lo2o ()\
10104+{\
10105+\ case ${1} in\
10106+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10107+\ *) func_lo2o_result=${1} ;;\
10108+\ esac\
10109+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10110+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10111+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10112+test 0 -eq $? || _lt_function_replace_fail=:
10113+
10114+
10115+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10116+func_xform ()\
10117+{\
10118+ func_xform_result=${1%.*}.lo\
10119+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10120+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10121+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10122+test 0 -eq $? || _lt_function_replace_fail=:
10123+
10124+
10125+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10126+func_arith ()\
10127+{\
10128+ func_arith_result=$(( $* ))\
10129+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10130+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10131+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10132+test 0 -eq $? || _lt_function_replace_fail=:
10133+
10134+
10135+ sed -e '/^func_len ()$/,/^} # func_len /c\
10136+func_len ()\
10137+{\
10138+ func_len_result=${#1}\
10139+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10140+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10141+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10142+test 0 -eq $? || _lt_function_replace_fail=:
10143+
10144+fi
10145+
10146+if test x"$lt_shell_append" = xyes; then
10147+ sed -e '/^func_append ()$/,/^} # func_append /c\
10148+func_append ()\
10149+{\
10150+ eval "${1}+=\\${2}"\
10151+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10152+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10153+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10154+test 0 -eq $? || _lt_function_replace_fail=:
10155+
10156+
10157+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10158+func_append_quoted ()\
10159+{\
10160+\ func_quote_for_eval "${2}"\
10161+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10162+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10163+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10164+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10165+test 0 -eq $? || _lt_function_replace_fail=:
10166+
10167+
10168+ # Save a `func_append' function call where possible by direct use of '+='
10169+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10170+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10171+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10172+ test 0 -eq $? || _lt_function_replace_fail=:
10173+else
10174+ # Save a `func_append' function call even when '+=' is not available
10175+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10176+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10177+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10178+ test 0 -eq $? || _lt_function_replace_fail=:
10179+fi
10180+
10181+if test x"$_lt_function_replace_fail" = x":"; then
10182+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10183+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10184+fi
10185+
10186+
10187+ mv -f "$cfgfile" "$ofile" ||
10188 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10189 chmod +x "$ofile"
10190
10191@@ -19765,12 +20610,12 @@ with_gcc=$GCC_CXX
10192 # Compiler flag to turn off builtin functions.
10193 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10194
10195-# How to pass a linker flag through the compiler.
10196-wl=$lt_lt_prog_compiler_wl_CXX
10197-
10198 # Additional compiler flags for building library objects.
10199 pic_flag=$lt_lt_prog_compiler_pic_CXX
10200
10201+# How to pass a linker flag through the compiler.
10202+wl=$lt_lt_prog_compiler_wl_CXX
10203+
10204 # Compiler flag to prevent dynamic linking.
10205 link_static_flag=$lt_lt_prog_compiler_static_CXX
10206
10207@@ -19857,9 +20702,6 @@ inherit_rpath=$inherit_rpath_CXX
10208 # Whether libtool must link a program against all its dependency libraries.
10209 link_all_deplibs=$link_all_deplibs_CXX
10210
10211-# Fix the shell variable \$srcfile for the compiler.
10212-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10213-
10214 # Set to "yes" if exported symbols are required.
10215 always_export_symbols=$always_export_symbols_CXX
10216
10217@@ -19875,6 +20717,9 @@ include_expsyms=$lt_include_expsyms_CXX
10218 # Commands necessary for linking programs (against libraries) with templates.
10219 prelink_cmds=$lt_prelink_cmds_CXX
10220
10221+# Commands necessary for finishing linking programs.
10222+postlink_cmds=$lt_postlink_cmds_CXX
10223+
10224 # Specify filename containing input files.
10225 file_list_spec=$lt_file_list_spec_CXX
10226
10227diff --git a/libtool.m4 b/libtool.m4
10228index 24d13f3440..e45fdc6998 100644
10229--- a/libtool.m4
10230+++ b/libtool.m4
10231@@ -1,7 +1,8 @@
10232 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10233 #
10234 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10235-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10236+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10237+# Inc.
10238 # Written by Gordon Matzigkeit, 1996
10239 #
10240 # This file is free software; the Free Software Foundation gives
10241@@ -10,7 +11,8 @@
10242
10243 m4_define([_LT_COPYING], [dnl
10244 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10245-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10246+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10247+# Inc.
10248 # Written by Gordon Matzigkeit, 1996
10249 #
10250 # This file is part of GNU Libtool.
10251@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10252 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10253 ])
10254
10255-# serial 56 LT_INIT
10256+# serial 57 LT_INIT
10257
10258
10259 # LT_PREREQ(VERSION)
10260@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10261 LIBTOOL_DEPS="$ltmain"
10262
10263 # Always use our own libtool.
10264-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10265+LIBTOOL='$(SHELL) $(top_builddir)'
10266+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10267 AC_SUBST(LIBTOOL)dnl
10268
10269 _LT_SETUP
10270@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
10271 dnl
10272 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10273 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10274+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10275 m4_require([_LT_CMD_RELOAD])dnl
10276 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10277+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10278 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10279 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10280+m4_require([_LT_WITH_SYSROOT])dnl
10281
10282 _LT_CONFIG_LIBTOOL_INIT([
10283 # See if we are running on zsh, and set the options which allow our
10284@@ -199,7 +205,7 @@ aix3*)
10285 esac
10286
10287 # Global variables:
10288-ofile=libtool
10289+ofile=${host_alias}-libtool
10290 can_build_shared=yes
10291
10292 # All known linkers require a `.a' archive for static linking (except MSVC,
10293@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
10294 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10295 configured by $[0], generated by m4_PACKAGE_STRING.
10296
10297-Copyright (C) 2009 Free Software Foundation, Inc.
10298+Copyright (C) 2010 Free Software Foundation, Inc.
10299 This config.lt script is free software; the Free Software Foundation
10300 gives unlimited permision to copy, distribute and modify it."
10301
10302@@ -746,15 +752,12 @@ _LT_EOF
10303 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10304 # text mode, it properly converts lines to CR/LF. This bash problem
10305 # is reportedly fixed, but why not run on old versions too?
10306- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10307- || (rm -f "$cfgfile"; exit 1)
10308+ sed '$q' "$ltmain" >> "$cfgfile" \
10309+ || (rm -f "$cfgfile"; exit 1)
10310
10311- _LT_PROG_XSI_SHELLFNS
10312+ _LT_PROG_REPLACE_SHELLFNS
10313
10314- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10315- || (rm -f "$cfgfile"; exit 1)
10316-
10317- mv -f "$cfgfile" "$ofile" ||
10318+ mv -f "$cfgfile" "$ofile" ||
10319 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10320 chmod +x "$ofile"
10321 ],
10322@@ -980,6 +983,8 @@ _LT_EOF
10323 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10324 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10325 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10326+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10327+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10328 cat > conftest.c << _LT_EOF
10329 int main() { return 0;}
10330 _LT_EOF
10331@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10332 fi
10333 ])
10334
10335-# _LT_SYS_MODULE_PATH_AIX
10336-# -----------------------
10337+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10338+# ----------------------------------
10339 # Links a minimal program and checks the executable
10340 # for the system default hardcoded library path. In most cases,
10341 # this is /usr/lib:/lib, but when the MPI compilers are used
10342 # the location of the communication and MPI libs are included too.
10343 # If we don't find anything, use the default library path according
10344 # to the aix ld manual.
10345+# Store the results from the different compilers for each TAGNAME.
10346+# Allow to override them for all tags through lt_cv_aix_libpath.
10347 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10348 [m4_require([_LT_DECL_SED])dnl
10349-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
10350-lt_aix_libpath_sed='
10351- /Import File Strings/,/^$/ {
10352- /^0/ {
10353- s/^0 *\(.*\)$/\1/
10354- p
10355- }
10356- }'
10357-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10358-# Check for a 64-bit object if we didn't find anything.
10359-if test -z "$aix_libpath"; then
10360- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10361-fi],[])
10362-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10363+if test "${lt_cv_aix_libpath+set}" = set; then
10364+ aix_libpath=$lt_cv_aix_libpath
10365+else
10366+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10367+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10368+ lt_aix_libpath_sed='[
10369+ /Import File Strings/,/^$/ {
10370+ /^0/ {
10371+ s/^0 *\([^ ]*\) *$/\1/
10372+ p
10373+ }
10374+ }]'
10375+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10376+ # Check for a 64-bit object if we didn't find anything.
10377+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10378+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10379+ fi],[])
10380+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10381+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10382+ fi
10383+ ])
10384+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10385+fi
10386 ])# _LT_SYS_MODULE_PATH_AIX
10387
10388
10389@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10390
10391 AC_MSG_CHECKING([how to print strings])
10392 # Test print first, because it will be a builtin if present.
10393-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10394+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10395 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10396 ECHO='print -r --'
10397 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10398@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
10399 ])# _LT_PROG_ECHO_BACKSLASH
10400
10401
10402+# _LT_WITH_SYSROOT
10403+# ----------------
10404+AC_DEFUN([_LT_WITH_SYSROOT],
10405+[AC_MSG_CHECKING([for sysroot])
10406+AC_ARG_WITH([libtool-sysroot],
10407+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10408+ (or the compiler's sysroot if not specified).],
10409+[], [with_libtool_sysroot=no])
10410+
10411+dnl lt_sysroot will always be passed unquoted. We quote it here
10412+dnl in case the user passed a directory name.
10413+lt_sysroot=
10414+case ${with_libtool_sysroot} in #(
10415+ yes)
10416+ if test "$GCC" = yes; then
10417+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10418+ fi
10419+ ;; #(
10420+ /*)
10421+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10422+ ;; #(
10423+ no|'')
10424+ ;; #(
10425+ *)
10426+ AC_MSG_RESULT([${with_libtool_sysroot}])
10427+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10428+ ;;
10429+esac
10430+
10431+ AC_MSG_RESULT([${lt_sysroot:-no}])
10432+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10433+[dependent libraries, and in which our libraries should be installed.])])
10434+
10435 # _LT_ENABLE_LOCK
10436 # ---------------
10437 m4_defun([_LT_ENABLE_LOCK],
10438@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10439 ])# _LT_ENABLE_LOCK
10440
10441
10442+# _LT_PROG_AR
10443+# -----------
10444+m4_defun([_LT_PROG_AR],
10445+[AC_CHECK_TOOLS(AR, [ar], false)
10446+: ${AR=ar}
10447+: ${AR_FLAGS=cru}
10448+_LT_DECL([], [AR], [1], [The archiver])
10449+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10450+
10451+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10452+ [lt_cv_ar_at_file=no
10453+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10454+ [echo conftest.$ac_objext > conftest.lst
10455+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10456+ AC_TRY_EVAL([lt_ar_try])
10457+ if test "$ac_status" -eq 0; then
10458+ # Ensure the archiver fails upon bogus file names.
10459+ rm -f conftest.$ac_objext libconftest.a
10460+ AC_TRY_EVAL([lt_ar_try])
10461+ if test "$ac_status" -ne 0; then
10462+ lt_cv_ar_at_file=@
10463+ fi
10464+ fi
10465+ rm -f conftest.* libconftest.a
10466+ ])
10467+ ])
10468+
10469+if test "x$lt_cv_ar_at_file" = xno; then
10470+ archiver_list_spec=
10471+else
10472+ archiver_list_spec=$lt_cv_ar_at_file
10473+fi
10474+_LT_DECL([], [archiver_list_spec], [1],
10475+ [How to feed a file listing to the archiver])
10476+])# _LT_PROG_AR
10477+
10478+
10479 # _LT_CMD_OLD_ARCHIVE
10480 # -------------------
10481 m4_defun([_LT_CMD_OLD_ARCHIVE],
10482-[AC_CHECK_TOOL(AR, ar, false)
10483-test -z "$AR" && AR=ar
10484-test -z "$AR_FLAGS" && AR_FLAGS=cru
10485-_LT_DECL([], [AR], [1], [The archiver])
10486-_LT_DECL([], [AR_FLAGS], [1])
10487+[_LT_PROG_AR
10488
10489 AC_CHECK_TOOL(STRIP, strip, :)
10490 test -z "$STRIP" && STRIP=:
10491@@ -1623,7 +1705,7 @@ else
10492 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10493 lt_status=$lt_dlunknown
10494 cat > conftest.$ac_ext <<_LT_EOF
10495-[#line __oline__ "configure"
10496+[#line $LINENO "configure"
10497 #include "confdefs.h"
10498
10499 #if HAVE_DLFCN_H
10500@@ -1667,10 +1749,10 @@ else
10501 /* When -fvisbility=hidden is used, assume the code has been annotated
10502 correspondingly for the symbols needed. */
10503 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10504-void fnord () __attribute__((visibility("default")));
10505+int fnord () __attribute__((visibility("default")));
10506 #endif
10507
10508-void fnord () { int i=42; }
10509+int fnord () { return 42; }
10510 int main ()
10511 {
10512 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10513@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10514 need_version=no
10515 need_lib_prefix=no
10516
10517- case $GCC,$host_os in
10518- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10519+ case $GCC,$cc_basename in
10520+ yes,*)
10521+ # gcc
10522 library_names_spec='$libname.dll.a'
10523 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10524 postinstall_cmds='base_file=`basename \${file}`~
10525@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10526 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10527 ;;
10528 esac
10529+ dynamic_linker='Win32 ld.exe'
10530+ ;;
10531+
10532+ *,cl*)
10533+ # Native MSVC
10534+ libname_spec='$name'
10535+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10536+ library_names_spec='${libname}.dll.lib'
10537+
10538+ case $build_os in
10539+ mingw*)
10540+ sys_lib_search_path_spec=
10541+ lt_save_ifs=$IFS
10542+ IFS=';'
10543+ for lt_path in $LIB
10544+ do
10545+ IFS=$lt_save_ifs
10546+ # Let DOS variable expansion print the short 8.3 style file name.
10547+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10548+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10549+ done
10550+ IFS=$lt_save_ifs
10551+ # Convert to MSYS style.
10552+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10553+ ;;
10554+ cygwin*)
10555+ # Convert to unix form, then to dos form, then back to unix form
10556+ # but this time dos style (no spaces!) so that the unix form looks
10557+ # like /cygdrive/c/PROGRA~1:/cygdr...
10558+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10559+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10560+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10561+ ;;
10562+ *)
10563+ sys_lib_search_path_spec="$LIB"
10564+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10565+ # It is most probably a Windows format PATH.
10566+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10567+ else
10568+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10569+ fi
10570+ # FIXME: find the short name or the path components, as spaces are
10571+ # common. (e.g. "Program Files" -> "PROGRA~1")
10572+ ;;
10573+ esac
10574+
10575+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10576+ postinstall_cmds='base_file=`basename \${file}`~
10577+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10578+ dldir=$destdir/`dirname \$dlpath`~
10579+ test -d \$dldir || mkdir -p \$dldir~
10580+ $install_prog $dir/$dlname \$dldir/$dlname'
10581+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10582+ dlpath=$dir/\$dldll~
10583+ $RM \$dlpath'
10584+ shlibpath_overrides_runpath=yes
10585+ dynamic_linker='Win32 link.exe'
10586 ;;
10587
10588 *)
10589+ # Assume MSVC wrapper
10590 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10591+ dynamic_linker='Win32 ld.exe'
10592 ;;
10593 esac
10594- dynamic_linker='Win32 ld.exe'
10595 # FIXME: first we should search . and the directory the executable is in
10596 shlibpath_var=PATH
10597 ;;
10598@@ -2342,7 +2483,7 @@ haiku*)
10599 soname_spec='${libname}${release}${shared_ext}$major'
10600 shlibpath_var=LIBRARY_PATH
10601 shlibpath_overrides_runpath=yes
10602- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10603+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10604 hardcode_into_libs=yes
10605 ;;
10606
10607@@ -2950,6 +3091,11 @@ case $reload_flag in
10608 esac
10609 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10610 case $host_os in
10611+ cygwin* | mingw* | pw32* | cegcc*)
10612+ if test "$GCC" != yes; then
10613+ reload_cmds=false
10614+ fi
10615+ ;;
10616 darwin*)
10617 if test "$GCC" = yes; then
10618 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10619@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10620 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10621 lt_cv_file_magic_cmd='func_win32_libid'
10622 else
10623- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10624+ # Keep this pattern in sync with the one in func_win32_libid.
10625+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10626 lt_cv_file_magic_cmd='$OBJDUMP -f'
10627 fi
10628 ;;
10629@@ -3167,6 +3314,21 @@ tpf*)
10630 ;;
10631 esac
10632 ])
10633+
10634+file_magic_glob=
10635+want_nocaseglob=no
10636+if test "$build" = "$host"; then
10637+ case $host_os in
10638+ mingw* | pw32*)
10639+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10640+ want_nocaseglob=yes
10641+ else
10642+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10643+ fi
10644+ ;;
10645+ esac
10646+fi
10647+
10648 file_magic_cmd=$lt_cv_file_magic_cmd
10649 deplibs_check_method=$lt_cv_deplibs_check_method
10650 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10651@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10652 _LT_DECL([], [deplibs_check_method], [1],
10653 [Method to check whether dependent libraries are shared objects])
10654 _LT_DECL([], [file_magic_cmd], [1],
10655- [Command to use when deplibs_check_method == "file_magic"])
10656+ [Command to use when deplibs_check_method = "file_magic"])
10657+_LT_DECL([], [file_magic_glob], [1],
10658+ [How to find potential files when deplibs_check_method = "file_magic"])
10659+_LT_DECL([], [want_nocaseglob], [1],
10660+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10661 ])# _LT_CHECK_MAGIC_METHOD
10662
10663
10664@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10665 dnl AC_DEFUN([AM_PROG_NM], [])
10666 dnl AC_DEFUN([AC_PROG_NM], [])
10667
10668+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10669+# --------------------------------
10670+# how to determine the name of the shared library
10671+# associated with a specific link library.
10672+# -- PORTME fill in with the dynamic library characteristics
10673+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10674+[m4_require([_LT_DECL_EGREP])
10675+m4_require([_LT_DECL_OBJDUMP])
10676+m4_require([_LT_DECL_DLLTOOL])
10677+AC_CACHE_CHECK([how to associate runtime and link libraries],
10678+lt_cv_sharedlib_from_linklib_cmd,
10679+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10680+
10681+case $host_os in
10682+cygwin* | mingw* | pw32* | cegcc*)
10683+ # two different shell functions defined in ltmain.sh
10684+ # decide which to use based on capabilities of $DLLTOOL
10685+ case `$DLLTOOL --help 2>&1` in
10686+ *--identify-strict*)
10687+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10688+ ;;
10689+ *)
10690+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10691+ ;;
10692+ esac
10693+ ;;
10694+*)
10695+ # fallback: assume linklib IS sharedlib
10696+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10697+ ;;
10698+esac
10699+])
10700+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10701+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10702+
10703+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10704+ [Command to associate shared and link libraries])
10705+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10706+
10707+
10708+# _LT_PATH_MANIFEST_TOOL
10709+# ----------------------
10710+# locate the manifest tool
10711+m4_defun([_LT_PATH_MANIFEST_TOOL],
10712+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10713+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10714+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10715+ [lt_cv_path_mainfest_tool=no
10716+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10717+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10718+ cat conftest.err >&AS_MESSAGE_LOG_FD
10719+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10720+ lt_cv_path_mainfest_tool=yes
10721+ fi
10722+ rm -f conftest*])
10723+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10724+ MANIFEST_TOOL=:
10725+fi
10726+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10727+])# _LT_PATH_MANIFEST_TOOL
10728+
10729
10730 # LT_LIB_M
10731 # --------
10732@@ -3403,8 +3630,8 @@ esac
10733 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10734
10735 # Transform an extracted symbol line into symbol name and symbol address
10736-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10737-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10738+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10739+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10740
10741 # Handle CRLF in mingw tool chain
10742 opt_cr=
10743@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10744 else
10745 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10746 fi
10747+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10748
10749 # Check to see that the pipe works correctly.
10750 pipe_works=no
10751@@ -3473,6 +3701,18 @@ _LT_EOF
10752 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10753 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10754 cat <<_LT_EOF > conftest.$ac_ext
10755+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10756+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10757+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10758+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10759+# define LT@&t@_DLSYM_CONST
10760+#elif defined(__osf__)
10761+/* This system does not cope well with relocations in const data. */
10762+# define LT@&t@_DLSYM_CONST
10763+#else
10764+# define LT@&t@_DLSYM_CONST const
10765+#endif
10766+
10767 #ifdef __cplusplus
10768 extern "C" {
10769 #endif
10770@@ -3484,7 +3724,7 @@ _LT_EOF
10771 cat <<_LT_EOF >> conftest.$ac_ext
10772
10773 /* The mapping between symbol names and symbols. */
10774-const struct {
10775+LT@&t@_DLSYM_CONST struct {
10776 const char *name;
10777 void *address;
10778 }
10779@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
10780 _LT_EOF
10781 # Now try linking the two files.
10782 mv conftest.$ac_objext conftstm.$ac_objext
10783- lt_save_LIBS="$LIBS"
10784- lt_save_CFLAGS="$CFLAGS"
10785+ lt_globsym_save_LIBS=$LIBS
10786+ lt_globsym_save_CFLAGS=$CFLAGS
10787 LIBS="conftstm.$ac_objext"
10788 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10789 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10790 pipe_works=yes
10791 fi
10792- LIBS="$lt_save_LIBS"
10793- CFLAGS="$lt_save_CFLAGS"
10794+ LIBS=$lt_globsym_save_LIBS
10795+ CFLAGS=$lt_globsym_save_CFLAGS
10796 else
10797 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10798 fi
10799@@ -3551,6 +3791,13 @@ else
10800 AC_MSG_RESULT(ok)
10801 fi
10802
10803+# Response file support.
10804+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10805+ nm_file_list_spec='@'
10806+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10807+ nm_file_list_spec='@'
10808+fi
10809+
10810 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10811 [Take the output of nm and produce a listing of raw symbols and C names])
10812 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10813@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
10814 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10815 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10816 [Transform the output of nm in a C name address pair when lib prefix is needed])
10817+_LT_DECL([], [nm_file_list_spec], [1],
10818+ [Specify filename containing input files for $NM])
10819 ]) # _LT_CMD_GLOBAL_SYMBOLS
10820
10821
10822@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10823 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10824 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10825
10826-AC_MSG_CHECKING([for $compiler option to produce PIC])
10827 m4_if([$1], [CXX], [
10828 # C++ specific cases for pic, static, wl, etc.
10829 if test "$GXX" = yes; then
10830@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10831 ;;
10832 esac
10833 ;;
10834+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10835+ # This hack is so that the source file can tell whether it is being
10836+ # built for inclusion in a dll (and should export symbols for example).
10837+ m4_if([$1], [GCJ], [],
10838+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10839+ ;;
10840 dgux*)
10841 case $cc_basename in
10842 ec++*)
10843@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10844 ;;
10845 solaris*)
10846 case $cc_basename in
10847- CC*)
10848+ CC* | sunCC*)
10849 # Sun C++ 4.2, 5.x and Centerline C++
10850 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10851 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10852@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10853 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10854 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10855 ;;
10856+ nagfor*)
10857+ # NAG Fortran compiler
10858+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10859+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10860+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10861+ ;;
10862 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10863 # Portland Group compilers (*not* the Pentium gcc compiler,
10864 # which looks to be a dead project)
10865@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10866 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10867 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10868 case $cc_basename in
10869- f77* | f90* | f95*)
10870+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10871 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10872 *)
10873 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10874@@ -4172,9 +4432,11 @@ case $host_os in
10875 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10876 ;;
10877 esac
10878-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10879-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10880- [How to pass a linker flag through the compiler])
10881+
10882+AC_CACHE_CHECK([for $compiler option to produce PIC],
10883+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10884+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10885+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10886
10887 #
10888 # Check to make sure the PIC flag actually works.
10889@@ -4193,6 +4455,8 @@ fi
10890 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10891 [Additional compiler flags for building library objects])
10892
10893+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10894+ [How to pass a linker flag through the compiler])
10895 #
10896 # Check to make sure the static flag actually works.
10897 #
10898@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
10899 m4_defun([_LT_LINKER_SHLIBS],
10900 [AC_REQUIRE([LT_PATH_LD])dnl
10901 AC_REQUIRE([LT_PATH_NM])dnl
10902+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
10903 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10904 m4_require([_LT_DECL_EGREP])dnl
10905 m4_require([_LT_DECL_SED])dnl
10906@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
10907 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10908 m4_if([$1], [CXX], [
10909 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10910+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10911 case $host_os in
10912 aix[[4-9]]*)
10913 # If we're using GNU nm, then we don't want the "-C" option.
10914@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
10915 ;;
10916 pw32*)
10917 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10918- ;;
10919+ ;;
10920 cygwin* | mingw* | cegcc*)
10921- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
10922- ;;
10923+ case $cc_basename in
10924+ cl*) ;;
10925+ *)
10926+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
10927+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10928+ ;;
10929+ esac
10930+ ;;
10931 *)
10932 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10933- ;;
10934+ ;;
10935 esac
10936- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10937 ], [
10938 runpath_var=
10939 _LT_TAGVAR(allow_undefined_flag, $1)=
10940@@ -4411,7 +4682,8 @@ _LT_EOF
10941 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
10942 _LT_TAGVAR(always_export_symbols, $1)=no
10943 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10944- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
10945+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
10946+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10947
10948 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
10949 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
10950@@ -4510,12 +4782,12 @@ _LT_EOF
10951 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
10952 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
10953 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
10954- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
10955+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
10956 if test "x$supports_anon_versioning" = xyes; then
10957 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
10958 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10959 echo "local: *; };" >> $output_objdir/$libname.ver~
10960- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10961+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10962 fi
10963 ;;
10964 esac
10965@@ -4529,8 +4801,8 @@ _LT_EOF
10966 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10967 wlarc=
10968 else
10969- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10970- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10971+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10972+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10973 fi
10974 ;;
10975
10976@@ -4548,8 +4820,8 @@ _LT_EOF
10977
10978 _LT_EOF
10979 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
10980- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10981- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10982+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10983+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10984 else
10985 _LT_TAGVAR(ld_shlibs, $1)=no
10986 fi
10987@@ -4595,8 +4867,8 @@ _LT_EOF
10988
10989 *)
10990 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
10991- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10992- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10993+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10994+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10995 else
10996 _LT_TAGVAR(ld_shlibs, $1)=no
10997 fi
10998@@ -4726,7 +4998,7 @@ _LT_EOF
10999 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11000 # Determine the default libpath from the value encoded in an
11001 # empty executable.
11002- _LT_SYS_MODULE_PATH_AIX
11003+ _LT_SYS_MODULE_PATH_AIX([$1])
11004 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11005 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11006 else
11007@@ -4737,7 +5009,7 @@ _LT_EOF
11008 else
11009 # Determine the default libpath from the value encoded in an
11010 # empty executable.
11011- _LT_SYS_MODULE_PATH_AIX
11012+ _LT_SYS_MODULE_PATH_AIX([$1])
11013 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11014 # Warning - without using the other run time loading flags,
11015 # -berok will link without error, but may produce a broken library.
11016@@ -4781,20 +5053,63 @@ _LT_EOF
11017 # Microsoft Visual C++.
11018 # hardcode_libdir_flag_spec is actually meaningless, as there is
11019 # no search path for DLLs.
11020- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11021- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11022- # Tell ltmain to make .lib files, not .a files.
11023- libext=lib
11024- # Tell ltmain to make .dll files, not .so files.
11025- shrext_cmds=".dll"
11026- # FIXME: Setting linknames here is a bad hack.
11027- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11028- # The linker will automatically build a .lib file if we build a DLL.
11029- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11030- # FIXME: Should let the user specify the lib program.
11031- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11032- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11033- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11034+ case $cc_basename in
11035+ cl*)
11036+ # Native MSVC
11037+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11038+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11039+ _LT_TAGVAR(always_export_symbols, $1)=yes
11040+ _LT_TAGVAR(file_list_spec, $1)='@'
11041+ # Tell ltmain to make .lib files, not .a files.
11042+ libext=lib
11043+ # Tell ltmain to make .dll files, not .so files.
11044+ shrext_cmds=".dll"
11045+ # FIXME: Setting linknames here is a bad hack.
11046+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11047+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11048+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11049+ else
11050+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11051+ fi~
11052+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11053+ linknames='
11054+ # The linker will not automatically build a static lib if we build a DLL.
11055+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11056+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11057+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
11058+ # Don't use ranlib
11059+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11060+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11061+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11062+ case $lt_outputfile in
11063+ *.exe|*.EXE) ;;
11064+ *)
11065+ lt_outputfile="$lt_outputfile.exe"
11066+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11067+ ;;
11068+ esac~
11069+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11070+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11071+ $RM "$lt_outputfile.manifest";
11072+ fi'
11073+ ;;
11074+ *)
11075+ # Assume MSVC wrapper
11076+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11077+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11078+ # Tell ltmain to make .lib files, not .a files.
11079+ libext=lib
11080+ # Tell ltmain to make .dll files, not .so files.
11081+ shrext_cmds=".dll"
11082+ # FIXME: Setting linknames here is a bad hack.
11083+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11084+ # The linker will automatically build a .lib file if we build a DLL.
11085+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11086+ # FIXME: Should let the user specify the lib program.
11087+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11088+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11089+ ;;
11090+ esac
11091 ;;
11092
11093 darwin* | rhapsody*)
11094@@ -4828,7 +5143,7 @@ _LT_EOF
11095
11096 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11097 freebsd* | dragonfly*)
11098- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11099+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11100 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11101 _LT_TAGVAR(hardcode_direct, $1)=yes
11102 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11103@@ -4836,7 +5151,7 @@ _LT_EOF
11104
11105 hpux9*)
11106 if test "$GCC" = yes; then
11107- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11108+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11109 else
11110 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11111 fi
11112@@ -4852,7 +5167,7 @@ _LT_EOF
11113
11114 hpux10*)
11115 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11116- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11117+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11118 else
11119 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11120 fi
11121@@ -4876,10 +5191,10 @@ _LT_EOF
11122 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11123 ;;
11124 ia64*)
11125- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11126+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11127 ;;
11128 *)
11129- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11130+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11131 ;;
11132 esac
11133 else
11134@@ -4926,16 +5241,31 @@ _LT_EOF
11135
11136 irix5* | irix6* | nonstopux*)
11137 if test "$GCC" = yes; then
11138- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11139+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11140 # Try to use the -exported_symbol ld option, if it does not
11141 # work, assume that -exports_file does not work either and
11142 # implicitly export all symbols.
11143- save_LDFLAGS="$LDFLAGS"
11144- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11145- AC_LINK_IFELSE(int foo(void) {},
11146- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11147- )
11148- LDFLAGS="$save_LDFLAGS"
11149+ # This should be the same for all languages, so no per-tag cache variable.
11150+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11151+ [lt_cv_irix_exported_symbol],
11152+ [save_LDFLAGS="$LDFLAGS"
11153+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11154+ AC_LINK_IFELSE(
11155+ [AC_LANG_SOURCE(
11156+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11157+ [C++], [[int foo (void) { return 0; }]],
11158+ [Fortran 77], [[
11159+ subroutine foo
11160+ end]],
11161+ [Fortran], [[
11162+ subroutine foo
11163+ end]])])],
11164+ [lt_cv_irix_exported_symbol=yes],
11165+ [lt_cv_irix_exported_symbol=no])
11166+ LDFLAGS="$save_LDFLAGS"])
11167+ if test "$lt_cv_irix_exported_symbol" = yes; then
11168+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11169+ fi
11170 else
11171 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11172 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
11173@@ -5020,7 +5350,7 @@ _LT_EOF
11174 osf4* | osf5*) # as osf3* with the addition of -msym flag
11175 if test "$GCC" = yes; then
11176 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11177- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11178+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11179 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11180 else
11181 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11182@@ -5039,9 +5369,9 @@ _LT_EOF
11183 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11184 if test "$GCC" = yes; then
11185 wlarc='${wl}'
11186- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11187+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11188 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11189- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11190+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11191 else
11192 case `$CC -V 2>&1` in
11193 *"Compilers 5.0"*)
11194@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11195 to runtime path list])
11196 _LT_TAGDECL([], [link_all_deplibs], [0],
11197 [Whether libtool must link a program against all its dependency libraries])
11198-_LT_TAGDECL([], [fix_srcfile_path], [1],
11199- [Fix the shell variable $srcfile for the compiler])
11200 _LT_TAGDECL([], [always_export_symbols], [0],
11201 [Set to "yes" if exported symbols are required])
11202 _LT_TAGDECL([], [export_symbols_cmds], [2],
11203@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11204 [Symbols that must always be exported])
11205 _LT_TAGDECL([], [prelink_cmds], [2],
11206 [Commands necessary for linking programs (against libraries) with templates])
11207+_LT_TAGDECL([], [postlink_cmds], [2],
11208+ [Commands necessary for finishing linking programs])
11209 _LT_TAGDECL([], [file_list_spec], [1],
11210 [Specify filename containing input files])
11211 dnl FIXME: Not yet implemented
11212@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11213 m4_defun([_LT_LANG_CXX_CONFIG],
11214 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11215 m4_require([_LT_DECL_EGREP])dnl
11216+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11217 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11218 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11219 (test "X$CXX" != "Xg++"))) ; then
11220@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11221
11222 # Allow CC to be a program name with arguments.
11223 lt_save_CC=$CC
11224+ lt_save_CFLAGS=$CFLAGS
11225 lt_save_LD=$LD
11226 lt_save_GCC=$GCC
11227 GCC=$GXX
11228@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11229 fi
11230 test -z "${LDCXX+set}" || LD=$LDCXX
11231 CC=${CXX-"c++"}
11232+ CFLAGS=$CXXFLAGS
11233 compiler=$CC
11234 _LT_TAGVAR(compiler, $1)=$CC
11235 _LT_CC_BASENAME([$compiler])
11236@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11237 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11238 # Determine the default libpath from the value encoded in an empty
11239 # executable.
11240- _LT_SYS_MODULE_PATH_AIX
11241+ _LT_SYS_MODULE_PATH_AIX([$1])
11242 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11243
11244 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11245@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11246 else
11247 # Determine the default libpath from the value encoded in an
11248 # empty executable.
11249- _LT_SYS_MODULE_PATH_AIX
11250+ _LT_SYS_MODULE_PATH_AIX([$1])
11251 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11252 # Warning - without using the other run time loading flags,
11253 # -berok will link without error, but may produce a broken library.
11254@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
11255 ;;
11256
11257 cygwin* | mingw* | pw32* | cegcc*)
11258- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11259- # as there is no search path for DLLs.
11260- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11261- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11262- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11263- _LT_TAGVAR(always_export_symbols, $1)=no
11264- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11265-
11266- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11267- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11268- # If the export-symbols file already is a .def file (1st line
11269- # is EXPORTS), use it as is; otherwise, prepend...
11270- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11271- cp $export_symbols $output_objdir/$soname.def;
11272- else
11273- echo EXPORTS > $output_objdir/$soname.def;
11274- cat $export_symbols >> $output_objdir/$soname.def;
11275- fi~
11276- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11277- else
11278- _LT_TAGVAR(ld_shlibs, $1)=no
11279- fi
11280- ;;
11281+ case $GXX,$cc_basename in
11282+ ,cl* | no,cl*)
11283+ # Native MSVC
11284+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11285+ # no search path for DLLs.
11286+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11287+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11288+ _LT_TAGVAR(always_export_symbols, $1)=yes
11289+ _LT_TAGVAR(file_list_spec, $1)='@'
11290+ # Tell ltmain to make .lib files, not .a files.
11291+ libext=lib
11292+ # Tell ltmain to make .dll files, not .so files.
11293+ shrext_cmds=".dll"
11294+ # FIXME: Setting linknames here is a bad hack.
11295+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11296+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11297+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11298+ else
11299+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11300+ fi~
11301+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11302+ linknames='
11303+ # The linker will not automatically build a static lib if we build a DLL.
11304+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11305+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11306+ # Don't use ranlib
11307+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11308+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11309+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11310+ case $lt_outputfile in
11311+ *.exe|*.EXE) ;;
11312+ *)
11313+ lt_outputfile="$lt_outputfile.exe"
11314+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11315+ ;;
11316+ esac~
11317+ func_to_tool_file "$lt_outputfile"~
11318+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11319+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11320+ $RM "$lt_outputfile.manifest";
11321+ fi'
11322+ ;;
11323+ *)
11324+ # g++
11325+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11326+ # as there is no search path for DLLs.
11327+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11328+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11329+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11330+ _LT_TAGVAR(always_export_symbols, $1)=no
11331+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11332+
11333+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11334+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11335+ # If the export-symbols file already is a .def file (1st line
11336+ # is EXPORTS), use it as is; otherwise, prepend...
11337+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11338+ cp $export_symbols $output_objdir/$soname.def;
11339+ else
11340+ echo EXPORTS > $output_objdir/$soname.def;
11341+ cat $export_symbols >> $output_objdir/$soname.def;
11342+ fi~
11343+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11344+ else
11345+ _LT_TAGVAR(ld_shlibs, $1)=no
11346+ fi
11347+ ;;
11348+ esac
11349+ ;;
11350 darwin* | rhapsody*)
11351 _LT_DARWIN_LINKER_FEATURES($1)
11352 ;;
11353@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11354 ;;
11355 *)
11356 if test "$GXX" = yes; then
11357- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11358+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11359 else
11360 # FIXME: insert proper C++ library support
11361 _LT_TAGVAR(ld_shlibs, $1)=no
11362@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
11363 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11364 ;;
11365 ia64*)
11366- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11367+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11368 ;;
11369 *)
11370- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11371+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11372 ;;
11373 esac
11374 fi
11375@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11376 *)
11377 if test "$GXX" = yes; then
11378 if test "$with_gnu_ld" = no; then
11379- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11380+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11381 else
11382- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
11383+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
11384 fi
11385 fi
11386 _LT_TAGVAR(link_all_deplibs, $1)=yes
11387@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
11388 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11389 rm -rf $tpldir~
11390 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11391- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11392+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11393 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11394 rm -rf $tpldir~
11395 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11396- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11397+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11398 $RANLIB $oldlib'
11399 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11400 rm -rf $tpldir~
11401 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11402- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11403+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11404 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11405 rm -rf $tpldir~
11406 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11407- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11408+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11409 ;;
11410 *) # Version 6 and above use weak symbols
11411 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11412@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11413 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11414 ;;
11415 *)
11416- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11417+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11418 ;;
11419 esac
11420
11421@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11422
11423 solaris*)
11424 case $cc_basename in
11425- CC*)
11426+ CC* | sunCC*)
11427 # Sun C++ 4.2, 5.x and Centerline C++
11428 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11429 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11430@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11431 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11432 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11433 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11434- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11435+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11436 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11437- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11438+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11439
11440 # Commands to make compiler produce verbose output that lists
11441 # what "hidden" libraries, object files and flags are used when
11442@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11443 fi # test -n "$compiler"
11444
11445 CC=$lt_save_CC
11446+ CFLAGS=$lt_save_CFLAGS
11447 LDCXX=$LD
11448 LD=$lt_save_LD
11449 GCC=$lt_save_GCC
11450@@ -6445,6 +6825,29 @@ AC_LANG_POP
11451 ])# _LT_LANG_CXX_CONFIG
11452
11453
11454+# _LT_FUNC_STRIPNAME_CNF
11455+# ----------------------
11456+# func_stripname_cnf prefix suffix name
11457+# strip PREFIX and SUFFIX off of NAME.
11458+# PREFIX and SUFFIX must not contain globbing or regex special
11459+# characters, hashes, percent signs, but SUFFIX may contain a leading
11460+# dot (in which case that matches only a dot).
11461+#
11462+# This function is identical to the (non-XSI) version of func_stripname,
11463+# except this one can be used by m4 code that may be executed by configure,
11464+# rather than the libtool script.
11465+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11466+AC_REQUIRE([_LT_DECL_SED])
11467+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11468+func_stripname_cnf ()
11469+{
11470+ case ${2} in
11471+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11472+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11473+ esac
11474+} # func_stripname_cnf
11475+])# _LT_FUNC_STRIPNAME_CNF
11476+
11477 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11478 # ---------------------------------
11479 # Figure out "hidden" library dependencies from verbose
11480@@ -6453,6 +6856,7 @@ AC_LANG_POP
11481 # objects, libraries and library flags.
11482 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11483 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11484+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11485 # Dependencies to place before and after the object being linked:
11486 _LT_TAGVAR(predep_objects, $1)=
11487 _LT_TAGVAR(postdep_objects, $1)=
11488@@ -6503,6 +6907,13 @@ public class foo {
11489 };
11490 _LT_EOF
11491 ])
11492+
11493+_lt_libdeps_save_CFLAGS=$CFLAGS
11494+case "$CC $CFLAGS " in #(
11495+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11496+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11497+esac
11498+
11499 dnl Parse the compiler output and extract the necessary
11500 dnl objects, libraries and library flags.
11501 if AC_TRY_EVAL(ac_compile); then
11502@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11503 pre_test_object_deps_done=no
11504
11505 for p in `eval "$output_verbose_link_cmd"`; do
11506- case $p in
11507+ case ${prev}${p} in
11508
11509 -L* | -R* | -l*)
11510 # Some compilers place space between "-{L,R}" and the path.
11511@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11512 test $p = "-R"; then
11513 prev=$p
11514 continue
11515- else
11516- prev=
11517 fi
11518
11519+ # Expand the sysroot to ease extracting the directories later.
11520+ if test -z "$prev"; then
11521+ case $p in
11522+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11523+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11524+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11525+ esac
11526+ fi
11527+ case $p in
11528+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11529+ esac
11530 if test "$pre_test_object_deps_done" = no; then
11531- case $p in
11532- -L* | -R*)
11533+ case ${prev} in
11534+ -L | -R)
11535 # Internal compiler library paths should come after those
11536 # provided the user. The postdeps already come after the
11537 # user supplied libs so there is no need to process them.
11538@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11539 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11540 fi
11541 fi
11542+ prev=
11543 ;;
11544
11545+ *.lto.$objext) ;; # Ignore GCC LTO objects
11546 *.$objext)
11547 # This assumes that the test object file only shows up
11548 # once in the compiler output.
11549@@ -6586,6 +7008,7 @@ else
11550 fi
11551
11552 $RM -f confest.$objext
11553+CFLAGS=$_lt_libdeps_save_CFLAGS
11554
11555 # PORTME: override above test on systems where it is broken
11556 m4_if([$1], [CXX],
11557@@ -6622,7 +7045,7 @@ linux*)
11558
11559 solaris*)
11560 case $cc_basename in
11561- CC*)
11562+ CC* | sunCC*)
11563 # The more standards-conforming stlport4 library is
11564 # incompatible with the Cstd library. Avoid specifying
11565 # it if it's in CXXFLAGS. Ignore libCrun as
11566@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11567 # Allow CC to be a program name with arguments.
11568 lt_save_CC="$CC"
11569 lt_save_GCC=$GCC
11570+ lt_save_CFLAGS=$CFLAGS
11571 CC=${F77-"f77"}
11572+ CFLAGS=$FFLAGS
11573 compiler=$CC
11574 _LT_TAGVAR(compiler, $1)=$CC
11575 _LT_CC_BASENAME([$compiler])
11576@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11577
11578 GCC=$lt_save_GCC
11579 CC="$lt_save_CC"
11580+ CFLAGS="$lt_save_CFLAGS"
11581 fi # test "$_lt_disable_F77" != yes
11582
11583 AC_LANG_POP
11584@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11585 # Allow CC to be a program name with arguments.
11586 lt_save_CC="$CC"
11587 lt_save_GCC=$GCC
11588+ lt_save_CFLAGS=$CFLAGS
11589 CC=${FC-"f95"}
11590+ CFLAGS=$FCFLAGS
11591 compiler=$CC
11592 GCC=$ac_cv_fc_compiler_gnu
11593
11594@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11595 fi # test -n "$compiler"
11596
11597 GCC=$lt_save_GCC
11598- CC="$lt_save_CC"
11599+ CC=$lt_save_CC
11600+ CFLAGS=$lt_save_CFLAGS
11601 fi # test "$_lt_disable_FC" != yes
11602
11603 AC_LANG_POP
11604@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11605 _LT_LINKER_BOILERPLATE
11606
11607 # Allow CC to be a program name with arguments.
11608-lt_save_CC="$CC"
11609+lt_save_CC=$CC
11610+lt_save_CFLAGS=$CFLAGS
11611 lt_save_GCC=$GCC
11612 GCC=yes
11613 CC=${GCJ-"gcj"}
11614+CFLAGS=$GCJFLAGS
11615 compiler=$CC
11616 _LT_TAGVAR(compiler, $1)=$CC
11617 _LT_TAGVAR(LD, $1)="$LD"
11618@@ -6992,7 +7423,8 @@ fi
11619 AC_LANG_RESTORE
11620
11621 GCC=$lt_save_GCC
11622-CC="$lt_save_CC"
11623+CC=$lt_save_CC
11624+CFLAGS=$lt_save_CFLAGS
11625 ])# _LT_LANG_GCJ_CONFIG
11626
11627
11628@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11629
11630 # Allow CC to be a program name with arguments.
11631 lt_save_CC="$CC"
11632+lt_save_CFLAGS=$CFLAGS
11633 lt_save_GCC=$GCC
11634 GCC=
11635 CC=${RC-"windres"}
11636+CFLAGS=
11637 compiler=$CC
11638 _LT_TAGVAR(compiler, $1)=$CC
11639 _LT_CC_BASENAME([$compiler])
11640@@ -7042,7 +7476,8 @@ fi
11641
11642 GCC=$lt_save_GCC
11643 AC_LANG_RESTORE
11644-CC="$lt_save_CC"
11645+CC=$lt_save_CC
11646+CFLAGS=$lt_save_CFLAGS
11647 ])# _LT_LANG_RC_CONFIG
11648
11649
11650@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
11651 AC_SUBST([OBJDUMP])
11652 ])
11653
11654+# _LT_DECL_DLLTOOL
11655+# ----------------
11656+# Ensure DLLTOOL variable is set.
11657+m4_defun([_LT_DECL_DLLTOOL],
11658+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11659+test -z "$DLLTOOL" && DLLTOOL=dlltool
11660+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11661+AC_SUBST([DLLTOOL])
11662+])
11663
11664 # _LT_DECL_SED
11665 # ------------
11666@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11667 # Try some XSI features
11668 xsi_shell=no
11669 ( _lt_dummy="a/b/c"
11670- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11671- = c,a/b,, \
11672+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11673+ = c,a/b,b/c, \
11674 && eval 'test $(( 1 + 1 )) -eq 2 \
11675 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11676 && xsi_shell=yes
11677@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
11678 ])# _LT_CHECK_SHELL_FEATURES
11679
11680
11681-# _LT_PROG_XSI_SHELLFNS
11682-# ---------------------
11683-# Bourne and XSI compatible variants of some useful shell functions.
11684-m4_defun([_LT_PROG_XSI_SHELLFNS],
11685-[case $xsi_shell in
11686- yes)
11687- cat << \_LT_EOF >> "$cfgfile"
11688-
11689-# func_dirname file append nondir_replacement
11690-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11691-# otherwise set result to NONDIR_REPLACEMENT.
11692-func_dirname ()
11693-{
11694- case ${1} in
11695- */*) func_dirname_result="${1%/*}${2}" ;;
11696- * ) func_dirname_result="${3}" ;;
11697- esac
11698-}
11699-
11700-# func_basename file
11701-func_basename ()
11702-{
11703- func_basename_result="${1##*/}"
11704-}
11705-
11706-# func_dirname_and_basename file append nondir_replacement
11707-# perform func_basename and func_dirname in a single function
11708-# call:
11709-# dirname: Compute the dirname of FILE. If nonempty,
11710-# add APPEND to the result, otherwise set result
11711-# to NONDIR_REPLACEMENT.
11712-# value returned in "$func_dirname_result"
11713-# basename: Compute filename of FILE.
11714-# value retuned in "$func_basename_result"
11715-# Implementation must be kept synchronized with func_dirname
11716-# and func_basename. For efficiency, we do not delegate to
11717-# those functions but instead duplicate the functionality here.
11718-func_dirname_and_basename ()
11719-{
11720- case ${1} in
11721- */*) func_dirname_result="${1%/*}${2}" ;;
11722- * ) func_dirname_result="${3}" ;;
11723- esac
11724- func_basename_result="${1##*/}"
11725-}
11726-
11727-# func_stripname prefix suffix name
11728-# strip PREFIX and SUFFIX off of NAME.
11729-# PREFIX and SUFFIX must not contain globbing or regex special
11730-# characters, hashes, percent signs, but SUFFIX may contain a leading
11731-# dot (in which case that matches only a dot).
11732-func_stripname ()
11733-{
11734- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11735- # positional parameters, so assign one to ordinary parameter first.
11736- func_stripname_result=${3}
11737- func_stripname_result=${func_stripname_result#"${1}"}
11738- func_stripname_result=${func_stripname_result%"${2}"}
11739-}
11740-
11741-# func_opt_split
11742-func_opt_split ()
11743-{
11744- func_opt_split_opt=${1%%=*}
11745- func_opt_split_arg=${1#*=}
11746-}
11747-
11748-# func_lo2o object
11749-func_lo2o ()
11750-{
11751- case ${1} in
11752- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11753- *) func_lo2o_result=${1} ;;
11754- esac
11755-}
11756-
11757-# func_xform libobj-or-source
11758-func_xform ()
11759-{
11760- func_xform_result=${1%.*}.lo
11761-}
11762-
11763-# func_arith arithmetic-term...
11764-func_arith ()
11765-{
11766- func_arith_result=$(( $[*] ))
11767-}
11768-
11769-# func_len string
11770-# STRING may not start with a hyphen.
11771-func_len ()
11772-{
11773- func_len_result=${#1}
11774-}
11775+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11776+# ------------------------------------------------------
11777+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11778+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11779+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11780+[dnl {
11781+sed -e '/^$1 ()$/,/^} # $1 /c\
11782+$1 ()\
11783+{\
11784+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11785+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11786+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11787+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11788+test 0 -eq $? || _lt_function_replace_fail=:
11789+])
11790
11791-_LT_EOF
11792- ;;
11793- *) # Bourne compatible functions.
11794- cat << \_LT_EOF >> "$cfgfile"
11795
11796-# func_dirname file append nondir_replacement
11797-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11798-# otherwise set result to NONDIR_REPLACEMENT.
11799-func_dirname ()
11800-{
11801- # Extract subdirectory from the argument.
11802- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11803- if test "X$func_dirname_result" = "X${1}"; then
11804- func_dirname_result="${3}"
11805- else
11806- func_dirname_result="$func_dirname_result${2}"
11807- fi
11808-}
11809+# _LT_PROG_REPLACE_SHELLFNS
11810+# -------------------------
11811+# Replace existing portable implementations of several shell functions with
11812+# equivalent extended shell implementations where those features are available..
11813+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11814+[if test x"$xsi_shell" = xyes; then
11815+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11816+ case ${1} in
11817+ */*) func_dirname_result="${1%/*}${2}" ;;
11818+ * ) func_dirname_result="${3}" ;;
11819+ esac])
11820+
11821+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11822+ func_basename_result="${1##*/}"])
11823+
11824+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11825+ case ${1} in
11826+ */*) func_dirname_result="${1%/*}${2}" ;;
11827+ * ) func_dirname_result="${3}" ;;
11828+ esac
11829+ func_basename_result="${1##*/}"])
11830
11831-# func_basename file
11832-func_basename ()
11833-{
11834- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11835-}
11836+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11837+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11838+ # positional parameters, so assign one to ordinary parameter first.
11839+ func_stripname_result=${3}
11840+ func_stripname_result=${func_stripname_result#"${1}"}
11841+ func_stripname_result=${func_stripname_result%"${2}"}])
11842
11843-dnl func_dirname_and_basename
11844-dnl A portable version of this function is already defined in general.m4sh
11845-dnl so there is no need for it here.
11846+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11847+ func_split_long_opt_name=${1%%=*}
11848+ func_split_long_opt_arg=${1#*=}])
11849
11850-# func_stripname prefix suffix name
11851-# strip PREFIX and SUFFIX off of NAME.
11852-# PREFIX and SUFFIX must not contain globbing or regex special
11853-# characters, hashes, percent signs, but SUFFIX may contain a leading
11854-# dot (in which case that matches only a dot).
11855-# func_strip_suffix prefix name
11856-func_stripname ()
11857-{
11858- case ${2} in
11859- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11860- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11861- esac
11862-}
11863+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11864+ func_split_short_opt_arg=${1#??}
11865+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11866
11867-# sed scripts:
11868-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11869-my_sed_long_arg='1s/^-[[^=]]*=//'
11870+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11871+ case ${1} in
11872+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11873+ *) func_lo2o_result=${1} ;;
11874+ esac])
11875
11876-# func_opt_split
11877-func_opt_split ()
11878-{
11879- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
11880- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
11881-}
11882+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
11883
11884-# func_lo2o object
11885-func_lo2o ()
11886-{
11887- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
11888-}
11889+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
11890
11891-# func_xform libobj-or-source
11892-func_xform ()
11893-{
11894- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
11895-}
11896+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
11897+fi
11898
11899-# func_arith arithmetic-term...
11900-func_arith ()
11901-{
11902- func_arith_result=`expr "$[@]"`
11903-}
11904+if test x"$lt_shell_append" = xyes; then
11905+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
11906
11907-# func_len string
11908-# STRING may not start with a hyphen.
11909-func_len ()
11910-{
11911- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
11912-}
11913+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
11914+ func_quote_for_eval "${2}"
11915+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11916+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11917
11918-_LT_EOF
11919-esac
11920+ # Save a `func_append' function call where possible by direct use of '+='
11921+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11922+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11923+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11924+ test 0 -eq $? || _lt_function_replace_fail=:
11925+else
11926+ # Save a `func_append' function call even when '+=' is not available
11927+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
11928+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11929+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11930+ test 0 -eq $? || _lt_function_replace_fail=:
11931+fi
11932
11933-case $lt_shell_append in
11934- yes)
11935- cat << \_LT_EOF >> "$cfgfile"
11936+if test x"$_lt_function_replace_fail" = x":"; then
11937+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11938+fi
11939+])
11940
11941-# func_append var value
11942-# Append VALUE to the end of shell variable VAR.
11943-func_append ()
11944-{
11945- eval "$[1]+=\$[2]"
11946-}
11947-_LT_EOF
11948+# _LT_PATH_CONVERSION_FUNCTIONS
11949+# -----------------------------
11950+# Determine which file name conversion functions should be used by
11951+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
11952+# for certain cross-compile configurations and native mingw.
11953+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
11954+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
11955+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
11956+AC_MSG_CHECKING([how to convert $build file names to $host format])
11957+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
11958+[case $host in
11959+ *-*-mingw* )
11960+ case $build in
11961+ *-*-mingw* ) # actually msys
11962+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11963+ ;;
11964+ *-*-cygwin* )
11965+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11966+ ;;
11967+ * ) # otherwise, assume *nix
11968+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11969+ ;;
11970+ esac
11971 ;;
11972- *)
11973- cat << \_LT_EOF >> "$cfgfile"
11974-
11975-# func_append var value
11976-# Append VALUE to the end of shell variable VAR.
11977-func_append ()
11978-{
11979- eval "$[1]=\$$[1]\$[2]"
11980-}
11981-
11982-_LT_EOF
11983+ *-*-cygwin* )
11984+ case $build in
11985+ *-*-mingw* ) # actually msys
11986+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
11987+ ;;
11988+ *-*-cygwin* )
11989+ lt_cv_to_host_file_cmd=func_convert_file_noop
11990+ ;;
11991+ * ) # otherwise, assume *nix
11992+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
11993+ ;;
11994+ esac
11995 ;;
11996- esac
11997+ * ) # unhandled hosts (and "normal" native builds)
11998+ lt_cv_to_host_file_cmd=func_convert_file_noop
11999+ ;;
12000+esac
12001+])
12002+to_host_file_cmd=$lt_cv_to_host_file_cmd
12003+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12004+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12005+ [0], [convert $build file names to $host format])dnl
12006+
12007+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12008+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12009+[#assume ordinary cross tools, or native build.
12010+lt_cv_to_tool_file_cmd=func_convert_file_noop
12011+case $host in
12012+ *-*-mingw* )
12013+ case $build in
12014+ *-*-mingw* ) # actually msys
12015+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12016+ ;;
12017+ esac
12018+ ;;
12019+esac
12020 ])
12021+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12022+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12023+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12024+ [0], [convert $build files to toolchain format])dnl
12025+])# _LT_PATH_CONVERSION_FUNCTIONS
12026diff --git a/ltmain.sh b/ltmain.sh
12027index 9503ec85d7..70e856e065 100644
12028--- a/ltmain.sh
12029+++ b/ltmain.sh
12030@@ -1,10 +1,9 @@
12031-# Generated from ltmain.m4sh.
12032
12033-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12034+# libtool (GNU libtool) 2.4
12035 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12036
12037 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12038-# 2007, 2008, 2009 Free Software Foundation, Inc.
12039+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12040 # This is free software; see the source for copying conditions. There is NO
12041 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12042
12043@@ -38,7 +37,6 @@
12044 # -n, --dry-run display commands without modifying any files
12045 # --features display basic configuration information and exit
12046 # --mode=MODE use operation mode MODE
12047-# --no-finish let install mode avoid finish commands
12048 # --preserve-dup-deps don't remove duplicate dependency libraries
12049 # --quiet, --silent don't print informational messages
12050 # --no-quiet, --no-silent
12051@@ -71,17 +69,19 @@
12052 # compiler: $LTCC
12053 # compiler flags: $LTCFLAGS
12054 # linker: $LD (gnu? $with_gnu_ld)
12055-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12056+# $progname: (GNU libtool) 2.4
12057 # automake: $automake_version
12058 # autoconf: $autoconf_version
12059 #
12060 # Report bugs to <bug-libtool@gnu.org>.
12061+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12062+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12063
12064 PROGRAM=libtool
12065 PACKAGE=libtool
12066-VERSION=2.2.7a
12067-TIMESTAMP=" 1.3134 2009-11-29"
12068-package_revision=1.3134
12069+VERSION=2.4
12070+TIMESTAMP=""
12071+package_revision=1.3293
12072
12073 # Be Bourne compatible
12074 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12075@@ -106,9 +106,6 @@ _LTECHO_EOF'
12076 }
12077
12078 # NLS nuisances: We save the old values to restore during execute mode.
12079-# Only set LANG and LC_ALL to C if already set.
12080-# These must not be set unconditionally because not all systems understand
12081-# e.g. LANG=C (notably SCO).
12082 lt_user_locale=
12083 lt_safe_locale=
12084 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12085@@ -121,15 +118,13 @@ do
12086 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12087 fi"
12088 done
12089+LC_ALL=C
12090+LANGUAGE=C
12091+export LANGUAGE LC_ALL
12092
12093 $lt_unset CDPATH
12094
12095
12096-
12097-
12098-
12099-
12100-
12101 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12102 # is ksh but when the shell is invoked as "sh" and the current value of
12103 # the _XPG environment variable is not equal to 1 (one), the special
12104@@ -140,7 +135,7 @@ progpath="$0"
12105
12106
12107 : ${CP="cp -f"}
12108-: ${ECHO=$as_echo}
12109+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12110 : ${EGREP="/bin/grep -E"}
12111 : ${FGREP="/bin/grep -F"}
12112 : ${GREP="/bin/grep"}
12113@@ -149,7 +144,7 @@ progpath="$0"
12114 : ${MKDIR="mkdir"}
12115 : ${MV="mv -f"}
12116 : ${RM="rm -f"}
12117-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12118+: ${SED="/bin/sed"}
12119 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12120 : ${Xsed="$SED -e 1s/^X//"}
12121
12122@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12123 dirname="s,/[^/]*$,,"
12124 basename="s,^.*/,,"
12125
12126+# func_dirname file append nondir_replacement
12127+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12128+# otherwise set result to NONDIR_REPLACEMENT.
12129+func_dirname ()
12130+{
12131+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12132+ if test "X$func_dirname_result" = "X${1}"; then
12133+ func_dirname_result="${3}"
12134+ else
12135+ func_dirname_result="$func_dirname_result${2}"
12136+ fi
12137+} # func_dirname may be replaced by extended shell implementation
12138+
12139+
12140+# func_basename file
12141+func_basename ()
12142+{
12143+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12144+} # func_basename may be replaced by extended shell implementation
12145+
12146+
12147 # func_dirname_and_basename file append nondir_replacement
12148 # perform func_basename and func_dirname in a single function
12149 # call:
12150@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12151 # those functions but instead duplicate the functionality here.
12152 func_dirname_and_basename ()
12153 {
12154- # Extract subdirectory from the argument.
12155- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12156- if test "X$func_dirname_result" = "X${1}"; then
12157- func_dirname_result="${3}"
12158- else
12159- func_dirname_result="$func_dirname_result${2}"
12160- fi
12161- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12162-}
12163+ # Extract subdirectory from the argument.
12164+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12165+ if test "X$func_dirname_result" = "X${1}"; then
12166+ func_dirname_result="${3}"
12167+ else
12168+ func_dirname_result="$func_dirname_result${2}"
12169+ fi
12170+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12171+} # func_dirname_and_basename may be replaced by extended shell implementation
12172+
12173+
12174+# func_stripname prefix suffix name
12175+# strip PREFIX and SUFFIX off of NAME.
12176+# PREFIX and SUFFIX must not contain globbing or regex special
12177+# characters, hashes, percent signs, but SUFFIX may contain a leading
12178+# dot (in which case that matches only a dot).
12179+# func_strip_suffix prefix name
12180+func_stripname ()
12181+{
12182+ case ${2} in
12183+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12184+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12185+ esac
12186+} # func_stripname may be replaced by extended shell implementation
12187
12188-# Generated shell functions inserted here.
12189
12190 # These SED scripts presuppose an absolute path with a trailing slash.
12191 pathcar='s,^/\([^/]*\).*$,\1,'
12192@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12193 # Same as above, but do not quote variable references.
12194 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12195
12196+# Sed substitution that turns a string into a regex matching for the
12197+# string literally.
12198+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12199+
12200+# Sed substitution that converts a w32 file name or path
12201+# which contains forward slashes, into one that contains
12202+# (escaped) backslashes. A very naive implementation.
12203+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12204+
12205 # Re-`\' parameter expansions in output of double_quote_subst that were
12206 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12207 # in input to double_quote_subst, that '$' was protected from expansion.
12208@@ -404,7 +443,7 @@ opt_warning=:
12209 # name if it has been set yet.
12210 func_echo ()
12211 {
12212- $ECHO "$progname${mode+: }$mode: $*"
12213+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12214 }
12215
12216 # func_verbose arg...
12217@@ -430,14 +469,14 @@ func_echo_all ()
12218 # Echo program name prefixed message to standard error.
12219 func_error ()
12220 {
12221- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12222+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12223 }
12224
12225 # func_warning arg...
12226 # Echo program name prefixed warning message to standard error.
12227 func_warning ()
12228 {
12229- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12230+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12231
12232 # bash bug again:
12233 :
12234@@ -656,19 +695,35 @@ func_show_eval_locale ()
12235 fi
12236 }
12237
12238-
12239-
12240+# func_tr_sh
12241+# Turn $1 into a string suitable for a shell variable name.
12242+# Result is stored in $func_tr_sh_result. All characters
12243+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12244+# if $1 begins with a digit, a '_' is prepended as well.
12245+func_tr_sh ()
12246+{
12247+ case $1 in
12248+ [0-9]* | *[!a-zA-Z0-9_]*)
12249+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12250+ ;;
12251+ * )
12252+ func_tr_sh_result=$1
12253+ ;;
12254+ esac
12255+}
12256
12257
12258 # func_version
12259 # Echo version message to standard output and exit.
12260 func_version ()
12261 {
12262+ $opt_debug
12263+
12264 $SED -n '/(C)/!b go
12265 :more
12266 /\./!{
12267 N
12268- s/\n# //
12269+ s/\n# / /
12270 b more
12271 }
12272 :go
12273@@ -685,7 +740,9 @@ func_version ()
12274 # Echo short help message to standard output and exit.
12275 func_usage ()
12276 {
12277- $SED -n '/^# Usage:/,/^# *-h/ {
12278+ $opt_debug
12279+
12280+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12281 s/^# //
12282 s/^# *$//
12283 s/\$progname/'$progname'/
12284@@ -701,7 +758,10 @@ func_usage ()
12285 # unless 'noexit' is passed as argument.
12286 func_help ()
12287 {
12288+ $opt_debug
12289+
12290 $SED -n '/^# Usage:/,/# Report bugs to/ {
12291+ :print
12292 s/^# //
12293 s/^# *$//
12294 s*\$progname*'$progname'*
12295@@ -714,7 +774,11 @@ func_help ()
12296 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12297 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12298 p
12299- }' < "$progpath"
12300+ d
12301+ }
12302+ /^# .* home page:/b print
12303+ /^# General help using/b print
12304+ ' < "$progpath"
12305 ret=$?
12306 if test -z "$1"; then
12307 exit $ret
12308@@ -726,12 +790,39 @@ func_help ()
12309 # exit_cmd.
12310 func_missing_arg ()
12311 {
12312- func_error "missing argument for $1"
12313+ $opt_debug
12314+
12315+ func_error "missing argument for $1."
12316 exit_cmd=exit
12317 }
12318
12319-exit_cmd=:
12320
12321+# func_split_short_opt shortopt
12322+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12323+# variables after splitting SHORTOPT after the 2nd character.
12324+func_split_short_opt ()
12325+{
12326+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12327+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12328+
12329+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12330+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12331+} # func_split_short_opt may be replaced by extended shell implementation
12332+
12333+
12334+# func_split_long_opt longopt
12335+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12336+# variables after splitting LONGOPT at the `=' sign.
12337+func_split_long_opt ()
12338+{
12339+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12340+ my_sed_long_arg='1s/^--[^=]*=//'
12341+
12342+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12343+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12344+} # func_split_long_opt may be replaced by extended shell implementation
12345+
12346+exit_cmd=:
12347
12348
12349
12350@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12351 magic_exe="%%%MAGIC EXE variable%%%"
12352
12353 # Global variables.
12354-# $mode is unset
12355 nonopt=
12356-execute_dlfiles=
12357 preserve_args=
12358 lo2o="s/\\.lo\$/.${objext}/"
12359 o2lo="s/\\.${objext}\$/.lo/"
12360 extracted_archives=
12361 extracted_serial=0
12362
12363-opt_dry_run=false
12364-opt_finish=:
12365-opt_duplicate_deps=false
12366-opt_silent=false
12367-opt_debug=:
12368-
12369 # If this variable is set in any of the actions, the command in it
12370 # will be execed at the end. This prevents here-documents from being
12371 # left over by shells.
12372 exec_cmd=
12373
12374+# func_append var value
12375+# Append VALUE to the end of shell variable VAR.
12376+func_append ()
12377+{
12378+ eval "${1}=\$${1}\${2}"
12379+} # func_append may be replaced by extended shell implementation
12380+
12381+# func_append_quoted var value
12382+# Quote VALUE and append to the end of shell variable VAR, separated
12383+# by a space.
12384+func_append_quoted ()
12385+{
12386+ func_quote_for_eval "${2}"
12387+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12388+} # func_append_quoted may be replaced by extended shell implementation
12389+
12390+
12391+# func_arith arithmetic-term...
12392+func_arith ()
12393+{
12394+ func_arith_result=`expr "${@}"`
12395+} # func_arith may be replaced by extended shell implementation
12396+
12397+
12398+# func_len string
12399+# STRING may not start with a hyphen.
12400+func_len ()
12401+{
12402+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12403+} # func_len may be replaced by extended shell implementation
12404+
12405+
12406+# func_lo2o object
12407+func_lo2o ()
12408+{
12409+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12410+} # func_lo2o may be replaced by extended shell implementation
12411+
12412+
12413+# func_xform libobj-or-source
12414+func_xform ()
12415+{
12416+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12417+} # func_xform may be replaced by extended shell implementation
12418+
12419+
12420 # func_fatal_configuration arg...
12421 # Echo program name prefixed message to standard error, followed by
12422 # a configuration failure hint, and exit.
12423@@ -850,130 +979,204 @@ func_enable_tag ()
12424 esac
12425 }
12426
12427-# Parse options once, thoroughly. This comes as soon as possible in
12428-# the script to make things like `libtool --version' happen quickly.
12429+# func_check_version_match
12430+# Ensure that we are using m4 macros, and libtool script from the same
12431+# release of libtool.
12432+func_check_version_match ()
12433 {
12434+ if test "$package_revision" != "$macro_revision"; then
12435+ if test "$VERSION" != "$macro_version"; then
12436+ if test -z "$macro_version"; then
12437+ cat >&2 <<_LT_EOF
12438+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12439+$progname: definition of this LT_INIT comes from an older release.
12440+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12441+$progname: and run autoconf again.
12442+_LT_EOF
12443+ else
12444+ cat >&2 <<_LT_EOF
12445+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12446+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12447+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12448+$progname: and run autoconf again.
12449+_LT_EOF
12450+ fi
12451+ else
12452+ cat >&2 <<_LT_EOF
12453+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12454+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12455+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12456+$progname: of $PACKAGE $VERSION and run autoconf again.
12457+_LT_EOF
12458+ fi
12459
12460- # Shorthand for --mode=foo, only valid as the first argument
12461- case $1 in
12462- clean|clea|cle|cl)
12463- shift; set dummy --mode clean ${1+"$@"}; shift
12464- ;;
12465- compile|compil|compi|comp|com|co|c)
12466- shift; set dummy --mode compile ${1+"$@"}; shift
12467- ;;
12468- execute|execut|execu|exec|exe|ex|e)
12469- shift; set dummy --mode execute ${1+"$@"}; shift
12470- ;;
12471- finish|finis|fini|fin|fi|f)
12472- shift; set dummy --mode finish ${1+"$@"}; shift
12473- ;;
12474- install|instal|insta|inst|ins|in|i)
12475- shift; set dummy --mode install ${1+"$@"}; shift
12476- ;;
12477- link|lin|li|l)
12478- shift; set dummy --mode link ${1+"$@"}; shift
12479- ;;
12480- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12481- shift; set dummy --mode uninstall ${1+"$@"}; shift
12482- ;;
12483- esac
12484+ exit $EXIT_MISMATCH
12485+ fi
12486+}
12487+
12488+
12489+# Shorthand for --mode=foo, only valid as the first argument
12490+case $1 in
12491+clean|clea|cle|cl)
12492+ shift; set dummy --mode clean ${1+"$@"}; shift
12493+ ;;
12494+compile|compil|compi|comp|com|co|c)
12495+ shift; set dummy --mode compile ${1+"$@"}; shift
12496+ ;;
12497+execute|execut|execu|exec|exe|ex|e)
12498+ shift; set dummy --mode execute ${1+"$@"}; shift
12499+ ;;
12500+finish|finis|fini|fin|fi|f)
12501+ shift; set dummy --mode finish ${1+"$@"}; shift
12502+ ;;
12503+install|instal|insta|inst|ins|in|i)
12504+ shift; set dummy --mode install ${1+"$@"}; shift
12505+ ;;
12506+link|lin|li|l)
12507+ shift; set dummy --mode link ${1+"$@"}; shift
12508+ ;;
12509+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12510+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12511+ ;;
12512+esac
12513
12514- # Parse non-mode specific arguments:
12515- while test "$#" -gt 0; do
12516+
12517+
12518+# Option defaults:
12519+opt_debug=:
12520+opt_dry_run=false
12521+opt_config=false
12522+opt_preserve_dup_deps=false
12523+opt_features=false
12524+opt_finish=false
12525+opt_help=false
12526+opt_help_all=false
12527+opt_silent=:
12528+opt_verbose=:
12529+opt_silent=false
12530+opt_verbose=false
12531+
12532+
12533+# Parse options once, thoroughly. This comes as soon as possible in the
12534+# script to make things like `--version' happen as quickly as we can.
12535+{
12536+ # this just eases exit handling
12537+ while test $# -gt 0; do
12538 opt="$1"
12539 shift
12540-
12541 case $opt in
12542- --config) func_config ;;
12543-
12544- --debug) preserve_args="$preserve_args $opt"
12545+ --debug|-x) opt_debug='set -x'
12546 func_echo "enabling shell trace mode"
12547- opt_debug='set -x'
12548 $opt_debug
12549 ;;
12550-
12551- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12552- execute_dlfiles="$execute_dlfiles $1"
12553- shift
12554+ --dry-run|--dryrun|-n)
12555+ opt_dry_run=:
12556 ;;
12557-
12558- --dry-run | -n) opt_dry_run=: ;;
12559- --features) func_features ;;
12560- --finish) mode="finish" ;;
12561- --no-finish) opt_finish=false ;;
12562-
12563- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12564- case $1 in
12565- # Valid mode arguments:
12566- clean) ;;
12567- compile) ;;
12568- execute) ;;
12569- finish) ;;
12570- install) ;;
12571- link) ;;
12572- relink) ;;
12573- uninstall) ;;
12574-
12575- # Catch anything else as an error
12576- *) func_error "invalid argument for $opt"
12577- exit_cmd=exit
12578- break
12579- ;;
12580- esac
12581-
12582- mode="$1"
12583+ --config)
12584+ opt_config=:
12585+func_config
12586+ ;;
12587+ --dlopen|-dlopen)
12588+ optarg="$1"
12589+ opt_dlopen="${opt_dlopen+$opt_dlopen
12590+}$optarg"
12591 shift
12592 ;;
12593-
12594 --preserve-dup-deps)
12595- opt_duplicate_deps=: ;;
12596-
12597- --quiet|--silent) preserve_args="$preserve_args $opt"
12598- opt_silent=:
12599- opt_verbose=false
12600+ opt_preserve_dup_deps=:
12601 ;;
12602-
12603- --no-quiet|--no-silent)
12604- preserve_args="$preserve_args $opt"
12605- opt_silent=false
12606+ --features)
12607+ opt_features=:
12608+func_features
12609 ;;
12610-
12611- --verbose| -v) preserve_args="$preserve_args $opt"
12612+ --finish)
12613+ opt_finish=:
12614+set dummy --mode finish ${1+"$@"}; shift
12615+ ;;
12616+ --help)
12617+ opt_help=:
12618+ ;;
12619+ --help-all)
12620+ opt_help_all=:
12621+opt_help=': help-all'
12622+ ;;
12623+ --mode)
12624+ test $# = 0 && func_missing_arg $opt && break
12625+ optarg="$1"
12626+ opt_mode="$optarg"
12627+case $optarg in
12628+ # Valid mode arguments:
12629+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12630+
12631+ # Catch anything else as an error
12632+ *) func_error "invalid argument for $opt"
12633+ exit_cmd=exit
12634+ break
12635+ ;;
12636+esac
12637+ shift
12638+ ;;
12639+ --no-silent|--no-quiet)
12640 opt_silent=false
12641- opt_verbose=:
12642+func_append preserve_args " $opt"
12643 ;;
12644-
12645- --no-verbose) preserve_args="$preserve_args $opt"
12646+ --no-verbose)
12647 opt_verbose=false
12648+func_append preserve_args " $opt"
12649 ;;
12650-
12651- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12652- preserve_args="$preserve_args $opt $1"
12653- func_enable_tag "$1" # tagname is set here
12654+ --silent|--quiet)
12655+ opt_silent=:
12656+func_append preserve_args " $opt"
12657+ opt_verbose=false
12658+ ;;
12659+ --verbose|-v)
12660+ opt_verbose=:
12661+func_append preserve_args " $opt"
12662+opt_silent=false
12663+ ;;
12664+ --tag)
12665+ test $# = 0 && func_missing_arg $opt && break
12666+ optarg="$1"
12667+ opt_tag="$optarg"
12668+func_append preserve_args " $opt $optarg"
12669+func_enable_tag "$optarg"
12670 shift
12671 ;;
12672
12673+ -\?|-h) func_usage ;;
12674+ --help) func_help ;;
12675+ --version) func_version ;;
12676+
12677 # Separate optargs to long options:
12678- -dlopen=*|--mode=*|--tag=*)
12679- func_opt_split "$opt"
12680- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12681+ --*=*)
12682+ func_split_long_opt "$opt"
12683+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12684 shift
12685 ;;
12686
12687- -\?|-h) func_usage ;;
12688- --help) opt_help=: ;;
12689- --help-all) opt_help=': help-all' ;;
12690- --version) func_version ;;
12691-
12692- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12693-
12694- *) nonopt="$opt"
12695- break
12696+ # Separate non-argument short options:
12697+ -\?*|-h*|-n*|-v*)
12698+ func_split_short_opt "$opt"
12699+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12700+ shift
12701 ;;
12702+
12703+ --) break ;;
12704+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12705+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12706 esac
12707 done
12708
12709+ # Validate options:
12710+
12711+ # save first non-option argument
12712+ if test "$#" -gt 0; then
12713+ nonopt="$opt"
12714+ shift
12715+ fi
12716+
12717+ # preserve --debug
12718+ test "$opt_debug" = : || func_append preserve_args " --debug"
12719
12720 case $host in
12721 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12722@@ -981,82 +1184,44 @@ func_enable_tag ()
12723 opt_duplicate_compiler_generated_deps=:
12724 ;;
12725 *)
12726- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12727+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12728 ;;
12729 esac
12730
12731- # Having warned about all mis-specified options, bail out if
12732- # anything was wrong.
12733- $exit_cmd $EXIT_FAILURE
12734-}
12735+ $opt_help || {
12736+ # Sanity checks first:
12737+ func_check_version_match
12738
12739-# func_check_version_match
12740-# Ensure that we are using m4 macros, and libtool script from the same
12741-# release of libtool.
12742-func_check_version_match ()
12743-{
12744- if test "$package_revision" != "$macro_revision"; then
12745- if test "$VERSION" != "$macro_version"; then
12746- if test -z "$macro_version"; then
12747- cat >&2 <<_LT_EOF
12748-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12749-$progname: definition of this LT_INIT comes from an older release.
12750-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12751-$progname: and run autoconf again.
12752-_LT_EOF
12753- else
12754- cat >&2 <<_LT_EOF
12755-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12756-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12757-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12758-$progname: and run autoconf again.
12759-_LT_EOF
12760- fi
12761- else
12762- cat >&2 <<_LT_EOF
12763-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12764-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12765-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12766-$progname: of $PACKAGE $VERSION and run autoconf again.
12767-_LT_EOF
12768+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12769+ func_fatal_configuration "not configured to build any kind of library"
12770 fi
12771
12772- exit $EXIT_MISMATCH
12773- fi
12774-}
12775-
12776+ # Darwin sucks
12777+ eval std_shrext=\"$shrext_cmds\"
12778
12779-## ----------- ##
12780-## Main. ##
12781-## ----------- ##
12782-
12783-$opt_help || {
12784- # Sanity checks first:
12785- func_check_version_match
12786-
12787- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12788- func_fatal_configuration "not configured to build any kind of library"
12789- fi
12790+ # Only execute mode is allowed to have -dlopen flags.
12791+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12792+ func_error "unrecognized option \`-dlopen'"
12793+ $ECHO "$help" 1>&2
12794+ exit $EXIT_FAILURE
12795+ fi
12796
12797- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12798+ # Change the help message to a mode-specific one.
12799+ generic_help="$help"
12800+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12801+ }
12802
12803
12804- # Darwin sucks
12805- eval "std_shrext=\"$shrext_cmds\""
12806+ # Bail if the options were screwed
12807+ $exit_cmd $EXIT_FAILURE
12808+}
12809
12810
12811- # Only execute mode is allowed to have -dlopen flags.
12812- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12813- func_error "unrecognized option \`-dlopen'"
12814- $ECHO "$help" 1>&2
12815- exit $EXIT_FAILURE
12816- fi
12817
12818- # Change the help message to a mode-specific one.
12819- generic_help="$help"
12820- help="Try \`$progname --help --mode=$mode' for more information."
12821-}
12822
12823+## ----------- ##
12824+## Main. ##
12825+## ----------- ##
12826
12827 # func_lalib_p file
12828 # True iff FILE is a libtool `.la' library or `.lo' object file.
12829@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12830 # temporary ltwrapper_script.
12831 func_ltwrapper_scriptname ()
12832 {
12833- func_ltwrapper_scriptname_result=""
12834- if func_ltwrapper_executable_p "$1"; then
12835- func_dirname_and_basename "$1" "" "."
12836- func_stripname '' '.exe' "$func_basename_result"
12837- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12838- fi
12839+ func_dirname_and_basename "$1" "" "."
12840+ func_stripname '' '.exe' "$func_basename_result"
12841+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12842 }
12843
12844 # func_ltwrapper_p file
12845@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12846 save_ifs=$IFS; IFS='~'
12847 for cmd in $1; do
12848 IFS=$save_ifs
12849- eval "cmd=\"$cmd\""
12850+ eval cmd=\"$cmd\"
12851 func_show_eval "$cmd" "${2-:}"
12852 done
12853 IFS=$save_ifs
12854@@ -1172,6 +1334,37 @@ func_source ()
12855 }
12856
12857
12858+# func_resolve_sysroot PATH
12859+# Replace a leading = in PATH with a sysroot. Store the result into
12860+# func_resolve_sysroot_result
12861+func_resolve_sysroot ()
12862+{
12863+ func_resolve_sysroot_result=$1
12864+ case $func_resolve_sysroot_result in
12865+ =*)
12866+ func_stripname '=' '' "$func_resolve_sysroot_result"
12867+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12868+ ;;
12869+ esac
12870+}
12871+
12872+# func_replace_sysroot PATH
12873+# If PATH begins with the sysroot, replace it with = and
12874+# store the result into func_replace_sysroot_result.
12875+func_replace_sysroot ()
12876+{
12877+ case "$lt_sysroot:$1" in
12878+ ?*:"$lt_sysroot"*)
12879+ func_stripname "$lt_sysroot" '' "$1"
12880+ func_replace_sysroot_result="=$func_stripname_result"
12881+ ;;
12882+ *)
12883+ # Including no sysroot.
12884+ func_replace_sysroot_result=$1
12885+ ;;
12886+ esac
12887+}
12888+
12889 # func_infer_tag arg
12890 # Infer tagged configuration to use if any are available and
12891 # if one wasn't chosen via the "--tag" command line option.
12892@@ -1184,8 +1377,7 @@ func_infer_tag ()
12893 if test -n "$available_tags" && test -z "$tagname"; then
12894 CC_quoted=
12895 for arg in $CC; do
12896- func_quote_for_eval "$arg"
12897- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12898+ func_append_quoted CC_quoted "$arg"
12899 done
12900 CC_expanded=`func_echo_all $CC`
12901 CC_quoted_expanded=`func_echo_all $CC_quoted`
12902@@ -1204,8 +1396,7 @@ func_infer_tag ()
12903 CC_quoted=
12904 for arg in $CC; do
12905 # Double-quote args containing other shell metacharacters.
12906- func_quote_for_eval "$arg"
12907- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12908+ func_append_quoted CC_quoted "$arg"
12909 done
12910 CC_expanded=`func_echo_all $CC`
12911 CC_quoted_expanded=`func_echo_all $CC_quoted`
12912@@ -1274,6 +1465,486 @@ EOF
12913 }
12914 }
12915
12916+
12917+##################################################
12918+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
12919+##################################################
12920+
12921+# func_convert_core_file_wine_to_w32 ARG
12922+# Helper function used by file name conversion functions when $build is *nix,
12923+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
12924+# correctly configured wine environment available, with the winepath program
12925+# in $build's $PATH.
12926+#
12927+# ARG is the $build file name to be converted to w32 format.
12928+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
12929+# be empty on error (or when ARG is empty)
12930+func_convert_core_file_wine_to_w32 ()
12931+{
12932+ $opt_debug
12933+ func_convert_core_file_wine_to_w32_result="$1"
12934+ if test -n "$1"; then
12935+ # Unfortunately, winepath does not exit with a non-zero error code, so we
12936+ # are forced to check the contents of stdout. On the other hand, if the
12937+ # command is not found, the shell will set an exit code of 127 and print
12938+ # *an error message* to stdout. So we must check for both error code of
12939+ # zero AND non-empty stdout, which explains the odd construction:
12940+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
12941+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
12942+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
12943+ $SED -e "$lt_sed_naive_backslashify"`
12944+ else
12945+ func_convert_core_file_wine_to_w32_result=
12946+ fi
12947+ fi
12948+}
12949+# end: func_convert_core_file_wine_to_w32
12950+
12951+
12952+# func_convert_core_path_wine_to_w32 ARG
12953+# Helper function used by path conversion functions when $build is *nix, and
12954+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
12955+# configured wine environment available, with the winepath program in $build's
12956+# $PATH. Assumes ARG has no leading or trailing path separator characters.
12957+#
12958+# ARG is path to be converted from $build format to win32.
12959+# Result is available in $func_convert_core_path_wine_to_w32_result.
12960+# Unconvertible file (directory) names in ARG are skipped; if no directory names
12961+# are convertible, then the result may be empty.
12962+func_convert_core_path_wine_to_w32 ()
12963+{
12964+ $opt_debug
12965+ # unfortunately, winepath doesn't convert paths, only file names
12966+ func_convert_core_path_wine_to_w32_result=""
12967+ if test -n "$1"; then
12968+ oldIFS=$IFS
12969+ IFS=:
12970+ for func_convert_core_path_wine_to_w32_f in $1; do
12971+ IFS=$oldIFS
12972+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
12973+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
12974+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
12975+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
12976+ else
12977+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
12978+ fi
12979+ fi
12980+ done
12981+ IFS=$oldIFS
12982+ fi
12983+}
12984+# end: func_convert_core_path_wine_to_w32
12985+
12986+
12987+# func_cygpath ARGS...
12988+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
12989+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
12990+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
12991+# (2), returns the Cygwin file name or path in func_cygpath_result (input
12992+# file name or path is assumed to be in w32 format, as previously converted
12993+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
12994+# or path in func_cygpath_result (input file name or path is assumed to be in
12995+# Cygwin format). Returns an empty string on error.
12996+#
12997+# ARGS are passed to cygpath, with the last one being the file name or path to
12998+# be converted.
12999+#
13000+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13001+# environment variable; do not put it in $PATH.
13002+func_cygpath ()
13003+{
13004+ $opt_debug
13005+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13006+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13007+ if test "$?" -ne 0; then
13008+ # on failure, ensure result is empty
13009+ func_cygpath_result=
13010+ fi
13011+ else
13012+ func_cygpath_result=
13013+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13014+ fi
13015+}
13016+#end: func_cygpath
13017+
13018+
13019+# func_convert_core_msys_to_w32 ARG
13020+# Convert file name or path ARG from MSYS format to w32 format. Return
13021+# result in func_convert_core_msys_to_w32_result.
13022+func_convert_core_msys_to_w32 ()
13023+{
13024+ $opt_debug
13025+ # awkward: cmd appends spaces to result
13026+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13027+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13028+}
13029+#end: func_convert_core_msys_to_w32
13030+
13031+
13032+# func_convert_file_check ARG1 ARG2
13033+# Verify that ARG1 (a file name in $build format) was converted to $host
13034+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13035+# func_to_host_file_result to ARG1).
13036+func_convert_file_check ()
13037+{
13038+ $opt_debug
13039+ if test -z "$2" && test -n "$1" ; then
13040+ func_error "Could not determine host file name corresponding to"
13041+ func_error " \`$1'"
13042+ func_error "Continuing, but uninstalled executables may not work."
13043+ # Fallback:
13044+ func_to_host_file_result="$1"
13045+ fi
13046+}
13047+# end func_convert_file_check
13048+
13049+
13050+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13051+# Verify that FROM_PATH (a path in $build format) was converted to $host
13052+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13053+# func_to_host_file_result to a simplistic fallback value (see below).
13054+func_convert_path_check ()
13055+{
13056+ $opt_debug
13057+ if test -z "$4" && test -n "$3"; then
13058+ func_error "Could not determine the host path corresponding to"
13059+ func_error " \`$3'"
13060+ func_error "Continuing, but uninstalled executables may not work."
13061+ # Fallback. This is a deliberately simplistic "conversion" and
13062+ # should not be "improved". See libtool.info.
13063+ if test "x$1" != "x$2"; then
13064+ lt_replace_pathsep_chars="s|$1|$2|g"
13065+ func_to_host_path_result=`echo "$3" |
13066+ $SED -e "$lt_replace_pathsep_chars"`
13067+ else
13068+ func_to_host_path_result="$3"
13069+ fi
13070+ fi
13071+}
13072+# end func_convert_path_check
13073+
13074+
13075+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13076+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13077+# and appending REPL if ORIG matches BACKPAT.
13078+func_convert_path_front_back_pathsep ()
13079+{
13080+ $opt_debug
13081+ case $4 in
13082+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13083+ ;;
13084+ esac
13085+ case $4 in
13086+ $2 ) func_append func_to_host_path_result "$3"
13087+ ;;
13088+ esac
13089+}
13090+# end func_convert_path_front_back_pathsep
13091+
13092+
13093+##################################################
13094+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13095+##################################################
13096+# invoked via `$to_host_file_cmd ARG'
13097+#
13098+# In each case, ARG is the path to be converted from $build to $host format.
13099+# Result will be available in $func_to_host_file_result.
13100+
13101+
13102+# func_to_host_file ARG
13103+# Converts the file name ARG from $build format to $host format. Return result
13104+# in func_to_host_file_result.
13105+func_to_host_file ()
13106+{
13107+ $opt_debug
13108+ $to_host_file_cmd "$1"
13109+}
13110+# end func_to_host_file
13111+
13112+
13113+# func_to_tool_file ARG LAZY
13114+# converts the file name ARG from $build format to toolchain format. Return
13115+# result in func_to_tool_file_result. If the conversion in use is listed
13116+# in (the comma separated) LAZY, no conversion takes place.
13117+func_to_tool_file ()
13118+{
13119+ $opt_debug
13120+ case ,$2, in
13121+ *,"$to_tool_file_cmd",*)
13122+ func_to_tool_file_result=$1
13123+ ;;
13124+ *)
13125+ $to_tool_file_cmd "$1"
13126+ func_to_tool_file_result=$func_to_host_file_result
13127+ ;;
13128+ esac
13129+}
13130+# end func_to_tool_file
13131+
13132+
13133+# func_convert_file_noop ARG
13134+# Copy ARG to func_to_host_file_result.
13135+func_convert_file_noop ()
13136+{
13137+ func_to_host_file_result="$1"
13138+}
13139+# end func_convert_file_noop
13140+
13141+
13142+# func_convert_file_msys_to_w32 ARG
13143+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13144+# conversion to w32 is not available inside the cwrapper. Returns result in
13145+# func_to_host_file_result.
13146+func_convert_file_msys_to_w32 ()
13147+{
13148+ $opt_debug
13149+ func_to_host_file_result="$1"
13150+ if test -n "$1"; then
13151+ func_convert_core_msys_to_w32 "$1"
13152+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13153+ fi
13154+ func_convert_file_check "$1" "$func_to_host_file_result"
13155+}
13156+# end func_convert_file_msys_to_w32
13157+
13158+
13159+# func_convert_file_cygwin_to_w32 ARG
13160+# Convert file name ARG from Cygwin to w32 format. Returns result in
13161+# func_to_host_file_result.
13162+func_convert_file_cygwin_to_w32 ()
13163+{
13164+ $opt_debug
13165+ func_to_host_file_result="$1"
13166+ if test -n "$1"; then
13167+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13168+ # LT_CYGPATH in this case.
13169+ func_to_host_file_result=`cygpath -m "$1"`
13170+ fi
13171+ func_convert_file_check "$1" "$func_to_host_file_result"
13172+}
13173+# end func_convert_file_cygwin_to_w32
13174+
13175+
13176+# func_convert_file_nix_to_w32 ARG
13177+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13178+# and a working winepath. Returns result in func_to_host_file_result.
13179+func_convert_file_nix_to_w32 ()
13180+{
13181+ $opt_debug
13182+ func_to_host_file_result="$1"
13183+ if test -n "$1"; then
13184+ func_convert_core_file_wine_to_w32 "$1"
13185+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13186+ fi
13187+ func_convert_file_check "$1" "$func_to_host_file_result"
13188+}
13189+# end func_convert_file_nix_to_w32
13190+
13191+
13192+# func_convert_file_msys_to_cygwin ARG
13193+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13194+# Returns result in func_to_host_file_result.
13195+func_convert_file_msys_to_cygwin ()
13196+{
13197+ $opt_debug
13198+ func_to_host_file_result="$1"
13199+ if test -n "$1"; then
13200+ func_convert_core_msys_to_w32 "$1"
13201+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13202+ func_to_host_file_result="$func_cygpath_result"
13203+ fi
13204+ func_convert_file_check "$1" "$func_to_host_file_result"
13205+}
13206+# end func_convert_file_msys_to_cygwin
13207+
13208+
13209+# func_convert_file_nix_to_cygwin ARG
13210+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13211+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13212+# in func_to_host_file_result.
13213+func_convert_file_nix_to_cygwin ()
13214+{
13215+ $opt_debug
13216+ func_to_host_file_result="$1"
13217+ if test -n "$1"; then
13218+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13219+ func_convert_core_file_wine_to_w32 "$1"
13220+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13221+ func_to_host_file_result="$func_cygpath_result"
13222+ fi
13223+ func_convert_file_check "$1" "$func_to_host_file_result"
13224+}
13225+# end func_convert_file_nix_to_cygwin
13226+
13227+
13228+#############################################
13229+# $build to $host PATH CONVERSION FUNCTIONS #
13230+#############################################
13231+# invoked via `$to_host_path_cmd ARG'
13232+#
13233+# In each case, ARG is the path to be converted from $build to $host format.
13234+# The result will be available in $func_to_host_path_result.
13235+#
13236+# Path separators are also converted from $build format to $host format. If
13237+# ARG begins or ends with a path separator character, it is preserved (but
13238+# converted to $host format) on output.
13239+#
13240+# All path conversion functions are named using the following convention:
13241+# file name conversion function : func_convert_file_X_to_Y ()
13242+# path conversion function : func_convert_path_X_to_Y ()
13243+# where, for any given $build/$host combination the 'X_to_Y' value is the
13244+# same. If conversion functions are added for new $build/$host combinations,
13245+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13246+# will break.
13247+
13248+
13249+# func_init_to_host_path_cmd
13250+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13251+# appropriate value, based on the value of $to_host_file_cmd.
13252+to_host_path_cmd=
13253+func_init_to_host_path_cmd ()
13254+{
13255+ $opt_debug
13256+ if test -z "$to_host_path_cmd"; then
13257+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13258+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13259+ fi
13260+}
13261+
13262+
13263+# func_to_host_path ARG
13264+# Converts the path ARG from $build format to $host format. Return result
13265+# in func_to_host_path_result.
13266+func_to_host_path ()
13267+{
13268+ $opt_debug
13269+ func_init_to_host_path_cmd
13270+ $to_host_path_cmd "$1"
13271+}
13272+# end func_to_host_path
13273+
13274+
13275+# func_convert_path_noop ARG
13276+# Copy ARG to func_to_host_path_result.
13277+func_convert_path_noop ()
13278+{
13279+ func_to_host_path_result="$1"
13280+}
13281+# end func_convert_path_noop
13282+
13283+
13284+# func_convert_path_msys_to_w32 ARG
13285+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13286+# conversion to w32 is not available inside the cwrapper. Returns result in
13287+# func_to_host_path_result.
13288+func_convert_path_msys_to_w32 ()
13289+{
13290+ $opt_debug
13291+ func_to_host_path_result="$1"
13292+ if test -n "$1"; then
13293+ # Remove leading and trailing path separator characters from ARG. MSYS
13294+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13295+ # and winepath ignores them completely.
13296+ func_stripname : : "$1"
13297+ func_to_host_path_tmp1=$func_stripname_result
13298+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13299+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13300+ func_convert_path_check : ";" \
13301+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13302+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13303+ fi
13304+}
13305+# end func_convert_path_msys_to_w32
13306+
13307+
13308+# func_convert_path_cygwin_to_w32 ARG
13309+# Convert path ARG from Cygwin to w32 format. Returns result in
13310+# func_to_host_file_result.
13311+func_convert_path_cygwin_to_w32 ()
13312+{
13313+ $opt_debug
13314+ func_to_host_path_result="$1"
13315+ if test -n "$1"; then
13316+ # See func_convert_path_msys_to_w32:
13317+ func_stripname : : "$1"
13318+ func_to_host_path_tmp1=$func_stripname_result
13319+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13320+ func_convert_path_check : ";" \
13321+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13322+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13323+ fi
13324+}
13325+# end func_convert_path_cygwin_to_w32
13326+
13327+
13328+# func_convert_path_nix_to_w32 ARG
13329+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13330+# a working winepath. Returns result in func_to_host_file_result.
13331+func_convert_path_nix_to_w32 ()
13332+{
13333+ $opt_debug
13334+ func_to_host_path_result="$1"
13335+ if test -n "$1"; then
13336+ # See func_convert_path_msys_to_w32:
13337+ func_stripname : : "$1"
13338+ func_to_host_path_tmp1=$func_stripname_result
13339+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13340+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13341+ func_convert_path_check : ";" \
13342+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13343+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13344+ fi
13345+}
13346+# end func_convert_path_nix_to_w32
13347+
13348+
13349+# func_convert_path_msys_to_cygwin ARG
13350+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13351+# Returns result in func_to_host_file_result.
13352+func_convert_path_msys_to_cygwin ()
13353+{
13354+ $opt_debug
13355+ func_to_host_path_result="$1"
13356+ if test -n "$1"; then
13357+ # See func_convert_path_msys_to_w32:
13358+ func_stripname : : "$1"
13359+ func_to_host_path_tmp1=$func_stripname_result
13360+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13361+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13362+ func_to_host_path_result="$func_cygpath_result"
13363+ func_convert_path_check : : \
13364+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13365+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13366+ fi
13367+}
13368+# end func_convert_path_msys_to_cygwin
13369+
13370+
13371+# func_convert_path_nix_to_cygwin ARG
13372+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13373+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13374+# func_to_host_file_result.
13375+func_convert_path_nix_to_cygwin ()
13376+{
13377+ $opt_debug
13378+ func_to_host_path_result="$1"
13379+ if test -n "$1"; then
13380+ # Remove leading and trailing path separator characters from
13381+ # ARG. msys behavior is inconsistent here, cygpath turns them
13382+ # into '.;' and ';.', and winepath ignores them completely.
13383+ func_stripname : : "$1"
13384+ func_to_host_path_tmp1=$func_stripname_result
13385+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13386+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13387+ func_to_host_path_result="$func_cygpath_result"
13388+ func_convert_path_check : : \
13389+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13390+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13391+ fi
13392+}
13393+# end func_convert_path_nix_to_cygwin
13394+
13395+
13396 # func_mode_compile arg...
13397 func_mode_compile ()
13398 {
13399@@ -1314,12 +1985,12 @@ func_mode_compile ()
13400 ;;
13401
13402 -pie | -fpie | -fPIE)
13403- pie_flag="$pie_flag $arg"
13404+ func_append pie_flag " $arg"
13405 continue
13406 ;;
13407
13408 -shared | -static | -prefer-pic | -prefer-non-pic)
13409- later="$later $arg"
13410+ func_append later " $arg"
13411 continue
13412 ;;
13413
13414@@ -1340,15 +2011,14 @@ func_mode_compile ()
13415 save_ifs="$IFS"; IFS=','
13416 for arg in $args; do
13417 IFS="$save_ifs"
13418- func_quote_for_eval "$arg"
13419- lastarg="$lastarg $func_quote_for_eval_result"
13420+ func_append_quoted lastarg "$arg"
13421 done
13422 IFS="$save_ifs"
13423 func_stripname ' ' '' "$lastarg"
13424 lastarg=$func_stripname_result
13425
13426 # Add the arguments to base_compile.
13427- base_compile="$base_compile $lastarg"
13428+ func_append base_compile " $lastarg"
13429 continue
13430 ;;
13431
13432@@ -1364,8 +2034,7 @@ func_mode_compile ()
13433 esac # case $arg_mode
13434
13435 # Aesthetically quote the previous argument.
13436- func_quote_for_eval "$lastarg"
13437- base_compile="$base_compile $func_quote_for_eval_result"
13438+ func_append_quoted base_compile "$lastarg"
13439 done # for arg
13440
13441 case $arg_mode in
13442@@ -1496,17 +2165,16 @@ compiler."
13443 $opt_dry_run || $RM $removelist
13444 exit $EXIT_FAILURE
13445 fi
13446- removelist="$removelist $output_obj"
13447+ func_append removelist " $output_obj"
13448 $ECHO "$srcfile" > "$lockfile"
13449 fi
13450
13451 $opt_dry_run || $RM $removelist
13452- removelist="$removelist $lockfile"
13453+ func_append removelist " $lockfile"
13454 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13455
13456- if test -n "$fix_srcfile_path"; then
13457- eval "srcfile=\"$fix_srcfile_path\""
13458- fi
13459+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13460+ srcfile=$func_to_tool_file_result
13461 func_quote_for_eval "$srcfile"
13462 qsrcfile=$func_quote_for_eval_result
13463
13464@@ -1526,7 +2194,7 @@ compiler."
13465
13466 if test -z "$output_obj"; then
13467 # Place PIC objects in $objdir
13468- command="$command -o $lobj"
13469+ func_append command " -o $lobj"
13470 fi
13471
13472 func_show_eval_locale "$command" \
13473@@ -1573,11 +2241,11 @@ compiler."
13474 command="$base_compile $qsrcfile $pic_flag"
13475 fi
13476 if test "$compiler_c_o" = yes; then
13477- command="$command -o $obj"
13478+ func_append command " -o $obj"
13479 fi
13480
13481 # Suppress compiler output if we already did a PIC compilation.
13482- command="$command$suppress_output"
13483+ func_append command "$suppress_output"
13484 func_show_eval_locale "$command" \
13485 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13486
13487@@ -1622,13 +2290,13 @@ compiler."
13488 }
13489
13490 $opt_help || {
13491- test "$mode" = compile && func_mode_compile ${1+"$@"}
13492+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13493 }
13494
13495 func_mode_help ()
13496 {
13497 # We need to display help for each of the modes.
13498- case $mode in
13499+ case $opt_mode in
13500 "")
13501 # Generic help is extracted from the usage comments
13502 # at the start of this file.
13503@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
13504
13505 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13506 -no-suppress do not suppress compiler output for multiple passes
13507- -prefer-pic try to building PIC objects only
13508- -prefer-non-pic try to building non-PIC objects only
13509+ -prefer-pic try to build PIC objects only
13510+ -prefer-non-pic try to build non-PIC objects only
13511 -shared do not build a \`.o' file suitable for static linking
13512 -static only build a \`.o' file suitable for static linking
13513 -Wc,FLAG pass FLAG directly to the compiler
13514@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
13515 ;;
13516
13517 *)
13518- func_fatal_help "invalid operation mode \`$mode'"
13519+ func_fatal_help "invalid operation mode \`$opt_mode'"
13520 ;;
13521 esac
13522
13523@@ -1819,13 +2487,13 @@ if $opt_help; then
13524 else
13525 {
13526 func_help noexit
13527- for mode in compile link execute install finish uninstall clean; do
13528+ for opt_mode in compile link execute install finish uninstall clean; do
13529 func_mode_help
13530 done
13531 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13532 {
13533 func_help noexit
13534- for mode in compile link execute install finish uninstall clean; do
13535+ for opt_mode in compile link execute install finish uninstall clean; do
13536 echo
13537 func_mode_help
13538 done
13539@@ -1854,13 +2522,16 @@ func_mode_execute ()
13540 func_fatal_help "you must specify a COMMAND"
13541
13542 # Handle -dlopen flags immediately.
13543- for file in $execute_dlfiles; do
13544+ for file in $opt_dlopen; do
13545 test -f "$file" \
13546 || func_fatal_help "\`$file' is not a file"
13547
13548 dir=
13549 case $file in
13550 *.la)
13551+ func_resolve_sysroot "$file"
13552+ file=$func_resolve_sysroot_result
13553+
13554 # Check to see that this really is a libtool archive.
13555 func_lalib_unsafe_p "$file" \
13556 || func_fatal_help "\`$lib' is not a valid libtool archive"
13557@@ -1882,7 +2553,7 @@ func_mode_execute ()
13558 dir="$func_dirname_result"
13559
13560 if test -f "$dir/$objdir/$dlname"; then
13561- dir="$dir/$objdir"
13562+ func_append dir "/$objdir"
13563 else
13564 if test ! -f "$dir/$dlname"; then
13565 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13566@@ -1907,10 +2578,10 @@ func_mode_execute ()
13567 test -n "$absdir" && dir="$absdir"
13568
13569 # Now add the directory to shlibpath_var.
13570- if eval test -z \"\$$shlibpath_var\"; then
13571- eval $shlibpath_var=\$dir
13572+ if eval "test -z \"\$$shlibpath_var\""; then
13573+ eval "$shlibpath_var=\"\$dir\""
13574 else
13575- eval $shlibpath_var=\$dir:\$$shlibpath_var
13576+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13577 fi
13578 done
13579
13580@@ -1939,8 +2610,7 @@ func_mode_execute ()
13581 ;;
13582 esac
13583 # Quote arguments (to preserve shell metacharacters).
13584- func_quote_for_eval "$file"
13585- args="$args $func_quote_for_eval_result"
13586+ func_append_quoted args "$file"
13587 done
13588
13589 if test "X$opt_dry_run" = Xfalse; then
13590@@ -1972,22 +2642,59 @@ func_mode_execute ()
13591 fi
13592 }
13593
13594-test "$mode" = execute && func_mode_execute ${1+"$@"}
13595+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13596
13597
13598 # func_mode_finish arg...
13599 func_mode_finish ()
13600 {
13601 $opt_debug
13602- libdirs="$nonopt"
13603+ libs=
13604+ libdirs=
13605 admincmds=
13606
13607- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13608- for dir
13609- do
13610- libdirs="$libdirs $dir"
13611- done
13612+ for opt in "$nonopt" ${1+"$@"}
13613+ do
13614+ if test -d "$opt"; then
13615+ func_append libdirs " $opt"
13616
13617+ elif test -f "$opt"; then
13618+ if func_lalib_unsafe_p "$opt"; then
13619+ func_append libs " $opt"
13620+ else
13621+ func_warning "\`$opt' is not a valid libtool archive"
13622+ fi
13623+
13624+ else
13625+ func_fatal_error "invalid argument \`$opt'"
13626+ fi
13627+ done
13628+
13629+ if test -n "$libs"; then
13630+ if test -n "$lt_sysroot"; then
13631+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13632+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13633+ else
13634+ sysroot_cmd=
13635+ fi
13636+
13637+ # Remove sysroot references
13638+ if $opt_dry_run; then
13639+ for lib in $libs; do
13640+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13641+ done
13642+ else
13643+ tmpdir=`func_mktempdir`
13644+ for lib in $libs; do
13645+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13646+ > $tmpdir/tmp-la
13647+ mv -f $tmpdir/tmp-la $lib
13648+ done
13649+ ${RM}r "$tmpdir"
13650+ fi
13651+ fi
13652+
13653+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13654 for libdir in $libdirs; do
13655 if test -n "$finish_cmds"; then
13656 # Do each command in the finish commands.
13657@@ -1997,7 +2704,7 @@ func_mode_finish ()
13658 if test -n "$finish_eval"; then
13659 # Do the single finish_eval.
13660 eval cmds=\"$finish_eval\"
13661- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13662+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13663 $cmds"
13664 fi
13665 done
13666@@ -2006,53 +2713,55 @@ func_mode_finish ()
13667 # Exit here if they wanted silent mode.
13668 $opt_silent && exit $EXIT_SUCCESS
13669
13670- echo "----------------------------------------------------------------------"
13671- echo "Libraries have been installed in:"
13672- for libdir in $libdirs; do
13673- $ECHO " $libdir"
13674- done
13675- echo
13676- echo "If you ever happen to want to link against installed libraries"
13677- echo "in a given directory, LIBDIR, you must either use libtool, and"
13678- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13679- echo "flag during linking and do at least one of the following:"
13680- if test -n "$shlibpath_var"; then
13681- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13682- echo " during execution"
13683- fi
13684- if test -n "$runpath_var"; then
13685- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13686- echo " during linking"
13687- fi
13688- if test -n "$hardcode_libdir_flag_spec"; then
13689- libdir=LIBDIR
13690- eval "flag=\"$hardcode_libdir_flag_spec\""
13691+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13692+ echo "----------------------------------------------------------------------"
13693+ echo "Libraries have been installed in:"
13694+ for libdir in $libdirs; do
13695+ $ECHO " $libdir"
13696+ done
13697+ echo
13698+ echo "If you ever happen to want to link against installed libraries"
13699+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13700+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13701+ echo "flag during linking and do at least one of the following:"
13702+ if test -n "$shlibpath_var"; then
13703+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13704+ echo " during execution"
13705+ fi
13706+ if test -n "$runpath_var"; then
13707+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13708+ echo " during linking"
13709+ fi
13710+ if test -n "$hardcode_libdir_flag_spec"; then
13711+ libdir=LIBDIR
13712+ eval flag=\"$hardcode_libdir_flag_spec\"
13713
13714- $ECHO " - use the \`$flag' linker flag"
13715- fi
13716- if test -n "$admincmds"; then
13717- $ECHO " - have your system administrator run these commands:$admincmds"
13718- fi
13719- if test -f /etc/ld.so.conf; then
13720- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13721- fi
13722- echo
13723+ $ECHO " - use the \`$flag' linker flag"
13724+ fi
13725+ if test -n "$admincmds"; then
13726+ $ECHO " - have your system administrator run these commands:$admincmds"
13727+ fi
13728+ if test -f /etc/ld.so.conf; then
13729+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13730+ fi
13731+ echo
13732
13733- echo "See any operating system documentation about shared libraries for"
13734- case $host in
13735- solaris2.[6789]|solaris2.1[0-9])
13736- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13737- echo "pages."
13738- ;;
13739- *)
13740- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13741- ;;
13742- esac
13743- echo "----------------------------------------------------------------------"
13744+ echo "See any operating system documentation about shared libraries for"
13745+ case $host in
13746+ solaris2.[6789]|solaris2.1[0-9])
13747+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13748+ echo "pages."
13749+ ;;
13750+ *)
13751+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13752+ ;;
13753+ esac
13754+ echo "----------------------------------------------------------------------"
13755+ fi
13756 exit $EXIT_SUCCESS
13757 }
13758
13759-test "$mode" = finish && func_mode_finish ${1+"$@"}
13760+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13761
13762
13763 # func_mode_install arg...
13764@@ -2077,7 +2786,7 @@ func_mode_install ()
13765 # The real first argument should be the name of the installation program.
13766 # Aesthetically quote it.
13767 func_quote_for_eval "$arg"
13768- install_prog="$install_prog$func_quote_for_eval_result"
13769+ func_append install_prog "$func_quote_for_eval_result"
13770 install_shared_prog=$install_prog
13771 case " $install_prog " in
13772 *[\\\ /]cp\ *) install_cp=: ;;
13773@@ -2097,7 +2806,7 @@ func_mode_install ()
13774 do
13775 arg2=
13776 if test -n "$dest"; then
13777- files="$files $dest"
13778+ func_append files " $dest"
13779 dest=$arg
13780 continue
13781 fi
13782@@ -2135,11 +2844,11 @@ func_mode_install ()
13783
13784 # Aesthetically quote the argument.
13785 func_quote_for_eval "$arg"
13786- install_prog="$install_prog $func_quote_for_eval_result"
13787+ func_append install_prog " $func_quote_for_eval_result"
13788 if test -n "$arg2"; then
13789 func_quote_for_eval "$arg2"
13790 fi
13791- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13792+ func_append install_shared_prog " $func_quote_for_eval_result"
13793 done
13794
13795 test -z "$install_prog" && \
13796@@ -2151,7 +2860,7 @@ func_mode_install ()
13797 if test -n "$install_override_mode" && $no_mode; then
13798 if $install_cp; then :; else
13799 func_quote_for_eval "$install_override_mode"
13800- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13801+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13802 fi
13803 fi
13804
13805@@ -2209,10 +2918,13 @@ func_mode_install ()
13806 case $file in
13807 *.$libext)
13808 # Do the static libraries later.
13809- staticlibs="$staticlibs $file"
13810+ func_append staticlibs " $file"
13811 ;;
13812
13813 *.la)
13814+ func_resolve_sysroot "$file"
13815+ file=$func_resolve_sysroot_result
13816+
13817 # Check to see that this really is a libtool archive.
13818 func_lalib_unsafe_p "$file" \
13819 || func_fatal_help "\`$file' is not a valid libtool archive"
13820@@ -2226,23 +2938,30 @@ func_mode_install ()
13821 if test "X$destdir" = "X$libdir"; then
13822 case "$current_libdirs " in
13823 *" $libdir "*) ;;
13824- *) current_libdirs="$current_libdirs $libdir" ;;
13825+ *) func_append current_libdirs " $libdir" ;;
13826 esac
13827 else
13828 # Note the libdir as a future libdir.
13829 case "$future_libdirs " in
13830 *" $libdir "*) ;;
13831- *) future_libdirs="$future_libdirs $libdir" ;;
13832+ *) func_append future_libdirs " $libdir" ;;
13833 esac
13834 fi
13835
13836 func_dirname "$file" "/" ""
13837 dir="$func_dirname_result"
13838- dir="$dir$objdir"
13839+ func_append dir "$objdir"
13840
13841 if test -n "$relink_command"; then
13842+ # Strip any trailing slash from the destination.
13843+ func_stripname '' '/' "$libdir"
13844+ destlibdir=$func_stripname_result
13845+
13846+ func_stripname '' '/' "$destdir"
13847+ s_destdir=$func_stripname_result
13848+
13849 # Determine the prefix the user has applied to our future dir.
13850- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13851+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13852
13853 # Don't allow the user to place us outside of our expected
13854 # location b/c this prevents finding dependent libraries that
13855@@ -2315,7 +3034,7 @@ func_mode_install ()
13856 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13857
13858 # Maybe install the static library, too.
13859- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13860+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13861 ;;
13862
13863 *.lo)
13864@@ -2503,7 +3222,7 @@ func_mode_install ()
13865 test -n "$future_libdirs" && \
13866 func_warning "remember to run \`$progname --finish$future_libdirs'"
13867
13868- if test -n "$current_libdirs" && $opt_finish; then
13869+ if test -n "$current_libdirs"; then
13870 # Maybe just do a dry run.
13871 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13872 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13873@@ -2512,7 +3231,7 @@ func_mode_install ()
13874 fi
13875 }
13876
13877-test "$mode" = install && func_mode_install ${1+"$@"}
13878+test "$opt_mode" = install && func_mode_install ${1+"$@"}
13879
13880
13881 # func_generate_dlsyms outputname originator pic_p
13882@@ -2559,6 +3278,18 @@ extern \"C\" {
13883 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
13884 #endif
13885
13886+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13887+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13888+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13889+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13890+# define LT_DLSYM_CONST
13891+#elif defined(__osf__)
13892+/* This system does not cope well with relocations in const data. */
13893+# define LT_DLSYM_CONST
13894+#else
13895+# define LT_DLSYM_CONST const
13896+#endif
13897+
13898 /* External symbol declarations for the compiler. */\
13899 "
13900
13901@@ -2570,21 +3301,22 @@ extern \"C\" {
13902 # Add our own program objects to the symbol list.
13903 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
13904 for progfile in $progfiles; do
13905- func_verbose "extracting global C symbols from \`$progfile'"
13906- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
13907+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
13908+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
13909+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
13910 done
13911
13912 if test -n "$exclude_expsyms"; then
13913 $opt_dry_run || {
13914- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
13915- $MV "$nlist"T "$nlist"
13916+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
13917+ eval '$MV "$nlist"T "$nlist"'
13918 }
13919 fi
13920
13921 if test -n "$export_symbols_regex"; then
13922 $opt_dry_run || {
13923- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
13924- $MV "$nlist"T "$nlist"
13925+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
13926+ eval '$MV "$nlist"T "$nlist"'
13927 }
13928 fi
13929
13930@@ -2593,23 +3325,23 @@ extern \"C\" {
13931 export_symbols="$output_objdir/$outputname.exp"
13932 $opt_dry_run || {
13933 $RM $export_symbols
13934- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
13935+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13936 case $host in
13937 *cygwin* | *mingw* | *cegcc* )
13938- echo EXPORTS > "$output_objdir/$outputname.def"
13939- cat "$export_symbols" >> "$output_objdir/$outputname.def"
13940+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13941+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
13942 ;;
13943 esac
13944 }
13945 else
13946 $opt_dry_run || {
13947- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
13948- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
13949- $MV "$nlist"T "$nlist"
13950+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
13951+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
13952+ eval '$MV "$nlist"T "$nlist"'
13953 case $host in
13954 *cygwin* | *mingw* | *cegcc* )
13955- echo EXPORTS > "$output_objdir/$outputname.def"
13956- cat "$nlist" >> "$output_objdir/$outputname.def"
13957+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13958+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
13959 ;;
13960 esac
13961 }
13962@@ -2620,10 +3352,52 @@ extern \"C\" {
13963 func_verbose "extracting global C symbols from \`$dlprefile'"
13964 func_basename "$dlprefile"
13965 name="$func_basename_result"
13966- $opt_dry_run || {
13967- $ECHO ": $name " >> "$nlist"
13968- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
13969- }
13970+ case $host in
13971+ *cygwin* | *mingw* | *cegcc* )
13972+ # if an import library, we need to obtain dlname
13973+ if func_win32_import_lib_p "$dlprefile"; then
13974+ func_tr_sh "$dlprefile"
13975+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
13976+ dlprefile_dlbasename=""
13977+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
13978+ # Use subshell, to avoid clobbering current variable values
13979+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
13980+ if test -n "$dlprefile_dlname" ; then
13981+ func_basename "$dlprefile_dlname"
13982+ dlprefile_dlbasename="$func_basename_result"
13983+ else
13984+ # no lafile. user explicitly requested -dlpreopen <import library>.
13985+ $sharedlib_from_linklib_cmd "$dlprefile"
13986+ dlprefile_dlbasename=$sharedlib_from_linklib_result
13987+ fi
13988+ fi
13989+ $opt_dry_run || {
13990+ if test -n "$dlprefile_dlbasename" ; then
13991+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
13992+ else
13993+ func_warning "Could not compute DLL name from $name"
13994+ eval '$ECHO ": $name " >> "$nlist"'
13995+ fi
13996+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
13997+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
13998+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
13999+ }
14000+ else # not an import lib
14001+ $opt_dry_run || {
14002+ eval '$ECHO ": $name " >> "$nlist"'
14003+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14004+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14005+ }
14006+ fi
14007+ ;;
14008+ *)
14009+ $opt_dry_run || {
14010+ eval '$ECHO ": $name " >> "$nlist"'
14011+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14012+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14013+ }
14014+ ;;
14015+ esac
14016 done
14017
14018 $opt_dry_run || {
14019@@ -2661,26 +3435,9 @@ typedef struct {
14020 const char *name;
14021 void *address;
14022 } lt_dlsymlist;
14023-"
14024- case $host in
14025- *cygwin* | *mingw* | *cegcc* )
14026- echo >> "$output_objdir/$my_dlsyms" "\
14027-/* DATA imports from DLLs on WIN32 con't be const, because
14028- runtime relocations are performed -- see ld's documentation
14029- on pseudo-relocs. */"
14030- lt_dlsym_const= ;;
14031- *osf5*)
14032- echo >> "$output_objdir/$my_dlsyms" "\
14033-/* This system does not cope well with relocations in const data */"
14034- lt_dlsym_const= ;;
14035- *)
14036- lt_dlsym_const=const ;;
14037- esac
14038-
14039- echo >> "$output_objdir/$my_dlsyms" "\
14040-extern $lt_dlsym_const lt_dlsymlist
14041+extern LT_DLSYM_CONST lt_dlsymlist
14042 lt_${my_prefix}_LTX_preloaded_symbols[];
14043-$lt_dlsym_const lt_dlsymlist
14044+LT_DLSYM_CONST lt_dlsymlist
14045 lt_${my_prefix}_LTX_preloaded_symbols[] =
14046 {\
14047 { \"$my_originator\", (void *) 0 },"
14048@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
14049 for arg in $LTCFLAGS; do
14050 case $arg in
14051 -pie | -fpie | -fPIE) ;;
14052- *) symtab_cflags="$symtab_cflags $arg" ;;
14053+ *) func_append symtab_cflags " $arg" ;;
14054 esac
14055 done
14056
14057@@ -2796,9 +3553,11 @@ func_win32_libid ()
14058 win32_libid_type="x86 archive import"
14059 ;;
14060 *ar\ archive*) # could be an import, or static
14061- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14062- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14063- win32_nmres=`$NM -f posix -A "$1" |
14064+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14065+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14066+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14067+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14068+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14069 $SED -n -e '
14070 1,100{
14071 / I /{
14072@@ -2827,6 +3586,131 @@ func_win32_libid ()
14073 $ECHO "$win32_libid_type"
14074 }
14075
14076+# func_cygming_dll_for_implib ARG
14077+#
14078+# Platform-specific function to extract the
14079+# name of the DLL associated with the specified
14080+# import library ARG.
14081+# Invoked by eval'ing the libtool variable
14082+# $sharedlib_from_linklib_cmd
14083+# Result is available in the variable
14084+# $sharedlib_from_linklib_result
14085+func_cygming_dll_for_implib ()
14086+{
14087+ $opt_debug
14088+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14089+}
14090+
14091+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14092+#
14093+# The is the core of a fallback implementation of a
14094+# platform-specific function to extract the name of the
14095+# DLL associated with the specified import library LIBNAME.
14096+#
14097+# SECTION_NAME is either .idata$6 or .idata$7, depending
14098+# on the platform and compiler that created the implib.
14099+#
14100+# Echos the name of the DLL associated with the
14101+# specified import library.
14102+func_cygming_dll_for_implib_fallback_core ()
14103+{
14104+ $opt_debug
14105+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14106+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14107+ $SED '/^Contents of section '"$match_literal"':/{
14108+ # Place marker at beginning of archive member dllname section
14109+ s/.*/====MARK====/
14110+ p
14111+ d
14112+ }
14113+ # These lines can sometimes be longer than 43 characters, but
14114+ # are always uninteresting
14115+ /:[ ]*file format pe[i]\{,1\}-/d
14116+ /^In archive [^:]*:/d
14117+ # Ensure marker is printed
14118+ /^====MARK====/p
14119+ # Remove all lines with less than 43 characters
14120+ /^.\{43\}/!d
14121+ # From remaining lines, remove first 43 characters
14122+ s/^.\{43\}//' |
14123+ $SED -n '
14124+ # Join marker and all lines until next marker into a single line
14125+ /^====MARK====/ b para
14126+ H
14127+ $ b para
14128+ b
14129+ :para
14130+ x
14131+ s/\n//g
14132+ # Remove the marker
14133+ s/^====MARK====//
14134+ # Remove trailing dots and whitespace
14135+ s/[\. \t]*$//
14136+ # Print
14137+ /./p' |
14138+ # we now have a list, one entry per line, of the stringified
14139+ # contents of the appropriate section of all members of the
14140+ # archive which possess that section. Heuristic: eliminate
14141+ # all those which have a first or second character that is
14142+ # a '.' (that is, objdump's representation of an unprintable
14143+ # character.) This should work for all archives with less than
14144+ # 0x302f exports -- but will fail for DLLs whose name actually
14145+ # begins with a literal '.' or a single character followed by
14146+ # a '.'.
14147+ #
14148+ # Of those that remain, print the first one.
14149+ $SED -e '/^\./d;/^.\./d;q'
14150+}
14151+
14152+# func_cygming_gnu_implib_p ARG
14153+# This predicate returns with zero status (TRUE) if
14154+# ARG is a GNU/binutils-style import library. Returns
14155+# with nonzero status (FALSE) otherwise.
14156+func_cygming_gnu_implib_p ()
14157+{
14158+ $opt_debug
14159+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14160+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
14161+ test -n "$func_cygming_gnu_implib_tmp"
14162+}
14163+
14164+# func_cygming_ms_implib_p ARG
14165+# This predicate returns with zero status (TRUE) if
14166+# ARG is an MS-style import library. Returns
14167+# with nonzero status (FALSE) otherwise.
14168+func_cygming_ms_implib_p ()
14169+{
14170+ $opt_debug
14171+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14172+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14173+ test -n "$func_cygming_ms_implib_tmp"
14174+}
14175+
14176+# func_cygming_dll_for_implib_fallback ARG
14177+# Platform-specific function to extract the
14178+# name of the DLL associated with the specified
14179+# import library ARG.
14180+#
14181+# This fallback implementation is for use when $DLLTOOL
14182+# does not support the --identify-strict option.
14183+# Invoked by eval'ing the libtool variable
14184+# $sharedlib_from_linklib_cmd
14185+# Result is available in the variable
14186+# $sharedlib_from_linklib_result
14187+func_cygming_dll_for_implib_fallback ()
14188+{
14189+ $opt_debug
14190+ if func_cygming_gnu_implib_p "$1" ; then
14191+ # binutils import library
14192+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14193+ elif func_cygming_ms_implib_p "$1" ; then
14194+ # ms-generated import library
14195+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14196+ else
14197+ # unknown
14198+ sharedlib_from_linklib_result=""
14199+ fi
14200+}
14201
14202
14203 # func_extract_an_archive dir oldlib
14204@@ -2917,7 +3801,7 @@ func_extract_archives ()
14205 darwin_file=
14206 darwin_files=
14207 for darwin_file in $darwin_filelist; do
14208- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14209+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14210 $LIPO -create -output "$darwin_file" $darwin_files
14211 done # $darwin_filelist
14212 $RM -rf unfat-$$
14213@@ -2932,7 +3816,7 @@ func_extract_archives ()
14214 func_extract_an_archive "$my_xdir" "$my_xabs"
14215 ;;
14216 esac
14217- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14218+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14219 done
14220
14221 func_extract_archives_result="$my_oldobjs"
14222@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14223 _LTECHO_EOF'
14224 }
14225 ECHO=\"$qECHO\"
14226- fi\
14227+ fi
14228+
14229+# Very basic option parsing. These options are (a) specific to
14230+# the libtool wrapper, (b) are identical between the wrapper
14231+# /script/ and the wrapper /executable/ which is used only on
14232+# windows platforms, and (c) all begin with the string "--lt-"
14233+# (application programs are unlikely to have options which match
14234+# this pattern).
14235+#
14236+# There are only two supported options: --lt-debug and
14237+# --lt-dump-script. There is, deliberately, no --lt-help.
14238+#
14239+# The first argument to this parsing function should be the
14240+# script's $0 value, followed by "$@".
14241+lt_option_debug=
14242+func_parse_lt_options ()
14243+{
14244+ lt_script_arg0=\$0
14245+ shift
14246+ for lt_opt
14247+ do
14248+ case \"\$lt_opt\" in
14249+ --lt-debug) lt_option_debug=1 ;;
14250+ --lt-dump-script)
14251+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14252+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14253+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14254+ cat \"\$lt_dump_D/\$lt_dump_F\"
14255+ exit 0
14256+ ;;
14257+ --lt-*)
14258+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14259+ exit 1
14260+ ;;
14261+ esac
14262+ done
14263+
14264+ # Print the debug banner immediately:
14265+ if test -n \"\$lt_option_debug\"; then
14266+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14267+ fi
14268+}
14269+
14270+# Used when --lt-debug. Prints its arguments to stdout
14271+# (redirection is the responsibility of the caller)
14272+func_lt_dump_args ()
14273+{
14274+ lt_dump_args_N=1;
14275+ for lt_arg
14276+ do
14277+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14278+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14279+ done
14280+}
14281+
14282+# Core function for launching the target application
14283+func_exec_program_core ()
14284+{
14285+"
14286+ case $host in
14287+ # Backslashes separate directories on plain windows
14288+ *-*-mingw | *-*-os2* | *-cegcc*)
14289+ $ECHO "\
14290+ if test -n \"\$lt_option_debug\"; then
14291+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14292+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14293+ fi
14294+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14295+"
14296+ ;;
14297+
14298+ *)
14299+ $ECHO "\
14300+ if test -n \"\$lt_option_debug\"; then
14301+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14302+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14303+ fi
14304+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14305+"
14306+ ;;
14307+ esac
14308+ $ECHO "\
14309+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14310+ exit 1
14311+}
14312+
14313+# A function to encapsulate launching the target application
14314+# Strips options in the --lt-* namespace from \$@ and
14315+# launches target application with the remaining arguments.
14316+func_exec_program ()
14317+{
14318+ for lt_wr_arg
14319+ do
14320+ case \$lt_wr_arg in
14321+ --lt-*) ;;
14322+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14323+ esac
14324+ shift
14325+ done
14326+ func_exec_program_core \${1+\"\$@\"}
14327+}
14328+
14329+ # Parse options
14330+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14331
14332 # Find the directory that this script lives in.
14333 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14334@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14335
14336 # relink executable if necessary
14337 if test -n \"\$relink_command\"; then
14338- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14339+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14340 else
14341 $ECHO \"\$relink_command_output\" >&2
14342 $RM \"\$progdir/\$file\"
14343@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14344
14345 if test -f \"\$progdir/\$program\"; then"
14346
14347+ # fixup the dll searchpath if we need to.
14348+ #
14349+ # Fix the DLL searchpath if we need to. Do this before prepending
14350+ # to shlibpath, because on Windows, both are PATH and uninstalled
14351+ # libraries must come first.
14352+ if test -n "$dllsearchpath"; then
14353+ $ECHO "\
14354+ # Add the dll search path components to the executable PATH
14355+ PATH=$dllsearchpath:\$PATH
14356+"
14357+ fi
14358+
14359 # Export our shlibpath_var if we have one.
14360 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14361 $ECHO "\
14362@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14363 "
14364 fi
14365
14366- # fixup the dll searchpath if we need to.
14367- if test -n "$dllsearchpath"; then
14368- $ECHO "\
14369- # Add the dll search path components to the executable PATH
14370- PATH=$dllsearchpath:\$PATH
14371-"
14372- fi
14373-
14374 $ECHO "\
14375 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14376 # Run the actual program with our arguments.
14377-"
14378- case $host in
14379- # Backslashes separate directories on plain windows
14380- *-*-mingw | *-*-os2* | *-cegcc*)
14381- $ECHO "\
14382- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14383-"
14384- ;;
14385-
14386- *)
14387- $ECHO "\
14388- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14389-"
14390- ;;
14391- esac
14392- $ECHO "\
14393- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14394- exit 1
14395+ func_exec_program \${1+\"\$@\"}
14396 fi
14397 else
14398 # The program doesn't exist.
14399@@ -3158,166 +4132,6 @@ fi\
14400 }
14401
14402
14403-# func_to_host_path arg
14404-#
14405-# Convert paths to host format when used with build tools.
14406-# Intended for use with "native" mingw (where libtool itself
14407-# is running under the msys shell), or in the following cross-
14408-# build environments:
14409-# $build $host
14410-# mingw (msys) mingw [e.g. native]
14411-# cygwin mingw
14412-# *nix + wine mingw
14413-# where wine is equipped with the `winepath' executable.
14414-# In the native mingw case, the (msys) shell automatically
14415-# converts paths for any non-msys applications it launches,
14416-# but that facility isn't available from inside the cwrapper.
14417-# Similar accommodations are necessary for $host mingw and
14418-# $build cygwin. Calling this function does no harm for other
14419-# $host/$build combinations not listed above.
14420-#
14421-# ARG is the path (on $build) that should be converted to
14422-# the proper representation for $host. The result is stored
14423-# in $func_to_host_path_result.
14424-func_to_host_path ()
14425-{
14426- func_to_host_path_result="$1"
14427- if test -n "$1"; then
14428- case $host in
14429- *mingw* )
14430- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14431- case $build in
14432- *mingw* ) # actually, msys
14433- # awkward: cmd appends spaces to result
14434- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14435- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14436- ;;
14437- *cygwin* )
14438- func_to_host_path_result=`cygpath -w "$1" |
14439- $SED -e "$lt_sed_naive_backslashify"`
14440- ;;
14441- * )
14442- # Unfortunately, winepath does not exit with a non-zero
14443- # error code, so we are forced to check the contents of
14444- # stdout. On the other hand, if the command is not
14445- # found, the shell will set an exit code of 127 and print
14446- # *an error message* to stdout. So we must check for both
14447- # error code of zero AND non-empty stdout, which explains
14448- # the odd construction:
14449- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14450- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14451- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14452- $SED -e "$lt_sed_naive_backslashify"`
14453- else
14454- # Allow warning below.
14455- func_to_host_path_result=
14456- fi
14457- ;;
14458- esac
14459- if test -z "$func_to_host_path_result" ; then
14460- func_error "Could not determine host path corresponding to"
14461- func_error " \`$1'"
14462- func_error "Continuing, but uninstalled executables may not work."
14463- # Fallback:
14464- func_to_host_path_result="$1"
14465- fi
14466- ;;
14467- esac
14468- fi
14469-}
14470-# end: func_to_host_path
14471-
14472-# func_to_host_pathlist arg
14473-#
14474-# Convert pathlists to host format when used with build tools.
14475-# See func_to_host_path(), above. This function supports the
14476-# following $build/$host combinations (but does no harm for
14477-# combinations not listed here):
14478-# $build $host
14479-# mingw (msys) mingw [e.g. native]
14480-# cygwin mingw
14481-# *nix + wine mingw
14482-#
14483-# Path separators are also converted from $build format to
14484-# $host format. If ARG begins or ends with a path separator
14485-# character, it is preserved (but converted to $host format)
14486-# on output.
14487-#
14488-# ARG is a pathlist (on $build) that should be converted to
14489-# the proper representation on $host. The result is stored
14490-# in $func_to_host_pathlist_result.
14491-func_to_host_pathlist ()
14492-{
14493- func_to_host_pathlist_result="$1"
14494- if test -n "$1"; then
14495- case $host in
14496- *mingw* )
14497- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14498- # Remove leading and trailing path separator characters from
14499- # ARG. msys behavior is inconsistent here, cygpath turns them
14500- # into '.;' and ';.', and winepath ignores them completely.
14501- func_stripname : : "$1"
14502- func_to_host_pathlist_tmp1=$func_stripname_result
14503- case $build in
14504- *mingw* ) # Actually, msys.
14505- # Awkward: cmd appends spaces to result.
14506- func_to_host_pathlist_result=`
14507- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14508- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14509- ;;
14510- *cygwin* )
14511- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14512- $SED -e "$lt_sed_naive_backslashify"`
14513- ;;
14514- * )
14515- # unfortunately, winepath doesn't convert pathlists
14516- func_to_host_pathlist_result=""
14517- func_to_host_pathlist_oldIFS=$IFS
14518- IFS=:
14519- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14520- IFS=$func_to_host_pathlist_oldIFS
14521- if test -n "$func_to_host_pathlist_f" ; then
14522- func_to_host_path "$func_to_host_pathlist_f"
14523- if test -n "$func_to_host_path_result" ; then
14524- if test -z "$func_to_host_pathlist_result" ; then
14525- func_to_host_pathlist_result="$func_to_host_path_result"
14526- else
14527- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14528- fi
14529- fi
14530- fi
14531- done
14532- IFS=$func_to_host_pathlist_oldIFS
14533- ;;
14534- esac
14535- if test -z "$func_to_host_pathlist_result"; then
14536- func_error "Could not determine the host path(s) corresponding to"
14537- func_error " \`$1'"
14538- func_error "Continuing, but uninstalled executables may not work."
14539- # Fallback. This may break if $1 contains DOS-style drive
14540- # specifications. The fix is not to complicate the expression
14541- # below, but for the user to provide a working wine installation
14542- # with winepath so that path translation in the cross-to-mingw
14543- # case works properly.
14544- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14545- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14546- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14547- fi
14548- # Now, add the leading and trailing path separators back
14549- case "$1" in
14550- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14551- ;;
14552- esac
14553- case "$1" in
14554- *: ) func_append func_to_host_pathlist_result ";"
14555- ;;
14556- esac
14557- ;;
14558- esac
14559- fi
14560-}
14561-# end: func_to_host_pathlist
14562-
14563 # func_emit_cwrapperexe_src
14564 # emit the source code for a wrapper executable on stdout
14565 # Must ONLY be called from within func_mode_link because
14566@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14567
14568 This wrapper executable should never be moved out of the build directory.
14569 If it is, it will not operate correctly.
14570-
14571- Currently, it simply execs the wrapper *script* "$SHELL $output",
14572- but could eventually absorb all of the scripts functionality and
14573- exec $objdir/$outputname directly.
14574 */
14575 EOF
14576 cat <<"EOF"
14577@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
14578 if (stale) { free ((void *) stale); stale = 0; } \
14579 } while (0)
14580
14581-#undef LTWRAPPER_DEBUGPRINTF
14582-#if defined LT_DEBUGWRAPPER
14583-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14584-static void
14585-ltwrapper_debugprintf (const char *fmt, ...)
14586-{
14587- va_list args;
14588- va_start (args, fmt);
14589- (void) vfprintf (stderr, fmt, args);
14590- va_end (args);
14591-}
14592+#if defined(LT_DEBUGWRAPPER)
14593+static int lt_debug = 1;
14594 #else
14595-# define LTWRAPPER_DEBUGPRINTF(args)
14596+static int lt_debug = 0;
14597 #endif
14598
14599-const char *program_name = NULL;
14600+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14601
14602 void *xmalloc (size_t num);
14603 char *xstrdup (const char *string);
14604@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
14605 int make_executable (const char *path);
14606 int check_executable (const char *path);
14607 char *strendzap (char *str, const char *pat);
14608-void lt_fatal (const char *message, ...);
14609+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14610+void lt_fatal (const char *file, int line, const char *message, ...);
14611+static const char *nonnull (const char *s);
14612+static const char *nonempty (const char *s);
14613 void lt_setenv (const char *name, const char *value);
14614 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14615 void lt_update_exe_path (const char *name, const char *value);
14616@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14617 EOF
14618
14619 cat <<EOF
14620-const char * MAGIC_EXE = "$magic_exe";
14621+volatile const char * MAGIC_EXE = "$magic_exe";
14622 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14623 EOF
14624
14625 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14626- func_to_host_pathlist "$temp_rpath"
14627+ func_to_host_path "$temp_rpath"
14628 cat <<EOF
14629-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14630+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14631 EOF
14632 else
14633 cat <<"EOF"
14634@@ -3513,10 +4317,10 @@ EOF
14635 fi
14636
14637 if test -n "$dllsearchpath"; then
14638- func_to_host_pathlist "$dllsearchpath:"
14639+ func_to_host_path "$dllsearchpath:"
14640 cat <<EOF
14641 const char * EXE_PATH_VARNAME = "PATH";
14642-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14643+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14644 EOF
14645 else
14646 cat <<"EOF"
14647@@ -3539,12 +4343,10 @@ EOF
14648 cat <<"EOF"
14649
14650 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14651-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14652
14653-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14654 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14655-
14656 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14657+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14658
14659 int
14660 main (int argc, char *argv[])
14661@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14662 int i;
14663
14664 program_name = (char *) xstrdup (base_name (argv[0]));
14665- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14666- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14667+ newargz = XMALLOC (char *, argc + 1);
14668
14669- /* very simple arg parsing; don't want to rely on getopt */
14670+ /* very simple arg parsing; don't want to rely on getopt
14671+ * also, copy all non cwrapper options to newargz, except
14672+ * argz[0], which is handled differently
14673+ */
14674+ newargc=0;
14675 for (i = 1; i < argc; i++)
14676 {
14677 if (strcmp (argv[i], dumpscript_opt) == 0)
14678@@ -3581,21 +4386,54 @@ EOF
14679 lt_dump_script (stdout);
14680 return 0;
14681 }
14682+ if (strcmp (argv[i], debug_opt) == 0)
14683+ {
14684+ lt_debug = 1;
14685+ continue;
14686+ }
14687+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14688+ {
14689+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14690+ namespace, but it is not one of the ones we know about and
14691+ have already dealt with, above (inluding dump-script), then
14692+ report an error. Otherwise, targets might begin to believe
14693+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14694+ namespace. The first time any user complains about this, we'll
14695+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14696+ or a configure.ac-settable value.
14697+ */
14698+ lt_fatal (__FILE__, __LINE__,
14699+ "unrecognized %s option: '%s'",
14700+ ltwrapper_option_prefix, argv[i]);
14701+ }
14702+ /* otherwise ... */
14703+ newargz[++newargc] = xstrdup (argv[i]);
14704 }
14705+ newargz[++newargc] = NULL;
14706+
14707+EOF
14708+ cat <<EOF
14709+ /* The GNU banner must be the first non-error debug message */
14710+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14711+EOF
14712+ cat <<"EOF"
14713+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14714+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14715
14716- newargz = XMALLOC (char *, argc + 1);
14717 tmp_pathspec = find_executable (argv[0]);
14718 if (tmp_pathspec == NULL)
14719- lt_fatal ("Couldn't find %s", argv[0]);
14720- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14721- tmp_pathspec));
14722+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14723+ lt_debugprintf (__FILE__, __LINE__,
14724+ "(main) found exe (before symlink chase) at: %s\n",
14725+ tmp_pathspec);
14726
14727 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14728- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14729- actual_cwrapper_path));
14730+ lt_debugprintf (__FILE__, __LINE__,
14731+ "(main) found exe (after symlink chase) at: %s\n",
14732+ actual_cwrapper_path);
14733 XFREE (tmp_pathspec);
14734
14735- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14736+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14737 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14738
14739 /* wrapper name transforms */
14740@@ -3613,8 +4451,9 @@ EOF
14741 target_name = tmp_pathspec;
14742 tmp_pathspec = 0;
14743
14744- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14745- target_name));
14746+ lt_debugprintf (__FILE__, __LINE__,
14747+ "(main) libtool target name: %s\n",
14748+ target_name);
14749 EOF
14750
14751 cat <<EOF
14752@@ -3664,35 +4503,19 @@ EOF
14753
14754 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14755 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14756- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14757+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14758+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14759+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14760+ libraries must come first. */
14761 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14762+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14763
14764- newargc=0;
14765- for (i = 1; i < argc; i++)
14766- {
14767- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14768- {
14769- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14770- namespace, but it is not one of the ones we know about and
14771- have already dealt with, above (inluding dump-script), then
14772- report an error. Otherwise, targets might begin to believe
14773- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14774- namespace. The first time any user complains about this, we'll
14775- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14776- or a configure.ac-settable value.
14777- */
14778- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14779- ltwrapper_option_prefix, argv[i]);
14780- }
14781- /* otherwise ... */
14782- newargz[++newargc] = xstrdup (argv[i]);
14783- }
14784- newargz[++newargc] = NULL;
14785-
14786- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14787+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14788+ nonnull (lt_argv_zero));
14789 for (i = 0; i < newargc; i++)
14790 {
14791- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14792+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14793+ i, nonnull (newargz[i]));
14794 }
14795
14796 EOF
14797@@ -3706,7 +4529,9 @@ EOF
14798 if (rval == -1)
14799 {
14800 /* failed to start process */
14801- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14802+ lt_debugprintf (__FILE__, __LINE__,
14803+ "(main) failed to launch target \"%s\": %s\n",
14804+ lt_argv_zero, nonnull (strerror (errno)));
14805 return 127;
14806 }
14807 return rval;
14808@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14809 {
14810 void *p = (void *) malloc (num);
14811 if (!p)
14812- lt_fatal ("Memory exhausted");
14813+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14814
14815 return p;
14816 }
14817@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14818 {
14819 struct stat st;
14820
14821- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14822- path ? (*path ? path : "EMPTY!") : "NULL!"));
14823+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14824+ nonempty (path));
14825 if ((!path) || (!*path))
14826 return 0;
14827
14828@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14829 int rval = 0;
14830 struct stat st;
14831
14832- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14833- path ? (*path ? path : "EMPTY!") : "NULL!"));
14834+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14835+ nonempty (path));
14836 if ((!path) || (!*path))
14837 return 0;
14838
14839@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14840 int tmp_len;
14841 char *concat_name;
14842
14843- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14844- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14845+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14846+ nonempty (wrapper));
14847
14848 if ((wrapper == NULL) || (*wrapper == '\0'))
14849 return NULL;
14850@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14851 {
14852 /* empty path: current directory */
14853 if (getcwd (tmp, LT_PATHMAX) == NULL)
14854- lt_fatal ("getcwd failed");
14855+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14856+ nonnull (strerror (errno)));
14857 tmp_len = strlen (tmp);
14858 concat_name =
14859 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14860@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14861 }
14862 /* Relative path | not found in path: prepend cwd */
14863 if (getcwd (tmp, LT_PATHMAX) == NULL)
14864- lt_fatal ("getcwd failed");
14865+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14866+ nonnull (strerror (errno)));
14867 tmp_len = strlen (tmp);
14868 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14869 memcpy (concat_name, tmp, tmp_len);
14870@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14871 int has_symlinks = 0;
14872 while (strlen (tmp_pathspec) && !has_symlinks)
14873 {
14874- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
14875- tmp_pathspec));
14876+ lt_debugprintf (__FILE__, __LINE__,
14877+ "checking path component for symlinks: %s\n",
14878+ tmp_pathspec);
14879 if (lstat (tmp_pathspec, &s) == 0)
14880 {
14881 if (S_ISLNK (s.st_mode) != 0)
14882@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
14883 }
14884 else
14885 {
14886- char *errstr = strerror (errno);
14887- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
14888+ lt_fatal (__FILE__, __LINE__,
14889+ "error accessing file \"%s\": %s",
14890+ tmp_pathspec, nonnull (strerror (errno)));
14891 }
14892 }
14893 XFREE (tmp_pathspec);
14894@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
14895 tmp_pathspec = realpath (pathspec, buf);
14896 if (tmp_pathspec == 0)
14897 {
14898- lt_fatal ("Could not follow symlinks for %s", pathspec);
14899+ lt_fatal (__FILE__, __LINE__,
14900+ "could not follow symlinks for %s", pathspec);
14901 }
14902 return xstrdup (tmp_pathspec);
14903 #endif
14904@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
14905 return str;
14906 }
14907
14908+void
14909+lt_debugprintf (const char *file, int line, const char *fmt, ...)
14910+{
14911+ va_list args;
14912+ if (lt_debug)
14913+ {
14914+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
14915+ va_start (args, fmt);
14916+ (void) vfprintf (stderr, fmt, args);
14917+ va_end (args);
14918+ }
14919+}
14920+
14921 static void
14922-lt_error_core (int exit_status, const char *mode,
14923+lt_error_core (int exit_status, const char *file,
14924+ int line, const char *mode,
14925 const char *message, va_list ap)
14926 {
14927- fprintf (stderr, "%s: %s: ", program_name, mode);
14928+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
14929 vfprintf (stderr, message, ap);
14930 fprintf (stderr, ".\n");
14931
14932@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
14933 }
14934
14935 void
14936-lt_fatal (const char *message, ...)
14937+lt_fatal (const char *file, int line, const char *message, ...)
14938 {
14939 va_list ap;
14940 va_start (ap, message);
14941- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
14942+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
14943 va_end (ap);
14944 }
14945
14946+static const char *
14947+nonnull (const char *s)
14948+{
14949+ return s ? s : "(null)";
14950+}
14951+
14952+static const char *
14953+nonempty (const char *s)
14954+{
14955+ return (s && !*s) ? "(empty)" : nonnull (s);
14956+}
14957+
14958 void
14959 lt_setenv (const char *name, const char *value)
14960 {
14961- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
14962- (name ? name : "<NULL>"),
14963- (value ? value : "<NULL>")));
14964+ lt_debugprintf (__FILE__, __LINE__,
14965+ "(lt_setenv) setting '%s' to '%s'\n",
14966+ nonnull (name), nonnull (value));
14967 {
14968 #ifdef HAVE_SETENV
14969 /* always make a copy, for consistency with !HAVE_SETENV */
14970@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
14971 void
14972 lt_update_exe_path (const char *name, const char *value)
14973 {
14974- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
14975- (name ? name : "<NULL>"),
14976- (value ? value : "<NULL>")));
14977+ lt_debugprintf (__FILE__, __LINE__,
14978+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
14979+ nonnull (name), nonnull (value));
14980
14981 if (name && *name && value && *value)
14982 {
14983@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
14984 void
14985 lt_update_lib_path (const char *name, const char *value)
14986 {
14987- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
14988- (name ? name : "<NULL>"),
14989- (value ? value : "<NULL>")));
14990+ lt_debugprintf (__FILE__, __LINE__,
14991+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
14992+ nonnull (name), nonnull (value));
14993
14994 if (name && *name && value && *value)
14995 {
14996@@ -4222,7 +5078,7 @@ EOF
14997 func_win32_import_lib_p ()
14998 {
14999 $opt_debug
15000- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15001+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15002 *import*) : ;;
15003 *) false ;;
15004 esac
15005@@ -4401,9 +5257,9 @@ func_mode_link ()
15006 ;;
15007 *)
15008 if test "$prev" = dlfiles; then
15009- dlfiles="$dlfiles $arg"
15010+ func_append dlfiles " $arg"
15011 else
15012- dlprefiles="$dlprefiles $arg"
15013+ func_append dlprefiles " $arg"
15014 fi
15015 prev=
15016 continue
15017@@ -4427,7 +5283,7 @@ func_mode_link ()
15018 *-*-darwin*)
15019 case "$deplibs " in
15020 *" $qarg.ltframework "*) ;;
15021- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15022+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15023 ;;
15024 esac
15025 ;;
15026@@ -4446,7 +5302,7 @@ func_mode_link ()
15027 moreargs=
15028 for fil in `cat "$save_arg"`
15029 do
15030-# moreargs="$moreargs $fil"
15031+# func_append moreargs " $fil"
15032 arg=$fil
15033 # A libtool-controlled object.
15034
15035@@ -4475,7 +5331,7 @@ func_mode_link ()
15036
15037 if test "$prev" = dlfiles; then
15038 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15039- dlfiles="$dlfiles $pic_object"
15040+ func_append dlfiles " $pic_object"
15041 prev=
15042 continue
15043 else
15044@@ -4487,7 +5343,7 @@ func_mode_link ()
15045 # CHECK ME: I think I busted this. -Ossama
15046 if test "$prev" = dlprefiles; then
15047 # Preload the old-style object.
15048- dlprefiles="$dlprefiles $pic_object"
15049+ func_append dlprefiles " $pic_object"
15050 prev=
15051 fi
15052
15053@@ -4557,12 +5413,12 @@ func_mode_link ()
15054 if test "$prev" = rpath; then
15055 case "$rpath " in
15056 *" $arg "*) ;;
15057- *) rpath="$rpath $arg" ;;
15058+ *) func_append rpath " $arg" ;;
15059 esac
15060 else
15061 case "$xrpath " in
15062 *" $arg "*) ;;
15063- *) xrpath="$xrpath $arg" ;;
15064+ *) func_append xrpath " $arg" ;;
15065 esac
15066 fi
15067 prev=
15068@@ -4574,28 +5430,28 @@ func_mode_link ()
15069 continue
15070 ;;
15071 weak)
15072- weak_libs="$weak_libs $arg"
15073+ func_append weak_libs " $arg"
15074 prev=
15075 continue
15076 ;;
15077 xcclinker)
15078- linker_flags="$linker_flags $qarg"
15079- compiler_flags="$compiler_flags $qarg"
15080+ func_append linker_flags " $qarg"
15081+ func_append compiler_flags " $qarg"
15082 prev=
15083 func_append compile_command " $qarg"
15084 func_append finalize_command " $qarg"
15085 continue
15086 ;;
15087 xcompiler)
15088- compiler_flags="$compiler_flags $qarg"
15089+ func_append compiler_flags " $qarg"
15090 prev=
15091 func_append compile_command " $qarg"
15092 func_append finalize_command " $qarg"
15093 continue
15094 ;;
15095 xlinker)
15096- linker_flags="$linker_flags $qarg"
15097- compiler_flags="$compiler_flags $wl$qarg"
15098+ func_append linker_flags " $qarg"
15099+ func_append compiler_flags " $wl$qarg"
15100 prev=
15101 func_append compile_command " $wl$qarg"
15102 func_append finalize_command " $wl$qarg"
15103@@ -4686,15 +5542,16 @@ func_mode_link ()
15104 ;;
15105
15106 -L*)
15107- func_stripname '-L' '' "$arg"
15108- dir=$func_stripname_result
15109- if test -z "$dir"; then
15110+ func_stripname "-L" '' "$arg"
15111+ if test -z "$func_stripname_result"; then
15112 if test "$#" -gt 0; then
15113 func_fatal_error "require no space between \`-L' and \`$1'"
15114 else
15115 func_fatal_error "need path for \`-L' option"
15116 fi
15117 fi
15118+ func_resolve_sysroot "$func_stripname_result"
15119+ dir=$func_resolve_sysroot_result
15120 # We need an absolute path.
15121 case $dir in
15122 [\\/]* | [A-Za-z]:[\\/]*) ;;
15123@@ -4706,10 +5563,16 @@ func_mode_link ()
15124 ;;
15125 esac
15126 case "$deplibs " in
15127- *" -L$dir "*) ;;
15128+ *" -L$dir "* | *" $arg "*)
15129+ # Will only happen for absolute or sysroot arguments
15130+ ;;
15131 *)
15132- deplibs="$deplibs -L$dir"
15133- lib_search_path="$lib_search_path $dir"
15134+ # Preserve sysroot, but never include relative directories
15135+ case $dir in
15136+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15137+ *) func_append deplibs " -L$dir" ;;
15138+ esac
15139+ func_append lib_search_path " $dir"
15140 ;;
15141 esac
15142 case $host in
15143@@ -4718,12 +5581,12 @@ func_mode_link ()
15144 case :$dllsearchpath: in
15145 *":$dir:"*) ;;
15146 ::) dllsearchpath=$dir;;
15147- *) dllsearchpath="$dllsearchpath:$dir";;
15148+ *) func_append dllsearchpath ":$dir";;
15149 esac
15150 case :$dllsearchpath: in
15151 *":$testbindir:"*) ;;
15152 ::) dllsearchpath=$testbindir;;
15153- *) dllsearchpath="$dllsearchpath:$testbindir";;
15154+ *) func_append dllsearchpath ":$testbindir";;
15155 esac
15156 ;;
15157 esac
15158@@ -4747,7 +5610,7 @@ func_mode_link ()
15159 ;;
15160 *-*-rhapsody* | *-*-darwin1.[012])
15161 # Rhapsody C and math libraries are in the System framework
15162- deplibs="$deplibs System.ltframework"
15163+ func_append deplibs " System.ltframework"
15164 continue
15165 ;;
15166 *-*-sco3.2v5* | *-*-sco5v6*)
15167@@ -4758,9 +5621,6 @@ func_mode_link ()
15168 # Compiler inserts libc in the correct place for threads to work
15169 test "X$arg" = "X-lc" && continue
15170 ;;
15171- *-*-linux*)
15172- test "X$arg" = "X-lc" && continue
15173- ;;
15174 esac
15175 elif test "X$arg" = "X-lc_r"; then
15176 case $host in
15177@@ -4770,7 +5630,7 @@ func_mode_link ()
15178 ;;
15179 esac
15180 fi
15181- deplibs="$deplibs $arg"
15182+ func_append deplibs " $arg"
15183 continue
15184 ;;
15185
15186@@ -4782,8 +5642,8 @@ func_mode_link ()
15187 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15188 # classes, name mangling, and exception handling.
15189 # Darwin uses the -arch flag to determine output architecture.
15190- -model|-arch|-isysroot)
15191- compiler_flags="$compiler_flags $arg"
15192+ -model|-arch|-isysroot|--sysroot)
15193+ func_append compiler_flags " $arg"
15194 func_append compile_command " $arg"
15195 func_append finalize_command " $arg"
15196 prev=xcompiler
15197@@ -4791,12 +5651,12 @@ func_mode_link ()
15198 ;;
15199
15200 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15201- compiler_flags="$compiler_flags $arg"
15202+ func_append compiler_flags " $arg"
15203 func_append compile_command " $arg"
15204 func_append finalize_command " $arg"
15205 case "$new_inherited_linker_flags " in
15206 *" $arg "*) ;;
15207- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15208+ * ) func_append new_inherited_linker_flags " $arg" ;;
15209 esac
15210 continue
15211 ;;
15212@@ -4863,13 +5723,17 @@ func_mode_link ()
15213 # We need an absolute path.
15214 case $dir in
15215 [\\/]* | [A-Za-z]:[\\/]*) ;;
15216+ =*)
15217+ func_stripname '=' '' "$dir"
15218+ dir=$lt_sysroot$func_stripname_result
15219+ ;;
15220 *)
15221 func_fatal_error "only absolute run-paths are allowed"
15222 ;;
15223 esac
15224 case "$xrpath " in
15225 *" $dir "*) ;;
15226- *) xrpath="$xrpath $dir" ;;
15227+ *) func_append xrpath " $dir" ;;
15228 esac
15229 continue
15230 ;;
15231@@ -4922,8 +5786,8 @@ func_mode_link ()
15232 for flag in $args; do
15233 IFS="$save_ifs"
15234 func_quote_for_eval "$flag"
15235- arg="$arg $func_quote_for_eval_result"
15236- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15237+ func_append arg " $func_quote_for_eval_result"
15238+ func_append compiler_flags " $func_quote_for_eval_result"
15239 done
15240 IFS="$save_ifs"
15241 func_stripname ' ' '' "$arg"
15242@@ -4938,9 +5802,9 @@ func_mode_link ()
15243 for flag in $args; do
15244 IFS="$save_ifs"
15245 func_quote_for_eval "$flag"
15246- arg="$arg $wl$func_quote_for_eval_result"
15247- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15248- linker_flags="$linker_flags $func_quote_for_eval_result"
15249+ func_append arg " $wl$func_quote_for_eval_result"
15250+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15251+ func_append linker_flags " $func_quote_for_eval_result"
15252 done
15253 IFS="$save_ifs"
15254 func_stripname ' ' '' "$arg"
15255@@ -4968,24 +5832,27 @@ func_mode_link ()
15256 arg="$func_quote_for_eval_result"
15257 ;;
15258
15259- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15260- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15261- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15262- # +DA*, +DD* enable 64-bit mode on the HP compiler
15263- # -q* pass through compiler args for the IBM compiler
15264- # -m*, -t[45]*, -txscale* pass through architecture-specific
15265- # compiler args for GCC
15266- # -F/path gives path to uninstalled frameworks, gcc on darwin
15267- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15268- # @file GCC response files
15269- # -tp=* Portland pgcc target processor selection
15270+ # Flags to be passed through unchanged, with rationale:
15271+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15272+ # -r[0-9][0-9]* specify processor for the SGI compiler
15273+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15274+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15275+ # -q* compiler args for the IBM compiler
15276+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15277+ # -F/path path to uninstalled frameworks, gcc on darwin
15278+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15279+ # @file GCC response files
15280+ # -tp=* Portland pgcc target processor selection
15281+ # --sysroot=* for sysroot support
15282+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15283 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15284- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15285+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15286+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15287 func_quote_for_eval "$arg"
15288 arg="$func_quote_for_eval_result"
15289 func_append compile_command " $arg"
15290 func_append finalize_command " $arg"
15291- compiler_flags="$compiler_flags $arg"
15292+ func_append compiler_flags " $arg"
15293 continue
15294 ;;
15295
15296@@ -4997,7 +5864,7 @@ func_mode_link ()
15297
15298 *.$objext)
15299 # A standard object.
15300- objs="$objs $arg"
15301+ func_append objs " $arg"
15302 ;;
15303
15304 *.lo)
15305@@ -5028,7 +5895,7 @@ func_mode_link ()
15306
15307 if test "$prev" = dlfiles; then
15308 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15309- dlfiles="$dlfiles $pic_object"
15310+ func_append dlfiles " $pic_object"
15311 prev=
15312 continue
15313 else
15314@@ -5040,7 +5907,7 @@ func_mode_link ()
15315 # CHECK ME: I think I busted this. -Ossama
15316 if test "$prev" = dlprefiles; then
15317 # Preload the old-style object.
15318- dlprefiles="$dlprefiles $pic_object"
15319+ func_append dlprefiles " $pic_object"
15320 prev=
15321 fi
15322
15323@@ -5085,24 +5952,25 @@ func_mode_link ()
15324
15325 *.$libext)
15326 # An archive.
15327- deplibs="$deplibs $arg"
15328- old_deplibs="$old_deplibs $arg"
15329+ func_append deplibs " $arg"
15330+ func_append old_deplibs " $arg"
15331 continue
15332 ;;
15333
15334 *.la)
15335 # A libtool-controlled library.
15336
15337+ func_resolve_sysroot "$arg"
15338 if test "$prev" = dlfiles; then
15339 # This library was specified with -dlopen.
15340- dlfiles="$dlfiles $arg"
15341+ func_append dlfiles " $func_resolve_sysroot_result"
15342 prev=
15343 elif test "$prev" = dlprefiles; then
15344 # The library was specified with -dlpreopen.
15345- dlprefiles="$dlprefiles $arg"
15346+ func_append dlprefiles " $func_resolve_sysroot_result"
15347 prev=
15348 else
15349- deplibs="$deplibs $arg"
15350+ func_append deplibs " $func_resolve_sysroot_result"
15351 fi
15352 continue
15353 ;;
15354@@ -5127,7 +5995,7 @@ func_mode_link ()
15355 func_fatal_help "the \`$prevarg' option requires an argument"
15356
15357 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15358- eval "arg=\"$export_dynamic_flag_spec\""
15359+ eval arg=\"$export_dynamic_flag_spec\"
15360 func_append compile_command " $arg"
15361 func_append finalize_command " $arg"
15362 fi
15363@@ -5144,11 +6012,13 @@ func_mode_link ()
15364 else
15365 shlib_search_path=
15366 fi
15367- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15368- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15369+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15370+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15371
15372 func_dirname "$output" "/" ""
15373 output_objdir="$func_dirname_result$objdir"
15374+ func_to_tool_file "$output_objdir/"
15375+ tool_output_objdir=$func_to_tool_file_result
15376 # Create the object directory.
15377 func_mkdir_p "$output_objdir"
15378
15379@@ -5169,12 +6039,12 @@ func_mode_link ()
15380 # Find all interdependent deplibs by searching for libraries
15381 # that are linked more than once (e.g. -la -lb -la)
15382 for deplib in $deplibs; do
15383- if $opt_duplicate_deps ; then
15384+ if $opt_preserve_dup_deps ; then
15385 case "$libs " in
15386- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15387+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15388 esac
15389 fi
15390- libs="$libs $deplib"
15391+ func_append libs " $deplib"
15392 done
15393
15394 if test "$linkmode" = lib; then
15395@@ -5187,9 +6057,9 @@ func_mode_link ()
15396 if $opt_duplicate_compiler_generated_deps; then
15397 for pre_post_dep in $predeps $postdeps; do
15398 case "$pre_post_deps " in
15399- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15400+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15401 esac
15402- pre_post_deps="$pre_post_deps $pre_post_dep"
15403+ func_append pre_post_deps " $pre_post_dep"
15404 done
15405 fi
15406 pre_post_deps=
15407@@ -5256,8 +6126,9 @@ func_mode_link ()
15408 for lib in $dlprefiles; do
15409 # Ignore non-libtool-libs
15410 dependency_libs=
15411+ func_resolve_sysroot "$lib"
15412 case $lib in
15413- *.la) func_source "$lib" ;;
15414+ *.la) func_source "$func_resolve_sysroot_result" ;;
15415 esac
15416
15417 # Collect preopened libtool deplibs, except any this library
15418@@ -5267,7 +6138,7 @@ func_mode_link ()
15419 deplib_base=$func_basename_result
15420 case " $weak_libs " in
15421 *" $deplib_base "*) ;;
15422- *) deplibs="$deplibs $deplib" ;;
15423+ *) func_append deplibs " $deplib" ;;
15424 esac
15425 done
15426 done
15427@@ -5288,11 +6159,11 @@ func_mode_link ()
15428 compile_deplibs="$deplib $compile_deplibs"
15429 finalize_deplibs="$deplib $finalize_deplibs"
15430 else
15431- compiler_flags="$compiler_flags $deplib"
15432+ func_append compiler_flags " $deplib"
15433 if test "$linkmode" = lib ; then
15434 case "$new_inherited_linker_flags " in
15435 *" $deplib "*) ;;
15436- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15437+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15438 esac
15439 fi
15440 fi
15441@@ -5377,7 +6248,7 @@ func_mode_link ()
15442 if test "$linkmode" = lib ; then
15443 case "$new_inherited_linker_flags " in
15444 *" $deplib "*) ;;
15445- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15446+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15447 esac
15448 fi
15449 fi
15450@@ -5390,7 +6261,8 @@ func_mode_link ()
15451 test "$pass" = conv && continue
15452 newdependency_libs="$deplib $newdependency_libs"
15453 func_stripname '-L' '' "$deplib"
15454- newlib_search_path="$newlib_search_path $func_stripname_result"
15455+ func_resolve_sysroot "$func_stripname_result"
15456+ func_append newlib_search_path " $func_resolve_sysroot_result"
15457 ;;
15458 prog)
15459 if test "$pass" = conv; then
15460@@ -5404,7 +6276,8 @@ func_mode_link ()
15461 finalize_deplibs="$deplib $finalize_deplibs"
15462 fi
15463 func_stripname '-L' '' "$deplib"
15464- newlib_search_path="$newlib_search_path $func_stripname_result"
15465+ func_resolve_sysroot "$func_stripname_result"
15466+ func_append newlib_search_path " $func_resolve_sysroot_result"
15467 ;;
15468 *)
15469 func_warning "\`-L' is ignored for archives/objects"
15470@@ -5415,17 +6288,21 @@ func_mode_link ()
15471 -R*)
15472 if test "$pass" = link; then
15473 func_stripname '-R' '' "$deplib"
15474- dir=$func_stripname_result
15475+ func_resolve_sysroot "$func_stripname_result"
15476+ dir=$func_resolve_sysroot_result
15477 # Make sure the xrpath contains only unique directories.
15478 case "$xrpath " in
15479 *" $dir "*) ;;
15480- *) xrpath="$xrpath $dir" ;;
15481+ *) func_append xrpath " $dir" ;;
15482 esac
15483 fi
15484 deplibs="$deplib $deplibs"
15485 continue
15486 ;;
15487- *.la) lib="$deplib" ;;
15488+ *.la)
15489+ func_resolve_sysroot "$deplib"
15490+ lib=$func_resolve_sysroot_result
15491+ ;;
15492 *.$libext)
15493 if test "$pass" = conv; then
15494 deplibs="$deplib $deplibs"
15495@@ -5488,11 +6365,11 @@ func_mode_link ()
15496 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15497 # If there is no dlopen support or we're linking statically,
15498 # we need to preload.
15499- newdlprefiles="$newdlprefiles $deplib"
15500+ func_append newdlprefiles " $deplib"
15501 compile_deplibs="$deplib $compile_deplibs"
15502 finalize_deplibs="$deplib $finalize_deplibs"
15503 else
15504- newdlfiles="$newdlfiles $deplib"
15505+ func_append newdlfiles " $deplib"
15506 fi
15507 fi
15508 continue
15509@@ -5538,7 +6415,7 @@ func_mode_link ()
15510 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15511 case " $new_inherited_linker_flags " in
15512 *" $tmp_inherited_linker_flag "*) ;;
15513- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15514+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15515 esac
15516 done
15517 fi
15518@@ -5546,8 +6423,8 @@ func_mode_link ()
15519 if test "$linkmode,$pass" = "lib,link" ||
15520 test "$linkmode,$pass" = "prog,scan" ||
15521 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15522- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15523- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15524+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15525+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15526 fi
15527
15528 if test "$pass" = conv; then
15529@@ -5558,20 +6435,20 @@ func_mode_link ()
15530 func_fatal_error "cannot find name of link library for \`$lib'"
15531 fi
15532 # It is a libtool convenience library, so add in its objects.
15533- convenience="$convenience $ladir/$objdir/$old_library"
15534- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15535+ func_append convenience " $ladir/$objdir/$old_library"
15536+ func_append old_convenience " $ladir/$objdir/$old_library"
15537 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15538 func_fatal_error "\`$lib' is not a convenience library"
15539 fi
15540 tmp_libs=
15541 for deplib in $dependency_libs; do
15542 deplibs="$deplib $deplibs"
15543- if $opt_duplicate_deps ; then
15544+ if $opt_preserve_dup_deps ; then
15545 case "$tmp_libs " in
15546- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15547+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15548 esac
15549 fi
15550- tmp_libs="$tmp_libs $deplib"
15551+ func_append tmp_libs " $deplib"
15552 done
15553 continue
15554 fi # $pass = conv
15555@@ -5579,9 +6456,15 @@ func_mode_link ()
15556
15557 # Get the name of the library we link against.
15558 linklib=
15559- for l in $old_library $library_names; do
15560- linklib="$l"
15561- done
15562+ if test -n "$old_library" &&
15563+ { test "$prefer_static_libs" = yes ||
15564+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15565+ linklib=$old_library
15566+ else
15567+ for l in $old_library $library_names; do
15568+ linklib="$l"
15569+ done
15570+ fi
15571 if test -z "$linklib"; then
15572 func_fatal_error "cannot find name of link library for \`$lib'"
15573 fi
15574@@ -5598,9 +6481,9 @@ func_mode_link ()
15575 # statically, we need to preload. We also need to preload any
15576 # dependent libraries so libltdl's deplib preloader doesn't
15577 # bomb out in the load deplibs phase.
15578- dlprefiles="$dlprefiles $lib $dependency_libs"
15579+ func_append dlprefiles " $lib $dependency_libs"
15580 else
15581- newdlfiles="$newdlfiles $lib"
15582+ func_append newdlfiles " $lib"
15583 fi
15584 continue
15585 fi # $pass = dlopen
15586@@ -5622,14 +6505,14 @@ func_mode_link ()
15587
15588 # Find the relevant object directory and library name.
15589 if test "X$installed" = Xyes; then
15590- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15591+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15592 func_warning "library \`$lib' was moved."
15593 dir="$ladir"
15594 absdir="$abs_ladir"
15595 libdir="$abs_ladir"
15596 else
15597- dir="$libdir"
15598- absdir="$libdir"
15599+ dir="$lt_sysroot$libdir"
15600+ absdir="$lt_sysroot$libdir"
15601 fi
15602 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15603 else
15604@@ -5637,12 +6520,12 @@ func_mode_link ()
15605 dir="$ladir"
15606 absdir="$abs_ladir"
15607 # Remove this search path later
15608- notinst_path="$notinst_path $abs_ladir"
15609+ func_append notinst_path " $abs_ladir"
15610 else
15611 dir="$ladir/$objdir"
15612 absdir="$abs_ladir/$objdir"
15613 # Remove this search path later
15614- notinst_path="$notinst_path $abs_ladir"
15615+ func_append notinst_path " $abs_ladir"
15616 fi
15617 fi # $installed = yes
15618 func_stripname 'lib' '.la' "$laname"
15619@@ -5653,20 +6536,46 @@ func_mode_link ()
15620 if test -z "$libdir" && test "$linkmode" = prog; then
15621 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15622 fi
15623- # Prefer using a static library (so that no silly _DYNAMIC symbols
15624- # are required to link).
15625- if test -n "$old_library"; then
15626- newdlprefiles="$newdlprefiles $dir/$old_library"
15627- # Keep a list of preopened convenience libraries to check
15628- # that they are being used correctly in the link pass.
15629- test -z "$libdir" && \
15630- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15631- # Otherwise, use the dlname, so that lt_dlopen finds it.
15632- elif test -n "$dlname"; then
15633- newdlprefiles="$newdlprefiles $dir/$dlname"
15634- else
15635- newdlprefiles="$newdlprefiles $dir/$linklib"
15636- fi
15637+ case "$host" in
15638+ # special handling for platforms with PE-DLLs.
15639+ *cygwin* | *mingw* | *cegcc* )
15640+ # Linker will automatically link against shared library if both
15641+ # static and shared are present. Therefore, ensure we extract
15642+ # symbols from the import library if a shared library is present
15643+ # (otherwise, the dlopen module name will be incorrect). We do
15644+ # this by putting the import library name into $newdlprefiles.
15645+ # We recover the dlopen module name by 'saving' the la file
15646+ # name in a special purpose variable, and (later) extracting the
15647+ # dlname from the la file.
15648+ if test -n "$dlname"; then
15649+ func_tr_sh "$dir/$linklib"
15650+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15651+ func_append newdlprefiles " $dir/$linklib"
15652+ else
15653+ func_append newdlprefiles " $dir/$old_library"
15654+ # Keep a list of preopened convenience libraries to check
15655+ # that they are being used correctly in the link pass.
15656+ test -z "$libdir" && \
15657+ func_append dlpreconveniencelibs " $dir/$old_library"
15658+ fi
15659+ ;;
15660+ * )
15661+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15662+ # are required to link).
15663+ if test -n "$old_library"; then
15664+ func_append newdlprefiles " $dir/$old_library"
15665+ # Keep a list of preopened convenience libraries to check
15666+ # that they are being used correctly in the link pass.
15667+ test -z "$libdir" && \
15668+ func_append dlpreconveniencelibs " $dir/$old_library"
15669+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15670+ elif test -n "$dlname"; then
15671+ func_append newdlprefiles " $dir/$dlname"
15672+ else
15673+ func_append newdlprefiles " $dir/$linklib"
15674+ fi
15675+ ;;
15676+ esac
15677 fi # $pass = dlpreopen
15678
15679 if test -z "$libdir"; then
15680@@ -5684,7 +6593,7 @@ func_mode_link ()
15681
15682
15683 if test "$linkmode" = prog && test "$pass" != link; then
15684- newlib_search_path="$newlib_search_path $ladir"
15685+ func_append newlib_search_path " $ladir"
15686 deplibs="$lib $deplibs"
15687
15688 linkalldeplibs=no
15689@@ -5697,7 +6606,8 @@ func_mode_link ()
15690 for deplib in $dependency_libs; do
15691 case $deplib in
15692 -L*) func_stripname '-L' '' "$deplib"
15693- newlib_search_path="$newlib_search_path $func_stripname_result"
15694+ func_resolve_sysroot "$func_stripname_result"
15695+ func_append newlib_search_path " $func_resolve_sysroot_result"
15696 ;;
15697 esac
15698 # Need to link against all dependency_libs?
15699@@ -5708,12 +6618,12 @@ func_mode_link ()
15700 # or/and link against static libraries
15701 newdependency_libs="$deplib $newdependency_libs"
15702 fi
15703- if $opt_duplicate_deps ; then
15704+ if $opt_preserve_dup_deps ; then
15705 case "$tmp_libs " in
15706- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15707+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15708 esac
15709 fi
15710- tmp_libs="$tmp_libs $deplib"
15711+ func_append tmp_libs " $deplib"
15712 done # for deplib
15713 continue
15714 fi # $linkmode = prog...
15715@@ -5728,7 +6638,7 @@ func_mode_link ()
15716 # Make sure the rpath contains only unique directories.
15717 case "$temp_rpath:" in
15718 *"$absdir:"*) ;;
15719- *) temp_rpath="$temp_rpath$absdir:" ;;
15720+ *) func_append temp_rpath "$absdir:" ;;
15721 esac
15722 fi
15723
15724@@ -5740,7 +6650,7 @@ func_mode_link ()
15725 *)
15726 case "$compile_rpath " in
15727 *" $absdir "*) ;;
15728- *) compile_rpath="$compile_rpath $absdir"
15729+ *) func_append compile_rpath " $absdir" ;;
15730 esac
15731 ;;
15732 esac
15733@@ -5749,7 +6659,7 @@ func_mode_link ()
15734 *)
15735 case "$finalize_rpath " in
15736 *" $libdir "*) ;;
15737- *) finalize_rpath="$finalize_rpath $libdir"
15738+ *) func_append finalize_rpath " $libdir" ;;
15739 esac
15740 ;;
15741 esac
15742@@ -5774,12 +6684,12 @@ func_mode_link ()
15743 case $host in
15744 *cygwin* | *mingw* | *cegcc*)
15745 # No point in relinking DLLs because paths are not encoded
15746- notinst_deplibs="$notinst_deplibs $lib"
15747+ func_append notinst_deplibs " $lib"
15748 need_relink=no
15749 ;;
15750 *)
15751 if test "$installed" = no; then
15752- notinst_deplibs="$notinst_deplibs $lib"
15753+ func_append notinst_deplibs " $lib"
15754 need_relink=yes
15755 fi
15756 ;;
15757@@ -5814,7 +6724,7 @@ func_mode_link ()
15758 *)
15759 case "$compile_rpath " in
15760 *" $absdir "*) ;;
15761- *) compile_rpath="$compile_rpath $absdir"
15762+ *) func_append compile_rpath " $absdir" ;;
15763 esac
15764 ;;
15765 esac
15766@@ -5823,7 +6733,7 @@ func_mode_link ()
15767 *)
15768 case "$finalize_rpath " in
15769 *" $libdir "*) ;;
15770- *) finalize_rpath="$finalize_rpath $libdir"
15771+ *) func_append finalize_rpath " $libdir" ;;
15772 esac
15773 ;;
15774 esac
15775@@ -5835,7 +6745,7 @@ func_mode_link ()
15776 shift
15777 realname="$1"
15778 shift
15779- eval "libname=\"$libname_spec\""
15780+ libname=`eval "\\$ECHO \"$libname_spec\""`
15781 # use dlname if we got it. it's perfectly good, no?
15782 if test -n "$dlname"; then
15783 soname="$dlname"
15784@@ -5848,7 +6758,7 @@ func_mode_link ()
15785 versuffix="-$major"
15786 ;;
15787 esac
15788- eval "soname=\"$soname_spec\""
15789+ eval soname=\"$soname_spec\"
15790 else
15791 soname="$realname"
15792 fi
15793@@ -5877,7 +6787,7 @@ func_mode_link ()
15794 linklib=$newlib
15795 fi # test -n "$old_archive_from_expsyms_cmds"
15796
15797- if test "$linkmode" = prog || test "$mode" != relink; then
15798+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15799 add_shlibpath=
15800 add_dir=
15801 add=
15802@@ -5933,7 +6843,7 @@ func_mode_link ()
15803 if test -n "$inst_prefix_dir"; then
15804 case $libdir in
15805 [\\/]*)
15806- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15807+ func_append add_dir " -L$inst_prefix_dir$libdir"
15808 ;;
15809 esac
15810 fi
15811@@ -5955,7 +6865,7 @@ func_mode_link ()
15812 if test -n "$add_shlibpath"; then
15813 case :$compile_shlibpath: in
15814 *":$add_shlibpath:"*) ;;
15815- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15816+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15817 esac
15818 fi
15819 if test "$linkmode" = prog; then
15820@@ -5969,13 +6879,13 @@ func_mode_link ()
15821 test "$hardcode_shlibpath_var" = yes; then
15822 case :$finalize_shlibpath: in
15823 *":$libdir:"*) ;;
15824- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15825+ *) func_append finalize_shlibpath "$libdir:" ;;
15826 esac
15827 fi
15828 fi
15829 fi
15830
15831- if test "$linkmode" = prog || test "$mode" = relink; then
15832+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15833 add_shlibpath=
15834 add_dir=
15835 add=
15836@@ -5989,7 +6899,7 @@ func_mode_link ()
15837 elif test "$hardcode_shlibpath_var" = yes; then
15838 case :$finalize_shlibpath: in
15839 *":$libdir:"*) ;;
15840- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15841+ *) func_append finalize_shlibpath "$libdir:" ;;
15842 esac
15843 add="-l$name"
15844 elif test "$hardcode_automatic" = yes; then
15845@@ -6001,12 +6911,12 @@ func_mode_link ()
15846 fi
15847 else
15848 # We cannot seem to hardcode it, guess we'll fake it.
15849- add_dir="-L$libdir"
15850+ add_dir="-L$lt_sysroot$libdir"
15851 # Try looking first in the location we're being installed to.
15852 if test -n "$inst_prefix_dir"; then
15853 case $libdir in
15854 [\\/]*)
15855- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15856+ func_append add_dir " -L$inst_prefix_dir$libdir"
15857 ;;
15858 esac
15859 fi
15860@@ -6083,27 +6993,33 @@ func_mode_link ()
15861 temp_xrpath=$func_stripname_result
15862 case " $xrpath " in
15863 *" $temp_xrpath "*) ;;
15864- *) xrpath="$xrpath $temp_xrpath";;
15865+ *) func_append xrpath " $temp_xrpath";;
15866 esac;;
15867- *) temp_deplibs="$temp_deplibs $libdir";;
15868+ *) func_append temp_deplibs " $libdir";;
15869 esac
15870 done
15871 dependency_libs="$temp_deplibs"
15872 fi
15873
15874- newlib_search_path="$newlib_search_path $absdir"
15875+ func_append newlib_search_path " $absdir"
15876 # Link against this library
15877 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
15878 # ... and its dependency_libs
15879 tmp_libs=
15880 for deplib in $dependency_libs; do
15881 newdependency_libs="$deplib $newdependency_libs"
15882- if $opt_duplicate_deps ; then
15883+ case $deplib in
15884+ -L*) func_stripname '-L' '' "$deplib"
15885+ func_resolve_sysroot "$func_stripname_result";;
15886+ *) func_resolve_sysroot "$deplib" ;;
15887+ esac
15888+ if $opt_preserve_dup_deps ; then
15889 case "$tmp_libs " in
15890- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15891+ *" $func_resolve_sysroot_result "*)
15892+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
15893 esac
15894 fi
15895- tmp_libs="$tmp_libs $deplib"
15896+ func_append tmp_libs " $func_resolve_sysroot_result"
15897 done
15898
15899 if test "$link_all_deplibs" != no; then
15900@@ -6113,8 +7029,10 @@ func_mode_link ()
15901 case $deplib in
15902 -L*) path="$deplib" ;;
15903 *.la)
15904+ func_resolve_sysroot "$deplib"
15905+ deplib=$func_resolve_sysroot_result
15906 func_dirname "$deplib" "" "."
15907- dir="$func_dirname_result"
15908+ dir=$func_dirname_result
15909 # We need an absolute path.
15910 case $dir in
15911 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
15912@@ -6130,7 +7048,7 @@ func_mode_link ()
15913 case $host in
15914 *-*-darwin*)
15915 depdepl=
15916- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15917+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15918 if test -n "$deplibrary_names" ; then
15919 for tmp in $deplibrary_names ; do
15920 depdepl=$tmp
15921@@ -6141,8 +7059,8 @@ func_mode_link ()
15922 if test -z "$darwin_install_name"; then
15923 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
15924 fi
15925- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15926- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
15927+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15928+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
15929 path=
15930 fi
15931 fi
15932@@ -6152,7 +7070,7 @@ func_mode_link ()
15933 ;;
15934 esac
15935 else
15936- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15937+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15938 test -z "$libdir" && \
15939 func_fatal_error "\`$deplib' is not a valid libtool archive"
15940 test "$absdir" != "$libdir" && \
15941@@ -6192,7 +7110,7 @@ func_mode_link ()
15942 for dir in $newlib_search_path; do
15943 case "$lib_search_path " in
15944 *" $dir "*) ;;
15945- *) lib_search_path="$lib_search_path $dir" ;;
15946+ *) func_append lib_search_path " $dir" ;;
15947 esac
15948 done
15949 newlib_search_path=
15950@@ -6205,7 +7123,7 @@ func_mode_link ()
15951 fi
15952 for var in $vars dependency_libs; do
15953 # Add libraries to $var in reverse order
15954- eval tmp_libs=\$$var
15955+ eval tmp_libs=\"\$$var\"
15956 new_libs=
15957 for deplib in $tmp_libs; do
15958 # FIXME: Pedantically, this is the right thing to do, so
15959@@ -6250,13 +7168,13 @@ func_mode_link ()
15960 -L*)
15961 case " $tmp_libs " in
15962 *" $deplib "*) ;;
15963- *) tmp_libs="$tmp_libs $deplib" ;;
15964+ *) func_append tmp_libs " $deplib" ;;
15965 esac
15966 ;;
15967- *) tmp_libs="$tmp_libs $deplib" ;;
15968+ *) func_append tmp_libs " $deplib" ;;
15969 esac
15970 done
15971- eval $var=\$tmp_libs
15972+ eval $var=\"$tmp_libs\"
15973 done # for var
15974 fi
15975 # Last step: remove runtime libs from dependency_libs
15976@@ -6269,7 +7187,7 @@ func_mode_link ()
15977 ;;
15978 esac
15979 if test -n "$i" ; then
15980- tmp_libs="$tmp_libs $i"
15981+ func_append tmp_libs " $i"
15982 fi
15983 done
15984 dependency_libs=$tmp_libs
15985@@ -6310,7 +7228,7 @@ func_mode_link ()
15986 # Now set the variables for building old libraries.
15987 build_libtool_libs=no
15988 oldlibs="$output"
15989- objs="$objs$old_deplibs"
15990+ func_append objs "$old_deplibs"
15991 ;;
15992
15993 lib)
15994@@ -6319,8 +7237,8 @@ func_mode_link ()
15995 lib*)
15996 func_stripname 'lib' '.la' "$outputname"
15997 name=$func_stripname_result
15998- eval "shared_ext=\"$shrext_cmds\""
15999- eval "libname=\"$libname_spec\""
16000+ eval shared_ext=\"$shrext_cmds\"
16001+ eval libname=\"$libname_spec\"
16002 ;;
16003 *)
16004 test "$module" = no && \
16005@@ -6330,8 +7248,8 @@ func_mode_link ()
16006 # Add the "lib" prefix for modules if required
16007 func_stripname '' '.la' "$outputname"
16008 name=$func_stripname_result
16009- eval "shared_ext=\"$shrext_cmds\""
16010- eval "libname=\"$libname_spec\""
16011+ eval shared_ext=\"$shrext_cmds\"
16012+ eval libname=\"$libname_spec\"
16013 else
16014 func_stripname '' '.la' "$outputname"
16015 libname=$func_stripname_result
16016@@ -6346,7 +7264,7 @@ func_mode_link ()
16017 echo
16018 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16019 $ECHO "*** objects $objs is not portable!"
16020- libobjs="$libobjs $objs"
16021+ func_append libobjs " $objs"
16022 fi
16023 fi
16024
16025@@ -6544,7 +7462,7 @@ func_mode_link ()
16026 done
16027
16028 # Make executables depend on our current version.
16029- verstring="$verstring:${current}.0"
16030+ func_append verstring ":${current}.0"
16031 ;;
16032
16033 qnx)
16034@@ -6612,10 +7530,10 @@ func_mode_link ()
16035 fi
16036
16037 func_generate_dlsyms "$libname" "$libname" "yes"
16038- libobjs="$libobjs $symfileobj"
16039+ func_append libobjs " $symfileobj"
16040 test "X$libobjs" = "X " && libobjs=
16041
16042- if test "$mode" != relink; then
16043+ if test "$opt_mode" != relink; then
16044 # Remove our outputs, but don't remove object files since they
16045 # may have been created when compiling PIC objects.
16046 removelist=
16047@@ -6631,7 +7549,7 @@ func_mode_link ()
16048 continue
16049 fi
16050 fi
16051- removelist="$removelist $p"
16052+ func_append removelist " $p"
16053 ;;
16054 *) ;;
16055 esac
16056@@ -6642,7 +7560,7 @@ func_mode_link ()
16057
16058 # Now set the variables for building old libraries.
16059 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16060- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16061+ func_append oldlibs " $output_objdir/$libname.$libext"
16062
16063 # Transform .lo files to .o files.
16064 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16065@@ -6659,10 +7577,11 @@ func_mode_link ()
16066 # If the user specified any rpath flags, then add them.
16067 temp_xrpath=
16068 for libdir in $xrpath; do
16069- temp_xrpath="$temp_xrpath -R$libdir"
16070+ func_replace_sysroot "$libdir"
16071+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16072 case "$finalize_rpath " in
16073 *" $libdir "*) ;;
16074- *) finalize_rpath="$finalize_rpath $libdir" ;;
16075+ *) func_append finalize_rpath " $libdir" ;;
16076 esac
16077 done
16078 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16079@@ -6676,7 +7595,7 @@ func_mode_link ()
16080 for lib in $old_dlfiles; do
16081 case " $dlprefiles $dlfiles " in
16082 *" $lib "*) ;;
16083- *) dlfiles="$dlfiles $lib" ;;
16084+ *) func_append dlfiles " $lib" ;;
16085 esac
16086 done
16087
16088@@ -6686,7 +7605,7 @@ func_mode_link ()
16089 for lib in $old_dlprefiles; do
16090 case "$dlprefiles " in
16091 *" $lib "*) ;;
16092- *) dlprefiles="$dlprefiles $lib" ;;
16093+ *) func_append dlprefiles " $lib" ;;
16094 esac
16095 done
16096
16097@@ -6698,7 +7617,7 @@ func_mode_link ()
16098 ;;
16099 *-*-rhapsody* | *-*-darwin1.[012])
16100 # Rhapsody C library is in the System framework
16101- deplibs="$deplibs System.ltframework"
16102+ func_append deplibs " System.ltframework"
16103 ;;
16104 *-*-netbsd*)
16105 # Don't link with libc until the a.out ld.so is fixed.
16106@@ -6715,7 +7634,7 @@ func_mode_link ()
16107 *)
16108 # Add libc to deplibs on all other systems if necessary.
16109 if test "$build_libtool_need_lc" = "yes"; then
16110- deplibs="$deplibs -lc"
16111+ func_append deplibs " -lc"
16112 fi
16113 ;;
16114 esac
16115@@ -6764,18 +7683,18 @@ EOF
16116 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16117 case " $predeps $postdeps " in
16118 *" $i "*)
16119- newdeplibs="$newdeplibs $i"
16120+ func_append newdeplibs " $i"
16121 i=""
16122 ;;
16123 esac
16124 fi
16125 if test -n "$i" ; then
16126- eval "libname=\"$libname_spec\""
16127- eval "deplib_matches=\"$library_names_spec\""
16128+ libname=`eval "\\$ECHO \"$libname_spec\""`
16129+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16130 set dummy $deplib_matches; shift
16131 deplib_match=$1
16132 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16133- newdeplibs="$newdeplibs $i"
16134+ func_append newdeplibs " $i"
16135 else
16136 droppeddeps=yes
16137 echo
16138@@ -6789,7 +7708,7 @@ EOF
16139 fi
16140 ;;
16141 *)
16142- newdeplibs="$newdeplibs $i"
16143+ func_append newdeplibs " $i"
16144 ;;
16145 esac
16146 done
16147@@ -6807,18 +7726,18 @@ EOF
16148 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16149 case " $predeps $postdeps " in
16150 *" $i "*)
16151- newdeplibs="$newdeplibs $i"
16152+ func_append newdeplibs " $i"
16153 i=""
16154 ;;
16155 esac
16156 fi
16157 if test -n "$i" ; then
16158- eval "libname=\"$libname_spec\""
16159- eval "deplib_matches=\"$library_names_spec\""
16160+ libname=`eval "\\$ECHO \"$libname_spec\""`
16161+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16162 set dummy $deplib_matches; shift
16163 deplib_match=$1
16164 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16165- newdeplibs="$newdeplibs $i"
16166+ func_append newdeplibs " $i"
16167 else
16168 droppeddeps=yes
16169 echo
16170@@ -6840,7 +7759,7 @@ EOF
16171 fi
16172 ;;
16173 *)
16174- newdeplibs="$newdeplibs $i"
16175+ func_append newdeplibs " $i"
16176 ;;
16177 esac
16178 done
16179@@ -6857,15 +7776,27 @@ EOF
16180 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16181 case " $predeps $postdeps " in
16182 *" $a_deplib "*)
16183- newdeplibs="$newdeplibs $a_deplib"
16184+ func_append newdeplibs " $a_deplib"
16185 a_deplib=""
16186 ;;
16187 esac
16188 fi
16189 if test -n "$a_deplib" ; then
16190- eval "libname=\"$libname_spec\""
16191+ libname=`eval "\\$ECHO \"$libname_spec\""`
16192+ if test -n "$file_magic_glob"; then
16193+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16194+ else
16195+ libnameglob=$libname
16196+ fi
16197+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16198 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16199- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16200+ if test "$want_nocaseglob" = yes; then
16201+ shopt -s nocaseglob
16202+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16203+ $nocaseglob
16204+ else
16205+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16206+ fi
16207 for potent_lib in $potential_libs; do
16208 # Follow soft links.
16209 if ls -lLd "$potent_lib" 2>/dev/null |
16210@@ -6885,10 +7816,10 @@ EOF
16211 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16212 esac
16213 done
16214- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16215+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16216 $SED -e 10q |
16217 $EGREP "$file_magic_regex" > /dev/null; then
16218- newdeplibs="$newdeplibs $a_deplib"
16219+ func_append newdeplibs " $a_deplib"
16220 a_deplib=""
16221 break 2
16222 fi
16223@@ -6913,7 +7844,7 @@ EOF
16224 ;;
16225 *)
16226 # Add a -L argument.
16227- newdeplibs="$newdeplibs $a_deplib"
16228+ func_append newdeplibs " $a_deplib"
16229 ;;
16230 esac
16231 done # Gone through all deplibs.
16232@@ -6929,20 +7860,20 @@ EOF
16233 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16234 case " $predeps $postdeps " in
16235 *" $a_deplib "*)
16236- newdeplibs="$newdeplibs $a_deplib"
16237+ func_append newdeplibs " $a_deplib"
16238 a_deplib=""
16239 ;;
16240 esac
16241 fi
16242 if test -n "$a_deplib" ; then
16243- eval "libname=\"$libname_spec\""
16244+ libname=`eval "\\$ECHO \"$libname_spec\""`
16245 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16246 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16247 for potent_lib in $potential_libs; do
16248 potlib="$potent_lib" # see symlink-check above in file_magic test
16249 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16250 $EGREP "$match_pattern_regex" > /dev/null; then
16251- newdeplibs="$newdeplibs $a_deplib"
16252+ func_append newdeplibs " $a_deplib"
16253 a_deplib=""
16254 break 2
16255 fi
16256@@ -6967,7 +7898,7 @@ EOF
16257 ;;
16258 *)
16259 # Add a -L argument.
16260- newdeplibs="$newdeplibs $a_deplib"
16261+ func_append newdeplibs " $a_deplib"
16262 ;;
16263 esac
16264 done # Gone through all deplibs.
16265@@ -7071,7 +8002,7 @@ EOF
16266 *)
16267 case " $deplibs " in
16268 *" -L$path/$objdir "*)
16269- new_libs="$new_libs -L$path/$objdir" ;;
16270+ func_append new_libs " -L$path/$objdir" ;;
16271 esac
16272 ;;
16273 esac
16274@@ -7081,10 +8012,10 @@ EOF
16275 -L*)
16276 case " $new_libs " in
16277 *" $deplib "*) ;;
16278- *) new_libs="$new_libs $deplib" ;;
16279+ *) func_append new_libs " $deplib" ;;
16280 esac
16281 ;;
16282- *) new_libs="$new_libs $deplib" ;;
16283+ *) func_append new_libs " $deplib" ;;
16284 esac
16285 done
16286 deplibs="$new_libs"
16287@@ -7101,10 +8032,12 @@ EOF
16288 hardcode_libdirs=
16289 dep_rpath=
16290 rpath="$finalize_rpath"
16291- test "$mode" != relink && rpath="$compile_rpath$rpath"
16292+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16293 for libdir in $rpath; do
16294 if test -n "$hardcode_libdir_flag_spec"; then
16295 if test -n "$hardcode_libdir_separator"; then
16296+ func_replace_sysroot "$libdir"
16297+ libdir=$func_replace_sysroot_result
16298 if test -z "$hardcode_libdirs"; then
16299 hardcode_libdirs="$libdir"
16300 else
16301@@ -7113,18 +8046,18 @@ EOF
16302 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16303 ;;
16304 *)
16305- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16306+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16307 ;;
16308 esac
16309 fi
16310 else
16311- eval "flag=\"$hardcode_libdir_flag_spec\""
16312- dep_rpath="$dep_rpath $flag"
16313+ eval flag=\"$hardcode_libdir_flag_spec\"
16314+ func_append dep_rpath " $flag"
16315 fi
16316 elif test -n "$runpath_var"; then
16317 case "$perm_rpath " in
16318 *" $libdir "*) ;;
16319- *) perm_rpath="$perm_rpath $libdir" ;;
16320+ *) func_apped perm_rpath " $libdir" ;;
16321 esac
16322 fi
16323 done
16324@@ -7133,40 +8066,38 @@ EOF
16325 test -n "$hardcode_libdirs"; then
16326 libdir="$hardcode_libdirs"
16327 if test -n "$hardcode_libdir_flag_spec_ld"; then
16328- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16329+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16330 else
16331- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16332+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16333 fi
16334 fi
16335 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16336 # We should set the runpath_var.
16337 rpath=
16338 for dir in $perm_rpath; do
16339- rpath="$rpath$dir:"
16340+ func_append rpath "$dir:"
16341 done
16342- eval $runpath_var=\$rpath\$$runpath_var
16343- export $runpath_var
16344+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16345 fi
16346 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16347 fi
16348
16349 shlibpath="$finalize_shlibpath"
16350- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16351+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16352 if test -n "$shlibpath"; then
16353- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16354- export $shlibpath_var
16355+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16356 fi
16357
16358 # Get the real and link names of the library.
16359- eval "shared_ext=\"$shrext_cmds\""
16360- eval "library_names=\"$library_names_spec\""
16361+ eval shared_ext=\"$shrext_cmds\"
16362+ eval library_names=\"$library_names_spec\"
16363 set dummy $library_names
16364 shift
16365 realname="$1"
16366 shift
16367
16368 if test -n "$soname_spec"; then
16369- eval "soname=\"$soname_spec\""
16370+ eval soname=\"$soname_spec\"
16371 else
16372 soname="$realname"
16373 fi
16374@@ -7178,7 +8109,7 @@ EOF
16375 linknames=
16376 for link
16377 do
16378- linknames="$linknames $link"
16379+ func_append linknames " $link"
16380 done
16381
16382 # Use standard objects if they are pic
16383@@ -7189,7 +8120,7 @@ EOF
16384 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16385 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16386 export_symbols="$output_objdir/$libname.uexp"
16387- delfiles="$delfiles $export_symbols"
16388+ func_append delfiles " $export_symbols"
16389 fi
16390
16391 orig_export_symbols=
16392@@ -7220,13 +8151,45 @@ EOF
16393 $opt_dry_run || $RM $export_symbols
16394 cmds=$export_symbols_cmds
16395 save_ifs="$IFS"; IFS='~'
16396- for cmd in $cmds; do
16397+ for cmd1 in $cmds; do
16398 IFS="$save_ifs"
16399- eval "cmd=\"$cmd\""
16400- func_len " $cmd"
16401- len=$func_len_result
16402- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16403+ # Take the normal branch if the nm_file_list_spec branch
16404+ # doesn't work or if tool conversion is not needed.
16405+ case $nm_file_list_spec~$to_tool_file_cmd in
16406+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16407+ try_normal_branch=yes
16408+ eval cmd=\"$cmd1\"
16409+ func_len " $cmd"
16410+ len=$func_len_result
16411+ ;;
16412+ *)
16413+ try_normal_branch=no
16414+ ;;
16415+ esac
16416+ if test "$try_normal_branch" = yes \
16417+ && { test "$len" -lt "$max_cmd_len" \
16418+ || test "$max_cmd_len" -le -1; }
16419+ then
16420+ func_show_eval "$cmd" 'exit $?'
16421+ skipped_export=false
16422+ elif test -n "$nm_file_list_spec"; then
16423+ func_basename "$output"
16424+ output_la=$func_basename_result
16425+ save_libobjs=$libobjs
16426+ save_output=$output
16427+ output=${output_objdir}/${output_la}.nm
16428+ func_to_tool_file "$output"
16429+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16430+ func_append delfiles " $output"
16431+ func_verbose "creating $NM input file list: $output"
16432+ for obj in $save_libobjs; do
16433+ func_to_tool_file "$obj"
16434+ $ECHO "$func_to_tool_file_result"
16435+ done > "$output"
16436+ eval cmd=\"$cmd1\"
16437 func_show_eval "$cmd" 'exit $?'
16438+ output=$save_output
16439+ libobjs=$save_libobjs
16440 skipped_export=false
16441 else
16442 # The command line is too long to execute in one step.
16443@@ -7248,7 +8211,7 @@ EOF
16444 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16445 tmp_export_symbols="$export_symbols"
16446 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16447- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16448+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16449 fi
16450
16451 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16452@@ -7260,7 +8223,7 @@ EOF
16453 # global variables. join(1) would be nice here, but unfortunately
16454 # isn't a blessed tool.
16455 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16456- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16457+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16458 export_symbols=$output_objdir/$libname.def
16459 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16460 fi
16461@@ -7270,7 +8233,7 @@ EOF
16462 case " $convenience " in
16463 *" $test_deplib "*) ;;
16464 *)
16465- tmp_deplibs="$tmp_deplibs $test_deplib"
16466+ func_append tmp_deplibs " $test_deplib"
16467 ;;
16468 esac
16469 done
16470@@ -7286,43 +8249,43 @@ EOF
16471 fi
16472 if test -n "$whole_archive_flag_spec"; then
16473 save_libobjs=$libobjs
16474- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16475+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16476 test "X$libobjs" = "X " && libobjs=
16477 else
16478 gentop="$output_objdir/${outputname}x"
16479- generated="$generated $gentop"
16480+ func_append generated " $gentop"
16481
16482 func_extract_archives $gentop $convenience
16483- libobjs="$libobjs $func_extract_archives_result"
16484+ func_append libobjs " $func_extract_archives_result"
16485 test "X$libobjs" = "X " && libobjs=
16486 fi
16487 fi
16488
16489 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16490- eval "flag=\"$thread_safe_flag_spec\""
16491- linker_flags="$linker_flags $flag"
16492+ eval flag=\"$thread_safe_flag_spec\"
16493+ func_append linker_flags " $flag"
16494 fi
16495
16496 # Make a backup of the uninstalled library when relinking
16497- if test "$mode" = relink; then
16498- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16499+ if test "$opt_mode" = relink; then
16500+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16501 fi
16502
16503 # Do each of the archive commands.
16504 if test "$module" = yes && test -n "$module_cmds" ; then
16505 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16506- eval "test_cmds=\"$module_expsym_cmds\""
16507+ eval test_cmds=\"$module_expsym_cmds\"
16508 cmds=$module_expsym_cmds
16509 else
16510- eval "test_cmds=\"$module_cmds\""
16511+ eval test_cmds=\"$module_cmds\"
16512 cmds=$module_cmds
16513 fi
16514 else
16515 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16516- eval "test_cmds=\"$archive_expsym_cmds\""
16517+ eval test_cmds=\"$archive_expsym_cmds\"
16518 cmds=$archive_expsym_cmds
16519 else
16520- eval "test_cmds=\"$archive_cmds\""
16521+ eval test_cmds=\"$archive_cmds\"
16522 cmds=$archive_cmds
16523 fi
16524 fi
16525@@ -7366,10 +8329,13 @@ EOF
16526 echo 'INPUT (' > $output
16527 for obj in $save_libobjs
16528 do
16529- $ECHO "$obj" >> $output
16530+ func_to_tool_file "$obj"
16531+ $ECHO "$func_to_tool_file_result" >> $output
16532 done
16533 echo ')' >> $output
16534- delfiles="$delfiles $output"
16535+ func_append delfiles " $output"
16536+ func_to_tool_file "$output"
16537+ output=$func_to_tool_file_result
16538 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16539 output=${output_objdir}/${output_la}.lnk
16540 func_verbose "creating linker input file list: $output"
16541@@ -7383,15 +8349,17 @@ EOF
16542 fi
16543 for obj
16544 do
16545- $ECHO "$obj" >> $output
16546+ func_to_tool_file "$obj"
16547+ $ECHO "$func_to_tool_file_result" >> $output
16548 done
16549- delfiles="$delfiles $output"
16550- output=$firstobj\"$file_list_spec$output\"
16551+ func_append delfiles " $output"
16552+ func_to_tool_file "$output"
16553+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16554 else
16555 if test -n "$save_libobjs"; then
16556 func_verbose "creating reloadable object files..."
16557 output=$output_objdir/$output_la-${k}.$objext
16558- eval "test_cmds=\"$reload_cmds\""
16559+ eval test_cmds=\"$reload_cmds\"
16560 func_len " $test_cmds"
16561 len0=$func_len_result
16562 len=$len0
16563@@ -7411,12 +8379,12 @@ EOF
16564 if test "$k" -eq 1 ; then
16565 # The first file doesn't have a previous command to add.
16566 reload_objs=$objlist
16567- eval "concat_cmds=\"$reload_cmds\""
16568+ eval concat_cmds=\"$reload_cmds\"
16569 else
16570 # All subsequent reloadable object files will link in
16571 # the last one created.
16572 reload_objs="$objlist $last_robj"
16573- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16574+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16575 fi
16576 last_robj=$output_objdir/$output_la-${k}.$objext
16577 func_arith $k + 1
16578@@ -7433,11 +8401,11 @@ EOF
16579 # files will link in the last one created.
16580 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16581 reload_objs="$objlist $last_robj"
16582- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16583+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16584 if test -n "$last_robj"; then
16585- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16586+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16587 fi
16588- delfiles="$delfiles $output"
16589+ func_append delfiles " $output"
16590
16591 else
16592 output=
16593@@ -7450,9 +8418,9 @@ EOF
16594 libobjs=$output
16595 # Append the command to create the export file.
16596 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16597- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16598+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16599 if test -n "$last_robj"; then
16600- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16601+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16602 fi
16603 fi
16604
16605@@ -7471,7 +8439,7 @@ EOF
16606 lt_exit=$?
16607
16608 # Restore the uninstalled library and exit
16609- if test "$mode" = relink; then
16610+ if test "$opt_mode" = relink; then
16611 ( cd "$output_objdir" && \
16612 $RM "${realname}T" && \
16613 $MV "${realname}U" "$realname" )
16614@@ -7492,7 +8460,7 @@ EOF
16615 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16616 tmp_export_symbols="$export_symbols"
16617 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16618- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16619+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16620 fi
16621
16622 if test -n "$orig_export_symbols"; then
16623@@ -7504,7 +8472,7 @@ EOF
16624 # global variables. join(1) would be nice here, but unfortunately
16625 # isn't a blessed tool.
16626 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16627- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16628+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16629 export_symbols=$output_objdir/$libname.def
16630 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16631 fi
16632@@ -7515,7 +8483,7 @@ EOF
16633 output=$save_output
16634
16635 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16636- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16637+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16638 test "X$libobjs" = "X " && libobjs=
16639 fi
16640 # Expand the library linking commands again to reset the
16641@@ -7539,23 +8507,23 @@ EOF
16642
16643 if test -n "$delfiles"; then
16644 # Append the command to remove temporary files to $cmds.
16645- eval "cmds=\"\$cmds~\$RM $delfiles\""
16646+ eval cmds=\"\$cmds~\$RM $delfiles\"
16647 fi
16648
16649 # Add any objects from preloaded convenience libraries
16650 if test -n "$dlprefiles"; then
16651 gentop="$output_objdir/${outputname}x"
16652- generated="$generated $gentop"
16653+ func_append generated " $gentop"
16654
16655 func_extract_archives $gentop $dlprefiles
16656- libobjs="$libobjs $func_extract_archives_result"
16657+ func_append libobjs " $func_extract_archives_result"
16658 test "X$libobjs" = "X " && libobjs=
16659 fi
16660
16661 save_ifs="$IFS"; IFS='~'
16662 for cmd in $cmds; do
16663 IFS="$save_ifs"
16664- eval "cmd=\"$cmd\""
16665+ eval cmd=\"$cmd\"
16666 $opt_silent || {
16667 func_quote_for_expand "$cmd"
16668 eval "func_echo $func_quote_for_expand_result"
16669@@ -7564,7 +8532,7 @@ EOF
16670 lt_exit=$?
16671
16672 # Restore the uninstalled library and exit
16673- if test "$mode" = relink; then
16674+ if test "$opt_mode" = relink; then
16675 ( cd "$output_objdir" && \
16676 $RM "${realname}T" && \
16677 $MV "${realname}U" "$realname" )
16678@@ -7576,8 +8544,8 @@ EOF
16679 IFS="$save_ifs"
16680
16681 # Restore the uninstalled library and exit
16682- if test "$mode" = relink; then
16683- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16684+ if test "$opt_mode" = relink; then
16685+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16686
16687 if test -n "$convenience"; then
16688 if test -z "$whole_archive_flag_spec"; then
16689@@ -7656,17 +8624,20 @@ EOF
16690
16691 if test -n "$convenience"; then
16692 if test -n "$whole_archive_flag_spec"; then
16693- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16694+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16695 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16696 else
16697 gentop="$output_objdir/${obj}x"
16698- generated="$generated $gentop"
16699+ func_append generated " $gentop"
16700
16701 func_extract_archives $gentop $convenience
16702 reload_conv_objs="$reload_objs $func_extract_archives_result"
16703 fi
16704 fi
16705
16706+ # If we're not building shared, we need to use non_pic_objs
16707+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16708+
16709 # Create the old-style object.
16710 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16711
16712@@ -7690,7 +8661,7 @@ EOF
16713 # Create an invalid libtool object if no PIC, so that we don't
16714 # accidentally link it into a program.
16715 # $show "echo timestamp > $libobj"
16716- # $opt_dry_run || echo timestamp > $libobj || exit $?
16717+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16718 exit $EXIT_SUCCESS
16719 fi
16720
16721@@ -7740,8 +8711,8 @@ EOF
16722 if test "$tagname" = CXX ; then
16723 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16724 10.[0123])
16725- compile_command="$compile_command ${wl}-bind_at_load"
16726- finalize_command="$finalize_command ${wl}-bind_at_load"
16727+ func_append compile_command " ${wl}-bind_at_load"
16728+ func_append finalize_command " ${wl}-bind_at_load"
16729 ;;
16730 esac
16731 fi
16732@@ -7761,7 +8732,7 @@ EOF
16733 *)
16734 case " $compile_deplibs " in
16735 *" -L$path/$objdir "*)
16736- new_libs="$new_libs -L$path/$objdir" ;;
16737+ func_append new_libs " -L$path/$objdir" ;;
16738 esac
16739 ;;
16740 esac
16741@@ -7771,17 +8742,17 @@ EOF
16742 -L*)
16743 case " $new_libs " in
16744 *" $deplib "*) ;;
16745- *) new_libs="$new_libs $deplib" ;;
16746+ *) func_append new_libs " $deplib" ;;
16747 esac
16748 ;;
16749- *) new_libs="$new_libs $deplib" ;;
16750+ *) func_append new_libs " $deplib" ;;
16751 esac
16752 done
16753 compile_deplibs="$new_libs"
16754
16755
16756- compile_command="$compile_command $compile_deplibs"
16757- finalize_command="$finalize_command $finalize_deplibs"
16758+ func_append compile_command " $compile_deplibs"
16759+ func_append finalize_command " $finalize_deplibs"
16760
16761 if test -n "$rpath$xrpath"; then
16762 # If the user specified any rpath flags, then add them.
16763@@ -7789,7 +8760,7 @@ EOF
16764 # This is the magic to use -rpath.
16765 case "$finalize_rpath " in
16766 *" $libdir "*) ;;
16767- *) finalize_rpath="$finalize_rpath $libdir" ;;
16768+ *) func_append finalize_rpath " $libdir" ;;
16769 esac
16770 done
16771 fi
16772@@ -7808,18 +8779,18 @@ EOF
16773 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16774 ;;
16775 *)
16776- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16777+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16778 ;;
16779 esac
16780 fi
16781 else
16782- eval "flag=\"$hardcode_libdir_flag_spec\""
16783- rpath="$rpath $flag"
16784+ eval flag=\"$hardcode_libdir_flag_spec\"
16785+ func_append rpath " $flag"
16786 fi
16787 elif test -n "$runpath_var"; then
16788 case "$perm_rpath " in
16789 *" $libdir "*) ;;
16790- *) perm_rpath="$perm_rpath $libdir" ;;
16791+ *) func_append perm_rpath " $libdir" ;;
16792 esac
16793 fi
16794 case $host in
16795@@ -7828,12 +8799,12 @@ EOF
16796 case :$dllsearchpath: in
16797 *":$libdir:"*) ;;
16798 ::) dllsearchpath=$libdir;;
16799- *) dllsearchpath="$dllsearchpath:$libdir";;
16800+ *) func_append dllsearchpath ":$libdir";;
16801 esac
16802 case :$dllsearchpath: in
16803 *":$testbindir:"*) ;;
16804 ::) dllsearchpath=$testbindir;;
16805- *) dllsearchpath="$dllsearchpath:$testbindir";;
16806+ *) func_append dllsearchpath ":$testbindir";;
16807 esac
16808 ;;
16809 esac
16810@@ -7842,7 +8813,7 @@ EOF
16811 if test -n "$hardcode_libdir_separator" &&
16812 test -n "$hardcode_libdirs"; then
16813 libdir="$hardcode_libdirs"
16814- eval "rpath=\" $hardcode_libdir_flag_spec\""
16815+ eval rpath=\" $hardcode_libdir_flag_spec\"
16816 fi
16817 compile_rpath="$rpath"
16818
16819@@ -7859,18 +8830,18 @@ EOF
16820 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16821 ;;
16822 *)
16823- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16824+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16825 ;;
16826 esac
16827 fi
16828 else
16829- eval "flag=\"$hardcode_libdir_flag_spec\""
16830- rpath="$rpath $flag"
16831+ eval flag=\"$hardcode_libdir_flag_spec\"
16832+ func_append rpath " $flag"
16833 fi
16834 elif test -n "$runpath_var"; then
16835 case "$finalize_perm_rpath " in
16836 *" $libdir "*) ;;
16837- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16838+ *) func_append finalize_perm_rpath " $libdir" ;;
16839 esac
16840 fi
16841 done
16842@@ -7878,7 +8849,7 @@ EOF
16843 if test -n "$hardcode_libdir_separator" &&
16844 test -n "$hardcode_libdirs"; then
16845 libdir="$hardcode_libdirs"
16846- eval "rpath=\" $hardcode_libdir_flag_spec\""
16847+ eval rpath=\" $hardcode_libdir_flag_spec\"
16848 fi
16849 finalize_rpath="$rpath"
16850
16851@@ -7921,6 +8892,12 @@ EOF
16852 exit_status=0
16853 func_show_eval "$link_command" 'exit_status=$?'
16854
16855+ if test -n "$postlink_cmds"; then
16856+ func_to_tool_file "$output"
16857+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16858+ func_execute_cmds "$postlink_cmds" 'exit $?'
16859+ fi
16860+
16861 # Delete the generated files.
16862 if test -f "$output_objdir/${outputname}S.${objext}"; then
16863 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16864@@ -7943,7 +8920,7 @@ EOF
16865 # We should set the runpath_var.
16866 rpath=
16867 for dir in $perm_rpath; do
16868- rpath="$rpath$dir:"
16869+ func_append rpath "$dir:"
16870 done
16871 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16872 fi
16873@@ -7951,7 +8928,7 @@ EOF
16874 # We should set the runpath_var.
16875 rpath=
16876 for dir in $finalize_perm_rpath; do
16877- rpath="$rpath$dir:"
16878+ func_append rpath "$dir:"
16879 done
16880 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
16881 fi
16882@@ -7966,6 +8943,13 @@ EOF
16883 $opt_dry_run || $RM $output
16884 # Link the executable and exit
16885 func_show_eval "$link_command" 'exit $?'
16886+
16887+ if test -n "$postlink_cmds"; then
16888+ func_to_tool_file "$output"
16889+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16890+ func_execute_cmds "$postlink_cmds" 'exit $?'
16891+ fi
16892+
16893 exit $EXIT_SUCCESS
16894 fi
16895
16896@@ -7999,6 +8983,12 @@ EOF
16897
16898 func_show_eval "$link_command" 'exit $?'
16899
16900+ if test -n "$postlink_cmds"; then
16901+ func_to_tool_file "$output_objdir/$outputname"
16902+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16903+ func_execute_cmds "$postlink_cmds" 'exit $?'
16904+ fi
16905+
16906 # Now create the wrapper script.
16907 func_verbose "creating $output"
16908
16909@@ -8096,7 +9086,7 @@ EOF
16910 else
16911 oldobjs="$old_deplibs $non_pic_objects"
16912 if test "$preload" = yes && test -f "$symfileobj"; then
16913- oldobjs="$oldobjs $symfileobj"
16914+ func_append oldobjs " $symfileobj"
16915 fi
16916 fi
16917 addlibs="$old_convenience"
16918@@ -8104,10 +9094,10 @@ EOF
16919
16920 if test -n "$addlibs"; then
16921 gentop="$output_objdir/${outputname}x"
16922- generated="$generated $gentop"
16923+ func_append generated " $gentop"
16924
16925 func_extract_archives $gentop $addlibs
16926- oldobjs="$oldobjs $func_extract_archives_result"
16927+ func_append oldobjs " $func_extract_archives_result"
16928 fi
16929
16930 # Do each command in the archive commands.
16931@@ -8118,10 +9108,10 @@ EOF
16932 # Add any objects from preloaded convenience libraries
16933 if test -n "$dlprefiles"; then
16934 gentop="$output_objdir/${outputname}x"
16935- generated="$generated $gentop"
16936+ func_append generated " $gentop"
16937
16938 func_extract_archives $gentop $dlprefiles
16939- oldobjs="$oldobjs $func_extract_archives_result"
16940+ func_append oldobjs " $func_extract_archives_result"
16941 fi
16942
16943 # POSIX demands no paths to be encoded in archives. We have
16944@@ -8139,7 +9129,7 @@ EOF
16945 else
16946 echo "copying selected object files to avoid basename conflicts..."
16947 gentop="$output_objdir/${outputname}x"
16948- generated="$generated $gentop"
16949+ func_append generated " $gentop"
16950 func_mkdir_p "$gentop"
16951 save_oldobjs=$oldobjs
16952 oldobjs=
16953@@ -8163,18 +9153,28 @@ EOF
16954 esac
16955 done
16956 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
16957- oldobjs="$oldobjs $gentop/$newobj"
16958+ func_append oldobjs " $gentop/$newobj"
16959 ;;
16960- *) oldobjs="$oldobjs $obj" ;;
16961+ *) func_append oldobjs " $obj" ;;
16962 esac
16963 done
16964 fi
16965- eval "cmds=\"$old_archive_cmds\""
16966+ eval cmds=\"$old_archive_cmds\"
16967
16968 func_len " $cmds"
16969 len=$func_len_result
16970 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16971 cmds=$old_archive_cmds
16972+ elif test -n "$archiver_list_spec"; then
16973+ func_verbose "using command file archive linking..."
16974+ for obj in $oldobjs
16975+ do
16976+ func_to_tool_file "$obj"
16977+ $ECHO "$func_to_tool_file_result"
16978+ done > $output_objdir/$libname.libcmd
16979+ func_to_tool_file "$output_objdir/$libname.libcmd"
16980+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
16981+ cmds=$old_archive_cmds
16982 else
16983 # the command line is too long to link in one step, link in parts
16984 func_verbose "using piecewise archive linking..."
16985@@ -8189,7 +9189,7 @@ EOF
16986 do
16987 last_oldobj=$obj
16988 done
16989- eval "test_cmds=\"$old_archive_cmds\""
16990+ eval test_cmds=\"$old_archive_cmds\"
16991 func_len " $test_cmds"
16992 len0=$func_len_result
16993 len=$len0
16994@@ -8208,7 +9208,7 @@ EOF
16995 RANLIB=$save_RANLIB
16996 fi
16997 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16998- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
16999+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17000 objlist=
17001 len=$len0
17002 fi
17003@@ -8216,9 +9216,9 @@ EOF
17004 RANLIB=$save_RANLIB
17005 oldobjs=$objlist
17006 if test "X$oldobjs" = "X" ; then
17007- eval "cmds=\"\$concat_cmds\""
17008+ eval cmds=\"\$concat_cmds\"
17009 else
17010- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17011+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17012 fi
17013 fi
17014 fi
17015@@ -8268,12 +9268,23 @@ EOF
17016 *.la)
17017 func_basename "$deplib"
17018 name="$func_basename_result"
17019- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17020+ func_resolve_sysroot "$deplib"
17021+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17022 test -z "$libdir" && \
17023 func_fatal_error "\`$deplib' is not a valid libtool archive"
17024- newdependency_libs="$newdependency_libs $libdir/$name"
17025+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17026+ ;;
17027+ -L*)
17028+ func_stripname -L '' "$deplib"
17029+ func_replace_sysroot "$func_stripname_result"
17030+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17031 ;;
17032- *) newdependency_libs="$newdependency_libs $deplib" ;;
17033+ -R*)
17034+ func_stripname -R '' "$deplib"
17035+ func_replace_sysroot "$func_stripname_result"
17036+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17037+ ;;
17038+ *) func_append newdependency_libs " $deplib" ;;
17039 esac
17040 done
17041 dependency_libs="$newdependency_libs"
17042@@ -8284,12 +9295,14 @@ EOF
17043 *.la)
17044 func_basename "$lib"
17045 name="$func_basename_result"
17046- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17047+ func_resolve_sysroot "$lib"
17048+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17049+
17050 test -z "$libdir" && \
17051 func_fatal_error "\`$lib' is not a valid libtool archive"
17052- newdlfiles="$newdlfiles $libdir/$name"
17053+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17054 ;;
17055- *) newdlfiles="$newdlfiles $lib" ;;
17056+ *) func_append newdlfiles " $lib" ;;
17057 esac
17058 done
17059 dlfiles="$newdlfiles"
17060@@ -8303,10 +9316,11 @@ EOF
17061 # the library:
17062 func_basename "$lib"
17063 name="$func_basename_result"
17064- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17065+ func_resolve_sysroot "$lib"
17066+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17067 test -z "$libdir" && \
17068 func_fatal_error "\`$lib' is not a valid libtool archive"
17069- newdlprefiles="$newdlprefiles $libdir/$name"
17070+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17071 ;;
17072 esac
17073 done
17074@@ -8318,7 +9332,7 @@ EOF
17075 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17076 *) abs=`pwd`"/$lib" ;;
17077 esac
17078- newdlfiles="$newdlfiles $abs"
17079+ func_append newdlfiles " $abs"
17080 done
17081 dlfiles="$newdlfiles"
17082 newdlprefiles=
17083@@ -8327,7 +9341,7 @@ EOF
17084 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17085 *) abs=`pwd`"/$lib" ;;
17086 esac
17087- newdlprefiles="$newdlprefiles $abs"
17088+ func_append newdlprefiles " $abs"
17089 done
17090 dlprefiles="$newdlprefiles"
17091 fi
17092@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17093 exit $EXIT_SUCCESS
17094 }
17095
17096-{ test "$mode" = link || test "$mode" = relink; } &&
17097+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17098 func_mode_link ${1+"$@"}
17099
17100
17101@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17102 for arg
17103 do
17104 case $arg in
17105- -f) RM="$RM $arg"; rmforce=yes ;;
17106- -*) RM="$RM $arg" ;;
17107- *) files="$files $arg" ;;
17108+ -f) func_append RM " $arg"; rmforce=yes ;;
17109+ -*) func_append RM " $arg" ;;
17110+ *) func_append files " $arg" ;;
17111 esac
17112 done
17113
17114@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17115
17116 rmdirs=
17117
17118- origobjdir="$objdir"
17119 for file in $files; do
17120 func_dirname "$file" "" "."
17121 dir="$func_dirname_result"
17122 if test "X$dir" = X.; then
17123- objdir="$origobjdir"
17124+ odir="$objdir"
17125 else
17126- objdir="$dir/$origobjdir"
17127+ odir="$dir/$objdir"
17128 fi
17129 func_basename "$file"
17130 name="$func_basename_result"
17131- test "$mode" = uninstall && objdir="$dir"
17132+ test "$opt_mode" = uninstall && odir="$dir"
17133
17134- # Remember objdir for removal later, being careful to avoid duplicates
17135- if test "$mode" = clean; then
17136+ # Remember odir for removal later, being careful to avoid duplicates
17137+ if test "$opt_mode" = clean; then
17138 case " $rmdirs " in
17139- *" $objdir "*) ;;
17140- *) rmdirs="$rmdirs $objdir" ;;
17141+ *" $odir "*) ;;
17142+ *) func_append rmdirs " $odir" ;;
17143 esac
17144 fi
17145
17146@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17147
17148 # Delete the libtool libraries and symlinks.
17149 for n in $library_names; do
17150- rmfiles="$rmfiles $objdir/$n"
17151+ func_append rmfiles " $odir/$n"
17152 done
17153- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17154+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17155
17156- case "$mode" in
17157+ case "$opt_mode" in
17158 clean)
17159- case " $library_names " in
17160- # " " in the beginning catches empty $dlname
17161+ case " $library_names " in
17162 *" $dlname "*) ;;
17163- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17164+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17165 esac
17166- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17167+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17168 ;;
17169 uninstall)
17170 if test -n "$library_names"; then
17171@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17172 # Add PIC object to the list of files to remove.
17173 if test -n "$pic_object" &&
17174 test "$pic_object" != none; then
17175- rmfiles="$rmfiles $dir/$pic_object"
17176+ func_append rmfiles " $dir/$pic_object"
17177 fi
17178
17179 # Add non-PIC object to the list of files to remove.
17180 if test -n "$non_pic_object" &&
17181 test "$non_pic_object" != none; then
17182- rmfiles="$rmfiles $dir/$non_pic_object"
17183+ func_append rmfiles " $dir/$non_pic_object"
17184 fi
17185 fi
17186 ;;
17187
17188 *)
17189- if test "$mode" = clean ; then
17190+ if test "$opt_mode" = clean ; then
17191 noexename=$name
17192 case $file in
17193 *.exe)
17194@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17195 noexename=$func_stripname_result
17196 # $file with .exe has already been added to rmfiles,
17197 # add $file without .exe
17198- rmfiles="$rmfiles $file"
17199+ func_append rmfiles " $file"
17200 ;;
17201 esac
17202 # Do a test to see if this is a libtool program.
17203@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17204 func_ltwrapper_scriptname "$file"
17205 relink_command=
17206 func_source $func_ltwrapper_scriptname_result
17207- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17208+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17209 else
17210 relink_command=
17211 func_source $dir/$noexename
17212@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17213
17214 # note $name still contains .exe if it was in $file originally
17215 # as does the version of $file that was added into $rmfiles
17216- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17217+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17218 if test "$fast_install" = yes && test -n "$relink_command"; then
17219- rmfiles="$rmfiles $objdir/lt-$name"
17220+ func_append rmfiles " $odir/lt-$name"
17221 fi
17222 if test "X$noexename" != "X$name" ; then
17223- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17224+ func_append rmfiles " $odir/lt-${noexename}.c"
17225 fi
17226 fi
17227 fi
17228@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17229 esac
17230 func_show_eval "$RM $rmfiles" 'exit_status=1'
17231 done
17232- objdir="$origobjdir"
17233
17234 # Try to remove the ${objdir}s in the directories where we deleted files
17235 for dir in $rmdirs; do
17236@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17237 exit $exit_status
17238 }
17239
17240-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17241+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17242 func_mode_uninstall ${1+"$@"}
17243
17244-test -z "$mode" && {
17245+test -z "$opt_mode" && {
17246 help="$generic_help"
17247 func_fatal_help "you must specify a MODE"
17248 }
17249
17250 test -z "$exec_cmd" && \
17251- func_fatal_help "invalid operation mode \`$mode'"
17252+ func_fatal_help "invalid operation mode \`$opt_mode'"
17253
17254 if test -n "$exec_cmd"; then
17255 eval exec "$exec_cmd"
17256diff --git a/ltoptions.m4 b/ltoptions.m4
17257index 5ef12ced2a..17cfd51c0b 100644
17258--- a/ltoptions.m4
17259+++ b/ltoptions.m4
17260@@ -8,7 +8,7 @@
17261 # unlimited permission to copy and/or distribute it, with or without
17262 # modifications, as long as this notice is preserved.
17263
17264-# serial 6 ltoptions.m4
17265+# serial 7 ltoptions.m4
17266
17267 # This is to help aclocal find these macros, as it can't see m4_define.
17268 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17269diff --git a/ltversion.m4 b/ltversion.m4
17270index bf87f77132..9c7b5d4118 100644
17271--- a/ltversion.m4
17272+++ b/ltversion.m4
17273@@ -7,17 +7,17 @@
17274 # unlimited permission to copy and/or distribute it, with or without
17275 # modifications, as long as this notice is preserved.
17276
17277-# Generated from ltversion.in.
17278+# @configure_input@
17279
17280-# serial 3134 ltversion.m4
17281+# serial 3293 ltversion.m4
17282 # This file is part of GNU Libtool
17283
17284-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17285-m4_define([LT_PACKAGE_REVISION], [1.3134])
17286+m4_define([LT_PACKAGE_VERSION], [2.4])
17287+m4_define([LT_PACKAGE_REVISION], [1.3293])
17288
17289 AC_DEFUN([LTVERSION_VERSION],
17290-[macro_version='2.2.7a'
17291-macro_revision='1.3134'
17292+[macro_version='2.4'
17293+macro_revision='1.3293'
17294 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17295 _LT_DECL(, macro_revision, 0)
17296 ])
17297diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17298index bf92b5e079..c573da90c5 100644
17299--- a/lt~obsolete.m4
17300+++ b/lt~obsolete.m4
17301@@ -7,7 +7,7 @@
17302 # unlimited permission to copy and/or distribute it, with or without
17303 # modifications, as long as this notice is preserved.
17304
17305-# serial 4 lt~obsolete.m4
17306+# serial 5 lt~obsolete.m4
17307
17308 # These exist entirely to fool aclocal when bootstrapping libtool.
17309 #
17310diff --git a/opcodes/configure b/opcodes/configure
17311index 0b352a454d..7eaea7db73 100755
17312--- a/opcodes/configure
17313+++ b/opcodes/configure
17314@@ -650,6 +650,9 @@ OTOOL
17315 LIPO
17316 NMEDIT
17317 DSYMUTIL
17318+MANIFEST_TOOL
17319+ac_ct_AR
17320+DLLTOOL
17321 OBJDUMP
17322 LN_S
17323 NM
17324@@ -763,6 +766,7 @@ enable_static
17325 with_pic
17326 enable_fast_install
17327 with_gnu_ld
17328+with_libtool_sysroot
17329 enable_libtool_lock
17330 enable_targets
17331 enable_werror
17332@@ -1423,6 +1427,8 @@ Optional Packages:
17333 --with-pic try to use only PIC/non-PIC objects [default=use
17334 both]
17335 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17336+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17337+ (or the compiler's sysroot if not specified).
17338
17339 Some influential environment variables:
17340 CC C compiler command
17341@@ -5115,8 +5121,8 @@ esac
17342
17343
17344
17345-macro_version='2.2.7a'
17346-macro_revision='1.3134'
17347+macro_version='2.4'
17348+macro_revision='1.3293'
17349
17350
17351
17352@@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17353 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17354 $as_echo_n "checking how to print strings... " >&6; }
17355 # Test print first, because it will be a builtin if present.
17356-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17357+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17358 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17359 ECHO='print -r --'
17360 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17361@@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17362 # Try some XSI features
17363 xsi_shell=no
17364 ( _lt_dummy="a/b/c"
17365- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17366- = c,a/b,, \
17367+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17368+ = c,a/b,b/c, \
17369 && eval 'test $(( 1 + 1 )) -eq 2 \
17370 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17371 && xsi_shell=yes
17372@@ -5892,6 +5898,80 @@ esac
17373
17374
17375
17376+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17377+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17378+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
17379+ $as_echo_n "(cached) " >&6
17380+else
17381+ case $host in
17382+ *-*-mingw* )
17383+ case $build in
17384+ *-*-mingw* ) # actually msys
17385+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17386+ ;;
17387+ *-*-cygwin* )
17388+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17389+ ;;
17390+ * ) # otherwise, assume *nix
17391+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17392+ ;;
17393+ esac
17394+ ;;
17395+ *-*-cygwin* )
17396+ case $build in
17397+ *-*-mingw* ) # actually msys
17398+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17399+ ;;
17400+ *-*-cygwin* )
17401+ lt_cv_to_host_file_cmd=func_convert_file_noop
17402+ ;;
17403+ * ) # otherwise, assume *nix
17404+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17405+ ;;
17406+ esac
17407+ ;;
17408+ * ) # unhandled hosts (and "normal" native builds)
17409+ lt_cv_to_host_file_cmd=func_convert_file_noop
17410+ ;;
17411+esac
17412+
17413+fi
17414+
17415+to_host_file_cmd=$lt_cv_to_host_file_cmd
17416+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17417+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17418+
17419+
17420+
17421+
17422+
17423+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17424+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17425+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
17426+ $as_echo_n "(cached) " >&6
17427+else
17428+ #assume ordinary cross tools, or native build.
17429+lt_cv_to_tool_file_cmd=func_convert_file_noop
17430+case $host in
17431+ *-*-mingw* )
17432+ case $build in
17433+ *-*-mingw* ) # actually msys
17434+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17435+ ;;
17436+ esac
17437+ ;;
17438+esac
17439+
17440+fi
17441+
17442+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17443+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17444+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17445+
17446+
17447+
17448+
17449+
17450 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17451 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17452 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17453@@ -5908,6 +5988,11 @@ case $reload_flag in
17454 esac
17455 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17456 case $host_os in
17457+ cygwin* | mingw* | pw32* | cegcc*)
17458+ if test "$GCC" != yes; then
17459+ reload_cmds=false
17460+ fi
17461+ ;;
17462 darwin*)
17463 if test "$GCC" = yes; then
17464 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17465@@ -6076,7 +6161,8 @@ mingw* | pw32*)
17466 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17467 lt_cv_file_magic_cmd='func_win32_libid'
17468 else
17469- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17470+ # Keep this pattern in sync with the one in func_win32_libid.
17471+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17472 lt_cv_file_magic_cmd='$OBJDUMP -f'
17473 fi
17474 ;;
17475@@ -6230,6 +6316,21 @@ esac
17476 fi
17477 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17478 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17479+
17480+file_magic_glob=
17481+want_nocaseglob=no
17482+if test "$build" = "$host"; then
17483+ case $host_os in
17484+ mingw* | pw32*)
17485+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17486+ want_nocaseglob=yes
17487+ else
17488+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17489+ fi
17490+ ;;
17491+ esac
17492+fi
17493+
17494 file_magic_cmd=$lt_cv_file_magic_cmd
17495 deplibs_check_method=$lt_cv_deplibs_check_method
17496 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17497@@ -6245,9 +6346,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17498
17499
17500
17501+
17502+
17503+
17504+
17505+
17506+
17507+
17508+
17509+
17510+
17511 if test -n "$ac_tool_prefix"; then
17512- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17513-set dummy ${ac_tool_prefix}ar; ac_word=$2
17514+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17515+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17516+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17517+$as_echo_n "checking for $ac_word... " >&6; }
17518+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
17519+ $as_echo_n "(cached) " >&6
17520+else
17521+ if test -n "$DLLTOOL"; then
17522+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17523+else
17524+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17525+for as_dir in $PATH
17526+do
17527+ IFS=$as_save_IFS
17528+ test -z "$as_dir" && as_dir=.
17529+ for ac_exec_ext in '' $ac_executable_extensions; do
17530+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17531+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17532+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17533+ break 2
17534+ fi
17535+done
17536+ done
17537+IFS=$as_save_IFS
17538+
17539+fi
17540+fi
17541+DLLTOOL=$ac_cv_prog_DLLTOOL
17542+if test -n "$DLLTOOL"; then
17543+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17544+$as_echo "$DLLTOOL" >&6; }
17545+else
17546+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17547+$as_echo "no" >&6; }
17548+fi
17549+
17550+
17551+fi
17552+if test -z "$ac_cv_prog_DLLTOOL"; then
17553+ ac_ct_DLLTOOL=$DLLTOOL
17554+ # Extract the first word of "dlltool", so it can be a program name with args.
17555+set dummy dlltool; ac_word=$2
17556+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17557+$as_echo_n "checking for $ac_word... " >&6; }
17558+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17559+ $as_echo_n "(cached) " >&6
17560+else
17561+ if test -n "$ac_ct_DLLTOOL"; then
17562+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17563+else
17564+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17565+for as_dir in $PATH
17566+do
17567+ IFS=$as_save_IFS
17568+ test -z "$as_dir" && as_dir=.
17569+ for ac_exec_ext in '' $ac_executable_extensions; do
17570+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17571+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17572+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17573+ break 2
17574+ fi
17575+done
17576+ done
17577+IFS=$as_save_IFS
17578+
17579+fi
17580+fi
17581+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17582+if test -n "$ac_ct_DLLTOOL"; then
17583+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17584+$as_echo "$ac_ct_DLLTOOL" >&6; }
17585+else
17586+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17587+$as_echo "no" >&6; }
17588+fi
17589+
17590+ if test "x$ac_ct_DLLTOOL" = x; then
17591+ DLLTOOL="false"
17592+ else
17593+ case $cross_compiling:$ac_tool_warned in
17594+yes:)
17595+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17596+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17597+ac_tool_warned=yes ;;
17598+esac
17599+ DLLTOOL=$ac_ct_DLLTOOL
17600+ fi
17601+else
17602+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17603+fi
17604+
17605+test -z "$DLLTOOL" && DLLTOOL=dlltool
17606+
17607+
17608+
17609+
17610+
17611+
17612+
17613+
17614+
17615+
17616+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17617+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17618+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17619+ $as_echo_n "(cached) " >&6
17620+else
17621+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17622+
17623+case $host_os in
17624+cygwin* | mingw* | pw32* | cegcc*)
17625+ # two different shell functions defined in ltmain.sh
17626+ # decide which to use based on capabilities of $DLLTOOL
17627+ case `$DLLTOOL --help 2>&1` in
17628+ *--identify-strict*)
17629+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17630+ ;;
17631+ *)
17632+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17633+ ;;
17634+ esac
17635+ ;;
17636+*)
17637+ # fallback: assume linklib IS sharedlib
17638+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17639+ ;;
17640+esac
17641+
17642+fi
17643+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17644+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17645+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17646+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17647+
17648+
17649+
17650+
17651+
17652+
17653+
17654+if test -n "$ac_tool_prefix"; then
17655+ for ac_prog in ar
17656+ do
17657+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17658+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17660 $as_echo_n "checking for $ac_word... " >&6; }
17661 if test "${ac_cv_prog_AR+set}" = set; then :
17662@@ -6263,7 +6517,7 @@ do
17663 test -z "$as_dir" && as_dir=.
17664 for ac_exec_ext in '' $ac_executable_extensions; do
17665 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17666- ac_cv_prog_AR="${ac_tool_prefix}ar"
17667+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17668 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17669 break 2
17670 fi
17671@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; }
17672 fi
17673
17674
17675+ test -n "$AR" && break
17676+ done
17677 fi
17678-if test -z "$ac_cv_prog_AR"; then
17679+if test -z "$AR"; then
17680 ac_ct_AR=$AR
17681- # Extract the first word of "ar", so it can be a program name with args.
17682-set dummy ar; ac_word=$2
17683+ for ac_prog in ar
17684+do
17685+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17686+set dummy $ac_prog; ac_word=$2
17687 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17688 $as_echo_n "checking for $ac_word... " >&6; }
17689 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17690@@ -6303,7 +6561,7 @@ do
17691 test -z "$as_dir" && as_dir=.
17692 for ac_exec_ext in '' $ac_executable_extensions; do
17693 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17694- ac_cv_prog_ac_ct_AR="ar"
17695+ ac_cv_prog_ac_ct_AR="$ac_prog"
17696 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17697 break 2
17698 fi
17699@@ -6322,6 +6580,10 @@ else
17700 $as_echo "no" >&6; }
17701 fi
17702
17703+
17704+ test -n "$ac_ct_AR" && break
17705+done
17706+
17707 if test "x$ac_ct_AR" = x; then
17708 AR="false"
17709 else
17710@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;;
17711 esac
17712 AR=$ac_ct_AR
17713 fi
17714-else
17715- AR="$ac_cv_prog_AR"
17716 fi
17717
17718-test -z "$AR" && AR=ar
17719-test -z "$AR_FLAGS" && AR_FLAGS=cru
17720+: ${AR=ar}
17721+: ${AR_FLAGS=cru}
17722+
17723+
17724+
17725+
17726+
17727+
17728+
17729+
17730+
17731+
17732+
17733+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17734+$as_echo_n "checking for archiver @FILE support... " >&6; }
17735+if test "${lt_cv_ar_at_file+set}" = set; then :
17736+ $as_echo_n "(cached) " >&6
17737+else
17738+ lt_cv_ar_at_file=no
17739+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17740+/* end confdefs.h. */
17741+
17742+int
17743+main ()
17744+{
17745
17746+ ;
17747+ return 0;
17748+}
17749+_ACEOF
17750+if ac_fn_c_try_compile "$LINENO"; then :
17751+ echo conftest.$ac_objext > conftest.lst
17752+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17753+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17754+ (eval $lt_ar_try) 2>&5
17755+ ac_status=$?
17756+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17757+ test $ac_status = 0; }
17758+ if test "$ac_status" -eq 0; then
17759+ # Ensure the archiver fails upon bogus file names.
17760+ rm -f conftest.$ac_objext libconftest.a
17761+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17762+ (eval $lt_ar_try) 2>&5
17763+ ac_status=$?
17764+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17765+ test $ac_status = 0; }
17766+ if test "$ac_status" -ne 0; then
17767+ lt_cv_ar_at_file=@
17768+ fi
17769+ fi
17770+ rm -f conftest.* libconftest.a
17771
17772+fi
17773+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17774
17775+fi
17776+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17777+$as_echo "$lt_cv_ar_at_file" >&6; }
17778
17779+if test "x$lt_cv_ar_at_file" = xno; then
17780+ archiver_list_spec=
17781+else
17782+ archiver_list_spec=$lt_cv_ar_at_file
17783+fi
17784
17785
17786
17787@@ -6684,8 +7002,8 @@ esac
17788 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17789
17790 # Transform an extracted symbol line into symbol name and symbol address
17791-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17792-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
17793+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17794+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
17795
17796 # Handle CRLF in mingw tool chain
17797 opt_cr=
17798@@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do
17799 else
17800 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17801 fi
17802+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17803
17804 # Check to see that the pipe works correctly.
17805 pipe_works=no
17806@@ -6762,6 +7081,18 @@ _LT_EOF
17807 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17808 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17809 cat <<_LT_EOF > conftest.$ac_ext
17810+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17811+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17812+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17813+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17814+# define LT_DLSYM_CONST
17815+#elif defined(__osf__)
17816+/* This system does not cope well with relocations in const data. */
17817+# define LT_DLSYM_CONST
17818+#else
17819+# define LT_DLSYM_CONST const
17820+#endif
17821+
17822 #ifdef __cplusplus
17823 extern "C" {
17824 #endif
17825@@ -6773,7 +7104,7 @@ _LT_EOF
17826 cat <<_LT_EOF >> conftest.$ac_ext
17827
17828 /* The mapping between symbol names and symbols. */
17829-const struct {
17830+LT_DLSYM_CONST struct {
17831 const char *name;
17832 void *address;
17833 }
17834@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() {
17835 _LT_EOF
17836 # Now try linking the two files.
17837 mv conftest.$ac_objext conftstm.$ac_objext
17838- lt_save_LIBS="$LIBS"
17839- lt_save_CFLAGS="$CFLAGS"
17840+ lt_globsym_save_LIBS=$LIBS
17841+ lt_globsym_save_CFLAGS=$CFLAGS
17842 LIBS="conftstm.$ac_objext"
17843 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17844 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17845@@ -6810,8 +7141,8 @@ _LT_EOF
17846 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17847 pipe_works=yes
17848 fi
17849- LIBS="$lt_save_LIBS"
17850- CFLAGS="$lt_save_CFLAGS"
17851+ LIBS=$lt_globsym_save_LIBS
17852+ CFLAGS=$lt_globsym_save_CFLAGS
17853 else
17854 echo "cannot find nm_test_func in $nlist" >&5
17855 fi
17856@@ -6848,6 +7179,16 @@ else
17857 $as_echo "ok" >&6; }
17858 fi
17859
17860+# Response file support.
17861+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17862+ nm_file_list_spec='@'
17863+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17864+ nm_file_list_spec='@'
17865+fi
17866+
17867+
17868+
17869+
17870
17871
17872
17873@@ -6869,6 +7210,45 @@ fi
17874
17875
17876
17877+
17878+
17879+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17880+$as_echo_n "checking for sysroot... " >&6; }
17881+
17882+# Check whether --with-libtool-sysroot was given.
17883+if test "${with_libtool_sysroot+set}" = set; then :
17884+ withval=$with_libtool_sysroot;
17885+else
17886+ with_libtool_sysroot=no
17887+fi
17888+
17889+
17890+lt_sysroot=
17891+case ${with_libtool_sysroot} in #(
17892+ yes)
17893+ if test "$GCC" = yes; then
17894+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17895+ fi
17896+ ;; #(
17897+ /*)
17898+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17899+ ;; #(
17900+ no|'')
17901+ ;; #(
17902+ *)
17903+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17904+$as_echo "${with_libtool_sysroot}" >&6; }
17905+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17906+ ;;
17907+esac
17908+
17909+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17910+$as_echo "${lt_sysroot:-no}" >&6; }
17911+
17912+
17913+
17914+
17915+
17916 # Check whether --enable-libtool-lock was given.
17917 if test "${enable_libtool_lock+set}" = set; then :
17918 enableval=$enable_libtool_lock;
17919@@ -7075,6 +7455,123 @@ esac
17920
17921 need_locks="$enable_libtool_lock"
17922
17923+if test -n "$ac_tool_prefix"; then
17924+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17925+set dummy ${ac_tool_prefix}mt; ac_word=$2
17926+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17927+$as_echo_n "checking for $ac_word... " >&6; }
17928+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17929+ $as_echo_n "(cached) " >&6
17930+else
17931+ if test -n "$MANIFEST_TOOL"; then
17932+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17933+else
17934+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17935+for as_dir in $PATH
17936+do
17937+ IFS=$as_save_IFS
17938+ test -z "$as_dir" && as_dir=.
17939+ for ac_exec_ext in '' $ac_executable_extensions; do
17940+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17941+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17942+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17943+ break 2
17944+ fi
17945+done
17946+ done
17947+IFS=$as_save_IFS
17948+
17949+fi
17950+fi
17951+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17952+if test -n "$MANIFEST_TOOL"; then
17953+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17954+$as_echo "$MANIFEST_TOOL" >&6; }
17955+else
17956+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17957+$as_echo "no" >&6; }
17958+fi
17959+
17960+
17961+fi
17962+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17963+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17964+ # Extract the first word of "mt", so it can be a program name with args.
17965+set dummy mt; ac_word=$2
17966+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17967+$as_echo_n "checking for $ac_word... " >&6; }
17968+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17969+ $as_echo_n "(cached) " >&6
17970+else
17971+ if test -n "$ac_ct_MANIFEST_TOOL"; then
17972+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
17973+else
17974+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17975+for as_dir in $PATH
17976+do
17977+ IFS=$as_save_IFS
17978+ test -z "$as_dir" && as_dir=.
17979+ for ac_exec_ext in '' $ac_executable_extensions; do
17980+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17981+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17982+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17983+ break 2
17984+ fi
17985+done
17986+ done
17987+IFS=$as_save_IFS
17988+
17989+fi
17990+fi
17991+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
17992+if test -n "$ac_ct_MANIFEST_TOOL"; then
17993+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
17994+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
17995+else
17996+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17997+$as_echo "no" >&6; }
17998+fi
17999+
18000+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18001+ MANIFEST_TOOL=":"
18002+ else
18003+ case $cross_compiling:$ac_tool_warned in
18004+yes:)
18005+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18006+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18007+ac_tool_warned=yes ;;
18008+esac
18009+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18010+ fi
18011+else
18012+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18013+fi
18014+
18015+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18016+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18017+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18018+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
18019+ $as_echo_n "(cached) " >&6
18020+else
18021+ lt_cv_path_mainfest_tool=no
18022+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18023+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18024+ cat conftest.err >&5
18025+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18026+ lt_cv_path_mainfest_tool=yes
18027+ fi
18028+ rm -f conftest*
18029+fi
18030+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18031+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18032+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18033+ MANIFEST_TOOL=:
18034+fi
18035+
18036+
18037+
18038+
18039+
18040
18041 case $host_os in
18042 rhapsody* | darwin*)
18043@@ -7638,6 +8135,8 @@ _LT_EOF
18044 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18045 echo "$AR cru libconftest.a conftest.o" >&5
18046 $AR cru libconftest.a conftest.o 2>&5
18047+ echo "$RANLIB libconftest.a" >&5
18048+ $RANLIB libconftest.a 2>&5
18049 cat > conftest.c << _LT_EOF
18050 int main() { return 0;}
18051 _LT_EOF
18052@@ -7803,7 +8302,8 @@ fi
18053 LIBTOOL_DEPS="$ltmain"
18054
18055 # Always use our own libtool.
18056-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18057+LIBTOOL='$(SHELL) $(top_builddir)'
18058+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18059
18060
18061
18062@@ -7892,7 +8392,7 @@ aix3*)
18063 esac
18064
18065 # Global variables:
18066-ofile=libtool
18067+ofile=${host_alias}-libtool
18068 can_build_shared=yes
18069
18070 # All known linkers require a `.a' archive for static linking (except MSVC,
18071@@ -8190,8 +8690,6 @@ fi
18072 lt_prog_compiler_pic=
18073 lt_prog_compiler_static=
18074
18075-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18076-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18077
18078 if test "$GCC" = yes; then
18079 lt_prog_compiler_wl='-Wl,'
18080@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18081 lt_prog_compiler_pic='--shared'
18082 lt_prog_compiler_static='--static'
18083 ;;
18084+ nagfor*)
18085+ # NAG Fortran compiler
18086+ lt_prog_compiler_wl='-Wl,-Wl,,'
18087+ lt_prog_compiler_pic='-PIC'
18088+ lt_prog_compiler_static='-Bstatic'
18089+ ;;
18090 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18091 # Portland Group compilers (*not* the Pentium gcc compiler,
18092 # which looks to be a dead project)
18093@@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18094 lt_prog_compiler_pic='-KPIC'
18095 lt_prog_compiler_static='-Bstatic'
18096 case $cc_basename in
18097- f77* | f90* | f95*)
18098+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18099 lt_prog_compiler_wl='-Qoption ld ';;
18100 *)
18101 lt_prog_compiler_wl='-Wl,';;
18102@@ -8476,13 +8980,17 @@ case $host_os in
18103 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18104 ;;
18105 esac
18106-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18107-$as_echo "$lt_prog_compiler_pic" >&6; }
18108-
18109-
18110-
18111-
18112
18113+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18114+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18115+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
18116+ $as_echo_n "(cached) " >&6
18117+else
18118+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18119+fi
18120+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18121+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18122+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18123
18124 #
18125 # Check to make sure the PIC flag actually works.
18126@@ -8543,6 +9051,11 @@ fi
18127
18128
18129
18130+
18131+
18132+
18133+
18134+
18135 #
18136 # Check to make sure the static flag actually works.
18137 #
18138@@ -8893,7 +9406,8 @@ _LT_EOF
18139 allow_undefined_flag=unsupported
18140 always_export_symbols=no
18141 enable_shared_with_static_runtimes=yes
18142- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18143+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
18144+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18145
18146 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18147 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18148@@ -8992,12 +9506,12 @@ _LT_EOF
18149 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18150 hardcode_libdir_flag_spec=
18151 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18152- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18153+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18154 if test "x$supports_anon_versioning" = xyes; then
18155 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18156 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18157 echo "local: *; };" >> $output_objdir/$libname.ver~
18158- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18159+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18160 fi
18161 ;;
18162 esac
18163@@ -9011,8 +9525,8 @@ _LT_EOF
18164 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18165 wlarc=
18166 else
18167- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18168- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18169+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18170+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18171 fi
18172 ;;
18173
18174@@ -9030,8 +9544,8 @@ _LT_EOF
18175
18176 _LT_EOF
18177 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18178- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18179- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18180+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18181+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18182 else
18183 ld_shlibs=no
18184 fi
18185@@ -9077,8 +9591,8 @@ _LT_EOF
18186
18187 *)
18188 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18189- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18190- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18191+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18192+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18193 else
18194 ld_shlibs=no
18195 fi
18196@@ -9208,7 +9722,13 @@ _LT_EOF
18197 allow_undefined_flag='-berok'
18198 # Determine the default libpath from the value encoded in an
18199 # empty executable.
18200- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18201+ if test "${lt_cv_aix_libpath+set}" = set; then
18202+ aix_libpath=$lt_cv_aix_libpath
18203+else
18204+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18205+ $as_echo_n "(cached) " >&6
18206+else
18207+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18208 /* end confdefs.h. */
18209
18210 int
18211@@ -9221,22 +9741,29 @@ main ()
18212 _ACEOF
18213 if ac_fn_c_try_link "$LINENO"; then :
18214
18215-lt_aix_libpath_sed='
18216- /Import File Strings/,/^$/ {
18217- /^0/ {
18218- s/^0 *\(.*\)$/\1/
18219- p
18220- }
18221- }'
18222-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18223-# Check for a 64-bit object if we didn't find anything.
18224-if test -z "$aix_libpath"; then
18225- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18226-fi
18227+ lt_aix_libpath_sed='
18228+ /Import File Strings/,/^$/ {
18229+ /^0/ {
18230+ s/^0 *\([^ ]*\) *$/\1/
18231+ p
18232+ }
18233+ }'
18234+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18235+ # Check for a 64-bit object if we didn't find anything.
18236+ if test -z "$lt_cv_aix_libpath_"; then
18237+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18238+ fi
18239 fi
18240 rm -f core conftest.err conftest.$ac_objext \
18241 conftest$ac_exeext conftest.$ac_ext
18242-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18243+ if test -z "$lt_cv_aix_libpath_"; then
18244+ lt_cv_aix_libpath_="/usr/lib:/lib"
18245+ fi
18246+
18247+fi
18248+
18249+ aix_libpath=$lt_cv_aix_libpath_
18250+fi
18251
18252 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18253 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
18254@@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18255 else
18256 # Determine the default libpath from the value encoded in an
18257 # empty executable.
18258- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18259+ if test "${lt_cv_aix_libpath+set}" = set; then
18260+ aix_libpath=$lt_cv_aix_libpath
18261+else
18262+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18263+ $as_echo_n "(cached) " >&6
18264+else
18265+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18266 /* end confdefs.h. */
18267
18268 int
18269@@ -9261,22 +9794,29 @@ main ()
18270 _ACEOF
18271 if ac_fn_c_try_link "$LINENO"; then :
18272
18273-lt_aix_libpath_sed='
18274- /Import File Strings/,/^$/ {
18275- /^0/ {
18276- s/^0 *\(.*\)$/\1/
18277- p
18278- }
18279- }'
18280-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18281-# Check for a 64-bit object if we didn't find anything.
18282-if test -z "$aix_libpath"; then
18283- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18284-fi
18285+ lt_aix_libpath_sed='
18286+ /Import File Strings/,/^$/ {
18287+ /^0/ {
18288+ s/^0 *\([^ ]*\) *$/\1/
18289+ p
18290+ }
18291+ }'
18292+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18293+ # Check for a 64-bit object if we didn't find anything.
18294+ if test -z "$lt_cv_aix_libpath_"; then
18295+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18296+ fi
18297 fi
18298 rm -f core conftest.err conftest.$ac_objext \
18299 conftest$ac_exeext conftest.$ac_ext
18300-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18301+ if test -z "$lt_cv_aix_libpath_"; then
18302+ lt_cv_aix_libpath_="/usr/lib:/lib"
18303+ fi
18304+
18305+fi
18306+
18307+ aix_libpath=$lt_cv_aix_libpath_
18308+fi
18309
18310 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18311 # Warning - without using the other run time loading flags,
18312@@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18313 # Microsoft Visual C++.
18314 # hardcode_libdir_flag_spec is actually meaningless, as there is
18315 # no search path for DLLs.
18316- hardcode_libdir_flag_spec=' '
18317- allow_undefined_flag=unsupported
18318- # Tell ltmain to make .lib files, not .a files.
18319- libext=lib
18320- # Tell ltmain to make .dll files, not .so files.
18321- shrext_cmds=".dll"
18322- # FIXME: Setting linknames here is a bad hack.
18323- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18324- # The linker will automatically build a .lib file if we build a DLL.
18325- old_archive_from_new_cmds='true'
18326- # FIXME: Should let the user specify the lib program.
18327- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18328- fix_srcfile_path='`cygpath -w "$srcfile"`'
18329- enable_shared_with_static_runtimes=yes
18330+ case $cc_basename in
18331+ cl*)
18332+ # Native MSVC
18333+ hardcode_libdir_flag_spec=' '
18334+ allow_undefined_flag=unsupported
18335+ always_export_symbols=yes
18336+ file_list_spec='@'
18337+ # Tell ltmain to make .lib files, not .a files.
18338+ libext=lib
18339+ # Tell ltmain to make .dll files, not .so files.
18340+ shrext_cmds=".dll"
18341+ # FIXME: Setting linknames here is a bad hack.
18342+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18343+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18344+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18345+ else
18346+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18347+ fi~
18348+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18349+ linknames='
18350+ # The linker will not automatically build a static lib if we build a DLL.
18351+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18352+ enable_shared_with_static_runtimes=yes
18353+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18354+ # Don't use ranlib
18355+ old_postinstall_cmds='chmod 644 $oldlib'
18356+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18357+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18358+ case $lt_outputfile in
18359+ *.exe|*.EXE) ;;
18360+ *)
18361+ lt_outputfile="$lt_outputfile.exe"
18362+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18363+ ;;
18364+ esac~
18365+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18366+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18367+ $RM "$lt_outputfile.manifest";
18368+ fi'
18369+ ;;
18370+ *)
18371+ # Assume MSVC wrapper
18372+ hardcode_libdir_flag_spec=' '
18373+ allow_undefined_flag=unsupported
18374+ # Tell ltmain to make .lib files, not .a files.
18375+ libext=lib
18376+ # Tell ltmain to make .dll files, not .so files.
18377+ shrext_cmds=".dll"
18378+ # FIXME: Setting linknames here is a bad hack.
18379+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18380+ # The linker will automatically build a .lib file if we build a DLL.
18381+ old_archive_from_new_cmds='true'
18382+ # FIXME: Should let the user specify the lib program.
18383+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18384+ enable_shared_with_static_runtimes=yes
18385+ ;;
18386+ esac
18387 ;;
18388
18389 darwin* | rhapsody*)
18390@@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18391
18392 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18393 freebsd* | dragonfly*)
18394- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18395+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18396 hardcode_libdir_flag_spec='-R$libdir'
18397 hardcode_direct=yes
18398 hardcode_shlibpath_var=no
18399@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18400
18401 hpux9*)
18402 if test "$GCC" = yes; then
18403- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18404+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18405 else
18406 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18407 fi
18408@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18409
18410 hpux10*)
18411 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18412- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18413+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18414 else
18415 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18416 fi
18417@@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18418 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18419 ;;
18420 ia64*)
18421- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18422+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18423 ;;
18424 *)
18425- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18426+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18427 ;;
18428 esac
18429 else
18430@@ -9525,23 +10108,36 @@ fi
18431
18432 irix5* | irix6* | nonstopux*)
18433 if test "$GCC" = yes; then
18434- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18435+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18436 # Try to use the -exported_symbol ld option, if it does not
18437 # work, assume that -exports_file does not work either and
18438 # implicitly export all symbols.
18439- save_LDFLAGS="$LDFLAGS"
18440- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18441- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18442+ # This should be the same for all languages, so no per-tag cache variable.
18443+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18444+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18445+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
18446+ $as_echo_n "(cached) " >&6
18447+else
18448+ save_LDFLAGS="$LDFLAGS"
18449+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18450+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18451 /* end confdefs.h. */
18452-int foo(void) {}
18453+int foo (void) { return 0; }
18454 _ACEOF
18455 if ac_fn_c_try_link "$LINENO"; then :
18456- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
18457-
18458+ lt_cv_irix_exported_symbol=yes
18459+else
18460+ lt_cv_irix_exported_symbol=no
18461 fi
18462 rm -f core conftest.err conftest.$ac_objext \
18463 conftest$ac_exeext conftest.$ac_ext
18464- LDFLAGS="$save_LDFLAGS"
18465+ LDFLAGS="$save_LDFLAGS"
18466+fi
18467+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18468+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18469+ if test "$lt_cv_irix_exported_symbol" = yes; then
18470+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
18471+ fi
18472 else
18473 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
18474 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
18475@@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \
18476 osf4* | osf5*) # as osf3* with the addition of -msym flag
18477 if test "$GCC" = yes; then
18478 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18479- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18480+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18481 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18482 else
18483 allow_undefined_flag=' -expect_unresolved \*'
18484@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \
18485 no_undefined_flag=' -z defs'
18486 if test "$GCC" = yes; then
18487 wlarc='${wl}'
18488- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18489+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18490 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18491- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18492+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18493 else
18494 case `$CC -V 2>&1` in
18495 *"Compilers 5.0"*)
18496@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18497 need_version=no
18498 need_lib_prefix=no
18499
18500- case $GCC,$host_os in
18501- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18502+ case $GCC,$cc_basename in
18503+ yes,*)
18504+ # gcc
18505 library_names_spec='$libname.dll.a'
18506 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18507 postinstall_cmds='base_file=`basename \${file}`~
18508@@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18509 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18510 ;;
18511 esac
18512+ dynamic_linker='Win32 ld.exe'
18513+ ;;
18514+
18515+ *,cl*)
18516+ # Native MSVC
18517+ libname_spec='$name'
18518+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18519+ library_names_spec='${libname}.dll.lib'
18520+
18521+ case $build_os in
18522+ mingw*)
18523+ sys_lib_search_path_spec=
18524+ lt_save_ifs=$IFS
18525+ IFS=';'
18526+ for lt_path in $LIB
18527+ do
18528+ IFS=$lt_save_ifs
18529+ # Let DOS variable expansion print the short 8.3 style file name.
18530+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18531+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18532+ done
18533+ IFS=$lt_save_ifs
18534+ # Convert to MSYS style.
18535+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18536+ ;;
18537+ cygwin*)
18538+ # Convert to unix form, then to dos form, then back to unix form
18539+ # but this time dos style (no spaces!) so that the unix form looks
18540+ # like /cygdrive/c/PROGRA~1:/cygdr...
18541+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18542+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18543+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18544+ ;;
18545+ *)
18546+ sys_lib_search_path_spec="$LIB"
18547+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18548+ # It is most probably a Windows format PATH.
18549+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18550+ else
18551+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18552+ fi
18553+ # FIXME: find the short name or the path components, as spaces are
18554+ # common. (e.g. "Program Files" -> "PROGRA~1")
18555+ ;;
18556+ esac
18557+
18558+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18559+ postinstall_cmds='base_file=`basename \${file}`~
18560+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18561+ dldir=$destdir/`dirname \$dlpath`~
18562+ test -d \$dldir || mkdir -p \$dldir~
18563+ $install_prog $dir/$dlname \$dldir/$dlname'
18564+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18565+ dlpath=$dir/\$dldll~
18566+ $RM \$dlpath'
18567+ shlibpath_overrides_runpath=yes
18568+ dynamic_linker='Win32 link.exe'
18569 ;;
18570
18571 *)
18572+ # Assume MSVC wrapper
18573 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18574+ dynamic_linker='Win32 ld.exe'
18575 ;;
18576 esac
18577- dynamic_linker='Win32 ld.exe'
18578 # FIXME: first we should search . and the directory the executable is in
18579 shlibpath_var=PATH
18580 ;;
18581@@ -10355,7 +11010,7 @@ haiku*)
18582 soname_spec='${libname}${release}${shared_ext}$major'
18583 shlibpath_var=LIBRARY_PATH
18584 shlibpath_overrides_runpath=yes
18585- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18586+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18587 hardcode_into_libs=yes
18588 ;;
18589
18590@@ -11195,10 +11850,10 @@ else
18591 /* When -fvisbility=hidden is used, assume the code has been annotated
18592 correspondingly for the symbols needed. */
18593 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18594-void fnord () __attribute__((visibility("default")));
18595+int fnord () __attribute__((visibility("default")));
18596 #endif
18597
18598-void fnord () { int i=42; }
18599+int fnord () { return 42; }
18600 int main ()
18601 {
18602 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18603@@ -11301,10 +11956,10 @@ else
18604 /* When -fvisbility=hidden is used, assume the code has been annotated
18605 correspondingly for the symbols needed. */
18606 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18607-void fnord () __attribute__((visibility("default")));
18608+int fnord () __attribute__((visibility("default")));
18609 #endif
18610
18611-void fnord () { int i=42; }
18612+int fnord () { return 42; }
18613 int main ()
18614 {
18615 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18616@@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then
18617 # since libbfd may not pull in the entirety of libiberty.
18618 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18619 if test -n "$x"; then
18620- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18621+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18622 fi
18623
18624 case "${host}" in
18625@@ -13518,13 +14173,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18626 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18627 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18628 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18629+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18630+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18631 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18632 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18633 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18634 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18635 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18636+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18637+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18638+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18639+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18640 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18641 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18642+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18643 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18644 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18645 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18646@@ -13539,14 +14201,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18647 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18648 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18649 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
18650+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18651+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18652 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18653 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18654 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18655-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18656 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18657+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18658 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18659 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18660 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18661+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18662 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18663 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18664 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18665@@ -13579,12 +14244,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18666 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18667 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18668 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18669-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18670 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18671 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18672 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18673 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18674 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18675+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18676 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18677 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18678 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18679@@ -13639,8 +14304,13 @@ reload_flag \
18680 OBJDUMP \
18681 deplibs_check_method \
18682 file_magic_cmd \
18683+file_magic_glob \
18684+want_nocaseglob \
18685+DLLTOOL \
18686+sharedlib_from_linklib_cmd \
18687 AR \
18688 AR_FLAGS \
18689+archiver_list_spec \
18690 STRIP \
18691 RANLIB \
18692 CC \
18693@@ -13650,12 +14320,14 @@ lt_cv_sys_global_symbol_pipe \
18694 lt_cv_sys_global_symbol_to_cdecl \
18695 lt_cv_sys_global_symbol_to_c_name_address \
18696 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18697+nm_file_list_spec \
18698 lt_prog_compiler_no_builtin_flag \
18699-lt_prog_compiler_wl \
18700 lt_prog_compiler_pic \
18701+lt_prog_compiler_wl \
18702 lt_prog_compiler_static \
18703 lt_cv_prog_compiler_c_o \
18704 need_locks \
18705+MANIFEST_TOOL \
18706 DSYMUTIL \
18707 NMEDIT \
18708 LIPO \
18709@@ -13671,7 +14343,6 @@ no_undefined_flag \
18710 hardcode_libdir_flag_spec \
18711 hardcode_libdir_flag_spec_ld \
18712 hardcode_libdir_separator \
18713-fix_srcfile_path \
18714 exclude_expsyms \
18715 include_expsyms \
18716 file_list_spec \
18717@@ -13707,6 +14378,7 @@ module_cmds \
18718 module_expsym_cmds \
18719 export_symbols_cmds \
18720 prelink_cmds \
18721+postlink_cmds \
18722 postinstall_cmds \
18723 postuninstall_cmds \
18724 finish_cmds \
18725@@ -14463,7 +15135,8 @@ $as_echo X"$file" |
18726 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18727 #
18728 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18729-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18730+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18731+# Inc.
18732 # Written by Gordon Matzigkeit, 1996
18733 #
18734 # This file is part of GNU Libtool.
18735@@ -14566,19 +15239,42 @@ SP2NL=$lt_lt_SP2NL
18736 # turn newlines into spaces.
18737 NL2SP=$lt_lt_NL2SP
18738
18739+# convert \$build file names to \$host format.
18740+to_host_file_cmd=$lt_cv_to_host_file_cmd
18741+
18742+# convert \$build files to toolchain format.
18743+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18744+
18745 # An object symbol dumper.
18746 OBJDUMP=$lt_OBJDUMP
18747
18748 # Method to check whether dependent libraries are shared objects.
18749 deplibs_check_method=$lt_deplibs_check_method
18750
18751-# Command to use when deplibs_check_method == "file_magic".
18752+# Command to use when deplibs_check_method = "file_magic".
18753 file_magic_cmd=$lt_file_magic_cmd
18754
18755+# How to find potential files when deplibs_check_method = "file_magic".
18756+file_magic_glob=$lt_file_magic_glob
18757+
18758+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18759+want_nocaseglob=$lt_want_nocaseglob
18760+
18761+# DLL creation program.
18762+DLLTOOL=$lt_DLLTOOL
18763+
18764+# Command to associate shared and link libraries.
18765+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18766+
18767 # The archiver.
18768 AR=$lt_AR
18769+
18770+# Flags to create an archive.
18771 AR_FLAGS=$lt_AR_FLAGS
18772
18773+# How to feed a file listing to the archiver.
18774+archiver_list_spec=$lt_archiver_list_spec
18775+
18776 # A symbol stripping program.
18777 STRIP=$lt_STRIP
18778
18779@@ -14608,6 +15304,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18780 # Transform the output of nm in a C name address pair when lib prefix is needed.
18781 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18782
18783+# Specify filename containing input files for \$NM.
18784+nm_file_list_spec=$lt_nm_file_list_spec
18785+
18786+# The root where to search for dependent libraries,and in which our libraries should be installed.
18787+lt_sysroot=$lt_sysroot
18788+
18789 # The name of the directory that contains temporary libtool files.
18790 objdir=$objdir
18791
18792@@ -14617,6 +15319,9 @@ MAGIC_CMD=$MAGIC_CMD
18793 # Must we lock files when doing compilation?
18794 need_locks=$lt_need_locks
18795
18796+# Manifest tool.
18797+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18798+
18799 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18800 DSYMUTIL=$lt_DSYMUTIL
18801
18802@@ -14731,12 +15436,12 @@ with_gcc=$GCC
18803 # Compiler flag to turn off builtin functions.
18804 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18805
18806-# How to pass a linker flag through the compiler.
18807-wl=$lt_lt_prog_compiler_wl
18808-
18809 # Additional compiler flags for building library objects.
18810 pic_flag=$lt_lt_prog_compiler_pic
18811
18812+# How to pass a linker flag through the compiler.
18813+wl=$lt_lt_prog_compiler_wl
18814+
18815 # Compiler flag to prevent dynamic linking.
18816 link_static_flag=$lt_lt_prog_compiler_static
18817
18818@@ -14823,9 +15528,6 @@ inherit_rpath=$inherit_rpath
18819 # Whether libtool must link a program against all its dependency libraries.
18820 link_all_deplibs=$link_all_deplibs
18821
18822-# Fix the shell variable \$srcfile for the compiler.
18823-fix_srcfile_path=$lt_fix_srcfile_path
18824-
18825 # Set to "yes" if exported symbols are required.
18826 always_export_symbols=$always_export_symbols
18827
18828@@ -14841,6 +15543,9 @@ include_expsyms=$lt_include_expsyms
18829 # Commands necessary for linking programs (against libraries) with templates.
18830 prelink_cmds=$lt_prelink_cmds
18831
18832+# Commands necessary for finishing linking programs.
18833+postlink_cmds=$lt_postlink_cmds
18834+
18835 # Specify filename containing input files.
18836 file_list_spec=$lt_file_list_spec
18837
18838@@ -14873,210 +15578,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18839 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18840 # text mode, it properly converts lines to CR/LF. This bash problem
18841 # is reportedly fixed, but why not run on old versions too?
18842- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18843- || (rm -f "$cfgfile"; exit 1)
18844-
18845- case $xsi_shell in
18846- yes)
18847- cat << \_LT_EOF >> "$cfgfile"
18848-
18849-# func_dirname file append nondir_replacement
18850-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18851-# otherwise set result to NONDIR_REPLACEMENT.
18852-func_dirname ()
18853-{
18854- case ${1} in
18855- */*) func_dirname_result="${1%/*}${2}" ;;
18856- * ) func_dirname_result="${3}" ;;
18857- esac
18858-}
18859-
18860-# func_basename file
18861-func_basename ()
18862-{
18863- func_basename_result="${1##*/}"
18864-}
18865-
18866-# func_dirname_and_basename file append nondir_replacement
18867-# perform func_basename and func_dirname in a single function
18868-# call:
18869-# dirname: Compute the dirname of FILE. If nonempty,
18870-# add APPEND to the result, otherwise set result
18871-# to NONDIR_REPLACEMENT.
18872-# value returned in "$func_dirname_result"
18873-# basename: Compute filename of FILE.
18874-# value retuned in "$func_basename_result"
18875-# Implementation must be kept synchronized with func_dirname
18876-# and func_basename. For efficiency, we do not delegate to
18877-# those functions but instead duplicate the functionality here.
18878-func_dirname_and_basename ()
18879-{
18880- case ${1} in
18881- */*) func_dirname_result="${1%/*}${2}" ;;
18882- * ) func_dirname_result="${3}" ;;
18883- esac
18884- func_basename_result="${1##*/}"
18885-}
18886-
18887-# func_stripname prefix suffix name
18888-# strip PREFIX and SUFFIX off of NAME.
18889-# PREFIX and SUFFIX must not contain globbing or regex special
18890-# characters, hashes, percent signs, but SUFFIX may contain a leading
18891-# dot (in which case that matches only a dot).
18892-func_stripname ()
18893-{
18894- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18895- # positional parameters, so assign one to ordinary parameter first.
18896- func_stripname_result=${3}
18897- func_stripname_result=${func_stripname_result#"${1}"}
18898- func_stripname_result=${func_stripname_result%"${2}"}
18899-}
18900-
18901-# func_opt_split
18902-func_opt_split ()
18903-{
18904- func_opt_split_opt=${1%%=*}
18905- func_opt_split_arg=${1#*=}
18906-}
18907-
18908-# func_lo2o object
18909-func_lo2o ()
18910-{
18911- case ${1} in
18912- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18913- *) func_lo2o_result=${1} ;;
18914- esac
18915-}
18916-
18917-# func_xform libobj-or-source
18918-func_xform ()
18919-{
18920- func_xform_result=${1%.*}.lo
18921-}
18922-
18923-# func_arith arithmetic-term...
18924-func_arith ()
18925-{
18926- func_arith_result=$(( $* ))
18927-}
18928-
18929-# func_len string
18930-# STRING may not start with a hyphen.
18931-func_len ()
18932-{
18933- func_len_result=${#1}
18934-}
18935-
18936-_LT_EOF
18937- ;;
18938- *) # Bourne compatible functions.
18939- cat << \_LT_EOF >> "$cfgfile"
18940-
18941-# func_dirname file append nondir_replacement
18942-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18943-# otherwise set result to NONDIR_REPLACEMENT.
18944-func_dirname ()
18945-{
18946- # Extract subdirectory from the argument.
18947- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18948- if test "X$func_dirname_result" = "X${1}"; then
18949- func_dirname_result="${3}"
18950- else
18951- func_dirname_result="$func_dirname_result${2}"
18952- fi
18953-}
18954-
18955-# func_basename file
18956-func_basename ()
18957-{
18958- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18959-}
18960-
18961-
18962-# func_stripname prefix suffix name
18963-# strip PREFIX and SUFFIX off of NAME.
18964-# PREFIX and SUFFIX must not contain globbing or regex special
18965-# characters, hashes, percent signs, but SUFFIX may contain a leading
18966-# dot (in which case that matches only a dot).
18967-# func_strip_suffix prefix name
18968-func_stripname ()
18969-{
18970- case ${2} in
18971- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18972- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18973- esac
18974-}
18975-
18976-# sed scripts:
18977-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18978-my_sed_long_arg='1s/^-[^=]*=//'
18979-
18980-# func_opt_split
18981-func_opt_split ()
18982-{
18983- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18984- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18985-}
18986-
18987-# func_lo2o object
18988-func_lo2o ()
18989-{
18990- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18991-}
18992-
18993-# func_xform libobj-or-source
18994-func_xform ()
18995-{
18996- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18997-}
18998-
18999-# func_arith arithmetic-term...
19000-func_arith ()
19001-{
19002- func_arith_result=`expr "$@"`
19003-}
19004-
19005-# func_len string
19006-# STRING may not start with a hyphen.
19007-func_len ()
19008-{
19009- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19010-}
19011-
19012-_LT_EOF
19013-esac
19014-
19015-case $lt_shell_append in
19016- yes)
19017- cat << \_LT_EOF >> "$cfgfile"
19018-
19019-# func_append var value
19020-# Append VALUE to the end of shell variable VAR.
19021-func_append ()
19022-{
19023- eval "$1+=\$2"
19024-}
19025-_LT_EOF
19026- ;;
19027- *)
19028- cat << \_LT_EOF >> "$cfgfile"
19029-
19030-# func_append var value
19031-# Append VALUE to the end of shell variable VAR.
19032-func_append ()
19033-{
19034- eval "$1=\$$1\$2"
19035-}
19036-
19037-_LT_EOF
19038- ;;
19039- esac
19040-
19041-
19042- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19043- || (rm -f "$cfgfile"; exit 1)
19044-
19045- mv -f "$cfgfile" "$ofile" ||
19046+ sed '$q' "$ltmain" >> "$cfgfile" \
19047+ || (rm -f "$cfgfile"; exit 1)
19048+
19049+ if test x"$xsi_shell" = xyes; then
19050+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19051+func_dirname ()\
19052+{\
19053+\ case ${1} in\
19054+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19055+\ * ) func_dirname_result="${3}" ;;\
19056+\ esac\
19057+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19058+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19059+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19060+test 0 -eq $? || _lt_function_replace_fail=:
19061+
19062+
19063+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19064+func_basename ()\
19065+{\
19066+\ func_basename_result="${1##*/}"\
19067+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19068+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19069+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19070+test 0 -eq $? || _lt_function_replace_fail=:
19071+
19072+
19073+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19074+func_dirname_and_basename ()\
19075+{\
19076+\ case ${1} in\
19077+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19078+\ * ) func_dirname_result="${3}" ;;\
19079+\ esac\
19080+\ func_basename_result="${1##*/}"\
19081+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19082+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19083+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19084+test 0 -eq $? || _lt_function_replace_fail=:
19085+
19086+
19087+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19088+func_stripname ()\
19089+{\
19090+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19091+\ # positional parameters, so assign one to ordinary parameter first.\
19092+\ func_stripname_result=${3}\
19093+\ func_stripname_result=${func_stripname_result#"${1}"}\
19094+\ func_stripname_result=${func_stripname_result%"${2}"}\
19095+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19096+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19097+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19098+test 0 -eq $? || _lt_function_replace_fail=:
19099+
19100+
19101+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19102+func_split_long_opt ()\
19103+{\
19104+\ func_split_long_opt_name=${1%%=*}\
19105+\ func_split_long_opt_arg=${1#*=}\
19106+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19107+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19108+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19109+test 0 -eq $? || _lt_function_replace_fail=:
19110+
19111+
19112+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19113+func_split_short_opt ()\
19114+{\
19115+\ func_split_short_opt_arg=${1#??}\
19116+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19117+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19118+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19119+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19120+test 0 -eq $? || _lt_function_replace_fail=:
19121+
19122+
19123+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19124+func_lo2o ()\
19125+{\
19126+\ case ${1} in\
19127+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19128+\ *) func_lo2o_result=${1} ;;\
19129+\ esac\
19130+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19131+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19132+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19133+test 0 -eq $? || _lt_function_replace_fail=:
19134+
19135+
19136+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19137+func_xform ()\
19138+{\
19139+ func_xform_result=${1%.*}.lo\
19140+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19141+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19142+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19143+test 0 -eq $? || _lt_function_replace_fail=:
19144+
19145+
19146+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19147+func_arith ()\
19148+{\
19149+ func_arith_result=$(( $* ))\
19150+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19151+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19152+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19153+test 0 -eq $? || _lt_function_replace_fail=:
19154+
19155+
19156+ sed -e '/^func_len ()$/,/^} # func_len /c\
19157+func_len ()\
19158+{\
19159+ func_len_result=${#1}\
19160+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
19161+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19162+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19163+test 0 -eq $? || _lt_function_replace_fail=:
19164+
19165+fi
19166+
19167+if test x"$lt_shell_append" = xyes; then
19168+ sed -e '/^func_append ()$/,/^} # func_append /c\
19169+func_append ()\
19170+{\
19171+ eval "${1}+=\\${2}"\
19172+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
19173+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19174+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19175+test 0 -eq $? || _lt_function_replace_fail=:
19176+
19177+
19178+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19179+func_append_quoted ()\
19180+{\
19181+\ func_quote_for_eval "${2}"\
19182+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19183+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19184+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19185+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19186+test 0 -eq $? || _lt_function_replace_fail=:
19187+
19188+
19189+ # Save a `func_append' function call where possible by direct use of '+='
19190+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19191+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19192+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19193+ test 0 -eq $? || _lt_function_replace_fail=:
19194+else
19195+ # Save a `func_append' function call even when '+=' is not available
19196+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19197+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19198+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19199+ test 0 -eq $? || _lt_function_replace_fail=:
19200+fi
19201+
19202+if test x"$_lt_function_replace_fail" = x":"; then
19203+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19204+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19205+fi
19206+
19207+
19208+ mv -f "$cfgfile" "$ofile" ||
19209 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19210 chmod +x "$ofile"
19211
19212diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19213index b9f5eb8a4f..a31b66a2f0 100644
19214--- a/opcodes/configure.ac
19215+++ b/opcodes/configure.ac
19216@@ -167,7 +167,7 @@ changequote(,)dnl
19217 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19218 changequote([,])dnl
19219 if test -n "$x"; then
19220- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19221+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19222 fi
19223
19224 case "${host}" in
19225diff --git a/zlib/configure b/zlib/configure
19226index bed9e3ea2b..caef0b674e 100755
19227--- a/zlib/configure
19228+++ b/zlib/configure
19229@@ -614,8 +614,11 @@ OTOOL
19230 LIPO
19231 NMEDIT
19232 DSYMUTIL
19233+MANIFEST_TOOL
19234 RANLIB
19235+ac_ct_AR
19236 AR
19237+DLLTOOL
19238 OBJDUMP
19239 LN_S
19240 NM
19241@@ -737,6 +740,7 @@ enable_static
19242 with_pic
19243 enable_fast_install
19244 with_gnu_ld
19245+with_libtool_sysroot
19246 enable_libtool_lock
19247 enable_host_shared
19248 '
19249@@ -1385,6 +1389,8 @@ Optional Packages:
19250 --with-pic try to use only PIC/non-PIC objects [default=use
19251 both]
19252 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19253+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19254+ (or the compiler's sysroot if not specified).
19255
19256 Some influential environment variables:
19257 CC C compiler command
19258@@ -3910,8 +3916,8 @@ esac
19259
19260
19261
19262-macro_version='2.2.7a'
19263-macro_revision='1.3134'
19264+macro_version='2.4'
19265+macro_revision='1.3293'
19266
19267
19268
19269@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19271 $as_echo_n "checking how to print strings... " >&6; }
19272 # Test print first, because it will be a builtin if present.
19273-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19274+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19275 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19276 ECHO='print -r --'
19277 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19278@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19279 # Try some XSI features
19280 xsi_shell=no
19281 ( _lt_dummy="a/b/c"
19282- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19283- = c,a/b,, \
19284+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19285+ = c,a/b,b/c, \
19286 && eval 'test $(( 1 + 1 )) -eq 2 \
19287 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19288 && xsi_shell=yes
19289@@ -4817,6 +4823,80 @@ esac
19290
19291
19292
19293+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19294+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19295+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
19296+ $as_echo_n "(cached) " >&6
19297+else
19298+ case $host in
19299+ *-*-mingw* )
19300+ case $build in
19301+ *-*-mingw* ) # actually msys
19302+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19303+ ;;
19304+ *-*-cygwin* )
19305+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19306+ ;;
19307+ * ) # otherwise, assume *nix
19308+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19309+ ;;
19310+ esac
19311+ ;;
19312+ *-*-cygwin* )
19313+ case $build in
19314+ *-*-mingw* ) # actually msys
19315+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19316+ ;;
19317+ *-*-cygwin* )
19318+ lt_cv_to_host_file_cmd=func_convert_file_noop
19319+ ;;
19320+ * ) # otherwise, assume *nix
19321+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19322+ ;;
19323+ esac
19324+ ;;
19325+ * ) # unhandled hosts (and "normal" native builds)
19326+ lt_cv_to_host_file_cmd=func_convert_file_noop
19327+ ;;
19328+esac
19329+
19330+fi
19331+
19332+to_host_file_cmd=$lt_cv_to_host_file_cmd
19333+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19334+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19335+
19336+
19337+
19338+
19339+
19340+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19341+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19342+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
19343+ $as_echo_n "(cached) " >&6
19344+else
19345+ #assume ordinary cross tools, or native build.
19346+lt_cv_to_tool_file_cmd=func_convert_file_noop
19347+case $host in
19348+ *-*-mingw* )
19349+ case $build in
19350+ *-*-mingw* ) # actually msys
19351+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19352+ ;;
19353+ esac
19354+ ;;
19355+esac
19356+
19357+fi
19358+
19359+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19360+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19361+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19362+
19363+
19364+
19365+
19366+
19367 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19368 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19369 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19370@@ -4833,6 +4913,11 @@ case $reload_flag in
19371 esac
19372 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19373 case $host_os in
19374+ cygwin* | mingw* | pw32* | cegcc*)
19375+ if test "$GCC" != yes; then
19376+ reload_cmds=false
19377+ fi
19378+ ;;
19379 darwin*)
19380 if test "$GCC" = yes; then
19381 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19382@@ -5001,7 +5086,8 @@ mingw* | pw32*)
19383 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19384 lt_cv_file_magic_cmd='func_win32_libid'
19385 else
19386- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19387+ # Keep this pattern in sync with the one in func_win32_libid.
19388+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19389 lt_cv_file_magic_cmd='$OBJDUMP -f'
19390 fi
19391 ;;
19392@@ -5155,6 +5241,21 @@ esac
19393 fi
19394 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19395 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19396+
19397+file_magic_glob=
19398+want_nocaseglob=no
19399+if test "$build" = "$host"; then
19400+ case $host_os in
19401+ mingw* | pw32*)
19402+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19403+ want_nocaseglob=yes
19404+ else
19405+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19406+ fi
19407+ ;;
19408+ esac
19409+fi
19410+
19411 file_magic_cmd=$lt_cv_file_magic_cmd
19412 deplibs_check_method=$lt_cv_deplibs_check_method
19413 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19414@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19415
19416
19417
19418+
19419+
19420+
19421+
19422+
19423+
19424+
19425+
19426+
19427+
19428 if test -n "$ac_tool_prefix"; then
19429- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19430-set dummy ${ac_tool_prefix}ar; ac_word=$2
19431+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19432+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19433+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19434+$as_echo_n "checking for $ac_word... " >&6; }
19435+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
19436+ $as_echo_n "(cached) " >&6
19437+else
19438+ if test -n "$DLLTOOL"; then
19439+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19440+else
19441+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19442+for as_dir in $PATH
19443+do
19444+ IFS=$as_save_IFS
19445+ test -z "$as_dir" && as_dir=.
19446+ for ac_exec_ext in '' $ac_executable_extensions; do
19447+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19448+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19449+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19450+ break 2
19451+ fi
19452+done
19453+ done
19454+IFS=$as_save_IFS
19455+
19456+fi
19457+fi
19458+DLLTOOL=$ac_cv_prog_DLLTOOL
19459+if test -n "$DLLTOOL"; then
19460+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19461+$as_echo "$DLLTOOL" >&6; }
19462+else
19463+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19464+$as_echo "no" >&6; }
19465+fi
19466+
19467+
19468+fi
19469+if test -z "$ac_cv_prog_DLLTOOL"; then
19470+ ac_ct_DLLTOOL=$DLLTOOL
19471+ # Extract the first word of "dlltool", so it can be a program name with args.
19472+set dummy dlltool; ac_word=$2
19473+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19474+$as_echo_n "checking for $ac_word... " >&6; }
19475+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
19476+ $as_echo_n "(cached) " >&6
19477+else
19478+ if test -n "$ac_ct_DLLTOOL"; then
19479+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19480+else
19481+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19482+for as_dir in $PATH
19483+do
19484+ IFS=$as_save_IFS
19485+ test -z "$as_dir" && as_dir=.
19486+ for ac_exec_ext in '' $ac_executable_extensions; do
19487+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19488+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19489+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19490+ break 2
19491+ fi
19492+done
19493+ done
19494+IFS=$as_save_IFS
19495+
19496+fi
19497+fi
19498+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19499+if test -n "$ac_ct_DLLTOOL"; then
19500+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19501+$as_echo "$ac_ct_DLLTOOL" >&6; }
19502+else
19503+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19504+$as_echo "no" >&6; }
19505+fi
19506+
19507+ if test "x$ac_ct_DLLTOOL" = x; then
19508+ DLLTOOL="false"
19509+ else
19510+ case $cross_compiling:$ac_tool_warned in
19511+yes:)
19512+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19513+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19514+ac_tool_warned=yes ;;
19515+esac
19516+ DLLTOOL=$ac_ct_DLLTOOL
19517+ fi
19518+else
19519+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19520+fi
19521+
19522+test -z "$DLLTOOL" && DLLTOOL=dlltool
19523+
19524+
19525+
19526+
19527+
19528+
19529+
19530+
19531+
19532+
19533+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19534+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19535+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
19536+ $as_echo_n "(cached) " >&6
19537+else
19538+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19539+
19540+case $host_os in
19541+cygwin* | mingw* | pw32* | cegcc*)
19542+ # two different shell functions defined in ltmain.sh
19543+ # decide which to use based on capabilities of $DLLTOOL
19544+ case `$DLLTOOL --help 2>&1` in
19545+ *--identify-strict*)
19546+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19547+ ;;
19548+ *)
19549+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19550+ ;;
19551+ esac
19552+ ;;
19553+*)
19554+ # fallback: assume linklib IS sharedlib
19555+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19556+ ;;
19557+esac
19558+
19559+fi
19560+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19561+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19562+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19563+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19564+
19565+
19566+
19567+
19568+
19569+
19570+
19571+
19572+if test -n "$ac_tool_prefix"; then
19573+ for ac_prog in ar
19574+ do
19575+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19576+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19577 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19578 $as_echo_n "checking for $ac_word... " >&6; }
19579 if test "${ac_cv_prog_AR+set}" = set; then :
19580@@ -5188,7 +5443,7 @@ do
19581 test -z "$as_dir" && as_dir=.
19582 for ac_exec_ext in '' $ac_executable_extensions; do
19583 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19584- ac_cv_prog_AR="${ac_tool_prefix}ar"
19585+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19586 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19587 break 2
19588 fi
19589@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }
19590 fi
19591
19592
19593+ test -n "$AR" && break
19594+ done
19595 fi
19596-if test -z "$ac_cv_prog_AR"; then
19597+if test -z "$AR"; then
19598 ac_ct_AR=$AR
19599- # Extract the first word of "ar", so it can be a program name with args.
19600-set dummy ar; ac_word=$2
19601+ for ac_prog in ar
19602+do
19603+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19604+set dummy $ac_prog; ac_word=$2
19605 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19606 $as_echo_n "checking for $ac_word... " >&6; }
19607 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19608@@ -5228,7 +5487,7 @@ do
19609 test -z "$as_dir" && as_dir=.
19610 for ac_exec_ext in '' $ac_executable_extensions; do
19611 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19612- ac_cv_prog_ac_ct_AR="ar"
19613+ ac_cv_prog_ac_ct_AR="$ac_prog"
19614 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19615 break 2
19616 fi
19617@@ -5247,6 +5506,10 @@ else
19618 $as_echo "no" >&6; }
19619 fi
19620
19621+
19622+ test -n "$ac_ct_AR" && break
19623+done
19624+
19625 if test "x$ac_ct_AR" = x; then
19626 AR="false"
19627 else
19628@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;
19629 esac
19630 AR=$ac_ct_AR
19631 fi
19632-else
19633- AR="$ac_cv_prog_AR"
19634 fi
19635
19636-test -z "$AR" && AR=ar
19637-test -z "$AR_FLAGS" && AR_FLAGS=cru
19638+: ${AR=ar}
19639+: ${AR_FLAGS=cru}
19640+
19641+
19642+
19643+
19644+
19645+
19646+
19647+
19648+
19649+
19650+
19651+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19652+$as_echo_n "checking for archiver @FILE support... " >&6; }
19653+if test "${lt_cv_ar_at_file+set}" = set; then :
19654+ $as_echo_n "(cached) " >&6
19655+else
19656+ lt_cv_ar_at_file=no
19657+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19658+/* end confdefs.h. */
19659+
19660+int
19661+main ()
19662+{
19663
19664+ ;
19665+ return 0;
19666+}
19667+_ACEOF
19668+if ac_fn_c_try_compile "$LINENO"; then :
19669+ echo conftest.$ac_objext > conftest.lst
19670+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19671+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19672+ (eval $lt_ar_try) 2>&5
19673+ ac_status=$?
19674+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19675+ test $ac_status = 0; }
19676+ if test "$ac_status" -eq 0; then
19677+ # Ensure the archiver fails upon bogus file names.
19678+ rm -f conftest.$ac_objext libconftest.a
19679+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19680+ (eval $lt_ar_try) 2>&5
19681+ ac_status=$?
19682+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19683+ test $ac_status = 0; }
19684+ if test "$ac_status" -ne 0; then
19685+ lt_cv_ar_at_file=@
19686+ fi
19687+ fi
19688+ rm -f conftest.* libconftest.a
19689
19690+fi
19691+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19692
19693+fi
19694+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19695+$as_echo "$lt_cv_ar_at_file" >&6; }
19696
19697+if test "x$lt_cv_ar_at_file" = xno; then
19698+ archiver_list_spec=
19699+else
19700+ archiver_list_spec=$lt_cv_ar_at_file
19701+fi
19702
19703
19704
19705@@ -5609,8 +5928,8 @@ esac
19706 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19707
19708 # Transform an extracted symbol line into symbol name and symbol address
19709-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19710-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
19711+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19712+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
19713
19714 # Handle CRLF in mingw tool chain
19715 opt_cr=
19716@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do
19717 else
19718 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19719 fi
19720+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19721
19722 # Check to see that the pipe works correctly.
19723 pipe_works=no
19724@@ -5687,6 +6007,18 @@ _LT_EOF
19725 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19726 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19727 cat <<_LT_EOF > conftest.$ac_ext
19728+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19729+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19730+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19731+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19732+# define LT_DLSYM_CONST
19733+#elif defined(__osf__)
19734+/* This system does not cope well with relocations in const data. */
19735+# define LT_DLSYM_CONST
19736+#else
19737+# define LT_DLSYM_CONST const
19738+#endif
19739+
19740 #ifdef __cplusplus
19741 extern "C" {
19742 #endif
19743@@ -5698,7 +6030,7 @@ _LT_EOF
19744 cat <<_LT_EOF >> conftest.$ac_ext
19745
19746 /* The mapping between symbol names and symbols. */
19747-const struct {
19748+LT_DLSYM_CONST struct {
19749 const char *name;
19750 void *address;
19751 }
19752@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {
19753 _LT_EOF
19754 # Now try linking the two files.
19755 mv conftest.$ac_objext conftstm.$ac_objext
19756- lt_save_LIBS="$LIBS"
19757- lt_save_CFLAGS="$CFLAGS"
19758+ lt_globsym_save_LIBS=$LIBS
19759+ lt_globsym_save_CFLAGS=$CFLAGS
19760 LIBS="conftstm.$ac_objext"
19761 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19762 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19763@@ -5735,8 +6067,8 @@ _LT_EOF
19764 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19765 pipe_works=yes
19766 fi
19767- LIBS="$lt_save_LIBS"
19768- CFLAGS="$lt_save_CFLAGS"
19769+ LIBS=$lt_globsym_save_LIBS
19770+ CFLAGS=$lt_globsym_save_CFLAGS
19771 else
19772 echo "cannot find nm_test_func in $nlist" >&5
19773 fi
19774@@ -5773,6 +6105,19 @@ else
19775 $as_echo "ok" >&6; }
19776 fi
19777
19778+# Response file support.
19779+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19780+ nm_file_list_spec='@'
19781+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19782+ nm_file_list_spec='@'
19783+fi
19784+
19785+
19786+
19787+
19788+
19789+
19790+
19791
19792
19793
19794@@ -5793,6 +6138,41 @@ fi
19795
19796
19797
19798+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19799+$as_echo_n "checking for sysroot... " >&6; }
19800+
19801+# Check whether --with-libtool-sysroot was given.
19802+if test "${with_libtool_sysroot+set}" = set; then :
19803+ withval=$with_libtool_sysroot;
19804+else
19805+ with_libtool_sysroot=no
19806+fi
19807+
19808+
19809+lt_sysroot=
19810+case ${with_libtool_sysroot} in #(
19811+ yes)
19812+ if test "$GCC" = yes; then
19813+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19814+ fi
19815+ ;; #(
19816+ /*)
19817+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19818+ ;; #(
19819+ no|'')
19820+ ;; #(
19821+ *)
19822+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19823+$as_echo "${with_libtool_sysroot}" >&6; }
19824+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
19825+ ;;
19826+esac
19827+
19828+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19829+$as_echo "${lt_sysroot:-no}" >&6; }
19830+
19831+
19832+
19833
19834
19835 # Check whether --enable-libtool-lock was given.
19836@@ -6004,6 +6384,123 @@ esac
19837
19838 need_locks="$enable_libtool_lock"
19839
19840+if test -n "$ac_tool_prefix"; then
19841+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19842+set dummy ${ac_tool_prefix}mt; ac_word=$2
19843+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19844+$as_echo_n "checking for $ac_word... " >&6; }
19845+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
19846+ $as_echo_n "(cached) " >&6
19847+else
19848+ if test -n "$MANIFEST_TOOL"; then
19849+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19850+else
19851+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19852+for as_dir in $PATH
19853+do
19854+ IFS=$as_save_IFS
19855+ test -z "$as_dir" && as_dir=.
19856+ for ac_exec_ext in '' $ac_executable_extensions; do
19857+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19858+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19859+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19860+ break 2
19861+ fi
19862+done
19863+ done
19864+IFS=$as_save_IFS
19865+
19866+fi
19867+fi
19868+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19869+if test -n "$MANIFEST_TOOL"; then
19870+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19871+$as_echo "$MANIFEST_TOOL" >&6; }
19872+else
19873+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19874+$as_echo "no" >&6; }
19875+fi
19876+
19877+
19878+fi
19879+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19880+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19881+ # Extract the first word of "mt", so it can be a program name with args.
19882+set dummy mt; ac_word=$2
19883+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19884+$as_echo_n "checking for $ac_word... " >&6; }
19885+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
19886+ $as_echo_n "(cached) " >&6
19887+else
19888+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19889+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19890+else
19891+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19892+for as_dir in $PATH
19893+do
19894+ IFS=$as_save_IFS
19895+ test -z "$as_dir" && as_dir=.
19896+ for ac_exec_ext in '' $ac_executable_extensions; do
19897+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19898+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19899+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19900+ break 2
19901+ fi
19902+done
19903+ done
19904+IFS=$as_save_IFS
19905+
19906+fi
19907+fi
19908+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
19909+if test -n "$ac_ct_MANIFEST_TOOL"; then
19910+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
19911+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
19912+else
19913+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19914+$as_echo "no" >&6; }
19915+fi
19916+
19917+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
19918+ MANIFEST_TOOL=":"
19919+ else
19920+ case $cross_compiling:$ac_tool_warned in
19921+yes:)
19922+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19923+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19924+ac_tool_warned=yes ;;
19925+esac
19926+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
19927+ fi
19928+else
19929+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
19930+fi
19931+
19932+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19933+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19934+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19935+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
19936+ $as_echo_n "(cached) " >&6
19937+else
19938+ lt_cv_path_mainfest_tool=no
19939+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
19940+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
19941+ cat conftest.err >&5
19942+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
19943+ lt_cv_path_mainfest_tool=yes
19944+ fi
19945+ rm -f conftest*
19946+fi
19947+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
19948+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
19949+if test "x$lt_cv_path_mainfest_tool" != xyes; then
19950+ MANIFEST_TOOL=:
19951+fi
19952+
19953+
19954+
19955+
19956+
19957
19958 case $host_os in
19959 rhapsody* | darwin*)
19960@@ -6570,6 +7067,8 @@ _LT_EOF
19961 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19962 echo "$AR cru libconftest.a conftest.o" >&5
19963 $AR cru libconftest.a conftest.o 2>&5
19964+ echo "$RANLIB libconftest.a" >&5
19965+ $RANLIB libconftest.a 2>&5
19966 cat > conftest.c << _LT_EOF
19967 int main() { return 0;}
19968 _LT_EOF
19969@@ -7033,7 +7532,8 @@ fi
19970 LIBTOOL_DEPS="$ltmain"
19971
19972 # Always use our own libtool.
19973-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
19974+LIBTOOL='$(SHELL) $(top_builddir)'
19975+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
19976
19977
19978
19979@@ -7122,7 +7622,7 @@ aix3*)
19980 esac
19981
19982 # Global variables:
19983-ofile=libtool
19984+ofile=${host_alias}-libtool
19985 can_build_shared=yes
19986
19987 # All known linkers require a `.a' archive for static linking (except MSVC,
19988@@ -7420,8 +7920,6 @@ fi
19989 lt_prog_compiler_pic=
19990 lt_prog_compiler_static=
19991
19992-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
19993-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19994
19995 if test "$GCC" = yes; then
19996 lt_prog_compiler_wl='-Wl,'
19997@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19998 lt_prog_compiler_pic='--shared'
19999 lt_prog_compiler_static='--static'
20000 ;;
20001+ nagfor*)
20002+ # NAG Fortran compiler
20003+ lt_prog_compiler_wl='-Wl,-Wl,,'
20004+ lt_prog_compiler_pic='-PIC'
20005+ lt_prog_compiler_static='-Bstatic'
20006+ ;;
20007 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20008 # Portland Group compilers (*not* the Pentium gcc compiler,
20009 # which looks to be a dead project)
20010@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20011 lt_prog_compiler_pic='-KPIC'
20012 lt_prog_compiler_static='-Bstatic'
20013 case $cc_basename in
20014- f77* | f90* | f95*)
20015+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20016 lt_prog_compiler_wl='-Qoption ld ';;
20017 *)
20018 lt_prog_compiler_wl='-Wl,';;
20019@@ -7706,13 +8210,17 @@ case $host_os in
20020 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20021 ;;
20022 esac
20023-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20024-$as_echo "$lt_prog_compiler_pic" >&6; }
20025-
20026-
20027-
20028-
20029
20030+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20031+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20032+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
20033+ $as_echo_n "(cached) " >&6
20034+else
20035+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20036+fi
20037+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20038+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20039+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20040
20041 #
20042 # Check to make sure the PIC flag actually works.
20043@@ -7773,6 +8281,11 @@ fi
20044
20045
20046
20047+
20048+
20049+
20050+
20051+
20052 #
20053 # Check to make sure the static flag actually works.
20054 #
20055@@ -8123,7 +8636,8 @@ _LT_EOF
20056 allow_undefined_flag=unsupported
20057 always_export_symbols=no
20058 enable_shared_with_static_runtimes=yes
20059- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20060+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
20061+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20062
20063 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20064 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20065@@ -8222,12 +8736,12 @@ _LT_EOF
20066 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20067 hardcode_libdir_flag_spec=
20068 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20069- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20070+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20071 if test "x$supports_anon_versioning" = xyes; then
20072 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20073 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20074 echo "local: *; };" >> $output_objdir/$libname.ver~
20075- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20076+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20077 fi
20078 ;;
20079 esac
20080@@ -8241,8 +8755,8 @@ _LT_EOF
20081 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20082 wlarc=
20083 else
20084- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20085- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20086+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20087+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20088 fi
20089 ;;
20090
20091@@ -8260,8 +8774,8 @@ _LT_EOF
20092
20093 _LT_EOF
20094 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20095- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20096- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20097+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20098+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20099 else
20100 ld_shlibs=no
20101 fi
20102@@ -8307,8 +8821,8 @@ _LT_EOF
20103
20104 *)
20105 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20106- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20107- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20108+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20109+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20110 else
20111 ld_shlibs=no
20112 fi
20113@@ -8438,7 +8952,13 @@ _LT_EOF
20114 allow_undefined_flag='-berok'
20115 # Determine the default libpath from the value encoded in an
20116 # empty executable.
20117- if test x$gcc_no_link = xyes; then
20118+ if test "${lt_cv_aix_libpath+set}" = set; then
20119+ aix_libpath=$lt_cv_aix_libpath
20120+else
20121+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20122+ $as_echo_n "(cached) " >&6
20123+else
20124+ if test x$gcc_no_link = xyes; then
20125 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20126 fi
20127 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20128@@ -8454,22 +8974,29 @@ main ()
20129 _ACEOF
20130 if ac_fn_c_try_link "$LINENO"; then :
20131
20132-lt_aix_libpath_sed='
20133- /Import File Strings/,/^$/ {
20134- /^0/ {
20135- s/^0 *\(.*\)$/\1/
20136- p
20137- }
20138- }'
20139-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20140-# Check for a 64-bit object if we didn't find anything.
20141-if test -z "$aix_libpath"; then
20142- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20143-fi
20144+ lt_aix_libpath_sed='
20145+ /Import File Strings/,/^$/ {
20146+ /^0/ {
20147+ s/^0 *\([^ ]*\) *$/\1/
20148+ p
20149+ }
20150+ }'
20151+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20152+ # Check for a 64-bit object if we didn't find anything.
20153+ if test -z "$lt_cv_aix_libpath_"; then
20154+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20155+ fi
20156 fi
20157 rm -f core conftest.err conftest.$ac_objext \
20158 conftest$ac_exeext conftest.$ac_ext
20159-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20160+ if test -z "$lt_cv_aix_libpath_"; then
20161+ lt_cv_aix_libpath_="/usr/lib:/lib"
20162+ fi
20163+
20164+fi
20165+
20166+ aix_libpath=$lt_cv_aix_libpath_
20167+fi
20168
20169 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20170 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
20171@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20172 else
20173 # Determine the default libpath from the value encoded in an
20174 # empty executable.
20175- if test x$gcc_no_link = xyes; then
20176+ if test "${lt_cv_aix_libpath+set}" = set; then
20177+ aix_libpath=$lt_cv_aix_libpath
20178+else
20179+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20180+ $as_echo_n "(cached) " >&6
20181+else
20182+ if test x$gcc_no_link = xyes; then
20183 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20184 fi
20185 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20186@@ -8497,22 +9030,29 @@ main ()
20187 _ACEOF
20188 if ac_fn_c_try_link "$LINENO"; then :
20189
20190-lt_aix_libpath_sed='
20191- /Import File Strings/,/^$/ {
20192- /^0/ {
20193- s/^0 *\(.*\)$/\1/
20194- p
20195- }
20196- }'
20197-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20198-# Check for a 64-bit object if we didn't find anything.
20199-if test -z "$aix_libpath"; then
20200- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20201-fi
20202+ lt_aix_libpath_sed='
20203+ /Import File Strings/,/^$/ {
20204+ /^0/ {
20205+ s/^0 *\([^ ]*\) *$/\1/
20206+ p
20207+ }
20208+ }'
20209+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20210+ # Check for a 64-bit object if we didn't find anything.
20211+ if test -z "$lt_cv_aix_libpath_"; then
20212+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20213+ fi
20214 fi
20215 rm -f core conftest.err conftest.$ac_objext \
20216 conftest$ac_exeext conftest.$ac_ext
20217-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20218+ if test -z "$lt_cv_aix_libpath_"; then
20219+ lt_cv_aix_libpath_="/usr/lib:/lib"
20220+ fi
20221+
20222+fi
20223+
20224+ aix_libpath=$lt_cv_aix_libpath_
20225+fi
20226
20227 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20228 # Warning - without using the other run time loading flags,
20229@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20230 # Microsoft Visual C++.
20231 # hardcode_libdir_flag_spec is actually meaningless, as there is
20232 # no search path for DLLs.
20233- hardcode_libdir_flag_spec=' '
20234- allow_undefined_flag=unsupported
20235- # Tell ltmain to make .lib files, not .a files.
20236- libext=lib
20237- # Tell ltmain to make .dll files, not .so files.
20238- shrext_cmds=".dll"
20239- # FIXME: Setting linknames here is a bad hack.
20240- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20241- # The linker will automatically build a .lib file if we build a DLL.
20242- old_archive_from_new_cmds='true'
20243- # FIXME: Should let the user specify the lib program.
20244- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20245- fix_srcfile_path='`cygpath -w "$srcfile"`'
20246- enable_shared_with_static_runtimes=yes
20247+ case $cc_basename in
20248+ cl*)
20249+ # Native MSVC
20250+ hardcode_libdir_flag_spec=' '
20251+ allow_undefined_flag=unsupported
20252+ always_export_symbols=yes
20253+ file_list_spec='@'
20254+ # Tell ltmain to make .lib files, not .a files.
20255+ libext=lib
20256+ # Tell ltmain to make .dll files, not .so files.
20257+ shrext_cmds=".dll"
20258+ # FIXME: Setting linknames here is a bad hack.
20259+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20260+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20261+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20262+ else
20263+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20264+ fi~
20265+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20266+ linknames='
20267+ # The linker will not automatically build a static lib if we build a DLL.
20268+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20269+ enable_shared_with_static_runtimes=yes
20270+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20271+ # Don't use ranlib
20272+ old_postinstall_cmds='chmod 644 $oldlib'
20273+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20274+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20275+ case $lt_outputfile in
20276+ *.exe|*.EXE) ;;
20277+ *)
20278+ lt_outputfile="$lt_outputfile.exe"
20279+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20280+ ;;
20281+ esac~
20282+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20283+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20284+ $RM "$lt_outputfile.manifest";
20285+ fi'
20286+ ;;
20287+ *)
20288+ # Assume MSVC wrapper
20289+ hardcode_libdir_flag_spec=' '
20290+ allow_undefined_flag=unsupported
20291+ # Tell ltmain to make .lib files, not .a files.
20292+ libext=lib
20293+ # Tell ltmain to make .dll files, not .so files.
20294+ shrext_cmds=".dll"
20295+ # FIXME: Setting linknames here is a bad hack.
20296+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20297+ # The linker will automatically build a .lib file if we build a DLL.
20298+ old_archive_from_new_cmds='true'
20299+ # FIXME: Should let the user specify the lib program.
20300+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20301+ enable_shared_with_static_runtimes=yes
20302+ ;;
20303+ esac
20304 ;;
20305
20306 darwin* | rhapsody*)
20307@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20308
20309 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20310 freebsd* | dragonfly*)
20311- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20312+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20313 hardcode_libdir_flag_spec='-R$libdir'
20314 hardcode_direct=yes
20315 hardcode_shlibpath_var=no
20316@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20317
20318 hpux9*)
20319 if test "$GCC" = yes; then
20320- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20321+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20322 else
20323 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20324 fi
20325@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20326
20327 hpux10*)
20328 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20329- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20330+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20331 else
20332 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20333 fi
20334@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20335 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20336 ;;
20337 ia64*)
20338- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20339+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20340 ;;
20341 *)
20342- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20343+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20344 ;;
20345 esac
20346 else
20347@@ -8761,26 +9344,39 @@ fi
20348
20349 irix5* | irix6* | nonstopux*)
20350 if test "$GCC" = yes; then
20351- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20352+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20353 # Try to use the -exported_symbol ld option, if it does not
20354 # work, assume that -exports_file does not work either and
20355 # implicitly export all symbols.
20356- save_LDFLAGS="$LDFLAGS"
20357- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20358- if test x$gcc_no_link = xyes; then
20359+ # This should be the same for all languages, so no per-tag cache variable.
20360+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20361+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20362+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
20363+ $as_echo_n "(cached) " >&6
20364+else
20365+ save_LDFLAGS="$LDFLAGS"
20366+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20367+ if test x$gcc_no_link = xyes; then
20368 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20369 fi
20370 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20371 /* end confdefs.h. */
20372-int foo(void) {}
20373+int foo (void) { return 0; }
20374 _ACEOF
20375 if ac_fn_c_try_link "$LINENO"; then :
20376- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
20377-
20378+ lt_cv_irix_exported_symbol=yes
20379+else
20380+ lt_cv_irix_exported_symbol=no
20381 fi
20382 rm -f core conftest.err conftest.$ac_objext \
20383 conftest$ac_exeext conftest.$ac_ext
20384- LDFLAGS="$save_LDFLAGS"
20385+ LDFLAGS="$save_LDFLAGS"
20386+fi
20387+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20388+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20389+ if test "$lt_cv_irix_exported_symbol" = yes; then
20390+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
20391+ fi
20392 else
20393 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
20394 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
20395@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \
20396 osf4* | osf5*) # as osf3* with the addition of -msym flag
20397 if test "$GCC" = yes; then
20398 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20399- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20400+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20401 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20402 else
20403 allow_undefined_flag=' -expect_unresolved \*'
20404@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \
20405 no_undefined_flag=' -z defs'
20406 if test "$GCC" = yes; then
20407 wlarc='${wl}'
20408- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20409+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20410 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20411- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20412+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20413 else
20414 case `$CC -V 2>&1` in
20415 *"Compilers 5.0"*)
20416@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20417 need_version=no
20418 need_lib_prefix=no
20419
20420- case $GCC,$host_os in
20421- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20422+ case $GCC,$cc_basename in
20423+ yes,*)
20424+ # gcc
20425 library_names_spec='$libname.dll.a'
20426 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20427 postinstall_cmds='base_file=`basename \${file}`~
20428@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20429 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20430 ;;
20431 esac
20432+ dynamic_linker='Win32 ld.exe'
20433+ ;;
20434+
20435+ *,cl*)
20436+ # Native MSVC
20437+ libname_spec='$name'
20438+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20439+ library_names_spec='${libname}.dll.lib'
20440+
20441+ case $build_os in
20442+ mingw*)
20443+ sys_lib_search_path_spec=
20444+ lt_save_ifs=$IFS
20445+ IFS=';'
20446+ for lt_path in $LIB
20447+ do
20448+ IFS=$lt_save_ifs
20449+ # Let DOS variable expansion print the short 8.3 style file name.
20450+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20451+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20452+ done
20453+ IFS=$lt_save_ifs
20454+ # Convert to MSYS style.
20455+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20456+ ;;
20457+ cygwin*)
20458+ # Convert to unix form, then to dos form, then back to unix form
20459+ # but this time dos style (no spaces!) so that the unix form looks
20460+ # like /cygdrive/c/PROGRA~1:/cygdr...
20461+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20462+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20463+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20464+ ;;
20465+ *)
20466+ sys_lib_search_path_spec="$LIB"
20467+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20468+ # It is most probably a Windows format PATH.
20469+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20470+ else
20471+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20472+ fi
20473+ # FIXME: find the short name or the path components, as spaces are
20474+ # common. (e.g. "Program Files" -> "PROGRA~1")
20475+ ;;
20476+ esac
20477+
20478+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20479+ postinstall_cmds='base_file=`basename \${file}`~
20480+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20481+ dldir=$destdir/`dirname \$dlpath`~
20482+ test -d \$dldir || mkdir -p \$dldir~
20483+ $install_prog $dir/$dlname \$dldir/$dlname'
20484+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20485+ dlpath=$dir/\$dldll~
20486+ $RM \$dlpath'
20487+ shlibpath_overrides_runpath=yes
20488+ dynamic_linker='Win32 link.exe'
20489 ;;
20490
20491 *)
20492+ # Assume MSVC wrapper
20493 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20494+ dynamic_linker='Win32 ld.exe'
20495 ;;
20496 esac
20497- dynamic_linker='Win32 ld.exe'
20498 # FIXME: first we should search . and the directory the executable is in
20499 shlibpath_var=PATH
20500 ;;
20501@@ -9594,7 +10249,7 @@ haiku*)
20502 soname_spec='${libname}${release}${shared_ext}$major'
20503 shlibpath_var=LIBRARY_PATH
20504 shlibpath_overrides_runpath=yes
20505- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20506+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20507 hardcode_into_libs=yes
20508 ;;
20509
20510@@ -10452,10 +11107,10 @@ else
20511 /* When -fvisbility=hidden is used, assume the code has been annotated
20512 correspondingly for the symbols needed. */
20513 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20514-void fnord () __attribute__((visibility("default")));
20515+int fnord () __attribute__((visibility("default")));
20516 #endif
20517
20518-void fnord () { int i=42; }
20519+int fnord () { return 42; }
20520 int main ()
20521 {
20522 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20523@@ -10558,10 +11213,10 @@ else
20524 /* When -fvisbility=hidden is used, assume the code has been annotated
20525 correspondingly for the symbols needed. */
20526 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20527-void fnord () __attribute__((visibility("default")));
20528+int fnord () __attribute__((visibility("default")));
20529 #endif
20530
20531-void fnord () { int i=42; }
20532+int fnord () { return 42; }
20533 int main ()
20534 {
20535 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20536@@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20537 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20538 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20539 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20540+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20541+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20542 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20543 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20544 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20545 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20546 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20547+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20548+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20549+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20550+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20551 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20552 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20553+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20554 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20555 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20556 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20557@@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20558 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20559 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20560 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
20561+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20562+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20563 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20564 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20565 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20566-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20567 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20568+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20569 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20570 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20571 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20572+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20573 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20574 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20575 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20576@@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20577 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20578 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20579 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20580-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20581 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20582 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20583 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20584 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20585 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20586+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20587 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20588 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20589 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20590@@ -12113,8 +12778,13 @@ reload_flag \
20591 OBJDUMP \
20592 deplibs_check_method \
20593 file_magic_cmd \
20594+file_magic_glob \
20595+want_nocaseglob \
20596+DLLTOOL \
20597+sharedlib_from_linklib_cmd \
20598 AR \
20599 AR_FLAGS \
20600+archiver_list_spec \
20601 STRIP \
20602 RANLIB \
20603 CC \
20604@@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \
20605 lt_cv_sys_global_symbol_to_cdecl \
20606 lt_cv_sys_global_symbol_to_c_name_address \
20607 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20608+nm_file_list_spec \
20609 lt_prog_compiler_no_builtin_flag \
20610-lt_prog_compiler_wl \
20611 lt_prog_compiler_pic \
20612+lt_prog_compiler_wl \
20613 lt_prog_compiler_static \
20614 lt_cv_prog_compiler_c_o \
20615 need_locks \
20616+MANIFEST_TOOL \
20617 DSYMUTIL \
20618 NMEDIT \
20619 LIPO \
20620@@ -12145,7 +12817,6 @@ no_undefined_flag \
20621 hardcode_libdir_flag_spec \
20622 hardcode_libdir_flag_spec_ld \
20623 hardcode_libdir_separator \
20624-fix_srcfile_path \
20625 exclude_expsyms \
20626 include_expsyms \
20627 file_list_spec \
20628@@ -12181,6 +12852,7 @@ module_cmds \
20629 module_expsym_cmds \
20630 export_symbols_cmds \
20631 prelink_cmds \
20632+postlink_cmds \
20633 postinstall_cmds \
20634 postuninstall_cmds \
20635 finish_cmds \
20636@@ -12770,7 +13442,8 @@ $as_echo X"$file" |
20637 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20638 #
20639 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20640-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20641+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20642+# Inc.
20643 # Written by Gordon Matzigkeit, 1996
20644 #
20645 # This file is part of GNU Libtool.
20646@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL
20647 # turn newlines into spaces.
20648 NL2SP=$lt_lt_NL2SP
20649
20650+# convert \$build file names to \$host format.
20651+to_host_file_cmd=$lt_cv_to_host_file_cmd
20652+
20653+# convert \$build files to toolchain format.
20654+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20655+
20656 # An object symbol dumper.
20657 OBJDUMP=$lt_OBJDUMP
20658
20659 # Method to check whether dependent libraries are shared objects.
20660 deplibs_check_method=$lt_deplibs_check_method
20661
20662-# Command to use when deplibs_check_method == "file_magic".
20663+# Command to use when deplibs_check_method = "file_magic".
20664 file_magic_cmd=$lt_file_magic_cmd
20665
20666+# How to find potential files when deplibs_check_method = "file_magic".
20667+file_magic_glob=$lt_file_magic_glob
20668+
20669+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20670+want_nocaseglob=$lt_want_nocaseglob
20671+
20672+# DLL creation program.
20673+DLLTOOL=$lt_DLLTOOL
20674+
20675+# Command to associate shared and link libraries.
20676+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20677+
20678 # The archiver.
20679 AR=$lt_AR
20680+
20681+# Flags to create an archive.
20682 AR_FLAGS=$lt_AR_FLAGS
20683
20684+# How to feed a file listing to the archiver.
20685+archiver_list_spec=$lt_archiver_list_spec
20686+
20687 # A symbol stripping program.
20688 STRIP=$lt_STRIP
20689
20690@@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20691 # Transform the output of nm in a C name address pair when lib prefix is needed.
20692 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20693
20694+# Specify filename containing input files for \$NM.
20695+nm_file_list_spec=$lt_nm_file_list_spec
20696+
20697+# The root where to search for dependent libraries,and in which our libraries should be installed.
20698+lt_sysroot=$lt_sysroot
20699+
20700 # The name of the directory that contains temporary libtool files.
20701 objdir=$objdir
20702
20703@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD
20704 # Must we lock files when doing compilation?
20705 need_locks=$lt_need_locks
20706
20707+# Manifest tool.
20708+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20709+
20710 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20711 DSYMUTIL=$lt_DSYMUTIL
20712
20713@@ -13038,12 +13743,12 @@ with_gcc=$GCC
20714 # Compiler flag to turn off builtin functions.
20715 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20716
20717-# How to pass a linker flag through the compiler.
20718-wl=$lt_lt_prog_compiler_wl
20719-
20720 # Additional compiler flags for building library objects.
20721 pic_flag=$lt_lt_prog_compiler_pic
20722
20723+# How to pass a linker flag through the compiler.
20724+wl=$lt_lt_prog_compiler_wl
20725+
20726 # Compiler flag to prevent dynamic linking.
20727 link_static_flag=$lt_lt_prog_compiler_static
20728
20729@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath
20730 # Whether libtool must link a program against all its dependency libraries.
20731 link_all_deplibs=$link_all_deplibs
20732
20733-# Fix the shell variable \$srcfile for the compiler.
20734-fix_srcfile_path=$lt_fix_srcfile_path
20735-
20736 # Set to "yes" if exported symbols are required.
20737 always_export_symbols=$always_export_symbols
20738
20739@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms
20740 # Commands necessary for linking programs (against libraries) with templates.
20741 prelink_cmds=$lt_prelink_cmds
20742
20743+# Commands necessary for finishing linking programs.
20744+postlink_cmds=$lt_postlink_cmds
20745+
20746 # Specify filename containing input files.
20747 file_list_spec=$lt_file_list_spec
20748
20749@@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20750 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20751 # text mode, it properly converts lines to CR/LF. This bash problem
20752 # is reportedly fixed, but why not run on old versions too?
20753- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20754- || (rm -f "$cfgfile"; exit 1)
20755-
20756- case $xsi_shell in
20757- yes)
20758- cat << \_LT_EOF >> "$cfgfile"
20759-
20760-# func_dirname file append nondir_replacement
20761-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20762-# otherwise set result to NONDIR_REPLACEMENT.
20763-func_dirname ()
20764-{
20765- case ${1} in
20766- */*) func_dirname_result="${1%/*}${2}" ;;
20767- * ) func_dirname_result="${3}" ;;
20768- esac
20769-}
20770-
20771-# func_basename file
20772-func_basename ()
20773-{
20774- func_basename_result="${1##*/}"
20775-}
20776-
20777-# func_dirname_and_basename file append nondir_replacement
20778-# perform func_basename and func_dirname in a single function
20779-# call:
20780-# dirname: Compute the dirname of FILE. If nonempty,
20781-# add APPEND to the result, otherwise set result
20782-# to NONDIR_REPLACEMENT.
20783-# value returned in "$func_dirname_result"
20784-# basename: Compute filename of FILE.
20785-# value retuned in "$func_basename_result"
20786-# Implementation must be kept synchronized with func_dirname
20787-# and func_basename. For efficiency, we do not delegate to
20788-# those functions but instead duplicate the functionality here.
20789-func_dirname_and_basename ()
20790-{
20791- case ${1} in
20792- */*) func_dirname_result="${1%/*}${2}" ;;
20793- * ) func_dirname_result="${3}" ;;
20794- esac
20795- func_basename_result="${1##*/}"
20796-}
20797-
20798-# func_stripname prefix suffix name
20799-# strip PREFIX and SUFFIX off of NAME.
20800-# PREFIX and SUFFIX must not contain globbing or regex special
20801-# characters, hashes, percent signs, but SUFFIX may contain a leading
20802-# dot (in which case that matches only a dot).
20803-func_stripname ()
20804-{
20805- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20806- # positional parameters, so assign one to ordinary parameter first.
20807- func_stripname_result=${3}
20808- func_stripname_result=${func_stripname_result#"${1}"}
20809- func_stripname_result=${func_stripname_result%"${2}"}
20810-}
20811-
20812-# func_opt_split
20813-func_opt_split ()
20814-{
20815- func_opt_split_opt=${1%%=*}
20816- func_opt_split_arg=${1#*=}
20817-}
20818-
20819-# func_lo2o object
20820-func_lo2o ()
20821-{
20822- case ${1} in
20823- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20824- *) func_lo2o_result=${1} ;;
20825- esac
20826-}
20827-
20828-# func_xform libobj-or-source
20829-func_xform ()
20830-{
20831- func_xform_result=${1%.*}.lo
20832-}
20833-
20834-# func_arith arithmetic-term...
20835-func_arith ()
20836-{
20837- func_arith_result=$(( $* ))
20838-}
20839-
20840-# func_len string
20841-# STRING may not start with a hyphen.
20842-func_len ()
20843-{
20844- func_len_result=${#1}
20845-}
20846-
20847-_LT_EOF
20848- ;;
20849- *) # Bourne compatible functions.
20850- cat << \_LT_EOF >> "$cfgfile"
20851-
20852-# func_dirname file append nondir_replacement
20853-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20854-# otherwise set result to NONDIR_REPLACEMENT.
20855-func_dirname ()
20856-{
20857- # Extract subdirectory from the argument.
20858- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20859- if test "X$func_dirname_result" = "X${1}"; then
20860- func_dirname_result="${3}"
20861- else
20862- func_dirname_result="$func_dirname_result${2}"
20863- fi
20864-}
20865-
20866-# func_basename file
20867-func_basename ()
20868-{
20869- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20870-}
20871-
20872-
20873-# func_stripname prefix suffix name
20874-# strip PREFIX and SUFFIX off of NAME.
20875-# PREFIX and SUFFIX must not contain globbing or regex special
20876-# characters, hashes, percent signs, but SUFFIX may contain a leading
20877-# dot (in which case that matches only a dot).
20878-# func_strip_suffix prefix name
20879-func_stripname ()
20880-{
20881- case ${2} in
20882- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20883- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20884- esac
20885-}
20886-
20887-# sed scripts:
20888-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20889-my_sed_long_arg='1s/^-[^=]*=//'
20890-
20891-# func_opt_split
20892-func_opt_split ()
20893-{
20894- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
20895- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
20896-}
20897-
20898-# func_lo2o object
20899-func_lo2o ()
20900-{
20901- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
20902-}
20903-
20904-# func_xform libobj-or-source
20905-func_xform ()
20906-{
20907- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
20908-}
20909-
20910-# func_arith arithmetic-term...
20911-func_arith ()
20912-{
20913- func_arith_result=`expr "$@"`
20914-}
20915-
20916-# func_len string
20917-# STRING may not start with a hyphen.
20918-func_len ()
20919-{
20920- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
20921-}
20922-
20923-_LT_EOF
20924-esac
20925-
20926-case $lt_shell_append in
20927- yes)
20928- cat << \_LT_EOF >> "$cfgfile"
20929-
20930-# func_append var value
20931-# Append VALUE to the end of shell variable VAR.
20932-func_append ()
20933-{
20934- eval "$1+=\$2"
20935-}
20936-_LT_EOF
20937- ;;
20938- *)
20939- cat << \_LT_EOF >> "$cfgfile"
20940-
20941-# func_append var value
20942-# Append VALUE to the end of shell variable VAR.
20943-func_append ()
20944-{
20945- eval "$1=\$$1\$2"
20946-}
20947-
20948-_LT_EOF
20949- ;;
20950- esac
20951-
20952-
20953- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
20954- || (rm -f "$cfgfile"; exit 1)
20955-
20956- mv -f "$cfgfile" "$ofile" ||
20957+ sed '$q' "$ltmain" >> "$cfgfile" \
20958+ || (rm -f "$cfgfile"; exit 1)
20959+
20960+ if test x"$xsi_shell" = xyes; then
20961+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
20962+func_dirname ()\
20963+{\
20964+\ case ${1} in\
20965+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20966+\ * ) func_dirname_result="${3}" ;;\
20967+\ esac\
20968+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
20969+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20970+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20971+test 0 -eq $? || _lt_function_replace_fail=:
20972+
20973+
20974+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
20975+func_basename ()\
20976+{\
20977+\ func_basename_result="${1##*/}"\
20978+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
20979+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20980+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20981+test 0 -eq $? || _lt_function_replace_fail=:
20982+
20983+
20984+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
20985+func_dirname_and_basename ()\
20986+{\
20987+\ case ${1} in\
20988+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20989+\ * ) func_dirname_result="${3}" ;;\
20990+\ esac\
20991+\ func_basename_result="${1##*/}"\
20992+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
20993+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20994+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20995+test 0 -eq $? || _lt_function_replace_fail=:
20996+
20997+
20998+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
20999+func_stripname ()\
21000+{\
21001+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21002+\ # positional parameters, so assign one to ordinary parameter first.\
21003+\ func_stripname_result=${3}\
21004+\ func_stripname_result=${func_stripname_result#"${1}"}\
21005+\ func_stripname_result=${func_stripname_result%"${2}"}\
21006+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21007+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21008+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21009+test 0 -eq $? || _lt_function_replace_fail=:
21010+
21011+
21012+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21013+func_split_long_opt ()\
21014+{\
21015+\ func_split_long_opt_name=${1%%=*}\
21016+\ func_split_long_opt_arg=${1#*=}\
21017+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21018+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21019+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21020+test 0 -eq $? || _lt_function_replace_fail=:
21021+
21022+
21023+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21024+func_split_short_opt ()\
21025+{\
21026+\ func_split_short_opt_arg=${1#??}\
21027+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21028+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21029+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21030+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21031+test 0 -eq $? || _lt_function_replace_fail=:
21032+
21033+
21034+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21035+func_lo2o ()\
21036+{\
21037+\ case ${1} in\
21038+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21039+\ *) func_lo2o_result=${1} ;;\
21040+\ esac\
21041+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21042+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21043+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21044+test 0 -eq $? || _lt_function_replace_fail=:
21045+
21046+
21047+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21048+func_xform ()\
21049+{\
21050+ func_xform_result=${1%.*}.lo\
21051+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21052+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21053+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21054+test 0 -eq $? || _lt_function_replace_fail=:
21055+
21056+
21057+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21058+func_arith ()\
21059+{\
21060+ func_arith_result=$(( $* ))\
21061+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21062+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21063+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21064+test 0 -eq $? || _lt_function_replace_fail=:
21065+
21066+
21067+ sed -e '/^func_len ()$/,/^} # func_len /c\
21068+func_len ()\
21069+{\
21070+ func_len_result=${#1}\
21071+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21072+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21073+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21074+test 0 -eq $? || _lt_function_replace_fail=:
21075+
21076+fi
21077+
21078+if test x"$lt_shell_append" = xyes; then
21079+ sed -e '/^func_append ()$/,/^} # func_append /c\
21080+func_append ()\
21081+{\
21082+ eval "${1}+=\\${2}"\
21083+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21084+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21085+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21086+test 0 -eq $? || _lt_function_replace_fail=:
21087+
21088+
21089+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21090+func_append_quoted ()\
21091+{\
21092+\ func_quote_for_eval "${2}"\
21093+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21094+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21095+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21096+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21097+test 0 -eq $? || _lt_function_replace_fail=:
21098+
21099+
21100+ # Save a `func_append' function call where possible by direct use of '+='
21101+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21102+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21103+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21104+ test 0 -eq $? || _lt_function_replace_fail=:
21105+else
21106+ # Save a `func_append' function call even when '+=' is not available
21107+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21108+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21109+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21110+ test 0 -eq $? || _lt_function_replace_fail=:
21111+fi
21112+
21113+if test x"$_lt_function_replace_fail" = x":"; then
21114+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21115+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21116+fi
21117+
21118+
21119+ mv -f "$cfgfile" "$ofile" ||
21120 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21121 chmod +x "$ofile"
21122
21123--
211242.12.0
21125
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-26 09:13:10 +0000