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-03-07 00:20:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit4485ea5807dd99b7f140b06b35654a6a70c286e4 (patch)
tree40e240190a18121f3ace7a528e9d836fc3762eb3 /meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
parentee18a2b23391a5308abd9bd817d2e2471ce00270 (diff)
downloadpoky-4485ea5807dd99b7f140b06b35654a6a70c286e4.tar.gz
binutils: Upgrade to 2.28 release
(From OE-Core rev: e9f839d5fe70a222cc7b8942f401ac86a10e6604) 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.patch21137
1 files changed, 21137 insertions, 0 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
new file mode 100644
index 0000000000..6b7f753891
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
@@ -0,0 +1,21137 @@
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@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5898 lt_cv_deplibs_check_method=pass_all
5899 ;;
5900
5901-linux-uclibc*)
5902- lt_cv_deplibs_check_method=pass_all
5903- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5904- ;;
5905-
5906 netbsd*)
5907 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5908 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5909@@ -5956,6 +6037,21 @@ esac
5910 fi
5911 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5912 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5913+
5914+file_magic_glob=
5915+want_nocaseglob=no
5916+if test "$build" = "$host"; then
5917+ case $host_os in
5918+ mingw* | pw32*)
5919+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5920+ want_nocaseglob=yes
5921+ else
5922+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5923+ fi
5924+ ;;
5925+ esac
5926+fi
5927+
5928 file_magic_cmd=$lt_cv_file_magic_cmd
5929 deplibs_check_method=$lt_cv_deplibs_check_method
5930 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5931@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5932
5933
5934
5935+
5936+
5937+
5938+
5939+
5940+
5941+
5942+
5943+
5944+
5945+if test -n "$ac_tool_prefix"; then
5946+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5947+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5948+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5949+$as_echo_n "checking for $ac_word... " >&6; }
5950+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5951+ $as_echo_n "(cached) " >&6
5952+else
5953+ if test -n "$DLLTOOL"; then
5954+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
5955+else
5956+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5957+for as_dir in $PATH
5958+do
5959+ IFS=$as_save_IFS
5960+ test -z "$as_dir" && as_dir=.
5961+ for ac_exec_ext in '' $ac_executable_extensions; do
5962+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5963+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5964+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5965+ break 2
5966+ fi
5967+done
5968+ done
5969+IFS=$as_save_IFS
5970+
5971+fi
5972+fi
5973+DLLTOOL=$ac_cv_prog_DLLTOOL
5974+if test -n "$DLLTOOL"; then
5975+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
5976+$as_echo "$DLLTOOL" >&6; }
5977+else
5978+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5979+$as_echo "no" >&6; }
5980+fi
5981+
5982+
5983+fi
5984+if test -z "$ac_cv_prog_DLLTOOL"; then
5985+ ac_ct_DLLTOOL=$DLLTOOL
5986+ # Extract the first word of "dlltool", so it can be a program name with args.
5987+set dummy dlltool; ac_word=$2
5988+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5989+$as_echo_n "checking for $ac_word... " >&6; }
5990+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
5991+ $as_echo_n "(cached) " >&6
5992+else
5993+ if test -n "$ac_ct_DLLTOOL"; then
5994+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
5995+else
5996+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5997+for as_dir in $PATH
5998+do
5999+ IFS=$as_save_IFS
6000+ test -z "$as_dir" && as_dir=.
6001+ for ac_exec_ext in '' $ac_executable_extensions; do
6002+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6003+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6004+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6005+ break 2
6006+ fi
6007+done
6008+ done
6009+IFS=$as_save_IFS
6010+
6011+fi
6012+fi
6013+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6014+if test -n "$ac_ct_DLLTOOL"; then
6015+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6016+$as_echo "$ac_ct_DLLTOOL" >&6; }
6017+else
6018+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6019+$as_echo "no" >&6; }
6020+fi
6021+
6022+ if test "x$ac_ct_DLLTOOL" = x; then
6023+ DLLTOOL="false"
6024+ else
6025+ case $cross_compiling:$ac_tool_warned in
6026+yes:)
6027+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6028+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6029+ac_tool_warned=yes ;;
6030+esac
6031+ DLLTOOL=$ac_ct_DLLTOOL
6032+ fi
6033+else
6034+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6035+fi
6036+
6037+test -z "$DLLTOOL" && DLLTOOL=dlltool
6038+
6039+
6040+
6041+
6042+
6043+
6044+
6045+
6046+
6047+
6048+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6049+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6050+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6051+ $as_echo_n "(cached) " >&6
6052+else
6053+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6054+
6055+case $host_os in
6056+cygwin* | mingw* | pw32* | cegcc*)
6057+ # two different shell functions defined in ltmain.sh
6058+ # decide which to use based on capabilities of $DLLTOOL
6059+ case `$DLLTOOL --help 2>&1` in
6060+ *--identify-strict*)
6061+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6062+ ;;
6063+ *)
6064+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6065+ ;;
6066+ esac
6067+ ;;
6068+*)
6069+ # fallback: assume linklib IS sharedlib
6070+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6071+ ;;
6072+esac
6073+
6074+fi
6075+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6076+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6077+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6078+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6079+
6080+
6081+
6082+
6083+
6084+
6085+
6086 if test -n "$ac_tool_prefix"; then
6087- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6088-set dummy ${ac_tool_prefix}ar; ac_word=$2
6089+ for ac_prog in ar
6090+ do
6091+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6092+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6094 $as_echo_n "checking for $ac_word... " >&6; }
6095 if test "${ac_cv_prog_AR+set}" = set; then :
6096@@ -5989,7 +6238,7 @@ do
6097 test -z "$as_dir" && as_dir=.
6098 for ac_exec_ext in '' $ac_executable_extensions; do
6099 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6100- ac_cv_prog_AR="${ac_tool_prefix}ar"
6101+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6102 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6103 break 2
6104 fi
6105@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; }
6106 fi
6107
6108
6109+ test -n "$AR" && break
6110+ done
6111 fi
6112-if test -z "$ac_cv_prog_AR"; then
6113+if test -z "$AR"; then
6114 ac_ct_AR=$AR
6115- # Extract the first word of "ar", so it can be a program name with args.
6116-set dummy ar; ac_word=$2
6117+ for ac_prog in ar
6118+do
6119+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6120+set dummy $ac_prog; ac_word=$2
6121 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6122 $as_echo_n "checking for $ac_word... " >&6; }
6123 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6124@@ -6029,7 +6282,7 @@ do
6125 test -z "$as_dir" && as_dir=.
6126 for ac_exec_ext in '' $ac_executable_extensions; do
6127 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6128- ac_cv_prog_ac_ct_AR="ar"
6129+ ac_cv_prog_ac_ct_AR="$ac_prog"
6130 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6131 break 2
6132 fi
6133@@ -6048,6 +6301,10 @@ else
6134 $as_echo "no" >&6; }
6135 fi
6136
6137+
6138+ test -n "$ac_ct_AR" && break
6139+done
6140+
6141 if test "x$ac_ct_AR" = x; then
6142 AR="false"
6143 else
6144@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;;
6145 esac
6146 AR=$ac_ct_AR
6147 fi
6148-else
6149- AR="$ac_cv_prog_AR"
6150 fi
6151
6152-test -z "$AR" && AR=ar
6153-test -z "$AR_FLAGS" && AR_FLAGS=cru
6154+: ${AR=ar}
6155+: ${AR_FLAGS=cru}
6156
6157
6158
6159@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6160
6161
6162
6163+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6164+$as_echo_n "checking for archiver @FILE support... " >&6; }
6165+if test "${lt_cv_ar_at_file+set}" = set; then :
6166+ $as_echo_n "(cached) " >&6
6167+else
6168+ lt_cv_ar_at_file=no
6169+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6170+/* end confdefs.h. */
6171+
6172+int
6173+main ()
6174+{
6175+
6176+ ;
6177+ return 0;
6178+}
6179+_ACEOF
6180+if ac_fn_c_try_compile "$LINENO"; then :
6181+ echo conftest.$ac_objext > conftest.lst
6182+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6183+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6184+ (eval $lt_ar_try) 2>&5
6185+ ac_status=$?
6186+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6187+ test $ac_status = 0; }
6188+ if test "$ac_status" -eq 0; then
6189+ # Ensure the archiver fails upon bogus file names.
6190+ rm -f conftest.$ac_objext libconftest.a
6191+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6192+ (eval $lt_ar_try) 2>&5
6193+ ac_status=$?
6194+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6195+ test $ac_status = 0; }
6196+ if test "$ac_status" -ne 0; then
6197+ lt_cv_ar_at_file=@
6198+ fi
6199+ fi
6200+ rm -f conftest.* libconftest.a
6201+
6202+fi
6203+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6204+
6205+fi
6206+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6207+$as_echo "$lt_cv_ar_at_file" >&6; }
6208+
6209+if test "x$lt_cv_ar_at_file" = xno; then
6210+ archiver_list_spec=
6211+else
6212+ archiver_list_spec=$lt_cv_ar_at_file
6213+fi
6214+
6215+
6216+
6217+
6218+
6219+
6220+
6221 if test -n "$ac_tool_prefix"; then
6222 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6223 set dummy ${ac_tool_prefix}strip; ac_word=$2
6224@@ -6410,8 +6723,8 @@ esac
6225 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6226
6227 # Transform an extracted symbol line into symbol name and symbol address
6228-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6229-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'"
6230+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6231+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'"
6232
6233 # Handle CRLF in mingw tool chain
6234 opt_cr=
6235@@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do
6236 else
6237 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6238 fi
6239+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6240
6241 # Check to see that the pipe works correctly.
6242 pipe_works=no
6243@@ -6488,6 +6802,18 @@ _LT_EOF
6244 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6245 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6246 cat <<_LT_EOF > conftest.$ac_ext
6247+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6248+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6249+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6250+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6251+# define LT_DLSYM_CONST
6252+#elif defined(__osf__)
6253+/* This system does not cope well with relocations in const data. */
6254+# define LT_DLSYM_CONST
6255+#else
6256+# define LT_DLSYM_CONST const
6257+#endif
6258+
6259 #ifdef __cplusplus
6260 extern "C" {
6261 #endif
6262@@ -6499,7 +6825,7 @@ _LT_EOF
6263 cat <<_LT_EOF >> conftest.$ac_ext
6264
6265 /* The mapping between symbol names and symbols. */
6266-const struct {
6267+LT_DLSYM_CONST struct {
6268 const char *name;
6269 void *address;
6270 }
6271@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() {
6272 _LT_EOF
6273 # Now try linking the two files.
6274 mv conftest.$ac_objext conftstm.$ac_objext
6275- lt_save_LIBS="$LIBS"
6276- lt_save_CFLAGS="$CFLAGS"
6277+ lt_globsym_save_LIBS=$LIBS
6278+ lt_globsym_save_CFLAGS=$CFLAGS
6279 LIBS="conftstm.$ac_objext"
6280 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6281 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6282@@ -6536,8 +6862,8 @@ _LT_EOF
6283 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6284 pipe_works=yes
6285 fi
6286- LIBS="$lt_save_LIBS"
6287- CFLAGS="$lt_save_CFLAGS"
6288+ LIBS=$lt_globsym_save_LIBS
6289+ CFLAGS=$lt_globsym_save_CFLAGS
6290 else
6291 echo "cannot find nm_test_func in $nlist" >&5
6292 fi
6293@@ -6574,6 +6900,18 @@ else
6294 $as_echo "ok" >&6; }
6295 fi
6296
6297+# Response file support.
6298+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6299+ nm_file_list_spec='@'
6300+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6301+ nm_file_list_spec='@'
6302+fi
6303+
6304+
6305+
6306+
6307+
6308+
6309
6310
6311
6312@@ -6595,6 +6933,43 @@ fi
6313
6314
6315
6316+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6317+$as_echo_n "checking for sysroot... " >&6; }
6318+
6319+# Check whether --with-libtool-sysroot was given.
6320+if test "${with_libtool_sysroot+set}" = set; then :
6321+ withval=$with_libtool_sysroot;
6322+else
6323+ with_libtool_sysroot=no
6324+fi
6325+
6326+
6327+lt_sysroot=
6328+case ${with_libtool_sysroot} in #(
6329+ yes)
6330+ if test "$GCC" = yes; then
6331+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6332+ fi
6333+ ;; #(
6334+ /*)
6335+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6336+ ;; #(
6337+ no|'')
6338+ ;; #(
6339+ *)
6340+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6341+$as_echo "${with_libtool_sysroot}" >&6; }
6342+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6343+ ;;
6344+esac
6345+
6346+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6347+$as_echo "${lt_sysroot:-no}" >&6; }
6348+
6349+
6350+
6351+
6352+
6353 # Check whether --enable-libtool-lock was given.
6354 if test "${enable_libtool_lock+set}" = set; then :
6355 enableval=$enable_libtool_lock;
6356@@ -6801,6 +7176,123 @@ esac
6357
6358 need_locks="$enable_libtool_lock"
6359
6360+if test -n "$ac_tool_prefix"; then
6361+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6362+set dummy ${ac_tool_prefix}mt; ac_word=$2
6363+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6364+$as_echo_n "checking for $ac_word... " >&6; }
6365+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6366+ $as_echo_n "(cached) " >&6
6367+else
6368+ if test -n "$MANIFEST_TOOL"; then
6369+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6370+else
6371+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6372+for as_dir in $PATH
6373+do
6374+ IFS=$as_save_IFS
6375+ test -z "$as_dir" && as_dir=.
6376+ for ac_exec_ext in '' $ac_executable_extensions; do
6377+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6378+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6379+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6380+ break 2
6381+ fi
6382+done
6383+ done
6384+IFS=$as_save_IFS
6385+
6386+fi
6387+fi
6388+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6389+if test -n "$MANIFEST_TOOL"; then
6390+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6391+$as_echo "$MANIFEST_TOOL" >&6; }
6392+else
6393+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6394+$as_echo "no" >&6; }
6395+fi
6396+
6397+
6398+fi
6399+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6400+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6401+ # Extract the first word of "mt", so it can be a program name with args.
6402+set dummy mt; ac_word=$2
6403+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6404+$as_echo_n "checking for $ac_word... " >&6; }
6405+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6406+ $as_echo_n "(cached) " >&6
6407+else
6408+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6409+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6410+else
6411+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6412+for as_dir in $PATH
6413+do
6414+ IFS=$as_save_IFS
6415+ test -z "$as_dir" && as_dir=.
6416+ for ac_exec_ext in '' $ac_executable_extensions; do
6417+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6418+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6419+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6420+ break 2
6421+ fi
6422+done
6423+ done
6424+IFS=$as_save_IFS
6425+
6426+fi
6427+fi
6428+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6429+if test -n "$ac_ct_MANIFEST_TOOL"; then
6430+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6431+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6432+else
6433+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6434+$as_echo "no" >&6; }
6435+fi
6436+
6437+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6438+ MANIFEST_TOOL=":"
6439+ else
6440+ case $cross_compiling:$ac_tool_warned in
6441+yes:)
6442+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6443+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6444+ac_tool_warned=yes ;;
6445+esac
6446+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6447+ fi
6448+else
6449+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6450+fi
6451+
6452+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6454+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6455+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6456+ $as_echo_n "(cached) " >&6
6457+else
6458+ lt_cv_path_mainfest_tool=no
6459+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6460+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6461+ cat conftest.err >&5
6462+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6463+ lt_cv_path_mainfest_tool=yes
6464+ fi
6465+ rm -f conftest*
6466+fi
6467+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6468+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6469+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6470+ MANIFEST_TOOL=:
6471+fi
6472+
6473+
6474+
6475+
6476+
6477
6478 case $host_os in
6479 rhapsody* | darwin*)
6480@@ -7364,6 +7856,8 @@ _LT_EOF
6481 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6482 echo "$AR cru libconftest.a conftest.o" >&5
6483 $AR cru libconftest.a conftest.o 2>&5
6484+ echo "$RANLIB libconftest.a" >&5
6485+ $RANLIB libconftest.a 2>&5
6486 cat > conftest.c << _LT_EOF
6487 int main() { return 0;}
6488 _LT_EOF
6489@@ -7559,7 +8053,8 @@ fi
6490 LIBTOOL_DEPS="$ltmain"
6491
6492 # Always use our own libtool.
6493-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6494+LIBTOOL='$(SHELL) $(top_builddir)'
6495+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6496
6497
6498
6499@@ -7648,7 +8143,7 @@ aix3*)
6500 esac
6501
6502 # Global variables:
6503-ofile=libtool
6504+ofile=${host_alias}-libtool
6505 can_build_shared=yes
6506
6507 # All known linkers require a `.a' archive for static linking (except MSVC,
6508@@ -7946,8 +8441,6 @@ fi
6509 lt_prog_compiler_pic=
6510 lt_prog_compiler_static=
6511
6512-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6513-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6514
6515 if test "$GCC" = yes; then
6516 lt_prog_compiler_wl='-Wl,'
6517@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6518 lt_prog_compiler_pic='--shared'
6519 lt_prog_compiler_static='--static'
6520 ;;
6521+ nagfor*)
6522+ # NAG Fortran compiler
6523+ lt_prog_compiler_wl='-Wl,-Wl,,'
6524+ lt_prog_compiler_pic='-PIC'
6525+ lt_prog_compiler_static='-Bstatic'
6526+ ;;
6527 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6528 # Portland Group compilers (*not* the Pentium gcc compiler,
6529 # which looks to be a dead project)
6530@@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6531 lt_prog_compiler_pic='-KPIC'
6532 lt_prog_compiler_static='-Bstatic'
6533 case $cc_basename in
6534- f77* | f90* | f95*)
6535+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6536 lt_prog_compiler_wl='-Qoption ld ';;
6537 *)
6538 lt_prog_compiler_wl='-Wl,';;
6539@@ -8232,13 +8731,17 @@ case $host_os in
6540 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6541 ;;
6542 esac
6543-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6544-$as_echo "$lt_prog_compiler_pic" >&6; }
6545-
6546-
6547-
6548-
6549
6550+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6551+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6552+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6553+ $as_echo_n "(cached) " >&6
6554+else
6555+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6556+fi
6557+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6558+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6559+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6560
6561 #
6562 # Check to make sure the PIC flag actually works.
6563@@ -8299,6 +8802,11 @@ fi
6564
6565
6566
6567+
6568+
6569+
6570+
6571+
6572 #
6573 # Check to make sure the static flag actually works.
6574 #
6575@@ -8649,7 +9157,8 @@ _LT_EOF
6576 allow_undefined_flag=unsupported
6577 always_export_symbols=no
6578 enable_shared_with_static_runtimes=yes
6579- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6580+ 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'
6581+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6582
6583 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6584 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6585@@ -8748,12 +9257,12 @@ _LT_EOF
6586 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6587 hardcode_libdir_flag_spec=
6588 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6589- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6590+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6591 if test "x$supports_anon_versioning" = xyes; then
6592 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6593 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6594 echo "local: *; };" >> $output_objdir/$libname.ver~
6595- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6596+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6597 fi
6598 ;;
6599 esac
6600@@ -8767,8 +9276,8 @@ _LT_EOF
6601 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6602 wlarc=
6603 else
6604- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6605- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6606+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6607+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6608 fi
6609 ;;
6610
6611@@ -8786,8 +9295,8 @@ _LT_EOF
6612
6613 _LT_EOF
6614 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6615- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6616- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6617+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6618+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6619 else
6620 ld_shlibs=no
6621 fi
6622@@ -8833,8 +9342,8 @@ _LT_EOF
6623
6624 *)
6625 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6626- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6627- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6628+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6629+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6630 else
6631 ld_shlibs=no
6632 fi
6633@@ -8964,7 +9473,13 @@ _LT_EOF
6634 allow_undefined_flag='-berok'
6635 # Determine the default libpath from the value encoded in an
6636 # empty executable.
6637- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6638+ if test "${lt_cv_aix_libpath+set}" = set; then
6639+ aix_libpath=$lt_cv_aix_libpath
6640+else
6641+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6642+ $as_echo_n "(cached) " >&6
6643+else
6644+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6645 /* end confdefs.h. */
6646
6647 int
6648@@ -8977,22 +9492,29 @@ main ()
6649 _ACEOF
6650 if ac_fn_c_try_link "$LINENO"; then :
6651
6652-lt_aix_libpath_sed='
6653- /Import File Strings/,/^$/ {
6654- /^0/ {
6655- s/^0 *\(.*\)$/\1/
6656- p
6657- }
6658- }'
6659-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 "$aix_libpath"; then
6662- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6663-fi
6664+ lt_aix_libpath_sed='
6665+ /Import File Strings/,/^$/ {
6666+ /^0/ {
6667+ s/^0 *\([^ ]*\) *$/\1/
6668+ p
6669+ }
6670+ }'
6671+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6672+ # Check for a 64-bit object if we didn't find anything.
6673+ if test -z "$lt_cv_aix_libpath_"; then
6674+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6675+ fi
6676 fi
6677 rm -f core conftest.err conftest.$ac_objext \
6678 conftest$ac_exeext conftest.$ac_ext
6679-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6680+ if test -z "$lt_cv_aix_libpath_"; then
6681+ lt_cv_aix_libpath_="/usr/lib:/lib"
6682+ fi
6683+
6684+fi
6685+
6686+ aix_libpath=$lt_cv_aix_libpath_
6687+fi
6688
6689 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6690 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"
6691@@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6692 else
6693 # Determine the default libpath from the value encoded in an
6694 # empty executable.
6695- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6696+ if test "${lt_cv_aix_libpath+set}" = set; then
6697+ aix_libpath=$lt_cv_aix_libpath
6698+else
6699+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6700+ $as_echo_n "(cached) " >&6
6701+else
6702+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6703 /* end confdefs.h. */
6704
6705 int
6706@@ -9017,22 +9545,29 @@ main ()
6707 _ACEOF
6708 if ac_fn_c_try_link "$LINENO"; then :
6709
6710-lt_aix_libpath_sed='
6711- /Import File Strings/,/^$/ {
6712- /^0/ {
6713- s/^0 *\(.*\)$/\1/
6714- p
6715- }
6716- }'
6717-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 "$aix_libpath"; then
6720- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6721-fi
6722+ lt_aix_libpath_sed='
6723+ /Import File Strings/,/^$/ {
6724+ /^0/ {
6725+ s/^0 *\([^ ]*\) *$/\1/
6726+ p
6727+ }
6728+ }'
6729+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6730+ # Check for a 64-bit object if we didn't find anything.
6731+ if test -z "$lt_cv_aix_libpath_"; then
6732+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6733+ fi
6734 fi
6735 rm -f core conftest.err conftest.$ac_objext \
6736 conftest$ac_exeext conftest.$ac_ext
6737-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6738+ if test -z "$lt_cv_aix_libpath_"; then
6739+ lt_cv_aix_libpath_="/usr/lib:/lib"
6740+ fi
6741+
6742+fi
6743+
6744+ aix_libpath=$lt_cv_aix_libpath_
6745+fi
6746
6747 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6748 # Warning - without using the other run time loading flags,
6749@@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6750 # Microsoft Visual C++.
6751 # hardcode_libdir_flag_spec is actually meaningless, as there is
6752 # no search path for DLLs.
6753- hardcode_libdir_flag_spec=' '
6754- allow_undefined_flag=unsupported
6755- # Tell ltmain to make .lib files, not .a files.
6756- libext=lib
6757- # Tell ltmain to make .dll files, not .so files.
6758- shrext_cmds=".dll"
6759- # FIXME: Setting linknames here is a bad hack.
6760- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6761- # The linker will automatically build a .lib file if we build a DLL.
6762- old_archive_from_new_cmds='true'
6763- # FIXME: Should let the user specify the lib program.
6764- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6765- fix_srcfile_path='`cygpath -w "$srcfile"`'
6766- enable_shared_with_static_runtimes=yes
6767+ case $cc_basename in
6768+ cl*)
6769+ # Native MSVC
6770+ hardcode_libdir_flag_spec=' '
6771+ allow_undefined_flag=unsupported
6772+ always_export_symbols=yes
6773+ file_list_spec='@'
6774+ # Tell ltmain to make .lib files, not .a files.
6775+ libext=lib
6776+ # Tell ltmain to make .dll files, not .so files.
6777+ shrext_cmds=".dll"
6778+ # FIXME: Setting linknames here is a bad hack.
6779+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6780+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6781+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6782+ else
6783+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6784+ fi~
6785+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6786+ linknames='
6787+ # The linker will not automatically build a static lib if we build a DLL.
6788+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6789+ enable_shared_with_static_runtimes=yes
6790+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6791+ # Don't use ranlib
6792+ old_postinstall_cmds='chmod 644 $oldlib'
6793+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6794+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6795+ case $lt_outputfile in
6796+ *.exe|*.EXE) ;;
6797+ *)
6798+ lt_outputfile="$lt_outputfile.exe"
6799+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6800+ ;;
6801+ esac~
6802+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6803+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6804+ $RM "$lt_outputfile.manifest";
6805+ fi'
6806+ ;;
6807+ *)
6808+ # Assume MSVC wrapper
6809+ hardcode_libdir_flag_spec=' '
6810+ allow_undefined_flag=unsupported
6811+ # Tell ltmain to make .lib files, not .a files.
6812+ libext=lib
6813+ # Tell ltmain to make .dll files, not .so files.
6814+ shrext_cmds=".dll"
6815+ # FIXME: Setting linknames here is a bad hack.
6816+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6817+ # The linker will automatically build a .lib file if we build a DLL.
6818+ old_archive_from_new_cmds='true'
6819+ # FIXME: Should let the user specify the lib program.
6820+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6821+ enable_shared_with_static_runtimes=yes
6822+ ;;
6823+ esac
6824 ;;
6825
6826 darwin* | rhapsody*)
6827@@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6828
6829 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6830 freebsd* | dragonfly*)
6831- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6832+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6833 hardcode_libdir_flag_spec='-R$libdir'
6834 hardcode_direct=yes
6835 hardcode_shlibpath_var=no
6836@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6837
6838 hpux9*)
6839 if test "$GCC" = yes; then
6840- 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'
6841+ 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'
6842 else
6843 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'
6844 fi
6845@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6846
6847 hpux10*)
6848 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6849- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6850+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6851 else
6852 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6853 fi
6854@@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6855 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6856 ;;
6857 ia64*)
6858- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6859+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6860 ;;
6861 *)
6862- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6863+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6864 ;;
6865 esac
6866 else
6867@@ -9281,23 +9859,36 @@ fi
6868
6869 irix5* | irix6* | nonstopux*)
6870 if test "$GCC" = yes; then
6871- 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'
6872+ 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'
6873 # Try to use the -exported_symbol ld option, if it does not
6874 # work, assume that -exports_file does not work either and
6875 # implicitly export all symbols.
6876- save_LDFLAGS="$LDFLAGS"
6877- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6878- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6879+ # This should be the same for all languages, so no per-tag cache variable.
6880+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6881+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6882+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6883+ $as_echo_n "(cached) " >&6
6884+else
6885+ save_LDFLAGS="$LDFLAGS"
6886+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6887+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6888 /* end confdefs.h. */
6889-int foo(void) {}
6890+int foo (void) { return 0; }
6891 _ACEOF
6892 if ac_fn_c_try_link "$LINENO"; then :
6893- 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'
6894-
6895+ lt_cv_irix_exported_symbol=yes
6896+else
6897+ lt_cv_irix_exported_symbol=no
6898 fi
6899 rm -f core conftest.err conftest.$ac_objext \
6900 conftest$ac_exeext conftest.$ac_ext
6901- LDFLAGS="$save_LDFLAGS"
6902+ LDFLAGS="$save_LDFLAGS"
6903+fi
6904+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6905+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6906+ if test "$lt_cv_irix_exported_symbol" = yes; then
6907+ 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'
6908+ fi
6909 else
6910 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'
6911 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'
6912@@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \
6913 osf4* | osf5*) # as osf3* with the addition of -msym flag
6914 if test "$GCC" = yes; then
6915 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6916- 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'
6917+ 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'
6918 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6919 else
6920 allow_undefined_flag=' -expect_unresolved \*'
6921@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \
6922 no_undefined_flag=' -z defs'
6923 if test "$GCC" = yes; then
6924 wlarc='${wl}'
6925- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6926+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6927 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6928- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6929+ $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'
6930 else
6931 case `$CC -V 2>&1` in
6932 *"Compilers 5.0"*)
6933@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6934 need_version=no
6935 need_lib_prefix=no
6936
6937- case $GCC,$host_os in
6938- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6939+ case $GCC,$cc_basename in
6940+ yes,*)
6941+ # gcc
6942 library_names_spec='$libname.dll.a'
6943 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6944 postinstall_cmds='base_file=`basename \${file}`~
6945@@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6946 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6947 ;;
6948 esac
6949+ dynamic_linker='Win32 ld.exe'
6950+ ;;
6951+
6952+ *,cl*)
6953+ # Native MSVC
6954+ libname_spec='$name'
6955+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6956+ library_names_spec='${libname}.dll.lib'
6957+
6958+ case $build_os in
6959+ mingw*)
6960+ sys_lib_search_path_spec=
6961+ lt_save_ifs=$IFS
6962+ IFS=';'
6963+ for lt_path in $LIB
6964+ do
6965+ IFS=$lt_save_ifs
6966+ # Let DOS variable expansion print the short 8.3 style file name.
6967+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
6968+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
6969+ done
6970+ IFS=$lt_save_ifs
6971+ # Convert to MSYS style.
6972+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
6973+ ;;
6974+ cygwin*)
6975+ # Convert to unix form, then to dos form, then back to unix form
6976+ # but this time dos style (no spaces!) so that the unix form looks
6977+ # like /cygdrive/c/PROGRA~1:/cygdr...
6978+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
6979+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
6980+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
6981+ ;;
6982+ *)
6983+ sys_lib_search_path_spec="$LIB"
6984+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
6985+ # It is most probably a Windows format PATH.
6986+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
6987+ else
6988+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
6989+ fi
6990+ # FIXME: find the short name or the path components, as spaces are
6991+ # common. (e.g. "Program Files" -> "PROGRA~1")
6992+ ;;
6993+ esac
6994+
6995+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
6996+ postinstall_cmds='base_file=`basename \${file}`~
6997+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
6998+ dldir=$destdir/`dirname \$dlpath`~
6999+ test -d \$dldir || mkdir -p \$dldir~
7000+ $install_prog $dir/$dlname \$dldir/$dlname'
7001+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7002+ dlpath=$dir/\$dldll~
7003+ $RM \$dlpath'
7004+ shlibpath_overrides_runpath=yes
7005+ dynamic_linker='Win32 link.exe'
7006 ;;
7007
7008 *)
7009+ # Assume MSVC wrapper
7010 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7011+ dynamic_linker='Win32 ld.exe'
7012 ;;
7013 esac
7014- dynamic_linker='Win32 ld.exe'
7015 # FIXME: first we should search . and the directory the executable is in
7016 shlibpath_var=PATH
7017 ;;
7018@@ -10111,7 +10761,7 @@ haiku*)
7019 soname_spec='${libname}${release}${shared_ext}$major'
7020 shlibpath_var=LIBRARY_PATH
7021 shlibpath_overrides_runpath=yes
7022- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7023+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7024 hardcode_into_libs=yes
7025 ;;
7026
7027@@ -10951,10 +11601,10 @@ else
7028 /* When -fvisbility=hidden is used, assume the code has been annotated
7029 correspondingly for the symbols needed. */
7030 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7031-void fnord () __attribute__((visibility("default")));
7032+int fnord () __attribute__((visibility("default")));
7033 #endif
7034
7035-void fnord () { int i=42; }
7036+int fnord () { return 42; }
7037 int main ()
7038 {
7039 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7040@@ -11057,10 +11707,10 @@ else
7041 /* When -fvisbility=hidden is used, assume the code has been annotated
7042 correspondingly for the symbols needed. */
7043 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7044-void fnord () __attribute__((visibility("default")));
7045+int fnord () __attribute__((visibility("default")));
7046 #endif
7047
7048-void fnord () { int i=42; }
7049+int fnord () { return 42; }
7050 int main ()
7051 {
7052 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7053@@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7054 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7055 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7056 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7057+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7058+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7059 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7060 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7061 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7062 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7063 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7064+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7065+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7066+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7067+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7068 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7069 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7070+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7071 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7072 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7073 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7074@@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7075 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7076 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7077 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"`'
7078+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7079+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7080 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7081 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7082 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7083-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7084 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7085+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7086 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7087 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7088 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7089+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7090 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7091 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7092 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7093@@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7094 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7095 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7096 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7097-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7098 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7099 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7100 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7101 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7102 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7103+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7104 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7105 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7106 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7107@@ -13126,8 +13786,13 @@ reload_flag \
7108 OBJDUMP \
7109 deplibs_check_method \
7110 file_magic_cmd \
7111+file_magic_glob \
7112+want_nocaseglob \
7113+DLLTOOL \
7114+sharedlib_from_linklib_cmd \
7115 AR \
7116 AR_FLAGS \
7117+archiver_list_spec \
7118 STRIP \
7119 RANLIB \
7120 CC \
7121@@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \
7122 lt_cv_sys_global_symbol_to_cdecl \
7123 lt_cv_sys_global_symbol_to_c_name_address \
7124 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7125+nm_file_list_spec \
7126 lt_prog_compiler_no_builtin_flag \
7127-lt_prog_compiler_wl \
7128 lt_prog_compiler_pic \
7129+lt_prog_compiler_wl \
7130 lt_prog_compiler_static \
7131 lt_cv_prog_compiler_c_o \
7132 need_locks \
7133+MANIFEST_TOOL \
7134 DSYMUTIL \
7135 NMEDIT \
7136 LIPO \
7137@@ -13158,7 +13825,6 @@ no_undefined_flag \
7138 hardcode_libdir_flag_spec \
7139 hardcode_libdir_flag_spec_ld \
7140 hardcode_libdir_separator \
7141-fix_srcfile_path \
7142 exclude_expsyms \
7143 include_expsyms \
7144 file_list_spec \
7145@@ -13194,6 +13860,7 @@ module_cmds \
7146 module_expsym_cmds \
7147 export_symbols_cmds \
7148 prelink_cmds \
7149+postlink_cmds \
7150 postinstall_cmds \
7151 postuninstall_cmds \
7152 finish_cmds \
7153@@ -13950,7 +14617,8 @@ $as_echo X"$file" |
7154 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7155 #
7156 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7157-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7158+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7159+# Inc.
7160 # Written by Gordon Matzigkeit, 1996
7161 #
7162 # This file is part of GNU Libtool.
7163@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL
7164 # turn newlines into spaces.
7165 NL2SP=$lt_lt_NL2SP
7166
7167+# convert \$build file names to \$host format.
7168+to_host_file_cmd=$lt_cv_to_host_file_cmd
7169+
7170+# convert \$build files to toolchain format.
7171+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7172+
7173 # An object symbol dumper.
7174 OBJDUMP=$lt_OBJDUMP
7175
7176 # Method to check whether dependent libraries are shared objects.
7177 deplibs_check_method=$lt_deplibs_check_method
7178
7179-# Command to use when deplibs_check_method == "file_magic".
7180+# Command to use when deplibs_check_method = "file_magic".
7181 file_magic_cmd=$lt_file_magic_cmd
7182
7183+# How to find potential files when deplibs_check_method = "file_magic".
7184+file_magic_glob=$lt_file_magic_glob
7185+
7186+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7187+want_nocaseglob=$lt_want_nocaseglob
7188+
7189+# DLL creation program.
7190+DLLTOOL=$lt_DLLTOOL
7191+
7192+# Command to associate shared and link libraries.
7193+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7194+
7195 # The archiver.
7196 AR=$lt_AR
7197+
7198+# Flags to create an archive.
7199 AR_FLAGS=$lt_AR_FLAGS
7200
7201+# How to feed a file listing to the archiver.
7202+archiver_list_spec=$lt_archiver_list_spec
7203+
7204 # A symbol stripping program.
7205 STRIP=$lt_STRIP
7206
7207@@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7208 # Transform the output of nm in a C name address pair when lib prefix is needed.
7209 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7210
7211+# Specify filename containing input files for \$NM.
7212+nm_file_list_spec=$lt_nm_file_list_spec
7213+
7214+# The root where to search for dependent libraries,and in which our libraries should be installed.
7215+lt_sysroot=$lt_sysroot
7216+
7217 # The name of the directory that contains temporary libtool files.
7218 objdir=$objdir
7219
7220@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD
7221 # Must we lock files when doing compilation?
7222 need_locks=$lt_need_locks
7223
7224+# Manifest tool.
7225+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7226+
7227 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7228 DSYMUTIL=$lt_DSYMUTIL
7229
7230@@ -14218,12 +14918,12 @@ with_gcc=$GCC
7231 # Compiler flag to turn off builtin functions.
7232 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7233
7234-# How to pass a linker flag through the compiler.
7235-wl=$lt_lt_prog_compiler_wl
7236-
7237 # Additional compiler flags for building library objects.
7238 pic_flag=$lt_lt_prog_compiler_pic
7239
7240+# How to pass a linker flag through the compiler.
7241+wl=$lt_lt_prog_compiler_wl
7242+
7243 # Compiler flag to prevent dynamic linking.
7244 link_static_flag=$lt_lt_prog_compiler_static
7245
7246@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath
7247 # Whether libtool must link a program against all its dependency libraries.
7248 link_all_deplibs=$link_all_deplibs
7249
7250-# Fix the shell variable \$srcfile for the compiler.
7251-fix_srcfile_path=$lt_fix_srcfile_path
7252-
7253 # Set to "yes" if exported symbols are required.
7254 always_export_symbols=$always_export_symbols
7255
7256@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms
7257 # Commands necessary for linking programs (against libraries) with templates.
7258 prelink_cmds=$lt_prelink_cmds
7259
7260+# Commands necessary for finishing linking programs.
7261+postlink_cmds=$lt_postlink_cmds
7262+
7263 # Specify filename containing input files.
7264 file_list_spec=$lt_file_list_spec
7265
7266@@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7267 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7268 # text mode, it properly converts lines to CR/LF. This bash problem
7269 # is reportedly fixed, but why not run on old versions too?
7270- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7271- || (rm -f "$cfgfile"; exit 1)
7272-
7273- case $xsi_shell in
7274- yes)
7275- cat << \_LT_EOF >> "$cfgfile"
7276-
7277-# func_dirname file append nondir_replacement
7278-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7279-# otherwise set result to NONDIR_REPLACEMENT.
7280-func_dirname ()
7281-{
7282- case ${1} in
7283- */*) func_dirname_result="${1%/*}${2}" ;;
7284- * ) func_dirname_result="${3}" ;;
7285- esac
7286-}
7287-
7288-# func_basename file
7289-func_basename ()
7290-{
7291- func_basename_result="${1##*/}"
7292-}
7293-
7294-# func_dirname_and_basename file append nondir_replacement
7295-# perform func_basename and func_dirname in a single function
7296-# call:
7297-# dirname: Compute the dirname of FILE. If nonempty,
7298-# add APPEND to the result, otherwise set result
7299-# to NONDIR_REPLACEMENT.
7300-# value returned in "$func_dirname_result"
7301-# basename: Compute filename of FILE.
7302-# value retuned in "$func_basename_result"
7303-# Implementation must be kept synchronized with func_dirname
7304-# and func_basename. For efficiency, we do not delegate to
7305-# those functions but instead duplicate the functionality here.
7306-func_dirname_and_basename ()
7307-{
7308- case ${1} in
7309- */*) func_dirname_result="${1%/*}${2}" ;;
7310- * ) func_dirname_result="${3}" ;;
7311- esac
7312- func_basename_result="${1##*/}"
7313-}
7314-
7315-# func_stripname prefix suffix name
7316-# strip PREFIX and SUFFIX off of NAME.
7317-# PREFIX and SUFFIX must not contain globbing or regex special
7318-# characters, hashes, percent signs, but SUFFIX may contain a leading
7319-# dot (in which case that matches only a dot).
7320-func_stripname ()
7321-{
7322- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7323- # positional parameters, so assign one to ordinary parameter first.
7324- func_stripname_result=${3}
7325- func_stripname_result=${func_stripname_result#"${1}"}
7326- func_stripname_result=${func_stripname_result%"${2}"}
7327-}
7328-
7329-# func_opt_split
7330-func_opt_split ()
7331-{
7332- func_opt_split_opt=${1%%=*}
7333- func_opt_split_arg=${1#*=}
7334-}
7335-
7336-# func_lo2o object
7337-func_lo2o ()
7338-{
7339- case ${1} in
7340- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7341- *) func_lo2o_result=${1} ;;
7342- esac
7343-}
7344-
7345-# func_xform libobj-or-source
7346-func_xform ()
7347-{
7348- func_xform_result=${1%.*}.lo
7349-}
7350-
7351-# func_arith arithmetic-term...
7352-func_arith ()
7353-{
7354- func_arith_result=$(( $* ))
7355-}
7356-
7357-# func_len string
7358-# STRING may not start with a hyphen.
7359-func_len ()
7360-{
7361- func_len_result=${#1}
7362-}
7363-
7364-_LT_EOF
7365- ;;
7366- *) # Bourne compatible functions.
7367- cat << \_LT_EOF >> "$cfgfile"
7368-
7369-# func_dirname file append nondir_replacement
7370-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7371-# otherwise set result to NONDIR_REPLACEMENT.
7372-func_dirname ()
7373-{
7374- # Extract subdirectory from the argument.
7375- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7376- if test "X$func_dirname_result" = "X${1}"; then
7377- func_dirname_result="${3}"
7378- else
7379- func_dirname_result="$func_dirname_result${2}"
7380- fi
7381-}
7382-
7383-# func_basename file
7384-func_basename ()
7385-{
7386- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7387-}
7388-
7389-
7390-# func_stripname prefix suffix name
7391-# strip PREFIX and SUFFIX off of NAME.
7392-# PREFIX and SUFFIX must not contain globbing or regex special
7393-# characters, hashes, percent signs, but SUFFIX may contain a leading
7394-# dot (in which case that matches only a dot).
7395-# func_strip_suffix prefix name
7396-func_stripname ()
7397-{
7398- case ${2} in
7399- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7400- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7401- esac
7402-}
7403-
7404-# sed scripts:
7405-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7406-my_sed_long_arg='1s/^-[^=]*=//'
7407-
7408-# func_opt_split
7409-func_opt_split ()
7410-{
7411- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7412- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7413-}
7414-
7415-# func_lo2o object
7416-func_lo2o ()
7417-{
7418- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7419-}
7420-
7421-# func_xform libobj-or-source
7422-func_xform ()
7423-{
7424- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7425-}
7426-
7427-# func_arith arithmetic-term...
7428-func_arith ()
7429-{
7430- func_arith_result=`expr "$@"`
7431-}
7432-
7433-# func_len string
7434-# STRING may not start with a hyphen.
7435-func_len ()
7436-{
7437- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7438-}
7439-
7440-_LT_EOF
7441-esac
7442-
7443-case $lt_shell_append in
7444- yes)
7445- cat << \_LT_EOF >> "$cfgfile"
7446-
7447-# func_append var value
7448-# Append VALUE to the end of shell variable VAR.
7449-func_append ()
7450-{
7451- eval "$1+=\$2"
7452-}
7453-_LT_EOF
7454- ;;
7455- *)
7456- cat << \_LT_EOF >> "$cfgfile"
7457-
7458-# func_append var value
7459-# Append VALUE to the end of shell variable VAR.
7460-func_append ()
7461-{
7462- eval "$1=\$$1\$2"
7463-}
7464-
7465-_LT_EOF
7466- ;;
7467- esac
7468-
7469-
7470- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7471- || (rm -f "$cfgfile"; exit 1)
7472-
7473- mv -f "$cfgfile" "$ofile" ||
7474+ sed '$q' "$ltmain" >> "$cfgfile" \
7475+ || (rm -f "$cfgfile"; exit 1)
7476+
7477+ if test x"$xsi_shell" = xyes; then
7478+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7479+func_dirname ()\
7480+{\
7481+\ case ${1} in\
7482+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7483+\ * ) func_dirname_result="${3}" ;;\
7484+\ esac\
7485+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7486+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7487+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7488+test 0 -eq $? || _lt_function_replace_fail=:
7489+
7490+
7491+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7492+func_basename ()\
7493+{\
7494+\ func_basename_result="${1##*/}"\
7495+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7496+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7497+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7498+test 0 -eq $? || _lt_function_replace_fail=:
7499+
7500+
7501+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7502+func_dirname_and_basename ()\
7503+{\
7504+\ case ${1} in\
7505+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7506+\ * ) func_dirname_result="${3}" ;;\
7507+\ esac\
7508+\ func_basename_result="${1##*/}"\
7509+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7510+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7511+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7512+test 0 -eq $? || _lt_function_replace_fail=:
7513+
7514+
7515+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7516+func_stripname ()\
7517+{\
7518+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7519+\ # positional parameters, so assign one to ordinary parameter first.\
7520+\ func_stripname_result=${3}\
7521+\ func_stripname_result=${func_stripname_result#"${1}"}\
7522+\ func_stripname_result=${func_stripname_result%"${2}"}\
7523+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7524+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7525+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7526+test 0 -eq $? || _lt_function_replace_fail=:
7527+
7528+
7529+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7530+func_split_long_opt ()\
7531+{\
7532+\ func_split_long_opt_name=${1%%=*}\
7533+\ func_split_long_opt_arg=${1#*=}\
7534+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7535+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7536+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7537+test 0 -eq $? || _lt_function_replace_fail=:
7538+
7539+
7540+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7541+func_split_short_opt ()\
7542+{\
7543+\ func_split_short_opt_arg=${1#??}\
7544+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7545+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7546+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7547+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7548+test 0 -eq $? || _lt_function_replace_fail=:
7549+
7550+
7551+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7552+func_lo2o ()\
7553+{\
7554+\ case ${1} in\
7555+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7556+\ *) func_lo2o_result=${1} ;;\
7557+\ esac\
7558+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7559+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7560+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7561+test 0 -eq $? || _lt_function_replace_fail=:
7562+
7563+
7564+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7565+func_xform ()\
7566+{\
7567+ func_xform_result=${1%.*}.lo\
7568+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7569+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7570+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7571+test 0 -eq $? || _lt_function_replace_fail=:
7572+
7573+
7574+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7575+func_arith ()\
7576+{\
7577+ func_arith_result=$(( $* ))\
7578+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7579+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7580+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7581+test 0 -eq $? || _lt_function_replace_fail=:
7582+
7583+
7584+ sed -e '/^func_len ()$/,/^} # func_len /c\
7585+func_len ()\
7586+{\
7587+ func_len_result=${#1}\
7588+} # Extended-shell func_len 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+fi
7594+
7595+if test x"$lt_shell_append" = xyes; then
7596+ sed -e '/^func_append ()$/,/^} # func_append /c\
7597+func_append ()\
7598+{\
7599+ eval "${1}+=\\${2}"\
7600+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7601+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7602+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7603+test 0 -eq $? || _lt_function_replace_fail=:
7604+
7605+
7606+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7607+func_append_quoted ()\
7608+{\
7609+\ func_quote_for_eval "${2}"\
7610+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7611+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7612+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7613+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7614+test 0 -eq $? || _lt_function_replace_fail=:
7615+
7616+
7617+ # Save a `func_append' function call where possible by direct use of '+='
7618+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7619+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7620+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7621+ test 0 -eq $? || _lt_function_replace_fail=:
7622+else
7623+ # Save a `func_append' function call even when '+=' is not available
7624+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7625+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7626+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7627+ test 0 -eq $? || _lt_function_replace_fail=:
7628+fi
7629+
7630+if test x"$_lt_function_replace_fail" = x":"; then
7631+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7632+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7633+fi
7634+
7635+
7636+ mv -f "$cfgfile" "$ofile" ||
7637 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7638 chmod +x "$ofile"
7639
7640diff --git a/ld/configure b/ld/configure
7641index a16c6db059..4277b74bad 100755
7642--- a/ld/configure
7643+++ b/ld/configure
7644@@ -659,8 +659,11 @@ OTOOL
7645 LIPO
7646 NMEDIT
7647 DSYMUTIL
7648+MANIFEST_TOOL
7649 RANLIB
7650+ac_ct_AR
7651 AR
7652+DLLTOOL
7653 OBJDUMP
7654 LN_S
7655 NM
7656@@ -782,6 +785,7 @@ enable_static
7657 with_pic
7658 enable_fast_install
7659 with_gnu_ld
7660+with_libtool_sysroot
7661 enable_libtool_lock
7662 enable_plugins
7663 enable_largefile
7664@@ -1463,6 +1467,8 @@ Optional Packages:
7665 --with-pic try to use only PIC/non-PIC objects [default=use
7666 both]
7667 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7668+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7669+ (or the compiler's sysroot if not specified).
7670 --with-lib-path=dir1:dir2... set default LIB_PATH
7671 --with-sysroot=DIR Search for usr/lib et al within DIR.
7672
7673@@ -5657,8 +5663,8 @@ esac
7674
7675
7676
7677-macro_version='2.2.7a'
7678-macro_revision='1.3134'
7679+macro_version='2.4'
7680+macro_revision='1.3293'
7681
7682
7683
7684@@ -5698,7 +5704,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7685 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7686 $as_echo_n "checking how to print strings... " >&6; }
7687 # Test print first, because it will be a builtin if present.
7688-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7689+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7690 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7691 ECHO='print -r --'
7692 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7693@@ -6384,8 +6390,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7694 # Try some XSI features
7695 xsi_shell=no
7696 ( _lt_dummy="a/b/c"
7697- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7698- = c,a/b,, \
7699+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7700+ = c,a/b,b/c, \
7701 && eval 'test $(( 1 + 1 )) -eq 2 \
7702 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7703 && xsi_shell=yes
7704@@ -6434,6 +6440,80 @@ esac
7705
7706
7707
7708+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7709+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7710+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7711+ $as_echo_n "(cached) " >&6
7712+else
7713+ case $host in
7714+ *-*-mingw* )
7715+ case $build in
7716+ *-*-mingw* ) # actually msys
7717+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7718+ ;;
7719+ *-*-cygwin* )
7720+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7721+ ;;
7722+ * ) # otherwise, assume *nix
7723+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7724+ ;;
7725+ esac
7726+ ;;
7727+ *-*-cygwin* )
7728+ case $build in
7729+ *-*-mingw* ) # actually msys
7730+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7731+ ;;
7732+ *-*-cygwin* )
7733+ lt_cv_to_host_file_cmd=func_convert_file_noop
7734+ ;;
7735+ * ) # otherwise, assume *nix
7736+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7737+ ;;
7738+ esac
7739+ ;;
7740+ * ) # unhandled hosts (and "normal" native builds)
7741+ lt_cv_to_host_file_cmd=func_convert_file_noop
7742+ ;;
7743+esac
7744+
7745+fi
7746+
7747+to_host_file_cmd=$lt_cv_to_host_file_cmd
7748+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7749+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7750+
7751+
7752+
7753+
7754+
7755+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7756+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7757+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7758+ $as_echo_n "(cached) " >&6
7759+else
7760+ #assume ordinary cross tools, or native build.
7761+lt_cv_to_tool_file_cmd=func_convert_file_noop
7762+case $host in
7763+ *-*-mingw* )
7764+ case $build in
7765+ *-*-mingw* ) # actually msys
7766+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7767+ ;;
7768+ esac
7769+ ;;
7770+esac
7771+
7772+fi
7773+
7774+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7775+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7776+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7777+
7778+
7779+
7780+
7781+
7782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7783 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7784 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7785@@ -6450,6 +6530,11 @@ case $reload_flag in
7786 esac
7787 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7788 case $host_os in
7789+ cygwin* | mingw* | pw32* | cegcc*)
7790+ if test "$GCC" != yes; then
7791+ reload_cmds=false
7792+ fi
7793+ ;;
7794 darwin*)
7795 if test "$GCC" = yes; then
7796 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7797@@ -6618,7 +6703,8 @@ mingw* | pw32*)
7798 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7799 lt_cv_file_magic_cmd='func_win32_libid'
7800 else
7801- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7802+ # Keep this pattern in sync with the one in func_win32_libid.
7803+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7804 lt_cv_file_magic_cmd='$OBJDUMP -f'
7805 fi
7806 ;;
7807@@ -6772,6 +6858,21 @@ esac
7808 fi
7809 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7810 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7811+
7812+file_magic_glob=
7813+want_nocaseglob=no
7814+if test "$build" = "$host"; then
7815+ case $host_os in
7816+ mingw* | pw32*)
7817+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7818+ want_nocaseglob=yes
7819+ else
7820+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7821+ fi
7822+ ;;
7823+ esac
7824+fi
7825+
7826 file_magic_cmd=$lt_cv_file_magic_cmd
7827 deplibs_check_method=$lt_cv_deplibs_check_method
7828 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7829@@ -6787,9 +6888,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7830
7831
7832
7833+
7834+
7835+
7836+
7837+
7838+
7839+
7840+
7841+
7842+
7843+if test -n "$ac_tool_prefix"; then
7844+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7845+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7846+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7847+$as_echo_n "checking for $ac_word... " >&6; }
7848+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7849+ $as_echo_n "(cached) " >&6
7850+else
7851+ if test -n "$DLLTOOL"; then
7852+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7853+else
7854+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7855+for as_dir in $PATH
7856+do
7857+ IFS=$as_save_IFS
7858+ test -z "$as_dir" && as_dir=.
7859+ for ac_exec_ext in '' $ac_executable_extensions; do
7860+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7861+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7862+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7863+ break 2
7864+ fi
7865+done
7866+ done
7867+IFS=$as_save_IFS
7868+
7869+fi
7870+fi
7871+DLLTOOL=$ac_cv_prog_DLLTOOL
7872+if test -n "$DLLTOOL"; then
7873+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7874+$as_echo "$DLLTOOL" >&6; }
7875+else
7876+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7877+$as_echo "no" >&6; }
7878+fi
7879+
7880+
7881+fi
7882+if test -z "$ac_cv_prog_DLLTOOL"; then
7883+ ac_ct_DLLTOOL=$DLLTOOL
7884+ # Extract the first word of "dlltool", so it can be a program name with args.
7885+set dummy dlltool; ac_word=$2
7886+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7887+$as_echo_n "checking for $ac_word... " >&6; }
7888+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7889+ $as_echo_n "(cached) " >&6
7890+else
7891+ if test -n "$ac_ct_DLLTOOL"; then
7892+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7893+else
7894+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7895+for as_dir in $PATH
7896+do
7897+ IFS=$as_save_IFS
7898+ test -z "$as_dir" && as_dir=.
7899+ for ac_exec_ext in '' $ac_executable_extensions; do
7900+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7901+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7902+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7903+ break 2
7904+ fi
7905+done
7906+ done
7907+IFS=$as_save_IFS
7908+
7909+fi
7910+fi
7911+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7912+if test -n "$ac_ct_DLLTOOL"; then
7913+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7914+$as_echo "$ac_ct_DLLTOOL" >&6; }
7915+else
7916+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7917+$as_echo "no" >&6; }
7918+fi
7919+
7920+ if test "x$ac_ct_DLLTOOL" = x; then
7921+ DLLTOOL="false"
7922+ else
7923+ case $cross_compiling:$ac_tool_warned in
7924+yes:)
7925+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7926+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7927+ac_tool_warned=yes ;;
7928+esac
7929+ DLLTOOL=$ac_ct_DLLTOOL
7930+ fi
7931+else
7932+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7933+fi
7934+
7935+test -z "$DLLTOOL" && DLLTOOL=dlltool
7936+
7937+
7938+
7939+
7940+
7941+
7942+
7943+
7944+
7945+
7946+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7947+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7948+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7949+ $as_echo_n "(cached) " >&6
7950+else
7951+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7952+
7953+case $host_os in
7954+cygwin* | mingw* | pw32* | cegcc*)
7955+ # two different shell functions defined in ltmain.sh
7956+ # decide which to use based on capabilities of $DLLTOOL
7957+ case `$DLLTOOL --help 2>&1` in
7958+ *--identify-strict*)
7959+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7960+ ;;
7961+ *)
7962+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7963+ ;;
7964+ esac
7965+ ;;
7966+*)
7967+ # fallback: assume linklib IS sharedlib
7968+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7969+ ;;
7970+esac
7971+
7972+fi
7973+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7974+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7975+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7976+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7977+
7978+
7979+
7980+
7981+
7982+
7983+
7984 if test -n "$ac_tool_prefix"; then
7985- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
7986-set dummy ${ac_tool_prefix}ar; ac_word=$2
7987+ for ac_prog in ar
7988+ do
7989+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7990+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7992 $as_echo_n "checking for $ac_word... " >&6; }
7993 if test "${ac_cv_prog_AR+set}" = set; then :
7994@@ -6805,7 +7059,7 @@ do
7995 test -z "$as_dir" && as_dir=.
7996 for ac_exec_ext in '' $ac_executable_extensions; do
7997 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7998- ac_cv_prog_AR="${ac_tool_prefix}ar"
7999+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8000 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8001 break 2
8002 fi
8003@@ -6825,11 +7079,15 @@ $as_echo "no" >&6; }
8004 fi
8005
8006
8007+ test -n "$AR" && break
8008+ done
8009 fi
8010-if test -z "$ac_cv_prog_AR"; then
8011+if test -z "$AR"; then
8012 ac_ct_AR=$AR
8013- # Extract the first word of "ar", so it can be a program name with args.
8014-set dummy ar; ac_word=$2
8015+ for ac_prog in ar
8016+do
8017+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8018+set dummy $ac_prog; ac_word=$2
8019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8020 $as_echo_n "checking for $ac_word... " >&6; }
8021 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8022@@ -6845,7 +7103,7 @@ do
8023 test -z "$as_dir" && as_dir=.
8024 for ac_exec_ext in '' $ac_executable_extensions; do
8025 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8026- ac_cv_prog_ac_ct_AR="ar"
8027+ ac_cv_prog_ac_ct_AR="$ac_prog"
8028 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8029 break 2
8030 fi
8031@@ -6864,6 +7122,10 @@ else
8032 $as_echo "no" >&6; }
8033 fi
8034
8035+
8036+ test -n "$ac_ct_AR" && break
8037+done
8038+
8039 if test "x$ac_ct_AR" = x; then
8040 AR="false"
8041 else
8042@@ -6875,12 +7137,12 @@ ac_tool_warned=yes ;;
8043 esac
8044 AR=$ac_ct_AR
8045 fi
8046-else
8047- AR="$ac_cv_prog_AR"
8048 fi
8049
8050-test -z "$AR" && AR=ar
8051-test -z "$AR_FLAGS" && AR_FLAGS=cru
8052+: ${AR=ar}
8053+: ${AR_FLAGS=cru}
8054+
8055+
8056
8057
8058
8059@@ -6890,6 +7152,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8060
8061
8062
8063+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8064+$as_echo_n "checking for archiver @FILE support... " >&6; }
8065+if test "${lt_cv_ar_at_file+set}" = set; then :
8066+ $as_echo_n "(cached) " >&6
8067+else
8068+ lt_cv_ar_at_file=no
8069+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8070+/* end confdefs.h. */
8071+
8072+int
8073+main ()
8074+{
8075+
8076+ ;
8077+ return 0;
8078+}
8079+_ACEOF
8080+if ac_fn_c_try_compile "$LINENO"; then :
8081+ echo conftest.$ac_objext > conftest.lst
8082+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8083+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8084+ (eval $lt_ar_try) 2>&5
8085+ ac_status=$?
8086+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8087+ test $ac_status = 0; }
8088+ if test "$ac_status" -eq 0; then
8089+ # Ensure the archiver fails upon bogus file names.
8090+ rm -f conftest.$ac_objext libconftest.a
8091+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8092+ (eval $lt_ar_try) 2>&5
8093+ ac_status=$?
8094+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8095+ test $ac_status = 0; }
8096+ if test "$ac_status" -ne 0; then
8097+ lt_cv_ar_at_file=@
8098+ fi
8099+ fi
8100+ rm -f conftest.* libconftest.a
8101+
8102+fi
8103+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8104+
8105+fi
8106+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8107+$as_echo "$lt_cv_ar_at_file" >&6; }
8108+
8109+if test "x$lt_cv_ar_at_file" = xno; then
8110+ archiver_list_spec=
8111+else
8112+ archiver_list_spec=$lt_cv_ar_at_file
8113+fi
8114+
8115+
8116+
8117+
8118+
8119
8120
8121 if test -n "$ac_tool_prefix"; then
8122@@ -7226,8 +7544,8 @@ esac
8123 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8124
8125 # Transform an extracted symbol line into symbol name and symbol address
8126-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8127-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'"
8128+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8129+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'"
8130
8131 # Handle CRLF in mingw tool chain
8132 opt_cr=
8133@@ -7263,6 +7581,7 @@ for ac_symprfx in "" "_"; do
8134 else
8135 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8136 fi
8137+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8138
8139 # Check to see that the pipe works correctly.
8140 pipe_works=no
8141@@ -7304,6 +7623,18 @@ _LT_EOF
8142 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8143 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8144 cat <<_LT_EOF > conftest.$ac_ext
8145+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8146+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8147+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8148+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8149+# define LT_DLSYM_CONST
8150+#elif defined(__osf__)
8151+/* This system does not cope well with relocations in const data. */
8152+# define LT_DLSYM_CONST
8153+#else
8154+# define LT_DLSYM_CONST const
8155+#endif
8156+
8157 #ifdef __cplusplus
8158 extern "C" {
8159 #endif
8160@@ -7315,7 +7646,7 @@ _LT_EOF
8161 cat <<_LT_EOF >> conftest.$ac_ext
8162
8163 /* The mapping between symbol names and symbols. */
8164-const struct {
8165+LT_DLSYM_CONST struct {
8166 const char *name;
8167 void *address;
8168 }
8169@@ -7341,8 +7672,8 @@ static const void *lt_preloaded_setup() {
8170 _LT_EOF
8171 # Now try linking the two files.
8172 mv conftest.$ac_objext conftstm.$ac_objext
8173- lt_save_LIBS="$LIBS"
8174- lt_save_CFLAGS="$CFLAGS"
8175+ lt_globsym_save_LIBS=$LIBS
8176+ lt_globsym_save_CFLAGS=$CFLAGS
8177 LIBS="conftstm.$ac_objext"
8178 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8179 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8180@@ -7352,8 +7683,8 @@ _LT_EOF
8181 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8182 pipe_works=yes
8183 fi
8184- LIBS="$lt_save_LIBS"
8185- CFLAGS="$lt_save_CFLAGS"
8186+ LIBS=$lt_globsym_save_LIBS
8187+ CFLAGS=$lt_globsym_save_CFLAGS
8188 else
8189 echo "cannot find nm_test_func in $nlist" >&5
8190 fi
8191@@ -7390,6 +7721,19 @@ else
8192 $as_echo "ok" >&6; }
8193 fi
8194
8195+# Response file support.
8196+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8197+ nm_file_list_spec='@'
8198+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8199+ nm_file_list_spec='@'
8200+fi
8201+
8202+
8203+
8204+
8205+
8206+
8207+
8208
8209
8210
8211@@ -7410,6 +7754,42 @@ fi
8212
8213
8214
8215+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8216+$as_echo_n "checking for sysroot... " >&6; }
8217+
8218+# Check whether --with-libtool-sysroot was given.
8219+if test "${with_libtool_sysroot+set}" = set; then :
8220+ withval=$with_libtool_sysroot;
8221+else
8222+ with_libtool_sysroot=no
8223+fi
8224+
8225+
8226+lt_sysroot=
8227+case ${with_libtool_sysroot} in #(
8228+ yes)
8229+ if test "$GCC" = yes; then
8230+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8231+ fi
8232+ ;; #(
8233+ /*)
8234+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8235+ ;; #(
8236+ no|'')
8237+ ;; #(
8238+ *)
8239+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8240+$as_echo "${with_libtool_sysroot}" >&6; }
8241+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
8242+ ;;
8243+esac
8244+
8245+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8246+$as_echo "${lt_sysroot:-no}" >&6; }
8247+
8248+
8249+
8250+
8251
8252 # Check whether --enable-libtool-lock was given.
8253 if test "${enable_libtool_lock+set}" = set; then :
8254@@ -7617,6 +7997,123 @@ esac
8255
8256 need_locks="$enable_libtool_lock"
8257
8258+if test -n "$ac_tool_prefix"; then
8259+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8260+set dummy ${ac_tool_prefix}mt; ac_word=$2
8261+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8262+$as_echo_n "checking for $ac_word... " >&6; }
8263+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
8264+ $as_echo_n "(cached) " >&6
8265+else
8266+ if test -n "$MANIFEST_TOOL"; then
8267+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8268+else
8269+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8270+for as_dir in $PATH
8271+do
8272+ IFS=$as_save_IFS
8273+ test -z "$as_dir" && as_dir=.
8274+ for ac_exec_ext in '' $ac_executable_extensions; do
8275+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8276+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8277+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8278+ break 2
8279+ fi
8280+done
8281+ done
8282+IFS=$as_save_IFS
8283+
8284+fi
8285+fi
8286+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8287+if test -n "$MANIFEST_TOOL"; then
8288+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8289+$as_echo "$MANIFEST_TOOL" >&6; }
8290+else
8291+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8292+$as_echo "no" >&6; }
8293+fi
8294+
8295+
8296+fi
8297+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8298+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8299+ # Extract the first word of "mt", so it can be a program name with args.
8300+set dummy mt; ac_word=$2
8301+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8302+$as_echo_n "checking for $ac_word... " >&6; }
8303+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
8304+ $as_echo_n "(cached) " >&6
8305+else
8306+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8307+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8308+else
8309+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8310+for as_dir in $PATH
8311+do
8312+ IFS=$as_save_IFS
8313+ test -z "$as_dir" && as_dir=.
8314+ for ac_exec_ext in '' $ac_executable_extensions; do
8315+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8316+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8317+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8318+ break 2
8319+ fi
8320+done
8321+ done
8322+IFS=$as_save_IFS
8323+
8324+fi
8325+fi
8326+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8327+if test -n "$ac_ct_MANIFEST_TOOL"; then
8328+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8329+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8330+else
8331+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8332+$as_echo "no" >&6; }
8333+fi
8334+
8335+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8336+ MANIFEST_TOOL=":"
8337+ else
8338+ case $cross_compiling:$ac_tool_warned in
8339+yes:)
8340+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8341+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8342+ac_tool_warned=yes ;;
8343+esac
8344+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8345+ fi
8346+else
8347+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8348+fi
8349+
8350+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8351+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8352+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8353+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
8354+ $as_echo_n "(cached) " >&6
8355+else
8356+ lt_cv_path_mainfest_tool=no
8357+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8358+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8359+ cat conftest.err >&5
8360+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8361+ lt_cv_path_mainfest_tool=yes
8362+ fi
8363+ rm -f conftest*
8364+fi
8365+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8366+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8367+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8368+ MANIFEST_TOOL=:
8369+fi
8370+
8371+
8372+
8373+
8374+
8375
8376 case $host_os in
8377 rhapsody* | darwin*)
8378@@ -8180,6 +8677,8 @@ _LT_EOF
8379 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8380 echo "$AR cru libconftest.a conftest.o" >&5
8381 $AR cru libconftest.a conftest.o 2>&5
8382+ echo "$RANLIB libconftest.a" >&5
8383+ $RANLIB libconftest.a 2>&5
8384 cat > conftest.c << _LT_EOF
8385 int main() { return 0;}
8386 _LT_EOF
8387@@ -8248,6 +8747,16 @@ done
8388
8389
8390
8391+func_stripname_cnf ()
8392+{
8393+ case ${2} in
8394+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8395+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8396+ esac
8397+} # func_stripname_cnf
8398+
8399+
8400+
8401
8402
8403 # Set options
8404@@ -8376,7 +8885,8 @@ fi
8405 LIBTOOL_DEPS="$ltmain"
8406
8407 # Always use our own libtool.
8408-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8409+LIBTOOL='$(SHELL) $(top_builddir)'
8410+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8411
8412
8413
8414@@ -8465,7 +8975,7 @@ aix3*)
8415 esac
8416
8417 # Global variables:
8418-ofile=libtool
8419+ofile=${host_alias}-libtool
8420 can_build_shared=yes
8421
8422 # All known linkers require a `.a' archive for static linking (except MSVC,
8423@@ -8763,8 +9273,6 @@ fi
8424 lt_prog_compiler_pic=
8425 lt_prog_compiler_static=
8426
8427-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8428-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8429
8430 if test "$GCC" = yes; then
8431 lt_prog_compiler_wl='-Wl,'
8432@@ -8930,6 +9438,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8433 lt_prog_compiler_pic='--shared'
8434 lt_prog_compiler_static='--static'
8435 ;;
8436+ nagfor*)
8437+ # NAG Fortran compiler
8438+ lt_prog_compiler_wl='-Wl,-Wl,,'
8439+ lt_prog_compiler_pic='-PIC'
8440+ lt_prog_compiler_static='-Bstatic'
8441+ ;;
8442 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8443 # Portland Group compilers (*not* the Pentium gcc compiler,
8444 # which looks to be a dead project)
8445@@ -8992,7 +9506,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8446 lt_prog_compiler_pic='-KPIC'
8447 lt_prog_compiler_static='-Bstatic'
8448 case $cc_basename in
8449- f77* | f90* | f95*)
8450+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8451 lt_prog_compiler_wl='-Qoption ld ';;
8452 *)
8453 lt_prog_compiler_wl='-Wl,';;
8454@@ -9049,13 +9563,17 @@ case $host_os in
8455 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8456 ;;
8457 esac
8458-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8459-$as_echo "$lt_prog_compiler_pic" >&6; }
8460-
8461-
8462-
8463-
8464
8465+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8466+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8467+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
8468+ $as_echo_n "(cached) " >&6
8469+else
8470+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8471+fi
8472+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8473+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8474+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8475
8476 #
8477 # Check to make sure the PIC flag actually works.
8478@@ -9116,6 +9634,11 @@ fi
8479
8480
8481
8482+
8483+
8484+
8485+
8486+
8487 #
8488 # Check to make sure the static flag actually works.
8489 #
8490@@ -9466,7 +9989,8 @@ _LT_EOF
8491 allow_undefined_flag=unsupported
8492 always_export_symbols=no
8493 enable_shared_with_static_runtimes=yes
8494- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8495+ 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'
8496+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8497
8498 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8499 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8500@@ -9565,12 +10089,12 @@ _LT_EOF
8501 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8502 hardcode_libdir_flag_spec=
8503 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8504- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8505+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8506 if test "x$supports_anon_versioning" = xyes; then
8507 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8508 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8509 echo "local: *; };" >> $output_objdir/$libname.ver~
8510- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8511+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8512 fi
8513 ;;
8514 esac
8515@@ -9584,8 +10108,8 @@ _LT_EOF
8516 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8517 wlarc=
8518 else
8519- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8520- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8521+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8522+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8523 fi
8524 ;;
8525
8526@@ -9603,8 +10127,8 @@ _LT_EOF
8527
8528 _LT_EOF
8529 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8530- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8531- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8532+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8533+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8534 else
8535 ld_shlibs=no
8536 fi
8537@@ -9650,8 +10174,8 @@ _LT_EOF
8538
8539 *)
8540 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8541- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8542- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8543+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8544+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8545 else
8546 ld_shlibs=no
8547 fi
8548@@ -9781,7 +10305,13 @@ _LT_EOF
8549 allow_undefined_flag='-berok'
8550 # Determine the default libpath from the value encoded in an
8551 # empty executable.
8552- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8553+ if test "${lt_cv_aix_libpath+set}" = set; then
8554+ aix_libpath=$lt_cv_aix_libpath
8555+else
8556+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8557+ $as_echo_n "(cached) " >&6
8558+else
8559+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8560 /* end confdefs.h. */
8561
8562 int
8563@@ -9794,22 +10324,29 @@ main ()
8564 _ACEOF
8565 if ac_fn_c_try_link "$LINENO"; then :
8566
8567-lt_aix_libpath_sed='
8568- /Import File Strings/,/^$/ {
8569- /^0/ {
8570- s/^0 *\(.*\)$/\1/
8571- p
8572- }
8573- }'
8574-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 "$aix_libpath"; then
8577- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8578-fi
8579+ lt_aix_libpath_sed='
8580+ /Import File Strings/,/^$/ {
8581+ /^0/ {
8582+ s/^0 *\([^ ]*\) *$/\1/
8583+ p
8584+ }
8585+ }'
8586+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8587+ # Check for a 64-bit object if we didn't find anything.
8588+ if test -z "$lt_cv_aix_libpath_"; then
8589+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8590+ fi
8591 fi
8592 rm -f core conftest.err conftest.$ac_objext \
8593 conftest$ac_exeext conftest.$ac_ext
8594-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8595+ if test -z "$lt_cv_aix_libpath_"; then
8596+ lt_cv_aix_libpath_="/usr/lib:/lib"
8597+ fi
8598+
8599+fi
8600+
8601+ aix_libpath=$lt_cv_aix_libpath_
8602+fi
8603
8604 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8605 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"
8606@@ -9821,7 +10358,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8607 else
8608 # Determine the default libpath from the value encoded in an
8609 # empty executable.
8610- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8611+ if test "${lt_cv_aix_libpath+set}" = set; then
8612+ aix_libpath=$lt_cv_aix_libpath
8613+else
8614+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8615+ $as_echo_n "(cached) " >&6
8616+else
8617+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8618 /* end confdefs.h. */
8619
8620 int
8621@@ -9834,22 +10377,29 @@ main ()
8622 _ACEOF
8623 if ac_fn_c_try_link "$LINENO"; then :
8624
8625-lt_aix_libpath_sed='
8626- /Import File Strings/,/^$/ {
8627- /^0/ {
8628- s/^0 *\(.*\)$/\1/
8629- p
8630- }
8631- }'
8632-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 "$aix_libpath"; then
8635- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8636-fi
8637+ lt_aix_libpath_sed='
8638+ /Import File Strings/,/^$/ {
8639+ /^0/ {
8640+ s/^0 *\([^ ]*\) *$/\1/
8641+ p
8642+ }
8643+ }'
8644+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8645+ # Check for a 64-bit object if we didn't find anything.
8646+ if test -z "$lt_cv_aix_libpath_"; then
8647+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8648+ fi
8649 fi
8650 rm -f core conftest.err conftest.$ac_objext \
8651 conftest$ac_exeext conftest.$ac_ext
8652-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8653+ if test -z "$lt_cv_aix_libpath_"; then
8654+ lt_cv_aix_libpath_="/usr/lib:/lib"
8655+ fi
8656+
8657+fi
8658+
8659+ aix_libpath=$lt_cv_aix_libpath_
8660+fi
8661
8662 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8663 # Warning - without using the other run time loading flags,
8664@@ -9893,21 +10443,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8665 # When not using gcc, we currently assume that we are using
8666 # Microsoft Visual C++.
8667 # hardcode_libdir_flag_spec is actually meaningless, as there is
8668- # no search path for DLLs.
8669- hardcode_libdir_flag_spec=' '
8670- allow_undefined_flag=unsupported
8671- # Tell ltmain to make .lib files, not .a files.
8672- libext=lib
8673- # Tell ltmain to make .dll files, not .so files.
8674- shrext_cmds=".dll"
8675- # FIXME: Setting linknames here is a bad hack.
8676- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8677- # The linker will automatically build a .lib file if we build a DLL.
8678- old_archive_from_new_cmds='true'
8679- # FIXME: Should let the user specify the lib program.
8680- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8681- fix_srcfile_path='`cygpath -w "$srcfile"`'
8682- enable_shared_with_static_runtimes=yes
8683+ # no search path for DLLs.
8684+ case $cc_basename in
8685+ cl*)
8686+ # Native MSVC
8687+ hardcode_libdir_flag_spec=' '
8688+ allow_undefined_flag=unsupported
8689+ always_export_symbols=yes
8690+ file_list_spec='@'
8691+ # Tell ltmain to make .lib files, not .a files.
8692+ libext=lib
8693+ # Tell ltmain to make .dll files, not .so files.
8694+ shrext_cmds=".dll"
8695+ # FIXME: Setting linknames here is a bad hack.
8696+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8697+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8698+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8699+ else
8700+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8701+ fi~
8702+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8703+ linknames='
8704+ # The linker will not automatically build a static lib if we build a DLL.
8705+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8706+ enable_shared_with_static_runtimes=yes
8707+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8708+ # Don't use ranlib
8709+ old_postinstall_cmds='chmod 644 $oldlib'
8710+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8711+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8712+ case $lt_outputfile in
8713+ *.exe|*.EXE) ;;
8714+ *)
8715+ lt_outputfile="$lt_outputfile.exe"
8716+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8717+ ;;
8718+ esac~
8719+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8720+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8721+ $RM "$lt_outputfile.manifest";
8722+ fi'
8723+ ;;
8724+ *)
8725+ # Assume MSVC wrapper
8726+ hardcode_libdir_flag_spec=' '
8727+ allow_undefined_flag=unsupported
8728+ # Tell ltmain to make .lib files, not .a files.
8729+ libext=lib
8730+ # Tell ltmain to make .dll files, not .so files.
8731+ shrext_cmds=".dll"
8732+ # FIXME: Setting linknames here is a bad hack.
8733+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8734+ # The linker will automatically build a .lib file if we build a DLL.
8735+ old_archive_from_new_cmds='true'
8736+ # FIXME: Should let the user specify the lib program.
8737+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8738+ enable_shared_with_static_runtimes=yes
8739+ ;;
8740+ esac
8741 ;;
8742
8743 darwin* | rhapsody*)
8744@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8745
8746 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8747 freebsd* | dragonfly*)
8748- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8749+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8750 hardcode_libdir_flag_spec='-R$libdir'
8751 hardcode_direct=yes
8752 hardcode_shlibpath_var=no
8753@@ -9976,7 +10569,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8754
8755 hpux9*)
8756 if test "$GCC" = yes; then
8757- 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'
8758+ 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'
8759 else
8760 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'
8761 fi
8762@@ -9992,7 +10585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8763
8764 hpux10*)
8765 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8766- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8767+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8768 else
8769 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8770 fi
8771@@ -10016,10 +10609,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8772 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8773 ;;
8774 ia64*)
8775- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8776+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8777 ;;
8778 *)
8779- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8780+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8781 ;;
8782 esac
8783 else
8784@@ -10098,23 +10691,36 @@ fi
8785
8786 irix5* | irix6* | nonstopux*)
8787 if test "$GCC" = yes; then
8788- 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'
8789+ 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'
8790 # Try to use the -exported_symbol ld option, if it does not
8791 # work, assume that -exports_file does not work either and
8792 # implicitly export all symbols.
8793- save_LDFLAGS="$LDFLAGS"
8794- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8795- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8796+ # This should be the same for all languages, so no per-tag cache variable.
8797+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8798+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8799+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8800+ $as_echo_n "(cached) " >&6
8801+else
8802+ save_LDFLAGS="$LDFLAGS"
8803+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8804+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8805 /* end confdefs.h. */
8806-int foo(void) {}
8807+int foo (void) { return 0; }
8808 _ACEOF
8809 if ac_fn_c_try_link "$LINENO"; then :
8810- 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'
8811-
8812+ lt_cv_irix_exported_symbol=yes
8813+else
8814+ lt_cv_irix_exported_symbol=no
8815 fi
8816 rm -f core conftest.err conftest.$ac_objext \
8817 conftest$ac_exeext conftest.$ac_ext
8818- LDFLAGS="$save_LDFLAGS"
8819+ LDFLAGS="$save_LDFLAGS"
8820+fi
8821+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8822+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8823+ if test "$lt_cv_irix_exported_symbol" = yes; then
8824+ 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'
8825+ fi
8826 else
8827 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'
8828 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'
8829@@ -10199,7 +10805,7 @@ rm -f core conftest.err conftest.$ac_objext \
8830 osf4* | osf5*) # as osf3* with the addition of -msym flag
8831 if test "$GCC" = yes; then
8832 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8833- 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'
8834+ 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'
8835 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8836 else
8837 allow_undefined_flag=' -expect_unresolved \*'
8838@@ -10218,9 +10824,9 @@ rm -f core conftest.err conftest.$ac_objext \
8839 no_undefined_flag=' -z defs'
8840 if test "$GCC" = yes; then
8841 wlarc='${wl}'
8842- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8843+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8844 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8845- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8846+ $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'
8847 else
8848 case `$CC -V 2>&1` in
8849 *"Compilers 5.0"*)
8850@@ -10796,8 +11402,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8851 need_version=no
8852 need_lib_prefix=no
8853
8854- case $GCC,$host_os in
8855- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8856+ case $GCC,$cc_basename in
8857+ yes,*)
8858+ # gcc
8859 library_names_spec='$libname.dll.a'
8860 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8861 postinstall_cmds='base_file=`basename \${file}`~
8862@@ -10830,13 +11437,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8863 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8864 ;;
8865 esac
8866+ dynamic_linker='Win32 ld.exe'
8867+ ;;
8868+
8869+ *,cl*)
8870+ # Native MSVC
8871+ libname_spec='$name'
8872+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8873+ library_names_spec='${libname}.dll.lib'
8874+
8875+ case $build_os in
8876+ mingw*)
8877+ sys_lib_search_path_spec=
8878+ lt_save_ifs=$IFS
8879+ IFS=';'
8880+ for lt_path in $LIB
8881+ do
8882+ IFS=$lt_save_ifs
8883+ # Let DOS variable expansion print the short 8.3 style file name.
8884+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8885+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8886+ done
8887+ IFS=$lt_save_ifs
8888+ # Convert to MSYS style.
8889+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8890+ ;;
8891+ cygwin*)
8892+ # Convert to unix form, then to dos form, then back to unix form
8893+ # but this time dos style (no spaces!) so that the unix form looks
8894+ # like /cygdrive/c/PROGRA~1:/cygdr...
8895+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8896+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8897+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8898+ ;;
8899+ *)
8900+ sys_lib_search_path_spec="$LIB"
8901+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8902+ # It is most probably a Windows format PATH.
8903+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8904+ else
8905+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8906+ fi
8907+ # FIXME: find the short name or the path components, as spaces are
8908+ # common. (e.g. "Program Files" -> "PROGRA~1")
8909+ ;;
8910+ esac
8911+
8912+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8913+ postinstall_cmds='base_file=`basename \${file}`~
8914+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8915+ dldir=$destdir/`dirname \$dlpath`~
8916+ test -d \$dldir || mkdir -p \$dldir~
8917+ $install_prog $dir/$dlname \$dldir/$dlname'
8918+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8919+ dlpath=$dir/\$dldll~
8920+ $RM \$dlpath'
8921+ shlibpath_overrides_runpath=yes
8922+ dynamic_linker='Win32 link.exe'
8923 ;;
8924
8925 *)
8926+ # Assume MSVC wrapper
8927 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8928+ dynamic_linker='Win32 ld.exe'
8929 ;;
8930 esac
8931- dynamic_linker='Win32 ld.exe'
8932 # FIXME: first we should search . and the directory the executable is in
8933 shlibpath_var=PATH
8934 ;;
8935@@ -10928,7 +11593,7 @@ haiku*)
8936 soname_spec='${libname}${release}${shared_ext}$major'
8937 shlibpath_var=LIBRARY_PATH
8938 shlibpath_overrides_runpath=yes
8939- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8940+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8941 hardcode_into_libs=yes
8942 ;;
8943
8944@@ -11768,10 +12433,10 @@ else
8945 /* When -fvisbility=hidden is used, assume the code has been annotated
8946 correspondingly for the symbols needed. */
8947 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8948-void fnord () __attribute__((visibility("default")));
8949+int fnord () __attribute__((visibility("default")));
8950 #endif
8951
8952-void fnord () { int i=42; }
8953+int fnord () { return 42; }
8954 int main ()
8955 {
8956 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8957@@ -11874,10 +12539,10 @@ else
8958 /* When -fvisbility=hidden is used, assume the code has been annotated
8959 correspondingly for the symbols needed. */
8960 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8961-void fnord () __attribute__((visibility("default")));
8962+int fnord () __attribute__((visibility("default")));
8963 #endif
8964
8965-void fnord () { int i=42; }
8966+int fnord () { return 42; }
8967 int main ()
8968 {
8969 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8970@@ -12269,6 +12934,7 @@ $RM -r conftest*
8971
8972 # Allow CC to be a program name with arguments.
8973 lt_save_CC=$CC
8974+ lt_save_CFLAGS=$CFLAGS
8975 lt_save_LD=$LD
8976 lt_save_GCC=$GCC
8977 GCC=$GXX
8978@@ -12286,6 +12952,7 @@ $RM -r conftest*
8979 fi
8980 test -z "${LDCXX+set}" || LD=$LDCXX
8981 CC=${CXX-"c++"}
8982+ CFLAGS=$CXXFLAGS
8983 compiler=$CC
8984 compiler_CXX=$CC
8985 for cc_temp in $compiler""; do
8986@@ -12568,7 +13235,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8987 allow_undefined_flag_CXX='-berok'
8988 # Determine the default libpath from the value encoded in an empty
8989 # executable.
8990- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8991+ if test "${lt_cv_aix_libpath+set}" = set; then
8992+ aix_libpath=$lt_cv_aix_libpath
8993+else
8994+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
8995+ $as_echo_n "(cached) " >&6
8996+else
8997+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8998 /* end confdefs.h. */
8999
9000 int
9001@@ -12581,22 +13254,29 @@ main ()
9002 _ACEOF
9003 if ac_fn_cxx_try_link "$LINENO"; then :
9004
9005-lt_aix_libpath_sed='
9006- /Import File Strings/,/^$/ {
9007- /^0/ {
9008- s/^0 *\(.*\)$/\1/
9009- p
9010- }
9011- }'
9012-aix_libpath=`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 "$aix_libpath"; then
9015- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9016-fi
9017+ lt_aix_libpath_sed='
9018+ /Import File Strings/,/^$/ {
9019+ /^0/ {
9020+ s/^0 *\([^ ]*\) *$/\1/
9021+ p
9022+ }
9023+ }'
9024+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9025+ # Check for a 64-bit object if we didn't find anything.
9026+ if test -z "$lt_cv_aix_libpath__CXX"; then
9027+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9028+ fi
9029 fi
9030 rm -f core conftest.err conftest.$ac_objext \
9031 conftest$ac_exeext conftest.$ac_ext
9032-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9033+ if test -z "$lt_cv_aix_libpath__CXX"; then
9034+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9035+ fi
9036+
9037+fi
9038+
9039+ aix_libpath=$lt_cv_aix_libpath__CXX
9040+fi
9041
9042 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9043
9044@@ -12609,7 +13289,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9045 else
9046 # Determine the default libpath from the value encoded in an
9047 # empty executable.
9048- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9049+ if test "${lt_cv_aix_libpath+set}" = set; then
9050+ aix_libpath=$lt_cv_aix_libpath
9051+else
9052+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9053+ $as_echo_n "(cached) " >&6
9054+else
9055+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9056 /* end confdefs.h. */
9057
9058 int
9059@@ -12622,22 +13308,29 @@ main ()
9060 _ACEOF
9061 if ac_fn_cxx_try_link "$LINENO"; then :
9062
9063-lt_aix_libpath_sed='
9064- /Import File Strings/,/^$/ {
9065- /^0/ {
9066- s/^0 *\(.*\)$/\1/
9067- p
9068- }
9069- }'
9070-aix_libpath=`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 "$aix_libpath"; then
9073- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9074-fi
9075+ lt_aix_libpath_sed='
9076+ /Import File Strings/,/^$/ {
9077+ /^0/ {
9078+ s/^0 *\([^ ]*\) *$/\1/
9079+ p
9080+ }
9081+ }'
9082+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9083+ # Check for a 64-bit object if we didn't find anything.
9084+ if test -z "$lt_cv_aix_libpath__CXX"; then
9085+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9086+ fi
9087 fi
9088 rm -f core conftest.err conftest.$ac_objext \
9089 conftest$ac_exeext conftest.$ac_ext
9090-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9091+ if test -z "$lt_cv_aix_libpath__CXX"; then
9092+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9093+ fi
9094+
9095+fi
9096+
9097+ aix_libpath=$lt_cv_aix_libpath__CXX
9098+fi
9099
9100 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9101 # Warning - without using the other run time loading flags,
9102@@ -12680,29 +13373,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9103 ;;
9104
9105 cygwin* | mingw* | pw32* | cegcc*)
9106- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9107- # as there is no search path for DLLs.
9108- hardcode_libdir_flag_spec_CXX='-L$libdir'
9109- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9110- allow_undefined_flag_CXX=unsupported
9111- always_export_symbols_CXX=no
9112- enable_shared_with_static_runtimes_CXX=yes
9113-
9114- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9115- 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'
9116- # If the export-symbols file already is a .def file (1st line
9117- # is EXPORTS), use it as is; otherwise, prepend...
9118- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9119- cp $export_symbols $output_objdir/$soname.def;
9120- else
9121- echo EXPORTS > $output_objdir/$soname.def;
9122- cat $export_symbols >> $output_objdir/$soname.def;
9123- fi~
9124- $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'
9125- else
9126- ld_shlibs_CXX=no
9127- fi
9128- ;;
9129+ case $GXX,$cc_basename in
9130+ ,cl* | no,cl*)
9131+ # Native MSVC
9132+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9133+ # no search path for DLLs.
9134+ hardcode_libdir_flag_spec_CXX=' '
9135+ allow_undefined_flag_CXX=unsupported
9136+ always_export_symbols_CXX=yes
9137+ file_list_spec_CXX='@'
9138+ # Tell ltmain to make .lib files, not .a files.
9139+ libext=lib
9140+ # Tell ltmain to make .dll files, not .so files.
9141+ shrext_cmds=".dll"
9142+ # FIXME: Setting linknames here is a bad hack.
9143+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9144+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9145+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9146+ else
9147+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9148+ fi~
9149+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9150+ linknames='
9151+ # The linker will not automatically build a static lib if we build a DLL.
9152+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9153+ enable_shared_with_static_runtimes_CXX=yes
9154+ # Don't use ranlib
9155+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9156+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9157+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9158+ case $lt_outputfile in
9159+ *.exe|*.EXE) ;;
9160+ *)
9161+ lt_outputfile="$lt_outputfile.exe"
9162+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9163+ ;;
9164+ esac~
9165+ func_to_tool_file "$lt_outputfile"~
9166+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9167+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9168+ $RM "$lt_outputfile.manifest";
9169+ fi'
9170+ ;;
9171+ *)
9172+ # g++
9173+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9174+ # as there is no search path for DLLs.
9175+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9176+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9177+ allow_undefined_flag_CXX=unsupported
9178+ always_export_symbols_CXX=no
9179+ enable_shared_with_static_runtimes_CXX=yes
9180+
9181+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9182+ 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'
9183+ # If the export-symbols file already is a .def file (1st line
9184+ # is EXPORTS), use it as is; otherwise, prepend...
9185+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9186+ cp $export_symbols $output_objdir/$soname.def;
9187+ else
9188+ echo EXPORTS > $output_objdir/$soname.def;
9189+ cat $export_symbols >> $output_objdir/$soname.def;
9190+ fi~
9191+ $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'
9192+ else
9193+ ld_shlibs_CXX=no
9194+ fi
9195+ ;;
9196+ esac
9197+ ;;
9198 darwin* | rhapsody*)
9199
9200
9201@@ -12808,7 +13547,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9202 ;;
9203 *)
9204 if test "$GXX" = yes; then
9205- 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'
9206+ 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'
9207 else
9208 # FIXME: insert proper C++ library support
9209 ld_shlibs_CXX=no
9210@@ -12879,10 +13618,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9211 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9212 ;;
9213 ia64*)
9214- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9215+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9216 ;;
9217 *)
9218- 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'
9219+ 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'
9220 ;;
9221 esac
9222 fi
9223@@ -12923,9 +13662,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9224 *)
9225 if test "$GXX" = yes; then
9226 if test "$with_gnu_ld" = no; then
9227- 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'
9228+ 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'
9229 else
9230- 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'
9231+ 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'
9232 fi
9233 fi
9234 link_all_deplibs_CXX=yes
9235@@ -12995,20 +13734,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9236 prelink_cmds_CXX='tpldir=Template.dir~
9237 rm -rf $tpldir~
9238 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9239- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9240+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9241 old_archive_cmds_CXX='tpldir=Template.dir~
9242 rm -rf $tpldir~
9243 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9244- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9245+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9246 $RANLIB $oldlib'
9247 archive_cmds_CXX='tpldir=Template.dir~
9248 rm -rf $tpldir~
9249 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9250- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9251+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9252 archive_expsym_cmds_CXX='tpldir=Template.dir~
9253 rm -rf $tpldir~
9254 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9255- $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'
9256+ $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'
9257 ;;
9258 *) # Version 6 and above use weak symbols
9259 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9260@@ -13203,7 +13942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9261 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'
9262 ;;
9263 *)
9264- 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'
9265+ 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'
9266 ;;
9267 esac
9268
9269@@ -13249,7 +13988,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9270
9271 solaris*)
9272 case $cc_basename in
9273- CC*)
9274+ CC* | sunCC*)
9275 # Sun C++ 4.2, 5.x and Centerline C++
9276 archive_cmds_need_lc_CXX=yes
9277 no_undefined_flag_CXX=' -zdefs'
9278@@ -13290,9 +14029,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9279 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9280 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9281 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9282- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9283+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9284 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9285- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9286+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9287
9288 # Commands to make compiler produce verbose output that lists
9289 # what "hidden" libraries, object files and flags are used when
9290@@ -13427,6 +14166,13 @@ private:
9291 };
9292 _LT_EOF
9293
9294+
9295+_lt_libdeps_save_CFLAGS=$CFLAGS
9296+case "$CC $CFLAGS " in #(
9297+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9298+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9299+esac
9300+
9301 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9302 (eval $ac_compile) 2>&5
9303 ac_status=$?
9304@@ -13440,7 +14186,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9305 pre_test_object_deps_done=no
9306
9307 for p in `eval "$output_verbose_link_cmd"`; do
9308- case $p in
9309+ case ${prev}${p} in
9310
9311 -L* | -R* | -l*)
9312 # Some compilers place space between "-{L,R}" and the path.
9313@@ -13449,13 +14195,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9314 test $p = "-R"; then
9315 prev=$p
9316 continue
9317- else
9318- prev=
9319 fi
9320
9321+ # Expand the sysroot to ease extracting the directories later.
9322+ if test -z "$prev"; then
9323+ case $p in
9324+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9325+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9326+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9327+ esac
9328+ fi
9329+ case $p in
9330+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9331+ esac
9332 if test "$pre_test_object_deps_done" = no; then
9333- case $p in
9334- -L* | -R*)
9335+ case ${prev} in
9336+ -L | -R)
9337 # Internal compiler library paths should come after those
9338 # provided the user. The postdeps already come after the
9339 # user supplied libs so there is no need to process them.
9340@@ -13475,8 +14230,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9341 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9342 fi
9343 fi
9344+ prev=
9345 ;;
9346
9347+ *.lto.$objext) ;; # Ignore GCC LTO objects
9348 *.$objext)
9349 # This assumes that the test object file only shows up
9350 # once in the compiler output.
9351@@ -13512,6 +14269,7 @@ else
9352 fi
9353
9354 $RM -f confest.$objext
9355+CFLAGS=$_lt_libdeps_save_CFLAGS
9356
9357 # PORTME: override above test on systems where it is broken
9358 case $host_os in
9359@@ -13547,7 +14305,7 @@ linux*)
9360
9361 solaris*)
9362 case $cc_basename in
9363- CC*)
9364+ CC* | sunCC*)
9365 # The more standards-conforming stlport4 library is
9366 # incompatible with the Cstd library. Avoid specifying
9367 # it if it's in CXXFLAGS. Ignore libCrun as
9368@@ -13612,8 +14370,6 @@ fi
9369 lt_prog_compiler_pic_CXX=
9370 lt_prog_compiler_static_CXX=
9371
9372-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9373-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9374
9375 # C++ specific cases for pic, static, wl, etc.
9376 if test "$GXX" = yes; then
9377@@ -13718,6 +14474,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9378 ;;
9379 esac
9380 ;;
9381+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9382+ # This hack is so that the source file can tell whether it is being
9383+ # built for inclusion in a dll (and should export symbols for example).
9384+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9385+ ;;
9386 dgux*)
9387 case $cc_basename in
9388 ec++*)
9389@@ -13870,7 +14631,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9390 ;;
9391 solaris*)
9392 case $cc_basename in
9393- CC*)
9394+ CC* | sunCC*)
9395 # Sun C++ 4.2, 5.x and Centerline C++
9396 lt_prog_compiler_pic_CXX='-KPIC'
9397 lt_prog_compiler_static_CXX='-Bstatic'
9398@@ -13935,10 +14696,17 @@ case $host_os in
9399 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9400 ;;
9401 esac
9402-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9403-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9404-
9405
9406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9407+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9408+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
9409+ $as_echo_n "(cached) " >&6
9410+else
9411+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9412+fi
9413+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9414+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9415+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9416
9417 #
9418 # Check to make sure the PIC flag actually works.
9419@@ -13996,6 +14764,8 @@ fi
9420
9421
9422
9423+
9424+
9425 #
9426 # Check to make sure the static flag actually works.
9427 #
9428@@ -14173,6 +14943,7 @@ fi
9429 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9430
9431 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9432+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9433 case $host_os in
9434 aix[4-9]*)
9435 # If we're using GNU nm, then we don't want the "-C" option.
9436@@ -14187,15 +14958,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9437 ;;
9438 pw32*)
9439 export_symbols_cmds_CXX="$ltdll_cmds"
9440- ;;
9441+ ;;
9442 cygwin* | mingw* | cegcc*)
9443- 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'
9444- ;;
9445+ case $cc_basename in
9446+ cl*) ;;
9447+ *)
9448+ 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'
9449+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9450+ ;;
9451+ esac
9452+ ;;
9453 *)
9454 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9455- ;;
9456+ ;;
9457 esac
9458- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9459
9460 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9461 $as_echo "$ld_shlibs_CXX" >&6; }
9462@@ -14458,8 +15234,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9463 need_version=no
9464 need_lib_prefix=no
9465
9466- case $GCC,$host_os in
9467- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9468+ case $GCC,$cc_basename in
9469+ yes,*)
9470+ # gcc
9471 library_names_spec='$libname.dll.a'
9472 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9473 postinstall_cmds='base_file=`basename \${file}`~
9474@@ -14491,13 +15268,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9475 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9476 ;;
9477 esac
9478+ dynamic_linker='Win32 ld.exe'
9479+ ;;
9480+
9481+ *,cl*)
9482+ # Native MSVC
9483+ libname_spec='$name'
9484+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9485+ library_names_spec='${libname}.dll.lib'
9486+
9487+ case $build_os in
9488+ mingw*)
9489+ sys_lib_search_path_spec=
9490+ lt_save_ifs=$IFS
9491+ IFS=';'
9492+ for lt_path in $LIB
9493+ do
9494+ IFS=$lt_save_ifs
9495+ # Let DOS variable expansion print the short 8.3 style file name.
9496+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9497+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9498+ done
9499+ IFS=$lt_save_ifs
9500+ # Convert to MSYS style.
9501+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9502+ ;;
9503+ cygwin*)
9504+ # Convert to unix form, then to dos form, then back to unix form
9505+ # but this time dos style (no spaces!) so that the unix form looks
9506+ # like /cygdrive/c/PROGRA~1:/cygdr...
9507+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9508+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9509+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9510+ ;;
9511+ *)
9512+ sys_lib_search_path_spec="$LIB"
9513+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9514+ # It is most probably a Windows format PATH.
9515+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9516+ else
9517+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9518+ fi
9519+ # FIXME: find the short name or the path components, as spaces are
9520+ # common. (e.g. "Program Files" -> "PROGRA~1")
9521+ ;;
9522+ esac
9523+
9524+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9525+ postinstall_cmds='base_file=`basename \${file}`~
9526+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9527+ dldir=$destdir/`dirname \$dlpath`~
9528+ test -d \$dldir || mkdir -p \$dldir~
9529+ $install_prog $dir/$dlname \$dldir/$dlname'
9530+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9531+ dlpath=$dir/\$dldll~
9532+ $RM \$dlpath'
9533+ shlibpath_overrides_runpath=yes
9534+ dynamic_linker='Win32 link.exe'
9535 ;;
9536
9537 *)
9538+ # Assume MSVC wrapper
9539 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9540+ dynamic_linker='Win32 ld.exe'
9541 ;;
9542 esac
9543- dynamic_linker='Win32 ld.exe'
9544 # FIXME: first we should search . and the directory the executable is in
9545 shlibpath_var=PATH
9546 ;;
9547@@ -14588,7 +15423,7 @@ haiku*)
9548 soname_spec='${libname}${release}${shared_ext}$major'
9549 shlibpath_var=LIBRARY_PATH
9550 shlibpath_overrides_runpath=yes
9551- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9552+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9553 hardcode_into_libs=yes
9554 ;;
9555
9556@@ -15047,6 +15882,7 @@ fi
9557 fi # test -n "$compiler"
9558
9559 CC=$lt_save_CC
9560+ CFLAGS=$lt_save_CFLAGS
9561 LDCXX=$LD
9562 LD=$lt_save_LD
9563 GCC=$lt_save_GCC
9564@@ -18026,13 +18862,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9565 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9566 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9567 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9568+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9569+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9570 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9571 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9572 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9573 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9574 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9575+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9576+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9577+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9578+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9579 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9580 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9581+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9582 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9583 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9584 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9585@@ -18047,14 +18890,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9586 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9587 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9588 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"`'
9589+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9590+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9591 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9592 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9593 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9594-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9595 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9596+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9597 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9598 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9599 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9600+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9601 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9602 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9603 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9604@@ -18087,12 +18933,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9605 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9606 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9607 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9608-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9609 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9610 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9611 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9612 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9613 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9614+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9615 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9616 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9617 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9618@@ -18131,8 +18977,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9619 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9620 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9621 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9622-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9623 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9624+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9625 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9626 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9627 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9628@@ -18159,12 +19005,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9629 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9630 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9631 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9632-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9633 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9634 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9635 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9636 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9637 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9638+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9639 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9640 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9641 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9642@@ -18202,8 +19048,13 @@ reload_flag \
9643 OBJDUMP \
9644 deplibs_check_method \
9645 file_magic_cmd \
9646+file_magic_glob \
9647+want_nocaseglob \
9648+DLLTOOL \
9649+sharedlib_from_linklib_cmd \
9650 AR \
9651 AR_FLAGS \
9652+archiver_list_spec \
9653 STRIP \
9654 RANLIB \
9655 CC \
9656@@ -18213,12 +19064,14 @@ lt_cv_sys_global_symbol_pipe \
9657 lt_cv_sys_global_symbol_to_cdecl \
9658 lt_cv_sys_global_symbol_to_c_name_address \
9659 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9660+nm_file_list_spec \
9661 lt_prog_compiler_no_builtin_flag \
9662-lt_prog_compiler_wl \
9663 lt_prog_compiler_pic \
9664+lt_prog_compiler_wl \
9665 lt_prog_compiler_static \
9666 lt_cv_prog_compiler_c_o \
9667 need_locks \
9668+MANIFEST_TOOL \
9669 DSYMUTIL \
9670 NMEDIT \
9671 LIPO \
9672@@ -18234,7 +19087,6 @@ no_undefined_flag \
9673 hardcode_libdir_flag_spec \
9674 hardcode_libdir_flag_spec_ld \
9675 hardcode_libdir_separator \
9676-fix_srcfile_path \
9677 exclude_expsyms \
9678 include_expsyms \
9679 file_list_spec \
9680@@ -18256,8 +19108,8 @@ LD_CXX \
9681 reload_flag_CXX \
9682 compiler_CXX \
9683 lt_prog_compiler_no_builtin_flag_CXX \
9684-lt_prog_compiler_wl_CXX \
9685 lt_prog_compiler_pic_CXX \
9686+lt_prog_compiler_wl_CXX \
9687 lt_prog_compiler_static_CXX \
9688 lt_cv_prog_compiler_c_o_CXX \
9689 export_dynamic_flag_spec_CXX \
9690@@ -18269,7 +19121,6 @@ no_undefined_flag_CXX \
9691 hardcode_libdir_flag_spec_CXX \
9692 hardcode_libdir_flag_spec_ld_CXX \
9693 hardcode_libdir_separator_CXX \
9694-fix_srcfile_path_CXX \
9695 exclude_expsyms_CXX \
9696 include_expsyms_CXX \
9697 file_list_spec_CXX \
9698@@ -18303,6 +19154,7 @@ module_cmds \
9699 module_expsym_cmds \
9700 export_symbols_cmds \
9701 prelink_cmds \
9702+postlink_cmds \
9703 postinstall_cmds \
9704 postuninstall_cmds \
9705 finish_cmds \
9706@@ -18317,7 +19169,8 @@ archive_expsym_cmds_CXX \
9707 module_cmds_CXX \
9708 module_expsym_cmds_CXX \
9709 export_symbols_cmds_CXX \
9710-prelink_cmds_CXX; do
9711+prelink_cmds_CXX \
9712+postlink_cmds_CXX; do
9713 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9714 *[\\\\\\\`\\"\\\$]*)
9715 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9716@@ -19110,7 +19963,8 @@ $as_echo X"$file" |
9717 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9718 #
9719 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9720-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9721+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9722+# Inc.
9723 # Written by Gordon Matzigkeit, 1996
9724 #
9725 # This file is part of GNU Libtool.
9726@@ -19213,19 +20067,42 @@ SP2NL=$lt_lt_SP2NL
9727 # turn newlines into spaces.
9728 NL2SP=$lt_lt_NL2SP
9729
9730+# convert \$build file names to \$host format.
9731+to_host_file_cmd=$lt_cv_to_host_file_cmd
9732+
9733+# convert \$build files to toolchain format.
9734+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9735+
9736 # An object symbol dumper.
9737 OBJDUMP=$lt_OBJDUMP
9738
9739 # Method to check whether dependent libraries are shared objects.
9740 deplibs_check_method=$lt_deplibs_check_method
9741
9742-# Command to use when deplibs_check_method == "file_magic".
9743+# Command to use when deplibs_check_method = "file_magic".
9744 file_magic_cmd=$lt_file_magic_cmd
9745
9746+# How to find potential files when deplibs_check_method = "file_magic".
9747+file_magic_glob=$lt_file_magic_glob
9748+
9749+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9750+want_nocaseglob=$lt_want_nocaseglob
9751+
9752+# DLL creation program.
9753+DLLTOOL=$lt_DLLTOOL
9754+
9755+# Command to associate shared and link libraries.
9756+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9757+
9758 # The archiver.
9759 AR=$lt_AR
9760+
9761+# Flags to create an archive.
9762 AR_FLAGS=$lt_AR_FLAGS
9763
9764+# How to feed a file listing to the archiver.
9765+archiver_list_spec=$lt_archiver_list_spec
9766+
9767 # A symbol stripping program.
9768 STRIP=$lt_STRIP
9769
9770@@ -19255,6 +20132,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9771 # Transform the output of nm in a C name address pair when lib prefix is needed.
9772 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9773
9774+# Specify filename containing input files for \$NM.
9775+nm_file_list_spec=$lt_nm_file_list_spec
9776+
9777+# The root where to search for dependent libraries,and in which our libraries should be installed.
9778+lt_sysroot=$lt_sysroot
9779+
9780 # The name of the directory that contains temporary libtool files.
9781 objdir=$objdir
9782
9783@@ -19264,6 +20147,9 @@ MAGIC_CMD=$MAGIC_CMD
9784 # Must we lock files when doing compilation?
9785 need_locks=$lt_need_locks
9786
9787+# Manifest tool.
9788+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9789+
9790 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9791 DSYMUTIL=$lt_DSYMUTIL
9792
9793@@ -19378,12 +20264,12 @@ with_gcc=$GCC
9794 # Compiler flag to turn off builtin functions.
9795 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9796
9797-# How to pass a linker flag through the compiler.
9798-wl=$lt_lt_prog_compiler_wl
9799-
9800 # Additional compiler flags for building library objects.
9801 pic_flag=$lt_lt_prog_compiler_pic
9802
9803+# How to pass a linker flag through the compiler.
9804+wl=$lt_lt_prog_compiler_wl
9805+
9806 # Compiler flag to prevent dynamic linking.
9807 link_static_flag=$lt_lt_prog_compiler_static
9808
9809@@ -19470,9 +20356,6 @@ inherit_rpath=$inherit_rpath
9810 # Whether libtool must link a program against all its dependency libraries.
9811 link_all_deplibs=$link_all_deplibs
9812
9813-# Fix the shell variable \$srcfile for the compiler.
9814-fix_srcfile_path=$lt_fix_srcfile_path
9815-
9816 # Set to "yes" if exported symbols are required.
9817 always_export_symbols=$always_export_symbols
9818
9819@@ -19488,6 +20371,9 @@ include_expsyms=$lt_include_expsyms
9820 # Commands necessary for linking programs (against libraries) with templates.
9821 prelink_cmds=$lt_prelink_cmds
9822
9823+# Commands necessary for finishing linking programs.
9824+postlink_cmds=$lt_postlink_cmds
9825+
9826 # Specify filename containing input files.
9827 file_list_spec=$lt_file_list_spec
9828
9829@@ -19534,210 +20420,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9830 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9831 # text mode, it properly converts lines to CR/LF. This bash problem
9832 # is reportedly fixed, but why not run on old versions too?
9833- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9834- || (rm -f "$cfgfile"; exit 1)
9835-
9836- case $xsi_shell in
9837- yes)
9838- cat << \_LT_EOF >> "$cfgfile"
9839-
9840-# func_dirname file append nondir_replacement
9841-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9842-# otherwise set result to NONDIR_REPLACEMENT.
9843-func_dirname ()
9844-{
9845- case ${1} in
9846- */*) func_dirname_result="${1%/*}${2}" ;;
9847- * ) func_dirname_result="${3}" ;;
9848- esac
9849-}
9850-
9851-# func_basename file
9852-func_basename ()
9853-{
9854- func_basename_result="${1##*/}"
9855-}
9856-
9857-# func_dirname_and_basename file append nondir_replacement
9858-# perform func_basename and func_dirname in a single function
9859-# call:
9860-# dirname: Compute the dirname of FILE. If nonempty,
9861-# add APPEND to the result, otherwise set result
9862-# to NONDIR_REPLACEMENT.
9863-# value returned in "$func_dirname_result"
9864-# basename: Compute filename of FILE.
9865-# value retuned in "$func_basename_result"
9866-# Implementation must be kept synchronized with func_dirname
9867-# and func_basename. For efficiency, we do not delegate to
9868-# those functions but instead duplicate the functionality here.
9869-func_dirname_and_basename ()
9870-{
9871- case ${1} in
9872- */*) func_dirname_result="${1%/*}${2}" ;;
9873- * ) func_dirname_result="${3}" ;;
9874- esac
9875- func_basename_result="${1##*/}"
9876-}
9877-
9878-# func_stripname prefix suffix name
9879-# strip PREFIX and SUFFIX off of NAME.
9880-# PREFIX and SUFFIX must not contain globbing or regex special
9881-# characters, hashes, percent signs, but SUFFIX may contain a leading
9882-# dot (in which case that matches only a dot).
9883-func_stripname ()
9884-{
9885- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9886- # positional parameters, so assign one to ordinary parameter first.
9887- func_stripname_result=${3}
9888- func_stripname_result=${func_stripname_result#"${1}"}
9889- func_stripname_result=${func_stripname_result%"${2}"}
9890-}
9891-
9892-# func_opt_split
9893-func_opt_split ()
9894-{
9895- func_opt_split_opt=${1%%=*}
9896- func_opt_split_arg=${1#*=}
9897-}
9898-
9899-# func_lo2o object
9900-func_lo2o ()
9901-{
9902- case ${1} in
9903- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9904- *) func_lo2o_result=${1} ;;
9905- esac
9906-}
9907-
9908-# func_xform libobj-or-source
9909-func_xform ()
9910-{
9911- func_xform_result=${1%.*}.lo
9912-}
9913-
9914-# func_arith arithmetic-term...
9915-func_arith ()
9916-{
9917- func_arith_result=$(( $* ))
9918-}
9919-
9920-# func_len string
9921-# STRING may not start with a hyphen.
9922-func_len ()
9923-{
9924- func_len_result=${#1}
9925-}
9926-
9927-_LT_EOF
9928- ;;
9929- *) # Bourne compatible functions.
9930- cat << \_LT_EOF >> "$cfgfile"
9931-
9932-# func_dirname file append nondir_replacement
9933-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9934-# otherwise set result to NONDIR_REPLACEMENT.
9935-func_dirname ()
9936-{
9937- # Extract subdirectory from the argument.
9938- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9939- if test "X$func_dirname_result" = "X${1}"; then
9940- func_dirname_result="${3}"
9941- else
9942- func_dirname_result="$func_dirname_result${2}"
9943- fi
9944-}
9945-
9946-# func_basename file
9947-func_basename ()
9948-{
9949- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9950-}
9951-
9952-
9953-# func_stripname prefix suffix name
9954-# strip PREFIX and SUFFIX off of NAME.
9955-# PREFIX and SUFFIX must not contain globbing or regex special
9956-# characters, hashes, percent signs, but SUFFIX may contain a leading
9957-# dot (in which case that matches only a dot).
9958-# func_strip_suffix prefix name
9959-func_stripname ()
9960-{
9961- case ${2} in
9962- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
9963- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
9964- esac
9965-}
9966-
9967-# sed scripts:
9968-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
9969-my_sed_long_arg='1s/^-[^=]*=//'
9970-
9971-# func_opt_split
9972-func_opt_split ()
9973-{
9974- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
9975- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
9976-}
9977-
9978-# func_lo2o object
9979-func_lo2o ()
9980-{
9981- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
9982-}
9983-
9984-# func_xform libobj-or-source
9985-func_xform ()
9986-{
9987- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
9988-}
9989-
9990-# func_arith arithmetic-term...
9991-func_arith ()
9992-{
9993- func_arith_result=`expr "$@"`
9994-}
9995-
9996-# func_len string
9997-# STRING may not start with a hyphen.
9998-func_len ()
9999-{
10000- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10001-}
10002-
10003-_LT_EOF
10004-esac
10005-
10006-case $lt_shell_append in
10007- yes)
10008- cat << \_LT_EOF >> "$cfgfile"
10009-
10010-# func_append var value
10011-# Append VALUE to the end of shell variable VAR.
10012-func_append ()
10013-{
10014- eval "$1+=\$2"
10015-}
10016-_LT_EOF
10017- ;;
10018- *)
10019- cat << \_LT_EOF >> "$cfgfile"
10020-
10021-# func_append var value
10022-# Append VALUE to the end of shell variable VAR.
10023-func_append ()
10024-{
10025- eval "$1=\$$1\$2"
10026-}
10027-
10028-_LT_EOF
10029- ;;
10030- esac
10031-
10032-
10033- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10034- || (rm -f "$cfgfile"; exit 1)
10035-
10036- mv -f "$cfgfile" "$ofile" ||
10037+ sed '$q' "$ltmain" >> "$cfgfile" \
10038+ || (rm -f "$cfgfile"; exit 1)
10039+
10040+ if test x"$xsi_shell" = xyes; then
10041+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10042+func_dirname ()\
10043+{\
10044+\ case ${1} in\
10045+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10046+\ * ) func_dirname_result="${3}" ;;\
10047+\ esac\
10048+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10049+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10050+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10051+test 0 -eq $? || _lt_function_replace_fail=:
10052+
10053+
10054+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10055+func_basename ()\
10056+{\
10057+\ func_basename_result="${1##*/}"\
10058+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10059+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10060+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10061+test 0 -eq $? || _lt_function_replace_fail=:
10062+
10063+
10064+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10065+func_dirname_and_basename ()\
10066+{\
10067+\ case ${1} in\
10068+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10069+\ * ) func_dirname_result="${3}" ;;\
10070+\ esac\
10071+\ func_basename_result="${1##*/}"\
10072+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10073+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10074+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10075+test 0 -eq $? || _lt_function_replace_fail=:
10076+
10077+
10078+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10079+func_stripname ()\
10080+{\
10081+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10082+\ # positional parameters, so assign one to ordinary parameter first.\
10083+\ func_stripname_result=${3}\
10084+\ func_stripname_result=${func_stripname_result#"${1}"}\
10085+\ func_stripname_result=${func_stripname_result%"${2}"}\
10086+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10087+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10088+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10089+test 0 -eq $? || _lt_function_replace_fail=:
10090+
10091+
10092+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10093+func_split_long_opt ()\
10094+{\
10095+\ func_split_long_opt_name=${1%%=*}\
10096+\ func_split_long_opt_arg=${1#*=}\
10097+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10098+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10099+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10100+test 0 -eq $? || _lt_function_replace_fail=:
10101+
10102+
10103+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10104+func_split_short_opt ()\
10105+{\
10106+\ func_split_short_opt_arg=${1#??}\
10107+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10108+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10109+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10110+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10111+test 0 -eq $? || _lt_function_replace_fail=:
10112+
10113+
10114+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10115+func_lo2o ()\
10116+{\
10117+\ case ${1} in\
10118+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10119+\ *) func_lo2o_result=${1} ;;\
10120+\ esac\
10121+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10122+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10123+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10124+test 0 -eq $? || _lt_function_replace_fail=:
10125+
10126+
10127+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10128+func_xform ()\
10129+{\
10130+ func_xform_result=${1%.*}.lo\
10131+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10132+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10133+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10134+test 0 -eq $? || _lt_function_replace_fail=:
10135+
10136+
10137+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10138+func_arith ()\
10139+{\
10140+ func_arith_result=$(( $* ))\
10141+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10142+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10143+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10144+test 0 -eq $? || _lt_function_replace_fail=:
10145+
10146+
10147+ sed -e '/^func_len ()$/,/^} # func_len /c\
10148+func_len ()\
10149+{\
10150+ func_len_result=${#1}\
10151+} # Extended-shell func_len 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+fi
10157+
10158+if test x"$lt_shell_append" = xyes; then
10159+ sed -e '/^func_append ()$/,/^} # func_append /c\
10160+func_append ()\
10161+{\
10162+ eval "${1}+=\\${2}"\
10163+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10164+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10165+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10166+test 0 -eq $? || _lt_function_replace_fail=:
10167+
10168+
10169+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10170+func_append_quoted ()\
10171+{\
10172+\ func_quote_for_eval "${2}"\
10173+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10174+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10175+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10176+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10177+test 0 -eq $? || _lt_function_replace_fail=:
10178+
10179+
10180+ # Save a `func_append' function call where possible by direct use of '+='
10181+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10182+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10183+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10184+ test 0 -eq $? || _lt_function_replace_fail=:
10185+else
10186+ # Save a `func_append' function call even when '+=' is not available
10187+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10188+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10189+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10190+ test 0 -eq $? || _lt_function_replace_fail=:
10191+fi
10192+
10193+if test x"$_lt_function_replace_fail" = x":"; then
10194+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10195+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10196+fi
10197+
10198+
10199+ mv -f "$cfgfile" "$ofile" ||
10200 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10201 chmod +x "$ofile"
10202
10203@@ -19765,12 +20610,12 @@ with_gcc=$GCC_CXX
10204 # Compiler flag to turn off builtin functions.
10205 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10206
10207-# How to pass a linker flag through the compiler.
10208-wl=$lt_lt_prog_compiler_wl_CXX
10209-
10210 # Additional compiler flags for building library objects.
10211 pic_flag=$lt_lt_prog_compiler_pic_CXX
10212
10213+# How to pass a linker flag through the compiler.
10214+wl=$lt_lt_prog_compiler_wl_CXX
10215+
10216 # Compiler flag to prevent dynamic linking.
10217 link_static_flag=$lt_lt_prog_compiler_static_CXX
10218
10219@@ -19857,9 +20702,6 @@ inherit_rpath=$inherit_rpath_CXX
10220 # Whether libtool must link a program against all its dependency libraries.
10221 link_all_deplibs=$link_all_deplibs_CXX
10222
10223-# Fix the shell variable \$srcfile for the compiler.
10224-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10225-
10226 # Set to "yes" if exported symbols are required.
10227 always_export_symbols=$always_export_symbols_CXX
10228
10229@@ -19875,6 +20717,9 @@ include_expsyms=$lt_include_expsyms_CXX
10230 # Commands necessary for linking programs (against libraries) with templates.
10231 prelink_cmds=$lt_prelink_cmds_CXX
10232
10233+# Commands necessary for finishing linking programs.
10234+postlink_cmds=$lt_postlink_cmds_CXX
10235+
10236 # Specify filename containing input files.
10237 file_list_spec=$lt_file_list_spec_CXX
10238
10239diff --git a/libtool.m4 b/libtool.m4
10240index 24d13f3440..e45fdc6998 100644
10241--- a/libtool.m4
10242+++ b/libtool.m4
10243@@ -1,7 +1,8 @@
10244 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10245 #
10246 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10247-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10248+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10249+# Inc.
10250 # Written by Gordon Matzigkeit, 1996
10251 #
10252 # This file is free software; the Free Software Foundation gives
10253@@ -10,7 +11,8 @@
10254
10255 m4_define([_LT_COPYING], [dnl
10256 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10257-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10258+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10259+# Inc.
10260 # Written by Gordon Matzigkeit, 1996
10261 #
10262 # This file is part of GNU Libtool.
10263@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10264 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10265 ])
10266
10267-# serial 56 LT_INIT
10268+# serial 57 LT_INIT
10269
10270
10271 # LT_PREREQ(VERSION)
10272@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10273 LIBTOOL_DEPS="$ltmain"
10274
10275 # Always use our own libtool.
10276-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10277+LIBTOOL='$(SHELL) $(top_builddir)'
10278+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10279 AC_SUBST(LIBTOOL)dnl
10280
10281 _LT_SETUP
10282@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
10283 dnl
10284 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10285 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10286+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10287 m4_require([_LT_CMD_RELOAD])dnl
10288 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10289+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10290 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10291 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10292+m4_require([_LT_WITH_SYSROOT])dnl
10293
10294 _LT_CONFIG_LIBTOOL_INIT([
10295 # See if we are running on zsh, and set the options which allow our
10296@@ -199,7 +205,7 @@ aix3*)
10297 esac
10298
10299 # Global variables:
10300-ofile=libtool
10301+ofile=${host_alias}-libtool
10302 can_build_shared=yes
10303
10304 # All known linkers require a `.a' archive for static linking (except MSVC,
10305@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
10306 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10307 configured by $[0], generated by m4_PACKAGE_STRING.
10308
10309-Copyright (C) 2009 Free Software Foundation, Inc.
10310+Copyright (C) 2010 Free Software Foundation, Inc.
10311 This config.lt script is free software; the Free Software Foundation
10312 gives unlimited permision to copy, distribute and modify it."
10313
10314@@ -746,15 +752,12 @@ _LT_EOF
10315 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10316 # text mode, it properly converts lines to CR/LF. This bash problem
10317 # is reportedly fixed, but why not run on old versions too?
10318- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10319- || (rm -f "$cfgfile"; exit 1)
10320+ sed '$q' "$ltmain" >> "$cfgfile" \
10321+ || (rm -f "$cfgfile"; exit 1)
10322
10323- _LT_PROG_XSI_SHELLFNS
10324+ _LT_PROG_REPLACE_SHELLFNS
10325
10326- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10327- || (rm -f "$cfgfile"; exit 1)
10328-
10329- mv -f "$cfgfile" "$ofile" ||
10330+ mv -f "$cfgfile" "$ofile" ||
10331 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10332 chmod +x "$ofile"
10333 ],
10334@@ -980,6 +983,8 @@ _LT_EOF
10335 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10336 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10337 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10338+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10339+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10340 cat > conftest.c << _LT_EOF
10341 int main() { return 0;}
10342 _LT_EOF
10343@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10344 fi
10345 ])
10346
10347-# _LT_SYS_MODULE_PATH_AIX
10348-# -----------------------
10349+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10350+# ----------------------------------
10351 # Links a minimal program and checks the executable
10352 # for the system default hardcoded library path. In most cases,
10353 # this is /usr/lib:/lib, but when the MPI compilers are used
10354 # the location of the communication and MPI libs are included too.
10355 # If we don't find anything, use the default library path according
10356 # to the aix ld manual.
10357+# Store the results from the different compilers for each TAGNAME.
10358+# Allow to override them for all tags through lt_cv_aix_libpath.
10359 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10360 [m4_require([_LT_DECL_SED])dnl
10361-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
10362-lt_aix_libpath_sed='
10363- /Import File Strings/,/^$/ {
10364- /^0/ {
10365- s/^0 *\(.*\)$/\1/
10366- p
10367- }
10368- }'
10369-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10370-# Check for a 64-bit object if we didn't find anything.
10371-if test -z "$aix_libpath"; then
10372- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10373-fi],[])
10374-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10375+if test "${lt_cv_aix_libpath+set}" = set; then
10376+ aix_libpath=$lt_cv_aix_libpath
10377+else
10378+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10379+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10380+ lt_aix_libpath_sed='[
10381+ /Import File Strings/,/^$/ {
10382+ /^0/ {
10383+ s/^0 *\([^ ]*\) *$/\1/
10384+ p
10385+ }
10386+ }]'
10387+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10388+ # Check for a 64-bit object if we didn't find anything.
10389+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10390+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10391+ fi],[])
10392+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10393+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10394+ fi
10395+ ])
10396+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10397+fi
10398 ])# _LT_SYS_MODULE_PATH_AIX
10399
10400
10401@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10402
10403 AC_MSG_CHECKING([how to print strings])
10404 # Test print first, because it will be a builtin if present.
10405-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10406+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10407 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10408 ECHO='print -r --'
10409 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10410@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
10411 ])# _LT_PROG_ECHO_BACKSLASH
10412
10413
10414+# _LT_WITH_SYSROOT
10415+# ----------------
10416+AC_DEFUN([_LT_WITH_SYSROOT],
10417+[AC_MSG_CHECKING([for sysroot])
10418+AC_ARG_WITH([libtool-sysroot],
10419+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10420+ (or the compiler's sysroot if not specified).],
10421+[], [with_libtool_sysroot=no])
10422+
10423+dnl lt_sysroot will always be passed unquoted. We quote it here
10424+dnl in case the user passed a directory name.
10425+lt_sysroot=
10426+case ${with_libtool_sysroot} in #(
10427+ yes)
10428+ if test "$GCC" = yes; then
10429+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10430+ fi
10431+ ;; #(
10432+ /*)
10433+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10434+ ;; #(
10435+ no|'')
10436+ ;; #(
10437+ *)
10438+ AC_MSG_RESULT([${with_libtool_sysroot}])
10439+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10440+ ;;
10441+esac
10442+
10443+ AC_MSG_RESULT([${lt_sysroot:-no}])
10444+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10445+[dependent libraries, and in which our libraries should be installed.])])
10446+
10447 # _LT_ENABLE_LOCK
10448 # ---------------
10449 m4_defun([_LT_ENABLE_LOCK],
10450@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10451 ])# _LT_ENABLE_LOCK
10452
10453
10454+# _LT_PROG_AR
10455+# -----------
10456+m4_defun([_LT_PROG_AR],
10457+[AC_CHECK_TOOLS(AR, [ar], false)
10458+: ${AR=ar}
10459+: ${AR_FLAGS=cru}
10460+_LT_DECL([], [AR], [1], [The archiver])
10461+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10462+
10463+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10464+ [lt_cv_ar_at_file=no
10465+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10466+ [echo conftest.$ac_objext > conftest.lst
10467+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10468+ AC_TRY_EVAL([lt_ar_try])
10469+ if test "$ac_status" -eq 0; then
10470+ # Ensure the archiver fails upon bogus file names.
10471+ rm -f conftest.$ac_objext libconftest.a
10472+ AC_TRY_EVAL([lt_ar_try])
10473+ if test "$ac_status" -ne 0; then
10474+ lt_cv_ar_at_file=@
10475+ fi
10476+ fi
10477+ rm -f conftest.* libconftest.a
10478+ ])
10479+ ])
10480+
10481+if test "x$lt_cv_ar_at_file" = xno; then
10482+ archiver_list_spec=
10483+else
10484+ archiver_list_spec=$lt_cv_ar_at_file
10485+fi
10486+_LT_DECL([], [archiver_list_spec], [1],
10487+ [How to feed a file listing to the archiver])
10488+])# _LT_PROG_AR
10489+
10490+
10491 # _LT_CMD_OLD_ARCHIVE
10492 # -------------------
10493 m4_defun([_LT_CMD_OLD_ARCHIVE],
10494-[AC_CHECK_TOOL(AR, ar, false)
10495-test -z "$AR" && AR=ar
10496-test -z "$AR_FLAGS" && AR_FLAGS=cru
10497-_LT_DECL([], [AR], [1], [The archiver])
10498-_LT_DECL([], [AR_FLAGS], [1])
10499+[_LT_PROG_AR
10500
10501 AC_CHECK_TOOL(STRIP, strip, :)
10502 test -z "$STRIP" && STRIP=:
10503@@ -1623,7 +1705,7 @@ else
10504 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10505 lt_status=$lt_dlunknown
10506 cat > conftest.$ac_ext <<_LT_EOF
10507-[#line __oline__ "configure"
10508+[#line $LINENO "configure"
10509 #include "confdefs.h"
10510
10511 #if HAVE_DLFCN_H
10512@@ -1667,10 +1749,10 @@ else
10513 /* When -fvisbility=hidden is used, assume the code has been annotated
10514 correspondingly for the symbols needed. */
10515 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10516-void fnord () __attribute__((visibility("default")));
10517+int fnord () __attribute__((visibility("default")));
10518 #endif
10519
10520-void fnord () { int i=42; }
10521+int fnord () { return 42; }
10522 int main ()
10523 {
10524 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10525@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10526 need_version=no
10527 need_lib_prefix=no
10528
10529- case $GCC,$host_os in
10530- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10531+ case $GCC,$cc_basename in
10532+ yes,*)
10533+ # gcc
10534 library_names_spec='$libname.dll.a'
10535 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10536 postinstall_cmds='base_file=`basename \${file}`~
10537@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10538 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10539 ;;
10540 esac
10541+ dynamic_linker='Win32 ld.exe'
10542+ ;;
10543+
10544+ *,cl*)
10545+ # Native MSVC
10546+ libname_spec='$name'
10547+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10548+ library_names_spec='${libname}.dll.lib'
10549+
10550+ case $build_os in
10551+ mingw*)
10552+ sys_lib_search_path_spec=
10553+ lt_save_ifs=$IFS
10554+ IFS=';'
10555+ for lt_path in $LIB
10556+ do
10557+ IFS=$lt_save_ifs
10558+ # Let DOS variable expansion print the short 8.3 style file name.
10559+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10560+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10561+ done
10562+ IFS=$lt_save_ifs
10563+ # Convert to MSYS style.
10564+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10565+ ;;
10566+ cygwin*)
10567+ # Convert to unix form, then to dos form, then back to unix form
10568+ # but this time dos style (no spaces!) so that the unix form looks
10569+ # like /cygdrive/c/PROGRA~1:/cygdr...
10570+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10571+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10572+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10573+ ;;
10574+ *)
10575+ sys_lib_search_path_spec="$LIB"
10576+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10577+ # It is most probably a Windows format PATH.
10578+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10579+ else
10580+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10581+ fi
10582+ # FIXME: find the short name or the path components, as spaces are
10583+ # common. (e.g. "Program Files" -> "PROGRA~1")
10584+ ;;
10585+ esac
10586+
10587+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10588+ postinstall_cmds='base_file=`basename \${file}`~
10589+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10590+ dldir=$destdir/`dirname \$dlpath`~
10591+ test -d \$dldir || mkdir -p \$dldir~
10592+ $install_prog $dir/$dlname \$dldir/$dlname'
10593+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10594+ dlpath=$dir/\$dldll~
10595+ $RM \$dlpath'
10596+ shlibpath_overrides_runpath=yes
10597+ dynamic_linker='Win32 link.exe'
10598 ;;
10599
10600 *)
10601+ # Assume MSVC wrapper
10602 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10603+ dynamic_linker='Win32 ld.exe'
10604 ;;
10605 esac
10606- dynamic_linker='Win32 ld.exe'
10607 # FIXME: first we should search . and the directory the executable is in
10608 shlibpath_var=PATH
10609 ;;
10610@@ -2342,7 +2483,7 @@ haiku*)
10611 soname_spec='${libname}${release}${shared_ext}$major'
10612 shlibpath_var=LIBRARY_PATH
10613 shlibpath_overrides_runpath=yes
10614- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10615+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10616 hardcode_into_libs=yes
10617 ;;
10618
10619@@ -2950,6 +3091,11 @@ case $reload_flag in
10620 esac
10621 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10622 case $host_os in
10623+ cygwin* | mingw* | pw32* | cegcc*)
10624+ if test "$GCC" != yes; then
10625+ reload_cmds=false
10626+ fi
10627+ ;;
10628 darwin*)
10629 if test "$GCC" = yes; then
10630 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10631@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10632 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10633 lt_cv_file_magic_cmd='func_win32_libid'
10634 else
10635- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10636+ # Keep this pattern in sync with the one in func_win32_libid.
10637+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10638 lt_cv_file_magic_cmd='$OBJDUMP -f'
10639 fi
10640 ;;
10641@@ -3167,6 +3314,21 @@ tpf*)
10642 ;;
10643 esac
10644 ])
10645+
10646+file_magic_glob=
10647+want_nocaseglob=no
10648+if test "$build" = "$host"; then
10649+ case $host_os in
10650+ mingw* | pw32*)
10651+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10652+ want_nocaseglob=yes
10653+ else
10654+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10655+ fi
10656+ ;;
10657+ esac
10658+fi
10659+
10660 file_magic_cmd=$lt_cv_file_magic_cmd
10661 deplibs_check_method=$lt_cv_deplibs_check_method
10662 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10663@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10664 _LT_DECL([], [deplibs_check_method], [1],
10665 [Method to check whether dependent libraries are shared objects])
10666 _LT_DECL([], [file_magic_cmd], [1],
10667- [Command to use when deplibs_check_method == "file_magic"])
10668+ [Command to use when deplibs_check_method = "file_magic"])
10669+_LT_DECL([], [file_magic_glob], [1],
10670+ [How to find potential files when deplibs_check_method = "file_magic"])
10671+_LT_DECL([], [want_nocaseglob], [1],
10672+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10673 ])# _LT_CHECK_MAGIC_METHOD
10674
10675
10676@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10677 dnl AC_DEFUN([AM_PROG_NM], [])
10678 dnl AC_DEFUN([AC_PROG_NM], [])
10679
10680+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10681+# --------------------------------
10682+# how to determine the name of the shared library
10683+# associated with a specific link library.
10684+# -- PORTME fill in with the dynamic library characteristics
10685+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10686+[m4_require([_LT_DECL_EGREP])
10687+m4_require([_LT_DECL_OBJDUMP])
10688+m4_require([_LT_DECL_DLLTOOL])
10689+AC_CACHE_CHECK([how to associate runtime and link libraries],
10690+lt_cv_sharedlib_from_linklib_cmd,
10691+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10692+
10693+case $host_os in
10694+cygwin* | mingw* | pw32* | cegcc*)
10695+ # two different shell functions defined in ltmain.sh
10696+ # decide which to use based on capabilities of $DLLTOOL
10697+ case `$DLLTOOL --help 2>&1` in
10698+ *--identify-strict*)
10699+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10700+ ;;
10701+ *)
10702+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10703+ ;;
10704+ esac
10705+ ;;
10706+*)
10707+ # fallback: assume linklib IS sharedlib
10708+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10709+ ;;
10710+esac
10711+])
10712+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10713+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10714+
10715+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10716+ [Command to associate shared and link libraries])
10717+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10718+
10719+
10720+# _LT_PATH_MANIFEST_TOOL
10721+# ----------------------
10722+# locate the manifest tool
10723+m4_defun([_LT_PATH_MANIFEST_TOOL],
10724+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10725+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10726+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10727+ [lt_cv_path_mainfest_tool=no
10728+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10729+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10730+ cat conftest.err >&AS_MESSAGE_LOG_FD
10731+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10732+ lt_cv_path_mainfest_tool=yes
10733+ fi
10734+ rm -f conftest*])
10735+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10736+ MANIFEST_TOOL=:
10737+fi
10738+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10739+])# _LT_PATH_MANIFEST_TOOL
10740+
10741
10742 # LT_LIB_M
10743 # --------
10744@@ -3403,8 +3630,8 @@ esac
10745 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10746
10747 # Transform an extracted symbol line into symbol name and symbol address
10748-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10749-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'"
10750+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10751+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'"
10752
10753 # Handle CRLF in mingw tool chain
10754 opt_cr=
10755@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10756 else
10757 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10758 fi
10759+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10760
10761 # Check to see that the pipe works correctly.
10762 pipe_works=no
10763@@ -3473,6 +3701,18 @@ _LT_EOF
10764 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10765 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10766 cat <<_LT_EOF > conftest.$ac_ext
10767+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10768+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10769+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10770+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10771+# define LT@&t@_DLSYM_CONST
10772+#elif defined(__osf__)
10773+/* This system does not cope well with relocations in const data. */
10774+# define LT@&t@_DLSYM_CONST
10775+#else
10776+# define LT@&t@_DLSYM_CONST const
10777+#endif
10778+
10779 #ifdef __cplusplus
10780 extern "C" {
10781 #endif
10782@@ -3484,7 +3724,7 @@ _LT_EOF
10783 cat <<_LT_EOF >> conftest.$ac_ext
10784
10785 /* The mapping between symbol names and symbols. */
10786-const struct {
10787+LT@&t@_DLSYM_CONST struct {
10788 const char *name;
10789 void *address;
10790 }
10791@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
10792 _LT_EOF
10793 # Now try linking the two files.
10794 mv conftest.$ac_objext conftstm.$ac_objext
10795- lt_save_LIBS="$LIBS"
10796- lt_save_CFLAGS="$CFLAGS"
10797+ lt_globsym_save_LIBS=$LIBS
10798+ lt_globsym_save_CFLAGS=$CFLAGS
10799 LIBS="conftstm.$ac_objext"
10800 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10801 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10802 pipe_works=yes
10803 fi
10804- LIBS="$lt_save_LIBS"
10805- CFLAGS="$lt_save_CFLAGS"
10806+ LIBS=$lt_globsym_save_LIBS
10807+ CFLAGS=$lt_globsym_save_CFLAGS
10808 else
10809 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10810 fi
10811@@ -3551,6 +3791,13 @@ else
10812 AC_MSG_RESULT(ok)
10813 fi
10814
10815+# Response file support.
10816+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10817+ nm_file_list_spec='@'
10818+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10819+ nm_file_list_spec='@'
10820+fi
10821+
10822 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10823 [Take the output of nm and produce a listing of raw symbols and C names])
10824 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10825@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
10826 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10827 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10828 [Transform the output of nm in a C name address pair when lib prefix is needed])
10829+_LT_DECL([], [nm_file_list_spec], [1],
10830+ [Specify filename containing input files for $NM])
10831 ]) # _LT_CMD_GLOBAL_SYMBOLS
10832
10833
10834@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10835 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10836 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10837
10838-AC_MSG_CHECKING([for $compiler option to produce PIC])
10839 m4_if([$1], [CXX], [
10840 # C++ specific cases for pic, static, wl, etc.
10841 if test "$GXX" = yes; then
10842@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10843 ;;
10844 esac
10845 ;;
10846+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10847+ # This hack is so that the source file can tell whether it is being
10848+ # built for inclusion in a dll (and should export symbols for example).
10849+ m4_if([$1], [GCJ], [],
10850+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10851+ ;;
10852 dgux*)
10853 case $cc_basename in
10854 ec++*)
10855@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10856 ;;
10857 solaris*)
10858 case $cc_basename in
10859- CC*)
10860+ CC* | sunCC*)
10861 # Sun C++ 4.2, 5.x and Centerline C++
10862 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10863 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10864@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10865 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10866 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10867 ;;
10868+ nagfor*)
10869+ # NAG Fortran compiler
10870+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10871+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10872+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10873+ ;;
10874 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10875 # Portland Group compilers (*not* the Pentium gcc compiler,
10876 # which looks to be a dead project)
10877@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10878 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10879 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10880 case $cc_basename in
10881- f77* | f90* | f95*)
10882+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10883 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10884 *)
10885 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10886@@ -4172,9 +4432,11 @@ case $host_os in
10887 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10888 ;;
10889 esac
10890-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10891-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10892- [How to pass a linker flag through the compiler])
10893+
10894+AC_CACHE_CHECK([for $compiler option to produce PIC],
10895+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10896+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10897+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10898
10899 #
10900 # Check to make sure the PIC flag actually works.
10901@@ -4193,6 +4455,8 @@ fi
10902 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10903 [Additional compiler flags for building library objects])
10904
10905+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10906+ [How to pass a linker flag through the compiler])
10907 #
10908 # Check to make sure the static flag actually works.
10909 #
10910@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
10911 m4_defun([_LT_LINKER_SHLIBS],
10912 [AC_REQUIRE([LT_PATH_LD])dnl
10913 AC_REQUIRE([LT_PATH_NM])dnl
10914+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
10915 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10916 m4_require([_LT_DECL_EGREP])dnl
10917 m4_require([_LT_DECL_SED])dnl
10918@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
10919 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10920 m4_if([$1], [CXX], [
10921 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10922+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10923 case $host_os in
10924 aix[[4-9]]*)
10925 # If we're using GNU nm, then we don't want the "-C" option.
10926@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
10927 ;;
10928 pw32*)
10929 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10930- ;;
10931+ ;;
10932 cygwin* | mingw* | cegcc*)
10933- _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'
10934- ;;
10935+ case $cc_basename in
10936+ cl*) ;;
10937+ *)
10938+ _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'
10939+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10940+ ;;
10941+ esac
10942+ ;;
10943 *)
10944 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10945- ;;
10946+ ;;
10947 esac
10948- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10949 ], [
10950 runpath_var=
10951 _LT_TAGVAR(allow_undefined_flag, $1)=
10952@@ -4411,7 +4682,8 @@ _LT_EOF
10953 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
10954 _LT_TAGVAR(always_export_symbols, $1)=no
10955 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10956- _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'
10957+ _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'
10958+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10959
10960 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
10961 _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'
10962@@ -4510,12 +4782,12 @@ _LT_EOF
10963 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
10964 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
10965 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
10966- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
10967+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
10968 if test "x$supports_anon_versioning" = xyes; then
10969 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
10970 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10971 echo "local: *; };" >> $output_objdir/$libname.ver~
10972- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10973+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10974 fi
10975 ;;
10976 esac
10977@@ -4529,8 +4801,8 @@ _LT_EOF
10978 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10979 wlarc=
10980 else
10981- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10982- _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'
10983+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10984+ _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'
10985 fi
10986 ;;
10987
10988@@ -4548,8 +4820,8 @@ _LT_EOF
10989
10990 _LT_EOF
10991 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
10992- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10993- _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'
10994+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10995+ _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'
10996 else
10997 _LT_TAGVAR(ld_shlibs, $1)=no
10998 fi
10999@@ -4595,8 +4867,8 @@ _LT_EOF
11000
11001 *)
11002 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11003- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11004- _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'
11005+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11006+ _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'
11007 else
11008 _LT_TAGVAR(ld_shlibs, $1)=no
11009 fi
11010@@ -4726,7 +4998,7 @@ _LT_EOF
11011 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11012 # Determine the default libpath from the value encoded in an
11013 # empty executable.
11014- _LT_SYS_MODULE_PATH_AIX
11015+ _LT_SYS_MODULE_PATH_AIX([$1])
11016 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11017 _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"
11018 else
11019@@ -4737,7 +5009,7 @@ _LT_EOF
11020 else
11021 # Determine the default libpath from the value encoded in an
11022 # empty executable.
11023- _LT_SYS_MODULE_PATH_AIX
11024+ _LT_SYS_MODULE_PATH_AIX([$1])
11025 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11026 # Warning - without using the other run time loading flags,
11027 # -berok will link without error, but may produce a broken library.
11028@@ -4781,20 +5053,63 @@ _LT_EOF
11029 # Microsoft Visual C++.
11030 # hardcode_libdir_flag_spec is actually meaningless, as there is
11031 # no search path for DLLs.
11032- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11033- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11034- # Tell ltmain to make .lib files, not .a files.
11035- libext=lib
11036- # Tell ltmain to make .dll files, not .so files.
11037- shrext_cmds=".dll"
11038- # FIXME: Setting linknames here is a bad hack.
11039- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11040- # The linker will automatically build a .lib file if we build a DLL.
11041- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11042- # FIXME: Should let the user specify the lib program.
11043- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11044- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11045- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11046+ case $cc_basename in
11047+ cl*)
11048+ # Native MSVC
11049+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11050+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11051+ _LT_TAGVAR(always_export_symbols, $1)=yes
11052+ _LT_TAGVAR(file_list_spec, $1)='@'
11053+ # Tell ltmain to make .lib files, not .a files.
11054+ libext=lib
11055+ # Tell ltmain to make .dll files, not .so files.
11056+ shrext_cmds=".dll"
11057+ # FIXME: Setting linknames here is a bad hack.
11058+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11059+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11060+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11061+ else
11062+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11063+ fi~
11064+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11065+ linknames='
11066+ # The linker will not automatically build a static lib if we build a DLL.
11067+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11068+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11069+ _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'
11070+ # Don't use ranlib
11071+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11072+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11073+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11074+ case $lt_outputfile in
11075+ *.exe|*.EXE) ;;
11076+ *)
11077+ lt_outputfile="$lt_outputfile.exe"
11078+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11079+ ;;
11080+ esac~
11081+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11082+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11083+ $RM "$lt_outputfile.manifest";
11084+ fi'
11085+ ;;
11086+ *)
11087+ # Assume MSVC wrapper
11088+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11089+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11090+ # Tell ltmain to make .lib files, not .a files.
11091+ libext=lib
11092+ # Tell ltmain to make .dll files, not .so files.
11093+ shrext_cmds=".dll"
11094+ # FIXME: Setting linknames here is a bad hack.
11095+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11096+ # The linker will automatically build a .lib file if we build a DLL.
11097+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11098+ # FIXME: Should let the user specify the lib program.
11099+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11100+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11101+ ;;
11102+ esac
11103 ;;
11104
11105 darwin* | rhapsody*)
11106@@ -4828,7 +5143,7 @@ _LT_EOF
11107
11108 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11109 freebsd* | dragonfly*)
11110- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11111+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11112 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11113 _LT_TAGVAR(hardcode_direct, $1)=yes
11114 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11115@@ -4836,7 +5151,7 @@ _LT_EOF
11116
11117 hpux9*)
11118 if test "$GCC" = yes; then
11119- _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'
11120+ _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'
11121 else
11122 _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'
11123 fi
11124@@ -4852,7 +5167,7 @@ _LT_EOF
11125
11126 hpux10*)
11127 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11128- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11129+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11130 else
11131 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11132 fi
11133@@ -4876,10 +5191,10 @@ _LT_EOF
11134 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11135 ;;
11136 ia64*)
11137- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11138+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11139 ;;
11140 *)
11141- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11142+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11143 ;;
11144 esac
11145 else
11146@@ -4926,16 +5241,31 @@ _LT_EOF
11147
11148 irix5* | irix6* | nonstopux*)
11149 if test "$GCC" = yes; then
11150- _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'
11151+ _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'
11152 # Try to use the -exported_symbol ld option, if it does not
11153 # work, assume that -exports_file does not work either and
11154 # implicitly export all symbols.
11155- save_LDFLAGS="$LDFLAGS"
11156- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11157- AC_LINK_IFELSE(int foo(void) {},
11158- _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'
11159- )
11160- LDFLAGS="$save_LDFLAGS"
11161+ # This should be the same for all languages, so no per-tag cache variable.
11162+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11163+ [lt_cv_irix_exported_symbol],
11164+ [save_LDFLAGS="$LDFLAGS"
11165+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11166+ AC_LINK_IFELSE(
11167+ [AC_LANG_SOURCE(
11168+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11169+ [C++], [[int foo (void) { return 0; }]],
11170+ [Fortran 77], [[
11171+ subroutine foo
11172+ end]],
11173+ [Fortran], [[
11174+ subroutine foo
11175+ end]])])],
11176+ [lt_cv_irix_exported_symbol=yes],
11177+ [lt_cv_irix_exported_symbol=no])
11178+ LDFLAGS="$save_LDFLAGS"])
11179+ if test "$lt_cv_irix_exported_symbol" = yes; then
11180+ _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'
11181+ fi
11182 else
11183 _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'
11184 _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'
11185@@ -5020,7 +5350,7 @@ _LT_EOF
11186 osf4* | osf5*) # as osf3* with the addition of -msym flag
11187 if test "$GCC" = yes; then
11188 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11189- _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'
11190+ _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'
11191 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11192 else
11193 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11194@@ -5039,9 +5369,9 @@ _LT_EOF
11195 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11196 if test "$GCC" = yes; then
11197 wlarc='${wl}'
11198- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11199+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11200 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11201- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11202+ $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'
11203 else
11204 case `$CC -V 2>&1` in
11205 *"Compilers 5.0"*)
11206@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11207 to runtime path list])
11208 _LT_TAGDECL([], [link_all_deplibs], [0],
11209 [Whether libtool must link a program against all its dependency libraries])
11210-_LT_TAGDECL([], [fix_srcfile_path], [1],
11211- [Fix the shell variable $srcfile for the compiler])
11212 _LT_TAGDECL([], [always_export_symbols], [0],
11213 [Set to "yes" if exported symbols are required])
11214 _LT_TAGDECL([], [export_symbols_cmds], [2],
11215@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11216 [Symbols that must always be exported])
11217 _LT_TAGDECL([], [prelink_cmds], [2],
11218 [Commands necessary for linking programs (against libraries) with templates])
11219+_LT_TAGDECL([], [postlink_cmds], [2],
11220+ [Commands necessary for finishing linking programs])
11221 _LT_TAGDECL([], [file_list_spec], [1],
11222 [Specify filename containing input files])
11223 dnl FIXME: Not yet implemented
11224@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11225 m4_defun([_LT_LANG_CXX_CONFIG],
11226 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11227 m4_require([_LT_DECL_EGREP])dnl
11228+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11229 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11230 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11231 (test "X$CXX" != "Xg++"))) ; then
11232@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11233
11234 # Allow CC to be a program name with arguments.
11235 lt_save_CC=$CC
11236+ lt_save_CFLAGS=$CFLAGS
11237 lt_save_LD=$LD
11238 lt_save_GCC=$GCC
11239 GCC=$GXX
11240@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11241 fi
11242 test -z "${LDCXX+set}" || LD=$LDCXX
11243 CC=${CXX-"c++"}
11244+ CFLAGS=$CXXFLAGS
11245 compiler=$CC
11246 _LT_TAGVAR(compiler, $1)=$CC
11247 _LT_CC_BASENAME([$compiler])
11248@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11249 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11250 # Determine the default libpath from the value encoded in an empty
11251 # executable.
11252- _LT_SYS_MODULE_PATH_AIX
11253+ _LT_SYS_MODULE_PATH_AIX([$1])
11254 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11255
11256 _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"
11257@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11258 else
11259 # Determine the default libpath from the value encoded in an
11260 # empty executable.
11261- _LT_SYS_MODULE_PATH_AIX
11262+ _LT_SYS_MODULE_PATH_AIX([$1])
11263 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11264 # Warning - without using the other run time loading flags,
11265 # -berok will link without error, but may produce a broken library.
11266@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
11267 ;;
11268
11269 cygwin* | mingw* | pw32* | cegcc*)
11270- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11271- # as there is no search path for DLLs.
11272- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11273- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11274- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11275- _LT_TAGVAR(always_export_symbols, $1)=no
11276- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11277-
11278- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11279- _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'
11280- # If the export-symbols file already is a .def file (1st line
11281- # is EXPORTS), use it as is; otherwise, prepend...
11282- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11283- cp $export_symbols $output_objdir/$soname.def;
11284- else
11285- echo EXPORTS > $output_objdir/$soname.def;
11286- cat $export_symbols >> $output_objdir/$soname.def;
11287- fi~
11288- $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'
11289- else
11290- _LT_TAGVAR(ld_shlibs, $1)=no
11291- fi
11292- ;;
11293+ case $GXX,$cc_basename in
11294+ ,cl* | no,cl*)
11295+ # Native MSVC
11296+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11297+ # no search path for DLLs.
11298+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11299+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11300+ _LT_TAGVAR(always_export_symbols, $1)=yes
11301+ _LT_TAGVAR(file_list_spec, $1)='@'
11302+ # Tell ltmain to make .lib files, not .a files.
11303+ libext=lib
11304+ # Tell ltmain to make .dll files, not .so files.
11305+ shrext_cmds=".dll"
11306+ # FIXME: Setting linknames here is a bad hack.
11307+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11308+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11309+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11310+ else
11311+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11312+ fi~
11313+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11314+ linknames='
11315+ # The linker will not automatically build a static lib if we build a DLL.
11316+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11317+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11318+ # Don't use ranlib
11319+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11320+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11321+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11322+ case $lt_outputfile in
11323+ *.exe|*.EXE) ;;
11324+ *)
11325+ lt_outputfile="$lt_outputfile.exe"
11326+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11327+ ;;
11328+ esac~
11329+ func_to_tool_file "$lt_outputfile"~
11330+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11331+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11332+ $RM "$lt_outputfile.manifest";
11333+ fi'
11334+ ;;
11335+ *)
11336+ # g++
11337+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11338+ # as there is no search path for DLLs.
11339+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11340+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11341+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11342+ _LT_TAGVAR(always_export_symbols, $1)=no
11343+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11344+
11345+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11346+ _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'
11347+ # If the export-symbols file already is a .def file (1st line
11348+ # is EXPORTS), use it as is; otherwise, prepend...
11349+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11350+ cp $export_symbols $output_objdir/$soname.def;
11351+ else
11352+ echo EXPORTS > $output_objdir/$soname.def;
11353+ cat $export_symbols >> $output_objdir/$soname.def;
11354+ fi~
11355+ $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'
11356+ else
11357+ _LT_TAGVAR(ld_shlibs, $1)=no
11358+ fi
11359+ ;;
11360+ esac
11361+ ;;
11362 darwin* | rhapsody*)
11363 _LT_DARWIN_LINKER_FEATURES($1)
11364 ;;
11365@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11366 ;;
11367 *)
11368 if test "$GXX" = yes; then
11369- _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'
11370+ _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'
11371 else
11372 # FIXME: insert proper C++ library support
11373 _LT_TAGVAR(ld_shlibs, $1)=no
11374@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
11375 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11376 ;;
11377 ia64*)
11378- _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'
11379+ _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'
11380 ;;
11381 *)
11382- _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'
11383+ _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'
11384 ;;
11385 esac
11386 fi
11387@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11388 *)
11389 if test "$GXX" = yes; then
11390 if test "$with_gnu_ld" = no; then
11391- _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'
11392+ _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'
11393 else
11394- _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'
11395+ _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'
11396 fi
11397 fi
11398 _LT_TAGVAR(link_all_deplibs, $1)=yes
11399@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
11400 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11401 rm -rf $tpldir~
11402 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11403- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11404+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11405 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11406 rm -rf $tpldir~
11407 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11408- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11409+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11410 $RANLIB $oldlib'
11411 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11412 rm -rf $tpldir~
11413 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11414- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11415+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11416 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11417 rm -rf $tpldir~
11418 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11419- $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'
11420+ $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'
11421 ;;
11422 *) # Version 6 and above use weak symbols
11423 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11424@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11425 _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'
11426 ;;
11427 *)
11428- _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'
11429+ _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'
11430 ;;
11431 esac
11432
11433@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11434
11435 solaris*)
11436 case $cc_basename in
11437- CC*)
11438+ CC* | sunCC*)
11439 # Sun C++ 4.2, 5.x and Centerline C++
11440 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11441 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11442@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11443 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11444 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11445 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11446- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11447+ _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'
11448 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11449- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11450+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11451
11452 # Commands to make compiler produce verbose output that lists
11453 # what "hidden" libraries, object files and flags are used when
11454@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11455 fi # test -n "$compiler"
11456
11457 CC=$lt_save_CC
11458+ CFLAGS=$lt_save_CFLAGS
11459 LDCXX=$LD
11460 LD=$lt_save_LD
11461 GCC=$lt_save_GCC
11462@@ -6445,6 +6825,29 @@ AC_LANG_POP
11463 ])# _LT_LANG_CXX_CONFIG
11464
11465
11466+# _LT_FUNC_STRIPNAME_CNF
11467+# ----------------------
11468+# func_stripname_cnf prefix suffix name
11469+# strip PREFIX and SUFFIX off of NAME.
11470+# PREFIX and SUFFIX must not contain globbing or regex special
11471+# characters, hashes, percent signs, but SUFFIX may contain a leading
11472+# dot (in which case that matches only a dot).
11473+#
11474+# This function is identical to the (non-XSI) version of func_stripname,
11475+# except this one can be used by m4 code that may be executed by configure,
11476+# rather than the libtool script.
11477+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11478+AC_REQUIRE([_LT_DECL_SED])
11479+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11480+func_stripname_cnf ()
11481+{
11482+ case ${2} in
11483+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11484+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11485+ esac
11486+} # func_stripname_cnf
11487+])# _LT_FUNC_STRIPNAME_CNF
11488+
11489 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11490 # ---------------------------------
11491 # Figure out "hidden" library dependencies from verbose
11492@@ -6453,6 +6856,7 @@ AC_LANG_POP
11493 # objects, libraries and library flags.
11494 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11495 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11496+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11497 # Dependencies to place before and after the object being linked:
11498 _LT_TAGVAR(predep_objects, $1)=
11499 _LT_TAGVAR(postdep_objects, $1)=
11500@@ -6503,6 +6907,13 @@ public class foo {
11501 };
11502 _LT_EOF
11503 ])
11504+
11505+_lt_libdeps_save_CFLAGS=$CFLAGS
11506+case "$CC $CFLAGS " in #(
11507+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11508+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11509+esac
11510+
11511 dnl Parse the compiler output and extract the necessary
11512 dnl objects, libraries and library flags.
11513 if AC_TRY_EVAL(ac_compile); then
11514@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11515 pre_test_object_deps_done=no
11516
11517 for p in `eval "$output_verbose_link_cmd"`; do
11518- case $p in
11519+ case ${prev}${p} in
11520
11521 -L* | -R* | -l*)
11522 # Some compilers place space between "-{L,R}" and the path.
11523@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11524 test $p = "-R"; then
11525 prev=$p
11526 continue
11527- else
11528- prev=
11529 fi
11530
11531+ # Expand the sysroot to ease extracting the directories later.
11532+ if test -z "$prev"; then
11533+ case $p in
11534+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11535+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11536+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11537+ esac
11538+ fi
11539+ case $p in
11540+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11541+ esac
11542 if test "$pre_test_object_deps_done" = no; then
11543- case $p in
11544- -L* | -R*)
11545+ case ${prev} in
11546+ -L | -R)
11547 # Internal compiler library paths should come after those
11548 # provided the user. The postdeps already come after the
11549 # user supplied libs so there is no need to process them.
11550@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11551 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11552 fi
11553 fi
11554+ prev=
11555 ;;
11556
11557+ *.lto.$objext) ;; # Ignore GCC LTO objects
11558 *.$objext)
11559 # This assumes that the test object file only shows up
11560 # once in the compiler output.
11561@@ -6586,6 +7008,7 @@ else
11562 fi
11563
11564 $RM -f confest.$objext
11565+CFLAGS=$_lt_libdeps_save_CFLAGS
11566
11567 # PORTME: override above test on systems where it is broken
11568 m4_if([$1], [CXX],
11569@@ -6622,7 +7045,7 @@ linux*)
11570
11571 solaris*)
11572 case $cc_basename in
11573- CC*)
11574+ CC* | sunCC*)
11575 # The more standards-conforming stlport4 library is
11576 # incompatible with the Cstd library. Avoid specifying
11577 # it if it's in CXXFLAGS. Ignore libCrun as
11578@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11579 # Allow CC to be a program name with arguments.
11580 lt_save_CC="$CC"
11581 lt_save_GCC=$GCC
11582+ lt_save_CFLAGS=$CFLAGS
11583 CC=${F77-"f77"}
11584+ CFLAGS=$FFLAGS
11585 compiler=$CC
11586 _LT_TAGVAR(compiler, $1)=$CC
11587 _LT_CC_BASENAME([$compiler])
11588@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11589
11590 GCC=$lt_save_GCC
11591 CC="$lt_save_CC"
11592+ CFLAGS="$lt_save_CFLAGS"
11593 fi # test "$_lt_disable_F77" != yes
11594
11595 AC_LANG_POP
11596@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11597 # Allow CC to be a program name with arguments.
11598 lt_save_CC="$CC"
11599 lt_save_GCC=$GCC
11600+ lt_save_CFLAGS=$CFLAGS
11601 CC=${FC-"f95"}
11602+ CFLAGS=$FCFLAGS
11603 compiler=$CC
11604 GCC=$ac_cv_fc_compiler_gnu
11605
11606@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11607 fi # test -n "$compiler"
11608
11609 GCC=$lt_save_GCC
11610- CC="$lt_save_CC"
11611+ CC=$lt_save_CC
11612+ CFLAGS=$lt_save_CFLAGS
11613 fi # test "$_lt_disable_FC" != yes
11614
11615 AC_LANG_POP
11616@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11617 _LT_LINKER_BOILERPLATE
11618
11619 # Allow CC to be a program name with arguments.
11620-lt_save_CC="$CC"
11621+lt_save_CC=$CC
11622+lt_save_CFLAGS=$CFLAGS
11623 lt_save_GCC=$GCC
11624 GCC=yes
11625 CC=${GCJ-"gcj"}
11626+CFLAGS=$GCJFLAGS
11627 compiler=$CC
11628 _LT_TAGVAR(compiler, $1)=$CC
11629 _LT_TAGVAR(LD, $1)="$LD"
11630@@ -6992,7 +7423,8 @@ fi
11631 AC_LANG_RESTORE
11632
11633 GCC=$lt_save_GCC
11634-CC="$lt_save_CC"
11635+CC=$lt_save_CC
11636+CFLAGS=$lt_save_CFLAGS
11637 ])# _LT_LANG_GCJ_CONFIG
11638
11639
11640@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11641
11642 # Allow CC to be a program name with arguments.
11643 lt_save_CC="$CC"
11644+lt_save_CFLAGS=$CFLAGS
11645 lt_save_GCC=$GCC
11646 GCC=
11647 CC=${RC-"windres"}
11648+CFLAGS=
11649 compiler=$CC
11650 _LT_TAGVAR(compiler, $1)=$CC
11651 _LT_CC_BASENAME([$compiler])
11652@@ -7042,7 +7476,8 @@ fi
11653
11654 GCC=$lt_save_GCC
11655 AC_LANG_RESTORE
11656-CC="$lt_save_CC"
11657+CC=$lt_save_CC
11658+CFLAGS=$lt_save_CFLAGS
11659 ])# _LT_LANG_RC_CONFIG
11660
11661
11662@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
11663 AC_SUBST([OBJDUMP])
11664 ])
11665
11666+# _LT_DECL_DLLTOOL
11667+# ----------------
11668+# Ensure DLLTOOL variable is set.
11669+m4_defun([_LT_DECL_DLLTOOL],
11670+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11671+test -z "$DLLTOOL" && DLLTOOL=dlltool
11672+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11673+AC_SUBST([DLLTOOL])
11674+])
11675
11676 # _LT_DECL_SED
11677 # ------------
11678@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11679 # Try some XSI features
11680 xsi_shell=no
11681 ( _lt_dummy="a/b/c"
11682- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11683- = c,a/b,, \
11684+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11685+ = c,a/b,b/c, \
11686 && eval 'test $(( 1 + 1 )) -eq 2 \
11687 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11688 && xsi_shell=yes
11689@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
11690 ])# _LT_CHECK_SHELL_FEATURES
11691
11692
11693-# _LT_PROG_XSI_SHELLFNS
11694-# ---------------------
11695-# Bourne and XSI compatible variants of some useful shell functions.
11696-m4_defun([_LT_PROG_XSI_SHELLFNS],
11697-[case $xsi_shell in
11698- yes)
11699- cat << \_LT_EOF >> "$cfgfile"
11700-
11701-# func_dirname file append nondir_replacement
11702-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11703-# otherwise set result to NONDIR_REPLACEMENT.
11704-func_dirname ()
11705-{
11706- case ${1} in
11707- */*) func_dirname_result="${1%/*}${2}" ;;
11708- * ) func_dirname_result="${3}" ;;
11709- esac
11710-}
11711-
11712-# func_basename file
11713-func_basename ()
11714-{
11715- func_basename_result="${1##*/}"
11716-}
11717-
11718-# func_dirname_and_basename file append nondir_replacement
11719-# perform func_basename and func_dirname in a single function
11720-# call:
11721-# dirname: Compute the dirname of FILE. If nonempty,
11722-# add APPEND to the result, otherwise set result
11723-# to NONDIR_REPLACEMENT.
11724-# value returned in "$func_dirname_result"
11725-# basename: Compute filename of FILE.
11726-# value retuned in "$func_basename_result"
11727-# Implementation must be kept synchronized with func_dirname
11728-# and func_basename. For efficiency, we do not delegate to
11729-# those functions but instead duplicate the functionality here.
11730-func_dirname_and_basename ()
11731-{
11732- case ${1} in
11733- */*) func_dirname_result="${1%/*}${2}" ;;
11734- * ) func_dirname_result="${3}" ;;
11735- esac
11736- func_basename_result="${1##*/}"
11737-}
11738-
11739-# func_stripname prefix suffix name
11740-# strip PREFIX and SUFFIX off of NAME.
11741-# PREFIX and SUFFIX must not contain globbing or regex special
11742-# characters, hashes, percent signs, but SUFFIX may contain a leading
11743-# dot (in which case that matches only a dot).
11744-func_stripname ()
11745-{
11746- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11747- # positional parameters, so assign one to ordinary parameter first.
11748- func_stripname_result=${3}
11749- func_stripname_result=${func_stripname_result#"${1}"}
11750- func_stripname_result=${func_stripname_result%"${2}"}
11751-}
11752-
11753-# func_opt_split
11754-func_opt_split ()
11755-{
11756- func_opt_split_opt=${1%%=*}
11757- func_opt_split_arg=${1#*=}
11758-}
11759-
11760-# func_lo2o object
11761-func_lo2o ()
11762-{
11763- case ${1} in
11764- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11765- *) func_lo2o_result=${1} ;;
11766- esac
11767-}
11768-
11769-# func_xform libobj-or-source
11770-func_xform ()
11771-{
11772- func_xform_result=${1%.*}.lo
11773-}
11774-
11775-# func_arith arithmetic-term...
11776-func_arith ()
11777-{
11778- func_arith_result=$(( $[*] ))
11779-}
11780-
11781-# func_len string
11782-# STRING may not start with a hyphen.
11783-func_len ()
11784-{
11785- func_len_result=${#1}
11786-}
11787+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11788+# ------------------------------------------------------
11789+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11790+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11791+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11792+[dnl {
11793+sed -e '/^$1 ()$/,/^} # $1 /c\
11794+$1 ()\
11795+{\
11796+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11797+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11798+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11799+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11800+test 0 -eq $? || _lt_function_replace_fail=:
11801+])
11802
11803-_LT_EOF
11804- ;;
11805- *) # Bourne compatible functions.
11806- cat << \_LT_EOF >> "$cfgfile"
11807
11808-# func_dirname file append nondir_replacement
11809-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11810-# otherwise set result to NONDIR_REPLACEMENT.
11811-func_dirname ()
11812-{
11813- # Extract subdirectory from the argument.
11814- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11815- if test "X$func_dirname_result" = "X${1}"; then
11816- func_dirname_result="${3}"
11817- else
11818- func_dirname_result="$func_dirname_result${2}"
11819- fi
11820-}
11821+# _LT_PROG_REPLACE_SHELLFNS
11822+# -------------------------
11823+# Replace existing portable implementations of several shell functions with
11824+# equivalent extended shell implementations where those features are available..
11825+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11826+[if test x"$xsi_shell" = xyes; then
11827+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11828+ case ${1} in
11829+ */*) func_dirname_result="${1%/*}${2}" ;;
11830+ * ) func_dirname_result="${3}" ;;
11831+ esac])
11832+
11833+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11834+ func_basename_result="${1##*/}"])
11835+
11836+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11837+ case ${1} in
11838+ */*) func_dirname_result="${1%/*}${2}" ;;
11839+ * ) func_dirname_result="${3}" ;;
11840+ esac
11841+ func_basename_result="${1##*/}"])
11842
11843-# func_basename file
11844-func_basename ()
11845-{
11846- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11847-}
11848+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11849+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11850+ # positional parameters, so assign one to ordinary parameter first.
11851+ func_stripname_result=${3}
11852+ func_stripname_result=${func_stripname_result#"${1}"}
11853+ func_stripname_result=${func_stripname_result%"${2}"}])
11854
11855-dnl func_dirname_and_basename
11856-dnl A portable version of this function is already defined in general.m4sh
11857-dnl so there is no need for it here.
11858+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11859+ func_split_long_opt_name=${1%%=*}
11860+ func_split_long_opt_arg=${1#*=}])
11861
11862-# func_stripname prefix suffix name
11863-# strip PREFIX and SUFFIX off of NAME.
11864-# PREFIX and SUFFIX must not contain globbing or regex special
11865-# characters, hashes, percent signs, but SUFFIX may contain a leading
11866-# dot (in which case that matches only a dot).
11867-# func_strip_suffix prefix name
11868-func_stripname ()
11869-{
11870- case ${2} in
11871- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11872- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11873- esac
11874-}
11875+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11876+ func_split_short_opt_arg=${1#??}
11877+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11878
11879-# sed scripts:
11880-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11881-my_sed_long_arg='1s/^-[[^=]]*=//'
11882+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11883+ case ${1} in
11884+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11885+ *) func_lo2o_result=${1} ;;
11886+ esac])
11887
11888-# func_opt_split
11889-func_opt_split ()
11890-{
11891- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
11892- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
11893-}
11894+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
11895
11896-# func_lo2o object
11897-func_lo2o ()
11898-{
11899- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
11900-}
11901+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
11902
11903-# func_xform libobj-or-source
11904-func_xform ()
11905-{
11906- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
11907-}
11908+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
11909+fi
11910
11911-# func_arith arithmetic-term...
11912-func_arith ()
11913-{
11914- func_arith_result=`expr "$[@]"`
11915-}
11916+if test x"$lt_shell_append" = xyes; then
11917+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
11918
11919-# func_len string
11920-# STRING may not start with a hyphen.
11921-func_len ()
11922-{
11923- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
11924-}
11925+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
11926+ func_quote_for_eval "${2}"
11927+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11928+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11929
11930-_LT_EOF
11931-esac
11932+ # Save a `func_append' function call where possible by direct use of '+='
11933+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11934+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11935+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11936+ test 0 -eq $? || _lt_function_replace_fail=:
11937+else
11938+ # Save a `func_append' function call even when '+=' is not available
11939+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
11940+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11941+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11942+ test 0 -eq $? || _lt_function_replace_fail=:
11943+fi
11944
11945-case $lt_shell_append in
11946- yes)
11947- cat << \_LT_EOF >> "$cfgfile"
11948+if test x"$_lt_function_replace_fail" = x":"; then
11949+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11950+fi
11951+])
11952
11953-# func_append var value
11954-# Append VALUE to the end of shell variable VAR.
11955-func_append ()
11956-{
11957- eval "$[1]+=\$[2]"
11958-}
11959-_LT_EOF
11960+# _LT_PATH_CONVERSION_FUNCTIONS
11961+# -----------------------------
11962+# Determine which file name conversion functions should be used by
11963+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
11964+# for certain cross-compile configurations and native mingw.
11965+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
11966+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
11967+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
11968+AC_MSG_CHECKING([how to convert $build file names to $host format])
11969+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
11970+[case $host in
11971+ *-*-mingw* )
11972+ case $build in
11973+ *-*-mingw* ) # actually msys
11974+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11975+ ;;
11976+ *-*-cygwin* )
11977+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11978+ ;;
11979+ * ) # otherwise, assume *nix
11980+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11981+ ;;
11982+ esac
11983 ;;
11984- *)
11985- cat << \_LT_EOF >> "$cfgfile"
11986-
11987-# func_append var value
11988-# Append VALUE to the end of shell variable VAR.
11989-func_append ()
11990-{
11991- eval "$[1]=\$$[1]\$[2]"
11992-}
11993-
11994-_LT_EOF
11995+ *-*-cygwin* )
11996+ case $build in
11997+ *-*-mingw* ) # actually msys
11998+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
11999+ ;;
12000+ *-*-cygwin* )
12001+ lt_cv_to_host_file_cmd=func_convert_file_noop
12002+ ;;
12003+ * ) # otherwise, assume *nix
12004+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
12005+ ;;
12006+ esac
12007 ;;
12008- esac
12009+ * ) # unhandled hosts (and "normal" native builds)
12010+ lt_cv_to_host_file_cmd=func_convert_file_noop
12011+ ;;
12012+esac
12013+])
12014+to_host_file_cmd=$lt_cv_to_host_file_cmd
12015+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12016+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12017+ [0], [convert $build file names to $host format])dnl
12018+
12019+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12020+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12021+[#assume ordinary cross tools, or native build.
12022+lt_cv_to_tool_file_cmd=func_convert_file_noop
12023+case $host in
12024+ *-*-mingw* )
12025+ case $build in
12026+ *-*-mingw* ) # actually msys
12027+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12028+ ;;
12029+ esac
12030+ ;;
12031+esac
12032 ])
12033+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12034+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12035+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12036+ [0], [convert $build files to toolchain format])dnl
12037+])# _LT_PATH_CONVERSION_FUNCTIONS
12038diff --git a/ltmain.sh b/ltmain.sh
12039index 9503ec85d7..70e856e065 100644
12040--- a/ltmain.sh
12041+++ b/ltmain.sh
12042@@ -1,10 +1,9 @@
12043-# Generated from ltmain.m4sh.
12044
12045-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12046+# libtool (GNU libtool) 2.4
12047 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12048
12049 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12050-# 2007, 2008, 2009 Free Software Foundation, Inc.
12051+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12052 # This is free software; see the source for copying conditions. There is NO
12053 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12054
12055@@ -38,7 +37,6 @@
12056 # -n, --dry-run display commands without modifying any files
12057 # --features display basic configuration information and exit
12058 # --mode=MODE use operation mode MODE
12059-# --no-finish let install mode avoid finish commands
12060 # --preserve-dup-deps don't remove duplicate dependency libraries
12061 # --quiet, --silent don't print informational messages
12062 # --no-quiet, --no-silent
12063@@ -71,17 +69,19 @@
12064 # compiler: $LTCC
12065 # compiler flags: $LTCFLAGS
12066 # linker: $LD (gnu? $with_gnu_ld)
12067-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12068+# $progname: (GNU libtool) 2.4
12069 # automake: $automake_version
12070 # autoconf: $autoconf_version
12071 #
12072 # Report bugs to <bug-libtool@gnu.org>.
12073+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12074+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12075
12076 PROGRAM=libtool
12077 PACKAGE=libtool
12078-VERSION=2.2.7a
12079-TIMESTAMP=" 1.3134 2009-11-29"
12080-package_revision=1.3134
12081+VERSION=2.4
12082+TIMESTAMP=""
12083+package_revision=1.3293
12084
12085 # Be Bourne compatible
12086 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12087@@ -106,9 +106,6 @@ _LTECHO_EOF'
12088 }
12089
12090 # NLS nuisances: We save the old values to restore during execute mode.
12091-# Only set LANG and LC_ALL to C if already set.
12092-# These must not be set unconditionally because not all systems understand
12093-# e.g. LANG=C (notably SCO).
12094 lt_user_locale=
12095 lt_safe_locale=
12096 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12097@@ -121,15 +118,13 @@ do
12098 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12099 fi"
12100 done
12101+LC_ALL=C
12102+LANGUAGE=C
12103+export LANGUAGE LC_ALL
12104
12105 $lt_unset CDPATH
12106
12107
12108-
12109-
12110-
12111-
12112-
12113 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12114 # is ksh but when the shell is invoked as "sh" and the current value of
12115 # the _XPG environment variable is not equal to 1 (one), the special
12116@@ -140,7 +135,7 @@ progpath="$0"
12117
12118
12119 : ${CP="cp -f"}
12120-: ${ECHO=$as_echo}
12121+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12122 : ${EGREP="/bin/grep -E"}
12123 : ${FGREP="/bin/grep -F"}
12124 : ${GREP="/bin/grep"}
12125@@ -149,7 +144,7 @@ progpath="$0"
12126 : ${MKDIR="mkdir"}
12127 : ${MV="mv -f"}
12128 : ${RM="rm -f"}
12129-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12130+: ${SED="/bin/sed"}
12131 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12132 : ${Xsed="$SED -e 1s/^X//"}
12133
12134@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12135 dirname="s,/[^/]*$,,"
12136 basename="s,^.*/,,"
12137
12138+# func_dirname file append nondir_replacement
12139+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12140+# otherwise set result to NONDIR_REPLACEMENT.
12141+func_dirname ()
12142+{
12143+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12144+ if test "X$func_dirname_result" = "X${1}"; then
12145+ func_dirname_result="${3}"
12146+ else
12147+ func_dirname_result="$func_dirname_result${2}"
12148+ fi
12149+} # func_dirname may be replaced by extended shell implementation
12150+
12151+
12152+# func_basename file
12153+func_basename ()
12154+{
12155+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12156+} # func_basename may be replaced by extended shell implementation
12157+
12158+
12159 # func_dirname_and_basename file append nondir_replacement
12160 # perform func_basename and func_dirname in a single function
12161 # call:
12162@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12163 # those functions but instead duplicate the functionality here.
12164 func_dirname_and_basename ()
12165 {
12166- # Extract subdirectory from the argument.
12167- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12168- if test "X$func_dirname_result" = "X${1}"; then
12169- func_dirname_result="${3}"
12170- else
12171- func_dirname_result="$func_dirname_result${2}"
12172- fi
12173- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12174-}
12175+ # Extract subdirectory from the argument.
12176+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12177+ if test "X$func_dirname_result" = "X${1}"; then
12178+ func_dirname_result="${3}"
12179+ else
12180+ func_dirname_result="$func_dirname_result${2}"
12181+ fi
12182+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12183+} # func_dirname_and_basename may be replaced by extended shell implementation
12184+
12185+
12186+# func_stripname prefix suffix name
12187+# strip PREFIX and SUFFIX off of NAME.
12188+# PREFIX and SUFFIX must not contain globbing or regex special
12189+# characters, hashes, percent signs, but SUFFIX may contain a leading
12190+# dot (in which case that matches only a dot).
12191+# func_strip_suffix prefix name
12192+func_stripname ()
12193+{
12194+ case ${2} in
12195+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12196+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12197+ esac
12198+} # func_stripname may be replaced by extended shell implementation
12199
12200-# Generated shell functions inserted here.
12201
12202 # These SED scripts presuppose an absolute path with a trailing slash.
12203 pathcar='s,^/\([^/]*\).*$,\1,'
12204@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12205 # Same as above, but do not quote variable references.
12206 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12207
12208+# Sed substitution that turns a string into a regex matching for the
12209+# string literally.
12210+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12211+
12212+# Sed substitution that converts a w32 file name or path
12213+# which contains forward slashes, into one that contains
12214+# (escaped) backslashes. A very naive implementation.
12215+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12216+
12217 # Re-`\' parameter expansions in output of double_quote_subst that were
12218 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12219 # in input to double_quote_subst, that '$' was protected from expansion.
12220@@ -404,7 +443,7 @@ opt_warning=:
12221 # name if it has been set yet.
12222 func_echo ()
12223 {
12224- $ECHO "$progname${mode+: }$mode: $*"
12225+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12226 }
12227
12228 # func_verbose arg...
12229@@ -430,14 +469,14 @@ func_echo_all ()
12230 # Echo program name prefixed message to standard error.
12231 func_error ()
12232 {
12233- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12234+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12235 }
12236
12237 # func_warning arg...
12238 # Echo program name prefixed warning message to standard error.
12239 func_warning ()
12240 {
12241- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12242+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12243
12244 # bash bug again:
12245 :
12246@@ -656,19 +695,35 @@ func_show_eval_locale ()
12247 fi
12248 }
12249
12250-
12251-
12252+# func_tr_sh
12253+# Turn $1 into a string suitable for a shell variable name.
12254+# Result is stored in $func_tr_sh_result. All characters
12255+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12256+# if $1 begins with a digit, a '_' is prepended as well.
12257+func_tr_sh ()
12258+{
12259+ case $1 in
12260+ [0-9]* | *[!a-zA-Z0-9_]*)
12261+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12262+ ;;
12263+ * )
12264+ func_tr_sh_result=$1
12265+ ;;
12266+ esac
12267+}
12268
12269
12270 # func_version
12271 # Echo version message to standard output and exit.
12272 func_version ()
12273 {
12274+ $opt_debug
12275+
12276 $SED -n '/(C)/!b go
12277 :more
12278 /\./!{
12279 N
12280- s/\n# //
12281+ s/\n# / /
12282 b more
12283 }
12284 :go
12285@@ -685,7 +740,9 @@ func_version ()
12286 # Echo short help message to standard output and exit.
12287 func_usage ()
12288 {
12289- $SED -n '/^# Usage:/,/^# *-h/ {
12290+ $opt_debug
12291+
12292+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12293 s/^# //
12294 s/^# *$//
12295 s/\$progname/'$progname'/
12296@@ -701,7 +758,10 @@ func_usage ()
12297 # unless 'noexit' is passed as argument.
12298 func_help ()
12299 {
12300+ $opt_debug
12301+
12302 $SED -n '/^# Usage:/,/# Report bugs to/ {
12303+ :print
12304 s/^# //
12305 s/^# *$//
12306 s*\$progname*'$progname'*
12307@@ -714,7 +774,11 @@ func_help ()
12308 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12309 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12310 p
12311- }' < "$progpath"
12312+ d
12313+ }
12314+ /^# .* home page:/b print
12315+ /^# General help using/b print
12316+ ' < "$progpath"
12317 ret=$?
12318 if test -z "$1"; then
12319 exit $ret
12320@@ -726,12 +790,39 @@ func_help ()
12321 # exit_cmd.
12322 func_missing_arg ()
12323 {
12324- func_error "missing argument for $1"
12325+ $opt_debug
12326+
12327+ func_error "missing argument for $1."
12328 exit_cmd=exit
12329 }
12330
12331-exit_cmd=:
12332
12333+# func_split_short_opt shortopt
12334+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12335+# variables after splitting SHORTOPT after the 2nd character.
12336+func_split_short_opt ()
12337+{
12338+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12339+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12340+
12341+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12342+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12343+} # func_split_short_opt may be replaced by extended shell implementation
12344+
12345+
12346+# func_split_long_opt longopt
12347+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12348+# variables after splitting LONGOPT at the `=' sign.
12349+func_split_long_opt ()
12350+{
12351+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12352+ my_sed_long_arg='1s/^--[^=]*=//'
12353+
12354+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12355+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12356+} # func_split_long_opt may be replaced by extended shell implementation
12357+
12358+exit_cmd=:
12359
12360
12361
12362@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12363 magic_exe="%%%MAGIC EXE variable%%%"
12364
12365 # Global variables.
12366-# $mode is unset
12367 nonopt=
12368-execute_dlfiles=
12369 preserve_args=
12370 lo2o="s/\\.lo\$/.${objext}/"
12371 o2lo="s/\\.${objext}\$/.lo/"
12372 extracted_archives=
12373 extracted_serial=0
12374
12375-opt_dry_run=false
12376-opt_finish=:
12377-opt_duplicate_deps=false
12378-opt_silent=false
12379-opt_debug=:
12380-
12381 # If this variable is set in any of the actions, the command in it
12382 # will be execed at the end. This prevents here-documents from being
12383 # left over by shells.
12384 exec_cmd=
12385
12386+# func_append var value
12387+# Append VALUE to the end of shell variable VAR.
12388+func_append ()
12389+{
12390+ eval "${1}=\$${1}\${2}"
12391+} # func_append may be replaced by extended shell implementation
12392+
12393+# func_append_quoted var value
12394+# Quote VALUE and append to the end of shell variable VAR, separated
12395+# by a space.
12396+func_append_quoted ()
12397+{
12398+ func_quote_for_eval "${2}"
12399+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12400+} # func_append_quoted may be replaced by extended shell implementation
12401+
12402+
12403+# func_arith arithmetic-term...
12404+func_arith ()
12405+{
12406+ func_arith_result=`expr "${@}"`
12407+} # func_arith may be replaced by extended shell implementation
12408+
12409+
12410+# func_len string
12411+# STRING may not start with a hyphen.
12412+func_len ()
12413+{
12414+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12415+} # func_len may be replaced by extended shell implementation
12416+
12417+
12418+# func_lo2o object
12419+func_lo2o ()
12420+{
12421+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12422+} # func_lo2o may be replaced by extended shell implementation
12423+
12424+
12425+# func_xform libobj-or-source
12426+func_xform ()
12427+{
12428+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12429+} # func_xform may be replaced by extended shell implementation
12430+
12431+
12432 # func_fatal_configuration arg...
12433 # Echo program name prefixed message to standard error, followed by
12434 # a configuration failure hint, and exit.
12435@@ -850,130 +979,204 @@ func_enable_tag ()
12436 esac
12437 }
12438
12439-# Parse options once, thoroughly. This comes as soon as possible in
12440-# the script to make things like `libtool --version' happen quickly.
12441+# func_check_version_match
12442+# Ensure that we are using m4 macros, and libtool script from the same
12443+# release of libtool.
12444+func_check_version_match ()
12445 {
12446+ if test "$package_revision" != "$macro_revision"; then
12447+ if test "$VERSION" != "$macro_version"; then
12448+ if test -z "$macro_version"; then
12449+ cat >&2 <<_LT_EOF
12450+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12451+$progname: definition of this LT_INIT comes from an older release.
12452+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12453+$progname: and run autoconf again.
12454+_LT_EOF
12455+ else
12456+ cat >&2 <<_LT_EOF
12457+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12458+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12459+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12460+$progname: and run autoconf again.
12461+_LT_EOF
12462+ fi
12463+ else
12464+ cat >&2 <<_LT_EOF
12465+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12466+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12467+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12468+$progname: of $PACKAGE $VERSION and run autoconf again.
12469+_LT_EOF
12470+ fi
12471
12472- # Shorthand for --mode=foo, only valid as the first argument
12473- case $1 in
12474- clean|clea|cle|cl)
12475- shift; set dummy --mode clean ${1+"$@"}; shift
12476- ;;
12477- compile|compil|compi|comp|com|co|c)
12478- shift; set dummy --mode compile ${1+"$@"}; shift
12479- ;;
12480- execute|execut|execu|exec|exe|ex|e)
12481- shift; set dummy --mode execute ${1+"$@"}; shift
12482- ;;
12483- finish|finis|fini|fin|fi|f)
12484- shift; set dummy --mode finish ${1+"$@"}; shift
12485- ;;
12486- install|instal|insta|inst|ins|in|i)
12487- shift; set dummy --mode install ${1+"$@"}; shift
12488- ;;
12489- link|lin|li|l)
12490- shift; set dummy --mode link ${1+"$@"}; shift
12491- ;;
12492- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12493- shift; set dummy --mode uninstall ${1+"$@"}; shift
12494- ;;
12495- esac
12496+ exit $EXIT_MISMATCH
12497+ fi
12498+}
12499+
12500+
12501+# Shorthand for --mode=foo, only valid as the first argument
12502+case $1 in
12503+clean|clea|cle|cl)
12504+ shift; set dummy --mode clean ${1+"$@"}; shift
12505+ ;;
12506+compile|compil|compi|comp|com|co|c)
12507+ shift; set dummy --mode compile ${1+"$@"}; shift
12508+ ;;
12509+execute|execut|execu|exec|exe|ex|e)
12510+ shift; set dummy --mode execute ${1+"$@"}; shift
12511+ ;;
12512+finish|finis|fini|fin|fi|f)
12513+ shift; set dummy --mode finish ${1+"$@"}; shift
12514+ ;;
12515+install|instal|insta|inst|ins|in|i)
12516+ shift; set dummy --mode install ${1+"$@"}; shift
12517+ ;;
12518+link|lin|li|l)
12519+ shift; set dummy --mode link ${1+"$@"}; shift
12520+ ;;
12521+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12522+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12523+ ;;
12524+esac
12525
12526- # Parse non-mode specific arguments:
12527- while test "$#" -gt 0; do
12528+
12529+
12530+# Option defaults:
12531+opt_debug=:
12532+opt_dry_run=false
12533+opt_config=false
12534+opt_preserve_dup_deps=false
12535+opt_features=false
12536+opt_finish=false
12537+opt_help=false
12538+opt_help_all=false
12539+opt_silent=:
12540+opt_verbose=:
12541+opt_silent=false
12542+opt_verbose=false
12543+
12544+
12545+# Parse options once, thoroughly. This comes as soon as possible in the
12546+# script to make things like `--version' happen as quickly as we can.
12547+{
12548+ # this just eases exit handling
12549+ while test $# -gt 0; do
12550 opt="$1"
12551 shift
12552-
12553 case $opt in
12554- --config) func_config ;;
12555-
12556- --debug) preserve_args="$preserve_args $opt"
12557+ --debug|-x) opt_debug='set -x'
12558 func_echo "enabling shell trace mode"
12559- opt_debug='set -x'
12560 $opt_debug
12561 ;;
12562-
12563- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12564- execute_dlfiles="$execute_dlfiles $1"
12565- shift
12566+ --dry-run|--dryrun|-n)
12567+ opt_dry_run=:
12568 ;;
12569-
12570- --dry-run | -n) opt_dry_run=: ;;
12571- --features) func_features ;;
12572- --finish) mode="finish" ;;
12573- --no-finish) opt_finish=false ;;
12574-
12575- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12576- case $1 in
12577- # Valid mode arguments:
12578- clean) ;;
12579- compile) ;;
12580- execute) ;;
12581- finish) ;;
12582- install) ;;
12583- link) ;;
12584- relink) ;;
12585- uninstall) ;;
12586-
12587- # Catch anything else as an error
12588- *) func_error "invalid argument for $opt"
12589- exit_cmd=exit
12590- break
12591- ;;
12592- esac
12593-
12594- mode="$1"
12595+ --config)
12596+ opt_config=:
12597+func_config
12598+ ;;
12599+ --dlopen|-dlopen)
12600+ optarg="$1"
12601+ opt_dlopen="${opt_dlopen+$opt_dlopen
12602+}$optarg"
12603 shift
12604 ;;
12605-
12606 --preserve-dup-deps)
12607- opt_duplicate_deps=: ;;
12608-
12609- --quiet|--silent) preserve_args="$preserve_args $opt"
12610- opt_silent=:
12611- opt_verbose=false
12612+ opt_preserve_dup_deps=:
12613 ;;
12614-
12615- --no-quiet|--no-silent)
12616- preserve_args="$preserve_args $opt"
12617- opt_silent=false
12618+ --features)
12619+ opt_features=:
12620+func_features
12621 ;;
12622-
12623- --verbose| -v) preserve_args="$preserve_args $opt"
12624+ --finish)
12625+ opt_finish=:
12626+set dummy --mode finish ${1+"$@"}; shift
12627+ ;;
12628+ --help)
12629+ opt_help=:
12630+ ;;
12631+ --help-all)
12632+ opt_help_all=:
12633+opt_help=': help-all'
12634+ ;;
12635+ --mode)
12636+ test $# = 0 && func_missing_arg $opt && break
12637+ optarg="$1"
12638+ opt_mode="$optarg"
12639+case $optarg in
12640+ # Valid mode arguments:
12641+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12642+
12643+ # Catch anything else as an error
12644+ *) func_error "invalid argument for $opt"
12645+ exit_cmd=exit
12646+ break
12647+ ;;
12648+esac
12649+ shift
12650+ ;;
12651+ --no-silent|--no-quiet)
12652 opt_silent=false
12653- opt_verbose=:
12654+func_append preserve_args " $opt"
12655 ;;
12656-
12657- --no-verbose) preserve_args="$preserve_args $opt"
12658+ --no-verbose)
12659 opt_verbose=false
12660+func_append preserve_args " $opt"
12661 ;;
12662-
12663- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12664- preserve_args="$preserve_args $opt $1"
12665- func_enable_tag "$1" # tagname is set here
12666+ --silent|--quiet)
12667+ opt_silent=:
12668+func_append preserve_args " $opt"
12669+ opt_verbose=false
12670+ ;;
12671+ --verbose|-v)
12672+ opt_verbose=:
12673+func_append preserve_args " $opt"
12674+opt_silent=false
12675+ ;;
12676+ --tag)
12677+ test $# = 0 && func_missing_arg $opt && break
12678+ optarg="$1"
12679+ opt_tag="$optarg"
12680+func_append preserve_args " $opt $optarg"
12681+func_enable_tag "$optarg"
12682 shift
12683 ;;
12684
12685+ -\?|-h) func_usage ;;
12686+ --help) func_help ;;
12687+ --version) func_version ;;
12688+
12689 # Separate optargs to long options:
12690- -dlopen=*|--mode=*|--tag=*)
12691- func_opt_split "$opt"
12692- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12693+ --*=*)
12694+ func_split_long_opt "$opt"
12695+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12696 shift
12697 ;;
12698
12699- -\?|-h) func_usage ;;
12700- --help) opt_help=: ;;
12701- --help-all) opt_help=': help-all' ;;
12702- --version) func_version ;;
12703-
12704- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12705-
12706- *) nonopt="$opt"
12707- break
12708+ # Separate non-argument short options:
12709+ -\?*|-h*|-n*|-v*)
12710+ func_split_short_opt "$opt"
12711+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12712+ shift
12713 ;;
12714+
12715+ --) break ;;
12716+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12717+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12718 esac
12719 done
12720
12721+ # Validate options:
12722+
12723+ # save first non-option argument
12724+ if test "$#" -gt 0; then
12725+ nonopt="$opt"
12726+ shift
12727+ fi
12728+
12729+ # preserve --debug
12730+ test "$opt_debug" = : || func_append preserve_args " --debug"
12731
12732 case $host in
12733 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12734@@ -981,82 +1184,44 @@ func_enable_tag ()
12735 opt_duplicate_compiler_generated_deps=:
12736 ;;
12737 *)
12738- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12739+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12740 ;;
12741 esac
12742
12743- # Having warned about all mis-specified options, bail out if
12744- # anything was wrong.
12745- $exit_cmd $EXIT_FAILURE
12746-}
12747+ $opt_help || {
12748+ # Sanity checks first:
12749+ func_check_version_match
12750
12751-# func_check_version_match
12752-# Ensure that we are using m4 macros, and libtool script from the same
12753-# release of libtool.
12754-func_check_version_match ()
12755-{
12756- if test "$package_revision" != "$macro_revision"; then
12757- if test "$VERSION" != "$macro_version"; then
12758- if test -z "$macro_version"; then
12759- cat >&2 <<_LT_EOF
12760-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12761-$progname: definition of this LT_INIT comes from an older release.
12762-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12763-$progname: and run autoconf again.
12764-_LT_EOF
12765- else
12766- cat >&2 <<_LT_EOF
12767-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12768-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12769-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12770-$progname: and run autoconf again.
12771-_LT_EOF
12772- fi
12773- else
12774- cat >&2 <<_LT_EOF
12775-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12776-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12777-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12778-$progname: of $PACKAGE $VERSION and run autoconf again.
12779-_LT_EOF
12780+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12781+ func_fatal_configuration "not configured to build any kind of library"
12782 fi
12783
12784- exit $EXIT_MISMATCH
12785- fi
12786-}
12787-
12788+ # Darwin sucks
12789+ eval std_shrext=\"$shrext_cmds\"
12790
12791-## ----------- ##
12792-## Main. ##
12793-## ----------- ##
12794-
12795-$opt_help || {
12796- # Sanity checks first:
12797- func_check_version_match
12798-
12799- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12800- func_fatal_configuration "not configured to build any kind of library"
12801- fi
12802+ # Only execute mode is allowed to have -dlopen flags.
12803+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12804+ func_error "unrecognized option \`-dlopen'"
12805+ $ECHO "$help" 1>&2
12806+ exit $EXIT_FAILURE
12807+ fi
12808
12809- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12810+ # Change the help message to a mode-specific one.
12811+ generic_help="$help"
12812+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12813+ }
12814
12815
12816- # Darwin sucks
12817- eval "std_shrext=\"$shrext_cmds\""
12818+ # Bail if the options were screwed
12819+ $exit_cmd $EXIT_FAILURE
12820+}
12821
12822
12823- # Only execute mode is allowed to have -dlopen flags.
12824- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12825- func_error "unrecognized option \`-dlopen'"
12826- $ECHO "$help" 1>&2
12827- exit $EXIT_FAILURE
12828- fi
12829
12830- # Change the help message to a mode-specific one.
12831- generic_help="$help"
12832- help="Try \`$progname --help --mode=$mode' for more information."
12833-}
12834
12835+## ----------- ##
12836+## Main. ##
12837+## ----------- ##
12838
12839 # func_lalib_p file
12840 # True iff FILE is a libtool `.la' library or `.lo' object file.
12841@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12842 # temporary ltwrapper_script.
12843 func_ltwrapper_scriptname ()
12844 {
12845- func_ltwrapper_scriptname_result=""
12846- if func_ltwrapper_executable_p "$1"; then
12847- func_dirname_and_basename "$1" "" "."
12848- func_stripname '' '.exe' "$func_basename_result"
12849- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12850- fi
12851+ func_dirname_and_basename "$1" "" "."
12852+ func_stripname '' '.exe' "$func_basename_result"
12853+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12854 }
12855
12856 # func_ltwrapper_p file
12857@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12858 save_ifs=$IFS; IFS='~'
12859 for cmd in $1; do
12860 IFS=$save_ifs
12861- eval "cmd=\"$cmd\""
12862+ eval cmd=\"$cmd\"
12863 func_show_eval "$cmd" "${2-:}"
12864 done
12865 IFS=$save_ifs
12866@@ -1172,6 +1334,37 @@ func_source ()
12867 }
12868
12869
12870+# func_resolve_sysroot PATH
12871+# Replace a leading = in PATH with a sysroot. Store the result into
12872+# func_resolve_sysroot_result
12873+func_resolve_sysroot ()
12874+{
12875+ func_resolve_sysroot_result=$1
12876+ case $func_resolve_sysroot_result in
12877+ =*)
12878+ func_stripname '=' '' "$func_resolve_sysroot_result"
12879+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12880+ ;;
12881+ esac
12882+}
12883+
12884+# func_replace_sysroot PATH
12885+# If PATH begins with the sysroot, replace it with = and
12886+# store the result into func_replace_sysroot_result.
12887+func_replace_sysroot ()
12888+{
12889+ case "$lt_sysroot:$1" in
12890+ ?*:"$lt_sysroot"*)
12891+ func_stripname "$lt_sysroot" '' "$1"
12892+ func_replace_sysroot_result="=$func_stripname_result"
12893+ ;;
12894+ *)
12895+ # Including no sysroot.
12896+ func_replace_sysroot_result=$1
12897+ ;;
12898+ esac
12899+}
12900+
12901 # func_infer_tag arg
12902 # Infer tagged configuration to use if any are available and
12903 # if one wasn't chosen via the "--tag" command line option.
12904@@ -1184,8 +1377,7 @@ func_infer_tag ()
12905 if test -n "$available_tags" && test -z "$tagname"; then
12906 CC_quoted=
12907 for arg in $CC; do
12908- func_quote_for_eval "$arg"
12909- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12910+ func_append_quoted CC_quoted "$arg"
12911 done
12912 CC_expanded=`func_echo_all $CC`
12913 CC_quoted_expanded=`func_echo_all $CC_quoted`
12914@@ -1204,8 +1396,7 @@ func_infer_tag ()
12915 CC_quoted=
12916 for arg in $CC; do
12917 # Double-quote args containing other shell metacharacters.
12918- func_quote_for_eval "$arg"
12919- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12920+ func_append_quoted CC_quoted "$arg"
12921 done
12922 CC_expanded=`func_echo_all $CC`
12923 CC_quoted_expanded=`func_echo_all $CC_quoted`
12924@@ -1274,6 +1465,486 @@ EOF
12925 }
12926 }
12927
12928+
12929+##################################################
12930+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
12931+##################################################
12932+
12933+# func_convert_core_file_wine_to_w32 ARG
12934+# Helper function used by file name conversion functions when $build is *nix,
12935+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
12936+# correctly configured wine environment available, with the winepath program
12937+# in $build's $PATH.
12938+#
12939+# ARG is the $build file name to be converted to w32 format.
12940+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
12941+# be empty on error (or when ARG is empty)
12942+func_convert_core_file_wine_to_w32 ()
12943+{
12944+ $opt_debug
12945+ func_convert_core_file_wine_to_w32_result="$1"
12946+ if test -n "$1"; then
12947+ # Unfortunately, winepath does not exit with a non-zero error code, so we
12948+ # are forced to check the contents of stdout. On the other hand, if the
12949+ # command is not found, the shell will set an exit code of 127 and print
12950+ # *an error message* to stdout. So we must check for both error code of
12951+ # zero AND non-empty stdout, which explains the odd construction:
12952+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
12953+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
12954+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
12955+ $SED -e "$lt_sed_naive_backslashify"`
12956+ else
12957+ func_convert_core_file_wine_to_w32_result=
12958+ fi
12959+ fi
12960+}
12961+# end: func_convert_core_file_wine_to_w32
12962+
12963+
12964+# func_convert_core_path_wine_to_w32 ARG
12965+# Helper function used by path conversion functions when $build is *nix, and
12966+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
12967+# configured wine environment available, with the winepath program in $build's
12968+# $PATH. Assumes ARG has no leading or trailing path separator characters.
12969+#
12970+# ARG is path to be converted from $build format to win32.
12971+# Result is available in $func_convert_core_path_wine_to_w32_result.
12972+# Unconvertible file (directory) names in ARG are skipped; if no directory names
12973+# are convertible, then the result may be empty.
12974+func_convert_core_path_wine_to_w32 ()
12975+{
12976+ $opt_debug
12977+ # unfortunately, winepath doesn't convert paths, only file names
12978+ func_convert_core_path_wine_to_w32_result=""
12979+ if test -n "$1"; then
12980+ oldIFS=$IFS
12981+ IFS=:
12982+ for func_convert_core_path_wine_to_w32_f in $1; do
12983+ IFS=$oldIFS
12984+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
12985+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
12986+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
12987+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
12988+ else
12989+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
12990+ fi
12991+ fi
12992+ done
12993+ IFS=$oldIFS
12994+ fi
12995+}
12996+# end: func_convert_core_path_wine_to_w32
12997+
12998+
12999+# func_cygpath ARGS...
13000+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
13001+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
13002+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
13003+# (2), returns the Cygwin file name or path in func_cygpath_result (input
13004+# file name or path is assumed to be in w32 format, as previously converted
13005+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
13006+# or path in func_cygpath_result (input file name or path is assumed to be in
13007+# Cygwin format). Returns an empty string on error.
13008+#
13009+# ARGS are passed to cygpath, with the last one being the file name or path to
13010+# be converted.
13011+#
13012+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13013+# environment variable; do not put it in $PATH.
13014+func_cygpath ()
13015+{
13016+ $opt_debug
13017+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13018+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13019+ if test "$?" -ne 0; then
13020+ # on failure, ensure result is empty
13021+ func_cygpath_result=
13022+ fi
13023+ else
13024+ func_cygpath_result=
13025+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13026+ fi
13027+}
13028+#end: func_cygpath
13029+
13030+
13031+# func_convert_core_msys_to_w32 ARG
13032+# Convert file name or path ARG from MSYS format to w32 format. Return
13033+# result in func_convert_core_msys_to_w32_result.
13034+func_convert_core_msys_to_w32 ()
13035+{
13036+ $opt_debug
13037+ # awkward: cmd appends spaces to result
13038+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13039+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13040+}
13041+#end: func_convert_core_msys_to_w32
13042+
13043+
13044+# func_convert_file_check ARG1 ARG2
13045+# Verify that ARG1 (a file name in $build format) was converted to $host
13046+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13047+# func_to_host_file_result to ARG1).
13048+func_convert_file_check ()
13049+{
13050+ $opt_debug
13051+ if test -z "$2" && test -n "$1" ; then
13052+ func_error "Could not determine host file name corresponding to"
13053+ func_error " \`$1'"
13054+ func_error "Continuing, but uninstalled executables may not work."
13055+ # Fallback:
13056+ func_to_host_file_result="$1"
13057+ fi
13058+}
13059+# end func_convert_file_check
13060+
13061+
13062+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13063+# Verify that FROM_PATH (a path in $build format) was converted to $host
13064+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13065+# func_to_host_file_result to a simplistic fallback value (see below).
13066+func_convert_path_check ()
13067+{
13068+ $opt_debug
13069+ if test -z "$4" && test -n "$3"; then
13070+ func_error "Could not determine the host path corresponding to"
13071+ func_error " \`$3'"
13072+ func_error "Continuing, but uninstalled executables may not work."
13073+ # Fallback. This is a deliberately simplistic "conversion" and
13074+ # should not be "improved". See libtool.info.
13075+ if test "x$1" != "x$2"; then
13076+ lt_replace_pathsep_chars="s|$1|$2|g"
13077+ func_to_host_path_result=`echo "$3" |
13078+ $SED -e "$lt_replace_pathsep_chars"`
13079+ else
13080+ func_to_host_path_result="$3"
13081+ fi
13082+ fi
13083+}
13084+# end func_convert_path_check
13085+
13086+
13087+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13088+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13089+# and appending REPL if ORIG matches BACKPAT.
13090+func_convert_path_front_back_pathsep ()
13091+{
13092+ $opt_debug
13093+ case $4 in
13094+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13095+ ;;
13096+ esac
13097+ case $4 in
13098+ $2 ) func_append func_to_host_path_result "$3"
13099+ ;;
13100+ esac
13101+}
13102+# end func_convert_path_front_back_pathsep
13103+
13104+
13105+##################################################
13106+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13107+##################################################
13108+# invoked via `$to_host_file_cmd ARG'
13109+#
13110+# In each case, ARG is the path to be converted from $build to $host format.
13111+# Result will be available in $func_to_host_file_result.
13112+
13113+
13114+# func_to_host_file ARG
13115+# Converts the file name ARG from $build format to $host format. Return result
13116+# in func_to_host_file_result.
13117+func_to_host_file ()
13118+{
13119+ $opt_debug
13120+ $to_host_file_cmd "$1"
13121+}
13122+# end func_to_host_file
13123+
13124+
13125+# func_to_tool_file ARG LAZY
13126+# converts the file name ARG from $build format to toolchain format. Return
13127+# result in func_to_tool_file_result. If the conversion in use is listed
13128+# in (the comma separated) LAZY, no conversion takes place.
13129+func_to_tool_file ()
13130+{
13131+ $opt_debug
13132+ case ,$2, in
13133+ *,"$to_tool_file_cmd",*)
13134+ func_to_tool_file_result=$1
13135+ ;;
13136+ *)
13137+ $to_tool_file_cmd "$1"
13138+ func_to_tool_file_result=$func_to_host_file_result
13139+ ;;
13140+ esac
13141+}
13142+# end func_to_tool_file
13143+
13144+
13145+# func_convert_file_noop ARG
13146+# Copy ARG to func_to_host_file_result.
13147+func_convert_file_noop ()
13148+{
13149+ func_to_host_file_result="$1"
13150+}
13151+# end func_convert_file_noop
13152+
13153+
13154+# func_convert_file_msys_to_w32 ARG
13155+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13156+# conversion to w32 is not available inside the cwrapper. Returns result in
13157+# func_to_host_file_result.
13158+func_convert_file_msys_to_w32 ()
13159+{
13160+ $opt_debug
13161+ func_to_host_file_result="$1"
13162+ if test -n "$1"; then
13163+ func_convert_core_msys_to_w32 "$1"
13164+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13165+ fi
13166+ func_convert_file_check "$1" "$func_to_host_file_result"
13167+}
13168+# end func_convert_file_msys_to_w32
13169+
13170+
13171+# func_convert_file_cygwin_to_w32 ARG
13172+# Convert file name ARG from Cygwin to w32 format. Returns result in
13173+# func_to_host_file_result.
13174+func_convert_file_cygwin_to_w32 ()
13175+{
13176+ $opt_debug
13177+ func_to_host_file_result="$1"
13178+ if test -n "$1"; then
13179+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13180+ # LT_CYGPATH in this case.
13181+ func_to_host_file_result=`cygpath -m "$1"`
13182+ fi
13183+ func_convert_file_check "$1" "$func_to_host_file_result"
13184+}
13185+# end func_convert_file_cygwin_to_w32
13186+
13187+
13188+# func_convert_file_nix_to_w32 ARG
13189+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13190+# and a working winepath. Returns result in func_to_host_file_result.
13191+func_convert_file_nix_to_w32 ()
13192+{
13193+ $opt_debug
13194+ func_to_host_file_result="$1"
13195+ if test -n "$1"; then
13196+ func_convert_core_file_wine_to_w32 "$1"
13197+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13198+ fi
13199+ func_convert_file_check "$1" "$func_to_host_file_result"
13200+}
13201+# end func_convert_file_nix_to_w32
13202+
13203+
13204+# func_convert_file_msys_to_cygwin ARG
13205+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13206+# Returns result in func_to_host_file_result.
13207+func_convert_file_msys_to_cygwin ()
13208+{
13209+ $opt_debug
13210+ func_to_host_file_result="$1"
13211+ if test -n "$1"; then
13212+ func_convert_core_msys_to_w32 "$1"
13213+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13214+ func_to_host_file_result="$func_cygpath_result"
13215+ fi
13216+ func_convert_file_check "$1" "$func_to_host_file_result"
13217+}
13218+# end func_convert_file_msys_to_cygwin
13219+
13220+
13221+# func_convert_file_nix_to_cygwin ARG
13222+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13223+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13224+# in func_to_host_file_result.
13225+func_convert_file_nix_to_cygwin ()
13226+{
13227+ $opt_debug
13228+ func_to_host_file_result="$1"
13229+ if test -n "$1"; then
13230+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13231+ func_convert_core_file_wine_to_w32 "$1"
13232+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13233+ func_to_host_file_result="$func_cygpath_result"
13234+ fi
13235+ func_convert_file_check "$1" "$func_to_host_file_result"
13236+}
13237+# end func_convert_file_nix_to_cygwin
13238+
13239+
13240+#############################################
13241+# $build to $host PATH CONVERSION FUNCTIONS #
13242+#############################################
13243+# invoked via `$to_host_path_cmd ARG'
13244+#
13245+# In each case, ARG is the path to be converted from $build to $host format.
13246+# The result will be available in $func_to_host_path_result.
13247+#
13248+# Path separators are also converted from $build format to $host format. If
13249+# ARG begins or ends with a path separator character, it is preserved (but
13250+# converted to $host format) on output.
13251+#
13252+# All path conversion functions are named using the following convention:
13253+# file name conversion function : func_convert_file_X_to_Y ()
13254+# path conversion function : func_convert_path_X_to_Y ()
13255+# where, for any given $build/$host combination the 'X_to_Y' value is the
13256+# same. If conversion functions are added for new $build/$host combinations,
13257+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13258+# will break.
13259+
13260+
13261+# func_init_to_host_path_cmd
13262+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13263+# appropriate value, based on the value of $to_host_file_cmd.
13264+to_host_path_cmd=
13265+func_init_to_host_path_cmd ()
13266+{
13267+ $opt_debug
13268+ if test -z "$to_host_path_cmd"; then
13269+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13270+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13271+ fi
13272+}
13273+
13274+
13275+# func_to_host_path ARG
13276+# Converts the path ARG from $build format to $host format. Return result
13277+# in func_to_host_path_result.
13278+func_to_host_path ()
13279+{
13280+ $opt_debug
13281+ func_init_to_host_path_cmd
13282+ $to_host_path_cmd "$1"
13283+}
13284+# end func_to_host_path
13285+
13286+
13287+# func_convert_path_noop ARG
13288+# Copy ARG to func_to_host_path_result.
13289+func_convert_path_noop ()
13290+{
13291+ func_to_host_path_result="$1"
13292+}
13293+# end func_convert_path_noop
13294+
13295+
13296+# func_convert_path_msys_to_w32 ARG
13297+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13298+# conversion to w32 is not available inside the cwrapper. Returns result in
13299+# func_to_host_path_result.
13300+func_convert_path_msys_to_w32 ()
13301+{
13302+ $opt_debug
13303+ func_to_host_path_result="$1"
13304+ if test -n "$1"; then
13305+ # Remove leading and trailing path separator characters from ARG. MSYS
13306+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13307+ # and winepath ignores them completely.
13308+ func_stripname : : "$1"
13309+ func_to_host_path_tmp1=$func_stripname_result
13310+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13311+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13312+ func_convert_path_check : ";" \
13313+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13314+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13315+ fi
13316+}
13317+# end func_convert_path_msys_to_w32
13318+
13319+
13320+# func_convert_path_cygwin_to_w32 ARG
13321+# Convert path ARG from Cygwin to w32 format. Returns result in
13322+# func_to_host_file_result.
13323+func_convert_path_cygwin_to_w32 ()
13324+{
13325+ $opt_debug
13326+ func_to_host_path_result="$1"
13327+ if test -n "$1"; then
13328+ # See func_convert_path_msys_to_w32:
13329+ func_stripname : : "$1"
13330+ func_to_host_path_tmp1=$func_stripname_result
13331+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13332+ func_convert_path_check : ";" \
13333+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13334+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13335+ fi
13336+}
13337+# end func_convert_path_cygwin_to_w32
13338+
13339+
13340+# func_convert_path_nix_to_w32 ARG
13341+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13342+# a working winepath. Returns result in func_to_host_file_result.
13343+func_convert_path_nix_to_w32 ()
13344+{
13345+ $opt_debug
13346+ func_to_host_path_result="$1"
13347+ if test -n "$1"; then
13348+ # See func_convert_path_msys_to_w32:
13349+ func_stripname : : "$1"
13350+ func_to_host_path_tmp1=$func_stripname_result
13351+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13352+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13353+ func_convert_path_check : ";" \
13354+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13355+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13356+ fi
13357+}
13358+# end func_convert_path_nix_to_w32
13359+
13360+
13361+# func_convert_path_msys_to_cygwin ARG
13362+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13363+# Returns result in func_to_host_file_result.
13364+func_convert_path_msys_to_cygwin ()
13365+{
13366+ $opt_debug
13367+ func_to_host_path_result="$1"
13368+ if test -n "$1"; then
13369+ # See func_convert_path_msys_to_w32:
13370+ func_stripname : : "$1"
13371+ func_to_host_path_tmp1=$func_stripname_result
13372+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13373+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13374+ func_to_host_path_result="$func_cygpath_result"
13375+ func_convert_path_check : : \
13376+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13377+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13378+ fi
13379+}
13380+# end func_convert_path_msys_to_cygwin
13381+
13382+
13383+# func_convert_path_nix_to_cygwin ARG
13384+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13385+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13386+# func_to_host_file_result.
13387+func_convert_path_nix_to_cygwin ()
13388+{
13389+ $opt_debug
13390+ func_to_host_path_result="$1"
13391+ if test -n "$1"; then
13392+ # Remove leading and trailing path separator characters from
13393+ # ARG. msys behavior is inconsistent here, cygpath turns them
13394+ # into '.;' and ';.', and winepath ignores them completely.
13395+ func_stripname : : "$1"
13396+ func_to_host_path_tmp1=$func_stripname_result
13397+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13398+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13399+ func_to_host_path_result="$func_cygpath_result"
13400+ func_convert_path_check : : \
13401+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13402+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13403+ fi
13404+}
13405+# end func_convert_path_nix_to_cygwin
13406+
13407+
13408 # func_mode_compile arg...
13409 func_mode_compile ()
13410 {
13411@@ -1314,12 +1985,12 @@ func_mode_compile ()
13412 ;;
13413
13414 -pie | -fpie | -fPIE)
13415- pie_flag="$pie_flag $arg"
13416+ func_append pie_flag " $arg"
13417 continue
13418 ;;
13419
13420 -shared | -static | -prefer-pic | -prefer-non-pic)
13421- later="$later $arg"
13422+ func_append later " $arg"
13423 continue
13424 ;;
13425
13426@@ -1340,15 +2011,14 @@ func_mode_compile ()
13427 save_ifs="$IFS"; IFS=','
13428 for arg in $args; do
13429 IFS="$save_ifs"
13430- func_quote_for_eval "$arg"
13431- lastarg="$lastarg $func_quote_for_eval_result"
13432+ func_append_quoted lastarg "$arg"
13433 done
13434 IFS="$save_ifs"
13435 func_stripname ' ' '' "$lastarg"
13436 lastarg=$func_stripname_result
13437
13438 # Add the arguments to base_compile.
13439- base_compile="$base_compile $lastarg"
13440+ func_append base_compile " $lastarg"
13441 continue
13442 ;;
13443
13444@@ -1364,8 +2034,7 @@ func_mode_compile ()
13445 esac # case $arg_mode
13446
13447 # Aesthetically quote the previous argument.
13448- func_quote_for_eval "$lastarg"
13449- base_compile="$base_compile $func_quote_for_eval_result"
13450+ func_append_quoted base_compile "$lastarg"
13451 done # for arg
13452
13453 case $arg_mode in
13454@@ -1496,17 +2165,16 @@ compiler."
13455 $opt_dry_run || $RM $removelist
13456 exit $EXIT_FAILURE
13457 fi
13458- removelist="$removelist $output_obj"
13459+ func_append removelist " $output_obj"
13460 $ECHO "$srcfile" > "$lockfile"
13461 fi
13462
13463 $opt_dry_run || $RM $removelist
13464- removelist="$removelist $lockfile"
13465+ func_append removelist " $lockfile"
13466 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13467
13468- if test -n "$fix_srcfile_path"; then
13469- eval "srcfile=\"$fix_srcfile_path\""
13470- fi
13471+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13472+ srcfile=$func_to_tool_file_result
13473 func_quote_for_eval "$srcfile"
13474 qsrcfile=$func_quote_for_eval_result
13475
13476@@ -1526,7 +2194,7 @@ compiler."
13477
13478 if test -z "$output_obj"; then
13479 # Place PIC objects in $objdir
13480- command="$command -o $lobj"
13481+ func_append command " -o $lobj"
13482 fi
13483
13484 func_show_eval_locale "$command" \
13485@@ -1573,11 +2241,11 @@ compiler."
13486 command="$base_compile $qsrcfile $pic_flag"
13487 fi
13488 if test "$compiler_c_o" = yes; then
13489- command="$command -o $obj"
13490+ func_append command " -o $obj"
13491 fi
13492
13493 # Suppress compiler output if we already did a PIC compilation.
13494- command="$command$suppress_output"
13495+ func_append command "$suppress_output"
13496 func_show_eval_locale "$command" \
13497 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13498
13499@@ -1622,13 +2290,13 @@ compiler."
13500 }
13501
13502 $opt_help || {
13503- test "$mode" = compile && func_mode_compile ${1+"$@"}
13504+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13505 }
13506
13507 func_mode_help ()
13508 {
13509 # We need to display help for each of the modes.
13510- case $mode in
13511+ case $opt_mode in
13512 "")
13513 # Generic help is extracted from the usage comments
13514 # at the start of this file.
13515@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
13516
13517 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13518 -no-suppress do not suppress compiler output for multiple passes
13519- -prefer-pic try to building PIC objects only
13520- -prefer-non-pic try to building non-PIC objects only
13521+ -prefer-pic try to build PIC objects only
13522+ -prefer-non-pic try to build non-PIC objects only
13523 -shared do not build a \`.o' file suitable for static linking
13524 -static only build a \`.o' file suitable for static linking
13525 -Wc,FLAG pass FLAG directly to the compiler
13526@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
13527 ;;
13528
13529 *)
13530- func_fatal_help "invalid operation mode \`$mode'"
13531+ func_fatal_help "invalid operation mode \`$opt_mode'"
13532 ;;
13533 esac
13534
13535@@ -1819,13 +2487,13 @@ if $opt_help; then
13536 else
13537 {
13538 func_help noexit
13539- for mode in compile link execute install finish uninstall clean; do
13540+ for opt_mode in compile link execute install finish uninstall clean; do
13541 func_mode_help
13542 done
13543 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13544 {
13545 func_help noexit
13546- for mode in compile link execute install finish uninstall clean; do
13547+ for opt_mode in compile link execute install finish uninstall clean; do
13548 echo
13549 func_mode_help
13550 done
13551@@ -1854,13 +2522,16 @@ func_mode_execute ()
13552 func_fatal_help "you must specify a COMMAND"
13553
13554 # Handle -dlopen flags immediately.
13555- for file in $execute_dlfiles; do
13556+ for file in $opt_dlopen; do
13557 test -f "$file" \
13558 || func_fatal_help "\`$file' is not a file"
13559
13560 dir=
13561 case $file in
13562 *.la)
13563+ func_resolve_sysroot "$file"
13564+ file=$func_resolve_sysroot_result
13565+
13566 # Check to see that this really is a libtool archive.
13567 func_lalib_unsafe_p "$file" \
13568 || func_fatal_help "\`$lib' is not a valid libtool archive"
13569@@ -1882,7 +2553,7 @@ func_mode_execute ()
13570 dir="$func_dirname_result"
13571
13572 if test -f "$dir/$objdir/$dlname"; then
13573- dir="$dir/$objdir"
13574+ func_append dir "/$objdir"
13575 else
13576 if test ! -f "$dir/$dlname"; then
13577 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13578@@ -1907,10 +2578,10 @@ func_mode_execute ()
13579 test -n "$absdir" && dir="$absdir"
13580
13581 # Now add the directory to shlibpath_var.
13582- if eval test -z \"\$$shlibpath_var\"; then
13583- eval $shlibpath_var=\$dir
13584+ if eval "test -z \"\$$shlibpath_var\""; then
13585+ eval "$shlibpath_var=\"\$dir\""
13586 else
13587- eval $shlibpath_var=\$dir:\$$shlibpath_var
13588+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13589 fi
13590 done
13591
13592@@ -1939,8 +2610,7 @@ func_mode_execute ()
13593 ;;
13594 esac
13595 # Quote arguments (to preserve shell metacharacters).
13596- func_quote_for_eval "$file"
13597- args="$args $func_quote_for_eval_result"
13598+ func_append_quoted args "$file"
13599 done
13600
13601 if test "X$opt_dry_run" = Xfalse; then
13602@@ -1972,22 +2642,59 @@ func_mode_execute ()
13603 fi
13604 }
13605
13606-test "$mode" = execute && func_mode_execute ${1+"$@"}
13607+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13608
13609
13610 # func_mode_finish arg...
13611 func_mode_finish ()
13612 {
13613 $opt_debug
13614- libdirs="$nonopt"
13615+ libs=
13616+ libdirs=
13617 admincmds=
13618
13619- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13620- for dir
13621- do
13622- libdirs="$libdirs $dir"
13623- done
13624+ for opt in "$nonopt" ${1+"$@"}
13625+ do
13626+ if test -d "$opt"; then
13627+ func_append libdirs " $opt"
13628
13629+ elif test -f "$opt"; then
13630+ if func_lalib_unsafe_p "$opt"; then
13631+ func_append libs " $opt"
13632+ else
13633+ func_warning "\`$opt' is not a valid libtool archive"
13634+ fi
13635+
13636+ else
13637+ func_fatal_error "invalid argument \`$opt'"
13638+ fi
13639+ done
13640+
13641+ if test -n "$libs"; then
13642+ if test -n "$lt_sysroot"; then
13643+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13644+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13645+ else
13646+ sysroot_cmd=
13647+ fi
13648+
13649+ # Remove sysroot references
13650+ if $opt_dry_run; then
13651+ for lib in $libs; do
13652+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13653+ done
13654+ else
13655+ tmpdir=`func_mktempdir`
13656+ for lib in $libs; do
13657+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13658+ > $tmpdir/tmp-la
13659+ mv -f $tmpdir/tmp-la $lib
13660+ done
13661+ ${RM}r "$tmpdir"
13662+ fi
13663+ fi
13664+
13665+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13666 for libdir in $libdirs; do
13667 if test -n "$finish_cmds"; then
13668 # Do each command in the finish commands.
13669@@ -1997,7 +2704,7 @@ func_mode_finish ()
13670 if test -n "$finish_eval"; then
13671 # Do the single finish_eval.
13672 eval cmds=\"$finish_eval\"
13673- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13674+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13675 $cmds"
13676 fi
13677 done
13678@@ -2006,53 +2713,55 @@ func_mode_finish ()
13679 # Exit here if they wanted silent mode.
13680 $opt_silent && exit $EXIT_SUCCESS
13681
13682- echo "----------------------------------------------------------------------"
13683- echo "Libraries have been installed in:"
13684- for libdir in $libdirs; do
13685- $ECHO " $libdir"
13686- done
13687- echo
13688- echo "If you ever happen to want to link against installed libraries"
13689- echo "in a given directory, LIBDIR, you must either use libtool, and"
13690- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13691- echo "flag during linking and do at least one of the following:"
13692- if test -n "$shlibpath_var"; then
13693- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13694- echo " during execution"
13695- fi
13696- if test -n "$runpath_var"; then
13697- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13698- echo " during linking"
13699- fi
13700- if test -n "$hardcode_libdir_flag_spec"; then
13701- libdir=LIBDIR
13702- eval "flag=\"$hardcode_libdir_flag_spec\""
13703+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13704+ echo "----------------------------------------------------------------------"
13705+ echo "Libraries have been installed in:"
13706+ for libdir in $libdirs; do
13707+ $ECHO " $libdir"
13708+ done
13709+ echo
13710+ echo "If you ever happen to want to link against installed libraries"
13711+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13712+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13713+ echo "flag during linking and do at least one of the following:"
13714+ if test -n "$shlibpath_var"; then
13715+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13716+ echo " during execution"
13717+ fi
13718+ if test -n "$runpath_var"; then
13719+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13720+ echo " during linking"
13721+ fi
13722+ if test -n "$hardcode_libdir_flag_spec"; then
13723+ libdir=LIBDIR
13724+ eval flag=\"$hardcode_libdir_flag_spec\"
13725
13726- $ECHO " - use the \`$flag' linker flag"
13727- fi
13728- if test -n "$admincmds"; then
13729- $ECHO " - have your system administrator run these commands:$admincmds"
13730- fi
13731- if test -f /etc/ld.so.conf; then
13732- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13733- fi
13734- echo
13735+ $ECHO " - use the \`$flag' linker flag"
13736+ fi
13737+ if test -n "$admincmds"; then
13738+ $ECHO " - have your system administrator run these commands:$admincmds"
13739+ fi
13740+ if test -f /etc/ld.so.conf; then
13741+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13742+ fi
13743+ echo
13744
13745- echo "See any operating system documentation about shared libraries for"
13746- case $host in
13747- solaris2.[6789]|solaris2.1[0-9])
13748- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13749- echo "pages."
13750- ;;
13751- *)
13752- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13753- ;;
13754- esac
13755- echo "----------------------------------------------------------------------"
13756+ echo "See any operating system documentation about shared libraries for"
13757+ case $host in
13758+ solaris2.[6789]|solaris2.1[0-9])
13759+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13760+ echo "pages."
13761+ ;;
13762+ *)
13763+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13764+ ;;
13765+ esac
13766+ echo "----------------------------------------------------------------------"
13767+ fi
13768 exit $EXIT_SUCCESS
13769 }
13770
13771-test "$mode" = finish && func_mode_finish ${1+"$@"}
13772+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13773
13774
13775 # func_mode_install arg...
13776@@ -2077,7 +2786,7 @@ func_mode_install ()
13777 # The real first argument should be the name of the installation program.
13778 # Aesthetically quote it.
13779 func_quote_for_eval "$arg"
13780- install_prog="$install_prog$func_quote_for_eval_result"
13781+ func_append install_prog "$func_quote_for_eval_result"
13782 install_shared_prog=$install_prog
13783 case " $install_prog " in
13784 *[\\\ /]cp\ *) install_cp=: ;;
13785@@ -2097,7 +2806,7 @@ func_mode_install ()
13786 do
13787 arg2=
13788 if test -n "$dest"; then
13789- files="$files $dest"
13790+ func_append files " $dest"
13791 dest=$arg
13792 continue
13793 fi
13794@@ -2135,11 +2844,11 @@ func_mode_install ()
13795
13796 # Aesthetically quote the argument.
13797 func_quote_for_eval "$arg"
13798- install_prog="$install_prog $func_quote_for_eval_result"
13799+ func_append install_prog " $func_quote_for_eval_result"
13800 if test -n "$arg2"; then
13801 func_quote_for_eval "$arg2"
13802 fi
13803- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13804+ func_append install_shared_prog " $func_quote_for_eval_result"
13805 done
13806
13807 test -z "$install_prog" && \
13808@@ -2151,7 +2860,7 @@ func_mode_install ()
13809 if test -n "$install_override_mode" && $no_mode; then
13810 if $install_cp; then :; else
13811 func_quote_for_eval "$install_override_mode"
13812- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13813+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13814 fi
13815 fi
13816
13817@@ -2209,10 +2918,13 @@ func_mode_install ()
13818 case $file in
13819 *.$libext)
13820 # Do the static libraries later.
13821- staticlibs="$staticlibs $file"
13822+ func_append staticlibs " $file"
13823 ;;
13824
13825 *.la)
13826+ func_resolve_sysroot "$file"
13827+ file=$func_resolve_sysroot_result
13828+
13829 # Check to see that this really is a libtool archive.
13830 func_lalib_unsafe_p "$file" \
13831 || func_fatal_help "\`$file' is not a valid libtool archive"
13832@@ -2226,23 +2938,30 @@ func_mode_install ()
13833 if test "X$destdir" = "X$libdir"; then
13834 case "$current_libdirs " in
13835 *" $libdir "*) ;;
13836- *) current_libdirs="$current_libdirs $libdir" ;;
13837+ *) func_append current_libdirs " $libdir" ;;
13838 esac
13839 else
13840 # Note the libdir as a future libdir.
13841 case "$future_libdirs " in
13842 *" $libdir "*) ;;
13843- *) future_libdirs="$future_libdirs $libdir" ;;
13844+ *) func_append future_libdirs " $libdir" ;;
13845 esac
13846 fi
13847
13848 func_dirname "$file" "/" ""
13849 dir="$func_dirname_result"
13850- dir="$dir$objdir"
13851+ func_append dir "$objdir"
13852
13853 if test -n "$relink_command"; then
13854+ # Strip any trailing slash from the destination.
13855+ func_stripname '' '/' "$libdir"
13856+ destlibdir=$func_stripname_result
13857+
13858+ func_stripname '' '/' "$destdir"
13859+ s_destdir=$func_stripname_result
13860+
13861 # Determine the prefix the user has applied to our future dir.
13862- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13863+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13864
13865 # Don't allow the user to place us outside of our expected
13866 # location b/c this prevents finding dependent libraries that
13867@@ -2315,7 +3034,7 @@ func_mode_install ()
13868 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13869
13870 # Maybe install the static library, too.
13871- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13872+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13873 ;;
13874
13875 *.lo)
13876@@ -2503,7 +3222,7 @@ func_mode_install ()
13877 test -n "$future_libdirs" && \
13878 func_warning "remember to run \`$progname --finish$future_libdirs'"
13879
13880- if test -n "$current_libdirs" && $opt_finish; then
13881+ if test -n "$current_libdirs"; then
13882 # Maybe just do a dry run.
13883 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13884 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13885@@ -2512,7 +3231,7 @@ func_mode_install ()
13886 fi
13887 }
13888
13889-test "$mode" = install && func_mode_install ${1+"$@"}
13890+test "$opt_mode" = install && func_mode_install ${1+"$@"}
13891
13892
13893 # func_generate_dlsyms outputname originator pic_p
13894@@ -2559,6 +3278,18 @@ extern \"C\" {
13895 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
13896 #endif
13897
13898+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13899+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13900+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13901+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13902+# define LT_DLSYM_CONST
13903+#elif defined(__osf__)
13904+/* This system does not cope well with relocations in const data. */
13905+# define LT_DLSYM_CONST
13906+#else
13907+# define LT_DLSYM_CONST const
13908+#endif
13909+
13910 /* External symbol declarations for the compiler. */\
13911 "
13912
13913@@ -2570,21 +3301,22 @@ extern \"C\" {
13914 # Add our own program objects to the symbol list.
13915 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
13916 for progfile in $progfiles; do
13917- func_verbose "extracting global C symbols from \`$progfile'"
13918- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
13919+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
13920+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
13921+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
13922 done
13923
13924 if test -n "$exclude_expsyms"; then
13925 $opt_dry_run || {
13926- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
13927- $MV "$nlist"T "$nlist"
13928+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
13929+ eval '$MV "$nlist"T "$nlist"'
13930 }
13931 fi
13932
13933 if test -n "$export_symbols_regex"; then
13934 $opt_dry_run || {
13935- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
13936- $MV "$nlist"T "$nlist"
13937+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
13938+ eval '$MV "$nlist"T "$nlist"'
13939 }
13940 fi
13941
13942@@ -2593,23 +3325,23 @@ extern \"C\" {
13943 export_symbols="$output_objdir/$outputname.exp"
13944 $opt_dry_run || {
13945 $RM $export_symbols
13946- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
13947+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13948 case $host in
13949 *cygwin* | *mingw* | *cegcc* )
13950- echo EXPORTS > "$output_objdir/$outputname.def"
13951- cat "$export_symbols" >> "$output_objdir/$outputname.def"
13952+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13953+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
13954 ;;
13955 esac
13956 }
13957 else
13958 $opt_dry_run || {
13959- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
13960- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
13961- $MV "$nlist"T "$nlist"
13962+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
13963+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
13964+ eval '$MV "$nlist"T "$nlist"'
13965 case $host in
13966 *cygwin* | *mingw* | *cegcc* )
13967- echo EXPORTS > "$output_objdir/$outputname.def"
13968- cat "$nlist" >> "$output_objdir/$outputname.def"
13969+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13970+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
13971 ;;
13972 esac
13973 }
13974@@ -2620,10 +3352,52 @@ extern \"C\" {
13975 func_verbose "extracting global C symbols from \`$dlprefile'"
13976 func_basename "$dlprefile"
13977 name="$func_basename_result"
13978- $opt_dry_run || {
13979- $ECHO ": $name " >> "$nlist"
13980- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
13981- }
13982+ case $host in
13983+ *cygwin* | *mingw* | *cegcc* )
13984+ # if an import library, we need to obtain dlname
13985+ if func_win32_import_lib_p "$dlprefile"; then
13986+ func_tr_sh "$dlprefile"
13987+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
13988+ dlprefile_dlbasename=""
13989+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
13990+ # Use subshell, to avoid clobbering current variable values
13991+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
13992+ if test -n "$dlprefile_dlname" ; then
13993+ func_basename "$dlprefile_dlname"
13994+ dlprefile_dlbasename="$func_basename_result"
13995+ else
13996+ # no lafile. user explicitly requested -dlpreopen <import library>.
13997+ $sharedlib_from_linklib_cmd "$dlprefile"
13998+ dlprefile_dlbasename=$sharedlib_from_linklib_result
13999+ fi
14000+ fi
14001+ $opt_dry_run || {
14002+ if test -n "$dlprefile_dlbasename" ; then
14003+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
14004+ else
14005+ func_warning "Could not compute DLL name from $name"
14006+ eval '$ECHO ": $name " >> "$nlist"'
14007+ fi
14008+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14009+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
14010+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
14011+ }
14012+ else # not an import lib
14013+ $opt_dry_run || {
14014+ eval '$ECHO ": $name " >> "$nlist"'
14015+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14016+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14017+ }
14018+ fi
14019+ ;;
14020+ *)
14021+ $opt_dry_run || {
14022+ eval '$ECHO ": $name " >> "$nlist"'
14023+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14024+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14025+ }
14026+ ;;
14027+ esac
14028 done
14029
14030 $opt_dry_run || {
14031@@ -2661,26 +3435,9 @@ typedef struct {
14032 const char *name;
14033 void *address;
14034 } lt_dlsymlist;
14035-"
14036- case $host in
14037- *cygwin* | *mingw* | *cegcc* )
14038- echo >> "$output_objdir/$my_dlsyms" "\
14039-/* DATA imports from DLLs on WIN32 con't be const, because
14040- runtime relocations are performed -- see ld's documentation
14041- on pseudo-relocs. */"
14042- lt_dlsym_const= ;;
14043- *osf5*)
14044- echo >> "$output_objdir/$my_dlsyms" "\
14045-/* This system does not cope well with relocations in const data */"
14046- lt_dlsym_const= ;;
14047- *)
14048- lt_dlsym_const=const ;;
14049- esac
14050-
14051- echo >> "$output_objdir/$my_dlsyms" "\
14052-extern $lt_dlsym_const lt_dlsymlist
14053+extern LT_DLSYM_CONST lt_dlsymlist
14054 lt_${my_prefix}_LTX_preloaded_symbols[];
14055-$lt_dlsym_const lt_dlsymlist
14056+LT_DLSYM_CONST lt_dlsymlist
14057 lt_${my_prefix}_LTX_preloaded_symbols[] =
14058 {\
14059 { \"$my_originator\", (void *) 0 },"
14060@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
14061 for arg in $LTCFLAGS; do
14062 case $arg in
14063 -pie | -fpie | -fPIE) ;;
14064- *) symtab_cflags="$symtab_cflags $arg" ;;
14065+ *) func_append symtab_cflags " $arg" ;;
14066 esac
14067 done
14068
14069@@ -2796,9 +3553,11 @@ func_win32_libid ()
14070 win32_libid_type="x86 archive import"
14071 ;;
14072 *ar\ archive*) # could be an import, or static
14073- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14074- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14075- win32_nmres=`$NM -f posix -A "$1" |
14076+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14077+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14078+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14079+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14080+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14081 $SED -n -e '
14082 1,100{
14083 / I /{
14084@@ -2827,6 +3586,131 @@ func_win32_libid ()
14085 $ECHO "$win32_libid_type"
14086 }
14087
14088+# func_cygming_dll_for_implib ARG
14089+#
14090+# Platform-specific function to extract the
14091+# name of the DLL associated with the specified
14092+# import library ARG.
14093+# Invoked by eval'ing the libtool variable
14094+# $sharedlib_from_linklib_cmd
14095+# Result is available in the variable
14096+# $sharedlib_from_linklib_result
14097+func_cygming_dll_for_implib ()
14098+{
14099+ $opt_debug
14100+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14101+}
14102+
14103+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14104+#
14105+# The is the core of a fallback implementation of a
14106+# platform-specific function to extract the name of the
14107+# DLL associated with the specified import library LIBNAME.
14108+#
14109+# SECTION_NAME is either .idata$6 or .idata$7, depending
14110+# on the platform and compiler that created the implib.
14111+#
14112+# Echos the name of the DLL associated with the
14113+# specified import library.
14114+func_cygming_dll_for_implib_fallback_core ()
14115+{
14116+ $opt_debug
14117+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14118+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14119+ $SED '/^Contents of section '"$match_literal"':/{
14120+ # Place marker at beginning of archive member dllname section
14121+ s/.*/====MARK====/
14122+ p
14123+ d
14124+ }
14125+ # These lines can sometimes be longer than 43 characters, but
14126+ # are always uninteresting
14127+ /:[ ]*file format pe[i]\{,1\}-/d
14128+ /^In archive [^:]*:/d
14129+ # Ensure marker is printed
14130+ /^====MARK====/p
14131+ # Remove all lines with less than 43 characters
14132+ /^.\{43\}/!d
14133+ # From remaining lines, remove first 43 characters
14134+ s/^.\{43\}//' |
14135+ $SED -n '
14136+ # Join marker and all lines until next marker into a single line
14137+ /^====MARK====/ b para
14138+ H
14139+ $ b para
14140+ b
14141+ :para
14142+ x
14143+ s/\n//g
14144+ # Remove the marker
14145+ s/^====MARK====//
14146+ # Remove trailing dots and whitespace
14147+ s/[\. \t]*$//
14148+ # Print
14149+ /./p' |
14150+ # we now have a list, one entry per line, of the stringified
14151+ # contents of the appropriate section of all members of the
14152+ # archive which possess that section. Heuristic: eliminate
14153+ # all those which have a first or second character that is
14154+ # a '.' (that is, objdump's representation of an unprintable
14155+ # character.) This should work for all archives with less than
14156+ # 0x302f exports -- but will fail for DLLs whose name actually
14157+ # begins with a literal '.' or a single character followed by
14158+ # a '.'.
14159+ #
14160+ # Of those that remain, print the first one.
14161+ $SED -e '/^\./d;/^.\./d;q'
14162+}
14163+
14164+# func_cygming_gnu_implib_p ARG
14165+# This predicate returns with zero status (TRUE) if
14166+# ARG is a GNU/binutils-style import library. Returns
14167+# with nonzero status (FALSE) otherwise.
14168+func_cygming_gnu_implib_p ()
14169+{
14170+ $opt_debug
14171+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14172+ 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)$'`
14173+ test -n "$func_cygming_gnu_implib_tmp"
14174+}
14175+
14176+# func_cygming_ms_implib_p ARG
14177+# This predicate returns with zero status (TRUE) if
14178+# ARG is an MS-style import library. Returns
14179+# with nonzero status (FALSE) otherwise.
14180+func_cygming_ms_implib_p ()
14181+{
14182+ $opt_debug
14183+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14184+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14185+ test -n "$func_cygming_ms_implib_tmp"
14186+}
14187+
14188+# func_cygming_dll_for_implib_fallback ARG
14189+# Platform-specific function to extract the
14190+# name of the DLL associated with the specified
14191+# import library ARG.
14192+#
14193+# This fallback implementation is for use when $DLLTOOL
14194+# does not support the --identify-strict option.
14195+# Invoked by eval'ing the libtool variable
14196+# $sharedlib_from_linklib_cmd
14197+# Result is available in the variable
14198+# $sharedlib_from_linklib_result
14199+func_cygming_dll_for_implib_fallback ()
14200+{
14201+ $opt_debug
14202+ if func_cygming_gnu_implib_p "$1" ; then
14203+ # binutils import library
14204+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14205+ elif func_cygming_ms_implib_p "$1" ; then
14206+ # ms-generated import library
14207+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14208+ else
14209+ # unknown
14210+ sharedlib_from_linklib_result=""
14211+ fi
14212+}
14213
14214
14215 # func_extract_an_archive dir oldlib
14216@@ -2917,7 +3801,7 @@ func_extract_archives ()
14217 darwin_file=
14218 darwin_files=
14219 for darwin_file in $darwin_filelist; do
14220- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14221+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14222 $LIPO -create -output "$darwin_file" $darwin_files
14223 done # $darwin_filelist
14224 $RM -rf unfat-$$
14225@@ -2932,7 +3816,7 @@ func_extract_archives ()
14226 func_extract_an_archive "$my_xdir" "$my_xabs"
14227 ;;
14228 esac
14229- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14230+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14231 done
14232
14233 func_extract_archives_result="$my_oldobjs"
14234@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14235 _LTECHO_EOF'
14236 }
14237 ECHO=\"$qECHO\"
14238- fi\
14239+ fi
14240+
14241+# Very basic option parsing. These options are (a) specific to
14242+# the libtool wrapper, (b) are identical between the wrapper
14243+# /script/ and the wrapper /executable/ which is used only on
14244+# windows platforms, and (c) all begin with the string "--lt-"
14245+# (application programs are unlikely to have options which match
14246+# this pattern).
14247+#
14248+# There are only two supported options: --lt-debug and
14249+# --lt-dump-script. There is, deliberately, no --lt-help.
14250+#
14251+# The first argument to this parsing function should be the
14252+# script's $0 value, followed by "$@".
14253+lt_option_debug=
14254+func_parse_lt_options ()
14255+{
14256+ lt_script_arg0=\$0
14257+ shift
14258+ for lt_opt
14259+ do
14260+ case \"\$lt_opt\" in
14261+ --lt-debug) lt_option_debug=1 ;;
14262+ --lt-dump-script)
14263+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14264+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14265+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14266+ cat \"\$lt_dump_D/\$lt_dump_F\"
14267+ exit 0
14268+ ;;
14269+ --lt-*)
14270+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14271+ exit 1
14272+ ;;
14273+ esac
14274+ done
14275+
14276+ # Print the debug banner immediately:
14277+ if test -n \"\$lt_option_debug\"; then
14278+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14279+ fi
14280+}
14281+
14282+# Used when --lt-debug. Prints its arguments to stdout
14283+# (redirection is the responsibility of the caller)
14284+func_lt_dump_args ()
14285+{
14286+ lt_dump_args_N=1;
14287+ for lt_arg
14288+ do
14289+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14290+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14291+ done
14292+}
14293+
14294+# Core function for launching the target application
14295+func_exec_program_core ()
14296+{
14297+"
14298+ case $host in
14299+ # Backslashes separate directories on plain windows
14300+ *-*-mingw | *-*-os2* | *-cegcc*)
14301+ $ECHO "\
14302+ if test -n \"\$lt_option_debug\"; then
14303+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14304+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14305+ fi
14306+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14307+"
14308+ ;;
14309+
14310+ *)
14311+ $ECHO "\
14312+ if test -n \"\$lt_option_debug\"; then
14313+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14314+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14315+ fi
14316+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14317+"
14318+ ;;
14319+ esac
14320+ $ECHO "\
14321+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14322+ exit 1
14323+}
14324+
14325+# A function to encapsulate launching the target application
14326+# Strips options in the --lt-* namespace from \$@ and
14327+# launches target application with the remaining arguments.
14328+func_exec_program ()
14329+{
14330+ for lt_wr_arg
14331+ do
14332+ case \$lt_wr_arg in
14333+ --lt-*) ;;
14334+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14335+ esac
14336+ shift
14337+ done
14338+ func_exec_program_core \${1+\"\$@\"}
14339+}
14340+
14341+ # Parse options
14342+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14343
14344 # Find the directory that this script lives in.
14345 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14346@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14347
14348 # relink executable if necessary
14349 if test -n \"\$relink_command\"; then
14350- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14351+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14352 else
14353 $ECHO \"\$relink_command_output\" >&2
14354 $RM \"\$progdir/\$file\"
14355@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14356
14357 if test -f \"\$progdir/\$program\"; then"
14358
14359+ # fixup the dll searchpath if we need to.
14360+ #
14361+ # Fix the DLL searchpath if we need to. Do this before prepending
14362+ # to shlibpath, because on Windows, both are PATH and uninstalled
14363+ # libraries must come first.
14364+ if test -n "$dllsearchpath"; then
14365+ $ECHO "\
14366+ # Add the dll search path components to the executable PATH
14367+ PATH=$dllsearchpath:\$PATH
14368+"
14369+ fi
14370+
14371 # Export our shlibpath_var if we have one.
14372 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14373 $ECHO "\
14374@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14375 "
14376 fi
14377
14378- # fixup the dll searchpath if we need to.
14379- if test -n "$dllsearchpath"; then
14380- $ECHO "\
14381- # Add the dll search path components to the executable PATH
14382- PATH=$dllsearchpath:\$PATH
14383-"
14384- fi
14385-
14386 $ECHO "\
14387 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14388 # Run the actual program with our arguments.
14389-"
14390- case $host in
14391- # Backslashes separate directories on plain windows
14392- *-*-mingw | *-*-os2* | *-cegcc*)
14393- $ECHO "\
14394- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14395-"
14396- ;;
14397-
14398- *)
14399- $ECHO "\
14400- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14401-"
14402- ;;
14403- esac
14404- $ECHO "\
14405- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14406- exit 1
14407+ func_exec_program \${1+\"\$@\"}
14408 fi
14409 else
14410 # The program doesn't exist.
14411@@ -3158,166 +4132,6 @@ fi\
14412 }
14413
14414
14415-# func_to_host_path arg
14416-#
14417-# Convert paths to host format when used with build tools.
14418-# Intended for use with "native" mingw (where libtool itself
14419-# is running under the msys shell), or in the following cross-
14420-# build environments:
14421-# $build $host
14422-# mingw (msys) mingw [e.g. native]
14423-# cygwin mingw
14424-# *nix + wine mingw
14425-# where wine is equipped with the `winepath' executable.
14426-# In the native mingw case, the (msys) shell automatically
14427-# converts paths for any non-msys applications it launches,
14428-# but that facility isn't available from inside the cwrapper.
14429-# Similar accommodations are necessary for $host mingw and
14430-# $build cygwin. Calling this function does no harm for other
14431-# $host/$build combinations not listed above.
14432-#
14433-# ARG is the path (on $build) that should be converted to
14434-# the proper representation for $host. The result is stored
14435-# in $func_to_host_path_result.
14436-func_to_host_path ()
14437-{
14438- func_to_host_path_result="$1"
14439- if test -n "$1"; then
14440- case $host in
14441- *mingw* )
14442- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14443- case $build in
14444- *mingw* ) # actually, msys
14445- # awkward: cmd appends spaces to result
14446- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14447- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14448- ;;
14449- *cygwin* )
14450- func_to_host_path_result=`cygpath -w "$1" |
14451- $SED -e "$lt_sed_naive_backslashify"`
14452- ;;
14453- * )
14454- # Unfortunately, winepath does not exit with a non-zero
14455- # error code, so we are forced to check the contents of
14456- # stdout. On the other hand, if the command is not
14457- # found, the shell will set an exit code of 127 and print
14458- # *an error message* to stdout. So we must check for both
14459- # error code of zero AND non-empty stdout, which explains
14460- # the odd construction:
14461- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14462- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14463- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14464- $SED -e "$lt_sed_naive_backslashify"`
14465- else
14466- # Allow warning below.
14467- func_to_host_path_result=
14468- fi
14469- ;;
14470- esac
14471- if test -z "$func_to_host_path_result" ; then
14472- func_error "Could not determine host path corresponding to"
14473- func_error " \`$1'"
14474- func_error "Continuing, but uninstalled executables may not work."
14475- # Fallback:
14476- func_to_host_path_result="$1"
14477- fi
14478- ;;
14479- esac
14480- fi
14481-}
14482-# end: func_to_host_path
14483-
14484-# func_to_host_pathlist arg
14485-#
14486-# Convert pathlists to host format when used with build tools.
14487-# See func_to_host_path(), above. This function supports the
14488-# following $build/$host combinations (but does no harm for
14489-# combinations not listed here):
14490-# $build $host
14491-# mingw (msys) mingw [e.g. native]
14492-# cygwin mingw
14493-# *nix + wine mingw
14494-#
14495-# Path separators are also converted from $build format to
14496-# $host format. If ARG begins or ends with a path separator
14497-# character, it is preserved (but converted to $host format)
14498-# on output.
14499-#
14500-# ARG is a pathlist (on $build) that should be converted to
14501-# the proper representation on $host. The result is stored
14502-# in $func_to_host_pathlist_result.
14503-func_to_host_pathlist ()
14504-{
14505- func_to_host_pathlist_result="$1"
14506- if test -n "$1"; then
14507- case $host in
14508- *mingw* )
14509- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14510- # Remove leading and trailing path separator characters from
14511- # ARG. msys behavior is inconsistent here, cygpath turns them
14512- # into '.;' and ';.', and winepath ignores them completely.
14513- func_stripname : : "$1"
14514- func_to_host_pathlist_tmp1=$func_stripname_result
14515- case $build in
14516- *mingw* ) # Actually, msys.
14517- # Awkward: cmd appends spaces to result.
14518- func_to_host_pathlist_result=`
14519- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14520- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14521- ;;
14522- *cygwin* )
14523- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14524- $SED -e "$lt_sed_naive_backslashify"`
14525- ;;
14526- * )
14527- # unfortunately, winepath doesn't convert pathlists
14528- func_to_host_pathlist_result=""
14529- func_to_host_pathlist_oldIFS=$IFS
14530- IFS=:
14531- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14532- IFS=$func_to_host_pathlist_oldIFS
14533- if test -n "$func_to_host_pathlist_f" ; then
14534- func_to_host_path "$func_to_host_pathlist_f"
14535- if test -n "$func_to_host_path_result" ; then
14536- if test -z "$func_to_host_pathlist_result" ; then
14537- func_to_host_pathlist_result="$func_to_host_path_result"
14538- else
14539- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14540- fi
14541- fi
14542- fi
14543- done
14544- IFS=$func_to_host_pathlist_oldIFS
14545- ;;
14546- esac
14547- if test -z "$func_to_host_pathlist_result"; then
14548- func_error "Could not determine the host path(s) corresponding to"
14549- func_error " \`$1'"
14550- func_error "Continuing, but uninstalled executables may not work."
14551- # Fallback. This may break if $1 contains DOS-style drive
14552- # specifications. The fix is not to complicate the expression
14553- # below, but for the user to provide a working wine installation
14554- # with winepath so that path translation in the cross-to-mingw
14555- # case works properly.
14556- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14557- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14558- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14559- fi
14560- # Now, add the leading and trailing path separators back
14561- case "$1" in
14562- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14563- ;;
14564- esac
14565- case "$1" in
14566- *: ) func_append func_to_host_pathlist_result ";"
14567- ;;
14568- esac
14569- ;;
14570- esac
14571- fi
14572-}
14573-# end: func_to_host_pathlist
14574-
14575 # func_emit_cwrapperexe_src
14576 # emit the source code for a wrapper executable on stdout
14577 # Must ONLY be called from within func_mode_link because
14578@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14579
14580 This wrapper executable should never be moved out of the build directory.
14581 If it is, it will not operate correctly.
14582-
14583- Currently, it simply execs the wrapper *script* "$SHELL $output",
14584- but could eventually absorb all of the scripts functionality and
14585- exec $objdir/$outputname directly.
14586 */
14587 EOF
14588 cat <<"EOF"
14589@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
14590 if (stale) { free ((void *) stale); stale = 0; } \
14591 } while (0)
14592
14593-#undef LTWRAPPER_DEBUGPRINTF
14594-#if defined LT_DEBUGWRAPPER
14595-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14596-static void
14597-ltwrapper_debugprintf (const char *fmt, ...)
14598-{
14599- va_list args;
14600- va_start (args, fmt);
14601- (void) vfprintf (stderr, fmt, args);
14602- va_end (args);
14603-}
14604+#if defined(LT_DEBUGWRAPPER)
14605+static int lt_debug = 1;
14606 #else
14607-# define LTWRAPPER_DEBUGPRINTF(args)
14608+static int lt_debug = 0;
14609 #endif
14610
14611-const char *program_name = NULL;
14612+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14613
14614 void *xmalloc (size_t num);
14615 char *xstrdup (const char *string);
14616@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
14617 int make_executable (const char *path);
14618 int check_executable (const char *path);
14619 char *strendzap (char *str, const char *pat);
14620-void lt_fatal (const char *message, ...);
14621+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14622+void lt_fatal (const char *file, int line, const char *message, ...);
14623+static const char *nonnull (const char *s);
14624+static const char *nonempty (const char *s);
14625 void lt_setenv (const char *name, const char *value);
14626 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14627 void lt_update_exe_path (const char *name, const char *value);
14628@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14629 EOF
14630
14631 cat <<EOF
14632-const char * MAGIC_EXE = "$magic_exe";
14633+volatile const char * MAGIC_EXE = "$magic_exe";
14634 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14635 EOF
14636
14637 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14638- func_to_host_pathlist "$temp_rpath"
14639+ func_to_host_path "$temp_rpath"
14640 cat <<EOF
14641-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14642+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14643 EOF
14644 else
14645 cat <<"EOF"
14646@@ -3513,10 +4317,10 @@ EOF
14647 fi
14648
14649 if test -n "$dllsearchpath"; then
14650- func_to_host_pathlist "$dllsearchpath:"
14651+ func_to_host_path "$dllsearchpath:"
14652 cat <<EOF
14653 const char * EXE_PATH_VARNAME = "PATH";
14654-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14655+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14656 EOF
14657 else
14658 cat <<"EOF"
14659@@ -3539,12 +4343,10 @@ EOF
14660 cat <<"EOF"
14661
14662 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14663-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14664
14665-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14666 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14667-
14668 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14669+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14670
14671 int
14672 main (int argc, char *argv[])
14673@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14674 int i;
14675
14676 program_name = (char *) xstrdup (base_name (argv[0]));
14677- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14678- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14679+ newargz = XMALLOC (char *, argc + 1);
14680
14681- /* very simple arg parsing; don't want to rely on getopt */
14682+ /* very simple arg parsing; don't want to rely on getopt
14683+ * also, copy all non cwrapper options to newargz, except
14684+ * argz[0], which is handled differently
14685+ */
14686+ newargc=0;
14687 for (i = 1; i < argc; i++)
14688 {
14689 if (strcmp (argv[i], dumpscript_opt) == 0)
14690@@ -3581,21 +4386,54 @@ EOF
14691 lt_dump_script (stdout);
14692 return 0;
14693 }
14694+ if (strcmp (argv[i], debug_opt) == 0)
14695+ {
14696+ lt_debug = 1;
14697+ continue;
14698+ }
14699+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14700+ {
14701+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14702+ namespace, but it is not one of the ones we know about and
14703+ have already dealt with, above (inluding dump-script), then
14704+ report an error. Otherwise, targets might begin to believe
14705+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14706+ namespace. The first time any user complains about this, we'll
14707+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14708+ or a configure.ac-settable value.
14709+ */
14710+ lt_fatal (__FILE__, __LINE__,
14711+ "unrecognized %s option: '%s'",
14712+ ltwrapper_option_prefix, argv[i]);
14713+ }
14714+ /* otherwise ... */
14715+ newargz[++newargc] = xstrdup (argv[i]);
14716 }
14717+ newargz[++newargc] = NULL;
14718+
14719+EOF
14720+ cat <<EOF
14721+ /* The GNU banner must be the first non-error debug message */
14722+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14723+EOF
14724+ cat <<"EOF"
14725+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14726+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14727
14728- newargz = XMALLOC (char *, argc + 1);
14729 tmp_pathspec = find_executable (argv[0]);
14730 if (tmp_pathspec == NULL)
14731- lt_fatal ("Couldn't find %s", argv[0]);
14732- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14733- tmp_pathspec));
14734+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14735+ lt_debugprintf (__FILE__, __LINE__,
14736+ "(main) found exe (before symlink chase) at: %s\n",
14737+ tmp_pathspec);
14738
14739 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14740- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14741- actual_cwrapper_path));
14742+ lt_debugprintf (__FILE__, __LINE__,
14743+ "(main) found exe (after symlink chase) at: %s\n",
14744+ actual_cwrapper_path);
14745 XFREE (tmp_pathspec);
14746
14747- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14748+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14749 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14750
14751 /* wrapper name transforms */
14752@@ -3613,8 +4451,9 @@ EOF
14753 target_name = tmp_pathspec;
14754 tmp_pathspec = 0;
14755
14756- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14757- target_name));
14758+ lt_debugprintf (__FILE__, __LINE__,
14759+ "(main) libtool target name: %s\n",
14760+ target_name);
14761 EOF
14762
14763 cat <<EOF
14764@@ -3664,35 +4503,19 @@ EOF
14765
14766 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14767 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14768- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14769+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14770+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14771+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14772+ libraries must come first. */
14773 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14774+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14775
14776- newargc=0;
14777- for (i = 1; i < argc; i++)
14778- {
14779- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14780- {
14781- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14782- namespace, but it is not one of the ones we know about and
14783- have already dealt with, above (inluding dump-script), then
14784- report an error. Otherwise, targets might begin to believe
14785- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14786- namespace. The first time any user complains about this, we'll
14787- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14788- or a configure.ac-settable value.
14789- */
14790- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14791- ltwrapper_option_prefix, argv[i]);
14792- }
14793- /* otherwise ... */
14794- newargz[++newargc] = xstrdup (argv[i]);
14795- }
14796- newargz[++newargc] = NULL;
14797-
14798- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14799+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14800+ nonnull (lt_argv_zero));
14801 for (i = 0; i < newargc; i++)
14802 {
14803- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14804+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14805+ i, nonnull (newargz[i]));
14806 }
14807
14808 EOF
14809@@ -3706,7 +4529,9 @@ EOF
14810 if (rval == -1)
14811 {
14812 /* failed to start process */
14813- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14814+ lt_debugprintf (__FILE__, __LINE__,
14815+ "(main) failed to launch target \"%s\": %s\n",
14816+ lt_argv_zero, nonnull (strerror (errno)));
14817 return 127;
14818 }
14819 return rval;
14820@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14821 {
14822 void *p = (void *) malloc (num);
14823 if (!p)
14824- lt_fatal ("Memory exhausted");
14825+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14826
14827 return p;
14828 }
14829@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14830 {
14831 struct stat st;
14832
14833- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14834- path ? (*path ? path : "EMPTY!") : "NULL!"));
14835+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14836+ nonempty (path));
14837 if ((!path) || (!*path))
14838 return 0;
14839
14840@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14841 int rval = 0;
14842 struct stat st;
14843
14844- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14845- path ? (*path ? path : "EMPTY!") : "NULL!"));
14846+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14847+ nonempty (path));
14848 if ((!path) || (!*path))
14849 return 0;
14850
14851@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14852 int tmp_len;
14853 char *concat_name;
14854
14855- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14856- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14857+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14858+ nonempty (wrapper));
14859
14860 if ((wrapper == NULL) || (*wrapper == '\0'))
14861 return NULL;
14862@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14863 {
14864 /* empty path: current directory */
14865 if (getcwd (tmp, LT_PATHMAX) == NULL)
14866- lt_fatal ("getcwd failed");
14867+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14868+ nonnull (strerror (errno)));
14869 tmp_len = strlen (tmp);
14870 concat_name =
14871 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14872@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14873 }
14874 /* Relative path | not found in path: prepend cwd */
14875 if (getcwd (tmp, LT_PATHMAX) == NULL)
14876- lt_fatal ("getcwd failed");
14877+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14878+ nonnull (strerror (errno)));
14879 tmp_len = strlen (tmp);
14880 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14881 memcpy (concat_name, tmp, tmp_len);
14882@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14883 int has_symlinks = 0;
14884 while (strlen (tmp_pathspec) && !has_symlinks)
14885 {
14886- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
14887- tmp_pathspec));
14888+ lt_debugprintf (__FILE__, __LINE__,
14889+ "checking path component for symlinks: %s\n",
14890+ tmp_pathspec);
14891 if (lstat (tmp_pathspec, &s) == 0)
14892 {
14893 if (S_ISLNK (s.st_mode) != 0)
14894@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
14895 }
14896 else
14897 {
14898- char *errstr = strerror (errno);
14899- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
14900+ lt_fatal (__FILE__, __LINE__,
14901+ "error accessing file \"%s\": %s",
14902+ tmp_pathspec, nonnull (strerror (errno)));
14903 }
14904 }
14905 XFREE (tmp_pathspec);
14906@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
14907 tmp_pathspec = realpath (pathspec, buf);
14908 if (tmp_pathspec == 0)
14909 {
14910- lt_fatal ("Could not follow symlinks for %s", pathspec);
14911+ lt_fatal (__FILE__, __LINE__,
14912+ "could not follow symlinks for %s", pathspec);
14913 }
14914 return xstrdup (tmp_pathspec);
14915 #endif
14916@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
14917 return str;
14918 }
14919
14920+void
14921+lt_debugprintf (const char *file, int line, const char *fmt, ...)
14922+{
14923+ va_list args;
14924+ if (lt_debug)
14925+ {
14926+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
14927+ va_start (args, fmt);
14928+ (void) vfprintf (stderr, fmt, args);
14929+ va_end (args);
14930+ }
14931+}
14932+
14933 static void
14934-lt_error_core (int exit_status, const char *mode,
14935+lt_error_core (int exit_status, const char *file,
14936+ int line, const char *mode,
14937 const char *message, va_list ap)
14938 {
14939- fprintf (stderr, "%s: %s: ", program_name, mode);
14940+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
14941 vfprintf (stderr, message, ap);
14942 fprintf (stderr, ".\n");
14943
14944@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
14945 }
14946
14947 void
14948-lt_fatal (const char *message, ...)
14949+lt_fatal (const char *file, int line, const char *message, ...)
14950 {
14951 va_list ap;
14952 va_start (ap, message);
14953- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
14954+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
14955 va_end (ap);
14956 }
14957
14958+static const char *
14959+nonnull (const char *s)
14960+{
14961+ return s ? s : "(null)";
14962+}
14963+
14964+static const char *
14965+nonempty (const char *s)
14966+{
14967+ return (s && !*s) ? "(empty)" : nonnull (s);
14968+}
14969+
14970 void
14971 lt_setenv (const char *name, const char *value)
14972 {
14973- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
14974- (name ? name : "<NULL>"),
14975- (value ? value : "<NULL>")));
14976+ lt_debugprintf (__FILE__, __LINE__,
14977+ "(lt_setenv) setting '%s' to '%s'\n",
14978+ nonnull (name), nonnull (value));
14979 {
14980 #ifdef HAVE_SETENV
14981 /* always make a copy, for consistency with !HAVE_SETENV */
14982@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
14983 void
14984 lt_update_exe_path (const char *name, const char *value)
14985 {
14986- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
14987- (name ? name : "<NULL>"),
14988- (value ? value : "<NULL>")));
14989+ lt_debugprintf (__FILE__, __LINE__,
14990+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
14991+ nonnull (name), nonnull (value));
14992
14993 if (name && *name && value && *value)
14994 {
14995@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
14996 void
14997 lt_update_lib_path (const char *name, const char *value)
14998 {
14999- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15000- (name ? name : "<NULL>"),
15001- (value ? value : "<NULL>")));
15002+ lt_debugprintf (__FILE__, __LINE__,
15003+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15004+ nonnull (name), nonnull (value));
15005
15006 if (name && *name && value && *value)
15007 {
15008@@ -4222,7 +5078,7 @@ EOF
15009 func_win32_import_lib_p ()
15010 {
15011 $opt_debug
15012- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15013+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15014 *import*) : ;;
15015 *) false ;;
15016 esac
15017@@ -4401,9 +5257,9 @@ func_mode_link ()
15018 ;;
15019 *)
15020 if test "$prev" = dlfiles; then
15021- dlfiles="$dlfiles $arg"
15022+ func_append dlfiles " $arg"
15023 else
15024- dlprefiles="$dlprefiles $arg"
15025+ func_append dlprefiles " $arg"
15026 fi
15027 prev=
15028 continue
15029@@ -4427,7 +5283,7 @@ func_mode_link ()
15030 *-*-darwin*)
15031 case "$deplibs " in
15032 *" $qarg.ltframework "*) ;;
15033- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15034+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15035 ;;
15036 esac
15037 ;;
15038@@ -4446,7 +5302,7 @@ func_mode_link ()
15039 moreargs=
15040 for fil in `cat "$save_arg"`
15041 do
15042-# moreargs="$moreargs $fil"
15043+# func_append moreargs " $fil"
15044 arg=$fil
15045 # A libtool-controlled object.
15046
15047@@ -4475,7 +5331,7 @@ func_mode_link ()
15048
15049 if test "$prev" = dlfiles; then
15050 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15051- dlfiles="$dlfiles $pic_object"
15052+ func_append dlfiles " $pic_object"
15053 prev=
15054 continue
15055 else
15056@@ -4487,7 +5343,7 @@ func_mode_link ()
15057 # CHECK ME: I think I busted this. -Ossama
15058 if test "$prev" = dlprefiles; then
15059 # Preload the old-style object.
15060- dlprefiles="$dlprefiles $pic_object"
15061+ func_append dlprefiles " $pic_object"
15062 prev=
15063 fi
15064
15065@@ -4557,12 +5413,12 @@ func_mode_link ()
15066 if test "$prev" = rpath; then
15067 case "$rpath " in
15068 *" $arg "*) ;;
15069- *) rpath="$rpath $arg" ;;
15070+ *) func_append rpath " $arg" ;;
15071 esac
15072 else
15073 case "$xrpath " in
15074 *" $arg "*) ;;
15075- *) xrpath="$xrpath $arg" ;;
15076+ *) func_append xrpath " $arg" ;;
15077 esac
15078 fi
15079 prev=
15080@@ -4574,28 +5430,28 @@ func_mode_link ()
15081 continue
15082 ;;
15083 weak)
15084- weak_libs="$weak_libs $arg"
15085+ func_append weak_libs " $arg"
15086 prev=
15087 continue
15088 ;;
15089 xcclinker)
15090- linker_flags="$linker_flags $qarg"
15091- compiler_flags="$compiler_flags $qarg"
15092+ func_append linker_flags " $qarg"
15093+ func_append compiler_flags " $qarg"
15094 prev=
15095 func_append compile_command " $qarg"
15096 func_append finalize_command " $qarg"
15097 continue
15098 ;;
15099 xcompiler)
15100- compiler_flags="$compiler_flags $qarg"
15101+ func_append compiler_flags " $qarg"
15102 prev=
15103 func_append compile_command " $qarg"
15104 func_append finalize_command " $qarg"
15105 continue
15106 ;;
15107 xlinker)
15108- linker_flags="$linker_flags $qarg"
15109- compiler_flags="$compiler_flags $wl$qarg"
15110+ func_append linker_flags " $qarg"
15111+ func_append compiler_flags " $wl$qarg"
15112 prev=
15113 func_append compile_command " $wl$qarg"
15114 func_append finalize_command " $wl$qarg"
15115@@ -4686,15 +5542,16 @@ func_mode_link ()
15116 ;;
15117
15118 -L*)
15119- func_stripname '-L' '' "$arg"
15120- dir=$func_stripname_result
15121- if test -z "$dir"; then
15122+ func_stripname "-L" '' "$arg"
15123+ if test -z "$func_stripname_result"; then
15124 if test "$#" -gt 0; then
15125 func_fatal_error "require no space between \`-L' and \`$1'"
15126 else
15127 func_fatal_error "need path for \`-L' option"
15128 fi
15129 fi
15130+ func_resolve_sysroot "$func_stripname_result"
15131+ dir=$func_resolve_sysroot_result
15132 # We need an absolute path.
15133 case $dir in
15134 [\\/]* | [A-Za-z]:[\\/]*) ;;
15135@@ -4706,10 +5563,16 @@ func_mode_link ()
15136 ;;
15137 esac
15138 case "$deplibs " in
15139- *" -L$dir "*) ;;
15140+ *" -L$dir "* | *" $arg "*)
15141+ # Will only happen for absolute or sysroot arguments
15142+ ;;
15143 *)
15144- deplibs="$deplibs -L$dir"
15145- lib_search_path="$lib_search_path $dir"
15146+ # Preserve sysroot, but never include relative directories
15147+ case $dir in
15148+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15149+ *) func_append deplibs " -L$dir" ;;
15150+ esac
15151+ func_append lib_search_path " $dir"
15152 ;;
15153 esac
15154 case $host in
15155@@ -4718,12 +5581,12 @@ func_mode_link ()
15156 case :$dllsearchpath: in
15157 *":$dir:"*) ;;
15158 ::) dllsearchpath=$dir;;
15159- *) dllsearchpath="$dllsearchpath:$dir";;
15160+ *) func_append dllsearchpath ":$dir";;
15161 esac
15162 case :$dllsearchpath: in
15163 *":$testbindir:"*) ;;
15164 ::) dllsearchpath=$testbindir;;
15165- *) dllsearchpath="$dllsearchpath:$testbindir";;
15166+ *) func_append dllsearchpath ":$testbindir";;
15167 esac
15168 ;;
15169 esac
15170@@ -4747,7 +5610,7 @@ func_mode_link ()
15171 ;;
15172 *-*-rhapsody* | *-*-darwin1.[012])
15173 # Rhapsody C and math libraries are in the System framework
15174- deplibs="$deplibs System.ltframework"
15175+ func_append deplibs " System.ltframework"
15176 continue
15177 ;;
15178 *-*-sco3.2v5* | *-*-sco5v6*)
15179@@ -4758,9 +5621,6 @@ func_mode_link ()
15180 # Compiler inserts libc in the correct place for threads to work
15181 test "X$arg" = "X-lc" && continue
15182 ;;
15183- *-*-linux*)
15184- test "X$arg" = "X-lc" && continue
15185- ;;
15186 esac
15187 elif test "X$arg" = "X-lc_r"; then
15188 case $host in
15189@@ -4770,7 +5630,7 @@ func_mode_link ()
15190 ;;
15191 esac
15192 fi
15193- deplibs="$deplibs $arg"
15194+ func_append deplibs " $arg"
15195 continue
15196 ;;
15197
15198@@ -4782,8 +5642,8 @@ func_mode_link ()
15199 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15200 # classes, name mangling, and exception handling.
15201 # Darwin uses the -arch flag to determine output architecture.
15202- -model|-arch|-isysroot)
15203- compiler_flags="$compiler_flags $arg"
15204+ -model|-arch|-isysroot|--sysroot)
15205+ func_append compiler_flags " $arg"
15206 func_append compile_command " $arg"
15207 func_append finalize_command " $arg"
15208 prev=xcompiler
15209@@ -4791,12 +5651,12 @@ func_mode_link ()
15210 ;;
15211
15212 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15213- compiler_flags="$compiler_flags $arg"
15214+ func_append compiler_flags " $arg"
15215 func_append compile_command " $arg"
15216 func_append finalize_command " $arg"
15217 case "$new_inherited_linker_flags " in
15218 *" $arg "*) ;;
15219- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15220+ * ) func_append new_inherited_linker_flags " $arg" ;;
15221 esac
15222 continue
15223 ;;
15224@@ -4863,13 +5723,17 @@ func_mode_link ()
15225 # We need an absolute path.
15226 case $dir in
15227 [\\/]* | [A-Za-z]:[\\/]*) ;;
15228+ =*)
15229+ func_stripname '=' '' "$dir"
15230+ dir=$lt_sysroot$func_stripname_result
15231+ ;;
15232 *)
15233 func_fatal_error "only absolute run-paths are allowed"
15234 ;;
15235 esac
15236 case "$xrpath " in
15237 *" $dir "*) ;;
15238- *) xrpath="$xrpath $dir" ;;
15239+ *) func_append xrpath " $dir" ;;
15240 esac
15241 continue
15242 ;;
15243@@ -4922,8 +5786,8 @@ func_mode_link ()
15244 for flag in $args; do
15245 IFS="$save_ifs"
15246 func_quote_for_eval "$flag"
15247- arg="$arg $func_quote_for_eval_result"
15248- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15249+ func_append arg " $func_quote_for_eval_result"
15250+ func_append compiler_flags " $func_quote_for_eval_result"
15251 done
15252 IFS="$save_ifs"
15253 func_stripname ' ' '' "$arg"
15254@@ -4938,9 +5802,9 @@ func_mode_link ()
15255 for flag in $args; do
15256 IFS="$save_ifs"
15257 func_quote_for_eval "$flag"
15258- arg="$arg $wl$func_quote_for_eval_result"
15259- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15260- linker_flags="$linker_flags $func_quote_for_eval_result"
15261+ func_append arg " $wl$func_quote_for_eval_result"
15262+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15263+ func_append linker_flags " $func_quote_for_eval_result"
15264 done
15265 IFS="$save_ifs"
15266 func_stripname ' ' '' "$arg"
15267@@ -4968,24 +5832,27 @@ func_mode_link ()
15268 arg="$func_quote_for_eval_result"
15269 ;;
15270
15271- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15272- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15273- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15274- # +DA*, +DD* enable 64-bit mode on the HP compiler
15275- # -q* pass through compiler args for the IBM compiler
15276- # -m*, -t[45]*, -txscale* pass through architecture-specific
15277- # compiler args for GCC
15278- # -F/path gives path to uninstalled frameworks, gcc on darwin
15279- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15280- # @file GCC response files
15281- # -tp=* Portland pgcc target processor selection
15282+ # Flags to be passed through unchanged, with rationale:
15283+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15284+ # -r[0-9][0-9]* specify processor for the SGI compiler
15285+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15286+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15287+ # -q* compiler args for the IBM compiler
15288+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15289+ # -F/path path to uninstalled frameworks, gcc on darwin
15290+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15291+ # @file GCC response files
15292+ # -tp=* Portland pgcc target processor selection
15293+ # --sysroot=* for sysroot support
15294+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15295 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15296- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15297+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15298+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15299 func_quote_for_eval "$arg"
15300 arg="$func_quote_for_eval_result"
15301 func_append compile_command " $arg"
15302 func_append finalize_command " $arg"
15303- compiler_flags="$compiler_flags $arg"
15304+ func_append compiler_flags " $arg"
15305 continue
15306 ;;
15307
15308@@ -4997,7 +5864,7 @@ func_mode_link ()
15309
15310 *.$objext)
15311 # A standard object.
15312- objs="$objs $arg"
15313+ func_append objs " $arg"
15314 ;;
15315
15316 *.lo)
15317@@ -5028,7 +5895,7 @@ func_mode_link ()
15318
15319 if test "$prev" = dlfiles; then
15320 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15321- dlfiles="$dlfiles $pic_object"
15322+ func_append dlfiles " $pic_object"
15323 prev=
15324 continue
15325 else
15326@@ -5040,7 +5907,7 @@ func_mode_link ()
15327 # CHECK ME: I think I busted this. -Ossama
15328 if test "$prev" = dlprefiles; then
15329 # Preload the old-style object.
15330- dlprefiles="$dlprefiles $pic_object"
15331+ func_append dlprefiles " $pic_object"
15332 prev=
15333 fi
15334
15335@@ -5085,24 +5952,25 @@ func_mode_link ()
15336
15337 *.$libext)
15338 # An archive.
15339- deplibs="$deplibs $arg"
15340- old_deplibs="$old_deplibs $arg"
15341+ func_append deplibs " $arg"
15342+ func_append old_deplibs " $arg"
15343 continue
15344 ;;
15345
15346 *.la)
15347 # A libtool-controlled library.
15348
15349+ func_resolve_sysroot "$arg"
15350 if test "$prev" = dlfiles; then
15351 # This library was specified with -dlopen.
15352- dlfiles="$dlfiles $arg"
15353+ func_append dlfiles " $func_resolve_sysroot_result"
15354 prev=
15355 elif test "$prev" = dlprefiles; then
15356 # The library was specified with -dlpreopen.
15357- dlprefiles="$dlprefiles $arg"
15358+ func_append dlprefiles " $func_resolve_sysroot_result"
15359 prev=
15360 else
15361- deplibs="$deplibs $arg"
15362+ func_append deplibs " $func_resolve_sysroot_result"
15363 fi
15364 continue
15365 ;;
15366@@ -5127,7 +5995,7 @@ func_mode_link ()
15367 func_fatal_help "the \`$prevarg' option requires an argument"
15368
15369 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15370- eval "arg=\"$export_dynamic_flag_spec\""
15371+ eval arg=\"$export_dynamic_flag_spec\"
15372 func_append compile_command " $arg"
15373 func_append finalize_command " $arg"
15374 fi
15375@@ -5144,11 +6012,13 @@ func_mode_link ()
15376 else
15377 shlib_search_path=
15378 fi
15379- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15380- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15381+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15382+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15383
15384 func_dirname "$output" "/" ""
15385 output_objdir="$func_dirname_result$objdir"
15386+ func_to_tool_file "$output_objdir/"
15387+ tool_output_objdir=$func_to_tool_file_result
15388 # Create the object directory.
15389 func_mkdir_p "$output_objdir"
15390
15391@@ -5169,12 +6039,12 @@ func_mode_link ()
15392 # Find all interdependent deplibs by searching for libraries
15393 # that are linked more than once (e.g. -la -lb -la)
15394 for deplib in $deplibs; do
15395- if $opt_duplicate_deps ; then
15396+ if $opt_preserve_dup_deps ; then
15397 case "$libs " in
15398- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15399+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15400 esac
15401 fi
15402- libs="$libs $deplib"
15403+ func_append libs " $deplib"
15404 done
15405
15406 if test "$linkmode" = lib; then
15407@@ -5187,9 +6057,9 @@ func_mode_link ()
15408 if $opt_duplicate_compiler_generated_deps; then
15409 for pre_post_dep in $predeps $postdeps; do
15410 case "$pre_post_deps " in
15411- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15412+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15413 esac
15414- pre_post_deps="$pre_post_deps $pre_post_dep"
15415+ func_append pre_post_deps " $pre_post_dep"
15416 done
15417 fi
15418 pre_post_deps=
15419@@ -5256,8 +6126,9 @@ func_mode_link ()
15420 for lib in $dlprefiles; do
15421 # Ignore non-libtool-libs
15422 dependency_libs=
15423+ func_resolve_sysroot "$lib"
15424 case $lib in
15425- *.la) func_source "$lib" ;;
15426+ *.la) func_source "$func_resolve_sysroot_result" ;;
15427 esac
15428
15429 # Collect preopened libtool deplibs, except any this library
15430@@ -5267,7 +6138,7 @@ func_mode_link ()
15431 deplib_base=$func_basename_result
15432 case " $weak_libs " in
15433 *" $deplib_base "*) ;;
15434- *) deplibs="$deplibs $deplib" ;;
15435+ *) func_append deplibs " $deplib" ;;
15436 esac
15437 done
15438 done
15439@@ -5288,11 +6159,11 @@ func_mode_link ()
15440 compile_deplibs="$deplib $compile_deplibs"
15441 finalize_deplibs="$deplib $finalize_deplibs"
15442 else
15443- compiler_flags="$compiler_flags $deplib"
15444+ func_append compiler_flags " $deplib"
15445 if test "$linkmode" = lib ; then
15446 case "$new_inherited_linker_flags " in
15447 *" $deplib "*) ;;
15448- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15449+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15450 esac
15451 fi
15452 fi
15453@@ -5377,7 +6248,7 @@ func_mode_link ()
15454 if test "$linkmode" = lib ; then
15455 case "$new_inherited_linker_flags " in
15456 *" $deplib "*) ;;
15457- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15458+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15459 esac
15460 fi
15461 fi
15462@@ -5390,7 +6261,8 @@ func_mode_link ()
15463 test "$pass" = conv && continue
15464 newdependency_libs="$deplib $newdependency_libs"
15465 func_stripname '-L' '' "$deplib"
15466- newlib_search_path="$newlib_search_path $func_stripname_result"
15467+ func_resolve_sysroot "$func_stripname_result"
15468+ func_append newlib_search_path " $func_resolve_sysroot_result"
15469 ;;
15470 prog)
15471 if test "$pass" = conv; then
15472@@ -5404,7 +6276,8 @@ func_mode_link ()
15473 finalize_deplibs="$deplib $finalize_deplibs"
15474 fi
15475 func_stripname '-L' '' "$deplib"
15476- newlib_search_path="$newlib_search_path $func_stripname_result"
15477+ func_resolve_sysroot "$func_stripname_result"
15478+ func_append newlib_search_path " $func_resolve_sysroot_result"
15479 ;;
15480 *)
15481 func_warning "\`-L' is ignored for archives/objects"
15482@@ -5415,17 +6288,21 @@ func_mode_link ()
15483 -R*)
15484 if test "$pass" = link; then
15485 func_stripname '-R' '' "$deplib"
15486- dir=$func_stripname_result
15487+ func_resolve_sysroot "$func_stripname_result"
15488+ dir=$func_resolve_sysroot_result
15489 # Make sure the xrpath contains only unique directories.
15490 case "$xrpath " in
15491 *" $dir "*) ;;
15492- *) xrpath="$xrpath $dir" ;;
15493+ *) func_append xrpath " $dir" ;;
15494 esac
15495 fi
15496 deplibs="$deplib $deplibs"
15497 continue
15498 ;;
15499- *.la) lib="$deplib" ;;
15500+ *.la)
15501+ func_resolve_sysroot "$deplib"
15502+ lib=$func_resolve_sysroot_result
15503+ ;;
15504 *.$libext)
15505 if test "$pass" = conv; then
15506 deplibs="$deplib $deplibs"
15507@@ -5488,11 +6365,11 @@ func_mode_link ()
15508 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15509 # If there is no dlopen support or we're linking statically,
15510 # we need to preload.
15511- newdlprefiles="$newdlprefiles $deplib"
15512+ func_append newdlprefiles " $deplib"
15513 compile_deplibs="$deplib $compile_deplibs"
15514 finalize_deplibs="$deplib $finalize_deplibs"
15515 else
15516- newdlfiles="$newdlfiles $deplib"
15517+ func_append newdlfiles " $deplib"
15518 fi
15519 fi
15520 continue
15521@@ -5538,7 +6415,7 @@ func_mode_link ()
15522 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15523 case " $new_inherited_linker_flags " in
15524 *" $tmp_inherited_linker_flag "*) ;;
15525- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15526+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15527 esac
15528 done
15529 fi
15530@@ -5546,8 +6423,8 @@ func_mode_link ()
15531 if test "$linkmode,$pass" = "lib,link" ||
15532 test "$linkmode,$pass" = "prog,scan" ||
15533 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15534- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15535- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15536+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15537+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15538 fi
15539
15540 if test "$pass" = conv; then
15541@@ -5558,20 +6435,20 @@ func_mode_link ()
15542 func_fatal_error "cannot find name of link library for \`$lib'"
15543 fi
15544 # It is a libtool convenience library, so add in its objects.
15545- convenience="$convenience $ladir/$objdir/$old_library"
15546- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15547+ func_append convenience " $ladir/$objdir/$old_library"
15548+ func_append old_convenience " $ladir/$objdir/$old_library"
15549 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15550 func_fatal_error "\`$lib' is not a convenience library"
15551 fi
15552 tmp_libs=
15553 for deplib in $dependency_libs; do
15554 deplibs="$deplib $deplibs"
15555- if $opt_duplicate_deps ; then
15556+ if $opt_preserve_dup_deps ; then
15557 case "$tmp_libs " in
15558- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15559+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15560 esac
15561 fi
15562- tmp_libs="$tmp_libs $deplib"
15563+ func_append tmp_libs " $deplib"
15564 done
15565 continue
15566 fi # $pass = conv
15567@@ -5579,9 +6456,15 @@ func_mode_link ()
15568
15569 # Get the name of the library we link against.
15570 linklib=
15571- for l in $old_library $library_names; do
15572- linklib="$l"
15573- done
15574+ if test -n "$old_library" &&
15575+ { test "$prefer_static_libs" = yes ||
15576+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15577+ linklib=$old_library
15578+ else
15579+ for l in $old_library $library_names; do
15580+ linklib="$l"
15581+ done
15582+ fi
15583 if test -z "$linklib"; then
15584 func_fatal_error "cannot find name of link library for \`$lib'"
15585 fi
15586@@ -5598,9 +6481,9 @@ func_mode_link ()
15587 # statically, we need to preload. We also need to preload any
15588 # dependent libraries so libltdl's deplib preloader doesn't
15589 # bomb out in the load deplibs phase.
15590- dlprefiles="$dlprefiles $lib $dependency_libs"
15591+ func_append dlprefiles " $lib $dependency_libs"
15592 else
15593- newdlfiles="$newdlfiles $lib"
15594+ func_append newdlfiles " $lib"
15595 fi
15596 continue
15597 fi # $pass = dlopen
15598@@ -5622,14 +6505,14 @@ func_mode_link ()
15599
15600 # Find the relevant object directory and library name.
15601 if test "X$installed" = Xyes; then
15602- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15603+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15604 func_warning "library \`$lib' was moved."
15605 dir="$ladir"
15606 absdir="$abs_ladir"
15607 libdir="$abs_ladir"
15608 else
15609- dir="$libdir"
15610- absdir="$libdir"
15611+ dir="$lt_sysroot$libdir"
15612+ absdir="$lt_sysroot$libdir"
15613 fi
15614 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15615 else
15616@@ -5637,12 +6520,12 @@ func_mode_link ()
15617 dir="$ladir"
15618 absdir="$abs_ladir"
15619 # Remove this search path later
15620- notinst_path="$notinst_path $abs_ladir"
15621+ func_append notinst_path " $abs_ladir"
15622 else
15623 dir="$ladir/$objdir"
15624 absdir="$abs_ladir/$objdir"
15625 # Remove this search path later
15626- notinst_path="$notinst_path $abs_ladir"
15627+ func_append notinst_path " $abs_ladir"
15628 fi
15629 fi # $installed = yes
15630 func_stripname 'lib' '.la' "$laname"
15631@@ -5653,20 +6536,46 @@ func_mode_link ()
15632 if test -z "$libdir" && test "$linkmode" = prog; then
15633 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15634 fi
15635- # Prefer using a static library (so that no silly _DYNAMIC symbols
15636- # are required to link).
15637- if test -n "$old_library"; then
15638- newdlprefiles="$newdlprefiles $dir/$old_library"
15639- # Keep a list of preopened convenience libraries to check
15640- # that they are being used correctly in the link pass.
15641- test -z "$libdir" && \
15642- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15643- # Otherwise, use the dlname, so that lt_dlopen finds it.
15644- elif test -n "$dlname"; then
15645- newdlprefiles="$newdlprefiles $dir/$dlname"
15646- else
15647- newdlprefiles="$newdlprefiles $dir/$linklib"
15648- fi
15649+ case "$host" in
15650+ # special handling for platforms with PE-DLLs.
15651+ *cygwin* | *mingw* | *cegcc* )
15652+ # Linker will automatically link against shared library if both
15653+ # static and shared are present. Therefore, ensure we extract
15654+ # symbols from the import library if a shared library is present
15655+ # (otherwise, the dlopen module name will be incorrect). We do
15656+ # this by putting the import library name into $newdlprefiles.
15657+ # We recover the dlopen module name by 'saving' the la file
15658+ # name in a special purpose variable, and (later) extracting the
15659+ # dlname from the la file.
15660+ if test -n "$dlname"; then
15661+ func_tr_sh "$dir/$linklib"
15662+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15663+ func_append newdlprefiles " $dir/$linklib"
15664+ else
15665+ func_append newdlprefiles " $dir/$old_library"
15666+ # Keep a list of preopened convenience libraries to check
15667+ # that they are being used correctly in the link pass.
15668+ test -z "$libdir" && \
15669+ func_append dlpreconveniencelibs " $dir/$old_library"
15670+ fi
15671+ ;;
15672+ * )
15673+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15674+ # are required to link).
15675+ if test -n "$old_library"; then
15676+ func_append newdlprefiles " $dir/$old_library"
15677+ # Keep a list of preopened convenience libraries to check
15678+ # that they are being used correctly in the link pass.
15679+ test -z "$libdir" && \
15680+ func_append dlpreconveniencelibs " $dir/$old_library"
15681+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15682+ elif test -n "$dlname"; then
15683+ func_append newdlprefiles " $dir/$dlname"
15684+ else
15685+ func_append newdlprefiles " $dir/$linklib"
15686+ fi
15687+ ;;
15688+ esac
15689 fi # $pass = dlpreopen
15690
15691 if test -z "$libdir"; then
15692@@ -5684,7 +6593,7 @@ func_mode_link ()
15693
15694
15695 if test "$linkmode" = prog && test "$pass" != link; then
15696- newlib_search_path="$newlib_search_path $ladir"
15697+ func_append newlib_search_path " $ladir"
15698 deplibs="$lib $deplibs"
15699
15700 linkalldeplibs=no
15701@@ -5697,7 +6606,8 @@ func_mode_link ()
15702 for deplib in $dependency_libs; do
15703 case $deplib in
15704 -L*) func_stripname '-L' '' "$deplib"
15705- newlib_search_path="$newlib_search_path $func_stripname_result"
15706+ func_resolve_sysroot "$func_stripname_result"
15707+ func_append newlib_search_path " $func_resolve_sysroot_result"
15708 ;;
15709 esac
15710 # Need to link against all dependency_libs?
15711@@ -5708,12 +6618,12 @@ func_mode_link ()
15712 # or/and link against static libraries
15713 newdependency_libs="$deplib $newdependency_libs"
15714 fi
15715- if $opt_duplicate_deps ; then
15716+ if $opt_preserve_dup_deps ; then
15717 case "$tmp_libs " in
15718- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15719+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15720 esac
15721 fi
15722- tmp_libs="$tmp_libs $deplib"
15723+ func_append tmp_libs " $deplib"
15724 done # for deplib
15725 continue
15726 fi # $linkmode = prog...
15727@@ -5728,7 +6638,7 @@ func_mode_link ()
15728 # Make sure the rpath contains only unique directories.
15729 case "$temp_rpath:" in
15730 *"$absdir:"*) ;;
15731- *) temp_rpath="$temp_rpath$absdir:" ;;
15732+ *) func_append temp_rpath "$absdir:" ;;
15733 esac
15734 fi
15735
15736@@ -5740,7 +6650,7 @@ func_mode_link ()
15737 *)
15738 case "$compile_rpath " in
15739 *" $absdir "*) ;;
15740- *) compile_rpath="$compile_rpath $absdir"
15741+ *) func_append compile_rpath " $absdir" ;;
15742 esac
15743 ;;
15744 esac
15745@@ -5749,7 +6659,7 @@ func_mode_link ()
15746 *)
15747 case "$finalize_rpath " in
15748 *" $libdir "*) ;;
15749- *) finalize_rpath="$finalize_rpath $libdir"
15750+ *) func_append finalize_rpath " $libdir" ;;
15751 esac
15752 ;;
15753 esac
15754@@ -5774,12 +6684,12 @@ func_mode_link ()
15755 case $host in
15756 *cygwin* | *mingw* | *cegcc*)
15757 # No point in relinking DLLs because paths are not encoded
15758- notinst_deplibs="$notinst_deplibs $lib"
15759+ func_append notinst_deplibs " $lib"
15760 need_relink=no
15761 ;;
15762 *)
15763 if test "$installed" = no; then
15764- notinst_deplibs="$notinst_deplibs $lib"
15765+ func_append notinst_deplibs " $lib"
15766 need_relink=yes
15767 fi
15768 ;;
15769@@ -5814,7 +6724,7 @@ func_mode_link ()
15770 *)
15771 case "$compile_rpath " in
15772 *" $absdir "*) ;;
15773- *) compile_rpath="$compile_rpath $absdir"
15774+ *) func_append compile_rpath " $absdir" ;;
15775 esac
15776 ;;
15777 esac
15778@@ -5823,7 +6733,7 @@ func_mode_link ()
15779 *)
15780 case "$finalize_rpath " in
15781 *" $libdir "*) ;;
15782- *) finalize_rpath="$finalize_rpath $libdir"
15783+ *) func_append finalize_rpath " $libdir" ;;
15784 esac
15785 ;;
15786 esac
15787@@ -5835,7 +6745,7 @@ func_mode_link ()
15788 shift
15789 realname="$1"
15790 shift
15791- eval "libname=\"$libname_spec\""
15792+ libname=`eval "\\$ECHO \"$libname_spec\""`
15793 # use dlname if we got it. it's perfectly good, no?
15794 if test -n "$dlname"; then
15795 soname="$dlname"
15796@@ -5848,7 +6758,7 @@ func_mode_link ()
15797 versuffix="-$major"
15798 ;;
15799 esac
15800- eval "soname=\"$soname_spec\""
15801+ eval soname=\"$soname_spec\"
15802 else
15803 soname="$realname"
15804 fi
15805@@ -5877,7 +6787,7 @@ func_mode_link ()
15806 linklib=$newlib
15807 fi # test -n "$old_archive_from_expsyms_cmds"
15808
15809- if test "$linkmode" = prog || test "$mode" != relink; then
15810+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15811 add_shlibpath=
15812 add_dir=
15813 add=
15814@@ -5933,7 +6843,7 @@ func_mode_link ()
15815 if test -n "$inst_prefix_dir"; then
15816 case $libdir in
15817 [\\/]*)
15818- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15819+ func_append add_dir " -L$inst_prefix_dir$libdir"
15820 ;;
15821 esac
15822 fi
15823@@ -5955,7 +6865,7 @@ func_mode_link ()
15824 if test -n "$add_shlibpath"; then
15825 case :$compile_shlibpath: in
15826 *":$add_shlibpath:"*) ;;
15827- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15828+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15829 esac
15830 fi
15831 if test "$linkmode" = prog; then
15832@@ -5969,13 +6879,13 @@ func_mode_link ()
15833 test "$hardcode_shlibpath_var" = yes; then
15834 case :$finalize_shlibpath: in
15835 *":$libdir:"*) ;;
15836- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15837+ *) func_append finalize_shlibpath "$libdir:" ;;
15838 esac
15839 fi
15840 fi
15841 fi
15842
15843- if test "$linkmode" = prog || test "$mode" = relink; then
15844+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15845 add_shlibpath=
15846 add_dir=
15847 add=
15848@@ -5989,7 +6899,7 @@ func_mode_link ()
15849 elif test "$hardcode_shlibpath_var" = yes; then
15850 case :$finalize_shlibpath: in
15851 *":$libdir:"*) ;;
15852- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15853+ *) func_append finalize_shlibpath "$libdir:" ;;
15854 esac
15855 add="-l$name"
15856 elif test "$hardcode_automatic" = yes; then
15857@@ -6001,12 +6911,12 @@ func_mode_link ()
15858 fi
15859 else
15860 # We cannot seem to hardcode it, guess we'll fake it.
15861- add_dir="-L$libdir"
15862+ add_dir="-L$lt_sysroot$libdir"
15863 # Try looking first in the location we're being installed to.
15864 if test -n "$inst_prefix_dir"; then
15865 case $libdir in
15866 [\\/]*)
15867- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15868+ func_append add_dir " -L$inst_prefix_dir$libdir"
15869 ;;
15870 esac
15871 fi
15872@@ -6083,27 +6993,33 @@ func_mode_link ()
15873 temp_xrpath=$func_stripname_result
15874 case " $xrpath " in
15875 *" $temp_xrpath "*) ;;
15876- *) xrpath="$xrpath $temp_xrpath";;
15877+ *) func_append xrpath " $temp_xrpath";;
15878 esac;;
15879- *) temp_deplibs="$temp_deplibs $libdir";;
15880+ *) func_append temp_deplibs " $libdir";;
15881 esac
15882 done
15883 dependency_libs="$temp_deplibs"
15884 fi
15885
15886- newlib_search_path="$newlib_search_path $absdir"
15887+ func_append newlib_search_path " $absdir"
15888 # Link against this library
15889 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
15890 # ... and its dependency_libs
15891 tmp_libs=
15892 for deplib in $dependency_libs; do
15893 newdependency_libs="$deplib $newdependency_libs"
15894- if $opt_duplicate_deps ; then
15895+ case $deplib in
15896+ -L*) func_stripname '-L' '' "$deplib"
15897+ func_resolve_sysroot "$func_stripname_result";;
15898+ *) func_resolve_sysroot "$deplib" ;;
15899+ esac
15900+ if $opt_preserve_dup_deps ; then
15901 case "$tmp_libs " in
15902- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15903+ *" $func_resolve_sysroot_result "*)
15904+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
15905 esac
15906 fi
15907- tmp_libs="$tmp_libs $deplib"
15908+ func_append tmp_libs " $func_resolve_sysroot_result"
15909 done
15910
15911 if test "$link_all_deplibs" != no; then
15912@@ -6113,8 +7029,10 @@ func_mode_link ()
15913 case $deplib in
15914 -L*) path="$deplib" ;;
15915 *.la)
15916+ func_resolve_sysroot "$deplib"
15917+ deplib=$func_resolve_sysroot_result
15918 func_dirname "$deplib" "" "."
15919- dir="$func_dirname_result"
15920+ dir=$func_dirname_result
15921 # We need an absolute path.
15922 case $dir in
15923 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
15924@@ -6130,7 +7048,7 @@ func_mode_link ()
15925 case $host in
15926 *-*-darwin*)
15927 depdepl=
15928- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15929+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15930 if test -n "$deplibrary_names" ; then
15931 for tmp in $deplibrary_names ; do
15932 depdepl=$tmp
15933@@ -6141,8 +7059,8 @@ func_mode_link ()
15934 if test -z "$darwin_install_name"; then
15935 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
15936 fi
15937- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15938- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
15939+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15940+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
15941 path=
15942 fi
15943 fi
15944@@ -6152,7 +7070,7 @@ func_mode_link ()
15945 ;;
15946 esac
15947 else
15948- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15949+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15950 test -z "$libdir" && \
15951 func_fatal_error "\`$deplib' is not a valid libtool archive"
15952 test "$absdir" != "$libdir" && \
15953@@ -6192,7 +7110,7 @@ func_mode_link ()
15954 for dir in $newlib_search_path; do
15955 case "$lib_search_path " in
15956 *" $dir "*) ;;
15957- *) lib_search_path="$lib_search_path $dir" ;;
15958+ *) func_append lib_search_path " $dir" ;;
15959 esac
15960 done
15961 newlib_search_path=
15962@@ -6205,7 +7123,7 @@ func_mode_link ()
15963 fi
15964 for var in $vars dependency_libs; do
15965 # Add libraries to $var in reverse order
15966- eval tmp_libs=\$$var
15967+ eval tmp_libs=\"\$$var\"
15968 new_libs=
15969 for deplib in $tmp_libs; do
15970 # FIXME: Pedantically, this is the right thing to do, so
15971@@ -6250,13 +7168,13 @@ func_mode_link ()
15972 -L*)
15973 case " $tmp_libs " in
15974 *" $deplib "*) ;;
15975- *) tmp_libs="$tmp_libs $deplib" ;;
15976+ *) func_append tmp_libs " $deplib" ;;
15977 esac
15978 ;;
15979- *) tmp_libs="$tmp_libs $deplib" ;;
15980+ *) func_append tmp_libs " $deplib" ;;
15981 esac
15982 done
15983- eval $var=\$tmp_libs
15984+ eval $var=\"$tmp_libs\"
15985 done # for var
15986 fi
15987 # Last step: remove runtime libs from dependency_libs
15988@@ -6269,7 +7187,7 @@ func_mode_link ()
15989 ;;
15990 esac
15991 if test -n "$i" ; then
15992- tmp_libs="$tmp_libs $i"
15993+ func_append tmp_libs " $i"
15994 fi
15995 done
15996 dependency_libs=$tmp_libs
15997@@ -6310,7 +7228,7 @@ func_mode_link ()
15998 # Now set the variables for building old libraries.
15999 build_libtool_libs=no
16000 oldlibs="$output"
16001- objs="$objs$old_deplibs"
16002+ func_append objs "$old_deplibs"
16003 ;;
16004
16005 lib)
16006@@ -6319,8 +7237,8 @@ func_mode_link ()
16007 lib*)
16008 func_stripname 'lib' '.la' "$outputname"
16009 name=$func_stripname_result
16010- eval "shared_ext=\"$shrext_cmds\""
16011- eval "libname=\"$libname_spec\""
16012+ eval shared_ext=\"$shrext_cmds\"
16013+ eval libname=\"$libname_spec\"
16014 ;;
16015 *)
16016 test "$module" = no && \
16017@@ -6330,8 +7248,8 @@ func_mode_link ()
16018 # Add the "lib" prefix for modules if required
16019 func_stripname '' '.la' "$outputname"
16020 name=$func_stripname_result
16021- eval "shared_ext=\"$shrext_cmds\""
16022- eval "libname=\"$libname_spec\""
16023+ eval shared_ext=\"$shrext_cmds\"
16024+ eval libname=\"$libname_spec\"
16025 else
16026 func_stripname '' '.la' "$outputname"
16027 libname=$func_stripname_result
16028@@ -6346,7 +7264,7 @@ func_mode_link ()
16029 echo
16030 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16031 $ECHO "*** objects $objs is not portable!"
16032- libobjs="$libobjs $objs"
16033+ func_append libobjs " $objs"
16034 fi
16035 fi
16036
16037@@ -6544,7 +7462,7 @@ func_mode_link ()
16038 done
16039
16040 # Make executables depend on our current version.
16041- verstring="$verstring:${current}.0"
16042+ func_append verstring ":${current}.0"
16043 ;;
16044
16045 qnx)
16046@@ -6612,10 +7530,10 @@ func_mode_link ()
16047 fi
16048
16049 func_generate_dlsyms "$libname" "$libname" "yes"
16050- libobjs="$libobjs $symfileobj"
16051+ func_append libobjs " $symfileobj"
16052 test "X$libobjs" = "X " && libobjs=
16053
16054- if test "$mode" != relink; then
16055+ if test "$opt_mode" != relink; then
16056 # Remove our outputs, but don't remove object files since they
16057 # may have been created when compiling PIC objects.
16058 removelist=
16059@@ -6631,7 +7549,7 @@ func_mode_link ()
16060 continue
16061 fi
16062 fi
16063- removelist="$removelist $p"
16064+ func_append removelist " $p"
16065 ;;
16066 *) ;;
16067 esac
16068@@ -6642,7 +7560,7 @@ func_mode_link ()
16069
16070 # Now set the variables for building old libraries.
16071 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16072- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16073+ func_append oldlibs " $output_objdir/$libname.$libext"
16074
16075 # Transform .lo files to .o files.
16076 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16077@@ -6659,10 +7577,11 @@ func_mode_link ()
16078 # If the user specified any rpath flags, then add them.
16079 temp_xrpath=
16080 for libdir in $xrpath; do
16081- temp_xrpath="$temp_xrpath -R$libdir"
16082+ func_replace_sysroot "$libdir"
16083+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16084 case "$finalize_rpath " in
16085 *" $libdir "*) ;;
16086- *) finalize_rpath="$finalize_rpath $libdir" ;;
16087+ *) func_append finalize_rpath " $libdir" ;;
16088 esac
16089 done
16090 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16091@@ -6676,7 +7595,7 @@ func_mode_link ()
16092 for lib in $old_dlfiles; do
16093 case " $dlprefiles $dlfiles " in
16094 *" $lib "*) ;;
16095- *) dlfiles="$dlfiles $lib" ;;
16096+ *) func_append dlfiles " $lib" ;;
16097 esac
16098 done
16099
16100@@ -6686,7 +7605,7 @@ func_mode_link ()
16101 for lib in $old_dlprefiles; do
16102 case "$dlprefiles " in
16103 *" $lib "*) ;;
16104- *) dlprefiles="$dlprefiles $lib" ;;
16105+ *) func_append dlprefiles " $lib" ;;
16106 esac
16107 done
16108
16109@@ -6698,7 +7617,7 @@ func_mode_link ()
16110 ;;
16111 *-*-rhapsody* | *-*-darwin1.[012])
16112 # Rhapsody C library is in the System framework
16113- deplibs="$deplibs System.ltframework"
16114+ func_append deplibs " System.ltframework"
16115 ;;
16116 *-*-netbsd*)
16117 # Don't link with libc until the a.out ld.so is fixed.
16118@@ -6715,7 +7634,7 @@ func_mode_link ()
16119 *)
16120 # Add libc to deplibs on all other systems if necessary.
16121 if test "$build_libtool_need_lc" = "yes"; then
16122- deplibs="$deplibs -lc"
16123+ func_append deplibs " -lc"
16124 fi
16125 ;;
16126 esac
16127@@ -6764,18 +7683,18 @@ EOF
16128 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16129 case " $predeps $postdeps " in
16130 *" $i "*)
16131- newdeplibs="$newdeplibs $i"
16132+ func_append newdeplibs " $i"
16133 i=""
16134 ;;
16135 esac
16136 fi
16137 if test -n "$i" ; then
16138- eval "libname=\"$libname_spec\""
16139- eval "deplib_matches=\"$library_names_spec\""
16140+ libname=`eval "\\$ECHO \"$libname_spec\""`
16141+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16142 set dummy $deplib_matches; shift
16143 deplib_match=$1
16144 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16145- newdeplibs="$newdeplibs $i"
16146+ func_append newdeplibs " $i"
16147 else
16148 droppeddeps=yes
16149 echo
16150@@ -6789,7 +7708,7 @@ EOF
16151 fi
16152 ;;
16153 *)
16154- newdeplibs="$newdeplibs $i"
16155+ func_append newdeplibs " $i"
16156 ;;
16157 esac
16158 done
16159@@ -6807,18 +7726,18 @@ EOF
16160 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16161 case " $predeps $postdeps " in
16162 *" $i "*)
16163- newdeplibs="$newdeplibs $i"
16164+ func_append newdeplibs " $i"
16165 i=""
16166 ;;
16167 esac
16168 fi
16169 if test -n "$i" ; then
16170- eval "libname=\"$libname_spec\""
16171- eval "deplib_matches=\"$library_names_spec\""
16172+ libname=`eval "\\$ECHO \"$libname_spec\""`
16173+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16174 set dummy $deplib_matches; shift
16175 deplib_match=$1
16176 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16177- newdeplibs="$newdeplibs $i"
16178+ func_append newdeplibs " $i"
16179 else
16180 droppeddeps=yes
16181 echo
16182@@ -6840,7 +7759,7 @@ EOF
16183 fi
16184 ;;
16185 *)
16186- newdeplibs="$newdeplibs $i"
16187+ func_append newdeplibs " $i"
16188 ;;
16189 esac
16190 done
16191@@ -6857,15 +7776,27 @@ EOF
16192 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16193 case " $predeps $postdeps " in
16194 *" $a_deplib "*)
16195- newdeplibs="$newdeplibs $a_deplib"
16196+ func_append newdeplibs " $a_deplib"
16197 a_deplib=""
16198 ;;
16199 esac
16200 fi
16201 if test -n "$a_deplib" ; then
16202- eval "libname=\"$libname_spec\""
16203+ libname=`eval "\\$ECHO \"$libname_spec\""`
16204+ if test -n "$file_magic_glob"; then
16205+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16206+ else
16207+ libnameglob=$libname
16208+ fi
16209+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16210 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16211- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16212+ if test "$want_nocaseglob" = yes; then
16213+ shopt -s nocaseglob
16214+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16215+ $nocaseglob
16216+ else
16217+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16218+ fi
16219 for potent_lib in $potential_libs; do
16220 # Follow soft links.
16221 if ls -lLd "$potent_lib" 2>/dev/null |
16222@@ -6885,10 +7816,10 @@ EOF
16223 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16224 esac
16225 done
16226- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16227+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16228 $SED -e 10q |
16229 $EGREP "$file_magic_regex" > /dev/null; then
16230- newdeplibs="$newdeplibs $a_deplib"
16231+ func_append newdeplibs " $a_deplib"
16232 a_deplib=""
16233 break 2
16234 fi
16235@@ -6913,7 +7844,7 @@ EOF
16236 ;;
16237 *)
16238 # Add a -L argument.
16239- newdeplibs="$newdeplibs $a_deplib"
16240+ func_append newdeplibs " $a_deplib"
16241 ;;
16242 esac
16243 done # Gone through all deplibs.
16244@@ -6929,20 +7860,20 @@ EOF
16245 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16246 case " $predeps $postdeps " in
16247 *" $a_deplib "*)
16248- newdeplibs="$newdeplibs $a_deplib"
16249+ func_append newdeplibs " $a_deplib"
16250 a_deplib=""
16251 ;;
16252 esac
16253 fi
16254 if test -n "$a_deplib" ; then
16255- eval "libname=\"$libname_spec\""
16256+ libname=`eval "\\$ECHO \"$libname_spec\""`
16257 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16258 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16259 for potent_lib in $potential_libs; do
16260 potlib="$potent_lib" # see symlink-check above in file_magic test
16261 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16262 $EGREP "$match_pattern_regex" > /dev/null; then
16263- newdeplibs="$newdeplibs $a_deplib"
16264+ func_append newdeplibs " $a_deplib"
16265 a_deplib=""
16266 break 2
16267 fi
16268@@ -6967,7 +7898,7 @@ EOF
16269 ;;
16270 *)
16271 # Add a -L argument.
16272- newdeplibs="$newdeplibs $a_deplib"
16273+ func_append newdeplibs " $a_deplib"
16274 ;;
16275 esac
16276 done # Gone through all deplibs.
16277@@ -7071,7 +8002,7 @@ EOF
16278 *)
16279 case " $deplibs " in
16280 *" -L$path/$objdir "*)
16281- new_libs="$new_libs -L$path/$objdir" ;;
16282+ func_append new_libs " -L$path/$objdir" ;;
16283 esac
16284 ;;
16285 esac
16286@@ -7081,10 +8012,10 @@ EOF
16287 -L*)
16288 case " $new_libs " in
16289 *" $deplib "*) ;;
16290- *) new_libs="$new_libs $deplib" ;;
16291+ *) func_append new_libs " $deplib" ;;
16292 esac
16293 ;;
16294- *) new_libs="$new_libs $deplib" ;;
16295+ *) func_append new_libs " $deplib" ;;
16296 esac
16297 done
16298 deplibs="$new_libs"
16299@@ -7101,10 +8032,12 @@ EOF
16300 hardcode_libdirs=
16301 dep_rpath=
16302 rpath="$finalize_rpath"
16303- test "$mode" != relink && rpath="$compile_rpath$rpath"
16304+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16305 for libdir in $rpath; do
16306 if test -n "$hardcode_libdir_flag_spec"; then
16307 if test -n "$hardcode_libdir_separator"; then
16308+ func_replace_sysroot "$libdir"
16309+ libdir=$func_replace_sysroot_result
16310 if test -z "$hardcode_libdirs"; then
16311 hardcode_libdirs="$libdir"
16312 else
16313@@ -7113,18 +8046,18 @@ EOF
16314 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16315 ;;
16316 *)
16317- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16318+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16319 ;;
16320 esac
16321 fi
16322 else
16323- eval "flag=\"$hardcode_libdir_flag_spec\""
16324- dep_rpath="$dep_rpath $flag"
16325+ eval flag=\"$hardcode_libdir_flag_spec\"
16326+ func_append dep_rpath " $flag"
16327 fi
16328 elif test -n "$runpath_var"; then
16329 case "$perm_rpath " in
16330 *" $libdir "*) ;;
16331- *) perm_rpath="$perm_rpath $libdir" ;;
16332+ *) func_apped perm_rpath " $libdir" ;;
16333 esac
16334 fi
16335 done
16336@@ -7133,40 +8066,38 @@ EOF
16337 test -n "$hardcode_libdirs"; then
16338 libdir="$hardcode_libdirs"
16339 if test -n "$hardcode_libdir_flag_spec_ld"; then
16340- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16341+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16342 else
16343- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16344+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16345 fi
16346 fi
16347 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16348 # We should set the runpath_var.
16349 rpath=
16350 for dir in $perm_rpath; do
16351- rpath="$rpath$dir:"
16352+ func_append rpath "$dir:"
16353 done
16354- eval $runpath_var=\$rpath\$$runpath_var
16355- export $runpath_var
16356+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16357 fi
16358 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16359 fi
16360
16361 shlibpath="$finalize_shlibpath"
16362- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16363+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16364 if test -n "$shlibpath"; then
16365- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16366- export $shlibpath_var
16367+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16368 fi
16369
16370 # Get the real and link names of the library.
16371- eval "shared_ext=\"$shrext_cmds\""
16372- eval "library_names=\"$library_names_spec\""
16373+ eval shared_ext=\"$shrext_cmds\"
16374+ eval library_names=\"$library_names_spec\"
16375 set dummy $library_names
16376 shift
16377 realname="$1"
16378 shift
16379
16380 if test -n "$soname_spec"; then
16381- eval "soname=\"$soname_spec\""
16382+ eval soname=\"$soname_spec\"
16383 else
16384 soname="$realname"
16385 fi
16386@@ -7178,7 +8109,7 @@ EOF
16387 linknames=
16388 for link
16389 do
16390- linknames="$linknames $link"
16391+ func_append linknames " $link"
16392 done
16393
16394 # Use standard objects if they are pic
16395@@ -7189,7 +8120,7 @@ EOF
16396 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16397 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16398 export_symbols="$output_objdir/$libname.uexp"
16399- delfiles="$delfiles $export_symbols"
16400+ func_append delfiles " $export_symbols"
16401 fi
16402
16403 orig_export_symbols=
16404@@ -7220,13 +8151,45 @@ EOF
16405 $opt_dry_run || $RM $export_symbols
16406 cmds=$export_symbols_cmds
16407 save_ifs="$IFS"; IFS='~'
16408- for cmd in $cmds; do
16409+ for cmd1 in $cmds; do
16410 IFS="$save_ifs"
16411- eval "cmd=\"$cmd\""
16412- func_len " $cmd"
16413- len=$func_len_result
16414- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16415+ # Take the normal branch if the nm_file_list_spec branch
16416+ # doesn't work or if tool conversion is not needed.
16417+ case $nm_file_list_spec~$to_tool_file_cmd in
16418+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16419+ try_normal_branch=yes
16420+ eval cmd=\"$cmd1\"
16421+ func_len " $cmd"
16422+ len=$func_len_result
16423+ ;;
16424+ *)
16425+ try_normal_branch=no
16426+ ;;
16427+ esac
16428+ if test "$try_normal_branch" = yes \
16429+ && { test "$len" -lt "$max_cmd_len" \
16430+ || test "$max_cmd_len" -le -1; }
16431+ then
16432+ func_show_eval "$cmd" 'exit $?'
16433+ skipped_export=false
16434+ elif test -n "$nm_file_list_spec"; then
16435+ func_basename "$output"
16436+ output_la=$func_basename_result
16437+ save_libobjs=$libobjs
16438+ save_output=$output
16439+ output=${output_objdir}/${output_la}.nm
16440+ func_to_tool_file "$output"
16441+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16442+ func_append delfiles " $output"
16443+ func_verbose "creating $NM input file list: $output"
16444+ for obj in $save_libobjs; do
16445+ func_to_tool_file "$obj"
16446+ $ECHO "$func_to_tool_file_result"
16447+ done > "$output"
16448+ eval cmd=\"$cmd1\"
16449 func_show_eval "$cmd" 'exit $?'
16450+ output=$save_output
16451+ libobjs=$save_libobjs
16452 skipped_export=false
16453 else
16454 # The command line is too long to execute in one step.
16455@@ -7248,7 +8211,7 @@ EOF
16456 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16457 tmp_export_symbols="$export_symbols"
16458 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16459- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16460+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16461 fi
16462
16463 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16464@@ -7260,7 +8223,7 @@ EOF
16465 # global variables. join(1) would be nice here, but unfortunately
16466 # isn't a blessed tool.
16467 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16468- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16469+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16470 export_symbols=$output_objdir/$libname.def
16471 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16472 fi
16473@@ -7270,7 +8233,7 @@ EOF
16474 case " $convenience " in
16475 *" $test_deplib "*) ;;
16476 *)
16477- tmp_deplibs="$tmp_deplibs $test_deplib"
16478+ func_append tmp_deplibs " $test_deplib"
16479 ;;
16480 esac
16481 done
16482@@ -7286,43 +8249,43 @@ EOF
16483 fi
16484 if test -n "$whole_archive_flag_spec"; then
16485 save_libobjs=$libobjs
16486- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16487+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16488 test "X$libobjs" = "X " && libobjs=
16489 else
16490 gentop="$output_objdir/${outputname}x"
16491- generated="$generated $gentop"
16492+ func_append generated " $gentop"
16493
16494 func_extract_archives $gentop $convenience
16495- libobjs="$libobjs $func_extract_archives_result"
16496+ func_append libobjs " $func_extract_archives_result"
16497 test "X$libobjs" = "X " && libobjs=
16498 fi
16499 fi
16500
16501 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16502- eval "flag=\"$thread_safe_flag_spec\""
16503- linker_flags="$linker_flags $flag"
16504+ eval flag=\"$thread_safe_flag_spec\"
16505+ func_append linker_flags " $flag"
16506 fi
16507
16508 # Make a backup of the uninstalled library when relinking
16509- if test "$mode" = relink; then
16510- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16511+ if test "$opt_mode" = relink; then
16512+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16513 fi
16514
16515 # Do each of the archive commands.
16516 if test "$module" = yes && test -n "$module_cmds" ; then
16517 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16518- eval "test_cmds=\"$module_expsym_cmds\""
16519+ eval test_cmds=\"$module_expsym_cmds\"
16520 cmds=$module_expsym_cmds
16521 else
16522- eval "test_cmds=\"$module_cmds\""
16523+ eval test_cmds=\"$module_cmds\"
16524 cmds=$module_cmds
16525 fi
16526 else
16527 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16528- eval "test_cmds=\"$archive_expsym_cmds\""
16529+ eval test_cmds=\"$archive_expsym_cmds\"
16530 cmds=$archive_expsym_cmds
16531 else
16532- eval "test_cmds=\"$archive_cmds\""
16533+ eval test_cmds=\"$archive_cmds\"
16534 cmds=$archive_cmds
16535 fi
16536 fi
16537@@ -7366,10 +8329,13 @@ EOF
16538 echo 'INPUT (' > $output
16539 for obj in $save_libobjs
16540 do
16541- $ECHO "$obj" >> $output
16542+ func_to_tool_file "$obj"
16543+ $ECHO "$func_to_tool_file_result" >> $output
16544 done
16545 echo ')' >> $output
16546- delfiles="$delfiles $output"
16547+ func_append delfiles " $output"
16548+ func_to_tool_file "$output"
16549+ output=$func_to_tool_file_result
16550 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16551 output=${output_objdir}/${output_la}.lnk
16552 func_verbose "creating linker input file list: $output"
16553@@ -7383,15 +8349,17 @@ EOF
16554 fi
16555 for obj
16556 do
16557- $ECHO "$obj" >> $output
16558+ func_to_tool_file "$obj"
16559+ $ECHO "$func_to_tool_file_result" >> $output
16560 done
16561- delfiles="$delfiles $output"
16562- output=$firstobj\"$file_list_spec$output\"
16563+ func_append delfiles " $output"
16564+ func_to_tool_file "$output"
16565+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16566 else
16567 if test -n "$save_libobjs"; then
16568 func_verbose "creating reloadable object files..."
16569 output=$output_objdir/$output_la-${k}.$objext
16570- eval "test_cmds=\"$reload_cmds\""
16571+ eval test_cmds=\"$reload_cmds\"
16572 func_len " $test_cmds"
16573 len0=$func_len_result
16574 len=$len0
16575@@ -7411,12 +8379,12 @@ EOF
16576 if test "$k" -eq 1 ; then
16577 # The first file doesn't have a previous command to add.
16578 reload_objs=$objlist
16579- eval "concat_cmds=\"$reload_cmds\""
16580+ eval concat_cmds=\"$reload_cmds\"
16581 else
16582 # All subsequent reloadable object files will link in
16583 # the last one created.
16584 reload_objs="$objlist $last_robj"
16585- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16586+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16587 fi
16588 last_robj=$output_objdir/$output_la-${k}.$objext
16589 func_arith $k + 1
16590@@ -7433,11 +8401,11 @@ EOF
16591 # files will link in the last one created.
16592 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16593 reload_objs="$objlist $last_robj"
16594- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16595+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16596 if test -n "$last_robj"; then
16597- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16598+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16599 fi
16600- delfiles="$delfiles $output"
16601+ func_append delfiles " $output"
16602
16603 else
16604 output=
16605@@ -7450,9 +8418,9 @@ EOF
16606 libobjs=$output
16607 # Append the command to create the export file.
16608 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16609- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16610+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16611 if test -n "$last_robj"; then
16612- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16613+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16614 fi
16615 fi
16616
16617@@ -7471,7 +8439,7 @@ EOF
16618 lt_exit=$?
16619
16620 # Restore the uninstalled library and exit
16621- if test "$mode" = relink; then
16622+ if test "$opt_mode" = relink; then
16623 ( cd "$output_objdir" && \
16624 $RM "${realname}T" && \
16625 $MV "${realname}U" "$realname" )
16626@@ -7492,7 +8460,7 @@ EOF
16627 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16628 tmp_export_symbols="$export_symbols"
16629 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16630- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16631+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16632 fi
16633
16634 if test -n "$orig_export_symbols"; then
16635@@ -7504,7 +8472,7 @@ EOF
16636 # global variables. join(1) would be nice here, but unfortunately
16637 # isn't a blessed tool.
16638 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16639- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16640+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16641 export_symbols=$output_objdir/$libname.def
16642 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16643 fi
16644@@ -7515,7 +8483,7 @@ EOF
16645 output=$save_output
16646
16647 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16648- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16649+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16650 test "X$libobjs" = "X " && libobjs=
16651 fi
16652 # Expand the library linking commands again to reset the
16653@@ -7539,23 +8507,23 @@ EOF
16654
16655 if test -n "$delfiles"; then
16656 # Append the command to remove temporary files to $cmds.
16657- eval "cmds=\"\$cmds~\$RM $delfiles\""
16658+ eval cmds=\"\$cmds~\$RM $delfiles\"
16659 fi
16660
16661 # Add any objects from preloaded convenience libraries
16662 if test -n "$dlprefiles"; then
16663 gentop="$output_objdir/${outputname}x"
16664- generated="$generated $gentop"
16665+ func_append generated " $gentop"
16666
16667 func_extract_archives $gentop $dlprefiles
16668- libobjs="$libobjs $func_extract_archives_result"
16669+ func_append libobjs " $func_extract_archives_result"
16670 test "X$libobjs" = "X " && libobjs=
16671 fi
16672
16673 save_ifs="$IFS"; IFS='~'
16674 for cmd in $cmds; do
16675 IFS="$save_ifs"
16676- eval "cmd=\"$cmd\""
16677+ eval cmd=\"$cmd\"
16678 $opt_silent || {
16679 func_quote_for_expand "$cmd"
16680 eval "func_echo $func_quote_for_expand_result"
16681@@ -7564,7 +8532,7 @@ EOF
16682 lt_exit=$?
16683
16684 # Restore the uninstalled library and exit
16685- if test "$mode" = relink; then
16686+ if test "$opt_mode" = relink; then
16687 ( cd "$output_objdir" && \
16688 $RM "${realname}T" && \
16689 $MV "${realname}U" "$realname" )
16690@@ -7576,8 +8544,8 @@ EOF
16691 IFS="$save_ifs"
16692
16693 # Restore the uninstalled library and exit
16694- if test "$mode" = relink; then
16695- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16696+ if test "$opt_mode" = relink; then
16697+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16698
16699 if test -n "$convenience"; then
16700 if test -z "$whole_archive_flag_spec"; then
16701@@ -7656,17 +8624,20 @@ EOF
16702
16703 if test -n "$convenience"; then
16704 if test -n "$whole_archive_flag_spec"; then
16705- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16706+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16707 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16708 else
16709 gentop="$output_objdir/${obj}x"
16710- generated="$generated $gentop"
16711+ func_append generated " $gentop"
16712
16713 func_extract_archives $gentop $convenience
16714 reload_conv_objs="$reload_objs $func_extract_archives_result"
16715 fi
16716 fi
16717
16718+ # If we're not building shared, we need to use non_pic_objs
16719+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16720+
16721 # Create the old-style object.
16722 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16723
16724@@ -7690,7 +8661,7 @@ EOF
16725 # Create an invalid libtool object if no PIC, so that we don't
16726 # accidentally link it into a program.
16727 # $show "echo timestamp > $libobj"
16728- # $opt_dry_run || echo timestamp > $libobj || exit $?
16729+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16730 exit $EXIT_SUCCESS
16731 fi
16732
16733@@ -7740,8 +8711,8 @@ EOF
16734 if test "$tagname" = CXX ; then
16735 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16736 10.[0123])
16737- compile_command="$compile_command ${wl}-bind_at_load"
16738- finalize_command="$finalize_command ${wl}-bind_at_load"
16739+ func_append compile_command " ${wl}-bind_at_load"
16740+ func_append finalize_command " ${wl}-bind_at_load"
16741 ;;
16742 esac
16743 fi
16744@@ -7761,7 +8732,7 @@ EOF
16745 *)
16746 case " $compile_deplibs " in
16747 *" -L$path/$objdir "*)
16748- new_libs="$new_libs -L$path/$objdir" ;;
16749+ func_append new_libs " -L$path/$objdir" ;;
16750 esac
16751 ;;
16752 esac
16753@@ -7771,17 +8742,17 @@ EOF
16754 -L*)
16755 case " $new_libs " in
16756 *" $deplib "*) ;;
16757- *) new_libs="$new_libs $deplib" ;;
16758+ *) func_append new_libs " $deplib" ;;
16759 esac
16760 ;;
16761- *) new_libs="$new_libs $deplib" ;;
16762+ *) func_append new_libs " $deplib" ;;
16763 esac
16764 done
16765 compile_deplibs="$new_libs"
16766
16767
16768- compile_command="$compile_command $compile_deplibs"
16769- finalize_command="$finalize_command $finalize_deplibs"
16770+ func_append compile_command " $compile_deplibs"
16771+ func_append finalize_command " $finalize_deplibs"
16772
16773 if test -n "$rpath$xrpath"; then
16774 # If the user specified any rpath flags, then add them.
16775@@ -7789,7 +8760,7 @@ EOF
16776 # This is the magic to use -rpath.
16777 case "$finalize_rpath " in
16778 *" $libdir "*) ;;
16779- *) finalize_rpath="$finalize_rpath $libdir" ;;
16780+ *) func_append finalize_rpath " $libdir" ;;
16781 esac
16782 done
16783 fi
16784@@ -7808,18 +8779,18 @@ EOF
16785 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16786 ;;
16787 *)
16788- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16789+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16790 ;;
16791 esac
16792 fi
16793 else
16794- eval "flag=\"$hardcode_libdir_flag_spec\""
16795- rpath="$rpath $flag"
16796+ eval flag=\"$hardcode_libdir_flag_spec\"
16797+ func_append rpath " $flag"
16798 fi
16799 elif test -n "$runpath_var"; then
16800 case "$perm_rpath " in
16801 *" $libdir "*) ;;
16802- *) perm_rpath="$perm_rpath $libdir" ;;
16803+ *) func_append perm_rpath " $libdir" ;;
16804 esac
16805 fi
16806 case $host in
16807@@ -7828,12 +8799,12 @@ EOF
16808 case :$dllsearchpath: in
16809 *":$libdir:"*) ;;
16810 ::) dllsearchpath=$libdir;;
16811- *) dllsearchpath="$dllsearchpath:$libdir";;
16812+ *) func_append dllsearchpath ":$libdir";;
16813 esac
16814 case :$dllsearchpath: in
16815 *":$testbindir:"*) ;;
16816 ::) dllsearchpath=$testbindir;;
16817- *) dllsearchpath="$dllsearchpath:$testbindir";;
16818+ *) func_append dllsearchpath ":$testbindir";;
16819 esac
16820 ;;
16821 esac
16822@@ -7842,7 +8813,7 @@ EOF
16823 if test -n "$hardcode_libdir_separator" &&
16824 test -n "$hardcode_libdirs"; then
16825 libdir="$hardcode_libdirs"
16826- eval "rpath=\" $hardcode_libdir_flag_spec\""
16827+ eval rpath=\" $hardcode_libdir_flag_spec\"
16828 fi
16829 compile_rpath="$rpath"
16830
16831@@ -7859,18 +8830,18 @@ EOF
16832 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16833 ;;
16834 *)
16835- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16836+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16837 ;;
16838 esac
16839 fi
16840 else
16841- eval "flag=\"$hardcode_libdir_flag_spec\""
16842- rpath="$rpath $flag"
16843+ eval flag=\"$hardcode_libdir_flag_spec\"
16844+ func_append rpath " $flag"
16845 fi
16846 elif test -n "$runpath_var"; then
16847 case "$finalize_perm_rpath " in
16848 *" $libdir "*) ;;
16849- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16850+ *) func_append finalize_perm_rpath " $libdir" ;;
16851 esac
16852 fi
16853 done
16854@@ -7878,7 +8849,7 @@ EOF
16855 if test -n "$hardcode_libdir_separator" &&
16856 test -n "$hardcode_libdirs"; then
16857 libdir="$hardcode_libdirs"
16858- eval "rpath=\" $hardcode_libdir_flag_spec\""
16859+ eval rpath=\" $hardcode_libdir_flag_spec\"
16860 fi
16861 finalize_rpath="$rpath"
16862
16863@@ -7921,6 +8892,12 @@ EOF
16864 exit_status=0
16865 func_show_eval "$link_command" 'exit_status=$?'
16866
16867+ if test -n "$postlink_cmds"; then
16868+ func_to_tool_file "$output"
16869+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16870+ func_execute_cmds "$postlink_cmds" 'exit $?'
16871+ fi
16872+
16873 # Delete the generated files.
16874 if test -f "$output_objdir/${outputname}S.${objext}"; then
16875 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16876@@ -7943,7 +8920,7 @@ EOF
16877 # We should set the runpath_var.
16878 rpath=
16879 for dir in $perm_rpath; do
16880- rpath="$rpath$dir:"
16881+ func_append rpath "$dir:"
16882 done
16883 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16884 fi
16885@@ -7951,7 +8928,7 @@ EOF
16886 # We should set the runpath_var.
16887 rpath=
16888 for dir in $finalize_perm_rpath; do
16889- rpath="$rpath$dir:"
16890+ func_append rpath "$dir:"
16891 done
16892 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
16893 fi
16894@@ -7966,6 +8943,13 @@ EOF
16895 $opt_dry_run || $RM $output
16896 # Link the executable and exit
16897 func_show_eval "$link_command" 'exit $?'
16898+
16899+ if test -n "$postlink_cmds"; then
16900+ func_to_tool_file "$output"
16901+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16902+ func_execute_cmds "$postlink_cmds" 'exit $?'
16903+ fi
16904+
16905 exit $EXIT_SUCCESS
16906 fi
16907
16908@@ -7999,6 +8983,12 @@ EOF
16909
16910 func_show_eval "$link_command" 'exit $?'
16911
16912+ if test -n "$postlink_cmds"; then
16913+ func_to_tool_file "$output_objdir/$outputname"
16914+ 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'`
16915+ func_execute_cmds "$postlink_cmds" 'exit $?'
16916+ fi
16917+
16918 # Now create the wrapper script.
16919 func_verbose "creating $output"
16920
16921@@ -8096,7 +9086,7 @@ EOF
16922 else
16923 oldobjs="$old_deplibs $non_pic_objects"
16924 if test "$preload" = yes && test -f "$symfileobj"; then
16925- oldobjs="$oldobjs $symfileobj"
16926+ func_append oldobjs " $symfileobj"
16927 fi
16928 fi
16929 addlibs="$old_convenience"
16930@@ -8104,10 +9094,10 @@ EOF
16931
16932 if test -n "$addlibs"; then
16933 gentop="$output_objdir/${outputname}x"
16934- generated="$generated $gentop"
16935+ func_append generated " $gentop"
16936
16937 func_extract_archives $gentop $addlibs
16938- oldobjs="$oldobjs $func_extract_archives_result"
16939+ func_append oldobjs " $func_extract_archives_result"
16940 fi
16941
16942 # Do each command in the archive commands.
16943@@ -8118,10 +9108,10 @@ EOF
16944 # Add any objects from preloaded convenience libraries
16945 if test -n "$dlprefiles"; then
16946 gentop="$output_objdir/${outputname}x"
16947- generated="$generated $gentop"
16948+ func_append generated " $gentop"
16949
16950 func_extract_archives $gentop $dlprefiles
16951- oldobjs="$oldobjs $func_extract_archives_result"
16952+ func_append oldobjs " $func_extract_archives_result"
16953 fi
16954
16955 # POSIX demands no paths to be encoded in archives. We have
16956@@ -8139,7 +9129,7 @@ EOF
16957 else
16958 echo "copying selected object files to avoid basename conflicts..."
16959 gentop="$output_objdir/${outputname}x"
16960- generated="$generated $gentop"
16961+ func_append generated " $gentop"
16962 func_mkdir_p "$gentop"
16963 save_oldobjs=$oldobjs
16964 oldobjs=
16965@@ -8163,18 +9153,28 @@ EOF
16966 esac
16967 done
16968 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
16969- oldobjs="$oldobjs $gentop/$newobj"
16970+ func_append oldobjs " $gentop/$newobj"
16971 ;;
16972- *) oldobjs="$oldobjs $obj" ;;
16973+ *) func_append oldobjs " $obj" ;;
16974 esac
16975 done
16976 fi
16977- eval "cmds=\"$old_archive_cmds\""
16978+ eval cmds=\"$old_archive_cmds\"
16979
16980 func_len " $cmds"
16981 len=$func_len_result
16982 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16983 cmds=$old_archive_cmds
16984+ elif test -n "$archiver_list_spec"; then
16985+ func_verbose "using command file archive linking..."
16986+ for obj in $oldobjs
16987+ do
16988+ func_to_tool_file "$obj"
16989+ $ECHO "$func_to_tool_file_result"
16990+ done > $output_objdir/$libname.libcmd
16991+ func_to_tool_file "$output_objdir/$libname.libcmd"
16992+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
16993+ cmds=$old_archive_cmds
16994 else
16995 # the command line is too long to link in one step, link in parts
16996 func_verbose "using piecewise archive linking..."
16997@@ -8189,7 +9189,7 @@ EOF
16998 do
16999 last_oldobj=$obj
17000 done
17001- eval "test_cmds=\"$old_archive_cmds\""
17002+ eval test_cmds=\"$old_archive_cmds\"
17003 func_len " $test_cmds"
17004 len0=$func_len_result
17005 len=$len0
17006@@ -8208,7 +9208,7 @@ EOF
17007 RANLIB=$save_RANLIB
17008 fi
17009 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
17010- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
17011+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17012 objlist=
17013 len=$len0
17014 fi
17015@@ -8216,9 +9216,9 @@ EOF
17016 RANLIB=$save_RANLIB
17017 oldobjs=$objlist
17018 if test "X$oldobjs" = "X" ; then
17019- eval "cmds=\"\$concat_cmds\""
17020+ eval cmds=\"\$concat_cmds\"
17021 else
17022- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17023+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17024 fi
17025 fi
17026 fi
17027@@ -8268,12 +9268,23 @@ EOF
17028 *.la)
17029 func_basename "$deplib"
17030 name="$func_basename_result"
17031- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17032+ func_resolve_sysroot "$deplib"
17033+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17034 test -z "$libdir" && \
17035 func_fatal_error "\`$deplib' is not a valid libtool archive"
17036- newdependency_libs="$newdependency_libs $libdir/$name"
17037+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17038+ ;;
17039+ -L*)
17040+ func_stripname -L '' "$deplib"
17041+ func_replace_sysroot "$func_stripname_result"
17042+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17043 ;;
17044- *) newdependency_libs="$newdependency_libs $deplib" ;;
17045+ -R*)
17046+ func_stripname -R '' "$deplib"
17047+ func_replace_sysroot "$func_stripname_result"
17048+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17049+ ;;
17050+ *) func_append newdependency_libs " $deplib" ;;
17051 esac
17052 done
17053 dependency_libs="$newdependency_libs"
17054@@ -8284,12 +9295,14 @@ EOF
17055 *.la)
17056 func_basename "$lib"
17057 name="$func_basename_result"
17058- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17059+ func_resolve_sysroot "$lib"
17060+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17061+
17062 test -z "$libdir" && \
17063 func_fatal_error "\`$lib' is not a valid libtool archive"
17064- newdlfiles="$newdlfiles $libdir/$name"
17065+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17066 ;;
17067- *) newdlfiles="$newdlfiles $lib" ;;
17068+ *) func_append newdlfiles " $lib" ;;
17069 esac
17070 done
17071 dlfiles="$newdlfiles"
17072@@ -8303,10 +9316,11 @@ EOF
17073 # the library:
17074 func_basename "$lib"
17075 name="$func_basename_result"
17076- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17077+ func_resolve_sysroot "$lib"
17078+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17079 test -z "$libdir" && \
17080 func_fatal_error "\`$lib' is not a valid libtool archive"
17081- newdlprefiles="$newdlprefiles $libdir/$name"
17082+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17083 ;;
17084 esac
17085 done
17086@@ -8318,7 +9332,7 @@ EOF
17087 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17088 *) abs=`pwd`"/$lib" ;;
17089 esac
17090- newdlfiles="$newdlfiles $abs"
17091+ func_append newdlfiles " $abs"
17092 done
17093 dlfiles="$newdlfiles"
17094 newdlprefiles=
17095@@ -8327,7 +9341,7 @@ EOF
17096 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17097 *) abs=`pwd`"/$lib" ;;
17098 esac
17099- newdlprefiles="$newdlprefiles $abs"
17100+ func_append newdlprefiles " $abs"
17101 done
17102 dlprefiles="$newdlprefiles"
17103 fi
17104@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17105 exit $EXIT_SUCCESS
17106 }
17107
17108-{ test "$mode" = link || test "$mode" = relink; } &&
17109+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17110 func_mode_link ${1+"$@"}
17111
17112
17113@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17114 for arg
17115 do
17116 case $arg in
17117- -f) RM="$RM $arg"; rmforce=yes ;;
17118- -*) RM="$RM $arg" ;;
17119- *) files="$files $arg" ;;
17120+ -f) func_append RM " $arg"; rmforce=yes ;;
17121+ -*) func_append RM " $arg" ;;
17122+ *) func_append files " $arg" ;;
17123 esac
17124 done
17125
17126@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17127
17128 rmdirs=
17129
17130- origobjdir="$objdir"
17131 for file in $files; do
17132 func_dirname "$file" "" "."
17133 dir="$func_dirname_result"
17134 if test "X$dir" = X.; then
17135- objdir="$origobjdir"
17136+ odir="$objdir"
17137 else
17138- objdir="$dir/$origobjdir"
17139+ odir="$dir/$objdir"
17140 fi
17141 func_basename "$file"
17142 name="$func_basename_result"
17143- test "$mode" = uninstall && objdir="$dir"
17144+ test "$opt_mode" = uninstall && odir="$dir"
17145
17146- # Remember objdir for removal later, being careful to avoid duplicates
17147- if test "$mode" = clean; then
17148+ # Remember odir for removal later, being careful to avoid duplicates
17149+ if test "$opt_mode" = clean; then
17150 case " $rmdirs " in
17151- *" $objdir "*) ;;
17152- *) rmdirs="$rmdirs $objdir" ;;
17153+ *" $odir "*) ;;
17154+ *) func_append rmdirs " $odir" ;;
17155 esac
17156 fi
17157
17158@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17159
17160 # Delete the libtool libraries and symlinks.
17161 for n in $library_names; do
17162- rmfiles="$rmfiles $objdir/$n"
17163+ func_append rmfiles " $odir/$n"
17164 done
17165- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17166+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17167
17168- case "$mode" in
17169+ case "$opt_mode" in
17170 clean)
17171- case " $library_names " in
17172- # " " in the beginning catches empty $dlname
17173+ case " $library_names " in
17174 *" $dlname "*) ;;
17175- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17176+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17177 esac
17178- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17179+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17180 ;;
17181 uninstall)
17182 if test -n "$library_names"; then
17183@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17184 # Add PIC object to the list of files to remove.
17185 if test -n "$pic_object" &&
17186 test "$pic_object" != none; then
17187- rmfiles="$rmfiles $dir/$pic_object"
17188+ func_append rmfiles " $dir/$pic_object"
17189 fi
17190
17191 # Add non-PIC object to the list of files to remove.
17192 if test -n "$non_pic_object" &&
17193 test "$non_pic_object" != none; then
17194- rmfiles="$rmfiles $dir/$non_pic_object"
17195+ func_append rmfiles " $dir/$non_pic_object"
17196 fi
17197 fi
17198 ;;
17199
17200 *)
17201- if test "$mode" = clean ; then
17202+ if test "$opt_mode" = clean ; then
17203 noexename=$name
17204 case $file in
17205 *.exe)
17206@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17207 noexename=$func_stripname_result
17208 # $file with .exe has already been added to rmfiles,
17209 # add $file without .exe
17210- rmfiles="$rmfiles $file"
17211+ func_append rmfiles " $file"
17212 ;;
17213 esac
17214 # Do a test to see if this is a libtool program.
17215@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17216 func_ltwrapper_scriptname "$file"
17217 relink_command=
17218 func_source $func_ltwrapper_scriptname_result
17219- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17220+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17221 else
17222 relink_command=
17223 func_source $dir/$noexename
17224@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17225
17226 # note $name still contains .exe if it was in $file originally
17227 # as does the version of $file that was added into $rmfiles
17228- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17229+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17230 if test "$fast_install" = yes && test -n "$relink_command"; then
17231- rmfiles="$rmfiles $objdir/lt-$name"
17232+ func_append rmfiles " $odir/lt-$name"
17233 fi
17234 if test "X$noexename" != "X$name" ; then
17235- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17236+ func_append rmfiles " $odir/lt-${noexename}.c"
17237 fi
17238 fi
17239 fi
17240@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17241 esac
17242 func_show_eval "$RM $rmfiles" 'exit_status=1'
17243 done
17244- objdir="$origobjdir"
17245
17246 # Try to remove the ${objdir}s in the directories where we deleted files
17247 for dir in $rmdirs; do
17248@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17249 exit $exit_status
17250 }
17251
17252-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17253+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17254 func_mode_uninstall ${1+"$@"}
17255
17256-test -z "$mode" && {
17257+test -z "$opt_mode" && {
17258 help="$generic_help"
17259 func_fatal_help "you must specify a MODE"
17260 }
17261
17262 test -z "$exec_cmd" && \
17263- func_fatal_help "invalid operation mode \`$mode'"
17264+ func_fatal_help "invalid operation mode \`$opt_mode'"
17265
17266 if test -n "$exec_cmd"; then
17267 eval exec "$exec_cmd"
17268diff --git a/ltoptions.m4 b/ltoptions.m4
17269index 5ef12ced2a..17cfd51c0b 100644
17270--- a/ltoptions.m4
17271+++ b/ltoptions.m4
17272@@ -8,7 +8,7 @@
17273 # unlimited permission to copy and/or distribute it, with or without
17274 # modifications, as long as this notice is preserved.
17275
17276-# serial 6 ltoptions.m4
17277+# serial 7 ltoptions.m4
17278
17279 # This is to help aclocal find these macros, as it can't see m4_define.
17280 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17281diff --git a/ltversion.m4 b/ltversion.m4
17282index bf87f77132..9c7b5d4118 100644
17283--- a/ltversion.m4
17284+++ b/ltversion.m4
17285@@ -7,17 +7,17 @@
17286 # unlimited permission to copy and/or distribute it, with or without
17287 # modifications, as long as this notice is preserved.
17288
17289-# Generated from ltversion.in.
17290+# @configure_input@
17291
17292-# serial 3134 ltversion.m4
17293+# serial 3293 ltversion.m4
17294 # This file is part of GNU Libtool
17295
17296-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17297-m4_define([LT_PACKAGE_REVISION], [1.3134])
17298+m4_define([LT_PACKAGE_VERSION], [2.4])
17299+m4_define([LT_PACKAGE_REVISION], [1.3293])
17300
17301 AC_DEFUN([LTVERSION_VERSION],
17302-[macro_version='2.2.7a'
17303-macro_revision='1.3134'
17304+[macro_version='2.4'
17305+macro_revision='1.3293'
17306 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17307 _LT_DECL(, macro_revision, 0)
17308 ])
17309diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17310index bf92b5e079..c573da90c5 100644
17311--- a/lt~obsolete.m4
17312+++ b/lt~obsolete.m4
17313@@ -7,7 +7,7 @@
17314 # unlimited permission to copy and/or distribute it, with or without
17315 # modifications, as long as this notice is preserved.
17316
17317-# serial 4 lt~obsolete.m4
17318+# serial 5 lt~obsolete.m4
17319
17320 # These exist entirely to fool aclocal when bootstrapping libtool.
17321 #
17322diff --git a/opcodes/configure b/opcodes/configure
17323index 0b352a454d..7eaea7db73 100755
17324--- a/opcodes/configure
17325+++ b/opcodes/configure
17326@@ -650,6 +650,9 @@ OTOOL
17327 LIPO
17328 NMEDIT
17329 DSYMUTIL
17330+MANIFEST_TOOL
17331+ac_ct_AR
17332+DLLTOOL
17333 OBJDUMP
17334 LN_S
17335 NM
17336@@ -763,6 +766,7 @@ enable_static
17337 with_pic
17338 enable_fast_install
17339 with_gnu_ld
17340+with_libtool_sysroot
17341 enable_libtool_lock
17342 enable_targets
17343 enable_werror
17344@@ -1423,6 +1427,8 @@ Optional Packages:
17345 --with-pic try to use only PIC/non-PIC objects [default=use
17346 both]
17347 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17348+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17349+ (or the compiler's sysroot if not specified).
17350
17351 Some influential environment variables:
17352 CC C compiler command
17353@@ -5115,8 +5121,8 @@ esac
17354
17355
17356
17357-macro_version='2.2.7a'
17358-macro_revision='1.3134'
17359+macro_version='2.4'
17360+macro_revision='1.3293'
17361
17362
17363
17364@@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17365 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17366 $as_echo_n "checking how to print strings... " >&6; }
17367 # Test print first, because it will be a builtin if present.
17368-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17369+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17370 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17371 ECHO='print -r --'
17372 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17373@@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17374 # Try some XSI features
17375 xsi_shell=no
17376 ( _lt_dummy="a/b/c"
17377- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17378- = c,a/b,, \
17379+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17380+ = c,a/b,b/c, \
17381 && eval 'test $(( 1 + 1 )) -eq 2 \
17382 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17383 && xsi_shell=yes
17384@@ -5892,6 +5898,80 @@ esac
17385
17386
17387
17388+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17389+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17390+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
17391+ $as_echo_n "(cached) " >&6
17392+else
17393+ case $host in
17394+ *-*-mingw* )
17395+ case $build in
17396+ *-*-mingw* ) # actually msys
17397+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17398+ ;;
17399+ *-*-cygwin* )
17400+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17401+ ;;
17402+ * ) # otherwise, assume *nix
17403+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17404+ ;;
17405+ esac
17406+ ;;
17407+ *-*-cygwin* )
17408+ case $build in
17409+ *-*-mingw* ) # actually msys
17410+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17411+ ;;
17412+ *-*-cygwin* )
17413+ lt_cv_to_host_file_cmd=func_convert_file_noop
17414+ ;;
17415+ * ) # otherwise, assume *nix
17416+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17417+ ;;
17418+ esac
17419+ ;;
17420+ * ) # unhandled hosts (and "normal" native builds)
17421+ lt_cv_to_host_file_cmd=func_convert_file_noop
17422+ ;;
17423+esac
17424+
17425+fi
17426+
17427+to_host_file_cmd=$lt_cv_to_host_file_cmd
17428+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17429+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17430+
17431+
17432+
17433+
17434+
17435+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17436+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17437+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
17438+ $as_echo_n "(cached) " >&6
17439+else
17440+ #assume ordinary cross tools, or native build.
17441+lt_cv_to_tool_file_cmd=func_convert_file_noop
17442+case $host in
17443+ *-*-mingw* )
17444+ case $build in
17445+ *-*-mingw* ) # actually msys
17446+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17447+ ;;
17448+ esac
17449+ ;;
17450+esac
17451+
17452+fi
17453+
17454+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17455+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17456+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17457+
17458+
17459+
17460+
17461+
17462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17463 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17464 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17465@@ -5908,6 +5988,11 @@ case $reload_flag in
17466 esac
17467 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17468 case $host_os in
17469+ cygwin* | mingw* | pw32* | cegcc*)
17470+ if test "$GCC" != yes; then
17471+ reload_cmds=false
17472+ fi
17473+ ;;
17474 darwin*)
17475 if test "$GCC" = yes; then
17476 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17477@@ -6076,7 +6161,8 @@ mingw* | pw32*)
17478 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17479 lt_cv_file_magic_cmd='func_win32_libid'
17480 else
17481- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17482+ # Keep this pattern in sync with the one in func_win32_libid.
17483+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17484 lt_cv_file_magic_cmd='$OBJDUMP -f'
17485 fi
17486 ;;
17487@@ -6230,6 +6316,21 @@ esac
17488 fi
17489 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17490 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17491+
17492+file_magic_glob=
17493+want_nocaseglob=no
17494+if test "$build" = "$host"; then
17495+ case $host_os in
17496+ mingw* | pw32*)
17497+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17498+ want_nocaseglob=yes
17499+ else
17500+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17501+ fi
17502+ ;;
17503+ esac
17504+fi
17505+
17506 file_magic_cmd=$lt_cv_file_magic_cmd
17507 deplibs_check_method=$lt_cv_deplibs_check_method
17508 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17509@@ -6245,9 +6346,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17510
17511
17512
17513+
17514+
17515+
17516+
17517+
17518+
17519+
17520+
17521+
17522+
17523 if test -n "$ac_tool_prefix"; then
17524- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17525-set dummy ${ac_tool_prefix}ar; ac_word=$2
17526+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17527+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17528+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17529+$as_echo_n "checking for $ac_word... " >&6; }
17530+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
17531+ $as_echo_n "(cached) " >&6
17532+else
17533+ if test -n "$DLLTOOL"; then
17534+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17535+else
17536+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17537+for as_dir in $PATH
17538+do
17539+ IFS=$as_save_IFS
17540+ test -z "$as_dir" && as_dir=.
17541+ for ac_exec_ext in '' $ac_executable_extensions; do
17542+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17543+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17544+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17545+ break 2
17546+ fi
17547+done
17548+ done
17549+IFS=$as_save_IFS
17550+
17551+fi
17552+fi
17553+DLLTOOL=$ac_cv_prog_DLLTOOL
17554+if test -n "$DLLTOOL"; then
17555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17556+$as_echo "$DLLTOOL" >&6; }
17557+else
17558+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17559+$as_echo "no" >&6; }
17560+fi
17561+
17562+
17563+fi
17564+if test -z "$ac_cv_prog_DLLTOOL"; then
17565+ ac_ct_DLLTOOL=$DLLTOOL
17566+ # Extract the first word of "dlltool", so it can be a program name with args.
17567+set dummy dlltool; ac_word=$2
17568+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17569+$as_echo_n "checking for $ac_word... " >&6; }
17570+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17571+ $as_echo_n "(cached) " >&6
17572+else
17573+ if test -n "$ac_ct_DLLTOOL"; then
17574+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17575+else
17576+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17577+for as_dir in $PATH
17578+do
17579+ IFS=$as_save_IFS
17580+ test -z "$as_dir" && as_dir=.
17581+ for ac_exec_ext in '' $ac_executable_extensions; do
17582+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17583+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17584+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17585+ break 2
17586+ fi
17587+done
17588+ done
17589+IFS=$as_save_IFS
17590+
17591+fi
17592+fi
17593+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17594+if test -n "$ac_ct_DLLTOOL"; then
17595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17596+$as_echo "$ac_ct_DLLTOOL" >&6; }
17597+else
17598+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17599+$as_echo "no" >&6; }
17600+fi
17601+
17602+ if test "x$ac_ct_DLLTOOL" = x; then
17603+ DLLTOOL="false"
17604+ else
17605+ case $cross_compiling:$ac_tool_warned in
17606+yes:)
17607+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17608+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17609+ac_tool_warned=yes ;;
17610+esac
17611+ DLLTOOL=$ac_ct_DLLTOOL
17612+ fi
17613+else
17614+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17615+fi
17616+
17617+test -z "$DLLTOOL" && DLLTOOL=dlltool
17618+
17619+
17620+
17621+
17622+
17623+
17624+
17625+
17626+
17627+
17628+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17629+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17630+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17631+ $as_echo_n "(cached) " >&6
17632+else
17633+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17634+
17635+case $host_os in
17636+cygwin* | mingw* | pw32* | cegcc*)
17637+ # two different shell functions defined in ltmain.sh
17638+ # decide which to use based on capabilities of $DLLTOOL
17639+ case `$DLLTOOL --help 2>&1` in
17640+ *--identify-strict*)
17641+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17642+ ;;
17643+ *)
17644+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17645+ ;;
17646+ esac
17647+ ;;
17648+*)
17649+ # fallback: assume linklib IS sharedlib
17650+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17651+ ;;
17652+esac
17653+
17654+fi
17655+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17656+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17657+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17658+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17659+
17660+
17661+
17662+
17663+
17664+
17665+
17666+if test -n "$ac_tool_prefix"; then
17667+ for ac_prog in ar
17668+ do
17669+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17670+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17671 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17672 $as_echo_n "checking for $ac_word... " >&6; }
17673 if test "${ac_cv_prog_AR+set}" = set; then :
17674@@ -6263,7 +6517,7 @@ do
17675 test -z "$as_dir" && as_dir=.
17676 for ac_exec_ext in '' $ac_executable_extensions; do
17677 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17678- ac_cv_prog_AR="${ac_tool_prefix}ar"
17679+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17680 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17681 break 2
17682 fi
17683@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; }
17684 fi
17685
17686
17687+ test -n "$AR" && break
17688+ done
17689 fi
17690-if test -z "$ac_cv_prog_AR"; then
17691+if test -z "$AR"; then
17692 ac_ct_AR=$AR
17693- # Extract the first word of "ar", so it can be a program name with args.
17694-set dummy ar; ac_word=$2
17695+ for ac_prog in ar
17696+do
17697+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17698+set dummy $ac_prog; ac_word=$2
17699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17700 $as_echo_n "checking for $ac_word... " >&6; }
17701 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17702@@ -6303,7 +6561,7 @@ do
17703 test -z "$as_dir" && as_dir=.
17704 for ac_exec_ext in '' $ac_executable_extensions; do
17705 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17706- ac_cv_prog_ac_ct_AR="ar"
17707+ ac_cv_prog_ac_ct_AR="$ac_prog"
17708 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17709 break 2
17710 fi
17711@@ -6322,6 +6580,10 @@ else
17712 $as_echo "no" >&6; }
17713 fi
17714
17715+
17716+ test -n "$ac_ct_AR" && break
17717+done
17718+
17719 if test "x$ac_ct_AR" = x; then
17720 AR="false"
17721 else
17722@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;;
17723 esac
17724 AR=$ac_ct_AR
17725 fi
17726-else
17727- AR="$ac_cv_prog_AR"
17728 fi
17729
17730-test -z "$AR" && AR=ar
17731-test -z "$AR_FLAGS" && AR_FLAGS=cru
17732+: ${AR=ar}
17733+: ${AR_FLAGS=cru}
17734+
17735+
17736+
17737+
17738+
17739+
17740+
17741+
17742+
17743+
17744+
17745+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17746+$as_echo_n "checking for archiver @FILE support... " >&6; }
17747+if test "${lt_cv_ar_at_file+set}" = set; then :
17748+ $as_echo_n "(cached) " >&6
17749+else
17750+ lt_cv_ar_at_file=no
17751+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17752+/* end confdefs.h. */
17753+
17754+int
17755+main ()
17756+{
17757
17758+ ;
17759+ return 0;
17760+}
17761+_ACEOF
17762+if ac_fn_c_try_compile "$LINENO"; then :
17763+ echo conftest.$ac_objext > conftest.lst
17764+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17765+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17766+ (eval $lt_ar_try) 2>&5
17767+ ac_status=$?
17768+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17769+ test $ac_status = 0; }
17770+ if test "$ac_status" -eq 0; then
17771+ # Ensure the archiver fails upon bogus file names.
17772+ rm -f conftest.$ac_objext libconftest.a
17773+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17774+ (eval $lt_ar_try) 2>&5
17775+ ac_status=$?
17776+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17777+ test $ac_status = 0; }
17778+ if test "$ac_status" -ne 0; then
17779+ lt_cv_ar_at_file=@
17780+ fi
17781+ fi
17782+ rm -f conftest.* libconftest.a
17783
17784+fi
17785+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17786
17787+fi
17788+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17789+$as_echo "$lt_cv_ar_at_file" >&6; }
17790
17791+if test "x$lt_cv_ar_at_file" = xno; then
17792+ archiver_list_spec=
17793+else
17794+ archiver_list_spec=$lt_cv_ar_at_file
17795+fi
17796
17797
17798
17799@@ -6684,8 +7002,8 @@ esac
17800 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17801
17802 # Transform an extracted symbol line into symbol name and symbol address
17803-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17804-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'"
17805+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17806+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'"
17807
17808 # Handle CRLF in mingw tool chain
17809 opt_cr=
17810@@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do
17811 else
17812 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17813 fi
17814+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17815
17816 # Check to see that the pipe works correctly.
17817 pipe_works=no
17818@@ -6762,6 +7081,18 @@ _LT_EOF
17819 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17820 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17821 cat <<_LT_EOF > conftest.$ac_ext
17822+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17823+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17824+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17825+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17826+# define LT_DLSYM_CONST
17827+#elif defined(__osf__)
17828+/* This system does not cope well with relocations in const data. */
17829+# define LT_DLSYM_CONST
17830+#else
17831+# define LT_DLSYM_CONST const
17832+#endif
17833+
17834 #ifdef __cplusplus
17835 extern "C" {
17836 #endif
17837@@ -6773,7 +7104,7 @@ _LT_EOF
17838 cat <<_LT_EOF >> conftest.$ac_ext
17839
17840 /* The mapping between symbol names and symbols. */
17841-const struct {
17842+LT_DLSYM_CONST struct {
17843 const char *name;
17844 void *address;
17845 }
17846@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() {
17847 _LT_EOF
17848 # Now try linking the two files.
17849 mv conftest.$ac_objext conftstm.$ac_objext
17850- lt_save_LIBS="$LIBS"
17851- lt_save_CFLAGS="$CFLAGS"
17852+ lt_globsym_save_LIBS=$LIBS
17853+ lt_globsym_save_CFLAGS=$CFLAGS
17854 LIBS="conftstm.$ac_objext"
17855 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17856 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17857@@ -6810,8 +7141,8 @@ _LT_EOF
17858 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17859 pipe_works=yes
17860 fi
17861- LIBS="$lt_save_LIBS"
17862- CFLAGS="$lt_save_CFLAGS"
17863+ LIBS=$lt_globsym_save_LIBS
17864+ CFLAGS=$lt_globsym_save_CFLAGS
17865 else
17866 echo "cannot find nm_test_func in $nlist" >&5
17867 fi
17868@@ -6848,6 +7179,16 @@ else
17869 $as_echo "ok" >&6; }
17870 fi
17871
17872+# Response file support.
17873+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17874+ nm_file_list_spec='@'
17875+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17876+ nm_file_list_spec='@'
17877+fi
17878+
17879+
17880+
17881+
17882
17883
17884
17885@@ -6869,6 +7210,45 @@ fi
17886
17887
17888
17889+
17890+
17891+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17892+$as_echo_n "checking for sysroot... " >&6; }
17893+
17894+# Check whether --with-libtool-sysroot was given.
17895+if test "${with_libtool_sysroot+set}" = set; then :
17896+ withval=$with_libtool_sysroot;
17897+else
17898+ with_libtool_sysroot=no
17899+fi
17900+
17901+
17902+lt_sysroot=
17903+case ${with_libtool_sysroot} in #(
17904+ yes)
17905+ if test "$GCC" = yes; then
17906+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17907+ fi
17908+ ;; #(
17909+ /*)
17910+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17911+ ;; #(
17912+ no|'')
17913+ ;; #(
17914+ *)
17915+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17916+$as_echo "${with_libtool_sysroot}" >&6; }
17917+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17918+ ;;
17919+esac
17920+
17921+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17922+$as_echo "${lt_sysroot:-no}" >&6; }
17923+
17924+
17925+
17926+
17927+
17928 # Check whether --enable-libtool-lock was given.
17929 if test "${enable_libtool_lock+set}" = set; then :
17930 enableval=$enable_libtool_lock;
17931@@ -7075,6 +7455,123 @@ esac
17932
17933 need_locks="$enable_libtool_lock"
17934
17935+if test -n "$ac_tool_prefix"; then
17936+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17937+set dummy ${ac_tool_prefix}mt; ac_word=$2
17938+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17939+$as_echo_n "checking for $ac_word... " >&6; }
17940+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17941+ $as_echo_n "(cached) " >&6
17942+else
17943+ if test -n "$MANIFEST_TOOL"; then
17944+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17945+else
17946+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17947+for as_dir in $PATH
17948+do
17949+ IFS=$as_save_IFS
17950+ test -z "$as_dir" && as_dir=.
17951+ for ac_exec_ext in '' $ac_executable_extensions; do
17952+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17953+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17954+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17955+ break 2
17956+ fi
17957+done
17958+ done
17959+IFS=$as_save_IFS
17960+
17961+fi
17962+fi
17963+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17964+if test -n "$MANIFEST_TOOL"; then
17965+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17966+$as_echo "$MANIFEST_TOOL" >&6; }
17967+else
17968+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17969+$as_echo "no" >&6; }
17970+fi
17971+
17972+
17973+fi
17974+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17975+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17976+ # Extract the first word of "mt", so it can be a program name with args.
17977+set dummy mt; ac_word=$2
17978+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17979+$as_echo_n "checking for $ac_word... " >&6; }
17980+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17981+ $as_echo_n "(cached) " >&6
17982+else
17983+ if test -n "$ac_ct_MANIFEST_TOOL"; then
17984+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
17985+else
17986+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17987+for as_dir in $PATH
17988+do
17989+ IFS=$as_save_IFS
17990+ test -z "$as_dir" && as_dir=.
17991+ for ac_exec_ext in '' $ac_executable_extensions; do
17992+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17993+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17994+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17995+ break 2
17996+ fi
17997+done
17998+ done
17999+IFS=$as_save_IFS
18000+
18001+fi
18002+fi
18003+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18004+if test -n "$ac_ct_MANIFEST_TOOL"; then
18005+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18006+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18007+else
18008+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18009+$as_echo "no" >&6; }
18010+fi
18011+
18012+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18013+ MANIFEST_TOOL=":"
18014+ else
18015+ case $cross_compiling:$ac_tool_warned in
18016+yes:)
18017+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18018+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18019+ac_tool_warned=yes ;;
18020+esac
18021+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18022+ fi
18023+else
18024+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18025+fi
18026+
18027+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18028+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18029+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18030+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
18031+ $as_echo_n "(cached) " >&6
18032+else
18033+ lt_cv_path_mainfest_tool=no
18034+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18035+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18036+ cat conftest.err >&5
18037+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18038+ lt_cv_path_mainfest_tool=yes
18039+ fi
18040+ rm -f conftest*
18041+fi
18042+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18043+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18044+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18045+ MANIFEST_TOOL=:
18046+fi
18047+
18048+
18049+
18050+
18051+
18052
18053 case $host_os in
18054 rhapsody* | darwin*)
18055@@ -7638,6 +8135,8 @@ _LT_EOF
18056 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18057 echo "$AR cru libconftest.a conftest.o" >&5
18058 $AR cru libconftest.a conftest.o 2>&5
18059+ echo "$RANLIB libconftest.a" >&5
18060+ $RANLIB libconftest.a 2>&5
18061 cat > conftest.c << _LT_EOF
18062 int main() { return 0;}
18063 _LT_EOF
18064@@ -7803,7 +8302,8 @@ fi
18065 LIBTOOL_DEPS="$ltmain"
18066
18067 # Always use our own libtool.
18068-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18069+LIBTOOL='$(SHELL) $(top_builddir)'
18070+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18071
18072
18073
18074@@ -7892,7 +8392,7 @@ aix3*)
18075 esac
18076
18077 # Global variables:
18078-ofile=libtool
18079+ofile=${host_alias}-libtool
18080 can_build_shared=yes
18081
18082 # All known linkers require a `.a' archive for static linking (except MSVC,
18083@@ -8190,8 +8690,6 @@ fi
18084 lt_prog_compiler_pic=
18085 lt_prog_compiler_static=
18086
18087-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18088-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18089
18090 if test "$GCC" = yes; then
18091 lt_prog_compiler_wl='-Wl,'
18092@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18093 lt_prog_compiler_pic='--shared'
18094 lt_prog_compiler_static='--static'
18095 ;;
18096+ nagfor*)
18097+ # NAG Fortran compiler
18098+ lt_prog_compiler_wl='-Wl,-Wl,,'
18099+ lt_prog_compiler_pic='-PIC'
18100+ lt_prog_compiler_static='-Bstatic'
18101+ ;;
18102 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18103 # Portland Group compilers (*not* the Pentium gcc compiler,
18104 # which looks to be a dead project)
18105@@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18106 lt_prog_compiler_pic='-KPIC'
18107 lt_prog_compiler_static='-Bstatic'
18108 case $cc_basename in
18109- f77* | f90* | f95*)
18110+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18111 lt_prog_compiler_wl='-Qoption ld ';;
18112 *)
18113 lt_prog_compiler_wl='-Wl,';;
18114@@ -8476,13 +8980,17 @@ case $host_os in
18115 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18116 ;;
18117 esac
18118-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18119-$as_echo "$lt_prog_compiler_pic" >&6; }
18120-
18121-
18122-
18123-
18124
18125+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18126+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18127+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
18128+ $as_echo_n "(cached) " >&6
18129+else
18130+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18131+fi
18132+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18133+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18134+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18135
18136 #
18137 # Check to make sure the PIC flag actually works.
18138@@ -8543,6 +9051,11 @@ fi
18139
18140
18141
18142+
18143+
18144+
18145+
18146+
18147 #
18148 # Check to make sure the static flag actually works.
18149 #
18150@@ -8893,7 +9406,8 @@ _LT_EOF
18151 allow_undefined_flag=unsupported
18152 always_export_symbols=no
18153 enable_shared_with_static_runtimes=yes
18154- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18155+ 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'
18156+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18157
18158 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18159 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18160@@ -8992,12 +9506,12 @@ _LT_EOF
18161 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18162 hardcode_libdir_flag_spec=
18163 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18164- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18165+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18166 if test "x$supports_anon_versioning" = xyes; then
18167 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18168 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18169 echo "local: *; };" >> $output_objdir/$libname.ver~
18170- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18171+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18172 fi
18173 ;;
18174 esac
18175@@ -9011,8 +9525,8 @@ _LT_EOF
18176 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18177 wlarc=
18178 else
18179- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18180- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18181+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18182+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18183 fi
18184 ;;
18185
18186@@ -9030,8 +9544,8 @@ _LT_EOF
18187
18188 _LT_EOF
18189 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18190- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18191- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18192+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18193+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18194 else
18195 ld_shlibs=no
18196 fi
18197@@ -9077,8 +9591,8 @@ _LT_EOF
18198
18199 *)
18200 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18201- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18202- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18203+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18204+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18205 else
18206 ld_shlibs=no
18207 fi
18208@@ -9208,7 +9722,13 @@ _LT_EOF
18209 allow_undefined_flag='-berok'
18210 # Determine the default libpath from the value encoded in an
18211 # empty executable.
18212- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18213+ if test "${lt_cv_aix_libpath+set}" = set; then
18214+ aix_libpath=$lt_cv_aix_libpath
18215+else
18216+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18217+ $as_echo_n "(cached) " >&6
18218+else
18219+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18220 /* end confdefs.h. */
18221
18222 int
18223@@ -9221,22 +9741,29 @@ main ()
18224 _ACEOF
18225 if ac_fn_c_try_link "$LINENO"; then :
18226
18227-lt_aix_libpath_sed='
18228- /Import File Strings/,/^$/ {
18229- /^0/ {
18230- s/^0 *\(.*\)$/\1/
18231- p
18232- }
18233- }'
18234-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 "$aix_libpath"; then
18237- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18238-fi
18239+ lt_aix_libpath_sed='
18240+ /Import File Strings/,/^$/ {
18241+ /^0/ {
18242+ s/^0 *\([^ ]*\) *$/\1/
18243+ p
18244+ }
18245+ }'
18246+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18247+ # Check for a 64-bit object if we didn't find anything.
18248+ if test -z "$lt_cv_aix_libpath_"; then
18249+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18250+ fi
18251 fi
18252 rm -f core conftest.err conftest.$ac_objext \
18253 conftest$ac_exeext conftest.$ac_ext
18254-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18255+ if test -z "$lt_cv_aix_libpath_"; then
18256+ lt_cv_aix_libpath_="/usr/lib:/lib"
18257+ fi
18258+
18259+fi
18260+
18261+ aix_libpath=$lt_cv_aix_libpath_
18262+fi
18263
18264 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18265 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"
18266@@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18267 else
18268 # Determine the default libpath from the value encoded in an
18269 # empty executable.
18270- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18271+ if test "${lt_cv_aix_libpath+set}" = set; then
18272+ aix_libpath=$lt_cv_aix_libpath
18273+else
18274+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18275+ $as_echo_n "(cached) " >&6
18276+else
18277+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18278 /* end confdefs.h. */
18279
18280 int
18281@@ -9261,22 +9794,29 @@ main ()
18282 _ACEOF
18283 if ac_fn_c_try_link "$LINENO"; then :
18284
18285-lt_aix_libpath_sed='
18286- /Import File Strings/,/^$/ {
18287- /^0/ {
18288- s/^0 *\(.*\)$/\1/
18289- p
18290- }
18291- }'
18292-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 "$aix_libpath"; then
18295- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18296-fi
18297+ lt_aix_libpath_sed='
18298+ /Import File Strings/,/^$/ {
18299+ /^0/ {
18300+ s/^0 *\([^ ]*\) *$/\1/
18301+ p
18302+ }
18303+ }'
18304+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18305+ # Check for a 64-bit object if we didn't find anything.
18306+ if test -z "$lt_cv_aix_libpath_"; then
18307+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18308+ fi
18309 fi
18310 rm -f core conftest.err conftest.$ac_objext \
18311 conftest$ac_exeext conftest.$ac_ext
18312-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18313+ if test -z "$lt_cv_aix_libpath_"; then
18314+ lt_cv_aix_libpath_="/usr/lib:/lib"
18315+ fi
18316+
18317+fi
18318+
18319+ aix_libpath=$lt_cv_aix_libpath_
18320+fi
18321
18322 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18323 # Warning - without using the other run time loading flags,
18324@@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18325 # Microsoft Visual C++.
18326 # hardcode_libdir_flag_spec is actually meaningless, as there is
18327 # no search path for DLLs.
18328- hardcode_libdir_flag_spec=' '
18329- allow_undefined_flag=unsupported
18330- # Tell ltmain to make .lib files, not .a files.
18331- libext=lib
18332- # Tell ltmain to make .dll files, not .so files.
18333- shrext_cmds=".dll"
18334- # FIXME: Setting linknames here is a bad hack.
18335- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18336- # The linker will automatically build a .lib file if we build a DLL.
18337- old_archive_from_new_cmds='true'
18338- # FIXME: Should let the user specify the lib program.
18339- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18340- fix_srcfile_path='`cygpath -w "$srcfile"`'
18341- enable_shared_with_static_runtimes=yes
18342+ case $cc_basename in
18343+ cl*)
18344+ # Native MSVC
18345+ hardcode_libdir_flag_spec=' '
18346+ allow_undefined_flag=unsupported
18347+ always_export_symbols=yes
18348+ file_list_spec='@'
18349+ # Tell ltmain to make .lib files, not .a files.
18350+ libext=lib
18351+ # Tell ltmain to make .dll files, not .so files.
18352+ shrext_cmds=".dll"
18353+ # FIXME: Setting linknames here is a bad hack.
18354+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18355+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18356+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18357+ else
18358+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18359+ fi~
18360+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18361+ linknames='
18362+ # The linker will not automatically build a static lib if we build a DLL.
18363+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18364+ enable_shared_with_static_runtimes=yes
18365+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18366+ # Don't use ranlib
18367+ old_postinstall_cmds='chmod 644 $oldlib'
18368+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18369+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18370+ case $lt_outputfile in
18371+ *.exe|*.EXE) ;;
18372+ *)
18373+ lt_outputfile="$lt_outputfile.exe"
18374+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18375+ ;;
18376+ esac~
18377+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18378+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18379+ $RM "$lt_outputfile.manifest";
18380+ fi'
18381+ ;;
18382+ *)
18383+ # Assume MSVC wrapper
18384+ hardcode_libdir_flag_spec=' '
18385+ allow_undefined_flag=unsupported
18386+ # Tell ltmain to make .lib files, not .a files.
18387+ libext=lib
18388+ # Tell ltmain to make .dll files, not .so files.
18389+ shrext_cmds=".dll"
18390+ # FIXME: Setting linknames here is a bad hack.
18391+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18392+ # The linker will automatically build a .lib file if we build a DLL.
18393+ old_archive_from_new_cmds='true'
18394+ # FIXME: Should let the user specify the lib program.
18395+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18396+ enable_shared_with_static_runtimes=yes
18397+ ;;
18398+ esac
18399 ;;
18400
18401 darwin* | rhapsody*)
18402@@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18403
18404 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18405 freebsd* | dragonfly*)
18406- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18407+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18408 hardcode_libdir_flag_spec='-R$libdir'
18409 hardcode_direct=yes
18410 hardcode_shlibpath_var=no
18411@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18412
18413 hpux9*)
18414 if test "$GCC" = yes; then
18415- 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'
18416+ 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'
18417 else
18418 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'
18419 fi
18420@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18421
18422 hpux10*)
18423 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18424- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18425+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18426 else
18427 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18428 fi
18429@@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18430 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18431 ;;
18432 ia64*)
18433- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18434+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18435 ;;
18436 *)
18437- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18438+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18439 ;;
18440 esac
18441 else
18442@@ -9525,23 +10108,36 @@ fi
18443
18444 irix5* | irix6* | nonstopux*)
18445 if test "$GCC" = yes; then
18446- 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'
18447+ 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'
18448 # Try to use the -exported_symbol ld option, if it does not
18449 # work, assume that -exports_file does not work either and
18450 # implicitly export all symbols.
18451- save_LDFLAGS="$LDFLAGS"
18452- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18453- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18454+ # This should be the same for all languages, so no per-tag cache variable.
18455+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18456+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18457+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
18458+ $as_echo_n "(cached) " >&6
18459+else
18460+ save_LDFLAGS="$LDFLAGS"
18461+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18462+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18463 /* end confdefs.h. */
18464-int foo(void) {}
18465+int foo (void) { return 0; }
18466 _ACEOF
18467 if ac_fn_c_try_link "$LINENO"; then :
18468- 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'
18469-
18470+ lt_cv_irix_exported_symbol=yes
18471+else
18472+ lt_cv_irix_exported_symbol=no
18473 fi
18474 rm -f core conftest.err conftest.$ac_objext \
18475 conftest$ac_exeext conftest.$ac_ext
18476- LDFLAGS="$save_LDFLAGS"
18477+ LDFLAGS="$save_LDFLAGS"
18478+fi
18479+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18480+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18481+ if test "$lt_cv_irix_exported_symbol" = yes; then
18482+ 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'
18483+ fi
18484 else
18485 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'
18486 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'
18487@@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \
18488 osf4* | osf5*) # as osf3* with the addition of -msym flag
18489 if test "$GCC" = yes; then
18490 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18491- 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'
18492+ 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'
18493 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18494 else
18495 allow_undefined_flag=' -expect_unresolved \*'
18496@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \
18497 no_undefined_flag=' -z defs'
18498 if test "$GCC" = yes; then
18499 wlarc='${wl}'
18500- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18501+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18502 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18503- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18504+ $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'
18505 else
18506 case `$CC -V 2>&1` in
18507 *"Compilers 5.0"*)
18508@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18509 need_version=no
18510 need_lib_prefix=no
18511
18512- case $GCC,$host_os in
18513- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18514+ case $GCC,$cc_basename in
18515+ yes,*)
18516+ # gcc
18517 library_names_spec='$libname.dll.a'
18518 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18519 postinstall_cmds='base_file=`basename \${file}`~
18520@@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18521 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18522 ;;
18523 esac
18524+ dynamic_linker='Win32 ld.exe'
18525+ ;;
18526+
18527+ *,cl*)
18528+ # Native MSVC
18529+ libname_spec='$name'
18530+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18531+ library_names_spec='${libname}.dll.lib'
18532+
18533+ case $build_os in
18534+ mingw*)
18535+ sys_lib_search_path_spec=
18536+ lt_save_ifs=$IFS
18537+ IFS=';'
18538+ for lt_path in $LIB
18539+ do
18540+ IFS=$lt_save_ifs
18541+ # Let DOS variable expansion print the short 8.3 style file name.
18542+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18543+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18544+ done
18545+ IFS=$lt_save_ifs
18546+ # Convert to MSYS style.
18547+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18548+ ;;
18549+ cygwin*)
18550+ # Convert to unix form, then to dos form, then back to unix form
18551+ # but this time dos style (no spaces!) so that the unix form looks
18552+ # like /cygdrive/c/PROGRA~1:/cygdr...
18553+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18554+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18555+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18556+ ;;
18557+ *)
18558+ sys_lib_search_path_spec="$LIB"
18559+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18560+ # It is most probably a Windows format PATH.
18561+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18562+ else
18563+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18564+ fi
18565+ # FIXME: find the short name or the path components, as spaces are
18566+ # common. (e.g. "Program Files" -> "PROGRA~1")
18567+ ;;
18568+ esac
18569+
18570+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18571+ postinstall_cmds='base_file=`basename \${file}`~
18572+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18573+ dldir=$destdir/`dirname \$dlpath`~
18574+ test -d \$dldir || mkdir -p \$dldir~
18575+ $install_prog $dir/$dlname \$dldir/$dlname'
18576+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18577+ dlpath=$dir/\$dldll~
18578+ $RM \$dlpath'
18579+ shlibpath_overrides_runpath=yes
18580+ dynamic_linker='Win32 link.exe'
18581 ;;
18582
18583 *)
18584+ # Assume MSVC wrapper
18585 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18586+ dynamic_linker='Win32 ld.exe'
18587 ;;
18588 esac
18589- dynamic_linker='Win32 ld.exe'
18590 # FIXME: first we should search . and the directory the executable is in
18591 shlibpath_var=PATH
18592 ;;
18593@@ -10355,7 +11010,7 @@ haiku*)
18594 soname_spec='${libname}${release}${shared_ext}$major'
18595 shlibpath_var=LIBRARY_PATH
18596 shlibpath_overrides_runpath=yes
18597- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18598+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18599 hardcode_into_libs=yes
18600 ;;
18601
18602@@ -11195,10 +11850,10 @@ else
18603 /* When -fvisbility=hidden is used, assume the code has been annotated
18604 correspondingly for the symbols needed. */
18605 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18606-void fnord () __attribute__((visibility("default")));
18607+int fnord () __attribute__((visibility("default")));
18608 #endif
18609
18610-void fnord () { int i=42; }
18611+int fnord () { return 42; }
18612 int main ()
18613 {
18614 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18615@@ -11301,10 +11956,10 @@ else
18616 /* When -fvisbility=hidden is used, assume the code has been annotated
18617 correspondingly for the symbols needed. */
18618 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18619-void fnord () __attribute__((visibility("default")));
18620+int fnord () __attribute__((visibility("default")));
18621 #endif
18622
18623-void fnord () { int i=42; }
18624+int fnord () { return 42; }
18625 int main ()
18626 {
18627 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18628@@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then
18629 # since libbfd may not pull in the entirety of libiberty.
18630 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18631 if test -n "$x"; then
18632- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18633+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18634 fi
18635
18636 case "${host}" in
18637@@ -13518,13 +14173,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18638 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18639 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18640 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18641+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18642+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18643 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18644 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18645 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18646 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18647 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18648+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18649+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18650+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18651+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18652 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18653 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18654+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18655 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18656 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18657 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18658@@ -13539,14 +14201,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18659 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18660 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18661 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"`'
18662+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18663+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18664 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18665 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18666 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18667-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18668 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18669+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18670 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18671 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18672 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18673+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18674 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18675 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18676 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18677@@ -13579,12 +14244,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18678 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18679 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18680 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18681-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18682 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18683 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18684 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18685 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18686 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18687+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18688 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18689 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18690 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18691@@ -13639,8 +14304,13 @@ reload_flag \
18692 OBJDUMP \
18693 deplibs_check_method \
18694 file_magic_cmd \
18695+file_magic_glob \
18696+want_nocaseglob \
18697+DLLTOOL \
18698+sharedlib_from_linklib_cmd \
18699 AR \
18700 AR_FLAGS \
18701+archiver_list_spec \
18702 STRIP \
18703 RANLIB \
18704 CC \
18705@@ -13650,12 +14320,14 @@ lt_cv_sys_global_symbol_pipe \
18706 lt_cv_sys_global_symbol_to_cdecl \
18707 lt_cv_sys_global_symbol_to_c_name_address \
18708 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18709+nm_file_list_spec \
18710 lt_prog_compiler_no_builtin_flag \
18711-lt_prog_compiler_wl \
18712 lt_prog_compiler_pic \
18713+lt_prog_compiler_wl \
18714 lt_prog_compiler_static \
18715 lt_cv_prog_compiler_c_o \
18716 need_locks \
18717+MANIFEST_TOOL \
18718 DSYMUTIL \
18719 NMEDIT \
18720 LIPO \
18721@@ -13671,7 +14343,6 @@ no_undefined_flag \
18722 hardcode_libdir_flag_spec \
18723 hardcode_libdir_flag_spec_ld \
18724 hardcode_libdir_separator \
18725-fix_srcfile_path \
18726 exclude_expsyms \
18727 include_expsyms \
18728 file_list_spec \
18729@@ -13707,6 +14378,7 @@ module_cmds \
18730 module_expsym_cmds \
18731 export_symbols_cmds \
18732 prelink_cmds \
18733+postlink_cmds \
18734 postinstall_cmds \
18735 postuninstall_cmds \
18736 finish_cmds \
18737@@ -14463,7 +15135,8 @@ $as_echo X"$file" |
18738 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18739 #
18740 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18741-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18742+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18743+# Inc.
18744 # Written by Gordon Matzigkeit, 1996
18745 #
18746 # This file is part of GNU Libtool.
18747@@ -14566,19 +15239,42 @@ SP2NL=$lt_lt_SP2NL
18748 # turn newlines into spaces.
18749 NL2SP=$lt_lt_NL2SP
18750
18751+# convert \$build file names to \$host format.
18752+to_host_file_cmd=$lt_cv_to_host_file_cmd
18753+
18754+# convert \$build files to toolchain format.
18755+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18756+
18757 # An object symbol dumper.
18758 OBJDUMP=$lt_OBJDUMP
18759
18760 # Method to check whether dependent libraries are shared objects.
18761 deplibs_check_method=$lt_deplibs_check_method
18762
18763-# Command to use when deplibs_check_method == "file_magic".
18764+# Command to use when deplibs_check_method = "file_magic".
18765 file_magic_cmd=$lt_file_magic_cmd
18766
18767+# How to find potential files when deplibs_check_method = "file_magic".
18768+file_magic_glob=$lt_file_magic_glob
18769+
18770+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18771+want_nocaseglob=$lt_want_nocaseglob
18772+
18773+# DLL creation program.
18774+DLLTOOL=$lt_DLLTOOL
18775+
18776+# Command to associate shared and link libraries.
18777+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18778+
18779 # The archiver.
18780 AR=$lt_AR
18781+
18782+# Flags to create an archive.
18783 AR_FLAGS=$lt_AR_FLAGS
18784
18785+# How to feed a file listing to the archiver.
18786+archiver_list_spec=$lt_archiver_list_spec
18787+
18788 # A symbol stripping program.
18789 STRIP=$lt_STRIP
18790
18791@@ -14608,6 +15304,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18792 # Transform the output of nm in a C name address pair when lib prefix is needed.
18793 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18794
18795+# Specify filename containing input files for \$NM.
18796+nm_file_list_spec=$lt_nm_file_list_spec
18797+
18798+# The root where to search for dependent libraries,and in which our libraries should be installed.
18799+lt_sysroot=$lt_sysroot
18800+
18801 # The name of the directory that contains temporary libtool files.
18802 objdir=$objdir
18803
18804@@ -14617,6 +15319,9 @@ MAGIC_CMD=$MAGIC_CMD
18805 # Must we lock files when doing compilation?
18806 need_locks=$lt_need_locks
18807
18808+# Manifest tool.
18809+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18810+
18811 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18812 DSYMUTIL=$lt_DSYMUTIL
18813
18814@@ -14731,12 +15436,12 @@ with_gcc=$GCC
18815 # Compiler flag to turn off builtin functions.
18816 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18817
18818-# How to pass a linker flag through the compiler.
18819-wl=$lt_lt_prog_compiler_wl
18820-
18821 # Additional compiler flags for building library objects.
18822 pic_flag=$lt_lt_prog_compiler_pic
18823
18824+# How to pass a linker flag through the compiler.
18825+wl=$lt_lt_prog_compiler_wl
18826+
18827 # Compiler flag to prevent dynamic linking.
18828 link_static_flag=$lt_lt_prog_compiler_static
18829
18830@@ -14823,9 +15528,6 @@ inherit_rpath=$inherit_rpath
18831 # Whether libtool must link a program against all its dependency libraries.
18832 link_all_deplibs=$link_all_deplibs
18833
18834-# Fix the shell variable \$srcfile for the compiler.
18835-fix_srcfile_path=$lt_fix_srcfile_path
18836-
18837 # Set to "yes" if exported symbols are required.
18838 always_export_symbols=$always_export_symbols
18839
18840@@ -14841,6 +15543,9 @@ include_expsyms=$lt_include_expsyms
18841 # Commands necessary for linking programs (against libraries) with templates.
18842 prelink_cmds=$lt_prelink_cmds
18843
18844+# Commands necessary for finishing linking programs.
18845+postlink_cmds=$lt_postlink_cmds
18846+
18847 # Specify filename containing input files.
18848 file_list_spec=$lt_file_list_spec
18849
18850@@ -14873,210 +15578,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18851 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18852 # text mode, it properly converts lines to CR/LF. This bash problem
18853 # is reportedly fixed, but why not run on old versions too?
18854- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18855- || (rm -f "$cfgfile"; exit 1)
18856-
18857- case $xsi_shell in
18858- yes)
18859- cat << \_LT_EOF >> "$cfgfile"
18860-
18861-# func_dirname file append nondir_replacement
18862-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18863-# otherwise set result to NONDIR_REPLACEMENT.
18864-func_dirname ()
18865-{
18866- case ${1} in
18867- */*) func_dirname_result="${1%/*}${2}" ;;
18868- * ) func_dirname_result="${3}" ;;
18869- esac
18870-}
18871-
18872-# func_basename file
18873-func_basename ()
18874-{
18875- func_basename_result="${1##*/}"
18876-}
18877-
18878-# func_dirname_and_basename file append nondir_replacement
18879-# perform func_basename and func_dirname in a single function
18880-# call:
18881-# dirname: Compute the dirname of FILE. If nonempty,
18882-# add APPEND to the result, otherwise set result
18883-# to NONDIR_REPLACEMENT.
18884-# value returned in "$func_dirname_result"
18885-# basename: Compute filename of FILE.
18886-# value retuned in "$func_basename_result"
18887-# Implementation must be kept synchronized with func_dirname
18888-# and func_basename. For efficiency, we do not delegate to
18889-# those functions but instead duplicate the functionality here.
18890-func_dirname_and_basename ()
18891-{
18892- case ${1} in
18893- */*) func_dirname_result="${1%/*}${2}" ;;
18894- * ) func_dirname_result="${3}" ;;
18895- esac
18896- func_basename_result="${1##*/}"
18897-}
18898-
18899-# func_stripname prefix suffix name
18900-# strip PREFIX and SUFFIX off of NAME.
18901-# PREFIX and SUFFIX must not contain globbing or regex special
18902-# characters, hashes, percent signs, but SUFFIX may contain a leading
18903-# dot (in which case that matches only a dot).
18904-func_stripname ()
18905-{
18906- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18907- # positional parameters, so assign one to ordinary parameter first.
18908- func_stripname_result=${3}
18909- func_stripname_result=${func_stripname_result#"${1}"}
18910- func_stripname_result=${func_stripname_result%"${2}"}
18911-}
18912-
18913-# func_opt_split
18914-func_opt_split ()
18915-{
18916- func_opt_split_opt=${1%%=*}
18917- func_opt_split_arg=${1#*=}
18918-}
18919-
18920-# func_lo2o object
18921-func_lo2o ()
18922-{
18923- case ${1} in
18924- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18925- *) func_lo2o_result=${1} ;;
18926- esac
18927-}
18928-
18929-# func_xform libobj-or-source
18930-func_xform ()
18931-{
18932- func_xform_result=${1%.*}.lo
18933-}
18934-
18935-# func_arith arithmetic-term...
18936-func_arith ()
18937-{
18938- func_arith_result=$(( $* ))
18939-}
18940-
18941-# func_len string
18942-# STRING may not start with a hyphen.
18943-func_len ()
18944-{
18945- func_len_result=${#1}
18946-}
18947-
18948-_LT_EOF
18949- ;;
18950- *) # Bourne compatible functions.
18951- cat << \_LT_EOF >> "$cfgfile"
18952-
18953-# func_dirname file append nondir_replacement
18954-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18955-# otherwise set result to NONDIR_REPLACEMENT.
18956-func_dirname ()
18957-{
18958- # Extract subdirectory from the argument.
18959- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18960- if test "X$func_dirname_result" = "X${1}"; then
18961- func_dirname_result="${3}"
18962- else
18963- func_dirname_result="$func_dirname_result${2}"
18964- fi
18965-}
18966-
18967-# func_basename file
18968-func_basename ()
18969-{
18970- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18971-}
18972-
18973-
18974-# func_stripname prefix suffix name
18975-# strip PREFIX and SUFFIX off of NAME.
18976-# PREFIX and SUFFIX must not contain globbing or regex special
18977-# characters, hashes, percent signs, but SUFFIX may contain a leading
18978-# dot (in which case that matches only a dot).
18979-# func_strip_suffix prefix name
18980-func_stripname ()
18981-{
18982- case ${2} in
18983- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18984- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18985- esac
18986-}
18987-
18988-# sed scripts:
18989-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18990-my_sed_long_arg='1s/^-[^=]*=//'
18991-
18992-# func_opt_split
18993-func_opt_split ()
18994-{
18995- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18996- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18997-}
18998-
18999-# func_lo2o object
19000-func_lo2o ()
19001-{
19002- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19003-}
19004-
19005-# func_xform libobj-or-source
19006-func_xform ()
19007-{
19008- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19009-}
19010-
19011-# func_arith arithmetic-term...
19012-func_arith ()
19013-{
19014- func_arith_result=`expr "$@"`
19015-}
19016-
19017-# func_len string
19018-# STRING may not start with a hyphen.
19019-func_len ()
19020-{
19021- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19022-}
19023-
19024-_LT_EOF
19025-esac
19026-
19027-case $lt_shell_append in
19028- yes)
19029- cat << \_LT_EOF >> "$cfgfile"
19030-
19031-# func_append var value
19032-# Append VALUE to the end of shell variable VAR.
19033-func_append ()
19034-{
19035- eval "$1+=\$2"
19036-}
19037-_LT_EOF
19038- ;;
19039- *)
19040- cat << \_LT_EOF >> "$cfgfile"
19041-
19042-# func_append var value
19043-# Append VALUE to the end of shell variable VAR.
19044-func_append ()
19045-{
19046- eval "$1=\$$1\$2"
19047-}
19048-
19049-_LT_EOF
19050- ;;
19051- esac
19052-
19053-
19054- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19055- || (rm -f "$cfgfile"; exit 1)
19056-
19057- mv -f "$cfgfile" "$ofile" ||
19058+ sed '$q' "$ltmain" >> "$cfgfile" \
19059+ || (rm -f "$cfgfile"; exit 1)
19060+
19061+ if test x"$xsi_shell" = xyes; then
19062+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19063+func_dirname ()\
19064+{\
19065+\ case ${1} in\
19066+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19067+\ * ) func_dirname_result="${3}" ;;\
19068+\ esac\
19069+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19070+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19071+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19072+test 0 -eq $? || _lt_function_replace_fail=:
19073+
19074+
19075+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19076+func_basename ()\
19077+{\
19078+\ func_basename_result="${1##*/}"\
19079+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19080+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19081+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19082+test 0 -eq $? || _lt_function_replace_fail=:
19083+
19084+
19085+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19086+func_dirname_and_basename ()\
19087+{\
19088+\ case ${1} in\
19089+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19090+\ * ) func_dirname_result="${3}" ;;\
19091+\ esac\
19092+\ func_basename_result="${1##*/}"\
19093+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19094+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19095+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19096+test 0 -eq $? || _lt_function_replace_fail=:
19097+
19098+
19099+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19100+func_stripname ()\
19101+{\
19102+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19103+\ # positional parameters, so assign one to ordinary parameter first.\
19104+\ func_stripname_result=${3}\
19105+\ func_stripname_result=${func_stripname_result#"${1}"}\
19106+\ func_stripname_result=${func_stripname_result%"${2}"}\
19107+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19108+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19109+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19110+test 0 -eq $? || _lt_function_replace_fail=:
19111+
19112+
19113+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19114+func_split_long_opt ()\
19115+{\
19116+\ func_split_long_opt_name=${1%%=*}\
19117+\ func_split_long_opt_arg=${1#*=}\
19118+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19119+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19120+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19121+test 0 -eq $? || _lt_function_replace_fail=:
19122+
19123+
19124+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19125+func_split_short_opt ()\
19126+{\
19127+\ func_split_short_opt_arg=${1#??}\
19128+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19129+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19130+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19131+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19132+test 0 -eq $? || _lt_function_replace_fail=:
19133+
19134+
19135+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19136+func_lo2o ()\
19137+{\
19138+\ case ${1} in\
19139+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19140+\ *) func_lo2o_result=${1} ;;\
19141+\ esac\
19142+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19143+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19144+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19145+test 0 -eq $? || _lt_function_replace_fail=:
19146+
19147+
19148+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19149+func_xform ()\
19150+{\
19151+ func_xform_result=${1%.*}.lo\
19152+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19153+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19154+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19155+test 0 -eq $? || _lt_function_replace_fail=:
19156+
19157+
19158+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19159+func_arith ()\
19160+{\
19161+ func_arith_result=$(( $* ))\
19162+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19163+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19164+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19165+test 0 -eq $? || _lt_function_replace_fail=:
19166+
19167+
19168+ sed -e '/^func_len ()$/,/^} # func_len /c\
19169+func_len ()\
19170+{\
19171+ func_len_result=${#1}\
19172+} # Extended-shell func_len 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+fi
19178+
19179+if test x"$lt_shell_append" = xyes; then
19180+ sed -e '/^func_append ()$/,/^} # func_append /c\
19181+func_append ()\
19182+{\
19183+ eval "${1}+=\\${2}"\
19184+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
19185+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19186+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19187+test 0 -eq $? || _lt_function_replace_fail=:
19188+
19189+
19190+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19191+func_append_quoted ()\
19192+{\
19193+\ func_quote_for_eval "${2}"\
19194+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19195+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19196+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19197+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19198+test 0 -eq $? || _lt_function_replace_fail=:
19199+
19200+
19201+ # Save a `func_append' function call where possible by direct use of '+='
19202+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19203+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19204+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19205+ test 0 -eq $? || _lt_function_replace_fail=:
19206+else
19207+ # Save a `func_append' function call even when '+=' is not available
19208+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19209+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19210+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19211+ test 0 -eq $? || _lt_function_replace_fail=:
19212+fi
19213+
19214+if test x"$_lt_function_replace_fail" = x":"; then
19215+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19216+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19217+fi
19218+
19219+
19220+ mv -f "$cfgfile" "$ofile" ||
19221 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19222 chmod +x "$ofile"
19223
19224diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19225index b9f5eb8a4f..a31b66a2f0 100644
19226--- a/opcodes/configure.ac
19227+++ b/opcodes/configure.ac
19228@@ -167,7 +167,7 @@ changequote(,)dnl
19229 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19230 changequote([,])dnl
19231 if test -n "$x"; then
19232- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19233+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19234 fi
19235
19236 case "${host}" in
19237diff --git a/zlib/configure b/zlib/configure
19238index bed9e3ea2b..caef0b674e 100755
19239--- a/zlib/configure
19240+++ b/zlib/configure
19241@@ -614,8 +614,11 @@ OTOOL
19242 LIPO
19243 NMEDIT
19244 DSYMUTIL
19245+MANIFEST_TOOL
19246 RANLIB
19247+ac_ct_AR
19248 AR
19249+DLLTOOL
19250 OBJDUMP
19251 LN_S
19252 NM
19253@@ -737,6 +740,7 @@ enable_static
19254 with_pic
19255 enable_fast_install
19256 with_gnu_ld
19257+with_libtool_sysroot
19258 enable_libtool_lock
19259 enable_host_shared
19260 '
19261@@ -1385,6 +1389,8 @@ Optional Packages:
19262 --with-pic try to use only PIC/non-PIC objects [default=use
19263 both]
19264 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19265+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19266+ (or the compiler's sysroot if not specified).
19267
19268 Some influential environment variables:
19269 CC C compiler command
19270@@ -3910,8 +3916,8 @@ esac
19271
19272
19273
19274-macro_version='2.2.7a'
19275-macro_revision='1.3134'
19276+macro_version='2.4'
19277+macro_revision='1.3293'
19278
19279
19280
19281@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19282 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19283 $as_echo_n "checking how to print strings... " >&6; }
19284 # Test print first, because it will be a builtin if present.
19285-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19286+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19287 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19288 ECHO='print -r --'
19289 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19290@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19291 # Try some XSI features
19292 xsi_shell=no
19293 ( _lt_dummy="a/b/c"
19294- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19295- = c,a/b,, \
19296+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19297+ = c,a/b,b/c, \
19298 && eval 'test $(( 1 + 1 )) -eq 2 \
19299 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19300 && xsi_shell=yes
19301@@ -4817,6 +4823,80 @@ esac
19302
19303
19304
19305+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19306+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19307+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
19308+ $as_echo_n "(cached) " >&6
19309+else
19310+ case $host in
19311+ *-*-mingw* )
19312+ case $build in
19313+ *-*-mingw* ) # actually msys
19314+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19315+ ;;
19316+ *-*-cygwin* )
19317+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19318+ ;;
19319+ * ) # otherwise, assume *nix
19320+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19321+ ;;
19322+ esac
19323+ ;;
19324+ *-*-cygwin* )
19325+ case $build in
19326+ *-*-mingw* ) # actually msys
19327+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19328+ ;;
19329+ *-*-cygwin* )
19330+ lt_cv_to_host_file_cmd=func_convert_file_noop
19331+ ;;
19332+ * ) # otherwise, assume *nix
19333+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19334+ ;;
19335+ esac
19336+ ;;
19337+ * ) # unhandled hosts (and "normal" native builds)
19338+ lt_cv_to_host_file_cmd=func_convert_file_noop
19339+ ;;
19340+esac
19341+
19342+fi
19343+
19344+to_host_file_cmd=$lt_cv_to_host_file_cmd
19345+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19346+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19347+
19348+
19349+
19350+
19351+
19352+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19353+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19354+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
19355+ $as_echo_n "(cached) " >&6
19356+else
19357+ #assume ordinary cross tools, or native build.
19358+lt_cv_to_tool_file_cmd=func_convert_file_noop
19359+case $host in
19360+ *-*-mingw* )
19361+ case $build in
19362+ *-*-mingw* ) # actually msys
19363+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19364+ ;;
19365+ esac
19366+ ;;
19367+esac
19368+
19369+fi
19370+
19371+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19372+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19373+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19374+
19375+
19376+
19377+
19378+
19379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19380 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19381 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19382@@ -4833,6 +4913,11 @@ case $reload_flag in
19383 esac
19384 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19385 case $host_os in
19386+ cygwin* | mingw* | pw32* | cegcc*)
19387+ if test "$GCC" != yes; then
19388+ reload_cmds=false
19389+ fi
19390+ ;;
19391 darwin*)
19392 if test "$GCC" = yes; then
19393 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19394@@ -5001,7 +5086,8 @@ mingw* | pw32*)
19395 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19396 lt_cv_file_magic_cmd='func_win32_libid'
19397 else
19398- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19399+ # Keep this pattern in sync with the one in func_win32_libid.
19400+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19401 lt_cv_file_magic_cmd='$OBJDUMP -f'
19402 fi
19403 ;;
19404@@ -5155,6 +5241,21 @@ esac
19405 fi
19406 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19407 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19408+
19409+file_magic_glob=
19410+want_nocaseglob=no
19411+if test "$build" = "$host"; then
19412+ case $host_os in
19413+ mingw* | pw32*)
19414+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19415+ want_nocaseglob=yes
19416+ else
19417+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19418+ fi
19419+ ;;
19420+ esac
19421+fi
19422+
19423 file_magic_cmd=$lt_cv_file_magic_cmd
19424 deplibs_check_method=$lt_cv_deplibs_check_method
19425 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19426@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19427
19428
19429
19430+
19431+
19432+
19433+
19434+
19435+
19436+
19437+
19438+
19439+
19440 if test -n "$ac_tool_prefix"; then
19441- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19442-set dummy ${ac_tool_prefix}ar; ac_word=$2
19443+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19444+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19445+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19446+$as_echo_n "checking for $ac_word... " >&6; }
19447+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
19448+ $as_echo_n "(cached) " >&6
19449+else
19450+ if test -n "$DLLTOOL"; then
19451+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19452+else
19453+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19454+for as_dir in $PATH
19455+do
19456+ IFS=$as_save_IFS
19457+ test -z "$as_dir" && as_dir=.
19458+ for ac_exec_ext in '' $ac_executable_extensions; do
19459+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19460+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19461+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19462+ break 2
19463+ fi
19464+done
19465+ done
19466+IFS=$as_save_IFS
19467+
19468+fi
19469+fi
19470+DLLTOOL=$ac_cv_prog_DLLTOOL
19471+if test -n "$DLLTOOL"; then
19472+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19473+$as_echo "$DLLTOOL" >&6; }
19474+else
19475+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19476+$as_echo "no" >&6; }
19477+fi
19478+
19479+
19480+fi
19481+if test -z "$ac_cv_prog_DLLTOOL"; then
19482+ ac_ct_DLLTOOL=$DLLTOOL
19483+ # Extract the first word of "dlltool", so it can be a program name with args.
19484+set dummy dlltool; ac_word=$2
19485+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19486+$as_echo_n "checking for $ac_word... " >&6; }
19487+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
19488+ $as_echo_n "(cached) " >&6
19489+else
19490+ if test -n "$ac_ct_DLLTOOL"; then
19491+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19492+else
19493+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19494+for as_dir in $PATH
19495+do
19496+ IFS=$as_save_IFS
19497+ test -z "$as_dir" && as_dir=.
19498+ for ac_exec_ext in '' $ac_executable_extensions; do
19499+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19500+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19501+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19502+ break 2
19503+ fi
19504+done
19505+ done
19506+IFS=$as_save_IFS
19507+
19508+fi
19509+fi
19510+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19511+if test -n "$ac_ct_DLLTOOL"; then
19512+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19513+$as_echo "$ac_ct_DLLTOOL" >&6; }
19514+else
19515+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19516+$as_echo "no" >&6; }
19517+fi
19518+
19519+ if test "x$ac_ct_DLLTOOL" = x; then
19520+ DLLTOOL="false"
19521+ else
19522+ case $cross_compiling:$ac_tool_warned in
19523+yes:)
19524+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19525+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19526+ac_tool_warned=yes ;;
19527+esac
19528+ DLLTOOL=$ac_ct_DLLTOOL
19529+ fi
19530+else
19531+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19532+fi
19533+
19534+test -z "$DLLTOOL" && DLLTOOL=dlltool
19535+
19536+
19537+
19538+
19539+
19540+
19541+
19542+
19543+
19544+
19545+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19546+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19547+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
19548+ $as_echo_n "(cached) " >&6
19549+else
19550+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19551+
19552+case $host_os in
19553+cygwin* | mingw* | pw32* | cegcc*)
19554+ # two different shell functions defined in ltmain.sh
19555+ # decide which to use based on capabilities of $DLLTOOL
19556+ case `$DLLTOOL --help 2>&1` in
19557+ *--identify-strict*)
19558+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19559+ ;;
19560+ *)
19561+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19562+ ;;
19563+ esac
19564+ ;;
19565+*)
19566+ # fallback: assume linklib IS sharedlib
19567+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19568+ ;;
19569+esac
19570+
19571+fi
19572+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19573+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19574+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19575+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19576+
19577+
19578+
19579+
19580+
19581+
19582+
19583+
19584+if test -n "$ac_tool_prefix"; then
19585+ for ac_prog in ar
19586+ do
19587+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19588+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19590 $as_echo_n "checking for $ac_word... " >&6; }
19591 if test "${ac_cv_prog_AR+set}" = set; then :
19592@@ -5188,7 +5443,7 @@ do
19593 test -z "$as_dir" && as_dir=.
19594 for ac_exec_ext in '' $ac_executable_extensions; do
19595 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19596- ac_cv_prog_AR="${ac_tool_prefix}ar"
19597+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19598 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19599 break 2
19600 fi
19601@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }
19602 fi
19603
19604
19605+ test -n "$AR" && break
19606+ done
19607 fi
19608-if test -z "$ac_cv_prog_AR"; then
19609+if test -z "$AR"; then
19610 ac_ct_AR=$AR
19611- # Extract the first word of "ar", so it can be a program name with args.
19612-set dummy ar; ac_word=$2
19613+ for ac_prog in ar
19614+do
19615+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19616+set dummy $ac_prog; ac_word=$2
19617 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19618 $as_echo_n "checking for $ac_word... " >&6; }
19619 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19620@@ -5228,7 +5487,7 @@ do
19621 test -z "$as_dir" && as_dir=.
19622 for ac_exec_ext in '' $ac_executable_extensions; do
19623 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19624- ac_cv_prog_ac_ct_AR="ar"
19625+ ac_cv_prog_ac_ct_AR="$ac_prog"
19626 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19627 break 2
19628 fi
19629@@ -5247,6 +5506,10 @@ else
19630 $as_echo "no" >&6; }
19631 fi
19632
19633+
19634+ test -n "$ac_ct_AR" && break
19635+done
19636+
19637 if test "x$ac_ct_AR" = x; then
19638 AR="false"
19639 else
19640@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;
19641 esac
19642 AR=$ac_ct_AR
19643 fi
19644-else
19645- AR="$ac_cv_prog_AR"
19646 fi
19647
19648-test -z "$AR" && AR=ar
19649-test -z "$AR_FLAGS" && AR_FLAGS=cru
19650+: ${AR=ar}
19651+: ${AR_FLAGS=cru}
19652+
19653+
19654+
19655+
19656+
19657+
19658+
19659+
19660+
19661+
19662+
19663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19664+$as_echo_n "checking for archiver @FILE support... " >&6; }
19665+if test "${lt_cv_ar_at_file+set}" = set; then :
19666+ $as_echo_n "(cached) " >&6
19667+else
19668+ lt_cv_ar_at_file=no
19669+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19670+/* end confdefs.h. */
19671+
19672+int
19673+main ()
19674+{
19675
19676+ ;
19677+ return 0;
19678+}
19679+_ACEOF
19680+if ac_fn_c_try_compile "$LINENO"; then :
19681+ echo conftest.$ac_objext > conftest.lst
19682+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19683+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19684+ (eval $lt_ar_try) 2>&5
19685+ ac_status=$?
19686+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19687+ test $ac_status = 0; }
19688+ if test "$ac_status" -eq 0; then
19689+ # Ensure the archiver fails upon bogus file names.
19690+ rm -f conftest.$ac_objext libconftest.a
19691+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19692+ (eval $lt_ar_try) 2>&5
19693+ ac_status=$?
19694+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19695+ test $ac_status = 0; }
19696+ if test "$ac_status" -ne 0; then
19697+ lt_cv_ar_at_file=@
19698+ fi
19699+ fi
19700+ rm -f conftest.* libconftest.a
19701
19702+fi
19703+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19704
19705+fi
19706+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19707+$as_echo "$lt_cv_ar_at_file" >&6; }
19708
19709+if test "x$lt_cv_ar_at_file" = xno; then
19710+ archiver_list_spec=
19711+else
19712+ archiver_list_spec=$lt_cv_ar_at_file
19713+fi
19714
19715
19716
19717@@ -5609,8 +5928,8 @@ esac
19718 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19719
19720 # Transform an extracted symbol line into symbol name and symbol address
19721-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19722-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'"
19723+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19724+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'"
19725
19726 # Handle CRLF in mingw tool chain
19727 opt_cr=
19728@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do
19729 else
19730 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19731 fi
19732+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19733
19734 # Check to see that the pipe works correctly.
19735 pipe_works=no
19736@@ -5687,6 +6007,18 @@ _LT_EOF
19737 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19738 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19739 cat <<_LT_EOF > conftest.$ac_ext
19740+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19741+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19742+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19743+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19744+# define LT_DLSYM_CONST
19745+#elif defined(__osf__)
19746+/* This system does not cope well with relocations in const data. */
19747+# define LT_DLSYM_CONST
19748+#else
19749+# define LT_DLSYM_CONST const
19750+#endif
19751+
19752 #ifdef __cplusplus
19753 extern "C" {
19754 #endif
19755@@ -5698,7 +6030,7 @@ _LT_EOF
19756 cat <<_LT_EOF >> conftest.$ac_ext
19757
19758 /* The mapping between symbol names and symbols. */
19759-const struct {
19760+LT_DLSYM_CONST struct {
19761 const char *name;
19762 void *address;
19763 }
19764@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {
19765 _LT_EOF
19766 # Now try linking the two files.
19767 mv conftest.$ac_objext conftstm.$ac_objext
19768- lt_save_LIBS="$LIBS"
19769- lt_save_CFLAGS="$CFLAGS"
19770+ lt_globsym_save_LIBS=$LIBS
19771+ lt_globsym_save_CFLAGS=$CFLAGS
19772 LIBS="conftstm.$ac_objext"
19773 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19774 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19775@@ -5735,8 +6067,8 @@ _LT_EOF
19776 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19777 pipe_works=yes
19778 fi
19779- LIBS="$lt_save_LIBS"
19780- CFLAGS="$lt_save_CFLAGS"
19781+ LIBS=$lt_globsym_save_LIBS
19782+ CFLAGS=$lt_globsym_save_CFLAGS
19783 else
19784 echo "cannot find nm_test_func in $nlist" >&5
19785 fi
19786@@ -5773,6 +6105,19 @@ else
19787 $as_echo "ok" >&6; }
19788 fi
19789
19790+# Response file support.
19791+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19792+ nm_file_list_spec='@'
19793+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19794+ nm_file_list_spec='@'
19795+fi
19796+
19797+
19798+
19799+
19800+
19801+
19802+
19803
19804
19805
19806@@ -5793,6 +6138,41 @@ fi
19807
19808
19809
19810+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19811+$as_echo_n "checking for sysroot... " >&6; }
19812+
19813+# Check whether --with-libtool-sysroot was given.
19814+if test "${with_libtool_sysroot+set}" = set; then :
19815+ withval=$with_libtool_sysroot;
19816+else
19817+ with_libtool_sysroot=no
19818+fi
19819+
19820+
19821+lt_sysroot=
19822+case ${with_libtool_sysroot} in #(
19823+ yes)
19824+ if test "$GCC" = yes; then
19825+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19826+ fi
19827+ ;; #(
19828+ /*)
19829+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19830+ ;; #(
19831+ no|'')
19832+ ;; #(
19833+ *)
19834+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19835+$as_echo "${with_libtool_sysroot}" >&6; }
19836+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
19837+ ;;
19838+esac
19839+
19840+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19841+$as_echo "${lt_sysroot:-no}" >&6; }
19842+
19843+
19844+
19845
19846
19847 # Check whether --enable-libtool-lock was given.
19848@@ -6004,6 +6384,123 @@ esac
19849
19850 need_locks="$enable_libtool_lock"
19851
19852+if test -n "$ac_tool_prefix"; then
19853+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19854+set dummy ${ac_tool_prefix}mt; ac_word=$2
19855+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19856+$as_echo_n "checking for $ac_word... " >&6; }
19857+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
19858+ $as_echo_n "(cached) " >&6
19859+else
19860+ if test -n "$MANIFEST_TOOL"; then
19861+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19862+else
19863+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19864+for as_dir in $PATH
19865+do
19866+ IFS=$as_save_IFS
19867+ test -z "$as_dir" && as_dir=.
19868+ for ac_exec_ext in '' $ac_executable_extensions; do
19869+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19870+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19871+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19872+ break 2
19873+ fi
19874+done
19875+ done
19876+IFS=$as_save_IFS
19877+
19878+fi
19879+fi
19880+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19881+if test -n "$MANIFEST_TOOL"; then
19882+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19883+$as_echo "$MANIFEST_TOOL" >&6; }
19884+else
19885+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19886+$as_echo "no" >&6; }
19887+fi
19888+
19889+
19890+fi
19891+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19892+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19893+ # Extract the first word of "mt", so it can be a program name with args.
19894+set dummy mt; ac_word=$2
19895+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19896+$as_echo_n "checking for $ac_word... " >&6; }
19897+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
19898+ $as_echo_n "(cached) " >&6
19899+else
19900+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19901+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19902+else
19903+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19904+for as_dir in $PATH
19905+do
19906+ IFS=$as_save_IFS
19907+ test -z "$as_dir" && as_dir=.
19908+ for ac_exec_ext in '' $ac_executable_extensions; do
19909+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19910+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19911+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19912+ break 2
19913+ fi
19914+done
19915+ done
19916+IFS=$as_save_IFS
19917+
19918+fi
19919+fi
19920+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
19921+if test -n "$ac_ct_MANIFEST_TOOL"; then
19922+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
19923+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
19924+else
19925+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19926+$as_echo "no" >&6; }
19927+fi
19928+
19929+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
19930+ MANIFEST_TOOL=":"
19931+ else
19932+ case $cross_compiling:$ac_tool_warned in
19933+yes:)
19934+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19935+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19936+ac_tool_warned=yes ;;
19937+esac
19938+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
19939+ fi
19940+else
19941+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
19942+fi
19943+
19944+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19945+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19946+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19947+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
19948+ $as_echo_n "(cached) " >&6
19949+else
19950+ lt_cv_path_mainfest_tool=no
19951+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
19952+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
19953+ cat conftest.err >&5
19954+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
19955+ lt_cv_path_mainfest_tool=yes
19956+ fi
19957+ rm -f conftest*
19958+fi
19959+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
19960+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
19961+if test "x$lt_cv_path_mainfest_tool" != xyes; then
19962+ MANIFEST_TOOL=:
19963+fi
19964+
19965+
19966+
19967+
19968+
19969
19970 case $host_os in
19971 rhapsody* | darwin*)
19972@@ -6570,6 +7067,8 @@ _LT_EOF
19973 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19974 echo "$AR cru libconftest.a conftest.o" >&5
19975 $AR cru libconftest.a conftest.o 2>&5
19976+ echo "$RANLIB libconftest.a" >&5
19977+ $RANLIB libconftest.a 2>&5
19978 cat > conftest.c << _LT_EOF
19979 int main() { return 0;}
19980 _LT_EOF
19981@@ -7033,7 +7532,8 @@ fi
19982 LIBTOOL_DEPS="$ltmain"
19983
19984 # Always use our own libtool.
19985-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
19986+LIBTOOL='$(SHELL) $(top_builddir)'
19987+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
19988
19989
19990
19991@@ -7122,7 +7622,7 @@ aix3*)
19992 esac
19993
19994 # Global variables:
19995-ofile=libtool
19996+ofile=${host_alias}-libtool
19997 can_build_shared=yes
19998
19999 # All known linkers require a `.a' archive for static linking (except MSVC,
20000@@ -7420,8 +7920,6 @@ fi
20001 lt_prog_compiler_pic=
20002 lt_prog_compiler_static=
20003
20004-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20005-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20006
20007 if test "$GCC" = yes; then
20008 lt_prog_compiler_wl='-Wl,'
20009@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20010 lt_prog_compiler_pic='--shared'
20011 lt_prog_compiler_static='--static'
20012 ;;
20013+ nagfor*)
20014+ # NAG Fortran compiler
20015+ lt_prog_compiler_wl='-Wl,-Wl,,'
20016+ lt_prog_compiler_pic='-PIC'
20017+ lt_prog_compiler_static='-Bstatic'
20018+ ;;
20019 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20020 # Portland Group compilers (*not* the Pentium gcc compiler,
20021 # which looks to be a dead project)
20022@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20023 lt_prog_compiler_pic='-KPIC'
20024 lt_prog_compiler_static='-Bstatic'
20025 case $cc_basename in
20026- f77* | f90* | f95*)
20027+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20028 lt_prog_compiler_wl='-Qoption ld ';;
20029 *)
20030 lt_prog_compiler_wl='-Wl,';;
20031@@ -7706,13 +8210,17 @@ case $host_os in
20032 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20033 ;;
20034 esac
20035-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20036-$as_echo "$lt_prog_compiler_pic" >&6; }
20037-
20038-
20039-
20040-
20041
20042+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20043+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20044+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
20045+ $as_echo_n "(cached) " >&6
20046+else
20047+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20048+fi
20049+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20050+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20051+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20052
20053 #
20054 # Check to make sure the PIC flag actually works.
20055@@ -7773,6 +8281,11 @@ fi
20056
20057
20058
20059+
20060+
20061+
20062+
20063+
20064 #
20065 # Check to make sure the static flag actually works.
20066 #
20067@@ -8123,7 +8636,8 @@ _LT_EOF
20068 allow_undefined_flag=unsupported
20069 always_export_symbols=no
20070 enable_shared_with_static_runtimes=yes
20071- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20072+ 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'
20073+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20074
20075 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20076 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20077@@ -8222,12 +8736,12 @@ _LT_EOF
20078 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20079 hardcode_libdir_flag_spec=
20080 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20081- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20082+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20083 if test "x$supports_anon_versioning" = xyes; then
20084 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20085 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20086 echo "local: *; };" >> $output_objdir/$libname.ver~
20087- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20088+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20089 fi
20090 ;;
20091 esac
20092@@ -8241,8 +8755,8 @@ _LT_EOF
20093 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20094 wlarc=
20095 else
20096- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20097- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20098+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20099+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20100 fi
20101 ;;
20102
20103@@ -8260,8 +8774,8 @@ _LT_EOF
20104
20105 _LT_EOF
20106 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20107- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20108- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20109+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20110+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20111 else
20112 ld_shlibs=no
20113 fi
20114@@ -8307,8 +8821,8 @@ _LT_EOF
20115
20116 *)
20117 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20118- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20119- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20120+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20121+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20122 else
20123 ld_shlibs=no
20124 fi
20125@@ -8438,7 +8952,13 @@ _LT_EOF
20126 allow_undefined_flag='-berok'
20127 # Determine the default libpath from the value encoded in an
20128 # empty executable.
20129- if test x$gcc_no_link = xyes; then
20130+ if test "${lt_cv_aix_libpath+set}" = set; then
20131+ aix_libpath=$lt_cv_aix_libpath
20132+else
20133+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20134+ $as_echo_n "(cached) " >&6
20135+else
20136+ if test x$gcc_no_link = xyes; then
20137 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20138 fi
20139 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20140@@ -8454,22 +8974,29 @@ main ()
20141 _ACEOF
20142 if ac_fn_c_try_link "$LINENO"; then :
20143
20144-lt_aix_libpath_sed='
20145- /Import File Strings/,/^$/ {
20146- /^0/ {
20147- s/^0 *\(.*\)$/\1/
20148- p
20149- }
20150- }'
20151-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 "$aix_libpath"; then
20154- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20155-fi
20156+ lt_aix_libpath_sed='
20157+ /Import File Strings/,/^$/ {
20158+ /^0/ {
20159+ s/^0 *\([^ ]*\) *$/\1/
20160+ p
20161+ }
20162+ }'
20163+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20164+ # Check for a 64-bit object if we didn't find anything.
20165+ if test -z "$lt_cv_aix_libpath_"; then
20166+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20167+ fi
20168 fi
20169 rm -f core conftest.err conftest.$ac_objext \
20170 conftest$ac_exeext conftest.$ac_ext
20171-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20172+ if test -z "$lt_cv_aix_libpath_"; then
20173+ lt_cv_aix_libpath_="/usr/lib:/lib"
20174+ fi
20175+
20176+fi
20177+
20178+ aix_libpath=$lt_cv_aix_libpath_
20179+fi
20180
20181 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20182 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"
20183@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20184 else
20185 # Determine the default libpath from the value encoded in an
20186 # empty executable.
20187- if test x$gcc_no_link = xyes; then
20188+ if test "${lt_cv_aix_libpath+set}" = set; then
20189+ aix_libpath=$lt_cv_aix_libpath
20190+else
20191+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20192+ $as_echo_n "(cached) " >&6
20193+else
20194+ if test x$gcc_no_link = xyes; then
20195 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20196 fi
20197 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20198@@ -8497,22 +9030,29 @@ main ()
20199 _ACEOF
20200 if ac_fn_c_try_link "$LINENO"; then :
20201
20202-lt_aix_libpath_sed='
20203- /Import File Strings/,/^$/ {
20204- /^0/ {
20205- s/^0 *\(.*\)$/\1/
20206- p
20207- }
20208- }'
20209-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 "$aix_libpath"; then
20212- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20213-fi
20214+ lt_aix_libpath_sed='
20215+ /Import File Strings/,/^$/ {
20216+ /^0/ {
20217+ s/^0 *\([^ ]*\) *$/\1/
20218+ p
20219+ }
20220+ }'
20221+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20222+ # Check for a 64-bit object if we didn't find anything.
20223+ if test -z "$lt_cv_aix_libpath_"; then
20224+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20225+ fi
20226 fi
20227 rm -f core conftest.err conftest.$ac_objext \
20228 conftest$ac_exeext conftest.$ac_ext
20229-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20230+ if test -z "$lt_cv_aix_libpath_"; then
20231+ lt_cv_aix_libpath_="/usr/lib:/lib"
20232+ fi
20233+
20234+fi
20235+
20236+ aix_libpath=$lt_cv_aix_libpath_
20237+fi
20238
20239 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20240 # Warning - without using the other run time loading flags,
20241@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20242 # Microsoft Visual C++.
20243 # hardcode_libdir_flag_spec is actually meaningless, as there is
20244 # no search path for DLLs.
20245- hardcode_libdir_flag_spec=' '
20246- allow_undefined_flag=unsupported
20247- # Tell ltmain to make .lib files, not .a files.
20248- libext=lib
20249- # Tell ltmain to make .dll files, not .so files.
20250- shrext_cmds=".dll"
20251- # FIXME: Setting linknames here is a bad hack.
20252- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20253- # The linker will automatically build a .lib file if we build a DLL.
20254- old_archive_from_new_cmds='true'
20255- # FIXME: Should let the user specify the lib program.
20256- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20257- fix_srcfile_path='`cygpath -w "$srcfile"`'
20258- enable_shared_with_static_runtimes=yes
20259+ case $cc_basename in
20260+ cl*)
20261+ # Native MSVC
20262+ hardcode_libdir_flag_spec=' '
20263+ allow_undefined_flag=unsupported
20264+ always_export_symbols=yes
20265+ file_list_spec='@'
20266+ # Tell ltmain to make .lib files, not .a files.
20267+ libext=lib
20268+ # Tell ltmain to make .dll files, not .so files.
20269+ shrext_cmds=".dll"
20270+ # FIXME: Setting linknames here is a bad hack.
20271+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20272+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20273+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20274+ else
20275+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20276+ fi~
20277+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20278+ linknames='
20279+ # The linker will not automatically build a static lib if we build a DLL.
20280+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20281+ enable_shared_with_static_runtimes=yes
20282+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20283+ # Don't use ranlib
20284+ old_postinstall_cmds='chmod 644 $oldlib'
20285+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20286+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20287+ case $lt_outputfile in
20288+ *.exe|*.EXE) ;;
20289+ *)
20290+ lt_outputfile="$lt_outputfile.exe"
20291+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20292+ ;;
20293+ esac~
20294+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20295+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20296+ $RM "$lt_outputfile.manifest";
20297+ fi'
20298+ ;;
20299+ *)
20300+ # Assume MSVC wrapper
20301+ hardcode_libdir_flag_spec=' '
20302+ allow_undefined_flag=unsupported
20303+ # Tell ltmain to make .lib files, not .a files.
20304+ libext=lib
20305+ # Tell ltmain to make .dll files, not .so files.
20306+ shrext_cmds=".dll"
20307+ # FIXME: Setting linknames here is a bad hack.
20308+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20309+ # The linker will automatically build a .lib file if we build a DLL.
20310+ old_archive_from_new_cmds='true'
20311+ # FIXME: Should let the user specify the lib program.
20312+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20313+ enable_shared_with_static_runtimes=yes
20314+ ;;
20315+ esac
20316 ;;
20317
20318 darwin* | rhapsody*)
20319@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20320
20321 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20322 freebsd* | dragonfly*)
20323- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20324+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20325 hardcode_libdir_flag_spec='-R$libdir'
20326 hardcode_direct=yes
20327 hardcode_shlibpath_var=no
20328@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20329
20330 hpux9*)
20331 if test "$GCC" = yes; then
20332- 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'
20333+ 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'
20334 else
20335 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'
20336 fi
20337@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20338
20339 hpux10*)
20340 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20341- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20342+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20343 else
20344 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20345 fi
20346@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20347 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20348 ;;
20349 ia64*)
20350- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20351+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20352 ;;
20353 *)
20354- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20355+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20356 ;;
20357 esac
20358 else
20359@@ -8761,26 +9344,39 @@ fi
20360
20361 irix5* | irix6* | nonstopux*)
20362 if test "$GCC" = yes; then
20363- 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'
20364+ 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'
20365 # Try to use the -exported_symbol ld option, if it does not
20366 # work, assume that -exports_file does not work either and
20367 # implicitly export all symbols.
20368- save_LDFLAGS="$LDFLAGS"
20369- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20370- if test x$gcc_no_link = xyes; then
20371+ # This should be the same for all languages, so no per-tag cache variable.
20372+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20373+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20374+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
20375+ $as_echo_n "(cached) " >&6
20376+else
20377+ save_LDFLAGS="$LDFLAGS"
20378+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20379+ if test x$gcc_no_link = xyes; then
20380 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20381 fi
20382 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20383 /* end confdefs.h. */
20384-int foo(void) {}
20385+int foo (void) { return 0; }
20386 _ACEOF
20387 if ac_fn_c_try_link "$LINENO"; then :
20388- 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'
20389-
20390+ lt_cv_irix_exported_symbol=yes
20391+else
20392+ lt_cv_irix_exported_symbol=no
20393 fi
20394 rm -f core conftest.err conftest.$ac_objext \
20395 conftest$ac_exeext conftest.$ac_ext
20396- LDFLAGS="$save_LDFLAGS"
20397+ LDFLAGS="$save_LDFLAGS"
20398+fi
20399+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20400+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20401+ if test "$lt_cv_irix_exported_symbol" = yes; then
20402+ 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'
20403+ fi
20404 else
20405 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'
20406 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'
20407@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \
20408 osf4* | osf5*) # as osf3* with the addition of -msym flag
20409 if test "$GCC" = yes; then
20410 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20411- 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'
20412+ 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'
20413 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20414 else
20415 allow_undefined_flag=' -expect_unresolved \*'
20416@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \
20417 no_undefined_flag=' -z defs'
20418 if test "$GCC" = yes; then
20419 wlarc='${wl}'
20420- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20421+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20422 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20423- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20424+ $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'
20425 else
20426 case `$CC -V 2>&1` in
20427 *"Compilers 5.0"*)
20428@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20429 need_version=no
20430 need_lib_prefix=no
20431
20432- case $GCC,$host_os in
20433- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20434+ case $GCC,$cc_basename in
20435+ yes,*)
20436+ # gcc
20437 library_names_spec='$libname.dll.a'
20438 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20439 postinstall_cmds='base_file=`basename \${file}`~
20440@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20441 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20442 ;;
20443 esac
20444+ dynamic_linker='Win32 ld.exe'
20445+ ;;
20446+
20447+ *,cl*)
20448+ # Native MSVC
20449+ libname_spec='$name'
20450+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20451+ library_names_spec='${libname}.dll.lib'
20452+
20453+ case $build_os in
20454+ mingw*)
20455+ sys_lib_search_path_spec=
20456+ lt_save_ifs=$IFS
20457+ IFS=';'
20458+ for lt_path in $LIB
20459+ do
20460+ IFS=$lt_save_ifs
20461+ # Let DOS variable expansion print the short 8.3 style file name.
20462+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20463+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20464+ done
20465+ IFS=$lt_save_ifs
20466+ # Convert to MSYS style.
20467+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20468+ ;;
20469+ cygwin*)
20470+ # Convert to unix form, then to dos form, then back to unix form
20471+ # but this time dos style (no spaces!) so that the unix form looks
20472+ # like /cygdrive/c/PROGRA~1:/cygdr...
20473+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20474+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20475+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20476+ ;;
20477+ *)
20478+ sys_lib_search_path_spec="$LIB"
20479+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20480+ # It is most probably a Windows format PATH.
20481+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20482+ else
20483+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20484+ fi
20485+ # FIXME: find the short name or the path components, as spaces are
20486+ # common. (e.g. "Program Files" -> "PROGRA~1")
20487+ ;;
20488+ esac
20489+
20490+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20491+ postinstall_cmds='base_file=`basename \${file}`~
20492+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20493+ dldir=$destdir/`dirname \$dlpath`~
20494+ test -d \$dldir || mkdir -p \$dldir~
20495+ $install_prog $dir/$dlname \$dldir/$dlname'
20496+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20497+ dlpath=$dir/\$dldll~
20498+ $RM \$dlpath'
20499+ shlibpath_overrides_runpath=yes
20500+ dynamic_linker='Win32 link.exe'
20501 ;;
20502
20503 *)
20504+ # Assume MSVC wrapper
20505 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20506+ dynamic_linker='Win32 ld.exe'
20507 ;;
20508 esac
20509- dynamic_linker='Win32 ld.exe'
20510 # FIXME: first we should search . and the directory the executable is in
20511 shlibpath_var=PATH
20512 ;;
20513@@ -9594,7 +10249,7 @@ haiku*)
20514 soname_spec='${libname}${release}${shared_ext}$major'
20515 shlibpath_var=LIBRARY_PATH
20516 shlibpath_overrides_runpath=yes
20517- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20518+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20519 hardcode_into_libs=yes
20520 ;;
20521
20522@@ -10452,10 +11107,10 @@ else
20523 /* When -fvisbility=hidden is used, assume the code has been annotated
20524 correspondingly for the symbols needed. */
20525 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20526-void fnord () __attribute__((visibility("default")));
20527+int fnord () __attribute__((visibility("default")));
20528 #endif
20529
20530-void fnord () { int i=42; }
20531+int fnord () { return 42; }
20532 int main ()
20533 {
20534 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20535@@ -10558,10 +11213,10 @@ else
20536 /* When -fvisbility=hidden is used, assume the code has been annotated
20537 correspondingly for the symbols needed. */
20538 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20539-void fnord () __attribute__((visibility("default")));
20540+int fnord () __attribute__((visibility("default")));
20541 #endif
20542
20543-void fnord () { int i=42; }
20544+int fnord () { return 42; }
20545 int main ()
20546 {
20547 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20548@@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20549 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20550 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20551 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20552+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20553+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20554 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20555 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20556 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20557 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20558 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20559+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20560+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20561+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20562+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20563 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20564 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20565+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20566 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20567 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20568 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20569@@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20570 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20571 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20572 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"`'
20573+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20574+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20575 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20576 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20577 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20578-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20579 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20580+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20581 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20582 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20583 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20584+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20585 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20586 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20587 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20588@@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20589 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20590 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20591 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20592-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20593 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20594 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20595 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20596 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20597 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20598+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20599 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20600 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20601 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20602@@ -12113,8 +12778,13 @@ reload_flag \
20603 OBJDUMP \
20604 deplibs_check_method \
20605 file_magic_cmd \
20606+file_magic_glob \
20607+want_nocaseglob \
20608+DLLTOOL \
20609+sharedlib_from_linklib_cmd \
20610 AR \
20611 AR_FLAGS \
20612+archiver_list_spec \
20613 STRIP \
20614 RANLIB \
20615 CC \
20616@@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \
20617 lt_cv_sys_global_symbol_to_cdecl \
20618 lt_cv_sys_global_symbol_to_c_name_address \
20619 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20620+nm_file_list_spec \
20621 lt_prog_compiler_no_builtin_flag \
20622-lt_prog_compiler_wl \
20623 lt_prog_compiler_pic \
20624+lt_prog_compiler_wl \
20625 lt_prog_compiler_static \
20626 lt_cv_prog_compiler_c_o \
20627 need_locks \
20628+MANIFEST_TOOL \
20629 DSYMUTIL \
20630 NMEDIT \
20631 LIPO \
20632@@ -12145,7 +12817,6 @@ no_undefined_flag \
20633 hardcode_libdir_flag_spec \
20634 hardcode_libdir_flag_spec_ld \
20635 hardcode_libdir_separator \
20636-fix_srcfile_path \
20637 exclude_expsyms \
20638 include_expsyms \
20639 file_list_spec \
20640@@ -12181,6 +12852,7 @@ module_cmds \
20641 module_expsym_cmds \
20642 export_symbols_cmds \
20643 prelink_cmds \
20644+postlink_cmds \
20645 postinstall_cmds \
20646 postuninstall_cmds \
20647 finish_cmds \
20648@@ -12770,7 +13442,8 @@ $as_echo X"$file" |
20649 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20650 #
20651 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20652-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20653+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20654+# Inc.
20655 # Written by Gordon Matzigkeit, 1996
20656 #
20657 # This file is part of GNU Libtool.
20658@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL
20659 # turn newlines into spaces.
20660 NL2SP=$lt_lt_NL2SP
20661
20662+# convert \$build file names to \$host format.
20663+to_host_file_cmd=$lt_cv_to_host_file_cmd
20664+
20665+# convert \$build files to toolchain format.
20666+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20667+
20668 # An object symbol dumper.
20669 OBJDUMP=$lt_OBJDUMP
20670
20671 # Method to check whether dependent libraries are shared objects.
20672 deplibs_check_method=$lt_deplibs_check_method
20673
20674-# Command to use when deplibs_check_method == "file_magic".
20675+# Command to use when deplibs_check_method = "file_magic".
20676 file_magic_cmd=$lt_file_magic_cmd
20677
20678+# How to find potential files when deplibs_check_method = "file_magic".
20679+file_magic_glob=$lt_file_magic_glob
20680+
20681+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20682+want_nocaseglob=$lt_want_nocaseglob
20683+
20684+# DLL creation program.
20685+DLLTOOL=$lt_DLLTOOL
20686+
20687+# Command to associate shared and link libraries.
20688+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20689+
20690 # The archiver.
20691 AR=$lt_AR
20692+
20693+# Flags to create an archive.
20694 AR_FLAGS=$lt_AR_FLAGS
20695
20696+# How to feed a file listing to the archiver.
20697+archiver_list_spec=$lt_archiver_list_spec
20698+
20699 # A symbol stripping program.
20700 STRIP=$lt_STRIP
20701
20702@@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20703 # Transform the output of nm in a C name address pair when lib prefix is needed.
20704 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20705
20706+# Specify filename containing input files for \$NM.
20707+nm_file_list_spec=$lt_nm_file_list_spec
20708+
20709+# The root where to search for dependent libraries,and in which our libraries should be installed.
20710+lt_sysroot=$lt_sysroot
20711+
20712 # The name of the directory that contains temporary libtool files.
20713 objdir=$objdir
20714
20715@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD
20716 # Must we lock files when doing compilation?
20717 need_locks=$lt_need_locks
20718
20719+# Manifest tool.
20720+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20721+
20722 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20723 DSYMUTIL=$lt_DSYMUTIL
20724
20725@@ -13038,12 +13743,12 @@ with_gcc=$GCC
20726 # Compiler flag to turn off builtin functions.
20727 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20728
20729-# How to pass a linker flag through the compiler.
20730-wl=$lt_lt_prog_compiler_wl
20731-
20732 # Additional compiler flags for building library objects.
20733 pic_flag=$lt_lt_prog_compiler_pic
20734
20735+# How to pass a linker flag through the compiler.
20736+wl=$lt_lt_prog_compiler_wl
20737+
20738 # Compiler flag to prevent dynamic linking.
20739 link_static_flag=$lt_lt_prog_compiler_static
20740
20741@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath
20742 # Whether libtool must link a program against all its dependency libraries.
20743 link_all_deplibs=$link_all_deplibs
20744
20745-# Fix the shell variable \$srcfile for the compiler.
20746-fix_srcfile_path=$lt_fix_srcfile_path
20747-
20748 # Set to "yes" if exported symbols are required.
20749 always_export_symbols=$always_export_symbols
20750
20751@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms
20752 # Commands necessary for linking programs (against libraries) with templates.
20753 prelink_cmds=$lt_prelink_cmds
20754
20755+# Commands necessary for finishing linking programs.
20756+postlink_cmds=$lt_postlink_cmds
20757+
20758 # Specify filename containing input files.
20759 file_list_spec=$lt_file_list_spec
20760
20761@@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20762 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20763 # text mode, it properly converts lines to CR/LF. This bash problem
20764 # is reportedly fixed, but why not run on old versions too?
20765- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20766- || (rm -f "$cfgfile"; exit 1)
20767-
20768- case $xsi_shell in
20769- yes)
20770- cat << \_LT_EOF >> "$cfgfile"
20771-
20772-# func_dirname file append nondir_replacement
20773-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20774-# otherwise set result to NONDIR_REPLACEMENT.
20775-func_dirname ()
20776-{
20777- case ${1} in
20778- */*) func_dirname_result="${1%/*}${2}" ;;
20779- * ) func_dirname_result="${3}" ;;
20780- esac
20781-}
20782-
20783-# func_basename file
20784-func_basename ()
20785-{
20786- func_basename_result="${1##*/}"
20787-}
20788-
20789-# func_dirname_and_basename file append nondir_replacement
20790-# perform func_basename and func_dirname in a single function
20791-# call:
20792-# dirname: Compute the dirname of FILE. If nonempty,
20793-# add APPEND to the result, otherwise set result
20794-# to NONDIR_REPLACEMENT.
20795-# value returned in "$func_dirname_result"
20796-# basename: Compute filename of FILE.
20797-# value retuned in "$func_basename_result"
20798-# Implementation must be kept synchronized with func_dirname
20799-# and func_basename. For efficiency, we do not delegate to
20800-# those functions but instead duplicate the functionality here.
20801-func_dirname_and_basename ()
20802-{
20803- case ${1} in
20804- */*) func_dirname_result="${1%/*}${2}" ;;
20805- * ) func_dirname_result="${3}" ;;
20806- esac
20807- func_basename_result="${1##*/}"
20808-}
20809-
20810-# func_stripname prefix suffix name
20811-# strip PREFIX and SUFFIX off of NAME.
20812-# PREFIX and SUFFIX must not contain globbing or regex special
20813-# characters, hashes, percent signs, but SUFFIX may contain a leading
20814-# dot (in which case that matches only a dot).
20815-func_stripname ()
20816-{
20817- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20818- # positional parameters, so assign one to ordinary parameter first.
20819- func_stripname_result=${3}
20820- func_stripname_result=${func_stripname_result#"${1}"}
20821- func_stripname_result=${func_stripname_result%"${2}"}
20822-}
20823-
20824-# func_opt_split
20825-func_opt_split ()
20826-{
20827- func_opt_split_opt=${1%%=*}
20828- func_opt_split_arg=${1#*=}
20829-}
20830-
20831-# func_lo2o object
20832-func_lo2o ()
20833-{
20834- case ${1} in
20835- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20836- *) func_lo2o_result=${1} ;;
20837- esac
20838-}
20839-
20840-# func_xform libobj-or-source
20841-func_xform ()
20842-{
20843- func_xform_result=${1%.*}.lo
20844-}
20845-
20846-# func_arith arithmetic-term...
20847-func_arith ()
20848-{
20849- func_arith_result=$(( $* ))
20850-}
20851-
20852-# func_len string
20853-# STRING may not start with a hyphen.
20854-func_len ()
20855-{
20856- func_len_result=${#1}
20857-}
20858-
20859-_LT_EOF
20860- ;;
20861- *) # Bourne compatible functions.
20862- cat << \_LT_EOF >> "$cfgfile"
20863-
20864-# func_dirname file append nondir_replacement
20865-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20866-# otherwise set result to NONDIR_REPLACEMENT.
20867-func_dirname ()
20868-{
20869- # Extract subdirectory from the argument.
20870- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20871- if test "X$func_dirname_result" = "X${1}"; then
20872- func_dirname_result="${3}"
20873- else
20874- func_dirname_result="$func_dirname_result${2}"
20875- fi
20876-}
20877-
20878-# func_basename file
20879-func_basename ()
20880-{
20881- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20882-}
20883-
20884-
20885-# func_stripname prefix suffix name
20886-# strip PREFIX and SUFFIX off of NAME.
20887-# PREFIX and SUFFIX must not contain globbing or regex special
20888-# characters, hashes, percent signs, but SUFFIX may contain a leading
20889-# dot (in which case that matches only a dot).
20890-# func_strip_suffix prefix name
20891-func_stripname ()
20892-{
20893- case ${2} in
20894- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20895- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20896- esac
20897-}
20898-
20899-# sed scripts:
20900-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20901-my_sed_long_arg='1s/^-[^=]*=//'
20902-
20903-# func_opt_split
20904-func_opt_split ()
20905-{
20906- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
20907- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
20908-}
20909-
20910-# func_lo2o object
20911-func_lo2o ()
20912-{
20913- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
20914-}
20915-
20916-# func_xform libobj-or-source
20917-func_xform ()
20918-{
20919- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
20920-}
20921-
20922-# func_arith arithmetic-term...
20923-func_arith ()
20924-{
20925- func_arith_result=`expr "$@"`
20926-}
20927-
20928-# func_len string
20929-# STRING may not start with a hyphen.
20930-func_len ()
20931-{
20932- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
20933-}
20934-
20935-_LT_EOF
20936-esac
20937-
20938-case $lt_shell_append in
20939- yes)
20940- cat << \_LT_EOF >> "$cfgfile"
20941-
20942-# func_append var value
20943-# Append VALUE to the end of shell variable VAR.
20944-func_append ()
20945-{
20946- eval "$1+=\$2"
20947-}
20948-_LT_EOF
20949- ;;
20950- *)
20951- cat << \_LT_EOF >> "$cfgfile"
20952-
20953-# func_append var value
20954-# Append VALUE to the end of shell variable VAR.
20955-func_append ()
20956-{
20957- eval "$1=\$$1\$2"
20958-}
20959-
20960-_LT_EOF
20961- ;;
20962- esac
20963-
20964-
20965- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
20966- || (rm -f "$cfgfile"; exit 1)
20967-
20968- mv -f "$cfgfile" "$ofile" ||
20969+ sed '$q' "$ltmain" >> "$cfgfile" \
20970+ || (rm -f "$cfgfile"; exit 1)
20971+
20972+ if test x"$xsi_shell" = xyes; then
20973+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
20974+func_dirname ()\
20975+{\
20976+\ case ${1} in\
20977+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20978+\ * ) func_dirname_result="${3}" ;;\
20979+\ esac\
20980+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
20981+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20982+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20983+test 0 -eq $? || _lt_function_replace_fail=:
20984+
20985+
20986+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
20987+func_basename ()\
20988+{\
20989+\ func_basename_result="${1##*/}"\
20990+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
20991+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20992+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20993+test 0 -eq $? || _lt_function_replace_fail=:
20994+
20995+
20996+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
20997+func_dirname_and_basename ()\
20998+{\
20999+\ case ${1} in\
21000+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21001+\ * ) func_dirname_result="${3}" ;;\
21002+\ esac\
21003+\ func_basename_result="${1##*/}"\
21004+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21005+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21006+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21007+test 0 -eq $? || _lt_function_replace_fail=:
21008+
21009+
21010+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21011+func_stripname ()\
21012+{\
21013+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21014+\ # positional parameters, so assign one to ordinary parameter first.\
21015+\ func_stripname_result=${3}\
21016+\ func_stripname_result=${func_stripname_result#"${1}"}\
21017+\ func_stripname_result=${func_stripname_result%"${2}"}\
21018+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21019+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21020+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21021+test 0 -eq $? || _lt_function_replace_fail=:
21022+
21023+
21024+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21025+func_split_long_opt ()\
21026+{\
21027+\ func_split_long_opt_name=${1%%=*}\
21028+\ func_split_long_opt_arg=${1#*=}\
21029+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21030+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21031+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21032+test 0 -eq $? || _lt_function_replace_fail=:
21033+
21034+
21035+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21036+func_split_short_opt ()\
21037+{\
21038+\ func_split_short_opt_arg=${1#??}\
21039+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21040+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21041+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21042+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21043+test 0 -eq $? || _lt_function_replace_fail=:
21044+
21045+
21046+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21047+func_lo2o ()\
21048+{\
21049+\ case ${1} in\
21050+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21051+\ *) func_lo2o_result=${1} ;;\
21052+\ esac\
21053+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21054+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21055+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21056+test 0 -eq $? || _lt_function_replace_fail=:
21057+
21058+
21059+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21060+func_xform ()\
21061+{\
21062+ func_xform_result=${1%.*}.lo\
21063+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21064+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21065+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21066+test 0 -eq $? || _lt_function_replace_fail=:
21067+
21068+
21069+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21070+func_arith ()\
21071+{\
21072+ func_arith_result=$(( $* ))\
21073+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21074+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21075+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21076+test 0 -eq $? || _lt_function_replace_fail=:
21077+
21078+
21079+ sed -e '/^func_len ()$/,/^} # func_len /c\
21080+func_len ()\
21081+{\
21082+ func_len_result=${#1}\
21083+} # Extended-shell func_len 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+fi
21089+
21090+if test x"$lt_shell_append" = xyes; then
21091+ sed -e '/^func_append ()$/,/^} # func_append /c\
21092+func_append ()\
21093+{\
21094+ eval "${1}+=\\${2}"\
21095+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21096+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21097+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21098+test 0 -eq $? || _lt_function_replace_fail=:
21099+
21100+
21101+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21102+func_append_quoted ()\
21103+{\
21104+\ func_quote_for_eval "${2}"\
21105+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21106+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21107+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21108+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21109+test 0 -eq $? || _lt_function_replace_fail=:
21110+
21111+
21112+ # Save a `func_append' function call where possible by direct use of '+='
21113+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21114+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21115+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21116+ test 0 -eq $? || _lt_function_replace_fail=:
21117+else
21118+ # Save a `func_append' function call even when '+=' is not available
21119+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21120+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21121+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21122+ test 0 -eq $? || _lt_function_replace_fail=:
21123+fi
21124+
21125+if test x"$_lt_function_replace_fail" = x":"; then
21126+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21127+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21128+fi
21129+
21130+
21131+ mv -f "$cfgfile" "$ofile" ||
21132 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21133 chmod +x "$ofile"
21134
21135--
211362.12.0
21137
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-23 07:39:15 +0000