summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch21157
1 files changed, 21157 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
new file mode 100644
index 0000000000..e87efe653b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -0,0 +1,21157 @@
1From 71c734bb3754319029dcfc898cedbade42274dcb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH 06/15] Use libtool 2.4
5
6get libtool sysroot support
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/configure | 1318 +++++++++++++++++------
13 bfd/configure.ac | 2 +-
14 binutils/configure | 1316 +++++++++++++++++------
15 configure | 2 +-
16 gas/configure | 1314 +++++++++++++++++------
17 gprof/configure | 1321 +++++++++++++++++------
18 ld/configure | 1691 +++++++++++++++++++++--------
19 libtool.m4 | 1080 +++++++++++++------
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
21 ltoptions.m4 | 2 +-
22 ltversion.m4 | 12 +-
23 lt~obsolete.m4 | 2 +-
24 opcodes/configure | 1318 +++++++++++++++++------
25 opcodes/configure.ac | 2 +-
26 zlib/configure | 1316 +++++++++++++++++------
27 15 files changed, 9927 insertions(+), 3694 deletions(-)
28
29diff --git a/bfd/configure b/bfd/configure
30index 48276594ed..3ece8943f3 100755
31--- a/bfd/configure
32+++ b/bfd/configure
33@@ -672,6 +672,9 @@ OTOOL
34 LIPO
35 NMEDIT
36 DSYMUTIL
37+MANIFEST_TOOL
38+ac_ct_AR
39+DLLTOOL
40 OBJDUMP
41 LN_S
42 NM
43@@ -785,6 +788,7 @@ enable_static
44 with_pic
45 enable_fast_install
46 with_gnu_ld
47+with_libtool_sysroot
48 enable_libtool_lock
49 enable_plugins
50 enable_largefile
51@@ -1461,6 +1465,8 @@ Optional Packages:
52 --with-pic try to use only PIC/non-PIC objects [default=use
53 both]
54 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
55+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
56+ (or the compiler's sysroot if not specified).
57 --with-mmap try using mmap for BFD input files if available
58 --with-separate-debug-dir=DIR
59 Look for global separate debug info in DIR
60@@ -5393,8 +5399,8 @@ esac
61
62
63
64-macro_version='2.2.7a'
65-macro_revision='1.3134'
66+macro_version='2.4'
67+macro_revision='1.3293'
68
69
70
71@@ -5434,7 +5440,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
73 $as_echo_n "checking how to print strings... " >&6; }
74 # Test print first, because it will be a builtin if present.
75-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
76+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
78 ECHO='print -r --'
79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
80@@ -6120,8 +6126,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
81 # Try some XSI features
82 xsi_shell=no
83 ( _lt_dummy="a/b/c"
84- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
85- = c,a/b,, \
86+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
87+ = c,a/b,b/c, \
88 && eval 'test $(( 1 + 1 )) -eq 2 \
89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
90 && xsi_shell=yes
91@@ -6170,6 +6176,80 @@ esac
92
93
94
95+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
96+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
97+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
98+ $as_echo_n "(cached) " >&6
99+else
100+ case $host in
101+ *-*-mingw* )
102+ case $build in
103+ *-*-mingw* ) # actually msys
104+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
105+ ;;
106+ *-*-cygwin* )
107+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
108+ ;;
109+ * ) # otherwise, assume *nix
110+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
111+ ;;
112+ esac
113+ ;;
114+ *-*-cygwin* )
115+ case $build in
116+ *-*-mingw* ) # actually msys
117+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
118+ ;;
119+ *-*-cygwin* )
120+ lt_cv_to_host_file_cmd=func_convert_file_noop
121+ ;;
122+ * ) # otherwise, assume *nix
123+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
124+ ;;
125+ esac
126+ ;;
127+ * ) # unhandled hosts (and "normal" native builds)
128+ lt_cv_to_host_file_cmd=func_convert_file_noop
129+ ;;
130+esac
131+
132+fi
133+
134+to_host_file_cmd=$lt_cv_to_host_file_cmd
135+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
136+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
137+
138+
139+
140+
141+
142+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
143+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
144+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
145+ $as_echo_n "(cached) " >&6
146+else
147+ #assume ordinary cross tools, or native build.
148+lt_cv_to_tool_file_cmd=func_convert_file_noop
149+case $host in
150+ *-*-mingw* )
151+ case $build in
152+ *-*-mingw* ) # actually msys
153+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
154+ ;;
155+ esac
156+ ;;
157+esac
158+
159+fi
160+
161+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
162+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
163+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
164+
165+
166+
167+
168+
169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
170 $as_echo_n "checking for $LD option to reload object files... " >&6; }
171 if test "${lt_cv_ld_reload_flag+set}" = set; then :
172@@ -6186,6 +6266,11 @@ case $reload_flag in
173 esac
174 reload_cmds='$LD$reload_flag -o $output$reload_objs'
175 case $host_os in
176+ cygwin* | mingw* | pw32* | cegcc*)
177+ if test "$GCC" != yes; then
178+ reload_cmds=false
179+ fi
180+ ;;
181 darwin*)
182 if test "$GCC" = yes; then
183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
184@@ -6354,7 +6439,8 @@ mingw* | pw32*)
185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
186 lt_cv_file_magic_cmd='func_win32_libid'
187 else
188- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
189+ # Keep this pattern in sync with the one in func_win32_libid.
190+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
191 lt_cv_file_magic_cmd='$OBJDUMP -f'
192 fi
193 ;;
194@@ -6508,6 +6594,21 @@ esac
195 fi
196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
197 $as_echo "$lt_cv_deplibs_check_method" >&6; }
198+
199+file_magic_glob=
200+want_nocaseglob=no
201+if test "$build" = "$host"; then
202+ case $host_os in
203+ mingw* | pw32*)
204+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
205+ want_nocaseglob=yes
206+ else
207+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
208+ fi
209+ ;;
210+ esac
211+fi
212+
213 file_magic_cmd=$lt_cv_file_magic_cmd
214 deplibs_check_method=$lt_cv_deplibs_check_method
215 test -z "$deplibs_check_method" && deplibs_check_method=unknown
216@@ -6521,11 +6622,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
217
218
219
220+
221+
222+
223+
224+
225+
226+
227+
228+
229+
230
231
232 if test -n "$ac_tool_prefix"; then
233- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
234-set dummy ${ac_tool_prefix}ar; ac_word=$2
235+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
236+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
237+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
238+$as_echo_n "checking for $ac_word... " >&6; }
239+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
240+ $as_echo_n "(cached) " >&6
241+else
242+ if test -n "$DLLTOOL"; then
243+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
244+else
245+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
246+for as_dir in $PATH
247+do
248+ IFS=$as_save_IFS
249+ test -z "$as_dir" && as_dir=.
250+ for ac_exec_ext in '' $ac_executable_extensions; do
251+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
252+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
253+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
254+ break 2
255+ fi
256+done
257+ done
258+IFS=$as_save_IFS
259+
260+fi
261+fi
262+DLLTOOL=$ac_cv_prog_DLLTOOL
263+if test -n "$DLLTOOL"; then
264+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
265+$as_echo "$DLLTOOL" >&6; }
266+else
267+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
268+$as_echo "no" >&6; }
269+fi
270+
271+
272+fi
273+if test -z "$ac_cv_prog_DLLTOOL"; then
274+ ac_ct_DLLTOOL=$DLLTOOL
275+ # Extract the first word of "dlltool", so it can be a program name with args.
276+set dummy dlltool; ac_word=$2
277+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
278+$as_echo_n "checking for $ac_word... " >&6; }
279+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
280+ $as_echo_n "(cached) " >&6
281+else
282+ if test -n "$ac_ct_DLLTOOL"; then
283+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
284+else
285+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
286+for as_dir in $PATH
287+do
288+ IFS=$as_save_IFS
289+ test -z "$as_dir" && as_dir=.
290+ for ac_exec_ext in '' $ac_executable_extensions; do
291+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
292+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
293+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
294+ break 2
295+ fi
296+done
297+ done
298+IFS=$as_save_IFS
299+
300+fi
301+fi
302+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
303+if test -n "$ac_ct_DLLTOOL"; then
304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
305+$as_echo "$ac_ct_DLLTOOL" >&6; }
306+else
307+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
308+$as_echo "no" >&6; }
309+fi
310+
311+ if test "x$ac_ct_DLLTOOL" = x; then
312+ DLLTOOL="false"
313+ else
314+ case $cross_compiling:$ac_tool_warned in
315+yes:)
316+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
317+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
318+ac_tool_warned=yes ;;
319+esac
320+ DLLTOOL=$ac_ct_DLLTOOL
321+ fi
322+else
323+ DLLTOOL="$ac_cv_prog_DLLTOOL"
324+fi
325+
326+test -z "$DLLTOOL" && DLLTOOL=dlltool
327+
328+
329+
330+
331+
332+
333+
334+
335+
336+
337+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
338+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
339+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
340+ $as_echo_n "(cached) " >&6
341+else
342+ lt_cv_sharedlib_from_linklib_cmd='unknown'
343+
344+case $host_os in
345+cygwin* | mingw* | pw32* | cegcc*)
346+ # two different shell functions defined in ltmain.sh
347+ # decide which to use based on capabilities of $DLLTOOL
348+ case `$DLLTOOL --help 2>&1` in
349+ *--identify-strict*)
350+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
351+ ;;
352+ *)
353+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
354+ ;;
355+ esac
356+ ;;
357+*)
358+ # fallback: assume linklib IS sharedlib
359+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
360+ ;;
361+esac
362+
363+fi
364+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
365+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
366+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
367+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
368+
369+
370+
371+
372+
373+
374+
375+if test -n "$ac_tool_prefix"; then
376+ for ac_prog in ar
377+ do
378+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
379+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
380 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
381 $as_echo_n "checking for $ac_word... " >&6; }
382 if test "${ac_cv_prog_AR+set}" = set; then :
383@@ -6541,7 +6795,7 @@ do
384 test -z "$as_dir" && as_dir=.
385 for ac_exec_ext in '' $ac_executable_extensions; do
386 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
387- ac_cv_prog_AR="${ac_tool_prefix}ar"
388+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
389 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
390 break 2
391 fi
392@@ -6561,11 +6815,15 @@ $as_echo "no" >&6; }
393 fi
394
395
396+ test -n "$AR" && break
397+ done
398 fi
399-if test -z "$ac_cv_prog_AR"; then
400+if test -z "$AR"; then
401 ac_ct_AR=$AR
402- # Extract the first word of "ar", so it can be a program name with args.
403-set dummy ar; ac_word=$2
404+ for ac_prog in ar
405+do
406+ # Extract the first word of "$ac_prog", so it can be a program name with args.
407+set dummy $ac_prog; ac_word=$2
408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
409 $as_echo_n "checking for $ac_word... " >&6; }
410 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
411@@ -6581,7 +6839,7 @@ do
412 test -z "$as_dir" && as_dir=.
413 for ac_exec_ext in '' $ac_executable_extensions; do
414 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
415- ac_cv_prog_ac_ct_AR="ar"
416+ ac_cv_prog_ac_ct_AR="$ac_prog"
417 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
418 break 2
419 fi
420@@ -6600,6 +6858,10 @@ else
421 $as_echo "no" >&6; }
422 fi
423
424+
425+ test -n "$ac_ct_AR" && break
426+done
427+
428 if test "x$ac_ct_AR" = x; then
429 AR="false"
430 else
431@@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;;
432 esac
433 AR=$ac_ct_AR
434 fi
435-else
436- AR="$ac_cv_prog_AR"
437 fi
438
439-test -z "$AR" && AR=ar
440-test -z "$AR_FLAGS" && AR_FLAGS=cru
441+: ${AR=ar}
442+: ${AR_FLAGS=cru}
443+
444+
445+
446+
447+
448+
449+
450+
451+
452+
453+
454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
455+$as_echo_n "checking for archiver @FILE support... " >&6; }
456+if test "${lt_cv_ar_at_file+set}" = set; then :
457+ $as_echo_n "(cached) " >&6
458+else
459+ lt_cv_ar_at_file=no
460+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
461+/* end confdefs.h. */
462+
463+int
464+main ()
465+{
466
467+ ;
468+ return 0;
469+}
470+_ACEOF
471+if ac_fn_c_try_compile "$LINENO"; then :
472+ echo conftest.$ac_objext > conftest.lst
473+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
474+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
475+ (eval $lt_ar_try) 2>&5
476+ ac_status=$?
477+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
478+ test $ac_status = 0; }
479+ if test "$ac_status" -eq 0; then
480+ # Ensure the archiver fails upon bogus file names.
481+ rm -f conftest.$ac_objext libconftest.a
482+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
483+ (eval $lt_ar_try) 2>&5
484+ ac_status=$?
485+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
486+ test $ac_status = 0; }
487+ if test "$ac_status" -ne 0; then
488+ lt_cv_ar_at_file=@
489+ fi
490+ fi
491+ rm -f conftest.* libconftest.a
492
493+fi
494+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
495
496+fi
497+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
498+$as_echo "$lt_cv_ar_at_file" >&6; }
499
500+if test "x$lt_cv_ar_at_file" = xno; then
501+ archiver_list_spec=
502+else
503+ archiver_list_spec=$lt_cv_ar_at_file
504+fi
505
506
507
508@@ -6962,8 +7280,8 @@ esac
509 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
510
511 # Transform an extracted symbol line into symbol name and symbol address
512-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
513-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'"
514+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
515+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'"
516
517 # Handle CRLF in mingw tool chain
518 opt_cr=
519@@ -6999,6 +7317,7 @@ for ac_symprfx in "" "_"; do
520 else
521 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
522 fi
523+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
524
525 # Check to see that the pipe works correctly.
526 pipe_works=no
527@@ -7040,6 +7359,18 @@ _LT_EOF
528 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
529 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
530 cat <<_LT_EOF > conftest.$ac_ext
531+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
532+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
533+/* DATA imports from DLLs on WIN32 con't be const, because runtime
534+ relocations are performed -- see ld's documentation on pseudo-relocs. */
535+# define LT_DLSYM_CONST
536+#elif defined(__osf__)
537+/* This system does not cope well with relocations in const data. */
538+# define LT_DLSYM_CONST
539+#else
540+# define LT_DLSYM_CONST const
541+#endif
542+
543 #ifdef __cplusplus
544 extern "C" {
545 #endif
546@@ -7051,7 +7382,7 @@ _LT_EOF
547 cat <<_LT_EOF >> conftest.$ac_ext
548
549 /* The mapping between symbol names and symbols. */
550-const struct {
551+LT_DLSYM_CONST struct {
552 const char *name;
553 void *address;
554 }
555@@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() {
556 _LT_EOF
557 # Now try linking the two files.
558 mv conftest.$ac_objext conftstm.$ac_objext
559- lt_save_LIBS="$LIBS"
560- lt_save_CFLAGS="$CFLAGS"
561+ lt_globsym_save_LIBS=$LIBS
562+ lt_globsym_save_CFLAGS=$CFLAGS
563 LIBS="conftstm.$ac_objext"
564 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
565 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
566@@ -7088,8 +7419,8 @@ _LT_EOF
567 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
568 pipe_works=yes
569 fi
570- LIBS="$lt_save_LIBS"
571- CFLAGS="$lt_save_CFLAGS"
572+ LIBS=$lt_globsym_save_LIBS
573+ CFLAGS=$lt_globsym_save_CFLAGS
574 else
575 echo "cannot find nm_test_func in $nlist" >&5
576 fi
577@@ -7126,6 +7457,16 @@ else
578 $as_echo "ok" >&6; }
579 fi
580
581+# Response file support.
582+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
583+ nm_file_list_spec='@'
584+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
585+ nm_file_list_spec='@'
586+fi
587+
588+
589+
590+
591
592
593
594@@ -7142,6 +7483,45 @@ fi
595
596
597
598+
599+
600+
601+
602+
603+
604+
605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
606+$as_echo_n "checking for sysroot... " >&6; }
607+
608+# Check whether --with-libtool-sysroot was given.
609+if test "${with_libtool_sysroot+set}" = set; then :
610+ withval=$with_libtool_sysroot;
611+else
612+ with_libtool_sysroot=no
613+fi
614+
615+
616+lt_sysroot=
617+case ${with_libtool_sysroot} in #(
618+ yes)
619+ if test "$GCC" = yes; then
620+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
621+ fi
622+ ;; #(
623+ /*)
624+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
625+ ;; #(
626+ no|'')
627+ ;; #(
628+ *)
629+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
630+$as_echo "${with_libtool_sysroot}" >&6; }
631+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
632+ ;;
633+esac
634+
635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
636+$as_echo "${lt_sysroot:-no}" >&6; }
637
638
639
640@@ -7353,6 +7733,123 @@ esac
641
642 need_locks="$enable_libtool_lock"
643
644+if test -n "$ac_tool_prefix"; then
645+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
646+set dummy ${ac_tool_prefix}mt; ac_word=$2
647+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
648+$as_echo_n "checking for $ac_word... " >&6; }
649+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
650+ $as_echo_n "(cached) " >&6
651+else
652+ if test -n "$MANIFEST_TOOL"; then
653+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
654+else
655+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
656+for as_dir in $PATH
657+do
658+ IFS=$as_save_IFS
659+ test -z "$as_dir" && as_dir=.
660+ for ac_exec_ext in '' $ac_executable_extensions; do
661+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
662+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
663+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
664+ break 2
665+ fi
666+done
667+ done
668+IFS=$as_save_IFS
669+
670+fi
671+fi
672+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
673+if test -n "$MANIFEST_TOOL"; then
674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
675+$as_echo "$MANIFEST_TOOL" >&6; }
676+else
677+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
678+$as_echo "no" >&6; }
679+fi
680+
681+
682+fi
683+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
684+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
685+ # Extract the first word of "mt", so it can be a program name with args.
686+set dummy mt; ac_word=$2
687+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
688+$as_echo_n "checking for $ac_word... " >&6; }
689+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
690+ $as_echo_n "(cached) " >&6
691+else
692+ if test -n "$ac_ct_MANIFEST_TOOL"; then
693+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
694+else
695+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
696+for as_dir in $PATH
697+do
698+ IFS=$as_save_IFS
699+ test -z "$as_dir" && as_dir=.
700+ for ac_exec_ext in '' $ac_executable_extensions; do
701+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
702+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
703+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
704+ break 2
705+ fi
706+done
707+ done
708+IFS=$as_save_IFS
709+
710+fi
711+fi
712+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
713+if test -n "$ac_ct_MANIFEST_TOOL"; then
714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
715+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
716+else
717+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
718+$as_echo "no" >&6; }
719+fi
720+
721+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
722+ MANIFEST_TOOL=":"
723+ else
724+ case $cross_compiling:$ac_tool_warned in
725+yes:)
726+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
727+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
728+ac_tool_warned=yes ;;
729+esac
730+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
731+ fi
732+else
733+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
734+fi
735+
736+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
737+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
738+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
739+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
740+ $as_echo_n "(cached) " >&6
741+else
742+ lt_cv_path_mainfest_tool=no
743+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
744+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
745+ cat conftest.err >&5
746+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
747+ lt_cv_path_mainfest_tool=yes
748+ fi
749+ rm -f conftest*
750+fi
751+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
752+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
753+if test "x$lt_cv_path_mainfest_tool" != xyes; then
754+ MANIFEST_TOOL=:
755+fi
756+
757+
758+
759+
760+
761
762 case $host_os in
763 rhapsody* | darwin*)
764@@ -7916,6 +8413,8 @@ _LT_EOF
765 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
766 echo "$AR cru libconftest.a conftest.o" >&5
767 $AR cru libconftest.a conftest.o 2>&5
768+ echo "$RANLIB libconftest.a" >&5
769+ $RANLIB libconftest.a 2>&5
770 cat > conftest.c << _LT_EOF
771 int main() { return 0;}
772 _LT_EOF
773@@ -8080,7 +8579,8 @@ fi
774 LIBTOOL_DEPS="$ltmain"
775
776 # Always use our own libtool.
777-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
778+LIBTOOL='$(SHELL) $(top_builddir)'
779+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
780
781
782
783@@ -8169,7 +8669,7 @@ aix3*)
784 esac
785
786 # Global variables:
787-ofile=libtool
788+ofile=${host_alias}-libtool
789 can_build_shared=yes
790
791 # All known linkers require a `.a' archive for static linking (except MSVC,
792@@ -8467,8 +8967,6 @@ fi
793 lt_prog_compiler_pic=
794 lt_prog_compiler_static=
795
796-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
797-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
798
799 if test "$GCC" = yes; then
800 lt_prog_compiler_wl='-Wl,'
801@@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
802 lt_prog_compiler_pic='--shared'
803 lt_prog_compiler_static='--static'
804 ;;
805+ nagfor*)
806+ # NAG Fortran compiler
807+ lt_prog_compiler_wl='-Wl,-Wl,,'
808+ lt_prog_compiler_pic='-PIC'
809+ lt_prog_compiler_static='-Bstatic'
810+ ;;
811 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
812 # Portland Group compilers (*not* the Pentium gcc compiler,
813 # which looks to be a dead project)
814@@ -8696,7 +9200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
815 lt_prog_compiler_pic='-KPIC'
816 lt_prog_compiler_static='-Bstatic'
817 case $cc_basename in
818- f77* | f90* | f95*)
819+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
820 lt_prog_compiler_wl='-Qoption ld ';;
821 *)
822 lt_prog_compiler_wl='-Wl,';;
823@@ -8753,13 +9257,17 @@ case $host_os in
824 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
825 ;;
826 esac
827-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
828-$as_echo "$lt_prog_compiler_pic" >&6; }
829-
830-
831-
832-
833
834+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
835+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
836+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
837+ $as_echo_n "(cached) " >&6
838+else
839+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
840+fi
841+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
842+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
843+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
844
845 #
846 # Check to make sure the PIC flag actually works.
847@@ -8820,6 +9328,11 @@ fi
848
849
850
851+
852+
853+
854+
855+
856 #
857 # Check to make sure the static flag actually works.
858 #
859@@ -9170,7 +9683,8 @@ _LT_EOF
860 allow_undefined_flag=unsupported
861 always_export_symbols=no
862 enable_shared_with_static_runtimes=yes
863- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
864+ 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'
865+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
866
867 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
868 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
869@@ -9269,12 +9783,12 @@ _LT_EOF
870 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
871 hardcode_libdir_flag_spec=
872 hardcode_libdir_flag_spec_ld='-rpath $libdir'
873- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
874+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
875 if test "x$supports_anon_versioning" = xyes; then
876 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
877 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
878 echo "local: *; };" >> $output_objdir/$libname.ver~
879- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
880+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
881 fi
882 ;;
883 esac
884@@ -9288,8 +9802,8 @@ _LT_EOF
885 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
886 wlarc=
887 else
888- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
889- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
890+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
891+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
892 fi
893 ;;
894
895@@ -9307,8 +9821,8 @@ _LT_EOF
896
897 _LT_EOF
898 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
899- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
900- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
901+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
902+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
903 else
904 ld_shlibs=no
905 fi
906@@ -9354,8 +9868,8 @@ _LT_EOF
907
908 *)
909 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
910- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
911- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
912+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
913+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
914 else
915 ld_shlibs=no
916 fi
917@@ -9485,7 +9999,13 @@ _LT_EOF
918 allow_undefined_flag='-berok'
919 # Determine the default libpath from the value encoded in an
920 # empty executable.
921- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
922+ if test "${lt_cv_aix_libpath+set}" = set; then
923+ aix_libpath=$lt_cv_aix_libpath
924+else
925+ if test "${lt_cv_aix_libpath_+set}" = set; then :
926+ $as_echo_n "(cached) " >&6
927+else
928+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
929 /* end confdefs.h. */
930
931 int
932@@ -9498,22 +10018,29 @@ main ()
933 _ACEOF
934 if ac_fn_c_try_link "$LINENO"; then :
935
936-lt_aix_libpath_sed='
937- /Import File Strings/,/^$/ {
938- /^0/ {
939- s/^0 *\(.*\)$/\1/
940- p
941- }
942- }'
943-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
944-# Check for a 64-bit object if we didn't find anything.
945-if test -z "$aix_libpath"; then
946- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
947-fi
948+ lt_aix_libpath_sed='
949+ /Import File Strings/,/^$/ {
950+ /^0/ {
951+ s/^0 *\([^ ]*\) *$/\1/
952+ p
953+ }
954+ }'
955+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
956+ # Check for a 64-bit object if we didn't find anything.
957+ if test -z "$lt_cv_aix_libpath_"; then
958+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
959+ fi
960 fi
961 rm -f core conftest.err conftest.$ac_objext \
962 conftest$ac_exeext conftest.$ac_ext
963-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
964+ if test -z "$lt_cv_aix_libpath_"; then
965+ lt_cv_aix_libpath_="/usr/lib:/lib"
966+ fi
967+
968+fi
969+
970+ aix_libpath=$lt_cv_aix_libpath_
971+fi
972
973 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
974 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"
975@@ -9525,7 +10052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
976 else
977 # Determine the default libpath from the value encoded in an
978 # empty executable.
979- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
980+ if test "${lt_cv_aix_libpath+set}" = set; then
981+ aix_libpath=$lt_cv_aix_libpath
982+else
983+ if test "${lt_cv_aix_libpath_+set}" = set; then :
984+ $as_echo_n "(cached) " >&6
985+else
986+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
987 /* end confdefs.h. */
988
989 int
990@@ -9538,22 +10071,29 @@ main ()
991 _ACEOF
992 if ac_fn_c_try_link "$LINENO"; then :
993
994-lt_aix_libpath_sed='
995- /Import File Strings/,/^$/ {
996- /^0/ {
997- s/^0 *\(.*\)$/\1/
998- p
999- }
1000- }'
1001-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1002-# Check for a 64-bit object if we didn't find anything.
1003-if test -z "$aix_libpath"; then
1004- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1005-fi
1006+ lt_aix_libpath_sed='
1007+ /Import File Strings/,/^$/ {
1008+ /^0/ {
1009+ s/^0 *\([^ ]*\) *$/\1/
1010+ p
1011+ }
1012+ }'
1013+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1014+ # Check for a 64-bit object if we didn't find anything.
1015+ if test -z "$lt_cv_aix_libpath_"; then
1016+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1017+ fi
1018 fi
1019 rm -f core conftest.err conftest.$ac_objext \
1020 conftest$ac_exeext conftest.$ac_ext
1021-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1022+ if test -z "$lt_cv_aix_libpath_"; then
1023+ lt_cv_aix_libpath_="/usr/lib:/lib"
1024+ fi
1025+
1026+fi
1027+
1028+ aix_libpath=$lt_cv_aix_libpath_
1029+fi
1030
1031 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1032 # Warning - without using the other run time loading flags,
1033@@ -9598,20 +10138,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1034 # Microsoft Visual C++.
1035 # hardcode_libdir_flag_spec is actually meaningless, as there is
1036 # no search path for DLLs.
1037- hardcode_libdir_flag_spec=' '
1038- allow_undefined_flag=unsupported
1039- # Tell ltmain to make .lib files, not .a files.
1040- libext=lib
1041- # Tell ltmain to make .dll files, not .so files.
1042- shrext_cmds=".dll"
1043- # FIXME: Setting linknames here is a bad hack.
1044- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1045- # The linker will automatically build a .lib file if we build a DLL.
1046- old_archive_from_new_cmds='true'
1047- # FIXME: Should let the user specify the lib program.
1048- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1049- fix_srcfile_path='`cygpath -w "$srcfile"`'
1050- enable_shared_with_static_runtimes=yes
1051+ case $cc_basename in
1052+ cl*)
1053+ # Native MSVC
1054+ hardcode_libdir_flag_spec=' '
1055+ allow_undefined_flag=unsupported
1056+ always_export_symbols=yes
1057+ file_list_spec='@'
1058+ # Tell ltmain to make .lib files, not .a files.
1059+ libext=lib
1060+ # Tell ltmain to make .dll files, not .so files.
1061+ shrext_cmds=".dll"
1062+ # FIXME: Setting linknames here is a bad hack.
1063+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1064+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1065+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1066+ else
1067+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1068+ fi~
1069+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1070+ linknames='
1071+ # The linker will not automatically build a static lib if we build a DLL.
1072+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1073+ enable_shared_with_static_runtimes=yes
1074+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1075+ # Don't use ranlib
1076+ old_postinstall_cmds='chmod 644 $oldlib'
1077+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1078+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1079+ case $lt_outputfile in
1080+ *.exe|*.EXE) ;;
1081+ *)
1082+ lt_outputfile="$lt_outputfile.exe"
1083+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1084+ ;;
1085+ esac~
1086+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1087+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1088+ $RM "$lt_outputfile.manifest";
1089+ fi'
1090+ ;;
1091+ *)
1092+ # Assume MSVC wrapper
1093+ hardcode_libdir_flag_spec=' '
1094+ allow_undefined_flag=unsupported
1095+ # Tell ltmain to make .lib files, not .a files.
1096+ libext=lib
1097+ # Tell ltmain to make .dll files, not .so files.
1098+ shrext_cmds=".dll"
1099+ # FIXME: Setting linknames here is a bad hack.
1100+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1101+ # The linker will automatically build a .lib file if we build a DLL.
1102+ old_archive_from_new_cmds='true'
1103+ # FIXME: Should let the user specify the lib program.
1104+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1105+ enable_shared_with_static_runtimes=yes
1106+ ;;
1107+ esac
1108 ;;
1109
1110 darwin* | rhapsody*)
1111@@ -9672,7 +10255,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1112
1113 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1114 freebsd* | dragonfly*)
1115- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1116+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1117 hardcode_libdir_flag_spec='-R$libdir'
1118 hardcode_direct=yes
1119 hardcode_shlibpath_var=no
1120@@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1121
1122 hpux9*)
1123 if test "$GCC" = yes; then
1124- 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'
1125+ 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'
1126 else
1127 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'
1128 fi
1129@@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1130
1131 hpux10*)
1132 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1133- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1134+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1135 else
1136 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1137 fi
1138@@ -9720,10 +10303,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1139 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1140 ;;
1141 ia64*)
1142- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1143+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1144 ;;
1145 *)
1146- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1147+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1148 ;;
1149 esac
1150 else
1151@@ -9802,23 +10385,36 @@ fi
1152
1153 irix5* | irix6* | nonstopux*)
1154 if test "$GCC" = yes; then
1155- 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'
1156+ 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'
1157 # Try to use the -exported_symbol ld option, if it does not
1158 # work, assume that -exports_file does not work either and
1159 # implicitly export all symbols.
1160- save_LDFLAGS="$LDFLAGS"
1161- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1162- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1163+ # This should be the same for all languages, so no per-tag cache variable.
1164+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1165+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1166+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
1167+ $as_echo_n "(cached) " >&6
1168+else
1169+ save_LDFLAGS="$LDFLAGS"
1170+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1171+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1172 /* end confdefs.h. */
1173-int foo(void) {}
1174+int foo (void) { return 0; }
1175 _ACEOF
1176 if ac_fn_c_try_link "$LINENO"; then :
1177- 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'
1178-
1179+ lt_cv_irix_exported_symbol=yes
1180+else
1181+ lt_cv_irix_exported_symbol=no
1182 fi
1183 rm -f core conftest.err conftest.$ac_objext \
1184 conftest$ac_exeext conftest.$ac_ext
1185- LDFLAGS="$save_LDFLAGS"
1186+ LDFLAGS="$save_LDFLAGS"
1187+fi
1188+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1189+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1190+ if test "$lt_cv_irix_exported_symbol" = yes; then
1191+ 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'
1192+ fi
1193 else
1194 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'
1195 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'
1196@@ -9903,7 +10499,7 @@ rm -f core conftest.err conftest.$ac_objext \
1197 osf4* | osf5*) # as osf3* with the addition of -msym flag
1198 if test "$GCC" = yes; then
1199 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1200- 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'
1201+ 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'
1202 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1203 else
1204 allow_undefined_flag=' -expect_unresolved \*'
1205@@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \
1206 no_undefined_flag=' -z defs'
1207 if test "$GCC" = yes; then
1208 wlarc='${wl}'
1209- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1210+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1211 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1212- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1213+ $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'
1214 else
1215 case `$CC -V 2>&1` in
1216 *"Compilers 5.0"*)
1217@@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1218 need_version=no
1219 need_lib_prefix=no
1220
1221- case $GCC,$host_os in
1222- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1223+ case $GCC,$cc_basename in
1224+ yes,*)
1225+ # gcc
1226 library_names_spec='$libname.dll.a'
1227 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1228 postinstall_cmds='base_file=`basename \${file}`~
1229@@ -10534,13 +11131,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1230 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1231 ;;
1232 esac
1233+ dynamic_linker='Win32 ld.exe'
1234+ ;;
1235+
1236+ *,cl*)
1237+ # Native MSVC
1238+ libname_spec='$name'
1239+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1240+ library_names_spec='${libname}.dll.lib'
1241+
1242+ case $build_os in
1243+ mingw*)
1244+ sys_lib_search_path_spec=
1245+ lt_save_ifs=$IFS
1246+ IFS=';'
1247+ for lt_path in $LIB
1248+ do
1249+ IFS=$lt_save_ifs
1250+ # Let DOS variable expansion print the short 8.3 style file name.
1251+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1252+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1253+ done
1254+ IFS=$lt_save_ifs
1255+ # Convert to MSYS style.
1256+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1257+ ;;
1258+ cygwin*)
1259+ # Convert to unix form, then to dos form, then back to unix form
1260+ # but this time dos style (no spaces!) so that the unix form looks
1261+ # like /cygdrive/c/PROGRA~1:/cygdr...
1262+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1263+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1264+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1265+ ;;
1266+ *)
1267+ sys_lib_search_path_spec="$LIB"
1268+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1269+ # It is most probably a Windows format PATH.
1270+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1271+ else
1272+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1273+ fi
1274+ # FIXME: find the short name or the path components, as spaces are
1275+ # common. (e.g. "Program Files" -> "PROGRA~1")
1276+ ;;
1277+ esac
1278+
1279+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1280+ postinstall_cmds='base_file=`basename \${file}`~
1281+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1282+ dldir=$destdir/`dirname \$dlpath`~
1283+ test -d \$dldir || mkdir -p \$dldir~
1284+ $install_prog $dir/$dlname \$dldir/$dlname'
1285+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1286+ dlpath=$dir/\$dldll~
1287+ $RM \$dlpath'
1288+ shlibpath_overrides_runpath=yes
1289+ dynamic_linker='Win32 link.exe'
1290 ;;
1291
1292 *)
1293+ # Assume MSVC wrapper
1294 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1295+ dynamic_linker='Win32 ld.exe'
1296 ;;
1297 esac
1298- dynamic_linker='Win32 ld.exe'
1299 # FIXME: first we should search . and the directory the executable is in
1300 shlibpath_var=PATH
1301 ;;
1302@@ -10632,7 +11287,7 @@ haiku*)
1303 soname_spec='${libname}${release}${shared_ext}$major'
1304 shlibpath_var=LIBRARY_PATH
1305 shlibpath_overrides_runpath=yes
1306- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1307+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1308 hardcode_into_libs=yes
1309 ;;
1310
1311@@ -11472,10 +12127,10 @@ else
1312 /* When -fvisbility=hidden is used, assume the code has been annotated
1313 correspondingly for the symbols needed. */
1314 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1315-void fnord () __attribute__((visibility("default")));
1316+int fnord () __attribute__((visibility("default")));
1317 #endif
1318
1319-void fnord () { int i=42; }
1320+int fnord () { return 42; }
1321 int main ()
1322 {
1323 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1324@@ -11578,10 +12233,10 @@ else
1325 /* When -fvisbility=hidden is used, assume the code has been annotated
1326 correspondingly for the symbols needed. */
1327 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1328-void fnord () __attribute__((visibility("default")));
1329+int fnord () __attribute__((visibility("default")));
1330 #endif
1331
1332-void fnord () { int i=42; }
1333+int fnord () { return 42; }
1334 int main ()
1335 {
1336 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1337@@ -14172,7 +14827,7 @@ SHARED_LDFLAGS=
1338 if test "$enable_shared" = "yes"; then
1339 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1340 if test -n "$x"; then
1341- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1342+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1343 fi
1344
1345 # More hacks to build DLLs on Windows.
1346@@ -16879,13 +17534,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1347 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1348 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1349 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1350+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1351+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1352 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1353 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1354 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1355 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1356 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1357+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1358+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1359+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1360+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1361 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1362 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1363+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1364 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1365 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1366 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1367@@ -16900,14 +17562,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1368 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1369 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1370 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"`'
1371+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1372+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1373 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1374 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1375 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1376-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1377 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1378+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1379 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1380 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1381 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1382+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1383 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1384 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1385 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1386@@ -16940,12 +17605,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1387 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1388 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1389 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1390-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1391 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1392 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1393 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1394 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1395 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1396+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1397 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1398 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1399 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1400@@ -17000,8 +17665,13 @@ reload_flag \
1401 OBJDUMP \
1402 deplibs_check_method \
1403 file_magic_cmd \
1404+file_magic_glob \
1405+want_nocaseglob \
1406+DLLTOOL \
1407+sharedlib_from_linklib_cmd \
1408 AR \
1409 AR_FLAGS \
1410+archiver_list_spec \
1411 STRIP \
1412 RANLIB \
1413 CC \
1414@@ -17011,12 +17681,14 @@ lt_cv_sys_global_symbol_pipe \
1415 lt_cv_sys_global_symbol_to_cdecl \
1416 lt_cv_sys_global_symbol_to_c_name_address \
1417 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1418+nm_file_list_spec \
1419 lt_prog_compiler_no_builtin_flag \
1420-lt_prog_compiler_wl \
1421 lt_prog_compiler_pic \
1422+lt_prog_compiler_wl \
1423 lt_prog_compiler_static \
1424 lt_cv_prog_compiler_c_o \
1425 need_locks \
1426+MANIFEST_TOOL \
1427 DSYMUTIL \
1428 NMEDIT \
1429 LIPO \
1430@@ -17032,7 +17704,6 @@ no_undefined_flag \
1431 hardcode_libdir_flag_spec \
1432 hardcode_libdir_flag_spec_ld \
1433 hardcode_libdir_separator \
1434-fix_srcfile_path \
1435 exclude_expsyms \
1436 include_expsyms \
1437 file_list_spec \
1438@@ -17068,6 +17739,7 @@ module_cmds \
1439 module_expsym_cmds \
1440 export_symbols_cmds \
1441 prelink_cmds \
1442+postlink_cmds \
1443 postinstall_cmds \
1444 postuninstall_cmds \
1445 finish_cmds \
1446@@ -17847,7 +18519,8 @@ $as_echo X"$file" |
1447 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1448 #
1449 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1450-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1451+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1452+# Inc.
1453 # Written by Gordon Matzigkeit, 1996
1454 #
1455 # This file is part of GNU Libtool.
1456@@ -17950,19 +18623,42 @@ SP2NL=$lt_lt_SP2NL
1457 # turn newlines into spaces.
1458 NL2SP=$lt_lt_NL2SP
1459
1460+# convert \$build file names to \$host format.
1461+to_host_file_cmd=$lt_cv_to_host_file_cmd
1462+
1463+# convert \$build files to toolchain format.
1464+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1465+
1466 # An object symbol dumper.
1467 OBJDUMP=$lt_OBJDUMP
1468
1469 # Method to check whether dependent libraries are shared objects.
1470 deplibs_check_method=$lt_deplibs_check_method
1471
1472-# Command to use when deplibs_check_method == "file_magic".
1473+# Command to use when deplibs_check_method = "file_magic".
1474 file_magic_cmd=$lt_file_magic_cmd
1475
1476+# How to find potential files when deplibs_check_method = "file_magic".
1477+file_magic_glob=$lt_file_magic_glob
1478+
1479+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1480+want_nocaseglob=$lt_want_nocaseglob
1481+
1482+# DLL creation program.
1483+DLLTOOL=$lt_DLLTOOL
1484+
1485+# Command to associate shared and link libraries.
1486+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1487+
1488 # The archiver.
1489 AR=$lt_AR
1490+
1491+# Flags to create an archive.
1492 AR_FLAGS=$lt_AR_FLAGS
1493
1494+# How to feed a file listing to the archiver.
1495+archiver_list_spec=$lt_archiver_list_spec
1496+
1497 # A symbol stripping program.
1498 STRIP=$lt_STRIP
1499
1500@@ -17992,6 +18688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1501 # Transform the output of nm in a C name address pair when lib prefix is needed.
1502 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1503
1504+# Specify filename containing input files for \$NM.
1505+nm_file_list_spec=$lt_nm_file_list_spec
1506+
1507+# The root where to search for dependent libraries,and in which our libraries should be installed.
1508+lt_sysroot=$lt_sysroot
1509+
1510 # The name of the directory that contains temporary libtool files.
1511 objdir=$objdir
1512
1513@@ -18001,6 +18703,9 @@ MAGIC_CMD=$MAGIC_CMD
1514 # Must we lock files when doing compilation?
1515 need_locks=$lt_need_locks
1516
1517+# Manifest tool.
1518+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1519+
1520 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1521 DSYMUTIL=$lt_DSYMUTIL
1522
1523@@ -18115,12 +18820,12 @@ with_gcc=$GCC
1524 # Compiler flag to turn off builtin functions.
1525 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1526
1527-# How to pass a linker flag through the compiler.
1528-wl=$lt_lt_prog_compiler_wl
1529-
1530 # Additional compiler flags for building library objects.
1531 pic_flag=$lt_lt_prog_compiler_pic
1532
1533+# How to pass a linker flag through the compiler.
1534+wl=$lt_lt_prog_compiler_wl
1535+
1536 # Compiler flag to prevent dynamic linking.
1537 link_static_flag=$lt_lt_prog_compiler_static
1538
1539@@ -18207,9 +18912,6 @@ inherit_rpath=$inherit_rpath
1540 # Whether libtool must link a program against all its dependency libraries.
1541 link_all_deplibs=$link_all_deplibs
1542
1543-# Fix the shell variable \$srcfile for the compiler.
1544-fix_srcfile_path=$lt_fix_srcfile_path
1545-
1546 # Set to "yes" if exported symbols are required.
1547 always_export_symbols=$always_export_symbols
1548
1549@@ -18225,6 +18927,9 @@ include_expsyms=$lt_include_expsyms
1550 # Commands necessary for linking programs (against libraries) with templates.
1551 prelink_cmds=$lt_prelink_cmds
1552
1553+# Commands necessary for finishing linking programs.
1554+postlink_cmds=$lt_postlink_cmds
1555+
1556 # Specify filename containing input files.
1557 file_list_spec=$lt_file_list_spec
1558
1559@@ -18257,210 +18962,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1560 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1561 # text mode, it properly converts lines to CR/LF. This bash problem
1562 # is reportedly fixed, but why not run on old versions too?
1563- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1564- || (rm -f "$cfgfile"; exit 1)
1565-
1566- case $xsi_shell in
1567- yes)
1568- cat << \_LT_EOF >> "$cfgfile"
1569-
1570-# func_dirname file append nondir_replacement
1571-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1572-# otherwise set result to NONDIR_REPLACEMENT.
1573-func_dirname ()
1574-{
1575- case ${1} in
1576- */*) func_dirname_result="${1%/*}${2}" ;;
1577- * ) func_dirname_result="${3}" ;;
1578- esac
1579-}
1580-
1581-# func_basename file
1582-func_basename ()
1583-{
1584- func_basename_result="${1##*/}"
1585-}
1586-
1587-# func_dirname_and_basename file append nondir_replacement
1588-# perform func_basename and func_dirname in a single function
1589-# call:
1590-# dirname: Compute the dirname of FILE. If nonempty,
1591-# add APPEND to the result, otherwise set result
1592-# to NONDIR_REPLACEMENT.
1593-# value returned in "$func_dirname_result"
1594-# basename: Compute filename of FILE.
1595-# value retuned in "$func_basename_result"
1596-# Implementation must be kept synchronized with func_dirname
1597-# and func_basename. For efficiency, we do not delegate to
1598-# those functions but instead duplicate the functionality here.
1599-func_dirname_and_basename ()
1600-{
1601- case ${1} in
1602- */*) func_dirname_result="${1%/*}${2}" ;;
1603- * ) func_dirname_result="${3}" ;;
1604- esac
1605- func_basename_result="${1##*/}"
1606-}
1607-
1608-# func_stripname prefix suffix name
1609-# strip PREFIX and SUFFIX off of NAME.
1610-# PREFIX and SUFFIX must not contain globbing or regex special
1611-# characters, hashes, percent signs, but SUFFIX may contain a leading
1612-# dot (in which case that matches only a dot).
1613-func_stripname ()
1614-{
1615- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1616- # positional parameters, so assign one to ordinary parameter first.
1617- func_stripname_result=${3}
1618- func_stripname_result=${func_stripname_result#"${1}"}
1619- func_stripname_result=${func_stripname_result%"${2}"}
1620-}
1621-
1622-# func_opt_split
1623-func_opt_split ()
1624-{
1625- func_opt_split_opt=${1%%=*}
1626- func_opt_split_arg=${1#*=}
1627-}
1628-
1629-# func_lo2o object
1630-func_lo2o ()
1631-{
1632- case ${1} in
1633- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1634- *) func_lo2o_result=${1} ;;
1635- esac
1636-}
1637-
1638-# func_xform libobj-or-source
1639-func_xform ()
1640-{
1641- func_xform_result=${1%.*}.lo
1642-}
1643-
1644-# func_arith arithmetic-term...
1645-func_arith ()
1646-{
1647- func_arith_result=$(( $* ))
1648-}
1649-
1650-# func_len string
1651-# STRING may not start with a hyphen.
1652-func_len ()
1653-{
1654- func_len_result=${#1}
1655-}
1656-
1657-_LT_EOF
1658- ;;
1659- *) # Bourne compatible functions.
1660- cat << \_LT_EOF >> "$cfgfile"
1661-
1662-# func_dirname file append nondir_replacement
1663-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1664-# otherwise set result to NONDIR_REPLACEMENT.
1665-func_dirname ()
1666-{
1667- # Extract subdirectory from the argument.
1668- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1669- if test "X$func_dirname_result" = "X${1}"; then
1670- func_dirname_result="${3}"
1671- else
1672- func_dirname_result="$func_dirname_result${2}"
1673- fi
1674-}
1675-
1676-# func_basename file
1677-func_basename ()
1678-{
1679- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1680-}
1681-
1682-
1683-# func_stripname prefix suffix name
1684-# strip PREFIX and SUFFIX off of NAME.
1685-# PREFIX and SUFFIX must not contain globbing or regex special
1686-# characters, hashes, percent signs, but SUFFIX may contain a leading
1687-# dot (in which case that matches only a dot).
1688-# func_strip_suffix prefix name
1689-func_stripname ()
1690-{
1691- case ${2} in
1692- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1693- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1694- esac
1695-}
1696-
1697-# sed scripts:
1698-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1699-my_sed_long_arg='1s/^-[^=]*=//'
1700-
1701-# func_opt_split
1702-func_opt_split ()
1703-{
1704- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1705- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1706-}
1707-
1708-# func_lo2o object
1709-func_lo2o ()
1710-{
1711- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1712-}
1713-
1714-# func_xform libobj-or-source
1715-func_xform ()
1716-{
1717- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1718-}
1719-
1720-# func_arith arithmetic-term...
1721-func_arith ()
1722-{
1723- func_arith_result=`expr "$@"`
1724-}
1725-
1726-# func_len string
1727-# STRING may not start with a hyphen.
1728-func_len ()
1729-{
1730- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1731-}
1732-
1733-_LT_EOF
1734-esac
1735-
1736-case $lt_shell_append in
1737- yes)
1738- cat << \_LT_EOF >> "$cfgfile"
1739-
1740-# func_append var value
1741-# Append VALUE to the end of shell variable VAR.
1742-func_append ()
1743-{
1744- eval "$1+=\$2"
1745-}
1746-_LT_EOF
1747- ;;
1748- *)
1749- cat << \_LT_EOF >> "$cfgfile"
1750-
1751-# func_append var value
1752-# Append VALUE to the end of shell variable VAR.
1753-func_append ()
1754-{
1755- eval "$1=\$$1\$2"
1756-}
1757-
1758-_LT_EOF
1759- ;;
1760- esac
1761-
1762-
1763- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1764- || (rm -f "$cfgfile"; exit 1)
1765-
1766- mv -f "$cfgfile" "$ofile" ||
1767+ sed '$q' "$ltmain" >> "$cfgfile" \
1768+ || (rm -f "$cfgfile"; exit 1)
1769+
1770+ if test x"$xsi_shell" = xyes; then
1771+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1772+func_dirname ()\
1773+{\
1774+\ case ${1} in\
1775+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1776+\ * ) func_dirname_result="${3}" ;;\
1777+\ esac\
1778+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1779+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1780+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1781+test 0 -eq $? || _lt_function_replace_fail=:
1782+
1783+
1784+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1785+func_basename ()\
1786+{\
1787+\ func_basename_result="${1##*/}"\
1788+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1789+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1790+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1791+test 0 -eq $? || _lt_function_replace_fail=:
1792+
1793+
1794+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1795+func_dirname_and_basename ()\
1796+{\
1797+\ case ${1} in\
1798+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1799+\ * ) func_dirname_result="${3}" ;;\
1800+\ esac\
1801+\ func_basename_result="${1##*/}"\
1802+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1803+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1804+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1805+test 0 -eq $? || _lt_function_replace_fail=:
1806+
1807+
1808+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1809+func_stripname ()\
1810+{\
1811+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1812+\ # positional parameters, so assign one to ordinary parameter first.\
1813+\ func_stripname_result=${3}\
1814+\ func_stripname_result=${func_stripname_result#"${1}"}\
1815+\ func_stripname_result=${func_stripname_result%"${2}"}\
1816+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1817+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1818+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1819+test 0 -eq $? || _lt_function_replace_fail=:
1820+
1821+
1822+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1823+func_split_long_opt ()\
1824+{\
1825+\ func_split_long_opt_name=${1%%=*}\
1826+\ func_split_long_opt_arg=${1#*=}\
1827+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1828+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1829+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1830+test 0 -eq $? || _lt_function_replace_fail=:
1831+
1832+
1833+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1834+func_split_short_opt ()\
1835+{\
1836+\ func_split_short_opt_arg=${1#??}\
1837+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1838+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1839+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1840+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1841+test 0 -eq $? || _lt_function_replace_fail=:
1842+
1843+
1844+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1845+func_lo2o ()\
1846+{\
1847+\ case ${1} in\
1848+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1849+\ *) func_lo2o_result=${1} ;;\
1850+\ esac\
1851+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1852+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1853+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1854+test 0 -eq $? || _lt_function_replace_fail=:
1855+
1856+
1857+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1858+func_xform ()\
1859+{\
1860+ func_xform_result=${1%.*}.lo\
1861+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1862+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1863+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1864+test 0 -eq $? || _lt_function_replace_fail=:
1865+
1866+
1867+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1868+func_arith ()\
1869+{\
1870+ func_arith_result=$(( $* ))\
1871+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1872+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1873+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1874+test 0 -eq $? || _lt_function_replace_fail=:
1875+
1876+
1877+ sed -e '/^func_len ()$/,/^} # func_len /c\
1878+func_len ()\
1879+{\
1880+ func_len_result=${#1}\
1881+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1882+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1883+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1884+test 0 -eq $? || _lt_function_replace_fail=:
1885+
1886+fi
1887+
1888+if test x"$lt_shell_append" = xyes; then
1889+ sed -e '/^func_append ()$/,/^} # func_append /c\
1890+func_append ()\
1891+{\
1892+ eval "${1}+=\\${2}"\
1893+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1894+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1895+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1896+test 0 -eq $? || _lt_function_replace_fail=:
1897+
1898+
1899+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1900+func_append_quoted ()\
1901+{\
1902+\ func_quote_for_eval "${2}"\
1903+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1904+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1905+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1906+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1907+test 0 -eq $? || _lt_function_replace_fail=:
1908+
1909+
1910+ # Save a `func_append' function call where possible by direct use of '+='
1911+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1912+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1913+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1914+ test 0 -eq $? || _lt_function_replace_fail=:
1915+else
1916+ # Save a `func_append' function call even when '+=' is not available
1917+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1918+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1919+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1920+ test 0 -eq $? || _lt_function_replace_fail=:
1921+fi
1922+
1923+if test x"$_lt_function_replace_fail" = x":"; then
1924+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1925+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1926+fi
1927+
1928+
1929+ mv -f "$cfgfile" "$ofile" ||
1930 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1931 chmod +x "$ofile"
1932
1933diff --git a/bfd/configure.ac b/bfd/configure.ac
1934index 8fd03a7ea8..8816c3286c 100644
1935--- a/bfd/configure.ac
1936+++ b/bfd/configure.ac
1937@@ -254,7 +254,7 @@ changequote(,)dnl
1938 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1939 changequote([,])dnl
1940 if test -n "$x"; then
1941- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1942+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1943 fi
1944
1945 # More hacks to build DLLs on Windows.
1946diff --git a/binutils/configure b/binutils/configure
1947index 22e1b1736e..321b63535b 100755
1948--- a/binutils/configure
1949+++ b/binutils/configure
1950@@ -659,8 +659,11 @@ OTOOL
1951 LIPO
1952 NMEDIT
1953 DSYMUTIL
1954+MANIFEST_TOOL
1955 RANLIB
1956+ac_ct_AR
1957 AR
1958+DLLTOOL
1959 OBJDUMP
1960 LN_S
1961 NM
1962@@ -772,6 +775,7 @@ enable_static
1963 with_pic
1964 enable_fast_install
1965 with_gnu_ld
1966+with_libtool_sysroot
1967 enable_libtool_lock
1968 enable_plugins
1969 enable_largefile
1970@@ -1444,6 +1448,8 @@ Optional Packages:
1971 --with-pic try to use only PIC/non-PIC objects [default=use
1972 both]
1973 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1974+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1975+ (or the compiler's sysroot if not specified).
1976 --with-system-zlib use installed libz
1977 --with-gnu-ld assume the C compiler uses GNU ld default=no
1978 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1979@@ -5160,8 +5166,8 @@ esac
1980
1981
1982
1983-macro_version='2.2.7a'
1984-macro_revision='1.3134'
1985+macro_version='2.4'
1986+macro_revision='1.3293'
1987
1988
1989
1990@@ -5201,7 +5207,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1992 $as_echo_n "checking how to print strings... " >&6; }
1993 # Test print first, because it will be a builtin if present.
1994-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1995+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
1996 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1997 ECHO='print -r --'
1998 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1999@@ -5887,8 +5893,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2000 # Try some XSI features
2001 xsi_shell=no
2002 ( _lt_dummy="a/b/c"
2003- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2004- = c,a/b,, \
2005+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2006+ = c,a/b,b/c, \
2007 && eval 'test $(( 1 + 1 )) -eq 2 \
2008 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2009 && xsi_shell=yes
2010@@ -5937,6 +5943,80 @@ esac
2011
2012
2013
2014+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2015+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2016+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
2017+ $as_echo_n "(cached) " >&6
2018+else
2019+ case $host in
2020+ *-*-mingw* )
2021+ case $build in
2022+ *-*-mingw* ) # actually msys
2023+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2024+ ;;
2025+ *-*-cygwin* )
2026+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2027+ ;;
2028+ * ) # otherwise, assume *nix
2029+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2030+ ;;
2031+ esac
2032+ ;;
2033+ *-*-cygwin* )
2034+ case $build in
2035+ *-*-mingw* ) # actually msys
2036+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2037+ ;;
2038+ *-*-cygwin* )
2039+ lt_cv_to_host_file_cmd=func_convert_file_noop
2040+ ;;
2041+ * ) # otherwise, assume *nix
2042+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2043+ ;;
2044+ esac
2045+ ;;
2046+ * ) # unhandled hosts (and "normal" native builds)
2047+ lt_cv_to_host_file_cmd=func_convert_file_noop
2048+ ;;
2049+esac
2050+
2051+fi
2052+
2053+to_host_file_cmd=$lt_cv_to_host_file_cmd
2054+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2055+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2056+
2057+
2058+
2059+
2060+
2061+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2062+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2063+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
2064+ $as_echo_n "(cached) " >&6
2065+else
2066+ #assume ordinary cross tools, or native build.
2067+lt_cv_to_tool_file_cmd=func_convert_file_noop
2068+case $host in
2069+ *-*-mingw* )
2070+ case $build in
2071+ *-*-mingw* ) # actually msys
2072+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2073+ ;;
2074+ esac
2075+ ;;
2076+esac
2077+
2078+fi
2079+
2080+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2081+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2082+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2083+
2084+
2085+
2086+
2087+
2088 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2089 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2090 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2091@@ -5953,6 +6033,11 @@ case $reload_flag in
2092 esac
2093 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2094 case $host_os in
2095+ cygwin* | mingw* | pw32* | cegcc*)
2096+ if test "$GCC" != yes; then
2097+ reload_cmds=false
2098+ fi
2099+ ;;
2100 darwin*)
2101 if test "$GCC" = yes; then
2102 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2103@@ -6121,7 +6206,8 @@ mingw* | pw32*)
2104 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2105 lt_cv_file_magic_cmd='func_win32_libid'
2106 else
2107- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2108+ # Keep this pattern in sync with the one in func_win32_libid.
2109+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2110 lt_cv_file_magic_cmd='$OBJDUMP -f'
2111 fi
2112 ;;
2113@@ -6275,6 +6361,21 @@ esac
2114 fi
2115 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2116 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2117+
2118+file_magic_glob=
2119+want_nocaseglob=no
2120+if test "$build" = "$host"; then
2121+ case $host_os in
2122+ mingw* | pw32*)
2123+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2124+ want_nocaseglob=yes
2125+ else
2126+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2127+ fi
2128+ ;;
2129+ esac
2130+fi
2131+
2132 file_magic_cmd=$lt_cv_file_magic_cmd
2133 deplibs_check_method=$lt_cv_deplibs_check_method
2134 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2135@@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2136
2137
2138
2139+
2140+
2141+
2142+
2143+
2144+
2145+
2146+
2147+
2148+
2149+if test -n "$ac_tool_prefix"; then
2150+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2151+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2152+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2153+$as_echo_n "checking for $ac_word... " >&6; }
2154+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
2155+ $as_echo_n "(cached) " >&6
2156+else
2157+ if test -n "$DLLTOOL"; then
2158+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2159+else
2160+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2161+for as_dir in $PATH
2162+do
2163+ IFS=$as_save_IFS
2164+ test -z "$as_dir" && as_dir=.
2165+ for ac_exec_ext in '' $ac_executable_extensions; do
2166+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2167+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2168+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2169+ break 2
2170+ fi
2171+done
2172+ done
2173+IFS=$as_save_IFS
2174+
2175+fi
2176+fi
2177+DLLTOOL=$ac_cv_prog_DLLTOOL
2178+if test -n "$DLLTOOL"; then
2179+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2180+$as_echo "$DLLTOOL" >&6; }
2181+else
2182+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2183+$as_echo "no" >&6; }
2184+fi
2185+
2186+
2187+fi
2188+if test -z "$ac_cv_prog_DLLTOOL"; then
2189+ ac_ct_DLLTOOL=$DLLTOOL
2190+ # Extract the first word of "dlltool", so it can be a program name with args.
2191+set dummy dlltool; ac_word=$2
2192+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2193+$as_echo_n "checking for $ac_word... " >&6; }
2194+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
2195+ $as_echo_n "(cached) " >&6
2196+else
2197+ if test -n "$ac_ct_DLLTOOL"; then
2198+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2199+else
2200+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2201+for as_dir in $PATH
2202+do
2203+ IFS=$as_save_IFS
2204+ test -z "$as_dir" && as_dir=.
2205+ for ac_exec_ext in '' $ac_executable_extensions; do
2206+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2207+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2208+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2209+ break 2
2210+ fi
2211+done
2212+ done
2213+IFS=$as_save_IFS
2214+
2215+fi
2216+fi
2217+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2218+if test -n "$ac_ct_DLLTOOL"; then
2219+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2220+$as_echo "$ac_ct_DLLTOOL" >&6; }
2221+else
2222+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2223+$as_echo "no" >&6; }
2224+fi
2225+
2226+ if test "x$ac_ct_DLLTOOL" = x; then
2227+ DLLTOOL="false"
2228+ else
2229+ case $cross_compiling:$ac_tool_warned in
2230+yes:)
2231+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2232+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2233+ac_tool_warned=yes ;;
2234+esac
2235+ DLLTOOL=$ac_ct_DLLTOOL
2236+ fi
2237+else
2238+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2239+fi
2240+
2241+test -z "$DLLTOOL" && DLLTOOL=dlltool
2242+
2243+
2244+
2245+
2246+
2247+
2248+
2249+
2250+
2251+
2252+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2253+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2254+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
2255+ $as_echo_n "(cached) " >&6
2256+else
2257+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2258+
2259+case $host_os in
2260+cygwin* | mingw* | pw32* | cegcc*)
2261+ # two different shell functions defined in ltmain.sh
2262+ # decide which to use based on capabilities of $DLLTOOL
2263+ case `$DLLTOOL --help 2>&1` in
2264+ *--identify-strict*)
2265+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2266+ ;;
2267+ *)
2268+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2269+ ;;
2270+ esac
2271+ ;;
2272+*)
2273+ # fallback: assume linklib IS sharedlib
2274+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2275+ ;;
2276+esac
2277+
2278+fi
2279+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2280+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2281+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2282+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2283+
2284+
2285+
2286+
2287+
2288+
2289+
2290 if test -n "$ac_tool_prefix"; then
2291- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2292-set dummy ${ac_tool_prefix}ar; ac_word=$2
2293+ for ac_prog in ar
2294+ do
2295+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2296+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2298 $as_echo_n "checking for $ac_word... " >&6; }
2299 if test "${ac_cv_prog_AR+set}" = set; then :
2300@@ -6308,7 +6562,7 @@ do
2301 test -z "$as_dir" && as_dir=.
2302 for ac_exec_ext in '' $ac_executable_extensions; do
2303 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2304- ac_cv_prog_AR="${ac_tool_prefix}ar"
2305+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2306 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2307 break 2
2308 fi
2309@@ -6328,11 +6582,15 @@ $as_echo "no" >&6; }
2310 fi
2311
2312
2313+ test -n "$AR" && break
2314+ done
2315 fi
2316-if test -z "$ac_cv_prog_AR"; then
2317+if test -z "$AR"; then
2318 ac_ct_AR=$AR
2319- # Extract the first word of "ar", so it can be a program name with args.
2320-set dummy ar; ac_word=$2
2321+ for ac_prog in ar
2322+do
2323+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2324+set dummy $ac_prog; ac_word=$2
2325 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2326 $as_echo_n "checking for $ac_word... " >&6; }
2327 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2328@@ -6348,7 +6606,7 @@ do
2329 test -z "$as_dir" && as_dir=.
2330 for ac_exec_ext in '' $ac_executable_extensions; do
2331 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2332- ac_cv_prog_ac_ct_AR="ar"
2333+ ac_cv_prog_ac_ct_AR="$ac_prog"
2334 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2335 break 2
2336 fi
2337@@ -6367,6 +6625,10 @@ else
2338 $as_echo "no" >&6; }
2339 fi
2340
2341+
2342+ test -n "$ac_ct_AR" && break
2343+done
2344+
2345 if test "x$ac_ct_AR" = x; then
2346 AR="false"
2347 else
2348@@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;;
2349 esac
2350 AR=$ac_ct_AR
2351 fi
2352-else
2353- AR="$ac_cv_prog_AR"
2354 fi
2355
2356-test -z "$AR" && AR=ar
2357-test -z "$AR_FLAGS" && AR_FLAGS=cru
2358+: ${AR=ar}
2359+: ${AR_FLAGS=cru}
2360
2361
2362
2363@@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2364
2365
2366
2367+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2368+$as_echo_n "checking for archiver @FILE support... " >&6; }
2369+if test "${lt_cv_ar_at_file+set}" = set; then :
2370+ $as_echo_n "(cached) " >&6
2371+else
2372+ lt_cv_ar_at_file=no
2373+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2374+/* end confdefs.h. */
2375+
2376+int
2377+main ()
2378+{
2379+
2380+ ;
2381+ return 0;
2382+}
2383+_ACEOF
2384+if ac_fn_c_try_compile "$LINENO"; then :
2385+ echo conftest.$ac_objext > conftest.lst
2386+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2387+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2388+ (eval $lt_ar_try) 2>&5
2389+ ac_status=$?
2390+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2391+ test $ac_status = 0; }
2392+ if test "$ac_status" -eq 0; then
2393+ # Ensure the archiver fails upon bogus file names.
2394+ rm -f conftest.$ac_objext libconftest.a
2395+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2396+ (eval $lt_ar_try) 2>&5
2397+ ac_status=$?
2398+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2399+ test $ac_status = 0; }
2400+ if test "$ac_status" -ne 0; then
2401+ lt_cv_ar_at_file=@
2402+ fi
2403+ fi
2404+ rm -f conftest.* libconftest.a
2405+
2406+fi
2407+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2408+
2409+fi
2410+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2411+$as_echo "$lt_cv_ar_at_file" >&6; }
2412+
2413+if test "x$lt_cv_ar_at_file" = xno; then
2414+ archiver_list_spec=
2415+else
2416+ archiver_list_spec=$lt_cv_ar_at_file
2417+fi
2418+
2419+
2420+
2421+
2422+
2423+
2424+
2425 if test -n "$ac_tool_prefix"; then
2426 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2427 set dummy ${ac_tool_prefix}strip; ac_word=$2
2428@@ -6729,8 +7047,8 @@ esac
2429 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2430
2431 # Transform an extracted symbol line into symbol name and symbol address
2432-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2433-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'"
2434+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2435+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'"
2436
2437 # Handle CRLF in mingw tool chain
2438 opt_cr=
2439@@ -6766,6 +7084,7 @@ for ac_symprfx in "" "_"; do
2440 else
2441 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2442 fi
2443+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2444
2445 # Check to see that the pipe works correctly.
2446 pipe_works=no
2447@@ -6807,6 +7126,18 @@ _LT_EOF
2448 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2449 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2450 cat <<_LT_EOF > conftest.$ac_ext
2451+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2452+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2453+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2454+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2455+# define LT_DLSYM_CONST
2456+#elif defined(__osf__)
2457+/* This system does not cope well with relocations in const data. */
2458+# define LT_DLSYM_CONST
2459+#else
2460+# define LT_DLSYM_CONST const
2461+#endif
2462+
2463 #ifdef __cplusplus
2464 extern "C" {
2465 #endif
2466@@ -6818,7 +7149,7 @@ _LT_EOF
2467 cat <<_LT_EOF >> conftest.$ac_ext
2468
2469 /* The mapping between symbol names and symbols. */
2470-const struct {
2471+LT_DLSYM_CONST struct {
2472 const char *name;
2473 void *address;
2474 }
2475@@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() {
2476 _LT_EOF
2477 # Now try linking the two files.
2478 mv conftest.$ac_objext conftstm.$ac_objext
2479- lt_save_LIBS="$LIBS"
2480- lt_save_CFLAGS="$CFLAGS"
2481+ lt_globsym_save_LIBS=$LIBS
2482+ lt_globsym_save_CFLAGS=$CFLAGS
2483 LIBS="conftstm.$ac_objext"
2484 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2485 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2486@@ -6855,8 +7186,8 @@ _LT_EOF
2487 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2488 pipe_works=yes
2489 fi
2490- LIBS="$lt_save_LIBS"
2491- CFLAGS="$lt_save_CFLAGS"
2492+ LIBS=$lt_globsym_save_LIBS
2493+ CFLAGS=$lt_globsym_save_CFLAGS
2494 else
2495 echo "cannot find nm_test_func in $nlist" >&5
2496 fi
2497@@ -6893,6 +7224,21 @@ else
2498 $as_echo "ok" >&6; }
2499 fi
2500
2501+# Response file support.
2502+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2503+ nm_file_list_spec='@'
2504+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2505+ nm_file_list_spec='@'
2506+fi
2507+
2508+
2509+
2510+
2511+
2512+
2513+
2514+
2515+
2516
2517
2518
2519@@ -6908,6 +7254,40 @@ fi
2520
2521
2522
2523+
2524+
2525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2526+$as_echo_n "checking for sysroot... " >&6; }
2527+
2528+# Check whether --with-libtool-sysroot was given.
2529+if test "${with_libtool_sysroot+set}" = set; then :
2530+ withval=$with_libtool_sysroot;
2531+else
2532+ with_libtool_sysroot=no
2533+fi
2534+
2535+
2536+lt_sysroot=
2537+case ${with_libtool_sysroot} in #(
2538+ yes)
2539+ if test "$GCC" = yes; then
2540+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2541+ fi
2542+ ;; #(
2543+ /*)
2544+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2545+ ;; #(
2546+ no|'')
2547+ ;; #(
2548+ *)
2549+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2550+$as_echo "${with_libtool_sysroot}" >&6; }
2551+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
2552+ ;;
2553+esac
2554+
2555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2556+$as_echo "${lt_sysroot:-no}" >&6; }
2557
2558
2559
2560@@ -7120,6 +7500,123 @@ esac
2561
2562 need_locks="$enable_libtool_lock"
2563
2564+if test -n "$ac_tool_prefix"; then
2565+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2566+set dummy ${ac_tool_prefix}mt; ac_word=$2
2567+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2568+$as_echo_n "checking for $ac_word... " >&6; }
2569+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
2570+ $as_echo_n "(cached) " >&6
2571+else
2572+ if test -n "$MANIFEST_TOOL"; then
2573+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2574+else
2575+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2576+for as_dir in $PATH
2577+do
2578+ IFS=$as_save_IFS
2579+ test -z "$as_dir" && as_dir=.
2580+ for ac_exec_ext in '' $ac_executable_extensions; do
2581+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2582+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2583+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2584+ break 2
2585+ fi
2586+done
2587+ done
2588+IFS=$as_save_IFS
2589+
2590+fi
2591+fi
2592+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2593+if test -n "$MANIFEST_TOOL"; then
2594+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2595+$as_echo "$MANIFEST_TOOL" >&6; }
2596+else
2597+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2598+$as_echo "no" >&6; }
2599+fi
2600+
2601+
2602+fi
2603+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2604+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2605+ # Extract the first word of "mt", so it can be a program name with args.
2606+set dummy mt; ac_word=$2
2607+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2608+$as_echo_n "checking for $ac_word... " >&6; }
2609+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
2610+ $as_echo_n "(cached) " >&6
2611+else
2612+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2613+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2614+else
2615+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2616+for as_dir in $PATH
2617+do
2618+ IFS=$as_save_IFS
2619+ test -z "$as_dir" && as_dir=.
2620+ for ac_exec_ext in '' $ac_executable_extensions; do
2621+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2622+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2623+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2624+ break 2
2625+ fi
2626+done
2627+ done
2628+IFS=$as_save_IFS
2629+
2630+fi
2631+fi
2632+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2633+if test -n "$ac_ct_MANIFEST_TOOL"; then
2634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2635+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2636+else
2637+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2638+$as_echo "no" >&6; }
2639+fi
2640+
2641+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2642+ MANIFEST_TOOL=":"
2643+ else
2644+ case $cross_compiling:$ac_tool_warned in
2645+yes:)
2646+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2647+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2648+ac_tool_warned=yes ;;
2649+esac
2650+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2651+ fi
2652+else
2653+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2654+fi
2655+
2656+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2657+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2658+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2659+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
2660+ $as_echo_n "(cached) " >&6
2661+else
2662+ lt_cv_path_mainfest_tool=no
2663+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2664+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2665+ cat conftest.err >&5
2666+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2667+ lt_cv_path_mainfest_tool=yes
2668+ fi
2669+ rm -f conftest*
2670+fi
2671+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2672+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2673+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2674+ MANIFEST_TOOL=:
2675+fi
2676+
2677+
2678+
2679+
2680+
2681
2682 case $host_os in
2683 rhapsody* | darwin*)
2684@@ -7683,6 +8180,8 @@ _LT_EOF
2685 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2686 echo "$AR cru libconftest.a conftest.o" >&5
2687 $AR cru libconftest.a conftest.o 2>&5
2688+ echo "$RANLIB libconftest.a" >&5
2689+ $RANLIB libconftest.a 2>&5
2690 cat > conftest.c << _LT_EOF
2691 int main() { return 0;}
2692 _LT_EOF
2693@@ -7878,7 +8377,8 @@ fi
2694 LIBTOOL_DEPS="$ltmain"
2695
2696 # Always use our own libtool.
2697-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2698+LIBTOOL='$(SHELL) $(top_builddir)'
2699+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2700
2701
2702
2703@@ -7967,7 +8467,7 @@ aix3*)
2704 esac
2705
2706 # Global variables:
2707-ofile=libtool
2708+ofile=${host_alias}-libtool
2709 can_build_shared=yes
2710
2711 # All known linkers require a `.a' archive for static linking (except MSVC,
2712@@ -8265,8 +8765,6 @@ fi
2713 lt_prog_compiler_pic=
2714 lt_prog_compiler_static=
2715
2716-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2717-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2718
2719 if test "$GCC" = yes; then
2720 lt_prog_compiler_wl='-Wl,'
2721@@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2722 lt_prog_compiler_pic='--shared'
2723 lt_prog_compiler_static='--static'
2724 ;;
2725+ nagfor*)
2726+ # NAG Fortran compiler
2727+ lt_prog_compiler_wl='-Wl,-Wl,,'
2728+ lt_prog_compiler_pic='-PIC'
2729+ lt_prog_compiler_static='-Bstatic'
2730+ ;;
2731 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2732 # Portland Group compilers (*not* the Pentium gcc compiler,
2733 # which looks to be a dead project)
2734@@ -8494,7 +8998,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2735 lt_prog_compiler_pic='-KPIC'
2736 lt_prog_compiler_static='-Bstatic'
2737 case $cc_basename in
2738- f77* | f90* | f95*)
2739+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2740 lt_prog_compiler_wl='-Qoption ld ';;
2741 *)
2742 lt_prog_compiler_wl='-Wl,';;
2743@@ -8551,13 +9055,17 @@ case $host_os in
2744 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2745 ;;
2746 esac
2747-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2748-$as_echo "$lt_prog_compiler_pic" >&6; }
2749-
2750-
2751-
2752-
2753
2754+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2755+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2756+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
2757+ $as_echo_n "(cached) " >&6
2758+else
2759+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2760+fi
2761+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2762+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2763+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2764
2765 #
2766 # Check to make sure the PIC flag actually works.
2767@@ -8618,6 +9126,11 @@ fi
2768
2769
2770
2771+
2772+
2773+
2774+
2775+
2776 #
2777 # Check to make sure the static flag actually works.
2778 #
2779@@ -8968,7 +9481,8 @@ _LT_EOF
2780 allow_undefined_flag=unsupported
2781 always_export_symbols=no
2782 enable_shared_with_static_runtimes=yes
2783- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2784+ 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'
2785+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2786
2787 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2788 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2789@@ -9067,12 +9581,12 @@ _LT_EOF
2790 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2791 hardcode_libdir_flag_spec=
2792 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2793- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2794+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2795 if test "x$supports_anon_versioning" = xyes; then
2796 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2797 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2798 echo "local: *; };" >> $output_objdir/$libname.ver~
2799- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2800+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2801 fi
2802 ;;
2803 esac
2804@@ -9086,8 +9600,8 @@ _LT_EOF
2805 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2806 wlarc=
2807 else
2808- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2809- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2810+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2811+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2812 fi
2813 ;;
2814
2815@@ -9105,8 +9619,8 @@ _LT_EOF
2816
2817 _LT_EOF
2818 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2819- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2820- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2821+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2822+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2823 else
2824 ld_shlibs=no
2825 fi
2826@@ -9152,8 +9666,8 @@ _LT_EOF
2827
2828 *)
2829 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2830- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2831- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2832+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2833+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2834 else
2835 ld_shlibs=no
2836 fi
2837@@ -9283,7 +9797,13 @@ _LT_EOF
2838 allow_undefined_flag='-berok'
2839 # Determine the default libpath from the value encoded in an
2840 # empty executable.
2841- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2842+ if test "${lt_cv_aix_libpath+set}" = set; then
2843+ aix_libpath=$lt_cv_aix_libpath
2844+else
2845+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2846+ $as_echo_n "(cached) " >&6
2847+else
2848+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2849 /* end confdefs.h. */
2850
2851 int
2852@@ -9296,22 +9816,29 @@ main ()
2853 _ACEOF
2854 if ac_fn_c_try_link "$LINENO"; then :
2855
2856-lt_aix_libpath_sed='
2857- /Import File Strings/,/^$/ {
2858- /^0/ {
2859- s/^0 *\(.*\)$/\1/
2860- p
2861- }
2862- }'
2863-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2864-# Check for a 64-bit object if we didn't find anything.
2865-if test -z "$aix_libpath"; then
2866- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2867-fi
2868+ lt_aix_libpath_sed='
2869+ /Import File Strings/,/^$/ {
2870+ /^0/ {
2871+ s/^0 *\([^ ]*\) *$/\1/
2872+ p
2873+ }
2874+ }'
2875+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2876+ # Check for a 64-bit object if we didn't find anything.
2877+ if test -z "$lt_cv_aix_libpath_"; then
2878+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2879+ fi
2880 fi
2881 rm -f core conftest.err conftest.$ac_objext \
2882 conftest$ac_exeext conftest.$ac_ext
2883-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2884+ if test -z "$lt_cv_aix_libpath_"; then
2885+ lt_cv_aix_libpath_="/usr/lib:/lib"
2886+ fi
2887+
2888+fi
2889+
2890+ aix_libpath=$lt_cv_aix_libpath_
2891+fi
2892
2893 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2894 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"
2895@@ -9323,7 +9850,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2896 else
2897 # Determine the default libpath from the value encoded in an
2898 # empty executable.
2899- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2900+ if test "${lt_cv_aix_libpath+set}" = set; then
2901+ aix_libpath=$lt_cv_aix_libpath
2902+else
2903+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2904+ $as_echo_n "(cached) " >&6
2905+else
2906+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2907 /* end confdefs.h. */
2908
2909 int
2910@@ -9336,22 +9869,29 @@ main ()
2911 _ACEOF
2912 if ac_fn_c_try_link "$LINENO"; then :
2913
2914-lt_aix_libpath_sed='
2915- /Import File Strings/,/^$/ {
2916- /^0/ {
2917- s/^0 *\(.*\)$/\1/
2918- p
2919- }
2920- }'
2921-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2922-# Check for a 64-bit object if we didn't find anything.
2923-if test -z "$aix_libpath"; then
2924- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2925-fi
2926+ lt_aix_libpath_sed='
2927+ /Import File Strings/,/^$/ {
2928+ /^0/ {
2929+ s/^0 *\([^ ]*\) *$/\1/
2930+ p
2931+ }
2932+ }'
2933+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2934+ # Check for a 64-bit object if we didn't find anything.
2935+ if test -z "$lt_cv_aix_libpath_"; then
2936+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2937+ fi
2938 fi
2939 rm -f core conftest.err conftest.$ac_objext \
2940 conftest$ac_exeext conftest.$ac_ext
2941-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2942+ if test -z "$lt_cv_aix_libpath_"; then
2943+ lt_cv_aix_libpath_="/usr/lib:/lib"
2944+ fi
2945+
2946+fi
2947+
2948+ aix_libpath=$lt_cv_aix_libpath_
2949+fi
2950
2951 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2952 # Warning - without using the other run time loading flags,
2953@@ -9396,20 +9936,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2954 # Microsoft Visual C++.
2955 # hardcode_libdir_flag_spec is actually meaningless, as there is
2956 # no search path for DLLs.
2957- hardcode_libdir_flag_spec=' '
2958- allow_undefined_flag=unsupported
2959- # Tell ltmain to make .lib files, not .a files.
2960- libext=lib
2961- # Tell ltmain to make .dll files, not .so files.
2962- shrext_cmds=".dll"
2963- # FIXME: Setting linknames here is a bad hack.
2964- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2965- # The linker will automatically build a .lib file if we build a DLL.
2966- old_archive_from_new_cmds='true'
2967- # FIXME: Should let the user specify the lib program.
2968- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2969- fix_srcfile_path='`cygpath -w "$srcfile"`'
2970- enable_shared_with_static_runtimes=yes
2971+ case $cc_basename in
2972+ cl*)
2973+ # Native MSVC
2974+ hardcode_libdir_flag_spec=' '
2975+ allow_undefined_flag=unsupported
2976+ always_export_symbols=yes
2977+ file_list_spec='@'
2978+ # Tell ltmain to make .lib files, not .a files.
2979+ libext=lib
2980+ # Tell ltmain to make .dll files, not .so files.
2981+ shrext_cmds=".dll"
2982+ # FIXME: Setting linknames here is a bad hack.
2983+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2984+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2985+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2986+ else
2987+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2988+ fi~
2989+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2990+ linknames='
2991+ # The linker will not automatically build a static lib if we build a DLL.
2992+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
2993+ enable_shared_with_static_runtimes=yes
2994+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2995+ # Don't use ranlib
2996+ old_postinstall_cmds='chmod 644 $oldlib'
2997+ postlink_cmds='lt_outputfile="@OUTPUT@"~
2998+ lt_tool_outputfile="@TOOL_OUTPUT@"~
2999+ case $lt_outputfile in
3000+ *.exe|*.EXE) ;;
3001+ *)
3002+ lt_outputfile="$lt_outputfile.exe"
3003+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3004+ ;;
3005+ esac~
3006+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3007+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3008+ $RM "$lt_outputfile.manifest";
3009+ fi'
3010+ ;;
3011+ *)
3012+ # Assume MSVC wrapper
3013+ hardcode_libdir_flag_spec=' '
3014+ allow_undefined_flag=unsupported
3015+ # Tell ltmain to make .lib files, not .a files.
3016+ libext=lib
3017+ # Tell ltmain to make .dll files, not .so files.
3018+ shrext_cmds=".dll"
3019+ # FIXME: Setting linknames here is a bad hack.
3020+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3021+ # The linker will automatically build a .lib file if we build a DLL.
3022+ old_archive_from_new_cmds='true'
3023+ # FIXME: Should let the user specify the lib program.
3024+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3025+ enable_shared_with_static_runtimes=yes
3026+ ;;
3027+ esac
3028 ;;
3029
3030 darwin* | rhapsody*)
3031@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3032
3033 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3034 freebsd* | dragonfly*)
3035- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3036+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3037 hardcode_libdir_flag_spec='-R$libdir'
3038 hardcode_direct=yes
3039 hardcode_shlibpath_var=no
3040@@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3041
3042 hpux9*)
3043 if test "$GCC" = yes; then
3044- 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'
3045+ 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'
3046 else
3047 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'
3048 fi
3049@@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3050
3051 hpux10*)
3052 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3053- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3054+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3055 else
3056 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3057 fi
3058@@ -9518,10 +10101,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3059 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3060 ;;
3061 ia64*)
3062- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3063+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3064 ;;
3065 *)
3066- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3067+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3068 ;;
3069 esac
3070 else
3071@@ -9600,23 +10183,36 @@ fi
3072
3073 irix5* | irix6* | nonstopux*)
3074 if test "$GCC" = yes; then
3075- 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'
3076+ 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'
3077 # Try to use the -exported_symbol ld option, if it does not
3078 # work, assume that -exports_file does not work either and
3079 # implicitly export all symbols.
3080- save_LDFLAGS="$LDFLAGS"
3081- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3082- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3083+ # This should be the same for all languages, so no per-tag cache variable.
3084+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3085+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3086+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
3087+ $as_echo_n "(cached) " >&6
3088+else
3089+ save_LDFLAGS="$LDFLAGS"
3090+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3091+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3092 /* end confdefs.h. */
3093-int foo(void) {}
3094+int foo (void) { return 0; }
3095 _ACEOF
3096 if ac_fn_c_try_link "$LINENO"; then :
3097- 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'
3098-
3099+ lt_cv_irix_exported_symbol=yes
3100+else
3101+ lt_cv_irix_exported_symbol=no
3102 fi
3103 rm -f core conftest.err conftest.$ac_objext \
3104 conftest$ac_exeext conftest.$ac_ext
3105- LDFLAGS="$save_LDFLAGS"
3106+ LDFLAGS="$save_LDFLAGS"
3107+fi
3108+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3109+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3110+ if test "$lt_cv_irix_exported_symbol" = yes; then
3111+ 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'
3112+ fi
3113 else
3114 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'
3115 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'
3116@@ -9701,7 +10297,7 @@ rm -f core conftest.err conftest.$ac_objext \
3117 osf4* | osf5*) # as osf3* with the addition of -msym flag
3118 if test "$GCC" = yes; then
3119 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3120- 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'
3121+ 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'
3122 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3123 else
3124 allow_undefined_flag=' -expect_unresolved \*'
3125@@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \
3126 no_undefined_flag=' -z defs'
3127 if test "$GCC" = yes; then
3128 wlarc='${wl}'
3129- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3130+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3131 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3132- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3133+ $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'
3134 else
3135 case `$CC -V 2>&1` in
3136 *"Compilers 5.0"*)
3137@@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3138 need_version=no
3139 need_lib_prefix=no
3140
3141- case $GCC,$host_os in
3142- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3143+ case $GCC,$cc_basename in
3144+ yes,*)
3145+ # gcc
3146 library_names_spec='$libname.dll.a'
3147 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3148 postinstall_cmds='base_file=`basename \${file}`~
3149@@ -10332,13 +10929,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3150 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3151 ;;
3152 esac
3153+ dynamic_linker='Win32 ld.exe'
3154+ ;;
3155+
3156+ *,cl*)
3157+ # Native MSVC
3158+ libname_spec='$name'
3159+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3160+ library_names_spec='${libname}.dll.lib'
3161+
3162+ case $build_os in
3163+ mingw*)
3164+ sys_lib_search_path_spec=
3165+ lt_save_ifs=$IFS
3166+ IFS=';'
3167+ for lt_path in $LIB
3168+ do
3169+ IFS=$lt_save_ifs
3170+ # Let DOS variable expansion print the short 8.3 style file name.
3171+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3172+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3173+ done
3174+ IFS=$lt_save_ifs
3175+ # Convert to MSYS style.
3176+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3177+ ;;
3178+ cygwin*)
3179+ # Convert to unix form, then to dos form, then back to unix form
3180+ # but this time dos style (no spaces!) so that the unix form looks
3181+ # like /cygdrive/c/PROGRA~1:/cygdr...
3182+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3183+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3184+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3185+ ;;
3186+ *)
3187+ sys_lib_search_path_spec="$LIB"
3188+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3189+ # It is most probably a Windows format PATH.
3190+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3191+ else
3192+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3193+ fi
3194+ # FIXME: find the short name or the path components, as spaces are
3195+ # common. (e.g. "Program Files" -> "PROGRA~1")
3196+ ;;
3197+ esac
3198+
3199+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3200+ postinstall_cmds='base_file=`basename \${file}`~
3201+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3202+ dldir=$destdir/`dirname \$dlpath`~
3203+ test -d \$dldir || mkdir -p \$dldir~
3204+ $install_prog $dir/$dlname \$dldir/$dlname'
3205+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3206+ dlpath=$dir/\$dldll~
3207+ $RM \$dlpath'
3208+ shlibpath_overrides_runpath=yes
3209+ dynamic_linker='Win32 link.exe'
3210 ;;
3211
3212 *)
3213+ # Assume MSVC wrapper
3214 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3215+ dynamic_linker='Win32 ld.exe'
3216 ;;
3217 esac
3218- dynamic_linker='Win32 ld.exe'
3219 # FIXME: first we should search . and the directory the executable is in
3220 shlibpath_var=PATH
3221 ;;
3222@@ -10430,7 +11085,7 @@ haiku*)
3223 soname_spec='${libname}${release}${shared_ext}$major'
3224 shlibpath_var=LIBRARY_PATH
3225 shlibpath_overrides_runpath=yes
3226- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3227+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3228 hardcode_into_libs=yes
3229 ;;
3230
3231@@ -11270,10 +11925,10 @@ else
3232 /* When -fvisbility=hidden is used, assume the code has been annotated
3233 correspondingly for the symbols needed. */
3234 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3235-void fnord () __attribute__((visibility("default")));
3236+int fnord () __attribute__((visibility("default")));
3237 #endif
3238
3239-void fnord () { int i=42; }
3240+int fnord () { return 42; }
3241 int main ()
3242 {
3243 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3244@@ -11376,10 +12031,10 @@ else
3245 /* When -fvisbility=hidden is used, assume the code has been annotated
3246 correspondingly for the symbols needed. */
3247 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3248-void fnord () __attribute__((visibility("default")));
3249+int fnord () __attribute__((visibility("default")));
3250 #endif
3251
3252-void fnord () { int i=42; }
3253+int fnord () { return 42; }
3254 int main ()
3255 {
3256 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3257@@ -15446,13 +16101,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3258 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3259 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3260 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3261+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3262+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3263 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3264 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3265 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3266 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3267 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3268+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3269+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3270+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3271+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3272 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3273 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3274+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3275 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3276 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3277 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3278@@ -15467,14 +16129,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3279 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3280 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3281 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"`'
3282+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3283+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3284 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3285 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3286 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3287-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3288 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3289+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3290 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3291 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3292 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3293+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3294 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3295 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3296 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3297@@ -15507,12 +16172,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3298 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3299 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3300 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3301-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3302 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3303 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3304 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3305 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3306 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3307+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3308 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3309 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3310 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3311@@ -15567,8 +16232,13 @@ reload_flag \
3312 OBJDUMP \
3313 deplibs_check_method \
3314 file_magic_cmd \
3315+file_magic_glob \
3316+want_nocaseglob \
3317+DLLTOOL \
3318+sharedlib_from_linklib_cmd \
3319 AR \
3320 AR_FLAGS \
3321+archiver_list_spec \
3322 STRIP \
3323 RANLIB \
3324 CC \
3325@@ -15578,12 +16248,14 @@ lt_cv_sys_global_symbol_pipe \
3326 lt_cv_sys_global_symbol_to_cdecl \
3327 lt_cv_sys_global_symbol_to_c_name_address \
3328 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3329+nm_file_list_spec \
3330 lt_prog_compiler_no_builtin_flag \
3331-lt_prog_compiler_wl \
3332 lt_prog_compiler_pic \
3333+lt_prog_compiler_wl \
3334 lt_prog_compiler_static \
3335 lt_cv_prog_compiler_c_o \
3336 need_locks \
3337+MANIFEST_TOOL \
3338 DSYMUTIL \
3339 NMEDIT \
3340 LIPO \
3341@@ -15599,7 +16271,6 @@ no_undefined_flag \
3342 hardcode_libdir_flag_spec \
3343 hardcode_libdir_flag_spec_ld \
3344 hardcode_libdir_separator \
3345-fix_srcfile_path \
3346 exclude_expsyms \
3347 include_expsyms \
3348 file_list_spec \
3349@@ -15635,6 +16306,7 @@ module_cmds \
3350 module_expsym_cmds \
3351 export_symbols_cmds \
3352 prelink_cmds \
3353+postlink_cmds \
3354 postinstall_cmds \
3355 postuninstall_cmds \
3356 finish_cmds \
3357@@ -16392,7 +17064,8 @@ $as_echo X"$file" |
3358 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3359 #
3360 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3361-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3362+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3363+# Inc.
3364 # Written by Gordon Matzigkeit, 1996
3365 #
3366 # This file is part of GNU Libtool.
3367@@ -16495,19 +17168,42 @@ SP2NL=$lt_lt_SP2NL
3368 # turn newlines into spaces.
3369 NL2SP=$lt_lt_NL2SP
3370
3371+# convert \$build file names to \$host format.
3372+to_host_file_cmd=$lt_cv_to_host_file_cmd
3373+
3374+# convert \$build files to toolchain format.
3375+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3376+
3377 # An object symbol dumper.
3378 OBJDUMP=$lt_OBJDUMP
3379
3380 # Method to check whether dependent libraries are shared objects.
3381 deplibs_check_method=$lt_deplibs_check_method
3382
3383-# Command to use when deplibs_check_method == "file_magic".
3384+# Command to use when deplibs_check_method = "file_magic".
3385 file_magic_cmd=$lt_file_magic_cmd
3386
3387+# How to find potential files when deplibs_check_method = "file_magic".
3388+file_magic_glob=$lt_file_magic_glob
3389+
3390+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3391+want_nocaseglob=$lt_want_nocaseglob
3392+
3393+# DLL creation program.
3394+DLLTOOL=$lt_DLLTOOL
3395+
3396+# Command to associate shared and link libraries.
3397+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3398+
3399 # The archiver.
3400 AR=$lt_AR
3401+
3402+# Flags to create an archive.
3403 AR_FLAGS=$lt_AR_FLAGS
3404
3405+# How to feed a file listing to the archiver.
3406+archiver_list_spec=$lt_archiver_list_spec
3407+
3408 # A symbol stripping program.
3409 STRIP=$lt_STRIP
3410
3411@@ -16537,6 +17233,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3412 # Transform the output of nm in a C name address pair when lib prefix is needed.
3413 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3414
3415+# Specify filename containing input files for \$NM.
3416+nm_file_list_spec=$lt_nm_file_list_spec
3417+
3418+# The root where to search for dependent libraries,and in which our libraries should be installed.
3419+lt_sysroot=$lt_sysroot
3420+
3421 # The name of the directory that contains temporary libtool files.
3422 objdir=$objdir
3423
3424@@ -16546,6 +17248,9 @@ MAGIC_CMD=$MAGIC_CMD
3425 # Must we lock files when doing compilation?
3426 need_locks=$lt_need_locks
3427
3428+# Manifest tool.
3429+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3430+
3431 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3432 DSYMUTIL=$lt_DSYMUTIL
3433
3434@@ -16660,12 +17365,12 @@ with_gcc=$GCC
3435 # Compiler flag to turn off builtin functions.
3436 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3437
3438-# How to pass a linker flag through the compiler.
3439-wl=$lt_lt_prog_compiler_wl
3440-
3441 # Additional compiler flags for building library objects.
3442 pic_flag=$lt_lt_prog_compiler_pic
3443
3444+# How to pass a linker flag through the compiler.
3445+wl=$lt_lt_prog_compiler_wl
3446+
3447 # Compiler flag to prevent dynamic linking.
3448 link_static_flag=$lt_lt_prog_compiler_static
3449
3450@@ -16752,9 +17457,6 @@ inherit_rpath=$inherit_rpath
3451 # Whether libtool must link a program against all its dependency libraries.
3452 link_all_deplibs=$link_all_deplibs
3453
3454-# Fix the shell variable \$srcfile for the compiler.
3455-fix_srcfile_path=$lt_fix_srcfile_path
3456-
3457 # Set to "yes" if exported symbols are required.
3458 always_export_symbols=$always_export_symbols
3459
3460@@ -16770,6 +17472,9 @@ include_expsyms=$lt_include_expsyms
3461 # Commands necessary for linking programs (against libraries) with templates.
3462 prelink_cmds=$lt_prelink_cmds
3463
3464+# Commands necessary for finishing linking programs.
3465+postlink_cmds=$lt_postlink_cmds
3466+
3467 # Specify filename containing input files.
3468 file_list_spec=$lt_file_list_spec
3469
3470@@ -16802,210 +17507,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3471 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3472 # text mode, it properly converts lines to CR/LF. This bash problem
3473 # is reportedly fixed, but why not run on old versions too?
3474- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3475- || (rm -f "$cfgfile"; exit 1)
3476-
3477- case $xsi_shell in
3478- yes)
3479- cat << \_LT_EOF >> "$cfgfile"
3480-
3481-# func_dirname file append nondir_replacement
3482-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3483-# otherwise set result to NONDIR_REPLACEMENT.
3484-func_dirname ()
3485-{
3486- case ${1} in
3487- */*) func_dirname_result="${1%/*}${2}" ;;
3488- * ) func_dirname_result="${3}" ;;
3489- esac
3490-}
3491-
3492-# func_basename file
3493-func_basename ()
3494-{
3495- func_basename_result="${1##*/}"
3496-}
3497-
3498-# func_dirname_and_basename file append nondir_replacement
3499-# perform func_basename and func_dirname in a single function
3500-# call:
3501-# dirname: Compute the dirname of FILE. If nonempty,
3502-# add APPEND to the result, otherwise set result
3503-# to NONDIR_REPLACEMENT.
3504-# value returned in "$func_dirname_result"
3505-# basename: Compute filename of FILE.
3506-# value retuned in "$func_basename_result"
3507-# Implementation must be kept synchronized with func_dirname
3508-# and func_basename. For efficiency, we do not delegate to
3509-# those functions but instead duplicate the functionality here.
3510-func_dirname_and_basename ()
3511-{
3512- case ${1} in
3513- */*) func_dirname_result="${1%/*}${2}" ;;
3514- * ) func_dirname_result="${3}" ;;
3515- esac
3516- func_basename_result="${1##*/}"
3517-}
3518-
3519-# func_stripname prefix suffix name
3520-# strip PREFIX and SUFFIX off of NAME.
3521-# PREFIX and SUFFIX must not contain globbing or regex special
3522-# characters, hashes, percent signs, but SUFFIX may contain a leading
3523-# dot (in which case that matches only a dot).
3524-func_stripname ()
3525-{
3526- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3527- # positional parameters, so assign one to ordinary parameter first.
3528- func_stripname_result=${3}
3529- func_stripname_result=${func_stripname_result#"${1}"}
3530- func_stripname_result=${func_stripname_result%"${2}"}
3531-}
3532-
3533-# func_opt_split
3534-func_opt_split ()
3535-{
3536- func_opt_split_opt=${1%%=*}
3537- func_opt_split_arg=${1#*=}
3538-}
3539-
3540-# func_lo2o object
3541-func_lo2o ()
3542-{
3543- case ${1} in
3544- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3545- *) func_lo2o_result=${1} ;;
3546- esac
3547-}
3548-
3549-# func_xform libobj-or-source
3550-func_xform ()
3551-{
3552- func_xform_result=${1%.*}.lo
3553-}
3554-
3555-# func_arith arithmetic-term...
3556-func_arith ()
3557-{
3558- func_arith_result=$(( $* ))
3559-}
3560-
3561-# func_len string
3562-# STRING may not start with a hyphen.
3563-func_len ()
3564-{
3565- func_len_result=${#1}
3566-}
3567-
3568-_LT_EOF
3569- ;;
3570- *) # Bourne compatible functions.
3571- cat << \_LT_EOF >> "$cfgfile"
3572-
3573-# func_dirname file append nondir_replacement
3574-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3575-# otherwise set result to NONDIR_REPLACEMENT.
3576-func_dirname ()
3577-{
3578- # Extract subdirectory from the argument.
3579- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3580- if test "X$func_dirname_result" = "X${1}"; then
3581- func_dirname_result="${3}"
3582- else
3583- func_dirname_result="$func_dirname_result${2}"
3584- fi
3585-}
3586-
3587-# func_basename file
3588-func_basename ()
3589-{
3590- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3591-}
3592-
3593-
3594-# func_stripname prefix suffix name
3595-# strip PREFIX and SUFFIX off of NAME.
3596-# PREFIX and SUFFIX must not contain globbing or regex special
3597-# characters, hashes, percent signs, but SUFFIX may contain a leading
3598-# dot (in which case that matches only a dot).
3599-# func_strip_suffix prefix name
3600-func_stripname ()
3601-{
3602- case ${2} in
3603- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3604- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3605- esac
3606-}
3607-
3608-# sed scripts:
3609-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3610-my_sed_long_arg='1s/^-[^=]*=//'
3611-
3612-# func_opt_split
3613-func_opt_split ()
3614-{
3615- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3616- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3617-}
3618-
3619-# func_lo2o object
3620-func_lo2o ()
3621-{
3622- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3623-}
3624-
3625-# func_xform libobj-or-source
3626-func_xform ()
3627-{
3628- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3629-}
3630-
3631-# func_arith arithmetic-term...
3632-func_arith ()
3633-{
3634- func_arith_result=`expr "$@"`
3635-}
3636-
3637-# func_len string
3638-# STRING may not start with a hyphen.
3639-func_len ()
3640-{
3641- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3642-}
3643-
3644-_LT_EOF
3645-esac
3646-
3647-case $lt_shell_append in
3648- yes)
3649- cat << \_LT_EOF >> "$cfgfile"
3650-
3651-# func_append var value
3652-# Append VALUE to the end of shell variable VAR.
3653-func_append ()
3654-{
3655- eval "$1+=\$2"
3656-}
3657-_LT_EOF
3658- ;;
3659- *)
3660- cat << \_LT_EOF >> "$cfgfile"
3661-
3662-# func_append var value
3663-# Append VALUE to the end of shell variable VAR.
3664-func_append ()
3665-{
3666- eval "$1=\$$1\$2"
3667-}
3668-
3669-_LT_EOF
3670- ;;
3671- esac
3672-
3673-
3674- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3675- || (rm -f "$cfgfile"; exit 1)
3676-
3677- mv -f "$cfgfile" "$ofile" ||
3678+ sed '$q' "$ltmain" >> "$cfgfile" \
3679+ || (rm -f "$cfgfile"; exit 1)
3680+
3681+ if test x"$xsi_shell" = xyes; then
3682+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3683+func_dirname ()\
3684+{\
3685+\ case ${1} in\
3686+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3687+\ * ) func_dirname_result="${3}" ;;\
3688+\ esac\
3689+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3690+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3691+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3692+test 0 -eq $? || _lt_function_replace_fail=:
3693+
3694+
3695+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3696+func_basename ()\
3697+{\
3698+\ func_basename_result="${1##*/}"\
3699+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3700+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3701+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3702+test 0 -eq $? || _lt_function_replace_fail=:
3703+
3704+
3705+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3706+func_dirname_and_basename ()\
3707+{\
3708+\ case ${1} in\
3709+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3710+\ * ) func_dirname_result="${3}" ;;\
3711+\ esac\
3712+\ func_basename_result="${1##*/}"\
3713+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3714+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3715+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3716+test 0 -eq $? || _lt_function_replace_fail=:
3717+
3718+
3719+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3720+func_stripname ()\
3721+{\
3722+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3723+\ # positional parameters, so assign one to ordinary parameter first.\
3724+\ func_stripname_result=${3}\
3725+\ func_stripname_result=${func_stripname_result#"${1}"}\
3726+\ func_stripname_result=${func_stripname_result%"${2}"}\
3727+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3728+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3729+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3730+test 0 -eq $? || _lt_function_replace_fail=:
3731+
3732+
3733+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3734+func_split_long_opt ()\
3735+{\
3736+\ func_split_long_opt_name=${1%%=*}\
3737+\ func_split_long_opt_arg=${1#*=}\
3738+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3739+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3740+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3741+test 0 -eq $? || _lt_function_replace_fail=:
3742+
3743+
3744+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3745+func_split_short_opt ()\
3746+{\
3747+\ func_split_short_opt_arg=${1#??}\
3748+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3749+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3750+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3751+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3752+test 0 -eq $? || _lt_function_replace_fail=:
3753+
3754+
3755+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3756+func_lo2o ()\
3757+{\
3758+\ case ${1} in\
3759+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3760+\ *) func_lo2o_result=${1} ;;\
3761+\ esac\
3762+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3763+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3764+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3765+test 0 -eq $? || _lt_function_replace_fail=:
3766+
3767+
3768+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3769+func_xform ()\
3770+{\
3771+ func_xform_result=${1%.*}.lo\
3772+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3773+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3774+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3775+test 0 -eq $? || _lt_function_replace_fail=:
3776+
3777+
3778+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3779+func_arith ()\
3780+{\
3781+ func_arith_result=$(( $* ))\
3782+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3783+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3784+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3785+test 0 -eq $? || _lt_function_replace_fail=:
3786+
3787+
3788+ sed -e '/^func_len ()$/,/^} # func_len /c\
3789+func_len ()\
3790+{\
3791+ func_len_result=${#1}\
3792+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3793+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3794+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3795+test 0 -eq $? || _lt_function_replace_fail=:
3796+
3797+fi
3798+
3799+if test x"$lt_shell_append" = xyes; then
3800+ sed -e '/^func_append ()$/,/^} # func_append /c\
3801+func_append ()\
3802+{\
3803+ eval "${1}+=\\${2}"\
3804+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3805+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3806+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3807+test 0 -eq $? || _lt_function_replace_fail=:
3808+
3809+
3810+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3811+func_append_quoted ()\
3812+{\
3813+\ func_quote_for_eval "${2}"\
3814+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3815+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3816+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3817+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3818+test 0 -eq $? || _lt_function_replace_fail=:
3819+
3820+
3821+ # Save a `func_append' function call where possible by direct use of '+='
3822+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3823+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3825+ test 0 -eq $? || _lt_function_replace_fail=:
3826+else
3827+ # Save a `func_append' function call even when '+=' is not available
3828+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3829+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3830+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3831+ test 0 -eq $? || _lt_function_replace_fail=:
3832+fi
3833+
3834+if test x"$_lt_function_replace_fail" = x":"; then
3835+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3836+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3837+fi
3838+
3839+
3840+ mv -f "$cfgfile" "$ofile" ||
3841 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3842 chmod +x "$ofile"
3843
3844diff --git a/configure b/configure
3845index d8af155ab5..005ed827ab 100755
3846--- a/configure
3847+++ b/configure
3848@@ -3844,7 +3844,7 @@ case "${target}" in
3849 or1k*-*-*)
3850 noconfigdirs="$noconfigdirs gdb"
3851 ;;
3852- sh*-*-* | sh64-*-*)
3853+ sh-*-* | sh64-*-*)
3854 case "${target}" in
3855 sh*-*-elf)
3856 ;;
3857diff --git a/gas/configure b/gas/configure
3858index 93afb20c8f..81dd4cbd97 100755
3859--- a/gas/configure
3860+++ b/gas/configure
3861@@ -650,8 +650,11 @@ OTOOL
3862 LIPO
3863 NMEDIT
3864 DSYMUTIL
3865+MANIFEST_TOOL
3866 RANLIB
3867+ac_ct_AR
3868 AR
3869+DLLTOOL
3870 OBJDUMP
3871 LN_S
3872 NM
3873@@ -763,6 +766,7 @@ enable_static
3874 with_pic
3875 enable_fast_install
3876 with_gnu_ld
3877+with_libtool_sysroot
3878 enable_libtool_lock
3879 enable_plugins
3880 enable_largefile
3881@@ -4921,8 +4925,8 @@ esac
3882
3883
3884
3885-macro_version='2.2.7a'
3886-macro_revision='1.3134'
3887+macro_version='2.4'
3888+macro_revision='1.3293'
3889
3890
3891
3892@@ -4962,7 +4966,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3894 $as_echo_n "checking how to print strings... " >&6; }
3895 # Test print first, because it will be a builtin if present.
3896-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3897+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3898 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3899 ECHO='print -r --'
3900 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3901@@ -5648,8 +5652,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3902 # Try some XSI features
3903 xsi_shell=no
3904 ( _lt_dummy="a/b/c"
3905- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3906- = c,a/b,, \
3907+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3908+ = c,a/b,b/c, \
3909 && eval 'test $(( 1 + 1 )) -eq 2 \
3910 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3911 && xsi_shell=yes
3912@@ -5698,6 +5702,80 @@ esac
3913
3914
3915
3916+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3917+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3918+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
3919+ $as_echo_n "(cached) " >&6
3920+else
3921+ case $host in
3922+ *-*-mingw* )
3923+ case $build in
3924+ *-*-mingw* ) # actually msys
3925+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3926+ ;;
3927+ *-*-cygwin* )
3928+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3929+ ;;
3930+ * ) # otherwise, assume *nix
3931+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3932+ ;;
3933+ esac
3934+ ;;
3935+ *-*-cygwin* )
3936+ case $build in
3937+ *-*-mingw* ) # actually msys
3938+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3939+ ;;
3940+ *-*-cygwin* )
3941+ lt_cv_to_host_file_cmd=func_convert_file_noop
3942+ ;;
3943+ * ) # otherwise, assume *nix
3944+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3945+ ;;
3946+ esac
3947+ ;;
3948+ * ) # unhandled hosts (and "normal" native builds)
3949+ lt_cv_to_host_file_cmd=func_convert_file_noop
3950+ ;;
3951+esac
3952+
3953+fi
3954+
3955+to_host_file_cmd=$lt_cv_to_host_file_cmd
3956+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3957+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3958+
3959+
3960+
3961+
3962+
3963+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3964+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3965+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
3966+ $as_echo_n "(cached) " >&6
3967+else
3968+ #assume ordinary cross tools, or native build.
3969+lt_cv_to_tool_file_cmd=func_convert_file_noop
3970+case $host in
3971+ *-*-mingw* )
3972+ case $build in
3973+ *-*-mingw* ) # actually msys
3974+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3975+ ;;
3976+ esac
3977+ ;;
3978+esac
3979+
3980+fi
3981+
3982+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3983+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
3984+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
3985+
3986+
3987+
3988+
3989+
3990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3991 $as_echo_n "checking for $LD option to reload object files... " >&6; }
3992 if test "${lt_cv_ld_reload_flag+set}" = set; then :
3993@@ -5714,6 +5792,11 @@ case $reload_flag in
3994 esac
3995 reload_cmds='$LD$reload_flag -o $output$reload_objs'
3996 case $host_os in
3997+ cygwin* | mingw* | pw32* | cegcc*)
3998+ if test "$GCC" != yes; then
3999+ reload_cmds=false
4000+ fi
4001+ ;;
4002 darwin*)
4003 if test "$GCC" = yes; then
4004 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4005@@ -5882,7 +5965,8 @@ mingw* | pw32*)
4006 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4007 lt_cv_file_magic_cmd='func_win32_libid'
4008 else
4009- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4010+ # Keep this pattern in sync with the one in func_win32_libid.
4011+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4012 lt_cv_file_magic_cmd='$OBJDUMP -f'
4013 fi
4014 ;;
4015@@ -6036,6 +6120,21 @@ esac
4016 fi
4017 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4018 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4019+
4020+file_magic_glob=
4021+want_nocaseglob=no
4022+if test "$build" = "$host"; then
4023+ case $host_os in
4024+ mingw* | pw32*)
4025+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4026+ want_nocaseglob=yes
4027+ else
4028+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4029+ fi
4030+ ;;
4031+ esac
4032+fi
4033+
4034 file_magic_cmd=$lt_cv_file_magic_cmd
4035 deplibs_check_method=$lt_cv_deplibs_check_method
4036 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4037@@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4038
4039
4040
4041+
4042+
4043+
4044+
4045+
4046+
4047+
4048+
4049+
4050+
4051+if test -n "$ac_tool_prefix"; then
4052+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4053+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4054+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4055+$as_echo_n "checking for $ac_word... " >&6; }
4056+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
4057+ $as_echo_n "(cached) " >&6
4058+else
4059+ if test -n "$DLLTOOL"; then
4060+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4061+else
4062+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4063+for as_dir in $PATH
4064+do
4065+ IFS=$as_save_IFS
4066+ test -z "$as_dir" && as_dir=.
4067+ for ac_exec_ext in '' $ac_executable_extensions; do
4068+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4069+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4070+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4071+ break 2
4072+ fi
4073+done
4074+ done
4075+IFS=$as_save_IFS
4076+
4077+fi
4078+fi
4079+DLLTOOL=$ac_cv_prog_DLLTOOL
4080+if test -n "$DLLTOOL"; then
4081+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4082+$as_echo "$DLLTOOL" >&6; }
4083+else
4084+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4085+$as_echo "no" >&6; }
4086+fi
4087+
4088+
4089+fi
4090+if test -z "$ac_cv_prog_DLLTOOL"; then
4091+ ac_ct_DLLTOOL=$DLLTOOL
4092+ # Extract the first word of "dlltool", so it can be a program name with args.
4093+set dummy dlltool; ac_word=$2
4094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4095+$as_echo_n "checking for $ac_word... " >&6; }
4096+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
4097+ $as_echo_n "(cached) " >&6
4098+else
4099+ if test -n "$ac_ct_DLLTOOL"; then
4100+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4101+else
4102+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4103+for as_dir in $PATH
4104+do
4105+ IFS=$as_save_IFS
4106+ test -z "$as_dir" && as_dir=.
4107+ for ac_exec_ext in '' $ac_executable_extensions; do
4108+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4109+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4110+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4111+ break 2
4112+ fi
4113+done
4114+ done
4115+IFS=$as_save_IFS
4116+
4117+fi
4118+fi
4119+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4120+if test -n "$ac_ct_DLLTOOL"; then
4121+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4122+$as_echo "$ac_ct_DLLTOOL" >&6; }
4123+else
4124+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4125+$as_echo "no" >&6; }
4126+fi
4127+
4128+ if test "x$ac_ct_DLLTOOL" = x; then
4129+ DLLTOOL="false"
4130+ else
4131+ case $cross_compiling:$ac_tool_warned in
4132+yes:)
4133+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4134+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4135+ac_tool_warned=yes ;;
4136+esac
4137+ DLLTOOL=$ac_ct_DLLTOOL
4138+ fi
4139+else
4140+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4141+fi
4142+
4143+test -z "$DLLTOOL" && DLLTOOL=dlltool
4144+
4145+
4146+
4147+
4148+
4149+
4150+
4151+
4152+
4153+
4154+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4155+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4156+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
4157+ $as_echo_n "(cached) " >&6
4158+else
4159+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4160+
4161+case $host_os in
4162+cygwin* | mingw* | pw32* | cegcc*)
4163+ # two different shell functions defined in ltmain.sh
4164+ # decide which to use based on capabilities of $DLLTOOL
4165+ case `$DLLTOOL --help 2>&1` in
4166+ *--identify-strict*)
4167+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4168+ ;;
4169+ *)
4170+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4171+ ;;
4172+ esac
4173+ ;;
4174+*)
4175+ # fallback: assume linklib IS sharedlib
4176+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4177+ ;;
4178+esac
4179+
4180+fi
4181+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4182+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4183+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4184+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4185+
4186+
4187+
4188+
4189+
4190+
4191+
4192 if test -n "$ac_tool_prefix"; then
4193- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4194-set dummy ${ac_tool_prefix}ar; ac_word=$2
4195+ for ac_prog in ar
4196+ do
4197+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4198+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4199 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4200 $as_echo_n "checking for $ac_word... " >&6; }
4201 if test "${ac_cv_prog_AR+set}" = set; then :
4202@@ -6069,7 +6321,7 @@ do
4203 test -z "$as_dir" && as_dir=.
4204 for ac_exec_ext in '' $ac_executable_extensions; do
4205 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4206- ac_cv_prog_AR="${ac_tool_prefix}ar"
4207+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4208 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4209 break 2
4210 fi
4211@@ -6089,11 +6341,15 @@ $as_echo "no" >&6; }
4212 fi
4213
4214
4215+ test -n "$AR" && break
4216+ done
4217 fi
4218-if test -z "$ac_cv_prog_AR"; then
4219+if test -z "$AR"; then
4220 ac_ct_AR=$AR
4221- # Extract the first word of "ar", so it can be a program name with args.
4222-set dummy ar; ac_word=$2
4223+ for ac_prog in ar
4224+do
4225+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4226+set dummy $ac_prog; ac_word=$2
4227 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4228 $as_echo_n "checking for $ac_word... " >&6; }
4229 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4230@@ -6109,7 +6365,7 @@ do
4231 test -z "$as_dir" && as_dir=.
4232 for ac_exec_ext in '' $ac_executable_extensions; do
4233 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4234- ac_cv_prog_ac_ct_AR="ar"
4235+ ac_cv_prog_ac_ct_AR="$ac_prog"
4236 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4237 break 2
4238 fi
4239@@ -6128,6 +6384,10 @@ else
4240 $as_echo "no" >&6; }
4241 fi
4242
4243+
4244+ test -n "$ac_ct_AR" && break
4245+done
4246+
4247 if test "x$ac_ct_AR" = x; then
4248 AR="false"
4249 else
4250@@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;;
4251 esac
4252 AR=$ac_ct_AR
4253 fi
4254-else
4255- AR="$ac_cv_prog_AR"
4256 fi
4257
4258-test -z "$AR" && AR=ar
4259-test -z "$AR_FLAGS" && AR_FLAGS=cru
4260+: ${AR=ar}
4261+: ${AR_FLAGS=cru}
4262
4263
4264
4265@@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4266
4267
4268
4269+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4270+$as_echo_n "checking for archiver @FILE support... " >&6; }
4271+if test "${lt_cv_ar_at_file+set}" = set; then :
4272+ $as_echo_n "(cached) " >&6
4273+else
4274+ lt_cv_ar_at_file=no
4275+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4276+/* end confdefs.h. */
4277+
4278+int
4279+main ()
4280+{
4281+
4282+ ;
4283+ return 0;
4284+}
4285+_ACEOF
4286+if ac_fn_c_try_compile "$LINENO"; then :
4287+ echo conftest.$ac_objext > conftest.lst
4288+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4289+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4290+ (eval $lt_ar_try) 2>&5
4291+ ac_status=$?
4292+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4293+ test $ac_status = 0; }
4294+ if test "$ac_status" -eq 0; then
4295+ # Ensure the archiver fails upon bogus file names.
4296+ rm -f conftest.$ac_objext libconftest.a
4297+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4298+ (eval $lt_ar_try) 2>&5
4299+ ac_status=$?
4300+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4301+ test $ac_status = 0; }
4302+ if test "$ac_status" -ne 0; then
4303+ lt_cv_ar_at_file=@
4304+ fi
4305+ fi
4306+ rm -f conftest.* libconftest.a
4307+
4308+fi
4309+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4310+
4311+fi
4312+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4313+$as_echo "$lt_cv_ar_at_file" >&6; }
4314+
4315+if test "x$lt_cv_ar_at_file" = xno; then
4316+ archiver_list_spec=
4317+else
4318+ archiver_list_spec=$lt_cv_ar_at_file
4319+fi
4320+
4321+
4322+
4323+
4324+
4325+
4326+
4327 if test -n "$ac_tool_prefix"; then
4328 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4329 set dummy ${ac_tool_prefix}strip; ac_word=$2
4330@@ -6490,8 +6806,8 @@ esac
4331 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4332
4333 # Transform an extracted symbol line into symbol name and symbol address
4334-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4335-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'"
4336+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4337+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'"
4338
4339 # Handle CRLF in mingw tool chain
4340 opt_cr=
4341@@ -6527,6 +6843,7 @@ for ac_symprfx in "" "_"; do
4342 else
4343 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4344 fi
4345+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4346
4347 # Check to see that the pipe works correctly.
4348 pipe_works=no
4349@@ -6568,6 +6885,18 @@ _LT_EOF
4350 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4351 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4352 cat <<_LT_EOF > conftest.$ac_ext
4353+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4354+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4355+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4356+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4357+# define LT_DLSYM_CONST
4358+#elif defined(__osf__)
4359+/* This system does not cope well with relocations in const data. */
4360+# define LT_DLSYM_CONST
4361+#else
4362+# define LT_DLSYM_CONST const
4363+#endif
4364+
4365 #ifdef __cplusplus
4366 extern "C" {
4367 #endif
4368@@ -6579,7 +6908,7 @@ _LT_EOF
4369 cat <<_LT_EOF >> conftest.$ac_ext
4370
4371 /* The mapping between symbol names and symbols. */
4372-const struct {
4373+LT_DLSYM_CONST struct {
4374 const char *name;
4375 void *address;
4376 }
4377@@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() {
4378 _LT_EOF
4379 # Now try linking the two files.
4380 mv conftest.$ac_objext conftstm.$ac_objext
4381- lt_save_LIBS="$LIBS"
4382- lt_save_CFLAGS="$CFLAGS"
4383+ lt_globsym_save_LIBS=$LIBS
4384+ lt_globsym_save_CFLAGS=$CFLAGS
4385 LIBS="conftstm.$ac_objext"
4386 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4387 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4388@@ -6616,8 +6945,8 @@ _LT_EOF
4389 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4390 pipe_works=yes
4391 fi
4392- LIBS="$lt_save_LIBS"
4393- CFLAGS="$lt_save_CFLAGS"
4394+ LIBS=$lt_globsym_save_LIBS
4395+ CFLAGS=$lt_globsym_save_CFLAGS
4396 else
4397 echo "cannot find nm_test_func in $nlist" >&5
4398 fi
4399@@ -6654,6 +6983,21 @@ else
4400 $as_echo "ok" >&6; }
4401 fi
4402
4403+# Response file support.
4404+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4405+ nm_file_list_spec='@'
4406+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4407+ nm_file_list_spec='@'
4408+fi
4409+
4410+
4411+
4412+
4413+
4414+
4415+
4416+
4417+
4418
4419
4420
4421@@ -6669,6 +7013,40 @@ fi
4422
4423
4424
4425+
4426+
4427+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4428+$as_echo_n "checking for sysroot... " >&6; }
4429+
4430+# Check whether --with-libtool-sysroot was given.
4431+if test "${with_libtool_sysroot+set}" = set; then :
4432+ withval=$with_libtool_sysroot;
4433+else
4434+ with_libtool_sysroot=no
4435+fi
4436+
4437+
4438+lt_sysroot=
4439+case ${with_libtool_sysroot} in #(
4440+ yes)
4441+ if test "$GCC" = yes; then
4442+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4443+ fi
4444+ ;; #(
4445+ /*)
4446+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4447+ ;; #(
4448+ no|'')
4449+ ;; #(
4450+ *)
4451+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4452+$as_echo "${with_libtool_sysroot}" >&6; }
4453+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
4454+ ;;
4455+esac
4456+
4457+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4458+$as_echo "${lt_sysroot:-no}" >&6; }
4459
4460
4461
4462@@ -6881,6 +7259,123 @@ esac
4463
4464 need_locks="$enable_libtool_lock"
4465
4466+if test -n "$ac_tool_prefix"; then
4467+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4468+set dummy ${ac_tool_prefix}mt; ac_word=$2
4469+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4470+$as_echo_n "checking for $ac_word... " >&6; }
4471+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
4472+ $as_echo_n "(cached) " >&6
4473+else
4474+ if test -n "$MANIFEST_TOOL"; then
4475+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4476+else
4477+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4478+for as_dir in $PATH
4479+do
4480+ IFS=$as_save_IFS
4481+ test -z "$as_dir" && as_dir=.
4482+ for ac_exec_ext in '' $ac_executable_extensions; do
4483+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4484+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4485+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4486+ break 2
4487+ fi
4488+done
4489+ done
4490+IFS=$as_save_IFS
4491+
4492+fi
4493+fi
4494+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4495+if test -n "$MANIFEST_TOOL"; then
4496+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4497+$as_echo "$MANIFEST_TOOL" >&6; }
4498+else
4499+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4500+$as_echo "no" >&6; }
4501+fi
4502+
4503+
4504+fi
4505+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4506+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4507+ # Extract the first word of "mt", so it can be a program name with args.
4508+set dummy mt; ac_word=$2
4509+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4510+$as_echo_n "checking for $ac_word... " >&6; }
4511+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
4512+ $as_echo_n "(cached) " >&6
4513+else
4514+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4515+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4516+else
4517+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4518+for as_dir in $PATH
4519+do
4520+ IFS=$as_save_IFS
4521+ test -z "$as_dir" && as_dir=.
4522+ for ac_exec_ext in '' $ac_executable_extensions; do
4523+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4524+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4525+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4526+ break 2
4527+ fi
4528+done
4529+ done
4530+IFS=$as_save_IFS
4531+
4532+fi
4533+fi
4534+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4535+if test -n "$ac_ct_MANIFEST_TOOL"; then
4536+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4537+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4538+else
4539+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4540+$as_echo "no" >&6; }
4541+fi
4542+
4543+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4544+ MANIFEST_TOOL=":"
4545+ else
4546+ case $cross_compiling:$ac_tool_warned in
4547+yes:)
4548+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4549+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4550+ac_tool_warned=yes ;;
4551+esac
4552+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4553+ fi
4554+else
4555+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4556+fi
4557+
4558+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4559+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4560+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4561+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
4562+ $as_echo_n "(cached) " >&6
4563+else
4564+ lt_cv_path_mainfest_tool=no
4565+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4566+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4567+ cat conftest.err >&5
4568+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4569+ lt_cv_path_mainfest_tool=yes
4570+ fi
4571+ rm -f conftest*
4572+fi
4573+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4574+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4575+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4576+ MANIFEST_TOOL=:
4577+fi
4578+
4579+
4580+
4581+
4582+
4583
4584 case $host_os in
4585 rhapsody* | darwin*)
4586@@ -7444,6 +7939,8 @@ _LT_EOF
4587 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4588 echo "$AR cru libconftest.a conftest.o" >&5
4589 $AR cru libconftest.a conftest.o 2>&5
4590+ echo "$RANLIB libconftest.a" >&5
4591+ $RANLIB libconftest.a 2>&5
4592 cat > conftest.c << _LT_EOF
4593 int main() { return 0;}
4594 _LT_EOF
4595@@ -7639,7 +8136,8 @@ fi
4596 LIBTOOL_DEPS="$ltmain"
4597
4598 # Always use our own libtool.
4599-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4600+LIBTOOL='$(SHELL) $(top_builddir)'
4601+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4602
4603
4604
4605@@ -7728,7 +8226,7 @@ aix3*)
4606 esac
4607
4608 # Global variables:
4609-ofile=libtool
4610+ofile=${host_alias}-libtool
4611 can_build_shared=yes
4612
4613 # All known linkers require a `.a' archive for static linking (except MSVC,
4614@@ -8026,8 +8524,6 @@ fi
4615 lt_prog_compiler_pic=
4616 lt_prog_compiler_static=
4617
4618-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4619-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4620
4621 if test "$GCC" = yes; then
4622 lt_prog_compiler_wl='-Wl,'
4623@@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4624 lt_prog_compiler_pic='--shared'
4625 lt_prog_compiler_static='--static'
4626 ;;
4627+ nagfor*)
4628+ # NAG Fortran compiler
4629+ lt_prog_compiler_wl='-Wl,-Wl,,'
4630+ lt_prog_compiler_pic='-PIC'
4631+ lt_prog_compiler_static='-Bstatic'
4632+ ;;
4633 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4634 # Portland Group compilers (*not* the Pentium gcc compiler,
4635 # which looks to be a dead project)
4636@@ -8255,7 +8757,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4637 lt_prog_compiler_pic='-KPIC'
4638 lt_prog_compiler_static='-Bstatic'
4639 case $cc_basename in
4640- f77* | f90* | f95*)
4641+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4642 lt_prog_compiler_wl='-Qoption ld ';;
4643 *)
4644 lt_prog_compiler_wl='-Wl,';;
4645@@ -8312,13 +8814,17 @@ case $host_os in
4646 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4647 ;;
4648 esac
4649-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4650-$as_echo "$lt_prog_compiler_pic" >&6; }
4651-
4652-
4653-
4654-
4655
4656+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4657+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4658+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
4659+ $as_echo_n "(cached) " >&6
4660+else
4661+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4662+fi
4663+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4664+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4665+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4666
4667 #
4668 # Check to make sure the PIC flag actually works.
4669@@ -8379,6 +8885,11 @@ fi
4670
4671
4672
4673+
4674+
4675+
4676+
4677+
4678 #
4679 # Check to make sure the static flag actually works.
4680 #
4681@@ -8729,7 +9240,8 @@ _LT_EOF
4682 allow_undefined_flag=unsupported
4683 always_export_symbols=no
4684 enable_shared_with_static_runtimes=yes
4685- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4686+ 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'
4687+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4688
4689 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4690 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4691@@ -8828,12 +9340,12 @@ _LT_EOF
4692 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4693 hardcode_libdir_flag_spec=
4694 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4695- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4696+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4697 if test "x$supports_anon_versioning" = xyes; then
4698 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4699 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4700 echo "local: *; };" >> $output_objdir/$libname.ver~
4701- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4702+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4703 fi
4704 ;;
4705 esac
4706@@ -8847,8 +9359,8 @@ _LT_EOF
4707 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4708 wlarc=
4709 else
4710- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4711- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4712+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4713+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4714 fi
4715 ;;
4716
4717@@ -8866,8 +9378,8 @@ _LT_EOF
4718
4719 _LT_EOF
4720 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4721- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4722- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4723+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4724+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4725 else
4726 ld_shlibs=no
4727 fi
4728@@ -8913,8 +9425,8 @@ _LT_EOF
4729
4730 *)
4731 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4732- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4733- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4734+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4735+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4736 else
4737 ld_shlibs=no
4738 fi
4739@@ -9044,7 +9556,13 @@ _LT_EOF
4740 allow_undefined_flag='-berok'
4741 # Determine the default libpath from the value encoded in an
4742 # empty executable.
4743- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4744+ if test "${lt_cv_aix_libpath+set}" = set; then
4745+ aix_libpath=$lt_cv_aix_libpath
4746+else
4747+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4748+ $as_echo_n "(cached) " >&6
4749+else
4750+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4751 /* end confdefs.h. */
4752
4753 int
4754@@ -9057,22 +9575,29 @@ main ()
4755 _ACEOF
4756 if ac_fn_c_try_link "$LINENO"; then :
4757
4758-lt_aix_libpath_sed='
4759- /Import File Strings/,/^$/ {
4760- /^0/ {
4761- s/^0 *\(.*\)$/\1/
4762- p
4763- }
4764- }'
4765-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4766-# Check for a 64-bit object if we didn't find anything.
4767-if test -z "$aix_libpath"; then
4768- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4769-fi
4770+ lt_aix_libpath_sed='
4771+ /Import File Strings/,/^$/ {
4772+ /^0/ {
4773+ s/^0 *\([^ ]*\) *$/\1/
4774+ p
4775+ }
4776+ }'
4777+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4778+ # Check for a 64-bit object if we didn't find anything.
4779+ if test -z "$lt_cv_aix_libpath_"; then
4780+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4781+ fi
4782 fi
4783 rm -f core conftest.err conftest.$ac_objext \
4784 conftest$ac_exeext conftest.$ac_ext
4785-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4786+ if test -z "$lt_cv_aix_libpath_"; then
4787+ lt_cv_aix_libpath_="/usr/lib:/lib"
4788+ fi
4789+
4790+fi
4791+
4792+ aix_libpath=$lt_cv_aix_libpath_
4793+fi
4794
4795 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4796 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"
4797@@ -9084,7 +9609,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4798 else
4799 # Determine the default libpath from the value encoded in an
4800 # empty executable.
4801- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4802+ if test "${lt_cv_aix_libpath+set}" = set; then
4803+ aix_libpath=$lt_cv_aix_libpath
4804+else
4805+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4806+ $as_echo_n "(cached) " >&6
4807+else
4808+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4809 /* end confdefs.h. */
4810
4811 int
4812@@ -9097,22 +9628,29 @@ main ()
4813 _ACEOF
4814 if ac_fn_c_try_link "$LINENO"; then :
4815
4816-lt_aix_libpath_sed='
4817- /Import File Strings/,/^$/ {
4818- /^0/ {
4819- s/^0 *\(.*\)$/\1/
4820- p
4821- }
4822- }'
4823-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4824-# Check for a 64-bit object if we didn't find anything.
4825-if test -z "$aix_libpath"; then
4826- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4827-fi
4828+ lt_aix_libpath_sed='
4829+ /Import File Strings/,/^$/ {
4830+ /^0/ {
4831+ s/^0 *\([^ ]*\) *$/\1/
4832+ p
4833+ }
4834+ }'
4835+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4836+ # Check for a 64-bit object if we didn't find anything.
4837+ if test -z "$lt_cv_aix_libpath_"; then
4838+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4839+ fi
4840 fi
4841 rm -f core conftest.err conftest.$ac_objext \
4842 conftest$ac_exeext conftest.$ac_ext
4843-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4844+ if test -z "$lt_cv_aix_libpath_"; then
4845+ lt_cv_aix_libpath_="/usr/lib:/lib"
4846+ fi
4847+
4848+fi
4849+
4850+ aix_libpath=$lt_cv_aix_libpath_
4851+fi
4852
4853 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4854 # Warning - without using the other run time loading flags,
4855@@ -9157,20 +9695,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4856 # Microsoft Visual C++.
4857 # hardcode_libdir_flag_spec is actually meaningless, as there is
4858 # no search path for DLLs.
4859- hardcode_libdir_flag_spec=' '
4860- allow_undefined_flag=unsupported
4861- # Tell ltmain to make .lib files, not .a files.
4862- libext=lib
4863- # Tell ltmain to make .dll files, not .so files.
4864- shrext_cmds=".dll"
4865- # FIXME: Setting linknames here is a bad hack.
4866- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4867- # The linker will automatically build a .lib file if we build a DLL.
4868- old_archive_from_new_cmds='true'
4869- # FIXME: Should let the user specify the lib program.
4870- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4871- fix_srcfile_path='`cygpath -w "$srcfile"`'
4872- enable_shared_with_static_runtimes=yes
4873+ case $cc_basename in
4874+ cl*)
4875+ # Native MSVC
4876+ hardcode_libdir_flag_spec=' '
4877+ allow_undefined_flag=unsupported
4878+ always_export_symbols=yes
4879+ file_list_spec='@'
4880+ # Tell ltmain to make .lib files, not .a files.
4881+ libext=lib
4882+ # Tell ltmain to make .dll files, not .so files.
4883+ shrext_cmds=".dll"
4884+ # FIXME: Setting linknames here is a bad hack.
4885+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4886+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4887+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4888+ else
4889+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4890+ fi~
4891+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4892+ linknames='
4893+ # The linker will not automatically build a static lib if we build a DLL.
4894+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4895+ enable_shared_with_static_runtimes=yes
4896+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4897+ # Don't use ranlib
4898+ old_postinstall_cmds='chmod 644 $oldlib'
4899+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4900+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4901+ case $lt_outputfile in
4902+ *.exe|*.EXE) ;;
4903+ *)
4904+ lt_outputfile="$lt_outputfile.exe"
4905+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4906+ ;;
4907+ esac~
4908+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4909+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4910+ $RM "$lt_outputfile.manifest";
4911+ fi'
4912+ ;;
4913+ *)
4914+ # Assume MSVC wrapper
4915+ hardcode_libdir_flag_spec=' '
4916+ allow_undefined_flag=unsupported
4917+ # Tell ltmain to make .lib files, not .a files.
4918+ libext=lib
4919+ # Tell ltmain to make .dll files, not .so files.
4920+ shrext_cmds=".dll"
4921+ # FIXME: Setting linknames here is a bad hack.
4922+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4923+ # The linker will automatically build a .lib file if we build a DLL.
4924+ old_archive_from_new_cmds='true'
4925+ # FIXME: Should let the user specify the lib program.
4926+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4927+ enable_shared_with_static_runtimes=yes
4928+ ;;
4929+ esac
4930 ;;
4931
4932 darwin* | rhapsody*)
4933@@ -9231,7 +9812,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4934
4935 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4936 freebsd* | dragonfly*)
4937- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4938+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4939 hardcode_libdir_flag_spec='-R$libdir'
4940 hardcode_direct=yes
4941 hardcode_shlibpath_var=no
4942@@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4943
4944 hpux9*)
4945 if test "$GCC" = yes; then
4946- 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'
4947+ 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'
4948 else
4949 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'
4950 fi
4951@@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4952
4953 hpux10*)
4954 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4955- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4956+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4957 else
4958 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4959 fi
4960@@ -9279,10 +9860,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4961 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4962 ;;
4963 ia64*)
4964- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4965+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4966 ;;
4967 *)
4968- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4969+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4970 ;;
4971 esac
4972 else
4973@@ -9361,23 +9942,36 @@ fi
4974
4975 irix5* | irix6* | nonstopux*)
4976 if test "$GCC" = yes; then
4977- 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'
4978+ 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'
4979 # Try to use the -exported_symbol ld option, if it does not
4980 # work, assume that -exports_file does not work either and
4981 # implicitly export all symbols.
4982- save_LDFLAGS="$LDFLAGS"
4983- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4984- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4985+ # This should be the same for all languages, so no per-tag cache variable.
4986+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
4987+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
4988+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
4989+ $as_echo_n "(cached) " >&6
4990+else
4991+ save_LDFLAGS="$LDFLAGS"
4992+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4993+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4994 /* end confdefs.h. */
4995-int foo(void) {}
4996+int foo (void) { return 0; }
4997 _ACEOF
4998 if ac_fn_c_try_link "$LINENO"; then :
4999- 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'
5000-
5001+ lt_cv_irix_exported_symbol=yes
5002+else
5003+ lt_cv_irix_exported_symbol=no
5004 fi
5005 rm -f core conftest.err conftest.$ac_objext \
5006 conftest$ac_exeext conftest.$ac_ext
5007- LDFLAGS="$save_LDFLAGS"
5008+ LDFLAGS="$save_LDFLAGS"
5009+fi
5010+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5011+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5012+ if test "$lt_cv_irix_exported_symbol" = yes; then
5013+ 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'
5014+ fi
5015 else
5016 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'
5017 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'
5018@@ -9462,7 +10056,7 @@ rm -f core conftest.err conftest.$ac_objext \
5019 osf4* | osf5*) # as osf3* with the addition of -msym flag
5020 if test "$GCC" = yes; then
5021 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5022- 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'
5023+ 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'
5024 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5025 else
5026 allow_undefined_flag=' -expect_unresolved \*'
5027@@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \
5028 no_undefined_flag=' -z defs'
5029 if test "$GCC" = yes; then
5030 wlarc='${wl}'
5031- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5032+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5033 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5034- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5035+ $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'
5036 else
5037 case `$CC -V 2>&1` in
5038 *"Compilers 5.0"*)
5039@@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5040 need_version=no
5041 need_lib_prefix=no
5042
5043- case $GCC,$host_os in
5044- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5045+ case $GCC,$cc_basename in
5046+ yes,*)
5047+ # gcc
5048 library_names_spec='$libname.dll.a'
5049 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5050 postinstall_cmds='base_file=`basename \${file}`~
5051@@ -10093,13 +10688,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5052 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5053 ;;
5054 esac
5055+ dynamic_linker='Win32 ld.exe'
5056+ ;;
5057+
5058+ *,cl*)
5059+ # Native MSVC
5060+ libname_spec='$name'
5061+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5062+ library_names_spec='${libname}.dll.lib'
5063+
5064+ case $build_os in
5065+ mingw*)
5066+ sys_lib_search_path_spec=
5067+ lt_save_ifs=$IFS
5068+ IFS=';'
5069+ for lt_path in $LIB
5070+ do
5071+ IFS=$lt_save_ifs
5072+ # Let DOS variable expansion print the short 8.3 style file name.
5073+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5074+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5075+ done
5076+ IFS=$lt_save_ifs
5077+ # Convert to MSYS style.
5078+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5079+ ;;
5080+ cygwin*)
5081+ # Convert to unix form, then to dos form, then back to unix form
5082+ # but this time dos style (no spaces!) so that the unix form looks
5083+ # like /cygdrive/c/PROGRA~1:/cygdr...
5084+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5085+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5086+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5087+ ;;
5088+ *)
5089+ sys_lib_search_path_spec="$LIB"
5090+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5091+ # It is most probably a Windows format PATH.
5092+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5093+ else
5094+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5095+ fi
5096+ # FIXME: find the short name or the path components, as spaces are
5097+ # common. (e.g. "Program Files" -> "PROGRA~1")
5098+ ;;
5099+ esac
5100+
5101+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5102+ postinstall_cmds='base_file=`basename \${file}`~
5103+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5104+ dldir=$destdir/`dirname \$dlpath`~
5105+ test -d \$dldir || mkdir -p \$dldir~
5106+ $install_prog $dir/$dlname \$dldir/$dlname'
5107+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5108+ dlpath=$dir/\$dldll~
5109+ $RM \$dlpath'
5110+ shlibpath_overrides_runpath=yes
5111+ dynamic_linker='Win32 link.exe'
5112 ;;
5113
5114 *)
5115+ # Assume MSVC wrapper
5116 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5117+ dynamic_linker='Win32 ld.exe'
5118 ;;
5119 esac
5120- dynamic_linker='Win32 ld.exe'
5121 # FIXME: first we should search . and the directory the executable is in
5122 shlibpath_var=PATH
5123 ;;
5124@@ -10191,7 +10844,7 @@ haiku*)
5125 soname_spec='${libname}${release}${shared_ext}$major'
5126 shlibpath_var=LIBRARY_PATH
5127 shlibpath_overrides_runpath=yes
5128- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5129+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5130 hardcode_into_libs=yes
5131 ;;
5132
5133@@ -11031,10 +11684,10 @@ else
5134 /* When -fvisbility=hidden is used, assume the code has been annotated
5135 correspondingly for the symbols needed. */
5136 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5137-void fnord () __attribute__((visibility("default")));
5138+int fnord () __attribute__((visibility("default")));
5139 #endif
5140
5141-void fnord () { int i=42; }
5142+int fnord () { return 42; }
5143 int main ()
5144 {
5145 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5146@@ -11137,10 +11790,10 @@ else
5147 /* When -fvisbility=hidden is used, assume the code has been annotated
5148 correspondingly for the symbols needed. */
5149 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5150-void fnord () __attribute__((visibility("default")));
5151+int fnord () __attribute__((visibility("default")));
5152 #endif
5153
5154-void fnord () { int i=42; }
5155+int fnord () { return 42; }
5156 int main ()
5157 {
5158 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5159@@ -15436,13 +16089,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5160 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5161 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5162 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5163+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5164+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5165 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5166 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5167 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5168 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5169 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5170+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5171+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5172+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5173+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5174 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5175 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5176+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5177 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5178 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5179 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5180@@ -15457,14 +16117,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5181 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5182 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5183 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"`'
5184+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5185+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5186 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5187 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5188 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5189-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5190 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5191+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5192 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5193 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5194 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5195+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5196 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5197 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5198 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5199@@ -15497,12 +16160,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5200 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5201 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5202 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5203-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5204 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5205 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5206 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5207 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5208 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5209+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5210 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5211 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5212 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5213@@ -15557,8 +16220,13 @@ reload_flag \
5214 OBJDUMP \
5215 deplibs_check_method \
5216 file_magic_cmd \
5217+file_magic_glob \
5218+want_nocaseglob \
5219+DLLTOOL \
5220+sharedlib_from_linklib_cmd \
5221 AR \
5222 AR_FLAGS \
5223+archiver_list_spec \
5224 STRIP \
5225 RANLIB \
5226 CC \
5227@@ -15568,12 +16236,14 @@ lt_cv_sys_global_symbol_pipe \
5228 lt_cv_sys_global_symbol_to_cdecl \
5229 lt_cv_sys_global_symbol_to_c_name_address \
5230 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5231+nm_file_list_spec \
5232 lt_prog_compiler_no_builtin_flag \
5233-lt_prog_compiler_wl \
5234 lt_prog_compiler_pic \
5235+lt_prog_compiler_wl \
5236 lt_prog_compiler_static \
5237 lt_cv_prog_compiler_c_o \
5238 need_locks \
5239+MANIFEST_TOOL \
5240 DSYMUTIL \
5241 NMEDIT \
5242 LIPO \
5243@@ -15589,7 +16259,6 @@ no_undefined_flag \
5244 hardcode_libdir_flag_spec \
5245 hardcode_libdir_flag_spec_ld \
5246 hardcode_libdir_separator \
5247-fix_srcfile_path \
5248 exclude_expsyms \
5249 include_expsyms \
5250 file_list_spec \
5251@@ -15625,6 +16294,7 @@ module_cmds \
5252 module_expsym_cmds \
5253 export_symbols_cmds \
5254 prelink_cmds \
5255+postlink_cmds \
5256 postinstall_cmds \
5257 postuninstall_cmds \
5258 finish_cmds \
5259@@ -16389,7 +17059,8 @@ $as_echo X"$file" |
5260 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5261 #
5262 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5263-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5264+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5265+# Inc.
5266 # Written by Gordon Matzigkeit, 1996
5267 #
5268 # This file is part of GNU Libtool.
5269@@ -16492,19 +17163,42 @@ SP2NL=$lt_lt_SP2NL
5270 # turn newlines into spaces.
5271 NL2SP=$lt_lt_NL2SP
5272
5273+# convert \$build file names to \$host format.
5274+to_host_file_cmd=$lt_cv_to_host_file_cmd
5275+
5276+# convert \$build files to toolchain format.
5277+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5278+
5279 # An object symbol dumper.
5280 OBJDUMP=$lt_OBJDUMP
5281
5282 # Method to check whether dependent libraries are shared objects.
5283 deplibs_check_method=$lt_deplibs_check_method
5284
5285-# Command to use when deplibs_check_method == "file_magic".
5286+# Command to use when deplibs_check_method = "file_magic".
5287 file_magic_cmd=$lt_file_magic_cmd
5288
5289+# How to find potential files when deplibs_check_method = "file_magic".
5290+file_magic_glob=$lt_file_magic_glob
5291+
5292+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5293+want_nocaseglob=$lt_want_nocaseglob
5294+
5295+# DLL creation program.
5296+DLLTOOL=$lt_DLLTOOL
5297+
5298+# Command to associate shared and link libraries.
5299+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5300+
5301 # The archiver.
5302 AR=$lt_AR
5303+
5304+# Flags to create an archive.
5305 AR_FLAGS=$lt_AR_FLAGS
5306
5307+# How to feed a file listing to the archiver.
5308+archiver_list_spec=$lt_archiver_list_spec
5309+
5310 # A symbol stripping program.
5311 STRIP=$lt_STRIP
5312
5313@@ -16534,6 +17228,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5314 # Transform the output of nm in a C name address pair when lib prefix is needed.
5315 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5316
5317+# Specify filename containing input files for \$NM.
5318+nm_file_list_spec=$lt_nm_file_list_spec
5319+
5320+# The root where to search for dependent libraries,and in which our libraries should be installed.
5321+lt_sysroot=$lt_sysroot
5322+
5323 # The name of the directory that contains temporary libtool files.
5324 objdir=$objdir
5325
5326@@ -16543,6 +17243,9 @@ MAGIC_CMD=$MAGIC_CMD
5327 # Must we lock files when doing compilation?
5328 need_locks=$lt_need_locks
5329
5330+# Manifest tool.
5331+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5332+
5333 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5334 DSYMUTIL=$lt_DSYMUTIL
5335
5336@@ -16657,12 +17360,12 @@ with_gcc=$GCC
5337 # Compiler flag to turn off builtin functions.
5338 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5339
5340-# How to pass a linker flag through the compiler.
5341-wl=$lt_lt_prog_compiler_wl
5342-
5343 # Additional compiler flags for building library objects.
5344 pic_flag=$lt_lt_prog_compiler_pic
5345
5346+# How to pass a linker flag through the compiler.
5347+wl=$lt_lt_prog_compiler_wl
5348+
5349 # Compiler flag to prevent dynamic linking.
5350 link_static_flag=$lt_lt_prog_compiler_static
5351
5352@@ -16749,9 +17452,6 @@ inherit_rpath=$inherit_rpath
5353 # Whether libtool must link a program against all its dependency libraries.
5354 link_all_deplibs=$link_all_deplibs
5355
5356-# Fix the shell variable \$srcfile for the compiler.
5357-fix_srcfile_path=$lt_fix_srcfile_path
5358-
5359 # Set to "yes" if exported symbols are required.
5360 always_export_symbols=$always_export_symbols
5361
5362@@ -16767,6 +17467,9 @@ include_expsyms=$lt_include_expsyms
5363 # Commands necessary for linking programs (against libraries) with templates.
5364 prelink_cmds=$lt_prelink_cmds
5365
5366+# Commands necessary for finishing linking programs.
5367+postlink_cmds=$lt_postlink_cmds
5368+
5369 # Specify filename containing input files.
5370 file_list_spec=$lt_file_list_spec
5371
5372@@ -16799,210 +17502,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5373 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5374 # text mode, it properly converts lines to CR/LF. This bash problem
5375 # is reportedly fixed, but why not run on old versions too?
5376- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5377- || (rm -f "$cfgfile"; exit 1)
5378-
5379- case $xsi_shell in
5380- yes)
5381- cat << \_LT_EOF >> "$cfgfile"
5382-
5383-# func_dirname file append nondir_replacement
5384-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5385-# otherwise set result to NONDIR_REPLACEMENT.
5386-func_dirname ()
5387-{
5388- case ${1} in
5389- */*) func_dirname_result="${1%/*}${2}" ;;
5390- * ) func_dirname_result="${3}" ;;
5391- esac
5392-}
5393-
5394-# func_basename file
5395-func_basename ()
5396-{
5397- func_basename_result="${1##*/}"
5398-}
5399-
5400-# func_dirname_and_basename file append nondir_replacement
5401-# perform func_basename and func_dirname in a single function
5402-# call:
5403-# dirname: Compute the dirname of FILE. If nonempty,
5404-# add APPEND to the result, otherwise set result
5405-# to NONDIR_REPLACEMENT.
5406-# value returned in "$func_dirname_result"
5407-# basename: Compute filename of FILE.
5408-# value retuned in "$func_basename_result"
5409-# Implementation must be kept synchronized with func_dirname
5410-# and func_basename. For efficiency, we do not delegate to
5411-# those functions but instead duplicate the functionality here.
5412-func_dirname_and_basename ()
5413-{
5414- case ${1} in
5415- */*) func_dirname_result="${1%/*}${2}" ;;
5416- * ) func_dirname_result="${3}" ;;
5417- esac
5418- func_basename_result="${1##*/}"
5419-}
5420-
5421-# func_stripname prefix suffix name
5422-# strip PREFIX and SUFFIX off of NAME.
5423-# PREFIX and SUFFIX must not contain globbing or regex special
5424-# characters, hashes, percent signs, but SUFFIX may contain a leading
5425-# dot (in which case that matches only a dot).
5426-func_stripname ()
5427-{
5428- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5429- # positional parameters, so assign one to ordinary parameter first.
5430- func_stripname_result=${3}
5431- func_stripname_result=${func_stripname_result#"${1}"}
5432- func_stripname_result=${func_stripname_result%"${2}"}
5433-}
5434-
5435-# func_opt_split
5436-func_opt_split ()
5437-{
5438- func_opt_split_opt=${1%%=*}
5439- func_opt_split_arg=${1#*=}
5440-}
5441-
5442-# func_lo2o object
5443-func_lo2o ()
5444-{
5445- case ${1} in
5446- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5447- *) func_lo2o_result=${1} ;;
5448- esac
5449-}
5450-
5451-# func_xform libobj-or-source
5452-func_xform ()
5453-{
5454- func_xform_result=${1%.*}.lo
5455-}
5456-
5457-# func_arith arithmetic-term...
5458-func_arith ()
5459-{
5460- func_arith_result=$(( $* ))
5461-}
5462-
5463-# func_len string
5464-# STRING may not start with a hyphen.
5465-func_len ()
5466-{
5467- func_len_result=${#1}
5468-}
5469-
5470-_LT_EOF
5471- ;;
5472- *) # Bourne compatible functions.
5473- cat << \_LT_EOF >> "$cfgfile"
5474-
5475-# func_dirname file append nondir_replacement
5476-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5477-# otherwise set result to NONDIR_REPLACEMENT.
5478-func_dirname ()
5479-{
5480- # Extract subdirectory from the argument.
5481- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5482- if test "X$func_dirname_result" = "X${1}"; then
5483- func_dirname_result="${3}"
5484- else
5485- func_dirname_result="$func_dirname_result${2}"
5486- fi
5487-}
5488-
5489-# func_basename file
5490-func_basename ()
5491-{
5492- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5493-}
5494-
5495-
5496-# func_stripname prefix suffix name
5497-# strip PREFIX and SUFFIX off of NAME.
5498-# PREFIX and SUFFIX must not contain globbing or regex special
5499-# characters, hashes, percent signs, but SUFFIX may contain a leading
5500-# dot (in which case that matches only a dot).
5501-# func_strip_suffix prefix name
5502-func_stripname ()
5503-{
5504- case ${2} in
5505- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5506- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5507- esac
5508-}
5509-
5510-# sed scripts:
5511-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5512-my_sed_long_arg='1s/^-[^=]*=//'
5513-
5514-# func_opt_split
5515-func_opt_split ()
5516-{
5517- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5518- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5519-}
5520-
5521-# func_lo2o object
5522-func_lo2o ()
5523-{
5524- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5525-}
5526-
5527-# func_xform libobj-or-source
5528-func_xform ()
5529-{
5530- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5531-}
5532-
5533-# func_arith arithmetic-term...
5534-func_arith ()
5535-{
5536- func_arith_result=`expr "$@"`
5537-}
5538-
5539-# func_len string
5540-# STRING may not start with a hyphen.
5541-func_len ()
5542-{
5543- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5544-}
5545-
5546-_LT_EOF
5547-esac
5548-
5549-case $lt_shell_append in
5550- yes)
5551- cat << \_LT_EOF >> "$cfgfile"
5552-
5553-# func_append var value
5554-# Append VALUE to the end of shell variable VAR.
5555-func_append ()
5556-{
5557- eval "$1+=\$2"
5558-}
5559-_LT_EOF
5560- ;;
5561- *)
5562- cat << \_LT_EOF >> "$cfgfile"
5563-
5564-# func_append var value
5565-# Append VALUE to the end of shell variable VAR.
5566-func_append ()
5567-{
5568- eval "$1=\$$1\$2"
5569-}
5570-
5571-_LT_EOF
5572- ;;
5573- esac
5574-
5575-
5576- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5577- || (rm -f "$cfgfile"; exit 1)
5578-
5579- mv -f "$cfgfile" "$ofile" ||
5580+ sed '$q' "$ltmain" >> "$cfgfile" \
5581+ || (rm -f "$cfgfile"; exit 1)
5582+
5583+ if test x"$xsi_shell" = xyes; then
5584+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5585+func_dirname ()\
5586+{\
5587+\ case ${1} in\
5588+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5589+\ * ) func_dirname_result="${3}" ;;\
5590+\ esac\
5591+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5592+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5593+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5594+test 0 -eq $? || _lt_function_replace_fail=:
5595+
5596+
5597+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5598+func_basename ()\
5599+{\
5600+\ func_basename_result="${1##*/}"\
5601+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5602+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5603+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5604+test 0 -eq $? || _lt_function_replace_fail=:
5605+
5606+
5607+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5608+func_dirname_and_basename ()\
5609+{\
5610+\ case ${1} in\
5611+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5612+\ * ) func_dirname_result="${3}" ;;\
5613+\ esac\
5614+\ func_basename_result="${1##*/}"\
5615+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5616+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5617+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5618+test 0 -eq $? || _lt_function_replace_fail=:
5619+
5620+
5621+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5622+func_stripname ()\
5623+{\
5624+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5625+\ # positional parameters, so assign one to ordinary parameter first.\
5626+\ func_stripname_result=${3}\
5627+\ func_stripname_result=${func_stripname_result#"${1}"}\
5628+\ func_stripname_result=${func_stripname_result%"${2}"}\
5629+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5630+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5631+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5632+test 0 -eq $? || _lt_function_replace_fail=:
5633+
5634+
5635+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5636+func_split_long_opt ()\
5637+{\
5638+\ func_split_long_opt_name=${1%%=*}\
5639+\ func_split_long_opt_arg=${1#*=}\
5640+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5641+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5642+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5643+test 0 -eq $? || _lt_function_replace_fail=:
5644+
5645+
5646+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5647+func_split_short_opt ()\
5648+{\
5649+\ func_split_short_opt_arg=${1#??}\
5650+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5651+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5652+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5653+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5654+test 0 -eq $? || _lt_function_replace_fail=:
5655+
5656+
5657+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5658+func_lo2o ()\
5659+{\
5660+\ case ${1} in\
5661+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5662+\ *) func_lo2o_result=${1} ;;\
5663+\ esac\
5664+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5665+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5666+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5667+test 0 -eq $? || _lt_function_replace_fail=:
5668+
5669+
5670+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5671+func_xform ()\
5672+{\
5673+ func_xform_result=${1%.*}.lo\
5674+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5675+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5676+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5677+test 0 -eq $? || _lt_function_replace_fail=:
5678+
5679+
5680+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5681+func_arith ()\
5682+{\
5683+ func_arith_result=$(( $* ))\
5684+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5685+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5686+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5687+test 0 -eq $? || _lt_function_replace_fail=:
5688+
5689+
5690+ sed -e '/^func_len ()$/,/^} # func_len /c\
5691+func_len ()\
5692+{\
5693+ func_len_result=${#1}\
5694+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5695+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5696+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5697+test 0 -eq $? || _lt_function_replace_fail=:
5698+
5699+fi
5700+
5701+if test x"$lt_shell_append" = xyes; then
5702+ sed -e '/^func_append ()$/,/^} # func_append /c\
5703+func_append ()\
5704+{\
5705+ eval "${1}+=\\${2}"\
5706+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5707+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5708+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5709+test 0 -eq $? || _lt_function_replace_fail=:
5710+
5711+
5712+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5713+func_append_quoted ()\
5714+{\
5715+\ func_quote_for_eval "${2}"\
5716+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5717+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5718+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5719+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5720+test 0 -eq $? || _lt_function_replace_fail=:
5721+
5722+
5723+ # Save a `func_append' function call where possible by direct use of '+='
5724+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5727+ test 0 -eq $? || _lt_function_replace_fail=:
5728+else
5729+ # Save a `func_append' function call even when '+=' is not available
5730+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5731+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5732+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5733+ test 0 -eq $? || _lt_function_replace_fail=:
5734+fi
5735+
5736+if test x"$_lt_function_replace_fail" = x":"; then
5737+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5738+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5739+fi
5740+
5741+
5742+ mv -f "$cfgfile" "$ofile" ||
5743 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5744 chmod +x "$ofile"
5745
5746diff --git a/gprof/configure b/gprof/configure
5747index 679e0dce77..ac4c016a63 100755
5748--- a/gprof/configure
5749+++ b/gprof/configure
5750@@ -631,8 +631,11 @@ OTOOL
5751 LIPO
5752 NMEDIT
5753 DSYMUTIL
5754+MANIFEST_TOOL
5755 RANLIB
5756+ac_ct_AR
5757 AR
5758+DLLTOOL
5759 OBJDUMP
5760 LN_S
5761 NM
5762@@ -744,6 +747,7 @@ enable_static
5763 with_pic
5764 enable_fast_install
5765 with_gnu_ld
5766+with_libtool_sysroot
5767 enable_libtool_lock
5768 enable_plugins
5769 enable_largefile
5770@@ -1402,6 +1406,8 @@ Optional Packages:
5771 --with-pic try to use only PIC/non-PIC objects [default=use
5772 both]
5773 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5774+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5775+ (or the compiler's sysroot if not specified).
5776
5777 Some influential environment variables:
5778 CC C compiler command
5779@@ -4836,8 +4842,8 @@ esac
5780
5781
5782
5783-macro_version='2.2.7a'
5784-macro_revision='1.3134'
5785+macro_version='2.4'
5786+macro_revision='1.3293'
5787
5788
5789
5790@@ -4877,7 +4883,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5791 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5792 $as_echo_n "checking how to print strings... " >&6; }
5793 # Test print first, because it will be a builtin if present.
5794-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5795+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5796 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5797 ECHO='print -r --'
5798 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5799@@ -5563,8 +5569,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5800 # Try some XSI features
5801 xsi_shell=no
5802 ( _lt_dummy="a/b/c"
5803- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5804- = c,a/b,, \
5805+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5806+ = c,a/b,b/c, \
5807 && eval 'test $(( 1 + 1 )) -eq 2 \
5808 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5809 && xsi_shell=yes
5810@@ -5613,6 +5619,80 @@ esac
5811
5812
5813
5814+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5815+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5816+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
5817+ $as_echo_n "(cached) " >&6
5818+else
5819+ case $host in
5820+ *-*-mingw* )
5821+ case $build in
5822+ *-*-mingw* ) # actually msys
5823+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5824+ ;;
5825+ *-*-cygwin* )
5826+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5827+ ;;
5828+ * ) # otherwise, assume *nix
5829+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5830+ ;;
5831+ esac
5832+ ;;
5833+ *-*-cygwin* )
5834+ case $build in
5835+ *-*-mingw* ) # actually msys
5836+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5837+ ;;
5838+ *-*-cygwin* )
5839+ lt_cv_to_host_file_cmd=func_convert_file_noop
5840+ ;;
5841+ * ) # otherwise, assume *nix
5842+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5843+ ;;
5844+ esac
5845+ ;;
5846+ * ) # unhandled hosts (and "normal" native builds)
5847+ lt_cv_to_host_file_cmd=func_convert_file_noop
5848+ ;;
5849+esac
5850+
5851+fi
5852+
5853+to_host_file_cmd=$lt_cv_to_host_file_cmd
5854+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5855+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5856+
5857+
5858+
5859+
5860+
5861+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5862+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5863+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
5864+ $as_echo_n "(cached) " >&6
5865+else
5866+ #assume ordinary cross tools, or native build.
5867+lt_cv_to_tool_file_cmd=func_convert_file_noop
5868+case $host in
5869+ *-*-mingw* )
5870+ case $build in
5871+ *-*-mingw* ) # actually msys
5872+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5873+ ;;
5874+ esac
5875+ ;;
5876+esac
5877+
5878+fi
5879+
5880+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5881+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5882+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5883+
5884+
5885+
5886+
5887+
5888 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5889 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5890 if test "${lt_cv_ld_reload_flag+set}" = set; then :
5891@@ -5629,6 +5709,11 @@ case $reload_flag in
5892 esac
5893 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5894 case $host_os in
5895+ cygwin* | mingw* | pw32* | cegcc*)
5896+ if test "$GCC" != yes; then
5897+ reload_cmds=false
5898+ fi
5899+ ;;
5900 darwin*)
5901 if test "$GCC" = yes; then
5902 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5903@@ -5797,7 +5882,8 @@ mingw* | pw32*)
5904 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5905 lt_cv_file_magic_cmd='func_win32_libid'
5906 else
5907- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5908+ # Keep this pattern in sync with the one in func_win32_libid.
5909+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5910 lt_cv_file_magic_cmd='$OBJDUMP -f'
5911 fi
5912 ;;
5913@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5914 lt_cv_deplibs_check_method=pass_all
5915 ;;
5916
5917-linux-uclibc*)
5918- lt_cv_deplibs_check_method=pass_all
5919- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5920- ;;
5921-
5922 netbsd*)
5923 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5924 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5925@@ -5956,6 +6037,21 @@ esac
5926 fi
5927 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5928 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5929+
5930+file_magic_glob=
5931+want_nocaseglob=no
5932+if test "$build" = "$host"; then
5933+ case $host_os in
5934+ mingw* | pw32*)
5935+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5936+ want_nocaseglob=yes
5937+ else
5938+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5939+ fi
5940+ ;;
5941+ esac
5942+fi
5943+
5944 file_magic_cmd=$lt_cv_file_magic_cmd
5945 deplibs_check_method=$lt_cv_deplibs_check_method
5946 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5947@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5948
5949
5950
5951+
5952+
5953+
5954+
5955+
5956+
5957+
5958+
5959+
5960+
5961+if test -n "$ac_tool_prefix"; then
5962+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5963+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5964+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5965+$as_echo_n "checking for $ac_word... " >&6; }
5966+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5967+ $as_echo_n "(cached) " >&6
5968+else
5969+ if test -n "$DLLTOOL"; then
5970+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
5971+else
5972+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5973+for as_dir in $PATH
5974+do
5975+ IFS=$as_save_IFS
5976+ test -z "$as_dir" && as_dir=.
5977+ for ac_exec_ext in '' $ac_executable_extensions; do
5978+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5979+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5980+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5981+ break 2
5982+ fi
5983+done
5984+ done
5985+IFS=$as_save_IFS
5986+
5987+fi
5988+fi
5989+DLLTOOL=$ac_cv_prog_DLLTOOL
5990+if test -n "$DLLTOOL"; then
5991+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
5992+$as_echo "$DLLTOOL" >&6; }
5993+else
5994+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5995+$as_echo "no" >&6; }
5996+fi
5997+
5998+
5999+fi
6000+if test -z "$ac_cv_prog_DLLTOOL"; then
6001+ ac_ct_DLLTOOL=$DLLTOOL
6002+ # Extract the first word of "dlltool", so it can be a program name with args.
6003+set dummy dlltool; ac_word=$2
6004+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6005+$as_echo_n "checking for $ac_word... " >&6; }
6006+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
6007+ $as_echo_n "(cached) " >&6
6008+else
6009+ if test -n "$ac_ct_DLLTOOL"; then
6010+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6011+else
6012+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6013+for as_dir in $PATH
6014+do
6015+ IFS=$as_save_IFS
6016+ test -z "$as_dir" && as_dir=.
6017+ for ac_exec_ext in '' $ac_executable_extensions; do
6018+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6019+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6020+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6021+ break 2
6022+ fi
6023+done
6024+ done
6025+IFS=$as_save_IFS
6026+
6027+fi
6028+fi
6029+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6030+if test -n "$ac_ct_DLLTOOL"; then
6031+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6032+$as_echo "$ac_ct_DLLTOOL" >&6; }
6033+else
6034+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6035+$as_echo "no" >&6; }
6036+fi
6037+
6038+ if test "x$ac_ct_DLLTOOL" = x; then
6039+ DLLTOOL="false"
6040+ else
6041+ case $cross_compiling:$ac_tool_warned in
6042+yes:)
6043+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6044+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6045+ac_tool_warned=yes ;;
6046+esac
6047+ DLLTOOL=$ac_ct_DLLTOOL
6048+ fi
6049+else
6050+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6051+fi
6052+
6053+test -z "$DLLTOOL" && DLLTOOL=dlltool
6054+
6055+
6056+
6057+
6058+
6059+
6060+
6061+
6062+
6063+
6064+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6065+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6066+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6067+ $as_echo_n "(cached) " >&6
6068+else
6069+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6070+
6071+case $host_os in
6072+cygwin* | mingw* | pw32* | cegcc*)
6073+ # two different shell functions defined in ltmain.sh
6074+ # decide which to use based on capabilities of $DLLTOOL
6075+ case `$DLLTOOL --help 2>&1` in
6076+ *--identify-strict*)
6077+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6078+ ;;
6079+ *)
6080+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6081+ ;;
6082+ esac
6083+ ;;
6084+*)
6085+ # fallback: assume linklib IS sharedlib
6086+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6087+ ;;
6088+esac
6089+
6090+fi
6091+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6092+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6093+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6094+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6095+
6096+
6097+
6098+
6099+
6100+
6101+
6102 if test -n "$ac_tool_prefix"; then
6103- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6104-set dummy ${ac_tool_prefix}ar; ac_word=$2
6105+ for ac_prog in ar
6106+ do
6107+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6108+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6110 $as_echo_n "checking for $ac_word... " >&6; }
6111 if test "${ac_cv_prog_AR+set}" = set; then :
6112@@ -5989,7 +6238,7 @@ do
6113 test -z "$as_dir" && as_dir=.
6114 for ac_exec_ext in '' $ac_executable_extensions; do
6115 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6116- ac_cv_prog_AR="${ac_tool_prefix}ar"
6117+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6118 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6119 break 2
6120 fi
6121@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; }
6122 fi
6123
6124
6125+ test -n "$AR" && break
6126+ done
6127 fi
6128-if test -z "$ac_cv_prog_AR"; then
6129+if test -z "$AR"; then
6130 ac_ct_AR=$AR
6131- # Extract the first word of "ar", so it can be a program name with args.
6132-set dummy ar; ac_word=$2
6133+ for ac_prog in ar
6134+do
6135+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6136+set dummy $ac_prog; ac_word=$2
6137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6138 $as_echo_n "checking for $ac_word... " >&6; }
6139 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6140@@ -6029,7 +6282,7 @@ do
6141 test -z "$as_dir" && as_dir=.
6142 for ac_exec_ext in '' $ac_executable_extensions; do
6143 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6144- ac_cv_prog_ac_ct_AR="ar"
6145+ ac_cv_prog_ac_ct_AR="$ac_prog"
6146 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6147 break 2
6148 fi
6149@@ -6048,6 +6301,10 @@ else
6150 $as_echo "no" >&6; }
6151 fi
6152
6153+
6154+ test -n "$ac_ct_AR" && break
6155+done
6156+
6157 if test "x$ac_ct_AR" = x; then
6158 AR="false"
6159 else
6160@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;;
6161 esac
6162 AR=$ac_ct_AR
6163 fi
6164-else
6165- AR="$ac_cv_prog_AR"
6166 fi
6167
6168-test -z "$AR" && AR=ar
6169-test -z "$AR_FLAGS" && AR_FLAGS=cru
6170+: ${AR=ar}
6171+: ${AR_FLAGS=cru}
6172
6173
6174
6175@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6176
6177
6178
6179+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6180+$as_echo_n "checking for archiver @FILE support... " >&6; }
6181+if test "${lt_cv_ar_at_file+set}" = set; then :
6182+ $as_echo_n "(cached) " >&6
6183+else
6184+ lt_cv_ar_at_file=no
6185+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6186+/* end confdefs.h. */
6187+
6188+int
6189+main ()
6190+{
6191+
6192+ ;
6193+ return 0;
6194+}
6195+_ACEOF
6196+if ac_fn_c_try_compile "$LINENO"; then :
6197+ echo conftest.$ac_objext > conftest.lst
6198+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6199+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6200+ (eval $lt_ar_try) 2>&5
6201+ ac_status=$?
6202+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6203+ test $ac_status = 0; }
6204+ if test "$ac_status" -eq 0; then
6205+ # Ensure the archiver fails upon bogus file names.
6206+ rm -f conftest.$ac_objext libconftest.a
6207+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6208+ (eval $lt_ar_try) 2>&5
6209+ ac_status=$?
6210+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6211+ test $ac_status = 0; }
6212+ if test "$ac_status" -ne 0; then
6213+ lt_cv_ar_at_file=@
6214+ fi
6215+ fi
6216+ rm -f conftest.* libconftest.a
6217+
6218+fi
6219+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6220+
6221+fi
6222+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6223+$as_echo "$lt_cv_ar_at_file" >&6; }
6224+
6225+if test "x$lt_cv_ar_at_file" = xno; then
6226+ archiver_list_spec=
6227+else
6228+ archiver_list_spec=$lt_cv_ar_at_file
6229+fi
6230+
6231+
6232+
6233+
6234+
6235+
6236+
6237 if test -n "$ac_tool_prefix"; then
6238 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6239 set dummy ${ac_tool_prefix}strip; ac_word=$2
6240@@ -6410,8 +6723,8 @@ esac
6241 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6242
6243 # Transform an extracted symbol line into symbol name and symbol address
6244-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6245-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'"
6246+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6247+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'"
6248
6249 # Handle CRLF in mingw tool chain
6250 opt_cr=
6251@@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do
6252 else
6253 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6254 fi
6255+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6256
6257 # Check to see that the pipe works correctly.
6258 pipe_works=no
6259@@ -6488,6 +6802,18 @@ _LT_EOF
6260 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6261 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6262 cat <<_LT_EOF > conftest.$ac_ext
6263+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6264+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6265+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6266+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6267+# define LT_DLSYM_CONST
6268+#elif defined(__osf__)
6269+/* This system does not cope well with relocations in const data. */
6270+# define LT_DLSYM_CONST
6271+#else
6272+# define LT_DLSYM_CONST const
6273+#endif
6274+
6275 #ifdef __cplusplus
6276 extern "C" {
6277 #endif
6278@@ -6499,7 +6825,7 @@ _LT_EOF
6279 cat <<_LT_EOF >> conftest.$ac_ext
6280
6281 /* The mapping between symbol names and symbols. */
6282-const struct {
6283+LT_DLSYM_CONST struct {
6284 const char *name;
6285 void *address;
6286 }
6287@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() {
6288 _LT_EOF
6289 # Now try linking the two files.
6290 mv conftest.$ac_objext conftstm.$ac_objext
6291- lt_save_LIBS="$LIBS"
6292- lt_save_CFLAGS="$CFLAGS"
6293+ lt_globsym_save_LIBS=$LIBS
6294+ lt_globsym_save_CFLAGS=$CFLAGS
6295 LIBS="conftstm.$ac_objext"
6296 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6297 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6298@@ -6536,8 +6862,8 @@ _LT_EOF
6299 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6300 pipe_works=yes
6301 fi
6302- LIBS="$lt_save_LIBS"
6303- CFLAGS="$lt_save_CFLAGS"
6304+ LIBS=$lt_globsym_save_LIBS
6305+ CFLAGS=$lt_globsym_save_CFLAGS
6306 else
6307 echo "cannot find nm_test_func in $nlist" >&5
6308 fi
6309@@ -6574,6 +6900,18 @@ else
6310 $as_echo "ok" >&6; }
6311 fi
6312
6313+# Response file support.
6314+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6315+ nm_file_list_spec='@'
6316+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6317+ nm_file_list_spec='@'
6318+fi
6319+
6320+
6321+
6322+
6323+
6324+
6325
6326
6327
6328@@ -6590,6 +6928,43 @@ fi
6329
6330
6331
6332+
6333+
6334+
6335+
6336+
6337+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6338+$as_echo_n "checking for sysroot... " >&6; }
6339+
6340+# Check whether --with-libtool-sysroot was given.
6341+if test "${with_libtool_sysroot+set}" = set; then :
6342+ withval=$with_libtool_sysroot;
6343+else
6344+ with_libtool_sysroot=no
6345+fi
6346+
6347+
6348+lt_sysroot=
6349+case ${with_libtool_sysroot} in #(
6350+ yes)
6351+ if test "$GCC" = yes; then
6352+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6353+ fi
6354+ ;; #(
6355+ /*)
6356+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6357+ ;; #(
6358+ no|'')
6359+ ;; #(
6360+ *)
6361+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6362+$as_echo "${with_libtool_sysroot}" >&6; }
6363+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6364+ ;;
6365+esac
6366+
6367+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6368+$as_echo "${lt_sysroot:-no}" >&6; }
6369
6370
6371
6372@@ -6801,6 +7176,123 @@ esac
6373
6374 need_locks="$enable_libtool_lock"
6375
6376+if test -n "$ac_tool_prefix"; then
6377+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6378+set dummy ${ac_tool_prefix}mt; ac_word=$2
6379+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6380+$as_echo_n "checking for $ac_word... " >&6; }
6381+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6382+ $as_echo_n "(cached) " >&6
6383+else
6384+ if test -n "$MANIFEST_TOOL"; then
6385+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6386+else
6387+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6388+for as_dir in $PATH
6389+do
6390+ IFS=$as_save_IFS
6391+ test -z "$as_dir" && as_dir=.
6392+ for ac_exec_ext in '' $ac_executable_extensions; do
6393+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6394+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6395+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6396+ break 2
6397+ fi
6398+done
6399+ done
6400+IFS=$as_save_IFS
6401+
6402+fi
6403+fi
6404+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6405+if test -n "$MANIFEST_TOOL"; then
6406+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6407+$as_echo "$MANIFEST_TOOL" >&6; }
6408+else
6409+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6410+$as_echo "no" >&6; }
6411+fi
6412+
6413+
6414+fi
6415+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6416+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6417+ # Extract the first word of "mt", so it can be a program name with args.
6418+set dummy mt; ac_word=$2
6419+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6420+$as_echo_n "checking for $ac_word... " >&6; }
6421+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6422+ $as_echo_n "(cached) " >&6
6423+else
6424+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6425+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6426+else
6427+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6428+for as_dir in $PATH
6429+do
6430+ IFS=$as_save_IFS
6431+ test -z "$as_dir" && as_dir=.
6432+ for ac_exec_ext in '' $ac_executable_extensions; do
6433+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6434+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6435+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6436+ break 2
6437+ fi
6438+done
6439+ done
6440+IFS=$as_save_IFS
6441+
6442+fi
6443+fi
6444+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6445+if test -n "$ac_ct_MANIFEST_TOOL"; then
6446+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6447+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6448+else
6449+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6450+$as_echo "no" >&6; }
6451+fi
6452+
6453+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6454+ MANIFEST_TOOL=":"
6455+ else
6456+ case $cross_compiling:$ac_tool_warned in
6457+yes:)
6458+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6459+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6460+ac_tool_warned=yes ;;
6461+esac
6462+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6463+ fi
6464+else
6465+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6466+fi
6467+
6468+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6469+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6470+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6471+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6472+ $as_echo_n "(cached) " >&6
6473+else
6474+ lt_cv_path_mainfest_tool=no
6475+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6476+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6477+ cat conftest.err >&5
6478+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6479+ lt_cv_path_mainfest_tool=yes
6480+ fi
6481+ rm -f conftest*
6482+fi
6483+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6484+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6485+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6486+ MANIFEST_TOOL=:
6487+fi
6488+
6489+
6490+
6491+
6492+
6493
6494 case $host_os in
6495 rhapsody* | darwin*)
6496@@ -7364,6 +7856,8 @@ _LT_EOF
6497 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6498 echo "$AR cru libconftest.a conftest.o" >&5
6499 $AR cru libconftest.a conftest.o 2>&5
6500+ echo "$RANLIB libconftest.a" >&5
6501+ $RANLIB libconftest.a 2>&5
6502 cat > conftest.c << _LT_EOF
6503 int main() { return 0;}
6504 _LT_EOF
6505@@ -7559,7 +8053,8 @@ fi
6506 LIBTOOL_DEPS="$ltmain"
6507
6508 # Always use our own libtool.
6509-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6510+LIBTOOL='$(SHELL) $(top_builddir)'
6511+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6512
6513
6514
6515@@ -7648,7 +8143,7 @@ aix3*)
6516 esac
6517
6518 # Global variables:
6519-ofile=libtool
6520+ofile=${host_alias}-libtool
6521 can_build_shared=yes
6522
6523 # All known linkers require a `.a' archive for static linking (except MSVC,
6524@@ -7946,8 +8441,6 @@ fi
6525 lt_prog_compiler_pic=
6526 lt_prog_compiler_static=
6527
6528-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6529-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6530
6531 if test "$GCC" = yes; then
6532 lt_prog_compiler_wl='-Wl,'
6533@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6534 lt_prog_compiler_pic='--shared'
6535 lt_prog_compiler_static='--static'
6536 ;;
6537+ nagfor*)
6538+ # NAG Fortran compiler
6539+ lt_prog_compiler_wl='-Wl,-Wl,,'
6540+ lt_prog_compiler_pic='-PIC'
6541+ lt_prog_compiler_static='-Bstatic'
6542+ ;;
6543 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6544 # Portland Group compilers (*not* the Pentium gcc compiler,
6545 # which looks to be a dead project)
6546@@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6547 lt_prog_compiler_pic='-KPIC'
6548 lt_prog_compiler_static='-Bstatic'
6549 case $cc_basename in
6550- f77* | f90* | f95*)
6551+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6552 lt_prog_compiler_wl='-Qoption ld ';;
6553 *)
6554 lt_prog_compiler_wl='-Wl,';;
6555@@ -8232,13 +8731,17 @@ case $host_os in
6556 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6557 ;;
6558 esac
6559-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6560-$as_echo "$lt_prog_compiler_pic" >&6; }
6561-
6562-
6563-
6564-
6565
6566+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6567+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6568+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6569+ $as_echo_n "(cached) " >&6
6570+else
6571+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6572+fi
6573+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6574+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6575+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6576
6577 #
6578 # Check to make sure the PIC flag actually works.
6579@@ -8299,6 +8802,11 @@ fi
6580
6581
6582
6583+
6584+
6585+
6586+
6587+
6588 #
6589 # Check to make sure the static flag actually works.
6590 #
6591@@ -8649,7 +9157,8 @@ _LT_EOF
6592 allow_undefined_flag=unsupported
6593 always_export_symbols=no
6594 enable_shared_with_static_runtimes=yes
6595- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6596+ 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'
6597+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6598
6599 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6600 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6601@@ -8748,12 +9257,12 @@ _LT_EOF
6602 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6603 hardcode_libdir_flag_spec=
6604 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6605- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6606+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6607 if test "x$supports_anon_versioning" = xyes; then
6608 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6609 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6610 echo "local: *; };" >> $output_objdir/$libname.ver~
6611- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6612+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6613 fi
6614 ;;
6615 esac
6616@@ -8767,8 +9276,8 @@ _LT_EOF
6617 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6618 wlarc=
6619 else
6620- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6621- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6622+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6623+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6624 fi
6625 ;;
6626
6627@@ -8786,8 +9295,8 @@ _LT_EOF
6628
6629 _LT_EOF
6630 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6631- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6632- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6633+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6634+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6635 else
6636 ld_shlibs=no
6637 fi
6638@@ -8833,8 +9342,8 @@ _LT_EOF
6639
6640 *)
6641 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6642- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6643- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6644+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6645+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6646 else
6647 ld_shlibs=no
6648 fi
6649@@ -8964,7 +9473,13 @@ _LT_EOF
6650 allow_undefined_flag='-berok'
6651 # Determine the default libpath from the value encoded in an
6652 # empty executable.
6653- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6654+ if test "${lt_cv_aix_libpath+set}" = set; then
6655+ aix_libpath=$lt_cv_aix_libpath
6656+else
6657+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6658+ $as_echo_n "(cached) " >&6
6659+else
6660+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6661 /* end confdefs.h. */
6662
6663 int
6664@@ -8977,22 +9492,29 @@ main ()
6665 _ACEOF
6666 if ac_fn_c_try_link "$LINENO"; then :
6667
6668-lt_aix_libpath_sed='
6669- /Import File Strings/,/^$/ {
6670- /^0/ {
6671- s/^0 *\(.*\)$/\1/
6672- p
6673- }
6674- }'
6675-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6676-# Check for a 64-bit object if we didn't find anything.
6677-if test -z "$aix_libpath"; then
6678- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6679-fi
6680+ lt_aix_libpath_sed='
6681+ /Import File Strings/,/^$/ {
6682+ /^0/ {
6683+ s/^0 *\([^ ]*\) *$/\1/
6684+ p
6685+ }
6686+ }'
6687+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6688+ # Check for a 64-bit object if we didn't find anything.
6689+ if test -z "$lt_cv_aix_libpath_"; then
6690+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6691+ fi
6692 fi
6693 rm -f core conftest.err conftest.$ac_objext \
6694 conftest$ac_exeext conftest.$ac_ext
6695-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6696+ if test -z "$lt_cv_aix_libpath_"; then
6697+ lt_cv_aix_libpath_="/usr/lib:/lib"
6698+ fi
6699+
6700+fi
6701+
6702+ aix_libpath=$lt_cv_aix_libpath_
6703+fi
6704
6705 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6706 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"
6707@@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6708 else
6709 # Determine the default libpath from the value encoded in an
6710 # empty executable.
6711- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6712+ if test "${lt_cv_aix_libpath+set}" = set; then
6713+ aix_libpath=$lt_cv_aix_libpath
6714+else
6715+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6716+ $as_echo_n "(cached) " >&6
6717+else
6718+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6719 /* end confdefs.h. */
6720
6721 int
6722@@ -9017,22 +9545,29 @@ main ()
6723 _ACEOF
6724 if ac_fn_c_try_link "$LINENO"; then :
6725
6726-lt_aix_libpath_sed='
6727- /Import File Strings/,/^$/ {
6728- /^0/ {
6729- s/^0 *\(.*\)$/\1/
6730- p
6731- }
6732- }'
6733-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6734-# Check for a 64-bit object if we didn't find anything.
6735-if test -z "$aix_libpath"; then
6736- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6737-fi
6738+ lt_aix_libpath_sed='
6739+ /Import File Strings/,/^$/ {
6740+ /^0/ {
6741+ s/^0 *\([^ ]*\) *$/\1/
6742+ p
6743+ }
6744+ }'
6745+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6746+ # Check for a 64-bit object if we didn't find anything.
6747+ if test -z "$lt_cv_aix_libpath_"; then
6748+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6749+ fi
6750 fi
6751 rm -f core conftest.err conftest.$ac_objext \
6752 conftest$ac_exeext conftest.$ac_ext
6753-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6754+ if test -z "$lt_cv_aix_libpath_"; then
6755+ lt_cv_aix_libpath_="/usr/lib:/lib"
6756+ fi
6757+
6758+fi
6759+
6760+ aix_libpath=$lt_cv_aix_libpath_
6761+fi
6762
6763 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6764 # Warning - without using the other run time loading flags,
6765@@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6766 # Microsoft Visual C++.
6767 # hardcode_libdir_flag_spec is actually meaningless, as there is
6768 # no search path for DLLs.
6769- hardcode_libdir_flag_spec=' '
6770- allow_undefined_flag=unsupported
6771- # Tell ltmain to make .lib files, not .a files.
6772- libext=lib
6773- # Tell ltmain to make .dll files, not .so files.
6774- shrext_cmds=".dll"
6775- # FIXME: Setting linknames here is a bad hack.
6776- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6777- # The linker will automatically build a .lib file if we build a DLL.
6778- old_archive_from_new_cmds='true'
6779- # FIXME: Should let the user specify the lib program.
6780- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6781- fix_srcfile_path='`cygpath -w "$srcfile"`'
6782- enable_shared_with_static_runtimes=yes
6783+ case $cc_basename in
6784+ cl*)
6785+ # Native MSVC
6786+ hardcode_libdir_flag_spec=' '
6787+ allow_undefined_flag=unsupported
6788+ always_export_symbols=yes
6789+ file_list_spec='@'
6790+ # Tell ltmain to make .lib files, not .a files.
6791+ libext=lib
6792+ # Tell ltmain to make .dll files, not .so files.
6793+ shrext_cmds=".dll"
6794+ # FIXME: Setting linknames here is a bad hack.
6795+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6796+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6797+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6798+ else
6799+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6800+ fi~
6801+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6802+ linknames='
6803+ # The linker will not automatically build a static lib if we build a DLL.
6804+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6805+ enable_shared_with_static_runtimes=yes
6806+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6807+ # Don't use ranlib
6808+ old_postinstall_cmds='chmod 644 $oldlib'
6809+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6810+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6811+ case $lt_outputfile in
6812+ *.exe|*.EXE) ;;
6813+ *)
6814+ lt_outputfile="$lt_outputfile.exe"
6815+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6816+ ;;
6817+ esac~
6818+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6819+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6820+ $RM "$lt_outputfile.manifest";
6821+ fi'
6822+ ;;
6823+ *)
6824+ # Assume MSVC wrapper
6825+ hardcode_libdir_flag_spec=' '
6826+ allow_undefined_flag=unsupported
6827+ # Tell ltmain to make .lib files, not .a files.
6828+ libext=lib
6829+ # Tell ltmain to make .dll files, not .so files.
6830+ shrext_cmds=".dll"
6831+ # FIXME: Setting linknames here is a bad hack.
6832+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6833+ # The linker will automatically build a .lib file if we build a DLL.
6834+ old_archive_from_new_cmds='true'
6835+ # FIXME: Should let the user specify the lib program.
6836+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6837+ enable_shared_with_static_runtimes=yes
6838+ ;;
6839+ esac
6840 ;;
6841
6842 darwin* | rhapsody*)
6843@@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6844
6845 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6846 freebsd* | dragonfly*)
6847- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6848+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6849 hardcode_libdir_flag_spec='-R$libdir'
6850 hardcode_direct=yes
6851 hardcode_shlibpath_var=no
6852@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6853
6854 hpux9*)
6855 if test "$GCC" = yes; then
6856- 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'
6857+ 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'
6858 else
6859 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'
6860 fi
6861@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6862
6863 hpux10*)
6864 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6865- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6866+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6867 else
6868 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6869 fi
6870@@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6871 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6872 ;;
6873 ia64*)
6874- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6875+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6876 ;;
6877 *)
6878- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6879+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6880 ;;
6881 esac
6882 else
6883@@ -9281,23 +9859,36 @@ fi
6884
6885 irix5* | irix6* | nonstopux*)
6886 if test "$GCC" = yes; then
6887- 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'
6888+ 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'
6889 # Try to use the -exported_symbol ld option, if it does not
6890 # work, assume that -exports_file does not work either and
6891 # implicitly export all symbols.
6892- save_LDFLAGS="$LDFLAGS"
6893- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6894- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6895+ # This should be the same for all languages, so no per-tag cache variable.
6896+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6897+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6898+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6899+ $as_echo_n "(cached) " >&6
6900+else
6901+ save_LDFLAGS="$LDFLAGS"
6902+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6903+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6904 /* end confdefs.h. */
6905-int foo(void) {}
6906+int foo (void) { return 0; }
6907 _ACEOF
6908 if ac_fn_c_try_link "$LINENO"; then :
6909- 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'
6910-
6911+ lt_cv_irix_exported_symbol=yes
6912+else
6913+ lt_cv_irix_exported_symbol=no
6914 fi
6915 rm -f core conftest.err conftest.$ac_objext \
6916 conftest$ac_exeext conftest.$ac_ext
6917- LDFLAGS="$save_LDFLAGS"
6918+ LDFLAGS="$save_LDFLAGS"
6919+fi
6920+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6921+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6922+ if test "$lt_cv_irix_exported_symbol" = yes; then
6923+ 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'
6924+ fi
6925 else
6926 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'
6927 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'
6928@@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \
6929 osf4* | osf5*) # as osf3* with the addition of -msym flag
6930 if test "$GCC" = yes; then
6931 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6932- 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'
6933+ 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'
6934 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6935 else
6936 allow_undefined_flag=' -expect_unresolved \*'
6937@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \
6938 no_undefined_flag=' -z defs'
6939 if test "$GCC" = yes; then
6940 wlarc='${wl}'
6941- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6942+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6943 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6944- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6945+ $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'
6946 else
6947 case `$CC -V 2>&1` in
6948 *"Compilers 5.0"*)
6949@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6950 need_version=no
6951 need_lib_prefix=no
6952
6953- case $GCC,$host_os in
6954- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6955+ case $GCC,$cc_basename in
6956+ yes,*)
6957+ # gcc
6958 library_names_spec='$libname.dll.a'
6959 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6960 postinstall_cmds='base_file=`basename \${file}`~
6961@@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6962 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6963 ;;
6964 esac
6965+ dynamic_linker='Win32 ld.exe'
6966+ ;;
6967+
6968+ *,cl*)
6969+ # Native MSVC
6970+ libname_spec='$name'
6971+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6972+ library_names_spec='${libname}.dll.lib'
6973+
6974+ case $build_os in
6975+ mingw*)
6976+ sys_lib_search_path_spec=
6977+ lt_save_ifs=$IFS
6978+ IFS=';'
6979+ for lt_path in $LIB
6980+ do
6981+ IFS=$lt_save_ifs
6982+ # Let DOS variable expansion print the short 8.3 style file name.
6983+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
6984+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
6985+ done
6986+ IFS=$lt_save_ifs
6987+ # Convert to MSYS style.
6988+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
6989+ ;;
6990+ cygwin*)
6991+ # Convert to unix form, then to dos form, then back to unix form
6992+ # but this time dos style (no spaces!) so that the unix form looks
6993+ # like /cygdrive/c/PROGRA~1:/cygdr...
6994+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
6995+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
6996+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
6997+ ;;
6998+ *)
6999+ sys_lib_search_path_spec="$LIB"
7000+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7001+ # It is most probably a Windows format PATH.
7002+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7003+ else
7004+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7005+ fi
7006+ # FIXME: find the short name or the path components, as spaces are
7007+ # common. (e.g. "Program Files" -> "PROGRA~1")
7008+ ;;
7009+ esac
7010+
7011+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7012+ postinstall_cmds='base_file=`basename \${file}`~
7013+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7014+ dldir=$destdir/`dirname \$dlpath`~
7015+ test -d \$dldir || mkdir -p \$dldir~
7016+ $install_prog $dir/$dlname \$dldir/$dlname'
7017+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7018+ dlpath=$dir/\$dldll~
7019+ $RM \$dlpath'
7020+ shlibpath_overrides_runpath=yes
7021+ dynamic_linker='Win32 link.exe'
7022 ;;
7023
7024 *)
7025+ # Assume MSVC wrapper
7026 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7027+ dynamic_linker='Win32 ld.exe'
7028 ;;
7029 esac
7030- dynamic_linker='Win32 ld.exe'
7031 # FIXME: first we should search . and the directory the executable is in
7032 shlibpath_var=PATH
7033 ;;
7034@@ -10111,7 +10761,7 @@ haiku*)
7035 soname_spec='${libname}${release}${shared_ext}$major'
7036 shlibpath_var=LIBRARY_PATH
7037 shlibpath_overrides_runpath=yes
7038- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7039+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7040 hardcode_into_libs=yes
7041 ;;
7042
7043@@ -10951,10 +11601,10 @@ else
7044 /* When -fvisbility=hidden is used, assume the code has been annotated
7045 correspondingly for the symbols needed. */
7046 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7047-void fnord () __attribute__((visibility("default")));
7048+int fnord () __attribute__((visibility("default")));
7049 #endif
7050
7051-void fnord () { int i=42; }
7052+int fnord () { return 42; }
7053 int main ()
7054 {
7055 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7056@@ -11057,10 +11707,10 @@ else
7057 /* When -fvisbility=hidden is used, assume the code has been annotated
7058 correspondingly for the symbols needed. */
7059 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7060-void fnord () __attribute__((visibility("default")));
7061+int fnord () __attribute__((visibility("default")));
7062 #endif
7063
7064-void fnord () { int i=42; }
7065+int fnord () { return 42; }
7066 int main ()
7067 {
7068 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7069@@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7070 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7071 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7072 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7073+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7074+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7075 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7076 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7077 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7078 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7079 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7080+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7081+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7082+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7083+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7084 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7085 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7086+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7087 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7088 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7089 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7090@@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7091 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7092 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7093 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"`'
7094+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7095+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7096 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7097 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7098 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7099-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7100 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7101+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7102 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7103 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7104 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7105+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7106 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7107 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7108 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7109@@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7110 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7111 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7112 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7113-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7114 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7115 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7116 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7117 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7118 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7119+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7120 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7121 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7122 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7123@@ -13126,8 +13786,13 @@ reload_flag \
7124 OBJDUMP \
7125 deplibs_check_method \
7126 file_magic_cmd \
7127+file_magic_glob \
7128+want_nocaseglob \
7129+DLLTOOL \
7130+sharedlib_from_linklib_cmd \
7131 AR \
7132 AR_FLAGS \
7133+archiver_list_spec \
7134 STRIP \
7135 RANLIB \
7136 CC \
7137@@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \
7138 lt_cv_sys_global_symbol_to_cdecl \
7139 lt_cv_sys_global_symbol_to_c_name_address \
7140 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7141+nm_file_list_spec \
7142 lt_prog_compiler_no_builtin_flag \
7143-lt_prog_compiler_wl \
7144 lt_prog_compiler_pic \
7145+lt_prog_compiler_wl \
7146 lt_prog_compiler_static \
7147 lt_cv_prog_compiler_c_o \
7148 need_locks \
7149+MANIFEST_TOOL \
7150 DSYMUTIL \
7151 NMEDIT \
7152 LIPO \
7153@@ -13158,7 +13825,6 @@ no_undefined_flag \
7154 hardcode_libdir_flag_spec \
7155 hardcode_libdir_flag_spec_ld \
7156 hardcode_libdir_separator \
7157-fix_srcfile_path \
7158 exclude_expsyms \
7159 include_expsyms \
7160 file_list_spec \
7161@@ -13194,6 +13860,7 @@ module_cmds \
7162 module_expsym_cmds \
7163 export_symbols_cmds \
7164 prelink_cmds \
7165+postlink_cmds \
7166 postinstall_cmds \
7167 postuninstall_cmds \
7168 finish_cmds \
7169@@ -13950,7 +14617,8 @@ $as_echo X"$file" |
7170 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7171 #
7172 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7173-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7174+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7175+# Inc.
7176 # Written by Gordon Matzigkeit, 1996
7177 #
7178 # This file is part of GNU Libtool.
7179@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL
7180 # turn newlines into spaces.
7181 NL2SP=$lt_lt_NL2SP
7182
7183+# convert \$build file names to \$host format.
7184+to_host_file_cmd=$lt_cv_to_host_file_cmd
7185+
7186+# convert \$build files to toolchain format.
7187+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7188+
7189 # An object symbol dumper.
7190 OBJDUMP=$lt_OBJDUMP
7191
7192 # Method to check whether dependent libraries are shared objects.
7193 deplibs_check_method=$lt_deplibs_check_method
7194
7195-# Command to use when deplibs_check_method == "file_magic".
7196+# Command to use when deplibs_check_method = "file_magic".
7197 file_magic_cmd=$lt_file_magic_cmd
7198
7199+# How to find potential files when deplibs_check_method = "file_magic".
7200+file_magic_glob=$lt_file_magic_glob
7201+
7202+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7203+want_nocaseglob=$lt_want_nocaseglob
7204+
7205+# DLL creation program.
7206+DLLTOOL=$lt_DLLTOOL
7207+
7208+# Command to associate shared and link libraries.
7209+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7210+
7211 # The archiver.
7212 AR=$lt_AR
7213+
7214+# Flags to create an archive.
7215 AR_FLAGS=$lt_AR_FLAGS
7216
7217+# How to feed a file listing to the archiver.
7218+archiver_list_spec=$lt_archiver_list_spec
7219+
7220 # A symbol stripping program.
7221 STRIP=$lt_STRIP
7222
7223@@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7224 # Transform the output of nm in a C name address pair when lib prefix is needed.
7225 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7226
7227+# Specify filename containing input files for \$NM.
7228+nm_file_list_spec=$lt_nm_file_list_spec
7229+
7230+# The root where to search for dependent libraries,and in which our libraries should be installed.
7231+lt_sysroot=$lt_sysroot
7232+
7233 # The name of the directory that contains temporary libtool files.
7234 objdir=$objdir
7235
7236@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD
7237 # Must we lock files when doing compilation?
7238 need_locks=$lt_need_locks
7239
7240+# Manifest tool.
7241+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7242+
7243 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7244 DSYMUTIL=$lt_DSYMUTIL
7245
7246@@ -14218,12 +14918,12 @@ with_gcc=$GCC
7247 # Compiler flag to turn off builtin functions.
7248 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7249
7250-# How to pass a linker flag through the compiler.
7251-wl=$lt_lt_prog_compiler_wl
7252-
7253 # Additional compiler flags for building library objects.
7254 pic_flag=$lt_lt_prog_compiler_pic
7255
7256+# How to pass a linker flag through the compiler.
7257+wl=$lt_lt_prog_compiler_wl
7258+
7259 # Compiler flag to prevent dynamic linking.
7260 link_static_flag=$lt_lt_prog_compiler_static
7261
7262@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath
7263 # Whether libtool must link a program against all its dependency libraries.
7264 link_all_deplibs=$link_all_deplibs
7265
7266-# Fix the shell variable \$srcfile for the compiler.
7267-fix_srcfile_path=$lt_fix_srcfile_path
7268-
7269 # Set to "yes" if exported symbols are required.
7270 always_export_symbols=$always_export_symbols
7271
7272@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms
7273 # Commands necessary for linking programs (against libraries) with templates.
7274 prelink_cmds=$lt_prelink_cmds
7275
7276+# Commands necessary for finishing linking programs.
7277+postlink_cmds=$lt_postlink_cmds
7278+
7279 # Specify filename containing input files.
7280 file_list_spec=$lt_file_list_spec
7281
7282@@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7283 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7284 # text mode, it properly converts lines to CR/LF. This bash problem
7285 # is reportedly fixed, but why not run on old versions too?
7286- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7287- || (rm -f "$cfgfile"; exit 1)
7288-
7289- case $xsi_shell in
7290- yes)
7291- cat << \_LT_EOF >> "$cfgfile"
7292-
7293-# func_dirname file append nondir_replacement
7294-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7295-# otherwise set result to NONDIR_REPLACEMENT.
7296-func_dirname ()
7297-{
7298- case ${1} in
7299- */*) func_dirname_result="${1%/*}${2}" ;;
7300- * ) func_dirname_result="${3}" ;;
7301- esac
7302-}
7303-
7304-# func_basename file
7305-func_basename ()
7306-{
7307- func_basename_result="${1##*/}"
7308-}
7309-
7310-# func_dirname_and_basename file append nondir_replacement
7311-# perform func_basename and func_dirname in a single function
7312-# call:
7313-# dirname: Compute the dirname of FILE. If nonempty,
7314-# add APPEND to the result, otherwise set result
7315-# to NONDIR_REPLACEMENT.
7316-# value returned in "$func_dirname_result"
7317-# basename: Compute filename of FILE.
7318-# value retuned in "$func_basename_result"
7319-# Implementation must be kept synchronized with func_dirname
7320-# and func_basename. For efficiency, we do not delegate to
7321-# those functions but instead duplicate the functionality here.
7322-func_dirname_and_basename ()
7323-{
7324- case ${1} in
7325- */*) func_dirname_result="${1%/*}${2}" ;;
7326- * ) func_dirname_result="${3}" ;;
7327- esac
7328- func_basename_result="${1##*/}"
7329-}
7330-
7331-# func_stripname prefix suffix name
7332-# strip PREFIX and SUFFIX off of NAME.
7333-# PREFIX and SUFFIX must not contain globbing or regex special
7334-# characters, hashes, percent signs, but SUFFIX may contain a leading
7335-# dot (in which case that matches only a dot).
7336-func_stripname ()
7337-{
7338- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7339- # positional parameters, so assign one to ordinary parameter first.
7340- func_stripname_result=${3}
7341- func_stripname_result=${func_stripname_result#"${1}"}
7342- func_stripname_result=${func_stripname_result%"${2}"}
7343-}
7344-
7345-# func_opt_split
7346-func_opt_split ()
7347-{
7348- func_opt_split_opt=${1%%=*}
7349- func_opt_split_arg=${1#*=}
7350-}
7351-
7352-# func_lo2o object
7353-func_lo2o ()
7354-{
7355- case ${1} in
7356- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7357- *) func_lo2o_result=${1} ;;
7358- esac
7359-}
7360-
7361-# func_xform libobj-or-source
7362-func_xform ()
7363-{
7364- func_xform_result=${1%.*}.lo
7365-}
7366-
7367-# func_arith arithmetic-term...
7368-func_arith ()
7369-{
7370- func_arith_result=$(( $* ))
7371-}
7372-
7373-# func_len string
7374-# STRING may not start with a hyphen.
7375-func_len ()
7376-{
7377- func_len_result=${#1}
7378-}
7379-
7380-_LT_EOF
7381- ;;
7382- *) # Bourne compatible functions.
7383- cat << \_LT_EOF >> "$cfgfile"
7384-
7385-# func_dirname file append nondir_replacement
7386-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7387-# otherwise set result to NONDIR_REPLACEMENT.
7388-func_dirname ()
7389-{
7390- # Extract subdirectory from the argument.
7391- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7392- if test "X$func_dirname_result" = "X${1}"; then
7393- func_dirname_result="${3}"
7394- else
7395- func_dirname_result="$func_dirname_result${2}"
7396- fi
7397-}
7398-
7399-# func_basename file
7400-func_basename ()
7401-{
7402- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7403-}
7404-
7405-
7406-# func_stripname prefix suffix name
7407-# strip PREFIX and SUFFIX off of NAME.
7408-# PREFIX and SUFFIX must not contain globbing or regex special
7409-# characters, hashes, percent signs, but SUFFIX may contain a leading
7410-# dot (in which case that matches only a dot).
7411-# func_strip_suffix prefix name
7412-func_stripname ()
7413-{
7414- case ${2} in
7415- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7416- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7417- esac
7418-}
7419-
7420-# sed scripts:
7421-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7422-my_sed_long_arg='1s/^-[^=]*=//'
7423-
7424-# func_opt_split
7425-func_opt_split ()
7426-{
7427- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7428- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7429-}
7430-
7431-# func_lo2o object
7432-func_lo2o ()
7433-{
7434- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7435-}
7436-
7437-# func_xform libobj-or-source
7438-func_xform ()
7439-{
7440- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7441-}
7442-
7443-# func_arith arithmetic-term...
7444-func_arith ()
7445-{
7446- func_arith_result=`expr "$@"`
7447-}
7448-
7449-# func_len string
7450-# STRING may not start with a hyphen.
7451-func_len ()
7452-{
7453- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7454-}
7455-
7456-_LT_EOF
7457-esac
7458-
7459-case $lt_shell_append in
7460- yes)
7461- cat << \_LT_EOF >> "$cfgfile"
7462-
7463-# func_append var value
7464-# Append VALUE to the end of shell variable VAR.
7465-func_append ()
7466-{
7467- eval "$1+=\$2"
7468-}
7469-_LT_EOF
7470- ;;
7471- *)
7472- cat << \_LT_EOF >> "$cfgfile"
7473-
7474-# func_append var value
7475-# Append VALUE to the end of shell variable VAR.
7476-func_append ()
7477-{
7478- eval "$1=\$$1\$2"
7479-}
7480-
7481-_LT_EOF
7482- ;;
7483- esac
7484-
7485-
7486- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7487- || (rm -f "$cfgfile"; exit 1)
7488-
7489- mv -f "$cfgfile" "$ofile" ||
7490+ sed '$q' "$ltmain" >> "$cfgfile" \
7491+ || (rm -f "$cfgfile"; exit 1)
7492+
7493+ if test x"$xsi_shell" = xyes; then
7494+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7495+func_dirname ()\
7496+{\
7497+\ case ${1} in\
7498+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7499+\ * ) func_dirname_result="${3}" ;;\
7500+\ esac\
7501+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7502+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7503+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7504+test 0 -eq $? || _lt_function_replace_fail=:
7505+
7506+
7507+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7508+func_basename ()\
7509+{\
7510+\ func_basename_result="${1##*/}"\
7511+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7512+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7513+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7514+test 0 -eq $? || _lt_function_replace_fail=:
7515+
7516+
7517+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7518+func_dirname_and_basename ()\
7519+{\
7520+\ case ${1} in\
7521+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7522+\ * ) func_dirname_result="${3}" ;;\
7523+\ esac\
7524+\ func_basename_result="${1##*/}"\
7525+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7526+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7527+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7528+test 0 -eq $? || _lt_function_replace_fail=:
7529+
7530+
7531+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7532+func_stripname ()\
7533+{\
7534+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7535+\ # positional parameters, so assign one to ordinary parameter first.\
7536+\ func_stripname_result=${3}\
7537+\ func_stripname_result=${func_stripname_result#"${1}"}\
7538+\ func_stripname_result=${func_stripname_result%"${2}"}\
7539+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7540+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7541+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7542+test 0 -eq $? || _lt_function_replace_fail=:
7543+
7544+
7545+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7546+func_split_long_opt ()\
7547+{\
7548+\ func_split_long_opt_name=${1%%=*}\
7549+\ func_split_long_opt_arg=${1#*=}\
7550+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7551+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7552+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7553+test 0 -eq $? || _lt_function_replace_fail=:
7554+
7555+
7556+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7557+func_split_short_opt ()\
7558+{\
7559+\ func_split_short_opt_arg=${1#??}\
7560+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7561+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7562+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7563+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7564+test 0 -eq $? || _lt_function_replace_fail=:
7565+
7566+
7567+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7568+func_lo2o ()\
7569+{\
7570+\ case ${1} in\
7571+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7572+\ *) func_lo2o_result=${1} ;;\
7573+\ esac\
7574+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7575+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7576+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7577+test 0 -eq $? || _lt_function_replace_fail=:
7578+
7579+
7580+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7581+func_xform ()\
7582+{\
7583+ func_xform_result=${1%.*}.lo\
7584+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7585+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7586+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7587+test 0 -eq $? || _lt_function_replace_fail=:
7588+
7589+
7590+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7591+func_arith ()\
7592+{\
7593+ func_arith_result=$(( $* ))\
7594+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7595+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7596+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7597+test 0 -eq $? || _lt_function_replace_fail=:
7598+
7599+
7600+ sed -e '/^func_len ()$/,/^} # func_len /c\
7601+func_len ()\
7602+{\
7603+ func_len_result=${#1}\
7604+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7605+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7606+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7607+test 0 -eq $? || _lt_function_replace_fail=:
7608+
7609+fi
7610+
7611+if test x"$lt_shell_append" = xyes; then
7612+ sed -e '/^func_append ()$/,/^} # func_append /c\
7613+func_append ()\
7614+{\
7615+ eval "${1}+=\\${2}"\
7616+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7617+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7618+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7619+test 0 -eq $? || _lt_function_replace_fail=:
7620+
7621+
7622+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7623+func_append_quoted ()\
7624+{\
7625+\ func_quote_for_eval "${2}"\
7626+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7627+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7628+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7629+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7630+test 0 -eq $? || _lt_function_replace_fail=:
7631+
7632+
7633+ # Save a `func_append' function call where possible by direct use of '+='
7634+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7635+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7636+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7637+ test 0 -eq $? || _lt_function_replace_fail=:
7638+else
7639+ # Save a `func_append' function call even when '+=' is not available
7640+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7641+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7642+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7643+ test 0 -eq $? || _lt_function_replace_fail=:
7644+fi
7645+
7646+if test x"$_lt_function_replace_fail" = x":"; then
7647+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7648+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7649+fi
7650+
7651+
7652+ mv -f "$cfgfile" "$ofile" ||
7653 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7654 chmod +x "$ofile"
7655
7656diff --git a/ld/configure b/ld/configure
7657index d7f66f8cdc..4e71511bd1 100755
7658--- a/ld/configure
7659+++ b/ld/configure
7660@@ -655,8 +655,11 @@ OTOOL
7661 LIPO
7662 NMEDIT
7663 DSYMUTIL
7664+MANIFEST_TOOL
7665 RANLIB
7666+ac_ct_AR
7667 AR
7668+DLLTOOL
7669 OBJDUMP
7670 LN_S
7671 NM
7672@@ -778,6 +781,7 @@ enable_static
7673 with_pic
7674 enable_fast_install
7675 with_gnu_ld
7676+with_libtool_sysroot
7677 enable_libtool_lock
7678 enable_plugins
7679 enable_largefile
7680@@ -1464,6 +1468,8 @@ Optional Packages:
7681 --with-pic try to use only PIC/non-PIC objects [default=use
7682 both]
7683 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7684+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7685+ (or the compiler's sysroot if not specified).
7686 --with-lib-path=dir1:dir2... set default LIB_PATH
7687 --with-sysroot=DIR Search for usr/lib et al within DIR.
7688
7689@@ -5658,8 +5664,8 @@ esac
7690
7691
7692
7693-macro_version='2.2.7a'
7694-macro_revision='1.3134'
7695+macro_version='2.4'
7696+macro_revision='1.3293'
7697
7698
7699
7700@@ -5699,7 +5705,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7702 $as_echo_n "checking how to print strings... " >&6; }
7703 # Test print first, because it will be a builtin if present.
7704-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7705+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7706 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7707 ECHO='print -r --'
7708 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7709@@ -6385,8 +6391,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7710 # Try some XSI features
7711 xsi_shell=no
7712 ( _lt_dummy="a/b/c"
7713- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7714- = c,a/b,, \
7715+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7716+ = c,a/b,b/c, \
7717 && eval 'test $(( 1 + 1 )) -eq 2 \
7718 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7719 && xsi_shell=yes
7720@@ -6435,6 +6441,80 @@ esac
7721
7722
7723
7724+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7725+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7726+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7727+ $as_echo_n "(cached) " >&6
7728+else
7729+ case $host in
7730+ *-*-mingw* )
7731+ case $build in
7732+ *-*-mingw* ) # actually msys
7733+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7734+ ;;
7735+ *-*-cygwin* )
7736+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7737+ ;;
7738+ * ) # otherwise, assume *nix
7739+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7740+ ;;
7741+ esac
7742+ ;;
7743+ *-*-cygwin* )
7744+ case $build in
7745+ *-*-mingw* ) # actually msys
7746+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7747+ ;;
7748+ *-*-cygwin* )
7749+ lt_cv_to_host_file_cmd=func_convert_file_noop
7750+ ;;
7751+ * ) # otherwise, assume *nix
7752+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7753+ ;;
7754+ esac
7755+ ;;
7756+ * ) # unhandled hosts (and "normal" native builds)
7757+ lt_cv_to_host_file_cmd=func_convert_file_noop
7758+ ;;
7759+esac
7760+
7761+fi
7762+
7763+to_host_file_cmd=$lt_cv_to_host_file_cmd
7764+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7765+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7766+
7767+
7768+
7769+
7770+
7771+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7772+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7773+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7774+ $as_echo_n "(cached) " >&6
7775+else
7776+ #assume ordinary cross tools, or native build.
7777+lt_cv_to_tool_file_cmd=func_convert_file_noop
7778+case $host in
7779+ *-*-mingw* )
7780+ case $build in
7781+ *-*-mingw* ) # actually msys
7782+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7783+ ;;
7784+ esac
7785+ ;;
7786+esac
7787+
7788+fi
7789+
7790+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7791+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7792+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7793+
7794+
7795+
7796+
7797+
7798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7799 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7800 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7801@@ -6451,6 +6531,11 @@ case $reload_flag in
7802 esac
7803 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7804 case $host_os in
7805+ cygwin* | mingw* | pw32* | cegcc*)
7806+ if test "$GCC" != yes; then
7807+ reload_cmds=false
7808+ fi
7809+ ;;
7810 darwin*)
7811 if test "$GCC" = yes; then
7812 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7813@@ -6619,7 +6704,8 @@ mingw* | pw32*)
7814 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7815 lt_cv_file_magic_cmd='func_win32_libid'
7816 else
7817- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7818+ # Keep this pattern in sync with the one in func_win32_libid.
7819+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7820 lt_cv_file_magic_cmd='$OBJDUMP -f'
7821 fi
7822 ;;
7823@@ -6773,6 +6859,21 @@ esac
7824 fi
7825 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7826 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7827+
7828+file_magic_glob=
7829+want_nocaseglob=no
7830+if test "$build" = "$host"; then
7831+ case $host_os in
7832+ mingw* | pw32*)
7833+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7834+ want_nocaseglob=yes
7835+ else
7836+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7837+ fi
7838+ ;;
7839+ esac
7840+fi
7841+
7842 file_magic_cmd=$lt_cv_file_magic_cmd
7843 deplibs_check_method=$lt_cv_deplibs_check_method
7844 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7845@@ -6788,9 +6889,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7846
7847
7848
7849+
7850+
7851+
7852+
7853+
7854+
7855+
7856+
7857+
7858+
7859+if test -n "$ac_tool_prefix"; then
7860+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7861+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7862+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7863+$as_echo_n "checking for $ac_word... " >&6; }
7864+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7865+ $as_echo_n "(cached) " >&6
7866+else
7867+ if test -n "$DLLTOOL"; then
7868+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7869+else
7870+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7871+for as_dir in $PATH
7872+do
7873+ IFS=$as_save_IFS
7874+ test -z "$as_dir" && as_dir=.
7875+ for ac_exec_ext in '' $ac_executable_extensions; do
7876+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7877+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7878+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7879+ break 2
7880+ fi
7881+done
7882+ done
7883+IFS=$as_save_IFS
7884+
7885+fi
7886+fi
7887+DLLTOOL=$ac_cv_prog_DLLTOOL
7888+if test -n "$DLLTOOL"; then
7889+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7890+$as_echo "$DLLTOOL" >&6; }
7891+else
7892+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7893+$as_echo "no" >&6; }
7894+fi
7895+
7896+
7897+fi
7898+if test -z "$ac_cv_prog_DLLTOOL"; then
7899+ ac_ct_DLLTOOL=$DLLTOOL
7900+ # Extract the first word of "dlltool", so it can be a program name with args.
7901+set dummy dlltool; ac_word=$2
7902+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7903+$as_echo_n "checking for $ac_word... " >&6; }
7904+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7905+ $as_echo_n "(cached) " >&6
7906+else
7907+ if test -n "$ac_ct_DLLTOOL"; then
7908+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7909+else
7910+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7911+for as_dir in $PATH
7912+do
7913+ IFS=$as_save_IFS
7914+ test -z "$as_dir" && as_dir=.
7915+ for ac_exec_ext in '' $ac_executable_extensions; do
7916+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7917+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7918+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7919+ break 2
7920+ fi
7921+done
7922+ done
7923+IFS=$as_save_IFS
7924+
7925+fi
7926+fi
7927+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7928+if test -n "$ac_ct_DLLTOOL"; then
7929+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7930+$as_echo "$ac_ct_DLLTOOL" >&6; }
7931+else
7932+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7933+$as_echo "no" >&6; }
7934+fi
7935+
7936+ if test "x$ac_ct_DLLTOOL" = x; then
7937+ DLLTOOL="false"
7938+ else
7939+ case $cross_compiling:$ac_tool_warned in
7940+yes:)
7941+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7942+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7943+ac_tool_warned=yes ;;
7944+esac
7945+ DLLTOOL=$ac_ct_DLLTOOL
7946+ fi
7947+else
7948+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7949+fi
7950+
7951+test -z "$DLLTOOL" && DLLTOOL=dlltool
7952+
7953+
7954+
7955+
7956+
7957+
7958+
7959+
7960+
7961+
7962+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7963+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7964+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7965+ $as_echo_n "(cached) " >&6
7966+else
7967+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7968+
7969+case $host_os in
7970+cygwin* | mingw* | pw32* | cegcc*)
7971+ # two different shell functions defined in ltmain.sh
7972+ # decide which to use based on capabilities of $DLLTOOL
7973+ case `$DLLTOOL --help 2>&1` in
7974+ *--identify-strict*)
7975+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7976+ ;;
7977+ *)
7978+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7979+ ;;
7980+ esac
7981+ ;;
7982+*)
7983+ # fallback: assume linklib IS sharedlib
7984+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7985+ ;;
7986+esac
7987+
7988+fi
7989+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7990+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7991+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7992+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7993+
7994+
7995+
7996+
7997+
7998+
7999+
8000 if test -n "$ac_tool_prefix"; then
8001- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8002-set dummy ${ac_tool_prefix}ar; ac_word=$2
8003+ for ac_prog in ar
8004+ do
8005+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8006+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8008 $as_echo_n "checking for $ac_word... " >&6; }
8009 if test "${ac_cv_prog_AR+set}" = set; then :
8010@@ -6806,7 +7060,7 @@ do
8011 test -z "$as_dir" && as_dir=.
8012 for ac_exec_ext in '' $ac_executable_extensions; do
8013 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8014- ac_cv_prog_AR="${ac_tool_prefix}ar"
8015+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8016 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8017 break 2
8018 fi
8019@@ -6826,11 +7080,15 @@ $as_echo "no" >&6; }
8020 fi
8021
8022
8023+ test -n "$AR" && break
8024+ done
8025 fi
8026-if test -z "$ac_cv_prog_AR"; then
8027+if test -z "$AR"; then
8028 ac_ct_AR=$AR
8029- # Extract the first word of "ar", so it can be a program name with args.
8030-set dummy ar; ac_word=$2
8031+ for ac_prog in ar
8032+do
8033+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8034+set dummy $ac_prog; ac_word=$2
8035 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8036 $as_echo_n "checking for $ac_word... " >&6; }
8037 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8038@@ -6846,7 +7104,7 @@ do
8039 test -z "$as_dir" && as_dir=.
8040 for ac_exec_ext in '' $ac_executable_extensions; do
8041 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8042- ac_cv_prog_ac_ct_AR="ar"
8043+ ac_cv_prog_ac_ct_AR="$ac_prog"
8044 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8045 break 2
8046 fi
8047@@ -6865,6 +7123,10 @@ else
8048 $as_echo "no" >&6; }
8049 fi
8050
8051+
8052+ test -n "$ac_ct_AR" && break
8053+done
8054+
8055 if test "x$ac_ct_AR" = x; then
8056 AR="false"
8057 else
8058@@ -6876,12 +7138,12 @@ ac_tool_warned=yes ;;
8059 esac
8060 AR=$ac_ct_AR
8061 fi
8062-else
8063- AR="$ac_cv_prog_AR"
8064 fi
8065
8066-test -z "$AR" && AR=ar
8067-test -z "$AR_FLAGS" && AR_FLAGS=cru
8068+: ${AR=ar}
8069+: ${AR_FLAGS=cru}
8070+
8071+
8072
8073
8074
8075@@ -6891,6 +7153,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8076
8077
8078
8079+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8080+$as_echo_n "checking for archiver @FILE support... " >&6; }
8081+if test "${lt_cv_ar_at_file+set}" = set; then :
8082+ $as_echo_n "(cached) " >&6
8083+else
8084+ lt_cv_ar_at_file=no
8085+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8086+/* end confdefs.h. */
8087+
8088+int
8089+main ()
8090+{
8091+
8092+ ;
8093+ return 0;
8094+}
8095+_ACEOF
8096+if ac_fn_c_try_compile "$LINENO"; then :
8097+ echo conftest.$ac_objext > conftest.lst
8098+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8099+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8100+ (eval $lt_ar_try) 2>&5
8101+ ac_status=$?
8102+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8103+ test $ac_status = 0; }
8104+ if test "$ac_status" -eq 0; then
8105+ # Ensure the archiver fails upon bogus file names.
8106+ rm -f conftest.$ac_objext libconftest.a
8107+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8108+ (eval $lt_ar_try) 2>&5
8109+ ac_status=$?
8110+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8111+ test $ac_status = 0; }
8112+ if test "$ac_status" -ne 0; then
8113+ lt_cv_ar_at_file=@
8114+ fi
8115+ fi
8116+ rm -f conftest.* libconftest.a
8117+
8118+fi
8119+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8120+
8121+fi
8122+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8123+$as_echo "$lt_cv_ar_at_file" >&6; }
8124+
8125+if test "x$lt_cv_ar_at_file" = xno; then
8126+ archiver_list_spec=
8127+else
8128+ archiver_list_spec=$lt_cv_ar_at_file
8129+fi
8130+
8131+
8132+
8133+
8134+
8135
8136
8137 if test -n "$ac_tool_prefix"; then
8138@@ -7227,8 +7545,8 @@ esac
8139 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8140
8141 # Transform an extracted symbol line into symbol name and symbol address
8142-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8143-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'"
8144+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8145+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'"
8146
8147 # Handle CRLF in mingw tool chain
8148 opt_cr=
8149@@ -7264,6 +7582,7 @@ for ac_symprfx in "" "_"; do
8150 else
8151 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8152 fi
8153+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8154
8155 # Check to see that the pipe works correctly.
8156 pipe_works=no
8157@@ -7305,6 +7624,18 @@ _LT_EOF
8158 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8159 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8160 cat <<_LT_EOF > conftest.$ac_ext
8161+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8162+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8163+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8164+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8165+# define LT_DLSYM_CONST
8166+#elif defined(__osf__)
8167+/* This system does not cope well with relocations in const data. */
8168+# define LT_DLSYM_CONST
8169+#else
8170+# define LT_DLSYM_CONST const
8171+#endif
8172+
8173 #ifdef __cplusplus
8174 extern "C" {
8175 #endif
8176@@ -7316,7 +7647,7 @@ _LT_EOF
8177 cat <<_LT_EOF >> conftest.$ac_ext
8178
8179 /* The mapping between symbol names and symbols. */
8180-const struct {
8181+LT_DLSYM_CONST struct {
8182 const char *name;
8183 void *address;
8184 }
8185@@ -7342,8 +7673,8 @@ static const void *lt_preloaded_setup() {
8186 _LT_EOF
8187 # Now try linking the two files.
8188 mv conftest.$ac_objext conftstm.$ac_objext
8189- lt_save_LIBS="$LIBS"
8190- lt_save_CFLAGS="$CFLAGS"
8191+ lt_globsym_save_LIBS=$LIBS
8192+ lt_globsym_save_CFLAGS=$CFLAGS
8193 LIBS="conftstm.$ac_objext"
8194 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8195 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8196@@ -7353,8 +7684,8 @@ _LT_EOF
8197 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8198 pipe_works=yes
8199 fi
8200- LIBS="$lt_save_LIBS"
8201- CFLAGS="$lt_save_CFLAGS"
8202+ LIBS=$lt_globsym_save_LIBS
8203+ CFLAGS=$lt_globsym_save_CFLAGS
8204 else
8205 echo "cannot find nm_test_func in $nlist" >&5
8206 fi
8207@@ -7391,6 +7722,19 @@ else
8208 $as_echo "ok" >&6; }
8209 fi
8210
8211+# Response file support.
8212+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8213+ nm_file_list_spec='@'
8214+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8215+ nm_file_list_spec='@'
8216+fi
8217+
8218+
8219+
8220+
8221+
8222+
8223+
8224
8225
8226
8227@@ -7404,6 +7748,42 @@ fi
8228
8229
8230
8231+
8232+
8233+
8234+
8235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8236+$as_echo_n "checking for sysroot... " >&6; }
8237+
8238+# Check whether --with-libtool-sysroot was given.
8239+if test "${with_libtool_sysroot+set}" = set; then :
8240+ withval=$with_libtool_sysroot;
8241+else
8242+ with_libtool_sysroot=no
8243+fi
8244+
8245+
8246+lt_sysroot=
8247+case ${with_libtool_sysroot} in #(
8248+ yes)
8249+ if test "$GCC" = yes; then
8250+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8251+ fi
8252+ ;; #(
8253+ /*)
8254+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8255+ ;; #(
8256+ no|'')
8257+ ;; #(
8258+ *)
8259+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8260+$as_echo "${with_libtool_sysroot}" >&6; }
8261+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
8262+ ;;
8263+esac
8264+
8265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8266+$as_echo "${lt_sysroot:-no}" >&6; }
8267
8268
8269
8270@@ -7618,6 +7998,123 @@ esac
8271
8272 need_locks="$enable_libtool_lock"
8273
8274+if test -n "$ac_tool_prefix"; then
8275+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8276+set dummy ${ac_tool_prefix}mt; ac_word=$2
8277+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8278+$as_echo_n "checking for $ac_word... " >&6; }
8279+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
8280+ $as_echo_n "(cached) " >&6
8281+else
8282+ if test -n "$MANIFEST_TOOL"; then
8283+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8284+else
8285+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8286+for as_dir in $PATH
8287+do
8288+ IFS=$as_save_IFS
8289+ test -z "$as_dir" && as_dir=.
8290+ for ac_exec_ext in '' $ac_executable_extensions; do
8291+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8292+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8293+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8294+ break 2
8295+ fi
8296+done
8297+ done
8298+IFS=$as_save_IFS
8299+
8300+fi
8301+fi
8302+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8303+if test -n "$MANIFEST_TOOL"; then
8304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8305+$as_echo "$MANIFEST_TOOL" >&6; }
8306+else
8307+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8308+$as_echo "no" >&6; }
8309+fi
8310+
8311+
8312+fi
8313+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8314+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8315+ # Extract the first word of "mt", so it can be a program name with args.
8316+set dummy mt; ac_word=$2
8317+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8318+$as_echo_n "checking for $ac_word... " >&6; }
8319+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
8320+ $as_echo_n "(cached) " >&6
8321+else
8322+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8323+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8324+else
8325+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8326+for as_dir in $PATH
8327+do
8328+ IFS=$as_save_IFS
8329+ test -z "$as_dir" && as_dir=.
8330+ for ac_exec_ext in '' $ac_executable_extensions; do
8331+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8332+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8333+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8334+ break 2
8335+ fi
8336+done
8337+ done
8338+IFS=$as_save_IFS
8339+
8340+fi
8341+fi
8342+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8343+if test -n "$ac_ct_MANIFEST_TOOL"; then
8344+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8345+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8346+else
8347+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8348+$as_echo "no" >&6; }
8349+fi
8350+
8351+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8352+ MANIFEST_TOOL=":"
8353+ else
8354+ case $cross_compiling:$ac_tool_warned in
8355+yes:)
8356+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8357+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8358+ac_tool_warned=yes ;;
8359+esac
8360+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8361+ fi
8362+else
8363+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8364+fi
8365+
8366+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8367+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8368+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8369+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
8370+ $as_echo_n "(cached) " >&6
8371+else
8372+ lt_cv_path_mainfest_tool=no
8373+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8374+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8375+ cat conftest.err >&5
8376+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8377+ lt_cv_path_mainfest_tool=yes
8378+ fi
8379+ rm -f conftest*
8380+fi
8381+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8382+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8383+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8384+ MANIFEST_TOOL=:
8385+fi
8386+
8387+
8388+
8389+
8390+
8391
8392 case $host_os in
8393 rhapsody* | darwin*)
8394@@ -8181,6 +8678,8 @@ _LT_EOF
8395 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8396 echo "$AR cru libconftest.a conftest.o" >&5
8397 $AR cru libconftest.a conftest.o 2>&5
8398+ echo "$RANLIB libconftest.a" >&5
8399+ $RANLIB libconftest.a 2>&5
8400 cat > conftest.c << _LT_EOF
8401 int main() { return 0;}
8402 _LT_EOF
8403@@ -8249,6 +8748,16 @@ done
8404
8405
8406
8407+func_stripname_cnf ()
8408+{
8409+ case ${2} in
8410+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8411+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8412+ esac
8413+} # func_stripname_cnf
8414+
8415+
8416+
8417
8418
8419 # Set options
8420@@ -8377,7 +8886,8 @@ fi
8421 LIBTOOL_DEPS="$ltmain"
8422
8423 # Always use our own libtool.
8424-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8425+LIBTOOL='$(SHELL) $(top_builddir)'
8426+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8427
8428
8429
8430@@ -8466,7 +8976,7 @@ aix3*)
8431 esac
8432
8433 # Global variables:
8434-ofile=libtool
8435+ofile=${host_alias}-libtool
8436 can_build_shared=yes
8437
8438 # All known linkers require a `.a' archive for static linking (except MSVC,
8439@@ -8764,8 +9274,6 @@ fi
8440 lt_prog_compiler_pic=
8441 lt_prog_compiler_static=
8442
8443-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8444-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8445
8446 if test "$GCC" = yes; then
8447 lt_prog_compiler_wl='-Wl,'
8448@@ -8931,6 +9439,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8449 lt_prog_compiler_pic='--shared'
8450 lt_prog_compiler_static='--static'
8451 ;;
8452+ nagfor*)
8453+ # NAG Fortran compiler
8454+ lt_prog_compiler_wl='-Wl,-Wl,,'
8455+ lt_prog_compiler_pic='-PIC'
8456+ lt_prog_compiler_static='-Bstatic'
8457+ ;;
8458 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8459 # Portland Group compilers (*not* the Pentium gcc compiler,
8460 # which looks to be a dead project)
8461@@ -8993,7 +9507,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8462 lt_prog_compiler_pic='-KPIC'
8463 lt_prog_compiler_static='-Bstatic'
8464 case $cc_basename in
8465- f77* | f90* | f95*)
8466+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8467 lt_prog_compiler_wl='-Qoption ld ';;
8468 *)
8469 lt_prog_compiler_wl='-Wl,';;
8470@@ -9050,13 +9564,17 @@ case $host_os in
8471 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8472 ;;
8473 esac
8474-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8475-$as_echo "$lt_prog_compiler_pic" >&6; }
8476-
8477-
8478-
8479-
8480
8481+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8482+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8483+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
8484+ $as_echo_n "(cached) " >&6
8485+else
8486+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8487+fi
8488+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8489+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8490+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8491
8492 #
8493 # Check to make sure the PIC flag actually works.
8494@@ -9117,6 +9635,11 @@ fi
8495
8496
8497
8498+
8499+
8500+
8501+
8502+
8503 #
8504 # Check to make sure the static flag actually works.
8505 #
8506@@ -9467,7 +9990,8 @@ _LT_EOF
8507 allow_undefined_flag=unsupported
8508 always_export_symbols=no
8509 enable_shared_with_static_runtimes=yes
8510- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8511+ 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'
8512+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8513
8514 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8515 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8516@@ -9566,12 +10090,12 @@ _LT_EOF
8517 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8518 hardcode_libdir_flag_spec=
8519 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8520- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8521+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8522 if test "x$supports_anon_versioning" = xyes; then
8523 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8524 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8525 echo "local: *; };" >> $output_objdir/$libname.ver~
8526- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8527+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8528 fi
8529 ;;
8530 esac
8531@@ -9585,8 +10109,8 @@ _LT_EOF
8532 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8533 wlarc=
8534 else
8535- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8536- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8537+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8538+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8539 fi
8540 ;;
8541
8542@@ -9604,8 +10128,8 @@ _LT_EOF
8543
8544 _LT_EOF
8545 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8546- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8547- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8548+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8549+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8550 else
8551 ld_shlibs=no
8552 fi
8553@@ -9651,8 +10175,8 @@ _LT_EOF
8554
8555 *)
8556 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8557- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8558- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8559+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8560+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8561 else
8562 ld_shlibs=no
8563 fi
8564@@ -9782,7 +10306,13 @@ _LT_EOF
8565 allow_undefined_flag='-berok'
8566 # Determine the default libpath from the value encoded in an
8567 # empty executable.
8568- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8569+ if test "${lt_cv_aix_libpath+set}" = set; then
8570+ aix_libpath=$lt_cv_aix_libpath
8571+else
8572+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8573+ $as_echo_n "(cached) " >&6
8574+else
8575+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8576 /* end confdefs.h. */
8577
8578 int
8579@@ -9795,22 +10325,29 @@ main ()
8580 _ACEOF
8581 if ac_fn_c_try_link "$LINENO"; then :
8582
8583-lt_aix_libpath_sed='
8584- /Import File Strings/,/^$/ {
8585- /^0/ {
8586- s/^0 *\(.*\)$/\1/
8587- p
8588- }
8589- }'
8590-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8591-# Check for a 64-bit object if we didn't find anything.
8592-if test -z "$aix_libpath"; then
8593- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8594-fi
8595+ lt_aix_libpath_sed='
8596+ /Import File Strings/,/^$/ {
8597+ /^0/ {
8598+ s/^0 *\([^ ]*\) *$/\1/
8599+ p
8600+ }
8601+ }'
8602+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8603+ # Check for a 64-bit object if we didn't find anything.
8604+ if test -z "$lt_cv_aix_libpath_"; then
8605+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8606+ fi
8607 fi
8608 rm -f core conftest.err conftest.$ac_objext \
8609 conftest$ac_exeext conftest.$ac_ext
8610-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8611+ if test -z "$lt_cv_aix_libpath_"; then
8612+ lt_cv_aix_libpath_="/usr/lib:/lib"
8613+ fi
8614+
8615+fi
8616+
8617+ aix_libpath=$lt_cv_aix_libpath_
8618+fi
8619
8620 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8621 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"
8622@@ -9822,7 +10359,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8623 else
8624 # Determine the default libpath from the value encoded in an
8625 # empty executable.
8626- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8627+ if test "${lt_cv_aix_libpath+set}" = set; then
8628+ aix_libpath=$lt_cv_aix_libpath
8629+else
8630+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8631+ $as_echo_n "(cached) " >&6
8632+else
8633+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8634 /* end confdefs.h. */
8635
8636 int
8637@@ -9835,22 +10378,29 @@ main ()
8638 _ACEOF
8639 if ac_fn_c_try_link "$LINENO"; then :
8640
8641-lt_aix_libpath_sed='
8642- /Import File Strings/,/^$/ {
8643- /^0/ {
8644- s/^0 *\(.*\)$/\1/
8645- p
8646- }
8647- }'
8648-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8649-# Check for a 64-bit object if we didn't find anything.
8650-if test -z "$aix_libpath"; then
8651- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8652-fi
8653+ lt_aix_libpath_sed='
8654+ /Import File Strings/,/^$/ {
8655+ /^0/ {
8656+ s/^0 *\([^ ]*\) *$/\1/
8657+ p
8658+ }
8659+ }'
8660+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8661+ # Check for a 64-bit object if we didn't find anything.
8662+ if test -z "$lt_cv_aix_libpath_"; then
8663+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8664+ fi
8665 fi
8666 rm -f core conftest.err conftest.$ac_objext \
8667 conftest$ac_exeext conftest.$ac_ext
8668-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8669+ if test -z "$lt_cv_aix_libpath_"; then
8670+ lt_cv_aix_libpath_="/usr/lib:/lib"
8671+ fi
8672+
8673+fi
8674+
8675+ aix_libpath=$lt_cv_aix_libpath_
8676+fi
8677
8678 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8679 # Warning - without using the other run time loading flags,
8680@@ -9894,21 +10444,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8681 # When not using gcc, we currently assume that we are using
8682 # Microsoft Visual C++.
8683 # hardcode_libdir_flag_spec is actually meaningless, as there is
8684- # no search path for DLLs.
8685- hardcode_libdir_flag_spec=' '
8686- allow_undefined_flag=unsupported
8687- # Tell ltmain to make .lib files, not .a files.
8688- libext=lib
8689- # Tell ltmain to make .dll files, not .so files.
8690- shrext_cmds=".dll"
8691- # FIXME: Setting linknames here is a bad hack.
8692- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8693- # The linker will automatically build a .lib file if we build a DLL.
8694- old_archive_from_new_cmds='true'
8695- # FIXME: Should let the user specify the lib program.
8696- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8697- fix_srcfile_path='`cygpath -w "$srcfile"`'
8698- enable_shared_with_static_runtimes=yes
8699+ # no search path for DLLs.
8700+ case $cc_basename in
8701+ cl*)
8702+ # Native MSVC
8703+ hardcode_libdir_flag_spec=' '
8704+ allow_undefined_flag=unsupported
8705+ always_export_symbols=yes
8706+ file_list_spec='@'
8707+ # Tell ltmain to make .lib files, not .a files.
8708+ libext=lib
8709+ # Tell ltmain to make .dll files, not .so files.
8710+ shrext_cmds=".dll"
8711+ # FIXME: Setting linknames here is a bad hack.
8712+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8713+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8714+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8715+ else
8716+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8717+ fi~
8718+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8719+ linknames='
8720+ # The linker will not automatically build a static lib if we build a DLL.
8721+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8722+ enable_shared_with_static_runtimes=yes
8723+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8724+ # Don't use ranlib
8725+ old_postinstall_cmds='chmod 644 $oldlib'
8726+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8727+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8728+ case $lt_outputfile in
8729+ *.exe|*.EXE) ;;
8730+ *)
8731+ lt_outputfile="$lt_outputfile.exe"
8732+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8733+ ;;
8734+ esac~
8735+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8736+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8737+ $RM "$lt_outputfile.manifest";
8738+ fi'
8739+ ;;
8740+ *)
8741+ # Assume MSVC wrapper
8742+ hardcode_libdir_flag_spec=' '
8743+ allow_undefined_flag=unsupported
8744+ # Tell ltmain to make .lib files, not .a files.
8745+ libext=lib
8746+ # Tell ltmain to make .dll files, not .so files.
8747+ shrext_cmds=".dll"
8748+ # FIXME: Setting linknames here is a bad hack.
8749+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8750+ # The linker will automatically build a .lib file if we build a DLL.
8751+ old_archive_from_new_cmds='true'
8752+ # FIXME: Should let the user specify the lib program.
8753+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8754+ enable_shared_with_static_runtimes=yes
8755+ ;;
8756+ esac
8757 ;;
8758
8759 darwin* | rhapsody*)
8760@@ -9969,7 +10562,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8761
8762 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8763 freebsd* | dragonfly*)
8764- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8765+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8766 hardcode_libdir_flag_spec='-R$libdir'
8767 hardcode_direct=yes
8768 hardcode_shlibpath_var=no
8769@@ -9977,7 +10570,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8770
8771 hpux9*)
8772 if test "$GCC" = yes; then
8773- 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'
8774+ 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'
8775 else
8776 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'
8777 fi
8778@@ -9993,7 +10586,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8779
8780 hpux10*)
8781 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8782- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8783+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8784 else
8785 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8786 fi
8787@@ -10017,10 +10610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8788 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8789 ;;
8790 ia64*)
8791- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8792+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8793 ;;
8794 *)
8795- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8796+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8797 ;;
8798 esac
8799 else
8800@@ -10099,23 +10692,36 @@ fi
8801
8802 irix5* | irix6* | nonstopux*)
8803 if test "$GCC" = yes; then
8804- 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'
8805+ 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'
8806 # Try to use the -exported_symbol ld option, if it does not
8807 # work, assume that -exports_file does not work either and
8808 # implicitly export all symbols.
8809- save_LDFLAGS="$LDFLAGS"
8810- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8811- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8812+ # This should be the same for all languages, so no per-tag cache variable.
8813+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8814+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8815+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8816+ $as_echo_n "(cached) " >&6
8817+else
8818+ save_LDFLAGS="$LDFLAGS"
8819+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8820+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8821 /* end confdefs.h. */
8822-int foo(void) {}
8823+int foo (void) { return 0; }
8824 _ACEOF
8825 if ac_fn_c_try_link "$LINENO"; then :
8826- 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'
8827-
8828+ lt_cv_irix_exported_symbol=yes
8829+else
8830+ lt_cv_irix_exported_symbol=no
8831 fi
8832 rm -f core conftest.err conftest.$ac_objext \
8833 conftest$ac_exeext conftest.$ac_ext
8834- LDFLAGS="$save_LDFLAGS"
8835+ LDFLAGS="$save_LDFLAGS"
8836+fi
8837+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8838+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8839+ if test "$lt_cv_irix_exported_symbol" = yes; then
8840+ 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'
8841+ fi
8842 else
8843 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'
8844 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'
8845@@ -10200,7 +10806,7 @@ rm -f core conftest.err conftest.$ac_objext \
8846 osf4* | osf5*) # as osf3* with the addition of -msym flag
8847 if test "$GCC" = yes; then
8848 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8849- 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'
8850+ 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'
8851 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8852 else
8853 allow_undefined_flag=' -expect_unresolved \*'
8854@@ -10219,9 +10825,9 @@ rm -f core conftest.err conftest.$ac_objext \
8855 no_undefined_flag=' -z defs'
8856 if test "$GCC" = yes; then
8857 wlarc='${wl}'
8858- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8859+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8860 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8861- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8862+ $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'
8863 else
8864 case `$CC -V 2>&1` in
8865 *"Compilers 5.0"*)
8866@@ -10797,8 +11403,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8867 need_version=no
8868 need_lib_prefix=no
8869
8870- case $GCC,$host_os in
8871- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8872+ case $GCC,$cc_basename in
8873+ yes,*)
8874+ # gcc
8875 library_names_spec='$libname.dll.a'
8876 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8877 postinstall_cmds='base_file=`basename \${file}`~
8878@@ -10831,13 +11438,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8879 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8880 ;;
8881 esac
8882+ dynamic_linker='Win32 ld.exe'
8883+ ;;
8884+
8885+ *,cl*)
8886+ # Native MSVC
8887+ libname_spec='$name'
8888+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8889+ library_names_spec='${libname}.dll.lib'
8890+
8891+ case $build_os in
8892+ mingw*)
8893+ sys_lib_search_path_spec=
8894+ lt_save_ifs=$IFS
8895+ IFS=';'
8896+ for lt_path in $LIB
8897+ do
8898+ IFS=$lt_save_ifs
8899+ # Let DOS variable expansion print the short 8.3 style file name.
8900+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8901+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8902+ done
8903+ IFS=$lt_save_ifs
8904+ # Convert to MSYS style.
8905+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8906+ ;;
8907+ cygwin*)
8908+ # Convert to unix form, then to dos form, then back to unix form
8909+ # but this time dos style (no spaces!) so that the unix form looks
8910+ # like /cygdrive/c/PROGRA~1:/cygdr...
8911+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8912+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8913+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8914+ ;;
8915+ *)
8916+ sys_lib_search_path_spec="$LIB"
8917+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8918+ # It is most probably a Windows format PATH.
8919+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8920+ else
8921+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8922+ fi
8923+ # FIXME: find the short name or the path components, as spaces are
8924+ # common. (e.g. "Program Files" -> "PROGRA~1")
8925+ ;;
8926+ esac
8927+
8928+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8929+ postinstall_cmds='base_file=`basename \${file}`~
8930+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8931+ dldir=$destdir/`dirname \$dlpath`~
8932+ test -d \$dldir || mkdir -p \$dldir~
8933+ $install_prog $dir/$dlname \$dldir/$dlname'
8934+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8935+ dlpath=$dir/\$dldll~
8936+ $RM \$dlpath'
8937+ shlibpath_overrides_runpath=yes
8938+ dynamic_linker='Win32 link.exe'
8939 ;;
8940
8941 *)
8942+ # Assume MSVC wrapper
8943 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8944+ dynamic_linker='Win32 ld.exe'
8945 ;;
8946 esac
8947- dynamic_linker='Win32 ld.exe'
8948 # FIXME: first we should search . and the directory the executable is in
8949 shlibpath_var=PATH
8950 ;;
8951@@ -10929,7 +11594,7 @@ haiku*)
8952 soname_spec='${libname}${release}${shared_ext}$major'
8953 shlibpath_var=LIBRARY_PATH
8954 shlibpath_overrides_runpath=yes
8955- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8956+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8957 hardcode_into_libs=yes
8958 ;;
8959
8960@@ -11769,10 +12434,10 @@ else
8961 /* When -fvisbility=hidden is used, assume the code has been annotated
8962 correspondingly for the symbols needed. */
8963 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8964-void fnord () __attribute__((visibility("default")));
8965+int fnord () __attribute__((visibility("default")));
8966 #endif
8967
8968-void fnord () { int i=42; }
8969+int fnord () { return 42; }
8970 int main ()
8971 {
8972 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8973@@ -11875,10 +12540,10 @@ else
8974 /* When -fvisbility=hidden is used, assume the code has been annotated
8975 correspondingly for the symbols needed. */
8976 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8977-void fnord () __attribute__((visibility("default")));
8978+int fnord () __attribute__((visibility("default")));
8979 #endif
8980
8981-void fnord () { int i=42; }
8982+int fnord () { return 42; }
8983 int main ()
8984 {
8985 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8986@@ -12270,6 +12935,7 @@ $RM -r conftest*
8987
8988 # Allow CC to be a program name with arguments.
8989 lt_save_CC=$CC
8990+ lt_save_CFLAGS=$CFLAGS
8991 lt_save_LD=$LD
8992 lt_save_GCC=$GCC
8993 GCC=$GXX
8994@@ -12287,6 +12953,7 @@ $RM -r conftest*
8995 fi
8996 test -z "${LDCXX+set}" || LD=$LDCXX
8997 CC=${CXX-"c++"}
8998+ CFLAGS=$CXXFLAGS
8999 compiler=$CC
9000 compiler_CXX=$CC
9001 for cc_temp in $compiler""; do
9002@@ -12569,7 +13236,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9003 allow_undefined_flag_CXX='-berok'
9004 # Determine the default libpath from the value encoded in an empty
9005 # executable.
9006- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9007+ if test "${lt_cv_aix_libpath+set}" = set; then
9008+ aix_libpath=$lt_cv_aix_libpath
9009+else
9010+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9011+ $as_echo_n "(cached) " >&6
9012+else
9013+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9014 /* end confdefs.h. */
9015
9016 int
9017@@ -12582,22 +13255,29 @@ main ()
9018 _ACEOF
9019 if ac_fn_cxx_try_link "$LINENO"; then :
9020
9021-lt_aix_libpath_sed='
9022- /Import File Strings/,/^$/ {
9023- /^0/ {
9024- s/^0 *\(.*\)$/\1/
9025- p
9026- }
9027- }'
9028-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9029-# Check for a 64-bit object if we didn't find anything.
9030-if test -z "$aix_libpath"; then
9031- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9032-fi
9033+ lt_aix_libpath_sed='
9034+ /Import File Strings/,/^$/ {
9035+ /^0/ {
9036+ s/^0 *\([^ ]*\) *$/\1/
9037+ p
9038+ }
9039+ }'
9040+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9041+ # Check for a 64-bit object if we didn't find anything.
9042+ if test -z "$lt_cv_aix_libpath__CXX"; then
9043+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9044+ fi
9045 fi
9046 rm -f core conftest.err conftest.$ac_objext \
9047 conftest$ac_exeext conftest.$ac_ext
9048-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9049+ if test -z "$lt_cv_aix_libpath__CXX"; then
9050+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9051+ fi
9052+
9053+fi
9054+
9055+ aix_libpath=$lt_cv_aix_libpath__CXX
9056+fi
9057
9058 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9059
9060@@ -12610,7 +13290,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9061 else
9062 # Determine the default libpath from the value encoded in an
9063 # empty executable.
9064- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9065+ if test "${lt_cv_aix_libpath+set}" = set; then
9066+ aix_libpath=$lt_cv_aix_libpath
9067+else
9068+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9069+ $as_echo_n "(cached) " >&6
9070+else
9071+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9072 /* end confdefs.h. */
9073
9074 int
9075@@ -12623,22 +13309,29 @@ main ()
9076 _ACEOF
9077 if ac_fn_cxx_try_link "$LINENO"; then :
9078
9079-lt_aix_libpath_sed='
9080- /Import File Strings/,/^$/ {
9081- /^0/ {
9082- s/^0 *\(.*\)$/\1/
9083- p
9084- }
9085- }'
9086-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9087-# Check for a 64-bit object if we didn't find anything.
9088-if test -z "$aix_libpath"; then
9089- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9090-fi
9091+ lt_aix_libpath_sed='
9092+ /Import File Strings/,/^$/ {
9093+ /^0/ {
9094+ s/^0 *\([^ ]*\) *$/\1/
9095+ p
9096+ }
9097+ }'
9098+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9099+ # Check for a 64-bit object if we didn't find anything.
9100+ if test -z "$lt_cv_aix_libpath__CXX"; then
9101+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9102+ fi
9103 fi
9104 rm -f core conftest.err conftest.$ac_objext \
9105 conftest$ac_exeext conftest.$ac_ext
9106-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9107+ if test -z "$lt_cv_aix_libpath__CXX"; then
9108+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9109+ fi
9110+
9111+fi
9112+
9113+ aix_libpath=$lt_cv_aix_libpath__CXX
9114+fi
9115
9116 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9117 # Warning - without using the other run time loading flags,
9118@@ -12681,29 +13374,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9119 ;;
9120
9121 cygwin* | mingw* | pw32* | cegcc*)
9122- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9123- # as there is no search path for DLLs.
9124- hardcode_libdir_flag_spec_CXX='-L$libdir'
9125- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9126- allow_undefined_flag_CXX=unsupported
9127- always_export_symbols_CXX=no
9128- enable_shared_with_static_runtimes_CXX=yes
9129-
9130- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9131- 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'
9132- # If the export-symbols file already is a .def file (1st line
9133- # is EXPORTS), use it as is; otherwise, prepend...
9134- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9135- cp $export_symbols $output_objdir/$soname.def;
9136- else
9137- echo EXPORTS > $output_objdir/$soname.def;
9138- cat $export_symbols >> $output_objdir/$soname.def;
9139- fi~
9140- $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'
9141- else
9142- ld_shlibs_CXX=no
9143- fi
9144- ;;
9145+ case $GXX,$cc_basename in
9146+ ,cl* | no,cl*)
9147+ # Native MSVC
9148+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9149+ # no search path for DLLs.
9150+ hardcode_libdir_flag_spec_CXX=' '
9151+ allow_undefined_flag_CXX=unsupported
9152+ always_export_symbols_CXX=yes
9153+ file_list_spec_CXX='@'
9154+ # Tell ltmain to make .lib files, not .a files.
9155+ libext=lib
9156+ # Tell ltmain to make .dll files, not .so files.
9157+ shrext_cmds=".dll"
9158+ # FIXME: Setting linknames here is a bad hack.
9159+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9160+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9161+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9162+ else
9163+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9164+ fi~
9165+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9166+ linknames='
9167+ # The linker will not automatically build a static lib if we build a DLL.
9168+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9169+ enable_shared_with_static_runtimes_CXX=yes
9170+ # Don't use ranlib
9171+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9172+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9173+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9174+ case $lt_outputfile in
9175+ *.exe|*.EXE) ;;
9176+ *)
9177+ lt_outputfile="$lt_outputfile.exe"
9178+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9179+ ;;
9180+ esac~
9181+ func_to_tool_file "$lt_outputfile"~
9182+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9183+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9184+ $RM "$lt_outputfile.manifest";
9185+ fi'
9186+ ;;
9187+ *)
9188+ # g++
9189+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9190+ # as there is no search path for DLLs.
9191+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9192+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9193+ allow_undefined_flag_CXX=unsupported
9194+ always_export_symbols_CXX=no
9195+ enable_shared_with_static_runtimes_CXX=yes
9196+
9197+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9198+ 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'
9199+ # If the export-symbols file already is a .def file (1st line
9200+ # is EXPORTS), use it as is; otherwise, prepend...
9201+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9202+ cp $export_symbols $output_objdir/$soname.def;
9203+ else
9204+ echo EXPORTS > $output_objdir/$soname.def;
9205+ cat $export_symbols >> $output_objdir/$soname.def;
9206+ fi~
9207+ $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'
9208+ else
9209+ ld_shlibs_CXX=no
9210+ fi
9211+ ;;
9212+ esac
9213+ ;;
9214 darwin* | rhapsody*)
9215
9216
9217@@ -12809,7 +13548,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9218 ;;
9219 *)
9220 if test "$GXX" = yes; then
9221- 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'
9222+ 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'
9223 else
9224 # FIXME: insert proper C++ library support
9225 ld_shlibs_CXX=no
9226@@ -12880,10 +13619,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9227 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9228 ;;
9229 ia64*)
9230- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9231+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9232 ;;
9233 *)
9234- 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'
9235+ 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'
9236 ;;
9237 esac
9238 fi
9239@@ -12924,9 +13663,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9240 *)
9241 if test "$GXX" = yes; then
9242 if test "$with_gnu_ld" = no; then
9243- 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'
9244+ 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'
9245 else
9246- 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'
9247+ 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'
9248 fi
9249 fi
9250 link_all_deplibs_CXX=yes
9251@@ -12996,20 +13735,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9252 prelink_cmds_CXX='tpldir=Template.dir~
9253 rm -rf $tpldir~
9254 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9255- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9256+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9257 old_archive_cmds_CXX='tpldir=Template.dir~
9258 rm -rf $tpldir~
9259 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9260- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9261+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9262 $RANLIB $oldlib'
9263 archive_cmds_CXX='tpldir=Template.dir~
9264 rm -rf $tpldir~
9265 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9266- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9267+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9268 archive_expsym_cmds_CXX='tpldir=Template.dir~
9269 rm -rf $tpldir~
9270 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9271- $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'
9272+ $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'
9273 ;;
9274 *) # Version 6 and above use weak symbols
9275 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9276@@ -13204,7 +13943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9277 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'
9278 ;;
9279 *)
9280- 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'
9281+ 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'
9282 ;;
9283 esac
9284
9285@@ -13250,7 +13989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9286
9287 solaris*)
9288 case $cc_basename in
9289- CC*)
9290+ CC* | sunCC*)
9291 # Sun C++ 4.2, 5.x and Centerline C++
9292 archive_cmds_need_lc_CXX=yes
9293 no_undefined_flag_CXX=' -zdefs'
9294@@ -13291,9 +14030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9295 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9296 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9297 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9298- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9299+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9300 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9301- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9302+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9303
9304 # Commands to make compiler produce verbose output that lists
9305 # what "hidden" libraries, object files and flags are used when
9306@@ -13428,6 +14167,13 @@ private:
9307 };
9308 _LT_EOF
9309
9310+
9311+_lt_libdeps_save_CFLAGS=$CFLAGS
9312+case "$CC $CFLAGS " in #(
9313+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9314+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9315+esac
9316+
9317 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9318 (eval $ac_compile) 2>&5
9319 ac_status=$?
9320@@ -13441,7 +14187,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9321 pre_test_object_deps_done=no
9322
9323 for p in `eval "$output_verbose_link_cmd"`; do
9324- case $p in
9325+ case ${prev}${p} in
9326
9327 -L* | -R* | -l*)
9328 # Some compilers place space between "-{L,R}" and the path.
9329@@ -13450,13 +14196,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9330 test $p = "-R"; then
9331 prev=$p
9332 continue
9333- else
9334- prev=
9335 fi
9336
9337+ # Expand the sysroot to ease extracting the directories later.
9338+ if test -z "$prev"; then
9339+ case $p in
9340+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9341+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9342+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9343+ esac
9344+ fi
9345+ case $p in
9346+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9347+ esac
9348 if test "$pre_test_object_deps_done" = no; then
9349- case $p in
9350- -L* | -R*)
9351+ case ${prev} in
9352+ -L | -R)
9353 # Internal compiler library paths should come after those
9354 # provided the user. The postdeps already come after the
9355 # user supplied libs so there is no need to process them.
9356@@ -13476,8 +14231,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9357 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9358 fi
9359 fi
9360+ prev=
9361 ;;
9362
9363+ *.lto.$objext) ;; # Ignore GCC LTO objects
9364 *.$objext)
9365 # This assumes that the test object file only shows up
9366 # once in the compiler output.
9367@@ -13513,6 +14270,7 @@ else
9368 fi
9369
9370 $RM -f confest.$objext
9371+CFLAGS=$_lt_libdeps_save_CFLAGS
9372
9373 # PORTME: override above test on systems where it is broken
9374 case $host_os in
9375@@ -13548,7 +14306,7 @@ linux*)
9376
9377 solaris*)
9378 case $cc_basename in
9379- CC*)
9380+ CC* | sunCC*)
9381 # The more standards-conforming stlport4 library is
9382 # incompatible with the Cstd library. Avoid specifying
9383 # it if it's in CXXFLAGS. Ignore libCrun as
9384@@ -13613,8 +14371,6 @@ fi
9385 lt_prog_compiler_pic_CXX=
9386 lt_prog_compiler_static_CXX=
9387
9388-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9389-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9390
9391 # C++ specific cases for pic, static, wl, etc.
9392 if test "$GXX" = yes; then
9393@@ -13719,6 +14475,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9394 ;;
9395 esac
9396 ;;
9397+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9398+ # This hack is so that the source file can tell whether it is being
9399+ # built for inclusion in a dll (and should export symbols for example).
9400+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9401+ ;;
9402 dgux*)
9403 case $cc_basename in
9404 ec++*)
9405@@ -13871,7 +14632,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9406 ;;
9407 solaris*)
9408 case $cc_basename in
9409- CC*)
9410+ CC* | sunCC*)
9411 # Sun C++ 4.2, 5.x and Centerline C++
9412 lt_prog_compiler_pic_CXX='-KPIC'
9413 lt_prog_compiler_static_CXX='-Bstatic'
9414@@ -13936,10 +14697,17 @@ case $host_os in
9415 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9416 ;;
9417 esac
9418-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9419-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9420-
9421
9422+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9423+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9424+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
9425+ $as_echo_n "(cached) " >&6
9426+else
9427+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9428+fi
9429+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9430+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9431+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9432
9433 #
9434 # Check to make sure the PIC flag actually works.
9435@@ -13997,6 +14765,8 @@ fi
9436
9437
9438
9439+
9440+
9441 #
9442 # Check to make sure the static flag actually works.
9443 #
9444@@ -14174,6 +14944,7 @@ fi
9445 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9446
9447 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9448+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9449 case $host_os in
9450 aix[4-9]*)
9451 # If we're using GNU nm, then we don't want the "-C" option.
9452@@ -14188,15 +14959,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9453 ;;
9454 pw32*)
9455 export_symbols_cmds_CXX="$ltdll_cmds"
9456- ;;
9457+ ;;
9458 cygwin* | mingw* | cegcc*)
9459- 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'
9460- ;;
9461+ case $cc_basename in
9462+ cl*) ;;
9463+ *)
9464+ 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'
9465+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9466+ ;;
9467+ esac
9468+ ;;
9469 *)
9470 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9471- ;;
9472+ ;;
9473 esac
9474- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9475
9476 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9477 $as_echo "$ld_shlibs_CXX" >&6; }
9478@@ -14459,8 +15235,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9479 need_version=no
9480 need_lib_prefix=no
9481
9482- case $GCC,$host_os in
9483- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9484+ case $GCC,$cc_basename in
9485+ yes,*)
9486+ # gcc
9487 library_names_spec='$libname.dll.a'
9488 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9489 postinstall_cmds='base_file=`basename \${file}`~
9490@@ -14492,13 +15269,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9491 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9492 ;;
9493 esac
9494+ dynamic_linker='Win32 ld.exe'
9495+ ;;
9496+
9497+ *,cl*)
9498+ # Native MSVC
9499+ libname_spec='$name'
9500+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9501+ library_names_spec='${libname}.dll.lib'
9502+
9503+ case $build_os in
9504+ mingw*)
9505+ sys_lib_search_path_spec=
9506+ lt_save_ifs=$IFS
9507+ IFS=';'
9508+ for lt_path in $LIB
9509+ do
9510+ IFS=$lt_save_ifs
9511+ # Let DOS variable expansion print the short 8.3 style file name.
9512+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9513+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9514+ done
9515+ IFS=$lt_save_ifs
9516+ # Convert to MSYS style.
9517+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9518+ ;;
9519+ cygwin*)
9520+ # Convert to unix form, then to dos form, then back to unix form
9521+ # but this time dos style (no spaces!) so that the unix form looks
9522+ # like /cygdrive/c/PROGRA~1:/cygdr...
9523+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9524+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9525+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9526+ ;;
9527+ *)
9528+ sys_lib_search_path_spec="$LIB"
9529+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9530+ # It is most probably a Windows format PATH.
9531+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9532+ else
9533+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9534+ fi
9535+ # FIXME: find the short name or the path components, as spaces are
9536+ # common. (e.g. "Program Files" -> "PROGRA~1")
9537+ ;;
9538+ esac
9539+
9540+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9541+ postinstall_cmds='base_file=`basename \${file}`~
9542+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9543+ dldir=$destdir/`dirname \$dlpath`~
9544+ test -d \$dldir || mkdir -p \$dldir~
9545+ $install_prog $dir/$dlname \$dldir/$dlname'
9546+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9547+ dlpath=$dir/\$dldll~
9548+ $RM \$dlpath'
9549+ shlibpath_overrides_runpath=yes
9550+ dynamic_linker='Win32 link.exe'
9551 ;;
9552
9553 *)
9554+ # Assume MSVC wrapper
9555 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9556+ dynamic_linker='Win32 ld.exe'
9557 ;;
9558 esac
9559- dynamic_linker='Win32 ld.exe'
9560 # FIXME: first we should search . and the directory the executable is in
9561 shlibpath_var=PATH
9562 ;;
9563@@ -14589,7 +15424,7 @@ haiku*)
9564 soname_spec='${libname}${release}${shared_ext}$major'
9565 shlibpath_var=LIBRARY_PATH
9566 shlibpath_overrides_runpath=yes
9567- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9568+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9569 hardcode_into_libs=yes
9570 ;;
9571
9572@@ -15048,6 +15883,7 @@ fi
9573 fi # test -n "$compiler"
9574
9575 CC=$lt_save_CC
9576+ CFLAGS=$lt_save_CFLAGS
9577 LDCXX=$LD
9578 LD=$lt_save_LD
9579 GCC=$lt_save_GCC
9580@@ -18083,13 +18919,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9581 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9582 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9583 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9584+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9585+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9586 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9587 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9588 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9589 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9590 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9591+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9592+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9593+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9594+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9595 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9596 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9597+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9598 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9599 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9600 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9601@@ -18104,14 +18947,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9602 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9603 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9604 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"`'
9605+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9606+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9607 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9608 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9609 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9610-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9611 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9612+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9613 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9614 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9615 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9616+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9617 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9618 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9619 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9620@@ -18144,12 +18990,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9621 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9622 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9623 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9624-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9625 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9626 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9627 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9628 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9629 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9630+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9631 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9632 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9633 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9634@@ -18188,8 +19034,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9635 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9636 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9637 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9638-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9639 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9640+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9641 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9642 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9643 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9644@@ -18216,12 +19062,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9645 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9646 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9647 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9648-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9649 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9650 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9651 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9652 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9653 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9654+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9655 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9656 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9657 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9658@@ -18259,8 +19105,13 @@ reload_flag \
9659 OBJDUMP \
9660 deplibs_check_method \
9661 file_magic_cmd \
9662+file_magic_glob \
9663+want_nocaseglob \
9664+DLLTOOL \
9665+sharedlib_from_linklib_cmd \
9666 AR \
9667 AR_FLAGS \
9668+archiver_list_spec \
9669 STRIP \
9670 RANLIB \
9671 CC \
9672@@ -18270,12 +19121,14 @@ lt_cv_sys_global_symbol_pipe \
9673 lt_cv_sys_global_symbol_to_cdecl \
9674 lt_cv_sys_global_symbol_to_c_name_address \
9675 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9676+nm_file_list_spec \
9677 lt_prog_compiler_no_builtin_flag \
9678-lt_prog_compiler_wl \
9679 lt_prog_compiler_pic \
9680+lt_prog_compiler_wl \
9681 lt_prog_compiler_static \
9682 lt_cv_prog_compiler_c_o \
9683 need_locks \
9684+MANIFEST_TOOL \
9685 DSYMUTIL \
9686 NMEDIT \
9687 LIPO \
9688@@ -18291,7 +19144,6 @@ no_undefined_flag \
9689 hardcode_libdir_flag_spec \
9690 hardcode_libdir_flag_spec_ld \
9691 hardcode_libdir_separator \
9692-fix_srcfile_path \
9693 exclude_expsyms \
9694 include_expsyms \
9695 file_list_spec \
9696@@ -18313,8 +19165,8 @@ LD_CXX \
9697 reload_flag_CXX \
9698 compiler_CXX \
9699 lt_prog_compiler_no_builtin_flag_CXX \
9700-lt_prog_compiler_wl_CXX \
9701 lt_prog_compiler_pic_CXX \
9702+lt_prog_compiler_wl_CXX \
9703 lt_prog_compiler_static_CXX \
9704 lt_cv_prog_compiler_c_o_CXX \
9705 export_dynamic_flag_spec_CXX \
9706@@ -18326,7 +19178,6 @@ no_undefined_flag_CXX \
9707 hardcode_libdir_flag_spec_CXX \
9708 hardcode_libdir_flag_spec_ld_CXX \
9709 hardcode_libdir_separator_CXX \
9710-fix_srcfile_path_CXX \
9711 exclude_expsyms_CXX \
9712 include_expsyms_CXX \
9713 file_list_spec_CXX \
9714@@ -18360,6 +19211,7 @@ module_cmds \
9715 module_expsym_cmds \
9716 export_symbols_cmds \
9717 prelink_cmds \
9718+postlink_cmds \
9719 postinstall_cmds \
9720 postuninstall_cmds \
9721 finish_cmds \
9722@@ -18374,7 +19226,8 @@ archive_expsym_cmds_CXX \
9723 module_cmds_CXX \
9724 module_expsym_cmds_CXX \
9725 export_symbols_cmds_CXX \
9726-prelink_cmds_CXX; do
9727+prelink_cmds_CXX \
9728+postlink_cmds_CXX; do
9729 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9730 *[\\\\\\\`\\"\\\$]*)
9731 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9732@@ -19167,7 +20020,8 @@ $as_echo X"$file" |
9733 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9734 #
9735 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9736-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9737+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9738+# Inc.
9739 # Written by Gordon Matzigkeit, 1996
9740 #
9741 # This file is part of GNU Libtool.
9742@@ -19270,19 +20124,42 @@ SP2NL=$lt_lt_SP2NL
9743 # turn newlines into spaces.
9744 NL2SP=$lt_lt_NL2SP
9745
9746+# convert \$build file names to \$host format.
9747+to_host_file_cmd=$lt_cv_to_host_file_cmd
9748+
9749+# convert \$build files to toolchain format.
9750+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9751+
9752 # An object symbol dumper.
9753 OBJDUMP=$lt_OBJDUMP
9754
9755 # Method to check whether dependent libraries are shared objects.
9756 deplibs_check_method=$lt_deplibs_check_method
9757
9758-# Command to use when deplibs_check_method == "file_magic".
9759+# Command to use when deplibs_check_method = "file_magic".
9760 file_magic_cmd=$lt_file_magic_cmd
9761
9762+# How to find potential files when deplibs_check_method = "file_magic".
9763+file_magic_glob=$lt_file_magic_glob
9764+
9765+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9766+want_nocaseglob=$lt_want_nocaseglob
9767+
9768+# DLL creation program.
9769+DLLTOOL=$lt_DLLTOOL
9770+
9771+# Command to associate shared and link libraries.
9772+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9773+
9774 # The archiver.
9775 AR=$lt_AR
9776+
9777+# Flags to create an archive.
9778 AR_FLAGS=$lt_AR_FLAGS
9779
9780+# How to feed a file listing to the archiver.
9781+archiver_list_spec=$lt_archiver_list_spec
9782+
9783 # A symbol stripping program.
9784 STRIP=$lt_STRIP
9785
9786@@ -19312,6 +20189,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9787 # Transform the output of nm in a C name address pair when lib prefix is needed.
9788 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9789
9790+# Specify filename containing input files for \$NM.
9791+nm_file_list_spec=$lt_nm_file_list_spec
9792+
9793+# The root where to search for dependent libraries,and in which our libraries should be installed.
9794+lt_sysroot=$lt_sysroot
9795+
9796 # The name of the directory that contains temporary libtool files.
9797 objdir=$objdir
9798
9799@@ -19321,6 +20204,9 @@ MAGIC_CMD=$MAGIC_CMD
9800 # Must we lock files when doing compilation?
9801 need_locks=$lt_need_locks
9802
9803+# Manifest tool.
9804+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9805+
9806 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9807 DSYMUTIL=$lt_DSYMUTIL
9808
9809@@ -19435,12 +20321,12 @@ with_gcc=$GCC
9810 # Compiler flag to turn off builtin functions.
9811 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9812
9813-# How to pass a linker flag through the compiler.
9814-wl=$lt_lt_prog_compiler_wl
9815-
9816 # Additional compiler flags for building library objects.
9817 pic_flag=$lt_lt_prog_compiler_pic
9818
9819+# How to pass a linker flag through the compiler.
9820+wl=$lt_lt_prog_compiler_wl
9821+
9822 # Compiler flag to prevent dynamic linking.
9823 link_static_flag=$lt_lt_prog_compiler_static
9824
9825@@ -19527,9 +20413,6 @@ inherit_rpath=$inherit_rpath
9826 # Whether libtool must link a program against all its dependency libraries.
9827 link_all_deplibs=$link_all_deplibs
9828
9829-# Fix the shell variable \$srcfile for the compiler.
9830-fix_srcfile_path=$lt_fix_srcfile_path
9831-
9832 # Set to "yes" if exported symbols are required.
9833 always_export_symbols=$always_export_symbols
9834
9835@@ -19545,6 +20428,9 @@ include_expsyms=$lt_include_expsyms
9836 # Commands necessary for linking programs (against libraries) with templates.
9837 prelink_cmds=$lt_prelink_cmds
9838
9839+# Commands necessary for finishing linking programs.
9840+postlink_cmds=$lt_postlink_cmds
9841+
9842 # Specify filename containing input files.
9843 file_list_spec=$lt_file_list_spec
9844
9845@@ -19591,210 +20477,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9846 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9847 # text mode, it properly converts lines to CR/LF. This bash problem
9848 # is reportedly fixed, but why not run on old versions too?
9849- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9850- || (rm -f "$cfgfile"; exit 1)
9851-
9852- case $xsi_shell in
9853- yes)
9854- cat << \_LT_EOF >> "$cfgfile"
9855-
9856-# func_dirname file append nondir_replacement
9857-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9858-# otherwise set result to NONDIR_REPLACEMENT.
9859-func_dirname ()
9860-{
9861- case ${1} in
9862- */*) func_dirname_result="${1%/*}${2}" ;;
9863- * ) func_dirname_result="${3}" ;;
9864- esac
9865-}
9866-
9867-# func_basename file
9868-func_basename ()
9869-{
9870- func_basename_result="${1##*/}"
9871-}
9872-
9873-# func_dirname_and_basename file append nondir_replacement
9874-# perform func_basename and func_dirname in a single function
9875-# call:
9876-# dirname: Compute the dirname of FILE. If nonempty,
9877-# add APPEND to the result, otherwise set result
9878-# to NONDIR_REPLACEMENT.
9879-# value returned in "$func_dirname_result"
9880-# basename: Compute filename of FILE.
9881-# value retuned in "$func_basename_result"
9882-# Implementation must be kept synchronized with func_dirname
9883-# and func_basename. For efficiency, we do not delegate to
9884-# those functions but instead duplicate the functionality here.
9885-func_dirname_and_basename ()
9886-{
9887- case ${1} in
9888- */*) func_dirname_result="${1%/*}${2}" ;;
9889- * ) func_dirname_result="${3}" ;;
9890- esac
9891- func_basename_result="${1##*/}"
9892-}
9893-
9894-# func_stripname prefix suffix name
9895-# strip PREFIX and SUFFIX off of NAME.
9896-# PREFIX and SUFFIX must not contain globbing or regex special
9897-# characters, hashes, percent signs, but SUFFIX may contain a leading
9898-# dot (in which case that matches only a dot).
9899-func_stripname ()
9900-{
9901- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9902- # positional parameters, so assign one to ordinary parameter first.
9903- func_stripname_result=${3}
9904- func_stripname_result=${func_stripname_result#"${1}"}
9905- func_stripname_result=${func_stripname_result%"${2}"}
9906-}
9907-
9908-# func_opt_split
9909-func_opt_split ()
9910-{
9911- func_opt_split_opt=${1%%=*}
9912- func_opt_split_arg=${1#*=}
9913-}
9914-
9915-# func_lo2o object
9916-func_lo2o ()
9917-{
9918- case ${1} in
9919- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9920- *) func_lo2o_result=${1} ;;
9921- esac
9922-}
9923-
9924-# func_xform libobj-or-source
9925-func_xform ()
9926-{
9927- func_xform_result=${1%.*}.lo
9928-}
9929-
9930-# func_arith arithmetic-term...
9931-func_arith ()
9932-{
9933- func_arith_result=$(( $* ))
9934-}
9935-
9936-# func_len string
9937-# STRING may not start with a hyphen.
9938-func_len ()
9939-{
9940- func_len_result=${#1}
9941-}
9942-
9943-_LT_EOF
9944- ;;
9945- *) # Bourne compatible functions.
9946- cat << \_LT_EOF >> "$cfgfile"
9947-
9948-# func_dirname file append nondir_replacement
9949-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9950-# otherwise set result to NONDIR_REPLACEMENT.
9951-func_dirname ()
9952-{
9953- # Extract subdirectory from the argument.
9954- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9955- if test "X$func_dirname_result" = "X${1}"; then
9956- func_dirname_result="${3}"
9957- else
9958- func_dirname_result="$func_dirname_result${2}"
9959- fi
9960-}
9961-
9962-# func_basename file
9963-func_basename ()
9964-{
9965- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9966-}
9967-
9968-
9969-# func_stripname prefix suffix name
9970-# strip PREFIX and SUFFIX off of NAME.
9971-# PREFIX and SUFFIX must not contain globbing or regex special
9972-# characters, hashes, percent signs, but SUFFIX may contain a leading
9973-# dot (in which case that matches only a dot).
9974-# func_strip_suffix prefix name
9975-func_stripname ()
9976-{
9977- case ${2} in
9978- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
9979- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
9980- esac
9981-}
9982-
9983-# sed scripts:
9984-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
9985-my_sed_long_arg='1s/^-[^=]*=//'
9986-
9987-# func_opt_split
9988-func_opt_split ()
9989-{
9990- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
9991- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
9992-}
9993-
9994-# func_lo2o object
9995-func_lo2o ()
9996-{
9997- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
9998-}
9999-
10000-# func_xform libobj-or-source
10001-func_xform ()
10002-{
10003- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10004-}
10005-
10006-# func_arith arithmetic-term...
10007-func_arith ()
10008-{
10009- func_arith_result=`expr "$@"`
10010-}
10011-
10012-# func_len string
10013-# STRING may not start with a hyphen.
10014-func_len ()
10015-{
10016- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10017-}
10018-
10019-_LT_EOF
10020-esac
10021-
10022-case $lt_shell_append in
10023- yes)
10024- cat << \_LT_EOF >> "$cfgfile"
10025-
10026-# func_append var value
10027-# Append VALUE to the end of shell variable VAR.
10028-func_append ()
10029-{
10030- eval "$1+=\$2"
10031-}
10032-_LT_EOF
10033- ;;
10034- *)
10035- cat << \_LT_EOF >> "$cfgfile"
10036-
10037-# func_append var value
10038-# Append VALUE to the end of shell variable VAR.
10039-func_append ()
10040-{
10041- eval "$1=\$$1\$2"
10042-}
10043-
10044-_LT_EOF
10045- ;;
10046- esac
10047-
10048-
10049- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10050- || (rm -f "$cfgfile"; exit 1)
10051-
10052- mv -f "$cfgfile" "$ofile" ||
10053+ sed '$q' "$ltmain" >> "$cfgfile" \
10054+ || (rm -f "$cfgfile"; exit 1)
10055+
10056+ if test x"$xsi_shell" = xyes; then
10057+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10058+func_dirname ()\
10059+{\
10060+\ case ${1} in\
10061+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10062+\ * ) func_dirname_result="${3}" ;;\
10063+\ esac\
10064+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10065+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10066+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10067+test 0 -eq $? || _lt_function_replace_fail=:
10068+
10069+
10070+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10071+func_basename ()\
10072+{\
10073+\ func_basename_result="${1##*/}"\
10074+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10075+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10076+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10077+test 0 -eq $? || _lt_function_replace_fail=:
10078+
10079+
10080+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10081+func_dirname_and_basename ()\
10082+{\
10083+\ case ${1} in\
10084+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10085+\ * ) func_dirname_result="${3}" ;;\
10086+\ esac\
10087+\ func_basename_result="${1##*/}"\
10088+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10089+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10090+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10091+test 0 -eq $? || _lt_function_replace_fail=:
10092+
10093+
10094+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10095+func_stripname ()\
10096+{\
10097+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10098+\ # positional parameters, so assign one to ordinary parameter first.\
10099+\ func_stripname_result=${3}\
10100+\ func_stripname_result=${func_stripname_result#"${1}"}\
10101+\ func_stripname_result=${func_stripname_result%"${2}"}\
10102+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10103+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10104+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10105+test 0 -eq $? || _lt_function_replace_fail=:
10106+
10107+
10108+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10109+func_split_long_opt ()\
10110+{\
10111+\ func_split_long_opt_name=${1%%=*}\
10112+\ func_split_long_opt_arg=${1#*=}\
10113+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10114+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10115+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10116+test 0 -eq $? || _lt_function_replace_fail=:
10117+
10118+
10119+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10120+func_split_short_opt ()\
10121+{\
10122+\ func_split_short_opt_arg=${1#??}\
10123+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10124+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10125+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10126+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10127+test 0 -eq $? || _lt_function_replace_fail=:
10128+
10129+
10130+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10131+func_lo2o ()\
10132+{\
10133+\ case ${1} in\
10134+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10135+\ *) func_lo2o_result=${1} ;;\
10136+\ esac\
10137+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10138+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10139+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10140+test 0 -eq $? || _lt_function_replace_fail=:
10141+
10142+
10143+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10144+func_xform ()\
10145+{\
10146+ func_xform_result=${1%.*}.lo\
10147+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10148+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10149+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10150+test 0 -eq $? || _lt_function_replace_fail=:
10151+
10152+
10153+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10154+func_arith ()\
10155+{\
10156+ func_arith_result=$(( $* ))\
10157+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10158+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10159+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10160+test 0 -eq $? || _lt_function_replace_fail=:
10161+
10162+
10163+ sed -e '/^func_len ()$/,/^} # func_len /c\
10164+func_len ()\
10165+{\
10166+ func_len_result=${#1}\
10167+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10168+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10169+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10170+test 0 -eq $? || _lt_function_replace_fail=:
10171+
10172+fi
10173+
10174+if test x"$lt_shell_append" = xyes; then
10175+ sed -e '/^func_append ()$/,/^} # func_append /c\
10176+func_append ()\
10177+{\
10178+ eval "${1}+=\\${2}"\
10179+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10180+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10181+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10182+test 0 -eq $? || _lt_function_replace_fail=:
10183+
10184+
10185+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10186+func_append_quoted ()\
10187+{\
10188+\ func_quote_for_eval "${2}"\
10189+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10190+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10191+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10192+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10193+test 0 -eq $? || _lt_function_replace_fail=:
10194+
10195+
10196+ # Save a `func_append' function call where possible by direct use of '+='
10197+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10198+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10199+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10200+ test 0 -eq $? || _lt_function_replace_fail=:
10201+else
10202+ # Save a `func_append' function call even when '+=' is not available
10203+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10204+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10205+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10206+ test 0 -eq $? || _lt_function_replace_fail=:
10207+fi
10208+
10209+if test x"$_lt_function_replace_fail" = x":"; then
10210+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10211+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10212+fi
10213+
10214+
10215+ mv -f "$cfgfile" "$ofile" ||
10216 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10217 chmod +x "$ofile"
10218
10219@@ -19822,12 +20667,12 @@ with_gcc=$GCC_CXX
10220 # Compiler flag to turn off builtin functions.
10221 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10222
10223-# How to pass a linker flag through the compiler.
10224-wl=$lt_lt_prog_compiler_wl_CXX
10225-
10226 # Additional compiler flags for building library objects.
10227 pic_flag=$lt_lt_prog_compiler_pic_CXX
10228
10229+# How to pass a linker flag through the compiler.
10230+wl=$lt_lt_prog_compiler_wl_CXX
10231+
10232 # Compiler flag to prevent dynamic linking.
10233 link_static_flag=$lt_lt_prog_compiler_static_CXX
10234
10235@@ -19914,9 +20759,6 @@ inherit_rpath=$inherit_rpath_CXX
10236 # Whether libtool must link a program against all its dependency libraries.
10237 link_all_deplibs=$link_all_deplibs_CXX
10238
10239-# Fix the shell variable \$srcfile for the compiler.
10240-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10241-
10242 # Set to "yes" if exported symbols are required.
10243 always_export_symbols=$always_export_symbols_CXX
10244
10245@@ -19932,6 +20774,9 @@ include_expsyms=$lt_include_expsyms_CXX
10246 # Commands necessary for linking programs (against libraries) with templates.
10247 prelink_cmds=$lt_prelink_cmds_CXX
10248
10249+# Commands necessary for finishing linking programs.
10250+postlink_cmds=$lt_postlink_cmds_CXX
10251+
10252 # Specify filename containing input files.
10253 file_list_spec=$lt_file_list_spec_CXX
10254
10255diff --git a/libtool.m4 b/libtool.m4
10256index 24d13f3440..e45fdc6998 100644
10257--- a/libtool.m4
10258+++ b/libtool.m4
10259@@ -1,7 +1,8 @@
10260 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10261 #
10262 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10263-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10264+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10265+# Inc.
10266 # Written by Gordon Matzigkeit, 1996
10267 #
10268 # This file is free software; the Free Software Foundation gives
10269@@ -10,7 +11,8 @@
10270
10271 m4_define([_LT_COPYING], [dnl
10272 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10273-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10274+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10275+# Inc.
10276 # Written by Gordon Matzigkeit, 1996
10277 #
10278 # This file is part of GNU Libtool.
10279@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10280 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10281 ])
10282
10283-# serial 56 LT_INIT
10284+# serial 57 LT_INIT
10285
10286
10287 # LT_PREREQ(VERSION)
10288@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10289 LIBTOOL_DEPS="$ltmain"
10290
10291 # Always use our own libtool.
10292-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10293+LIBTOOL='$(SHELL) $(top_builddir)'
10294+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10295 AC_SUBST(LIBTOOL)dnl
10296
10297 _LT_SETUP
10298@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
10299 dnl
10300 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10301 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10302+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10303 m4_require([_LT_CMD_RELOAD])dnl
10304 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10305+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10306 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10307 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10308+m4_require([_LT_WITH_SYSROOT])dnl
10309
10310 _LT_CONFIG_LIBTOOL_INIT([
10311 # See if we are running on zsh, and set the options which allow our
10312@@ -199,7 +205,7 @@ aix3*)
10313 esac
10314
10315 # Global variables:
10316-ofile=libtool
10317+ofile=${host_alias}-libtool
10318 can_build_shared=yes
10319
10320 # All known linkers require a `.a' archive for static linking (except MSVC,
10321@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
10322 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10323 configured by $[0], generated by m4_PACKAGE_STRING.
10324
10325-Copyright (C) 2009 Free Software Foundation, Inc.
10326+Copyright (C) 2010 Free Software Foundation, Inc.
10327 This config.lt script is free software; the Free Software Foundation
10328 gives unlimited permision to copy, distribute and modify it."
10329
10330@@ -746,15 +752,12 @@ _LT_EOF
10331 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10332 # text mode, it properly converts lines to CR/LF. This bash problem
10333 # is reportedly fixed, but why not run on old versions too?
10334- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10335- || (rm -f "$cfgfile"; exit 1)
10336+ sed '$q' "$ltmain" >> "$cfgfile" \
10337+ || (rm -f "$cfgfile"; exit 1)
10338
10339- _LT_PROG_XSI_SHELLFNS
10340+ _LT_PROG_REPLACE_SHELLFNS
10341
10342- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10343- || (rm -f "$cfgfile"; exit 1)
10344-
10345- mv -f "$cfgfile" "$ofile" ||
10346+ mv -f "$cfgfile" "$ofile" ||
10347 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10348 chmod +x "$ofile"
10349 ],
10350@@ -980,6 +983,8 @@ _LT_EOF
10351 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10352 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10353 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10354+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10355+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10356 cat > conftest.c << _LT_EOF
10357 int main() { return 0;}
10358 _LT_EOF
10359@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10360 fi
10361 ])
10362
10363-# _LT_SYS_MODULE_PATH_AIX
10364-# -----------------------
10365+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10366+# ----------------------------------
10367 # Links a minimal program and checks the executable
10368 # for the system default hardcoded library path. In most cases,
10369 # this is /usr/lib:/lib, but when the MPI compilers are used
10370 # the location of the communication and MPI libs are included too.
10371 # If we don't find anything, use the default library path according
10372 # to the aix ld manual.
10373+# Store the results from the different compilers for each TAGNAME.
10374+# Allow to override them for all tags through lt_cv_aix_libpath.
10375 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10376 [m4_require([_LT_DECL_SED])dnl
10377-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
10378-lt_aix_libpath_sed='
10379- /Import File Strings/,/^$/ {
10380- /^0/ {
10381- s/^0 *\(.*\)$/\1/
10382- p
10383- }
10384- }'
10385-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10386-# Check for a 64-bit object if we didn't find anything.
10387-if test -z "$aix_libpath"; then
10388- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10389-fi],[])
10390-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10391+if test "${lt_cv_aix_libpath+set}" = set; then
10392+ aix_libpath=$lt_cv_aix_libpath
10393+else
10394+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10395+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10396+ lt_aix_libpath_sed='[
10397+ /Import File Strings/,/^$/ {
10398+ /^0/ {
10399+ s/^0 *\([^ ]*\) *$/\1/
10400+ p
10401+ }
10402+ }]'
10403+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10404+ # Check for a 64-bit object if we didn't find anything.
10405+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10406+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10407+ fi],[])
10408+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10409+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10410+ fi
10411+ ])
10412+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10413+fi
10414 ])# _LT_SYS_MODULE_PATH_AIX
10415
10416
10417@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10418
10419 AC_MSG_CHECKING([how to print strings])
10420 # Test print first, because it will be a builtin if present.
10421-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10422+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10423 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10424 ECHO='print -r --'
10425 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10426@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
10427 ])# _LT_PROG_ECHO_BACKSLASH
10428
10429
10430+# _LT_WITH_SYSROOT
10431+# ----------------
10432+AC_DEFUN([_LT_WITH_SYSROOT],
10433+[AC_MSG_CHECKING([for sysroot])
10434+AC_ARG_WITH([libtool-sysroot],
10435+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10436+ (or the compiler's sysroot if not specified).],
10437+[], [with_libtool_sysroot=no])
10438+
10439+dnl lt_sysroot will always be passed unquoted. We quote it here
10440+dnl in case the user passed a directory name.
10441+lt_sysroot=
10442+case ${with_libtool_sysroot} in #(
10443+ yes)
10444+ if test "$GCC" = yes; then
10445+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10446+ fi
10447+ ;; #(
10448+ /*)
10449+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10450+ ;; #(
10451+ no|'')
10452+ ;; #(
10453+ *)
10454+ AC_MSG_RESULT([${with_libtool_sysroot}])
10455+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10456+ ;;
10457+esac
10458+
10459+ AC_MSG_RESULT([${lt_sysroot:-no}])
10460+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10461+[dependent libraries, and in which our libraries should be installed.])])
10462+
10463 # _LT_ENABLE_LOCK
10464 # ---------------
10465 m4_defun([_LT_ENABLE_LOCK],
10466@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10467 ])# _LT_ENABLE_LOCK
10468
10469
10470+# _LT_PROG_AR
10471+# -----------
10472+m4_defun([_LT_PROG_AR],
10473+[AC_CHECK_TOOLS(AR, [ar], false)
10474+: ${AR=ar}
10475+: ${AR_FLAGS=cru}
10476+_LT_DECL([], [AR], [1], [The archiver])
10477+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10478+
10479+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10480+ [lt_cv_ar_at_file=no
10481+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10482+ [echo conftest.$ac_objext > conftest.lst
10483+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10484+ AC_TRY_EVAL([lt_ar_try])
10485+ if test "$ac_status" -eq 0; then
10486+ # Ensure the archiver fails upon bogus file names.
10487+ rm -f conftest.$ac_objext libconftest.a
10488+ AC_TRY_EVAL([lt_ar_try])
10489+ if test "$ac_status" -ne 0; then
10490+ lt_cv_ar_at_file=@
10491+ fi
10492+ fi
10493+ rm -f conftest.* libconftest.a
10494+ ])
10495+ ])
10496+
10497+if test "x$lt_cv_ar_at_file" = xno; then
10498+ archiver_list_spec=
10499+else
10500+ archiver_list_spec=$lt_cv_ar_at_file
10501+fi
10502+_LT_DECL([], [archiver_list_spec], [1],
10503+ [How to feed a file listing to the archiver])
10504+])# _LT_PROG_AR
10505+
10506+
10507 # _LT_CMD_OLD_ARCHIVE
10508 # -------------------
10509 m4_defun([_LT_CMD_OLD_ARCHIVE],
10510-[AC_CHECK_TOOL(AR, ar, false)
10511-test -z "$AR" && AR=ar
10512-test -z "$AR_FLAGS" && AR_FLAGS=cru
10513-_LT_DECL([], [AR], [1], [The archiver])
10514-_LT_DECL([], [AR_FLAGS], [1])
10515+[_LT_PROG_AR
10516
10517 AC_CHECK_TOOL(STRIP, strip, :)
10518 test -z "$STRIP" && STRIP=:
10519@@ -1623,7 +1705,7 @@ else
10520 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10521 lt_status=$lt_dlunknown
10522 cat > conftest.$ac_ext <<_LT_EOF
10523-[#line __oline__ "configure"
10524+[#line $LINENO "configure"
10525 #include "confdefs.h"
10526
10527 #if HAVE_DLFCN_H
10528@@ -1667,10 +1749,10 @@ else
10529 /* When -fvisbility=hidden is used, assume the code has been annotated
10530 correspondingly for the symbols needed. */
10531 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10532-void fnord () __attribute__((visibility("default")));
10533+int fnord () __attribute__((visibility("default")));
10534 #endif
10535
10536-void fnord () { int i=42; }
10537+int fnord () { return 42; }
10538 int main ()
10539 {
10540 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10541@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10542 need_version=no
10543 need_lib_prefix=no
10544
10545- case $GCC,$host_os in
10546- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10547+ case $GCC,$cc_basename in
10548+ yes,*)
10549+ # gcc
10550 library_names_spec='$libname.dll.a'
10551 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10552 postinstall_cmds='base_file=`basename \${file}`~
10553@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10554 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10555 ;;
10556 esac
10557+ dynamic_linker='Win32 ld.exe'
10558+ ;;
10559+
10560+ *,cl*)
10561+ # Native MSVC
10562+ libname_spec='$name'
10563+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10564+ library_names_spec='${libname}.dll.lib'
10565+
10566+ case $build_os in
10567+ mingw*)
10568+ sys_lib_search_path_spec=
10569+ lt_save_ifs=$IFS
10570+ IFS=';'
10571+ for lt_path in $LIB
10572+ do
10573+ IFS=$lt_save_ifs
10574+ # Let DOS variable expansion print the short 8.3 style file name.
10575+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10576+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10577+ done
10578+ IFS=$lt_save_ifs
10579+ # Convert to MSYS style.
10580+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10581+ ;;
10582+ cygwin*)
10583+ # Convert to unix form, then to dos form, then back to unix form
10584+ # but this time dos style (no spaces!) so that the unix form looks
10585+ # like /cygdrive/c/PROGRA~1:/cygdr...
10586+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10587+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10588+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10589+ ;;
10590+ *)
10591+ sys_lib_search_path_spec="$LIB"
10592+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10593+ # It is most probably a Windows format PATH.
10594+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10595+ else
10596+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10597+ fi
10598+ # FIXME: find the short name or the path components, as spaces are
10599+ # common. (e.g. "Program Files" -> "PROGRA~1")
10600+ ;;
10601+ esac
10602+
10603+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10604+ postinstall_cmds='base_file=`basename \${file}`~
10605+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10606+ dldir=$destdir/`dirname \$dlpath`~
10607+ test -d \$dldir || mkdir -p \$dldir~
10608+ $install_prog $dir/$dlname \$dldir/$dlname'
10609+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10610+ dlpath=$dir/\$dldll~
10611+ $RM \$dlpath'
10612+ shlibpath_overrides_runpath=yes
10613+ dynamic_linker='Win32 link.exe'
10614 ;;
10615
10616 *)
10617+ # Assume MSVC wrapper
10618 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10619+ dynamic_linker='Win32 ld.exe'
10620 ;;
10621 esac
10622- dynamic_linker='Win32 ld.exe'
10623 # FIXME: first we should search . and the directory the executable is in
10624 shlibpath_var=PATH
10625 ;;
10626@@ -2342,7 +2483,7 @@ haiku*)
10627 soname_spec='${libname}${release}${shared_ext}$major'
10628 shlibpath_var=LIBRARY_PATH
10629 shlibpath_overrides_runpath=yes
10630- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10631+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10632 hardcode_into_libs=yes
10633 ;;
10634
10635@@ -2950,6 +3091,11 @@ case $reload_flag in
10636 esac
10637 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10638 case $host_os in
10639+ cygwin* | mingw* | pw32* | cegcc*)
10640+ if test "$GCC" != yes; then
10641+ reload_cmds=false
10642+ fi
10643+ ;;
10644 darwin*)
10645 if test "$GCC" = yes; then
10646 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10647@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10648 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10649 lt_cv_file_magic_cmd='func_win32_libid'
10650 else
10651- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10652+ # Keep this pattern in sync with the one in func_win32_libid.
10653+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10654 lt_cv_file_magic_cmd='$OBJDUMP -f'
10655 fi
10656 ;;
10657@@ -3167,6 +3314,21 @@ tpf*)
10658 ;;
10659 esac
10660 ])
10661+
10662+file_magic_glob=
10663+want_nocaseglob=no
10664+if test "$build" = "$host"; then
10665+ case $host_os in
10666+ mingw* | pw32*)
10667+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10668+ want_nocaseglob=yes
10669+ else
10670+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10671+ fi
10672+ ;;
10673+ esac
10674+fi
10675+
10676 file_magic_cmd=$lt_cv_file_magic_cmd
10677 deplibs_check_method=$lt_cv_deplibs_check_method
10678 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10679@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10680 _LT_DECL([], [deplibs_check_method], [1],
10681 [Method to check whether dependent libraries are shared objects])
10682 _LT_DECL([], [file_magic_cmd], [1],
10683- [Command to use when deplibs_check_method == "file_magic"])
10684+ [Command to use when deplibs_check_method = "file_magic"])
10685+_LT_DECL([], [file_magic_glob], [1],
10686+ [How to find potential files when deplibs_check_method = "file_magic"])
10687+_LT_DECL([], [want_nocaseglob], [1],
10688+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10689 ])# _LT_CHECK_MAGIC_METHOD
10690
10691
10692@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10693 dnl AC_DEFUN([AM_PROG_NM], [])
10694 dnl AC_DEFUN([AC_PROG_NM], [])
10695
10696+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10697+# --------------------------------
10698+# how to determine the name of the shared library
10699+# associated with a specific link library.
10700+# -- PORTME fill in with the dynamic library characteristics
10701+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10702+[m4_require([_LT_DECL_EGREP])
10703+m4_require([_LT_DECL_OBJDUMP])
10704+m4_require([_LT_DECL_DLLTOOL])
10705+AC_CACHE_CHECK([how to associate runtime and link libraries],
10706+lt_cv_sharedlib_from_linklib_cmd,
10707+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10708+
10709+case $host_os in
10710+cygwin* | mingw* | pw32* | cegcc*)
10711+ # two different shell functions defined in ltmain.sh
10712+ # decide which to use based on capabilities of $DLLTOOL
10713+ case `$DLLTOOL --help 2>&1` in
10714+ *--identify-strict*)
10715+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10716+ ;;
10717+ *)
10718+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10719+ ;;
10720+ esac
10721+ ;;
10722+*)
10723+ # fallback: assume linklib IS sharedlib
10724+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10725+ ;;
10726+esac
10727+])
10728+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10729+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10730+
10731+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10732+ [Command to associate shared and link libraries])
10733+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10734+
10735+
10736+# _LT_PATH_MANIFEST_TOOL
10737+# ----------------------
10738+# locate the manifest tool
10739+m4_defun([_LT_PATH_MANIFEST_TOOL],
10740+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10741+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10742+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10743+ [lt_cv_path_mainfest_tool=no
10744+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10745+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10746+ cat conftest.err >&AS_MESSAGE_LOG_FD
10747+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10748+ lt_cv_path_mainfest_tool=yes
10749+ fi
10750+ rm -f conftest*])
10751+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10752+ MANIFEST_TOOL=:
10753+fi
10754+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10755+])# _LT_PATH_MANIFEST_TOOL
10756+
10757
10758 # LT_LIB_M
10759 # --------
10760@@ -3403,8 +3630,8 @@ esac
10761 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10762
10763 # Transform an extracted symbol line into symbol name and symbol address
10764-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10765-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'"
10766+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10767+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'"
10768
10769 # Handle CRLF in mingw tool chain
10770 opt_cr=
10771@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10772 else
10773 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10774 fi
10775+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10776
10777 # Check to see that the pipe works correctly.
10778 pipe_works=no
10779@@ -3473,6 +3701,18 @@ _LT_EOF
10780 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10781 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10782 cat <<_LT_EOF > conftest.$ac_ext
10783+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10784+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10785+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10786+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10787+# define LT@&t@_DLSYM_CONST
10788+#elif defined(__osf__)
10789+/* This system does not cope well with relocations in const data. */
10790+# define LT@&t@_DLSYM_CONST
10791+#else
10792+# define LT@&t@_DLSYM_CONST const
10793+#endif
10794+
10795 #ifdef __cplusplus
10796 extern "C" {
10797 #endif
10798@@ -3484,7 +3724,7 @@ _LT_EOF
10799 cat <<_LT_EOF >> conftest.$ac_ext
10800
10801 /* The mapping between symbol names and symbols. */
10802-const struct {
10803+LT@&t@_DLSYM_CONST struct {
10804 const char *name;
10805 void *address;
10806 }
10807@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
10808 _LT_EOF
10809 # Now try linking the two files.
10810 mv conftest.$ac_objext conftstm.$ac_objext
10811- lt_save_LIBS="$LIBS"
10812- lt_save_CFLAGS="$CFLAGS"
10813+ lt_globsym_save_LIBS=$LIBS
10814+ lt_globsym_save_CFLAGS=$CFLAGS
10815 LIBS="conftstm.$ac_objext"
10816 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10817 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10818 pipe_works=yes
10819 fi
10820- LIBS="$lt_save_LIBS"
10821- CFLAGS="$lt_save_CFLAGS"
10822+ LIBS=$lt_globsym_save_LIBS
10823+ CFLAGS=$lt_globsym_save_CFLAGS
10824 else
10825 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10826 fi
10827@@ -3551,6 +3791,13 @@ else
10828 AC_MSG_RESULT(ok)
10829 fi
10830
10831+# Response file support.
10832+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10833+ nm_file_list_spec='@'
10834+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10835+ nm_file_list_spec='@'
10836+fi
10837+
10838 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10839 [Take the output of nm and produce a listing of raw symbols and C names])
10840 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10841@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
10842 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10843 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10844 [Transform the output of nm in a C name address pair when lib prefix is needed])
10845+_LT_DECL([], [nm_file_list_spec], [1],
10846+ [Specify filename containing input files for $NM])
10847 ]) # _LT_CMD_GLOBAL_SYMBOLS
10848
10849
10850@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10851 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10852 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10853
10854-AC_MSG_CHECKING([for $compiler option to produce PIC])
10855 m4_if([$1], [CXX], [
10856 # C++ specific cases for pic, static, wl, etc.
10857 if test "$GXX" = yes; then
10858@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10859 ;;
10860 esac
10861 ;;
10862+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10863+ # This hack is so that the source file can tell whether it is being
10864+ # built for inclusion in a dll (and should export symbols for example).
10865+ m4_if([$1], [GCJ], [],
10866+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10867+ ;;
10868 dgux*)
10869 case $cc_basename in
10870 ec++*)
10871@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10872 ;;
10873 solaris*)
10874 case $cc_basename in
10875- CC*)
10876+ CC* | sunCC*)
10877 # Sun C++ 4.2, 5.x and Centerline C++
10878 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10879 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10880@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10881 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10882 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10883 ;;
10884+ nagfor*)
10885+ # NAG Fortran compiler
10886+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10887+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10888+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10889+ ;;
10890 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10891 # Portland Group compilers (*not* the Pentium gcc compiler,
10892 # which looks to be a dead project)
10893@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10894 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10895 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10896 case $cc_basename in
10897- f77* | f90* | f95*)
10898+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10899 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10900 *)
10901 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10902@@ -4172,9 +4432,11 @@ case $host_os in
10903 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10904 ;;
10905 esac
10906-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10907-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10908- [How to pass a linker flag through the compiler])
10909+
10910+AC_CACHE_CHECK([for $compiler option to produce PIC],
10911+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10912+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10913+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10914
10915 #
10916 # Check to make sure the PIC flag actually works.
10917@@ -4193,6 +4455,8 @@ fi
10918 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10919 [Additional compiler flags for building library objects])
10920
10921+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10922+ [How to pass a linker flag through the compiler])
10923 #
10924 # Check to make sure the static flag actually works.
10925 #
10926@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
10927 m4_defun([_LT_LINKER_SHLIBS],
10928 [AC_REQUIRE([LT_PATH_LD])dnl
10929 AC_REQUIRE([LT_PATH_NM])dnl
10930+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
10931 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10932 m4_require([_LT_DECL_EGREP])dnl
10933 m4_require([_LT_DECL_SED])dnl
10934@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
10935 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10936 m4_if([$1], [CXX], [
10937 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10938+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10939 case $host_os in
10940 aix[[4-9]]*)
10941 # If we're using GNU nm, then we don't want the "-C" option.
10942@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
10943 ;;
10944 pw32*)
10945 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10946- ;;
10947+ ;;
10948 cygwin* | mingw* | cegcc*)
10949- _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'
10950- ;;
10951+ case $cc_basename in
10952+ cl*) ;;
10953+ *)
10954+ _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'
10955+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10956+ ;;
10957+ esac
10958+ ;;
10959 *)
10960 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10961- ;;
10962+ ;;
10963 esac
10964- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10965 ], [
10966 runpath_var=
10967 _LT_TAGVAR(allow_undefined_flag, $1)=
10968@@ -4411,7 +4682,8 @@ _LT_EOF
10969 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
10970 _LT_TAGVAR(always_export_symbols, $1)=no
10971 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10972- _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'
10973+ _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'
10974+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10975
10976 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
10977 _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'
10978@@ -4510,12 +4782,12 @@ _LT_EOF
10979 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
10980 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
10981 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
10982- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
10983+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
10984 if test "x$supports_anon_versioning" = xyes; then
10985 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
10986 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10987 echo "local: *; };" >> $output_objdir/$libname.ver~
10988- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10989+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10990 fi
10991 ;;
10992 esac
10993@@ -4529,8 +4801,8 @@ _LT_EOF
10994 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10995 wlarc=
10996 else
10997- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10998- _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'
10999+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11000+ _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'
11001 fi
11002 ;;
11003
11004@@ -4548,8 +4820,8 @@ _LT_EOF
11005
11006 _LT_EOF
11007 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11008- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11009- _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'
11010+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11011+ _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'
11012 else
11013 _LT_TAGVAR(ld_shlibs, $1)=no
11014 fi
11015@@ -4595,8 +4867,8 @@ _LT_EOF
11016
11017 *)
11018 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11019- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11020- _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'
11021+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11022+ _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'
11023 else
11024 _LT_TAGVAR(ld_shlibs, $1)=no
11025 fi
11026@@ -4726,7 +4998,7 @@ _LT_EOF
11027 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11028 # Determine the default libpath from the value encoded in an
11029 # empty executable.
11030- _LT_SYS_MODULE_PATH_AIX
11031+ _LT_SYS_MODULE_PATH_AIX([$1])
11032 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11033 _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"
11034 else
11035@@ -4737,7 +5009,7 @@ _LT_EOF
11036 else
11037 # Determine the default libpath from the value encoded in an
11038 # empty executable.
11039- _LT_SYS_MODULE_PATH_AIX
11040+ _LT_SYS_MODULE_PATH_AIX([$1])
11041 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11042 # Warning - without using the other run time loading flags,
11043 # -berok will link without error, but may produce a broken library.
11044@@ -4781,20 +5053,63 @@ _LT_EOF
11045 # Microsoft Visual C++.
11046 # hardcode_libdir_flag_spec is actually meaningless, as there is
11047 # no search path for DLLs.
11048- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11049- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11050- # Tell ltmain to make .lib files, not .a files.
11051- libext=lib
11052- # Tell ltmain to make .dll files, not .so files.
11053- shrext_cmds=".dll"
11054- # FIXME: Setting linknames here is a bad hack.
11055- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11056- # The linker will automatically build a .lib file if we build a DLL.
11057- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11058- # FIXME: Should let the user specify the lib program.
11059- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11060- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11061- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11062+ case $cc_basename in
11063+ cl*)
11064+ # Native MSVC
11065+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11066+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11067+ _LT_TAGVAR(always_export_symbols, $1)=yes
11068+ _LT_TAGVAR(file_list_spec, $1)='@'
11069+ # Tell ltmain to make .lib files, not .a files.
11070+ libext=lib
11071+ # Tell ltmain to make .dll files, not .so files.
11072+ shrext_cmds=".dll"
11073+ # FIXME: Setting linknames here is a bad hack.
11074+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11075+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11076+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11077+ else
11078+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11079+ fi~
11080+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11081+ linknames='
11082+ # The linker will not automatically build a static lib if we build a DLL.
11083+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11084+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11085+ _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'
11086+ # Don't use ranlib
11087+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11088+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11089+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11090+ case $lt_outputfile in
11091+ *.exe|*.EXE) ;;
11092+ *)
11093+ lt_outputfile="$lt_outputfile.exe"
11094+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11095+ ;;
11096+ esac~
11097+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11098+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11099+ $RM "$lt_outputfile.manifest";
11100+ fi'
11101+ ;;
11102+ *)
11103+ # Assume MSVC wrapper
11104+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11105+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11106+ # Tell ltmain to make .lib files, not .a files.
11107+ libext=lib
11108+ # Tell ltmain to make .dll files, not .so files.
11109+ shrext_cmds=".dll"
11110+ # FIXME: Setting linknames here is a bad hack.
11111+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11112+ # The linker will automatically build a .lib file if we build a DLL.
11113+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11114+ # FIXME: Should let the user specify the lib program.
11115+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11116+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11117+ ;;
11118+ esac
11119 ;;
11120
11121 darwin* | rhapsody*)
11122@@ -4828,7 +5143,7 @@ _LT_EOF
11123
11124 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11125 freebsd* | dragonfly*)
11126- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11127+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11128 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11129 _LT_TAGVAR(hardcode_direct, $1)=yes
11130 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11131@@ -4836,7 +5151,7 @@ _LT_EOF
11132
11133 hpux9*)
11134 if test "$GCC" = yes; then
11135- _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'
11136+ _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'
11137 else
11138 _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'
11139 fi
11140@@ -4852,7 +5167,7 @@ _LT_EOF
11141
11142 hpux10*)
11143 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11144- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11145+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11146 else
11147 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11148 fi
11149@@ -4876,10 +5191,10 @@ _LT_EOF
11150 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11151 ;;
11152 ia64*)
11153- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11154+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11155 ;;
11156 *)
11157- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11158+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11159 ;;
11160 esac
11161 else
11162@@ -4926,16 +5241,31 @@ _LT_EOF
11163
11164 irix5* | irix6* | nonstopux*)
11165 if test "$GCC" = yes; then
11166- _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'
11167+ _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'
11168 # Try to use the -exported_symbol ld option, if it does not
11169 # work, assume that -exports_file does not work either and
11170 # implicitly export all symbols.
11171- save_LDFLAGS="$LDFLAGS"
11172- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11173- AC_LINK_IFELSE(int foo(void) {},
11174- _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'
11175- )
11176- LDFLAGS="$save_LDFLAGS"
11177+ # This should be the same for all languages, so no per-tag cache variable.
11178+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11179+ [lt_cv_irix_exported_symbol],
11180+ [save_LDFLAGS="$LDFLAGS"
11181+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11182+ AC_LINK_IFELSE(
11183+ [AC_LANG_SOURCE(
11184+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11185+ [C++], [[int foo (void) { return 0; }]],
11186+ [Fortran 77], [[
11187+ subroutine foo
11188+ end]],
11189+ [Fortran], [[
11190+ subroutine foo
11191+ end]])])],
11192+ [lt_cv_irix_exported_symbol=yes],
11193+ [lt_cv_irix_exported_symbol=no])
11194+ LDFLAGS="$save_LDFLAGS"])
11195+ if test "$lt_cv_irix_exported_symbol" = yes; then
11196+ _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'
11197+ fi
11198 else
11199 _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'
11200 _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'
11201@@ -5020,7 +5350,7 @@ _LT_EOF
11202 osf4* | osf5*) # as osf3* with the addition of -msym flag
11203 if test "$GCC" = yes; then
11204 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11205- _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'
11206+ _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'
11207 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11208 else
11209 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11210@@ -5039,9 +5369,9 @@ _LT_EOF
11211 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11212 if test "$GCC" = yes; then
11213 wlarc='${wl}'
11214- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11215+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11216 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11217- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11218+ $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'
11219 else
11220 case `$CC -V 2>&1` in
11221 *"Compilers 5.0"*)
11222@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11223 to runtime path list])
11224 _LT_TAGDECL([], [link_all_deplibs], [0],
11225 [Whether libtool must link a program against all its dependency libraries])
11226-_LT_TAGDECL([], [fix_srcfile_path], [1],
11227- [Fix the shell variable $srcfile for the compiler])
11228 _LT_TAGDECL([], [always_export_symbols], [0],
11229 [Set to "yes" if exported symbols are required])
11230 _LT_TAGDECL([], [export_symbols_cmds], [2],
11231@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11232 [Symbols that must always be exported])
11233 _LT_TAGDECL([], [prelink_cmds], [2],
11234 [Commands necessary for linking programs (against libraries) with templates])
11235+_LT_TAGDECL([], [postlink_cmds], [2],
11236+ [Commands necessary for finishing linking programs])
11237 _LT_TAGDECL([], [file_list_spec], [1],
11238 [Specify filename containing input files])
11239 dnl FIXME: Not yet implemented
11240@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11241 m4_defun([_LT_LANG_CXX_CONFIG],
11242 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11243 m4_require([_LT_DECL_EGREP])dnl
11244+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11245 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11246 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11247 (test "X$CXX" != "Xg++"))) ; then
11248@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11249
11250 # Allow CC to be a program name with arguments.
11251 lt_save_CC=$CC
11252+ lt_save_CFLAGS=$CFLAGS
11253 lt_save_LD=$LD
11254 lt_save_GCC=$GCC
11255 GCC=$GXX
11256@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11257 fi
11258 test -z "${LDCXX+set}" || LD=$LDCXX
11259 CC=${CXX-"c++"}
11260+ CFLAGS=$CXXFLAGS
11261 compiler=$CC
11262 _LT_TAGVAR(compiler, $1)=$CC
11263 _LT_CC_BASENAME([$compiler])
11264@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11265 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11266 # Determine the default libpath from the value encoded in an empty
11267 # executable.
11268- _LT_SYS_MODULE_PATH_AIX
11269+ _LT_SYS_MODULE_PATH_AIX([$1])
11270 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11271
11272 _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"
11273@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11274 else
11275 # Determine the default libpath from the value encoded in an
11276 # empty executable.
11277- _LT_SYS_MODULE_PATH_AIX
11278+ _LT_SYS_MODULE_PATH_AIX([$1])
11279 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11280 # Warning - without using the other run time loading flags,
11281 # -berok will link without error, but may produce a broken library.
11282@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
11283 ;;
11284
11285 cygwin* | mingw* | pw32* | cegcc*)
11286- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11287- # as there is no search path for DLLs.
11288- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11289- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11290- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11291- _LT_TAGVAR(always_export_symbols, $1)=no
11292- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11293-
11294- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11295- _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'
11296- # If the export-symbols file already is a .def file (1st line
11297- # is EXPORTS), use it as is; otherwise, prepend...
11298- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11299- cp $export_symbols $output_objdir/$soname.def;
11300- else
11301- echo EXPORTS > $output_objdir/$soname.def;
11302- cat $export_symbols >> $output_objdir/$soname.def;
11303- fi~
11304- $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'
11305- else
11306- _LT_TAGVAR(ld_shlibs, $1)=no
11307- fi
11308- ;;
11309+ case $GXX,$cc_basename in
11310+ ,cl* | no,cl*)
11311+ # Native MSVC
11312+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11313+ # no search path for DLLs.
11314+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11315+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11316+ _LT_TAGVAR(always_export_symbols, $1)=yes
11317+ _LT_TAGVAR(file_list_spec, $1)='@'
11318+ # Tell ltmain to make .lib files, not .a files.
11319+ libext=lib
11320+ # Tell ltmain to make .dll files, not .so files.
11321+ shrext_cmds=".dll"
11322+ # FIXME: Setting linknames here is a bad hack.
11323+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11324+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11325+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11326+ else
11327+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11328+ fi~
11329+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11330+ linknames='
11331+ # The linker will not automatically build a static lib if we build a DLL.
11332+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11333+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11334+ # Don't use ranlib
11335+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11336+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11337+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11338+ case $lt_outputfile in
11339+ *.exe|*.EXE) ;;
11340+ *)
11341+ lt_outputfile="$lt_outputfile.exe"
11342+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11343+ ;;
11344+ esac~
11345+ func_to_tool_file "$lt_outputfile"~
11346+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11347+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11348+ $RM "$lt_outputfile.manifest";
11349+ fi'
11350+ ;;
11351+ *)
11352+ # g++
11353+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11354+ # as there is no search path for DLLs.
11355+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11356+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11357+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11358+ _LT_TAGVAR(always_export_symbols, $1)=no
11359+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11360+
11361+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11362+ _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'
11363+ # If the export-symbols file already is a .def file (1st line
11364+ # is EXPORTS), use it as is; otherwise, prepend...
11365+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11366+ cp $export_symbols $output_objdir/$soname.def;
11367+ else
11368+ echo EXPORTS > $output_objdir/$soname.def;
11369+ cat $export_symbols >> $output_objdir/$soname.def;
11370+ fi~
11371+ $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'
11372+ else
11373+ _LT_TAGVAR(ld_shlibs, $1)=no
11374+ fi
11375+ ;;
11376+ esac
11377+ ;;
11378 darwin* | rhapsody*)
11379 _LT_DARWIN_LINKER_FEATURES($1)
11380 ;;
11381@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11382 ;;
11383 *)
11384 if test "$GXX" = yes; then
11385- _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'
11386+ _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'
11387 else
11388 # FIXME: insert proper C++ library support
11389 _LT_TAGVAR(ld_shlibs, $1)=no
11390@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
11391 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11392 ;;
11393 ia64*)
11394- _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'
11395+ _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'
11396 ;;
11397 *)
11398- _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'
11399+ _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'
11400 ;;
11401 esac
11402 fi
11403@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11404 *)
11405 if test "$GXX" = yes; then
11406 if test "$with_gnu_ld" = no; then
11407- _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'
11408+ _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'
11409 else
11410- _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'
11411+ _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'
11412 fi
11413 fi
11414 _LT_TAGVAR(link_all_deplibs, $1)=yes
11415@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
11416 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11417 rm -rf $tpldir~
11418 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11419- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11420+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11421 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11422 rm -rf $tpldir~
11423 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11424- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11425+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11426 $RANLIB $oldlib'
11427 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11428 rm -rf $tpldir~
11429 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11430- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11431+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11432 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11433 rm -rf $tpldir~
11434 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11435- $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'
11436+ $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'
11437 ;;
11438 *) # Version 6 and above use weak symbols
11439 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11440@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11441 _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'
11442 ;;
11443 *)
11444- _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'
11445+ _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'
11446 ;;
11447 esac
11448
11449@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11450
11451 solaris*)
11452 case $cc_basename in
11453- CC*)
11454+ CC* | sunCC*)
11455 # Sun C++ 4.2, 5.x and Centerline C++
11456 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11457 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11458@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11459 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11460 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11461 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11462- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11463+ _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'
11464 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11465- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11466+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11467
11468 # Commands to make compiler produce verbose output that lists
11469 # what "hidden" libraries, object files and flags are used when
11470@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11471 fi # test -n "$compiler"
11472
11473 CC=$lt_save_CC
11474+ CFLAGS=$lt_save_CFLAGS
11475 LDCXX=$LD
11476 LD=$lt_save_LD
11477 GCC=$lt_save_GCC
11478@@ -6445,6 +6825,29 @@ AC_LANG_POP
11479 ])# _LT_LANG_CXX_CONFIG
11480
11481
11482+# _LT_FUNC_STRIPNAME_CNF
11483+# ----------------------
11484+# func_stripname_cnf prefix suffix name
11485+# strip PREFIX and SUFFIX off of NAME.
11486+# PREFIX and SUFFIX must not contain globbing or regex special
11487+# characters, hashes, percent signs, but SUFFIX may contain a leading
11488+# dot (in which case that matches only a dot).
11489+#
11490+# This function is identical to the (non-XSI) version of func_stripname,
11491+# except this one can be used by m4 code that may be executed by configure,
11492+# rather than the libtool script.
11493+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11494+AC_REQUIRE([_LT_DECL_SED])
11495+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11496+func_stripname_cnf ()
11497+{
11498+ case ${2} in
11499+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11500+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11501+ esac
11502+} # func_stripname_cnf
11503+])# _LT_FUNC_STRIPNAME_CNF
11504+
11505 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11506 # ---------------------------------
11507 # Figure out "hidden" library dependencies from verbose
11508@@ -6453,6 +6856,7 @@ AC_LANG_POP
11509 # objects, libraries and library flags.
11510 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11511 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11512+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11513 # Dependencies to place before and after the object being linked:
11514 _LT_TAGVAR(predep_objects, $1)=
11515 _LT_TAGVAR(postdep_objects, $1)=
11516@@ -6503,6 +6907,13 @@ public class foo {
11517 };
11518 _LT_EOF
11519 ])
11520+
11521+_lt_libdeps_save_CFLAGS=$CFLAGS
11522+case "$CC $CFLAGS " in #(
11523+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11524+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11525+esac
11526+
11527 dnl Parse the compiler output and extract the necessary
11528 dnl objects, libraries and library flags.
11529 if AC_TRY_EVAL(ac_compile); then
11530@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11531 pre_test_object_deps_done=no
11532
11533 for p in `eval "$output_verbose_link_cmd"`; do
11534- case $p in
11535+ case ${prev}${p} in
11536
11537 -L* | -R* | -l*)
11538 # Some compilers place space between "-{L,R}" and the path.
11539@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11540 test $p = "-R"; then
11541 prev=$p
11542 continue
11543- else
11544- prev=
11545 fi
11546
11547+ # Expand the sysroot to ease extracting the directories later.
11548+ if test -z "$prev"; then
11549+ case $p in
11550+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11551+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11552+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11553+ esac
11554+ fi
11555+ case $p in
11556+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11557+ esac
11558 if test "$pre_test_object_deps_done" = no; then
11559- case $p in
11560- -L* | -R*)
11561+ case ${prev} in
11562+ -L | -R)
11563 # Internal compiler library paths should come after those
11564 # provided the user. The postdeps already come after the
11565 # user supplied libs so there is no need to process them.
11566@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11567 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11568 fi
11569 fi
11570+ prev=
11571 ;;
11572
11573+ *.lto.$objext) ;; # Ignore GCC LTO objects
11574 *.$objext)
11575 # This assumes that the test object file only shows up
11576 # once in the compiler output.
11577@@ -6586,6 +7008,7 @@ else
11578 fi
11579
11580 $RM -f confest.$objext
11581+CFLAGS=$_lt_libdeps_save_CFLAGS
11582
11583 # PORTME: override above test on systems where it is broken
11584 m4_if([$1], [CXX],
11585@@ -6622,7 +7045,7 @@ linux*)
11586
11587 solaris*)
11588 case $cc_basename in
11589- CC*)
11590+ CC* | sunCC*)
11591 # The more standards-conforming stlport4 library is
11592 # incompatible with the Cstd library. Avoid specifying
11593 # it if it's in CXXFLAGS. Ignore libCrun as
11594@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11595 # Allow CC to be a program name with arguments.
11596 lt_save_CC="$CC"
11597 lt_save_GCC=$GCC
11598+ lt_save_CFLAGS=$CFLAGS
11599 CC=${F77-"f77"}
11600+ CFLAGS=$FFLAGS
11601 compiler=$CC
11602 _LT_TAGVAR(compiler, $1)=$CC
11603 _LT_CC_BASENAME([$compiler])
11604@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11605
11606 GCC=$lt_save_GCC
11607 CC="$lt_save_CC"
11608+ CFLAGS="$lt_save_CFLAGS"
11609 fi # test "$_lt_disable_F77" != yes
11610
11611 AC_LANG_POP
11612@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11613 # Allow CC to be a program name with arguments.
11614 lt_save_CC="$CC"
11615 lt_save_GCC=$GCC
11616+ lt_save_CFLAGS=$CFLAGS
11617 CC=${FC-"f95"}
11618+ CFLAGS=$FCFLAGS
11619 compiler=$CC
11620 GCC=$ac_cv_fc_compiler_gnu
11621
11622@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11623 fi # test -n "$compiler"
11624
11625 GCC=$lt_save_GCC
11626- CC="$lt_save_CC"
11627+ CC=$lt_save_CC
11628+ CFLAGS=$lt_save_CFLAGS
11629 fi # test "$_lt_disable_FC" != yes
11630
11631 AC_LANG_POP
11632@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11633 _LT_LINKER_BOILERPLATE
11634
11635 # Allow CC to be a program name with arguments.
11636-lt_save_CC="$CC"
11637+lt_save_CC=$CC
11638+lt_save_CFLAGS=$CFLAGS
11639 lt_save_GCC=$GCC
11640 GCC=yes
11641 CC=${GCJ-"gcj"}
11642+CFLAGS=$GCJFLAGS
11643 compiler=$CC
11644 _LT_TAGVAR(compiler, $1)=$CC
11645 _LT_TAGVAR(LD, $1)="$LD"
11646@@ -6992,7 +7423,8 @@ fi
11647 AC_LANG_RESTORE
11648
11649 GCC=$lt_save_GCC
11650-CC="$lt_save_CC"
11651+CC=$lt_save_CC
11652+CFLAGS=$lt_save_CFLAGS
11653 ])# _LT_LANG_GCJ_CONFIG
11654
11655
11656@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11657
11658 # Allow CC to be a program name with arguments.
11659 lt_save_CC="$CC"
11660+lt_save_CFLAGS=$CFLAGS
11661 lt_save_GCC=$GCC
11662 GCC=
11663 CC=${RC-"windres"}
11664+CFLAGS=
11665 compiler=$CC
11666 _LT_TAGVAR(compiler, $1)=$CC
11667 _LT_CC_BASENAME([$compiler])
11668@@ -7042,7 +7476,8 @@ fi
11669
11670 GCC=$lt_save_GCC
11671 AC_LANG_RESTORE
11672-CC="$lt_save_CC"
11673+CC=$lt_save_CC
11674+CFLAGS=$lt_save_CFLAGS
11675 ])# _LT_LANG_RC_CONFIG
11676
11677
11678@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
11679 AC_SUBST([OBJDUMP])
11680 ])
11681
11682+# _LT_DECL_DLLTOOL
11683+# ----------------
11684+# Ensure DLLTOOL variable is set.
11685+m4_defun([_LT_DECL_DLLTOOL],
11686+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11687+test -z "$DLLTOOL" && DLLTOOL=dlltool
11688+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11689+AC_SUBST([DLLTOOL])
11690+])
11691
11692 # _LT_DECL_SED
11693 # ------------
11694@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11695 # Try some XSI features
11696 xsi_shell=no
11697 ( _lt_dummy="a/b/c"
11698- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11699- = c,a/b,, \
11700+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11701+ = c,a/b,b/c, \
11702 && eval 'test $(( 1 + 1 )) -eq 2 \
11703 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11704 && xsi_shell=yes
11705@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
11706 ])# _LT_CHECK_SHELL_FEATURES
11707
11708
11709-# _LT_PROG_XSI_SHELLFNS
11710-# ---------------------
11711-# Bourne and XSI compatible variants of some useful shell functions.
11712-m4_defun([_LT_PROG_XSI_SHELLFNS],
11713-[case $xsi_shell in
11714- yes)
11715- cat << \_LT_EOF >> "$cfgfile"
11716-
11717-# func_dirname file append nondir_replacement
11718-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11719-# otherwise set result to NONDIR_REPLACEMENT.
11720-func_dirname ()
11721-{
11722- case ${1} in
11723- */*) func_dirname_result="${1%/*}${2}" ;;
11724- * ) func_dirname_result="${3}" ;;
11725- esac
11726-}
11727-
11728-# func_basename file
11729-func_basename ()
11730-{
11731- func_basename_result="${1##*/}"
11732-}
11733-
11734-# func_dirname_and_basename file append nondir_replacement
11735-# perform func_basename and func_dirname in a single function
11736-# call:
11737-# dirname: Compute the dirname of FILE. If nonempty,
11738-# add APPEND to the result, otherwise set result
11739-# to NONDIR_REPLACEMENT.
11740-# value returned in "$func_dirname_result"
11741-# basename: Compute filename of FILE.
11742-# value retuned in "$func_basename_result"
11743-# Implementation must be kept synchronized with func_dirname
11744-# and func_basename. For efficiency, we do not delegate to
11745-# those functions but instead duplicate the functionality here.
11746-func_dirname_and_basename ()
11747-{
11748- case ${1} in
11749- */*) func_dirname_result="${1%/*}${2}" ;;
11750- * ) func_dirname_result="${3}" ;;
11751- esac
11752- func_basename_result="${1##*/}"
11753-}
11754-
11755-# func_stripname prefix suffix name
11756-# strip PREFIX and SUFFIX off of NAME.
11757-# PREFIX and SUFFIX must not contain globbing or regex special
11758-# characters, hashes, percent signs, but SUFFIX may contain a leading
11759-# dot (in which case that matches only a dot).
11760-func_stripname ()
11761-{
11762- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11763- # positional parameters, so assign one to ordinary parameter first.
11764- func_stripname_result=${3}
11765- func_stripname_result=${func_stripname_result#"${1}"}
11766- func_stripname_result=${func_stripname_result%"${2}"}
11767-}
11768-
11769-# func_opt_split
11770-func_opt_split ()
11771-{
11772- func_opt_split_opt=${1%%=*}
11773- func_opt_split_arg=${1#*=}
11774-}
11775-
11776-# func_lo2o object
11777-func_lo2o ()
11778-{
11779- case ${1} in
11780- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11781- *) func_lo2o_result=${1} ;;
11782- esac
11783-}
11784-
11785-# func_xform libobj-or-source
11786-func_xform ()
11787-{
11788- func_xform_result=${1%.*}.lo
11789-}
11790-
11791-# func_arith arithmetic-term...
11792-func_arith ()
11793-{
11794- func_arith_result=$(( $[*] ))
11795-}
11796-
11797-# func_len string
11798-# STRING may not start with a hyphen.
11799-func_len ()
11800-{
11801- func_len_result=${#1}
11802-}
11803+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11804+# ------------------------------------------------------
11805+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11806+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11807+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11808+[dnl {
11809+sed -e '/^$1 ()$/,/^} # $1 /c\
11810+$1 ()\
11811+{\
11812+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11813+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11814+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11815+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11816+test 0 -eq $? || _lt_function_replace_fail=:
11817+])
11818
11819-_LT_EOF
11820- ;;
11821- *) # Bourne compatible functions.
11822- cat << \_LT_EOF >> "$cfgfile"
11823
11824-# func_dirname file append nondir_replacement
11825-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11826-# otherwise set result to NONDIR_REPLACEMENT.
11827-func_dirname ()
11828-{
11829- # Extract subdirectory from the argument.
11830- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11831- if test "X$func_dirname_result" = "X${1}"; then
11832- func_dirname_result="${3}"
11833- else
11834- func_dirname_result="$func_dirname_result${2}"
11835- fi
11836-}
11837+# _LT_PROG_REPLACE_SHELLFNS
11838+# -------------------------
11839+# Replace existing portable implementations of several shell functions with
11840+# equivalent extended shell implementations where those features are available..
11841+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11842+[if test x"$xsi_shell" = xyes; then
11843+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11844+ case ${1} in
11845+ */*) func_dirname_result="${1%/*}${2}" ;;
11846+ * ) func_dirname_result="${3}" ;;
11847+ esac])
11848+
11849+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11850+ func_basename_result="${1##*/}"])
11851+
11852+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11853+ case ${1} in
11854+ */*) func_dirname_result="${1%/*}${2}" ;;
11855+ * ) func_dirname_result="${3}" ;;
11856+ esac
11857+ func_basename_result="${1##*/}"])
11858
11859-# func_basename file
11860-func_basename ()
11861-{
11862- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11863-}
11864+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11865+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11866+ # positional parameters, so assign one to ordinary parameter first.
11867+ func_stripname_result=${3}
11868+ func_stripname_result=${func_stripname_result#"${1}"}
11869+ func_stripname_result=${func_stripname_result%"${2}"}])
11870
11871-dnl func_dirname_and_basename
11872-dnl A portable version of this function is already defined in general.m4sh
11873-dnl so there is no need for it here.
11874+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11875+ func_split_long_opt_name=${1%%=*}
11876+ func_split_long_opt_arg=${1#*=}])
11877
11878-# func_stripname prefix suffix name
11879-# strip PREFIX and SUFFIX off of NAME.
11880-# PREFIX and SUFFIX must not contain globbing or regex special
11881-# characters, hashes, percent signs, but SUFFIX may contain a leading
11882-# dot (in which case that matches only a dot).
11883-# func_strip_suffix prefix name
11884-func_stripname ()
11885-{
11886- case ${2} in
11887- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11888- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11889- esac
11890-}
11891+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11892+ func_split_short_opt_arg=${1#??}
11893+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11894
11895-# sed scripts:
11896-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11897-my_sed_long_arg='1s/^-[[^=]]*=//'
11898+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11899+ case ${1} in
11900+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11901+ *) func_lo2o_result=${1} ;;
11902+ esac])
11903
11904-# func_opt_split
11905-func_opt_split ()
11906-{
11907- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
11908- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
11909-}
11910+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
11911
11912-# func_lo2o object
11913-func_lo2o ()
11914-{
11915- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
11916-}
11917+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
11918
11919-# func_xform libobj-or-source
11920-func_xform ()
11921-{
11922- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
11923-}
11924+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
11925+fi
11926
11927-# func_arith arithmetic-term...
11928-func_arith ()
11929-{
11930- func_arith_result=`expr "$[@]"`
11931-}
11932+if test x"$lt_shell_append" = xyes; then
11933+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
11934
11935-# func_len string
11936-# STRING may not start with a hyphen.
11937-func_len ()
11938-{
11939- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
11940-}
11941+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
11942+ func_quote_for_eval "${2}"
11943+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11944+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11945
11946-_LT_EOF
11947-esac
11948+ # Save a `func_append' function call where possible by direct use of '+='
11949+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11950+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11951+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11952+ test 0 -eq $? || _lt_function_replace_fail=:
11953+else
11954+ # Save a `func_append' function call even when '+=' is not available
11955+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
11956+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11957+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11958+ test 0 -eq $? || _lt_function_replace_fail=:
11959+fi
11960
11961-case $lt_shell_append in
11962- yes)
11963- cat << \_LT_EOF >> "$cfgfile"
11964+if test x"$_lt_function_replace_fail" = x":"; then
11965+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11966+fi
11967+])
11968
11969-# func_append var value
11970-# Append VALUE to the end of shell variable VAR.
11971-func_append ()
11972-{
11973- eval "$[1]+=\$[2]"
11974-}
11975-_LT_EOF
11976+# _LT_PATH_CONVERSION_FUNCTIONS
11977+# -----------------------------
11978+# Determine which file name conversion functions should be used by
11979+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
11980+# for certain cross-compile configurations and native mingw.
11981+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
11982+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
11983+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
11984+AC_MSG_CHECKING([how to convert $build file names to $host format])
11985+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
11986+[case $host in
11987+ *-*-mingw* )
11988+ case $build in
11989+ *-*-mingw* ) # actually msys
11990+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11991+ ;;
11992+ *-*-cygwin* )
11993+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11994+ ;;
11995+ * ) # otherwise, assume *nix
11996+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11997+ ;;
11998+ esac
11999 ;;
12000- *)
12001- cat << \_LT_EOF >> "$cfgfile"
12002-
12003-# func_append var value
12004-# Append VALUE to the end of shell variable VAR.
12005-func_append ()
12006-{
12007- eval "$[1]=\$$[1]\$[2]"
12008-}
12009-
12010-_LT_EOF
12011+ *-*-cygwin* )
12012+ case $build in
12013+ *-*-mingw* ) # actually msys
12014+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
12015+ ;;
12016+ *-*-cygwin* )
12017+ lt_cv_to_host_file_cmd=func_convert_file_noop
12018+ ;;
12019+ * ) # otherwise, assume *nix
12020+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
12021+ ;;
12022+ esac
12023 ;;
12024- esac
12025+ * ) # unhandled hosts (and "normal" native builds)
12026+ lt_cv_to_host_file_cmd=func_convert_file_noop
12027+ ;;
12028+esac
12029+])
12030+to_host_file_cmd=$lt_cv_to_host_file_cmd
12031+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12032+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12033+ [0], [convert $build file names to $host format])dnl
12034+
12035+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12036+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12037+[#assume ordinary cross tools, or native build.
12038+lt_cv_to_tool_file_cmd=func_convert_file_noop
12039+case $host in
12040+ *-*-mingw* )
12041+ case $build in
12042+ *-*-mingw* ) # actually msys
12043+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12044+ ;;
12045+ esac
12046+ ;;
12047+esac
12048 ])
12049+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12050+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12051+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12052+ [0], [convert $build files to toolchain format])dnl
12053+])# _LT_PATH_CONVERSION_FUNCTIONS
12054diff --git a/ltmain.sh b/ltmain.sh
12055index 9503ec85d7..70e856e065 100644
12056--- a/ltmain.sh
12057+++ b/ltmain.sh
12058@@ -1,10 +1,9 @@
12059-# Generated from ltmain.m4sh.
12060
12061-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12062+# libtool (GNU libtool) 2.4
12063 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12064
12065 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12066-# 2007, 2008, 2009 Free Software Foundation, Inc.
12067+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12068 # This is free software; see the source for copying conditions. There is NO
12069 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12070
12071@@ -38,7 +37,6 @@
12072 # -n, --dry-run display commands without modifying any files
12073 # --features display basic configuration information and exit
12074 # --mode=MODE use operation mode MODE
12075-# --no-finish let install mode avoid finish commands
12076 # --preserve-dup-deps don't remove duplicate dependency libraries
12077 # --quiet, --silent don't print informational messages
12078 # --no-quiet, --no-silent
12079@@ -71,17 +69,19 @@
12080 # compiler: $LTCC
12081 # compiler flags: $LTCFLAGS
12082 # linker: $LD (gnu? $with_gnu_ld)
12083-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12084+# $progname: (GNU libtool) 2.4
12085 # automake: $automake_version
12086 # autoconf: $autoconf_version
12087 #
12088 # Report bugs to <bug-libtool@gnu.org>.
12089+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12090+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12091
12092 PROGRAM=libtool
12093 PACKAGE=libtool
12094-VERSION=2.2.7a
12095-TIMESTAMP=" 1.3134 2009-11-29"
12096-package_revision=1.3134
12097+VERSION=2.4
12098+TIMESTAMP=""
12099+package_revision=1.3293
12100
12101 # Be Bourne compatible
12102 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12103@@ -106,9 +106,6 @@ _LTECHO_EOF'
12104 }
12105
12106 # NLS nuisances: We save the old values to restore during execute mode.
12107-# Only set LANG and LC_ALL to C if already set.
12108-# These must not be set unconditionally because not all systems understand
12109-# e.g. LANG=C (notably SCO).
12110 lt_user_locale=
12111 lt_safe_locale=
12112 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12113@@ -121,15 +118,13 @@ do
12114 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12115 fi"
12116 done
12117+LC_ALL=C
12118+LANGUAGE=C
12119+export LANGUAGE LC_ALL
12120
12121 $lt_unset CDPATH
12122
12123
12124-
12125-
12126-
12127-
12128-
12129 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12130 # is ksh but when the shell is invoked as "sh" and the current value of
12131 # the _XPG environment variable is not equal to 1 (one), the special
12132@@ -140,7 +135,7 @@ progpath="$0"
12133
12134
12135 : ${CP="cp -f"}
12136-: ${ECHO=$as_echo}
12137+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12138 : ${EGREP="/bin/grep -E"}
12139 : ${FGREP="/bin/grep -F"}
12140 : ${GREP="/bin/grep"}
12141@@ -149,7 +144,7 @@ progpath="$0"
12142 : ${MKDIR="mkdir"}
12143 : ${MV="mv -f"}
12144 : ${RM="rm -f"}
12145-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12146+: ${SED="/bin/sed"}
12147 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12148 : ${Xsed="$SED -e 1s/^X//"}
12149
12150@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12151 dirname="s,/[^/]*$,,"
12152 basename="s,^.*/,,"
12153
12154+# func_dirname file append nondir_replacement
12155+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12156+# otherwise set result to NONDIR_REPLACEMENT.
12157+func_dirname ()
12158+{
12159+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12160+ if test "X$func_dirname_result" = "X${1}"; then
12161+ func_dirname_result="${3}"
12162+ else
12163+ func_dirname_result="$func_dirname_result${2}"
12164+ fi
12165+} # func_dirname may be replaced by extended shell implementation
12166+
12167+
12168+# func_basename file
12169+func_basename ()
12170+{
12171+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12172+} # func_basename may be replaced by extended shell implementation
12173+
12174+
12175 # func_dirname_and_basename file append nondir_replacement
12176 # perform func_basename and func_dirname in a single function
12177 # call:
12178@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12179 # those functions but instead duplicate the functionality here.
12180 func_dirname_and_basename ()
12181 {
12182- # Extract subdirectory from the argument.
12183- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12184- if test "X$func_dirname_result" = "X${1}"; then
12185- func_dirname_result="${3}"
12186- else
12187- func_dirname_result="$func_dirname_result${2}"
12188- fi
12189- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12190-}
12191+ # Extract subdirectory from the argument.
12192+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12193+ if test "X$func_dirname_result" = "X${1}"; then
12194+ func_dirname_result="${3}"
12195+ else
12196+ func_dirname_result="$func_dirname_result${2}"
12197+ fi
12198+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12199+} # func_dirname_and_basename may be replaced by extended shell implementation
12200+
12201+
12202+# func_stripname prefix suffix name
12203+# strip PREFIX and SUFFIX off of NAME.
12204+# PREFIX and SUFFIX must not contain globbing or regex special
12205+# characters, hashes, percent signs, but SUFFIX may contain a leading
12206+# dot (in which case that matches only a dot).
12207+# func_strip_suffix prefix name
12208+func_stripname ()
12209+{
12210+ case ${2} in
12211+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12212+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12213+ esac
12214+} # func_stripname may be replaced by extended shell implementation
12215
12216-# Generated shell functions inserted here.
12217
12218 # These SED scripts presuppose an absolute path with a trailing slash.
12219 pathcar='s,^/\([^/]*\).*$,\1,'
12220@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12221 # Same as above, but do not quote variable references.
12222 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12223
12224+# Sed substitution that turns a string into a regex matching for the
12225+# string literally.
12226+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12227+
12228+# Sed substitution that converts a w32 file name or path
12229+# which contains forward slashes, into one that contains
12230+# (escaped) backslashes. A very naive implementation.
12231+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12232+
12233 # Re-`\' parameter expansions in output of double_quote_subst that were
12234 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12235 # in input to double_quote_subst, that '$' was protected from expansion.
12236@@ -404,7 +443,7 @@ opt_warning=:
12237 # name if it has been set yet.
12238 func_echo ()
12239 {
12240- $ECHO "$progname${mode+: }$mode: $*"
12241+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12242 }
12243
12244 # func_verbose arg...
12245@@ -430,14 +469,14 @@ func_echo_all ()
12246 # Echo program name prefixed message to standard error.
12247 func_error ()
12248 {
12249- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12250+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12251 }
12252
12253 # func_warning arg...
12254 # Echo program name prefixed warning message to standard error.
12255 func_warning ()
12256 {
12257- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12258+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12259
12260 # bash bug again:
12261 :
12262@@ -656,19 +695,35 @@ func_show_eval_locale ()
12263 fi
12264 }
12265
12266-
12267-
12268+# func_tr_sh
12269+# Turn $1 into a string suitable for a shell variable name.
12270+# Result is stored in $func_tr_sh_result. All characters
12271+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12272+# if $1 begins with a digit, a '_' is prepended as well.
12273+func_tr_sh ()
12274+{
12275+ case $1 in
12276+ [0-9]* | *[!a-zA-Z0-9_]*)
12277+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12278+ ;;
12279+ * )
12280+ func_tr_sh_result=$1
12281+ ;;
12282+ esac
12283+}
12284
12285
12286 # func_version
12287 # Echo version message to standard output and exit.
12288 func_version ()
12289 {
12290+ $opt_debug
12291+
12292 $SED -n '/(C)/!b go
12293 :more
12294 /\./!{
12295 N
12296- s/\n# //
12297+ s/\n# / /
12298 b more
12299 }
12300 :go
12301@@ -685,7 +740,9 @@ func_version ()
12302 # Echo short help message to standard output and exit.
12303 func_usage ()
12304 {
12305- $SED -n '/^# Usage:/,/^# *-h/ {
12306+ $opt_debug
12307+
12308+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12309 s/^# //
12310 s/^# *$//
12311 s/\$progname/'$progname'/
12312@@ -701,7 +758,10 @@ func_usage ()
12313 # unless 'noexit' is passed as argument.
12314 func_help ()
12315 {
12316+ $opt_debug
12317+
12318 $SED -n '/^# Usage:/,/# Report bugs to/ {
12319+ :print
12320 s/^# //
12321 s/^# *$//
12322 s*\$progname*'$progname'*
12323@@ -714,7 +774,11 @@ func_help ()
12324 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12325 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12326 p
12327- }' < "$progpath"
12328+ d
12329+ }
12330+ /^# .* home page:/b print
12331+ /^# General help using/b print
12332+ ' < "$progpath"
12333 ret=$?
12334 if test -z "$1"; then
12335 exit $ret
12336@@ -726,12 +790,39 @@ func_help ()
12337 # exit_cmd.
12338 func_missing_arg ()
12339 {
12340- func_error "missing argument for $1"
12341+ $opt_debug
12342+
12343+ func_error "missing argument for $1."
12344 exit_cmd=exit
12345 }
12346
12347-exit_cmd=:
12348
12349+# func_split_short_opt shortopt
12350+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12351+# variables after splitting SHORTOPT after the 2nd character.
12352+func_split_short_opt ()
12353+{
12354+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12355+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12356+
12357+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12358+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12359+} # func_split_short_opt may be replaced by extended shell implementation
12360+
12361+
12362+# func_split_long_opt longopt
12363+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12364+# variables after splitting LONGOPT at the `=' sign.
12365+func_split_long_opt ()
12366+{
12367+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12368+ my_sed_long_arg='1s/^--[^=]*=//'
12369+
12370+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12371+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12372+} # func_split_long_opt may be replaced by extended shell implementation
12373+
12374+exit_cmd=:
12375
12376
12377
12378@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12379 magic_exe="%%%MAGIC EXE variable%%%"
12380
12381 # Global variables.
12382-# $mode is unset
12383 nonopt=
12384-execute_dlfiles=
12385 preserve_args=
12386 lo2o="s/\\.lo\$/.${objext}/"
12387 o2lo="s/\\.${objext}\$/.lo/"
12388 extracted_archives=
12389 extracted_serial=0
12390
12391-opt_dry_run=false
12392-opt_finish=:
12393-opt_duplicate_deps=false
12394-opt_silent=false
12395-opt_debug=:
12396-
12397 # If this variable is set in any of the actions, the command in it
12398 # will be execed at the end. This prevents here-documents from being
12399 # left over by shells.
12400 exec_cmd=
12401
12402+# func_append var value
12403+# Append VALUE to the end of shell variable VAR.
12404+func_append ()
12405+{
12406+ eval "${1}=\$${1}\${2}"
12407+} # func_append may be replaced by extended shell implementation
12408+
12409+# func_append_quoted var value
12410+# Quote VALUE and append to the end of shell variable VAR, separated
12411+# by a space.
12412+func_append_quoted ()
12413+{
12414+ func_quote_for_eval "${2}"
12415+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12416+} # func_append_quoted may be replaced by extended shell implementation
12417+
12418+
12419+# func_arith arithmetic-term...
12420+func_arith ()
12421+{
12422+ func_arith_result=`expr "${@}"`
12423+} # func_arith may be replaced by extended shell implementation
12424+
12425+
12426+# func_len string
12427+# STRING may not start with a hyphen.
12428+func_len ()
12429+{
12430+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12431+} # func_len may be replaced by extended shell implementation
12432+
12433+
12434+# func_lo2o object
12435+func_lo2o ()
12436+{
12437+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12438+} # func_lo2o may be replaced by extended shell implementation
12439+
12440+
12441+# func_xform libobj-or-source
12442+func_xform ()
12443+{
12444+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12445+} # func_xform may be replaced by extended shell implementation
12446+
12447+
12448 # func_fatal_configuration arg...
12449 # Echo program name prefixed message to standard error, followed by
12450 # a configuration failure hint, and exit.
12451@@ -850,130 +979,204 @@ func_enable_tag ()
12452 esac
12453 }
12454
12455-# Parse options once, thoroughly. This comes as soon as possible in
12456-# the script to make things like `libtool --version' happen quickly.
12457+# func_check_version_match
12458+# Ensure that we are using m4 macros, and libtool script from the same
12459+# release of libtool.
12460+func_check_version_match ()
12461 {
12462+ if test "$package_revision" != "$macro_revision"; then
12463+ if test "$VERSION" != "$macro_version"; then
12464+ if test -z "$macro_version"; then
12465+ cat >&2 <<_LT_EOF
12466+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12467+$progname: definition of this LT_INIT comes from an older release.
12468+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12469+$progname: and run autoconf again.
12470+_LT_EOF
12471+ else
12472+ cat >&2 <<_LT_EOF
12473+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12474+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12475+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12476+$progname: and run autoconf again.
12477+_LT_EOF
12478+ fi
12479+ else
12480+ cat >&2 <<_LT_EOF
12481+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12482+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12483+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12484+$progname: of $PACKAGE $VERSION and run autoconf again.
12485+_LT_EOF
12486+ fi
12487
12488- # Shorthand for --mode=foo, only valid as the first argument
12489- case $1 in
12490- clean|clea|cle|cl)
12491- shift; set dummy --mode clean ${1+"$@"}; shift
12492- ;;
12493- compile|compil|compi|comp|com|co|c)
12494- shift; set dummy --mode compile ${1+"$@"}; shift
12495- ;;
12496- execute|execut|execu|exec|exe|ex|e)
12497- shift; set dummy --mode execute ${1+"$@"}; shift
12498- ;;
12499- finish|finis|fini|fin|fi|f)
12500- shift; set dummy --mode finish ${1+"$@"}; shift
12501- ;;
12502- install|instal|insta|inst|ins|in|i)
12503- shift; set dummy --mode install ${1+"$@"}; shift
12504- ;;
12505- link|lin|li|l)
12506- shift; set dummy --mode link ${1+"$@"}; shift
12507- ;;
12508- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12509- shift; set dummy --mode uninstall ${1+"$@"}; shift
12510- ;;
12511- esac
12512+ exit $EXIT_MISMATCH
12513+ fi
12514+}
12515+
12516+
12517+# Shorthand for --mode=foo, only valid as the first argument
12518+case $1 in
12519+clean|clea|cle|cl)
12520+ shift; set dummy --mode clean ${1+"$@"}; shift
12521+ ;;
12522+compile|compil|compi|comp|com|co|c)
12523+ shift; set dummy --mode compile ${1+"$@"}; shift
12524+ ;;
12525+execute|execut|execu|exec|exe|ex|e)
12526+ shift; set dummy --mode execute ${1+"$@"}; shift
12527+ ;;
12528+finish|finis|fini|fin|fi|f)
12529+ shift; set dummy --mode finish ${1+"$@"}; shift
12530+ ;;
12531+install|instal|insta|inst|ins|in|i)
12532+ shift; set dummy --mode install ${1+"$@"}; shift
12533+ ;;
12534+link|lin|li|l)
12535+ shift; set dummy --mode link ${1+"$@"}; shift
12536+ ;;
12537+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12538+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12539+ ;;
12540+esac
12541
12542- # Parse non-mode specific arguments:
12543- while test "$#" -gt 0; do
12544+
12545+
12546+# Option defaults:
12547+opt_debug=:
12548+opt_dry_run=false
12549+opt_config=false
12550+opt_preserve_dup_deps=false
12551+opt_features=false
12552+opt_finish=false
12553+opt_help=false
12554+opt_help_all=false
12555+opt_silent=:
12556+opt_verbose=:
12557+opt_silent=false
12558+opt_verbose=false
12559+
12560+
12561+# Parse options once, thoroughly. This comes as soon as possible in the
12562+# script to make things like `--version' happen as quickly as we can.
12563+{
12564+ # this just eases exit handling
12565+ while test $# -gt 0; do
12566 opt="$1"
12567 shift
12568-
12569 case $opt in
12570- --config) func_config ;;
12571-
12572- --debug) preserve_args="$preserve_args $opt"
12573+ --debug|-x) opt_debug='set -x'
12574 func_echo "enabling shell trace mode"
12575- opt_debug='set -x'
12576 $opt_debug
12577 ;;
12578-
12579- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12580- execute_dlfiles="$execute_dlfiles $1"
12581- shift
12582+ --dry-run|--dryrun|-n)
12583+ opt_dry_run=:
12584 ;;
12585-
12586- --dry-run | -n) opt_dry_run=: ;;
12587- --features) func_features ;;
12588- --finish) mode="finish" ;;
12589- --no-finish) opt_finish=false ;;
12590-
12591- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12592- case $1 in
12593- # Valid mode arguments:
12594- clean) ;;
12595- compile) ;;
12596- execute) ;;
12597- finish) ;;
12598- install) ;;
12599- link) ;;
12600- relink) ;;
12601- uninstall) ;;
12602-
12603- # Catch anything else as an error
12604- *) func_error "invalid argument for $opt"
12605- exit_cmd=exit
12606- break
12607- ;;
12608- esac
12609-
12610- mode="$1"
12611+ --config)
12612+ opt_config=:
12613+func_config
12614+ ;;
12615+ --dlopen|-dlopen)
12616+ optarg="$1"
12617+ opt_dlopen="${opt_dlopen+$opt_dlopen
12618+}$optarg"
12619 shift
12620 ;;
12621-
12622 --preserve-dup-deps)
12623- opt_duplicate_deps=: ;;
12624-
12625- --quiet|--silent) preserve_args="$preserve_args $opt"
12626- opt_silent=:
12627- opt_verbose=false
12628+ opt_preserve_dup_deps=:
12629 ;;
12630-
12631- --no-quiet|--no-silent)
12632- preserve_args="$preserve_args $opt"
12633- opt_silent=false
12634+ --features)
12635+ opt_features=:
12636+func_features
12637 ;;
12638-
12639- --verbose| -v) preserve_args="$preserve_args $opt"
12640+ --finish)
12641+ opt_finish=:
12642+set dummy --mode finish ${1+"$@"}; shift
12643+ ;;
12644+ --help)
12645+ opt_help=:
12646+ ;;
12647+ --help-all)
12648+ opt_help_all=:
12649+opt_help=': help-all'
12650+ ;;
12651+ --mode)
12652+ test $# = 0 && func_missing_arg $opt && break
12653+ optarg="$1"
12654+ opt_mode="$optarg"
12655+case $optarg in
12656+ # Valid mode arguments:
12657+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12658+
12659+ # Catch anything else as an error
12660+ *) func_error "invalid argument for $opt"
12661+ exit_cmd=exit
12662+ break
12663+ ;;
12664+esac
12665+ shift
12666+ ;;
12667+ --no-silent|--no-quiet)
12668 opt_silent=false
12669- opt_verbose=:
12670+func_append preserve_args " $opt"
12671 ;;
12672-
12673- --no-verbose) preserve_args="$preserve_args $opt"
12674+ --no-verbose)
12675 opt_verbose=false
12676+func_append preserve_args " $opt"
12677 ;;
12678-
12679- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12680- preserve_args="$preserve_args $opt $1"
12681- func_enable_tag "$1" # tagname is set here
12682+ --silent|--quiet)
12683+ opt_silent=:
12684+func_append preserve_args " $opt"
12685+ opt_verbose=false
12686+ ;;
12687+ --verbose|-v)
12688+ opt_verbose=:
12689+func_append preserve_args " $opt"
12690+opt_silent=false
12691+ ;;
12692+ --tag)
12693+ test $# = 0 && func_missing_arg $opt && break
12694+ optarg="$1"
12695+ opt_tag="$optarg"
12696+func_append preserve_args " $opt $optarg"
12697+func_enable_tag "$optarg"
12698 shift
12699 ;;
12700
12701+ -\?|-h) func_usage ;;
12702+ --help) func_help ;;
12703+ --version) func_version ;;
12704+
12705 # Separate optargs to long options:
12706- -dlopen=*|--mode=*|--tag=*)
12707- func_opt_split "$opt"
12708- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12709+ --*=*)
12710+ func_split_long_opt "$opt"
12711+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12712 shift
12713 ;;
12714
12715- -\?|-h) func_usage ;;
12716- --help) opt_help=: ;;
12717- --help-all) opt_help=': help-all' ;;
12718- --version) func_version ;;
12719-
12720- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12721-
12722- *) nonopt="$opt"
12723- break
12724+ # Separate non-argument short options:
12725+ -\?*|-h*|-n*|-v*)
12726+ func_split_short_opt "$opt"
12727+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12728+ shift
12729 ;;
12730+
12731+ --) break ;;
12732+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12733+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12734 esac
12735 done
12736
12737+ # Validate options:
12738+
12739+ # save first non-option argument
12740+ if test "$#" -gt 0; then
12741+ nonopt="$opt"
12742+ shift
12743+ fi
12744+
12745+ # preserve --debug
12746+ test "$opt_debug" = : || func_append preserve_args " --debug"
12747
12748 case $host in
12749 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12750@@ -981,82 +1184,44 @@ func_enable_tag ()
12751 opt_duplicate_compiler_generated_deps=:
12752 ;;
12753 *)
12754- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12755+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12756 ;;
12757 esac
12758
12759- # Having warned about all mis-specified options, bail out if
12760- # anything was wrong.
12761- $exit_cmd $EXIT_FAILURE
12762-}
12763+ $opt_help || {
12764+ # Sanity checks first:
12765+ func_check_version_match
12766
12767-# func_check_version_match
12768-# Ensure that we are using m4 macros, and libtool script from the same
12769-# release of libtool.
12770-func_check_version_match ()
12771-{
12772- if test "$package_revision" != "$macro_revision"; then
12773- if test "$VERSION" != "$macro_version"; then
12774- if test -z "$macro_version"; then
12775- cat >&2 <<_LT_EOF
12776-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12777-$progname: definition of this LT_INIT comes from an older release.
12778-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12779-$progname: and run autoconf again.
12780-_LT_EOF
12781- else
12782- cat >&2 <<_LT_EOF
12783-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12784-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12785-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12786-$progname: and run autoconf again.
12787-_LT_EOF
12788- fi
12789- else
12790- cat >&2 <<_LT_EOF
12791-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12792-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12793-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12794-$progname: of $PACKAGE $VERSION and run autoconf again.
12795-_LT_EOF
12796+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12797+ func_fatal_configuration "not configured to build any kind of library"
12798 fi
12799
12800- exit $EXIT_MISMATCH
12801- fi
12802-}
12803-
12804+ # Darwin sucks
12805+ eval std_shrext=\"$shrext_cmds\"
12806
12807-## ----------- ##
12808-## Main. ##
12809-## ----------- ##
12810-
12811-$opt_help || {
12812- # Sanity checks first:
12813- func_check_version_match
12814-
12815- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12816- func_fatal_configuration "not configured to build any kind of library"
12817- fi
12818+ # Only execute mode is allowed to have -dlopen flags.
12819+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12820+ func_error "unrecognized option \`-dlopen'"
12821+ $ECHO "$help" 1>&2
12822+ exit $EXIT_FAILURE
12823+ fi
12824
12825- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12826+ # Change the help message to a mode-specific one.
12827+ generic_help="$help"
12828+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12829+ }
12830
12831
12832- # Darwin sucks
12833- eval "std_shrext=\"$shrext_cmds\""
12834+ # Bail if the options were screwed
12835+ $exit_cmd $EXIT_FAILURE
12836+}
12837
12838
12839- # Only execute mode is allowed to have -dlopen flags.
12840- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12841- func_error "unrecognized option \`-dlopen'"
12842- $ECHO "$help" 1>&2
12843- exit $EXIT_FAILURE
12844- fi
12845
12846- # Change the help message to a mode-specific one.
12847- generic_help="$help"
12848- help="Try \`$progname --help --mode=$mode' for more information."
12849-}
12850
12851+## ----------- ##
12852+## Main. ##
12853+## ----------- ##
12854
12855 # func_lalib_p file
12856 # True iff FILE is a libtool `.la' library or `.lo' object file.
12857@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12858 # temporary ltwrapper_script.
12859 func_ltwrapper_scriptname ()
12860 {
12861- func_ltwrapper_scriptname_result=""
12862- if func_ltwrapper_executable_p "$1"; then
12863- func_dirname_and_basename "$1" "" "."
12864- func_stripname '' '.exe' "$func_basename_result"
12865- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12866- fi
12867+ func_dirname_and_basename "$1" "" "."
12868+ func_stripname '' '.exe' "$func_basename_result"
12869+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12870 }
12871
12872 # func_ltwrapper_p file
12873@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12874 save_ifs=$IFS; IFS='~'
12875 for cmd in $1; do
12876 IFS=$save_ifs
12877- eval "cmd=\"$cmd\""
12878+ eval cmd=\"$cmd\"
12879 func_show_eval "$cmd" "${2-:}"
12880 done
12881 IFS=$save_ifs
12882@@ -1172,6 +1334,37 @@ func_source ()
12883 }
12884
12885
12886+# func_resolve_sysroot PATH
12887+# Replace a leading = in PATH with a sysroot. Store the result into
12888+# func_resolve_sysroot_result
12889+func_resolve_sysroot ()
12890+{
12891+ func_resolve_sysroot_result=$1
12892+ case $func_resolve_sysroot_result in
12893+ =*)
12894+ func_stripname '=' '' "$func_resolve_sysroot_result"
12895+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12896+ ;;
12897+ esac
12898+}
12899+
12900+# func_replace_sysroot PATH
12901+# If PATH begins with the sysroot, replace it with = and
12902+# store the result into func_replace_sysroot_result.
12903+func_replace_sysroot ()
12904+{
12905+ case "$lt_sysroot:$1" in
12906+ ?*:"$lt_sysroot"*)
12907+ func_stripname "$lt_sysroot" '' "$1"
12908+ func_replace_sysroot_result="=$func_stripname_result"
12909+ ;;
12910+ *)
12911+ # Including no sysroot.
12912+ func_replace_sysroot_result=$1
12913+ ;;
12914+ esac
12915+}
12916+
12917 # func_infer_tag arg
12918 # Infer tagged configuration to use if any are available and
12919 # if one wasn't chosen via the "--tag" command line option.
12920@@ -1184,8 +1377,7 @@ func_infer_tag ()
12921 if test -n "$available_tags" && test -z "$tagname"; then
12922 CC_quoted=
12923 for arg in $CC; do
12924- func_quote_for_eval "$arg"
12925- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12926+ func_append_quoted CC_quoted "$arg"
12927 done
12928 CC_expanded=`func_echo_all $CC`
12929 CC_quoted_expanded=`func_echo_all $CC_quoted`
12930@@ -1204,8 +1396,7 @@ func_infer_tag ()
12931 CC_quoted=
12932 for arg in $CC; do
12933 # Double-quote args containing other shell metacharacters.
12934- func_quote_for_eval "$arg"
12935- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12936+ func_append_quoted CC_quoted "$arg"
12937 done
12938 CC_expanded=`func_echo_all $CC`
12939 CC_quoted_expanded=`func_echo_all $CC_quoted`
12940@@ -1274,6 +1465,486 @@ EOF
12941 }
12942 }
12943
12944+
12945+##################################################
12946+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
12947+##################################################
12948+
12949+# func_convert_core_file_wine_to_w32 ARG
12950+# Helper function used by file name conversion functions when $build is *nix,
12951+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
12952+# correctly configured wine environment available, with the winepath program
12953+# in $build's $PATH.
12954+#
12955+# ARG is the $build file name to be converted to w32 format.
12956+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
12957+# be empty on error (or when ARG is empty)
12958+func_convert_core_file_wine_to_w32 ()
12959+{
12960+ $opt_debug
12961+ func_convert_core_file_wine_to_w32_result="$1"
12962+ if test -n "$1"; then
12963+ # Unfortunately, winepath does not exit with a non-zero error code, so we
12964+ # are forced to check the contents of stdout. On the other hand, if the
12965+ # command is not found, the shell will set an exit code of 127 and print
12966+ # *an error message* to stdout. So we must check for both error code of
12967+ # zero AND non-empty stdout, which explains the odd construction:
12968+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
12969+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
12970+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
12971+ $SED -e "$lt_sed_naive_backslashify"`
12972+ else
12973+ func_convert_core_file_wine_to_w32_result=
12974+ fi
12975+ fi
12976+}
12977+# end: func_convert_core_file_wine_to_w32
12978+
12979+
12980+# func_convert_core_path_wine_to_w32 ARG
12981+# Helper function used by path conversion functions when $build is *nix, and
12982+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
12983+# configured wine environment available, with the winepath program in $build's
12984+# $PATH. Assumes ARG has no leading or trailing path separator characters.
12985+#
12986+# ARG is path to be converted from $build format to win32.
12987+# Result is available in $func_convert_core_path_wine_to_w32_result.
12988+# Unconvertible file (directory) names in ARG are skipped; if no directory names
12989+# are convertible, then the result may be empty.
12990+func_convert_core_path_wine_to_w32 ()
12991+{
12992+ $opt_debug
12993+ # unfortunately, winepath doesn't convert paths, only file names
12994+ func_convert_core_path_wine_to_w32_result=""
12995+ if test -n "$1"; then
12996+ oldIFS=$IFS
12997+ IFS=:
12998+ for func_convert_core_path_wine_to_w32_f in $1; do
12999+ IFS=$oldIFS
13000+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
13001+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
13002+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
13003+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
13004+ else
13005+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
13006+ fi
13007+ fi
13008+ done
13009+ IFS=$oldIFS
13010+ fi
13011+}
13012+# end: func_convert_core_path_wine_to_w32
13013+
13014+
13015+# func_cygpath ARGS...
13016+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
13017+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
13018+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
13019+# (2), returns the Cygwin file name or path in func_cygpath_result (input
13020+# file name or path is assumed to be in w32 format, as previously converted
13021+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
13022+# or path in func_cygpath_result (input file name or path is assumed to be in
13023+# Cygwin format). Returns an empty string on error.
13024+#
13025+# ARGS are passed to cygpath, with the last one being the file name or path to
13026+# be converted.
13027+#
13028+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13029+# environment variable; do not put it in $PATH.
13030+func_cygpath ()
13031+{
13032+ $opt_debug
13033+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13034+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13035+ if test "$?" -ne 0; then
13036+ # on failure, ensure result is empty
13037+ func_cygpath_result=
13038+ fi
13039+ else
13040+ func_cygpath_result=
13041+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13042+ fi
13043+}
13044+#end: func_cygpath
13045+
13046+
13047+# func_convert_core_msys_to_w32 ARG
13048+# Convert file name or path ARG from MSYS format to w32 format. Return
13049+# result in func_convert_core_msys_to_w32_result.
13050+func_convert_core_msys_to_w32 ()
13051+{
13052+ $opt_debug
13053+ # awkward: cmd appends spaces to result
13054+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13055+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13056+}
13057+#end: func_convert_core_msys_to_w32
13058+
13059+
13060+# func_convert_file_check ARG1 ARG2
13061+# Verify that ARG1 (a file name in $build format) was converted to $host
13062+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13063+# func_to_host_file_result to ARG1).
13064+func_convert_file_check ()
13065+{
13066+ $opt_debug
13067+ if test -z "$2" && test -n "$1" ; then
13068+ func_error "Could not determine host file name corresponding to"
13069+ func_error " \`$1'"
13070+ func_error "Continuing, but uninstalled executables may not work."
13071+ # Fallback:
13072+ func_to_host_file_result="$1"
13073+ fi
13074+}
13075+# end func_convert_file_check
13076+
13077+
13078+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13079+# Verify that FROM_PATH (a path in $build format) was converted to $host
13080+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13081+# func_to_host_file_result to a simplistic fallback value (see below).
13082+func_convert_path_check ()
13083+{
13084+ $opt_debug
13085+ if test -z "$4" && test -n "$3"; then
13086+ func_error "Could not determine the host path corresponding to"
13087+ func_error " \`$3'"
13088+ func_error "Continuing, but uninstalled executables may not work."
13089+ # Fallback. This is a deliberately simplistic "conversion" and
13090+ # should not be "improved". See libtool.info.
13091+ if test "x$1" != "x$2"; then
13092+ lt_replace_pathsep_chars="s|$1|$2|g"
13093+ func_to_host_path_result=`echo "$3" |
13094+ $SED -e "$lt_replace_pathsep_chars"`
13095+ else
13096+ func_to_host_path_result="$3"
13097+ fi
13098+ fi
13099+}
13100+# end func_convert_path_check
13101+
13102+
13103+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13104+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13105+# and appending REPL if ORIG matches BACKPAT.
13106+func_convert_path_front_back_pathsep ()
13107+{
13108+ $opt_debug
13109+ case $4 in
13110+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13111+ ;;
13112+ esac
13113+ case $4 in
13114+ $2 ) func_append func_to_host_path_result "$3"
13115+ ;;
13116+ esac
13117+}
13118+# end func_convert_path_front_back_pathsep
13119+
13120+
13121+##################################################
13122+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13123+##################################################
13124+# invoked via `$to_host_file_cmd ARG'
13125+#
13126+# In each case, ARG is the path to be converted from $build to $host format.
13127+# Result will be available in $func_to_host_file_result.
13128+
13129+
13130+# func_to_host_file ARG
13131+# Converts the file name ARG from $build format to $host format. Return result
13132+# in func_to_host_file_result.
13133+func_to_host_file ()
13134+{
13135+ $opt_debug
13136+ $to_host_file_cmd "$1"
13137+}
13138+# end func_to_host_file
13139+
13140+
13141+# func_to_tool_file ARG LAZY
13142+# converts the file name ARG from $build format to toolchain format. Return
13143+# result in func_to_tool_file_result. If the conversion in use is listed
13144+# in (the comma separated) LAZY, no conversion takes place.
13145+func_to_tool_file ()
13146+{
13147+ $opt_debug
13148+ case ,$2, in
13149+ *,"$to_tool_file_cmd",*)
13150+ func_to_tool_file_result=$1
13151+ ;;
13152+ *)
13153+ $to_tool_file_cmd "$1"
13154+ func_to_tool_file_result=$func_to_host_file_result
13155+ ;;
13156+ esac
13157+}
13158+# end func_to_tool_file
13159+
13160+
13161+# func_convert_file_noop ARG
13162+# Copy ARG to func_to_host_file_result.
13163+func_convert_file_noop ()
13164+{
13165+ func_to_host_file_result="$1"
13166+}
13167+# end func_convert_file_noop
13168+
13169+
13170+# func_convert_file_msys_to_w32 ARG
13171+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13172+# conversion to w32 is not available inside the cwrapper. Returns result in
13173+# func_to_host_file_result.
13174+func_convert_file_msys_to_w32 ()
13175+{
13176+ $opt_debug
13177+ func_to_host_file_result="$1"
13178+ if test -n "$1"; then
13179+ func_convert_core_msys_to_w32 "$1"
13180+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13181+ fi
13182+ func_convert_file_check "$1" "$func_to_host_file_result"
13183+}
13184+# end func_convert_file_msys_to_w32
13185+
13186+
13187+# func_convert_file_cygwin_to_w32 ARG
13188+# Convert file name ARG from Cygwin to w32 format. Returns result in
13189+# func_to_host_file_result.
13190+func_convert_file_cygwin_to_w32 ()
13191+{
13192+ $opt_debug
13193+ func_to_host_file_result="$1"
13194+ if test -n "$1"; then
13195+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13196+ # LT_CYGPATH in this case.
13197+ func_to_host_file_result=`cygpath -m "$1"`
13198+ fi
13199+ func_convert_file_check "$1" "$func_to_host_file_result"
13200+}
13201+# end func_convert_file_cygwin_to_w32
13202+
13203+
13204+# func_convert_file_nix_to_w32 ARG
13205+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13206+# and a working winepath. Returns result in func_to_host_file_result.
13207+func_convert_file_nix_to_w32 ()
13208+{
13209+ $opt_debug
13210+ func_to_host_file_result="$1"
13211+ if test -n "$1"; then
13212+ func_convert_core_file_wine_to_w32 "$1"
13213+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13214+ fi
13215+ func_convert_file_check "$1" "$func_to_host_file_result"
13216+}
13217+# end func_convert_file_nix_to_w32
13218+
13219+
13220+# func_convert_file_msys_to_cygwin ARG
13221+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13222+# Returns result in func_to_host_file_result.
13223+func_convert_file_msys_to_cygwin ()
13224+{
13225+ $opt_debug
13226+ func_to_host_file_result="$1"
13227+ if test -n "$1"; then
13228+ func_convert_core_msys_to_w32 "$1"
13229+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13230+ func_to_host_file_result="$func_cygpath_result"
13231+ fi
13232+ func_convert_file_check "$1" "$func_to_host_file_result"
13233+}
13234+# end func_convert_file_msys_to_cygwin
13235+
13236+
13237+# func_convert_file_nix_to_cygwin ARG
13238+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13239+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13240+# in func_to_host_file_result.
13241+func_convert_file_nix_to_cygwin ()
13242+{
13243+ $opt_debug
13244+ func_to_host_file_result="$1"
13245+ if test -n "$1"; then
13246+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13247+ func_convert_core_file_wine_to_w32 "$1"
13248+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13249+ func_to_host_file_result="$func_cygpath_result"
13250+ fi
13251+ func_convert_file_check "$1" "$func_to_host_file_result"
13252+}
13253+# end func_convert_file_nix_to_cygwin
13254+
13255+
13256+#############################################
13257+# $build to $host PATH CONVERSION FUNCTIONS #
13258+#############################################
13259+# invoked via `$to_host_path_cmd ARG'
13260+#
13261+# In each case, ARG is the path to be converted from $build to $host format.
13262+# The result will be available in $func_to_host_path_result.
13263+#
13264+# Path separators are also converted from $build format to $host format. If
13265+# ARG begins or ends with a path separator character, it is preserved (but
13266+# converted to $host format) on output.
13267+#
13268+# All path conversion functions are named using the following convention:
13269+# file name conversion function : func_convert_file_X_to_Y ()
13270+# path conversion function : func_convert_path_X_to_Y ()
13271+# where, for any given $build/$host combination the 'X_to_Y' value is the
13272+# same. If conversion functions are added for new $build/$host combinations,
13273+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13274+# will break.
13275+
13276+
13277+# func_init_to_host_path_cmd
13278+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13279+# appropriate value, based on the value of $to_host_file_cmd.
13280+to_host_path_cmd=
13281+func_init_to_host_path_cmd ()
13282+{
13283+ $opt_debug
13284+ if test -z "$to_host_path_cmd"; then
13285+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13286+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13287+ fi
13288+}
13289+
13290+
13291+# func_to_host_path ARG
13292+# Converts the path ARG from $build format to $host format. Return result
13293+# in func_to_host_path_result.
13294+func_to_host_path ()
13295+{
13296+ $opt_debug
13297+ func_init_to_host_path_cmd
13298+ $to_host_path_cmd "$1"
13299+}
13300+# end func_to_host_path
13301+
13302+
13303+# func_convert_path_noop ARG
13304+# Copy ARG to func_to_host_path_result.
13305+func_convert_path_noop ()
13306+{
13307+ func_to_host_path_result="$1"
13308+}
13309+# end func_convert_path_noop
13310+
13311+
13312+# func_convert_path_msys_to_w32 ARG
13313+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13314+# conversion to w32 is not available inside the cwrapper. Returns result in
13315+# func_to_host_path_result.
13316+func_convert_path_msys_to_w32 ()
13317+{
13318+ $opt_debug
13319+ func_to_host_path_result="$1"
13320+ if test -n "$1"; then
13321+ # Remove leading and trailing path separator characters from ARG. MSYS
13322+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13323+ # and winepath ignores them completely.
13324+ func_stripname : : "$1"
13325+ func_to_host_path_tmp1=$func_stripname_result
13326+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13327+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13328+ func_convert_path_check : ";" \
13329+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13330+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13331+ fi
13332+}
13333+# end func_convert_path_msys_to_w32
13334+
13335+
13336+# func_convert_path_cygwin_to_w32 ARG
13337+# Convert path ARG from Cygwin to w32 format. Returns result in
13338+# func_to_host_file_result.
13339+func_convert_path_cygwin_to_w32 ()
13340+{
13341+ $opt_debug
13342+ func_to_host_path_result="$1"
13343+ if test -n "$1"; then
13344+ # See func_convert_path_msys_to_w32:
13345+ func_stripname : : "$1"
13346+ func_to_host_path_tmp1=$func_stripname_result
13347+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13348+ func_convert_path_check : ";" \
13349+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13350+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13351+ fi
13352+}
13353+# end func_convert_path_cygwin_to_w32
13354+
13355+
13356+# func_convert_path_nix_to_w32 ARG
13357+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13358+# a working winepath. Returns result in func_to_host_file_result.
13359+func_convert_path_nix_to_w32 ()
13360+{
13361+ $opt_debug
13362+ func_to_host_path_result="$1"
13363+ if test -n "$1"; then
13364+ # See func_convert_path_msys_to_w32:
13365+ func_stripname : : "$1"
13366+ func_to_host_path_tmp1=$func_stripname_result
13367+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13368+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13369+ func_convert_path_check : ";" \
13370+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13371+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13372+ fi
13373+}
13374+# end func_convert_path_nix_to_w32
13375+
13376+
13377+# func_convert_path_msys_to_cygwin ARG
13378+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13379+# Returns result in func_to_host_file_result.
13380+func_convert_path_msys_to_cygwin ()
13381+{
13382+ $opt_debug
13383+ func_to_host_path_result="$1"
13384+ if test -n "$1"; then
13385+ # See func_convert_path_msys_to_w32:
13386+ func_stripname : : "$1"
13387+ func_to_host_path_tmp1=$func_stripname_result
13388+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13389+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13390+ func_to_host_path_result="$func_cygpath_result"
13391+ func_convert_path_check : : \
13392+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13393+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13394+ fi
13395+}
13396+# end func_convert_path_msys_to_cygwin
13397+
13398+
13399+# func_convert_path_nix_to_cygwin ARG
13400+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13401+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13402+# func_to_host_file_result.
13403+func_convert_path_nix_to_cygwin ()
13404+{
13405+ $opt_debug
13406+ func_to_host_path_result="$1"
13407+ if test -n "$1"; then
13408+ # Remove leading and trailing path separator characters from
13409+ # ARG. msys behavior is inconsistent here, cygpath turns them
13410+ # into '.;' and ';.', and winepath ignores them completely.
13411+ func_stripname : : "$1"
13412+ func_to_host_path_tmp1=$func_stripname_result
13413+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13414+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13415+ func_to_host_path_result="$func_cygpath_result"
13416+ func_convert_path_check : : \
13417+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13418+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13419+ fi
13420+}
13421+# end func_convert_path_nix_to_cygwin
13422+
13423+
13424 # func_mode_compile arg...
13425 func_mode_compile ()
13426 {
13427@@ -1314,12 +1985,12 @@ func_mode_compile ()
13428 ;;
13429
13430 -pie | -fpie | -fPIE)
13431- pie_flag="$pie_flag $arg"
13432+ func_append pie_flag " $arg"
13433 continue
13434 ;;
13435
13436 -shared | -static | -prefer-pic | -prefer-non-pic)
13437- later="$later $arg"
13438+ func_append later " $arg"
13439 continue
13440 ;;
13441
13442@@ -1340,15 +2011,14 @@ func_mode_compile ()
13443 save_ifs="$IFS"; IFS=','
13444 for arg in $args; do
13445 IFS="$save_ifs"
13446- func_quote_for_eval "$arg"
13447- lastarg="$lastarg $func_quote_for_eval_result"
13448+ func_append_quoted lastarg "$arg"
13449 done
13450 IFS="$save_ifs"
13451 func_stripname ' ' '' "$lastarg"
13452 lastarg=$func_stripname_result
13453
13454 # Add the arguments to base_compile.
13455- base_compile="$base_compile $lastarg"
13456+ func_append base_compile " $lastarg"
13457 continue
13458 ;;
13459
13460@@ -1364,8 +2034,7 @@ func_mode_compile ()
13461 esac # case $arg_mode
13462
13463 # Aesthetically quote the previous argument.
13464- func_quote_for_eval "$lastarg"
13465- base_compile="$base_compile $func_quote_for_eval_result"
13466+ func_append_quoted base_compile "$lastarg"
13467 done # for arg
13468
13469 case $arg_mode in
13470@@ -1496,17 +2165,16 @@ compiler."
13471 $opt_dry_run || $RM $removelist
13472 exit $EXIT_FAILURE
13473 fi
13474- removelist="$removelist $output_obj"
13475+ func_append removelist " $output_obj"
13476 $ECHO "$srcfile" > "$lockfile"
13477 fi
13478
13479 $opt_dry_run || $RM $removelist
13480- removelist="$removelist $lockfile"
13481+ func_append removelist " $lockfile"
13482 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13483
13484- if test -n "$fix_srcfile_path"; then
13485- eval "srcfile=\"$fix_srcfile_path\""
13486- fi
13487+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13488+ srcfile=$func_to_tool_file_result
13489 func_quote_for_eval "$srcfile"
13490 qsrcfile=$func_quote_for_eval_result
13491
13492@@ -1526,7 +2194,7 @@ compiler."
13493
13494 if test -z "$output_obj"; then
13495 # Place PIC objects in $objdir
13496- command="$command -o $lobj"
13497+ func_append command " -o $lobj"
13498 fi
13499
13500 func_show_eval_locale "$command" \
13501@@ -1573,11 +2241,11 @@ compiler."
13502 command="$base_compile $qsrcfile $pic_flag"
13503 fi
13504 if test "$compiler_c_o" = yes; then
13505- command="$command -o $obj"
13506+ func_append command " -o $obj"
13507 fi
13508
13509 # Suppress compiler output if we already did a PIC compilation.
13510- command="$command$suppress_output"
13511+ func_append command "$suppress_output"
13512 func_show_eval_locale "$command" \
13513 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13514
13515@@ -1622,13 +2290,13 @@ compiler."
13516 }
13517
13518 $opt_help || {
13519- test "$mode" = compile && func_mode_compile ${1+"$@"}
13520+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13521 }
13522
13523 func_mode_help ()
13524 {
13525 # We need to display help for each of the modes.
13526- case $mode in
13527+ case $opt_mode in
13528 "")
13529 # Generic help is extracted from the usage comments
13530 # at the start of this file.
13531@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
13532
13533 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13534 -no-suppress do not suppress compiler output for multiple passes
13535- -prefer-pic try to building PIC objects only
13536- -prefer-non-pic try to building non-PIC objects only
13537+ -prefer-pic try to build PIC objects only
13538+ -prefer-non-pic try to build non-PIC objects only
13539 -shared do not build a \`.o' file suitable for static linking
13540 -static only build a \`.o' file suitable for static linking
13541 -Wc,FLAG pass FLAG directly to the compiler
13542@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
13543 ;;
13544
13545 *)
13546- func_fatal_help "invalid operation mode \`$mode'"
13547+ func_fatal_help "invalid operation mode \`$opt_mode'"
13548 ;;
13549 esac
13550
13551@@ -1819,13 +2487,13 @@ if $opt_help; then
13552 else
13553 {
13554 func_help noexit
13555- for mode in compile link execute install finish uninstall clean; do
13556+ for opt_mode in compile link execute install finish uninstall clean; do
13557 func_mode_help
13558 done
13559 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13560 {
13561 func_help noexit
13562- for mode in compile link execute install finish uninstall clean; do
13563+ for opt_mode in compile link execute install finish uninstall clean; do
13564 echo
13565 func_mode_help
13566 done
13567@@ -1854,13 +2522,16 @@ func_mode_execute ()
13568 func_fatal_help "you must specify a COMMAND"
13569
13570 # Handle -dlopen flags immediately.
13571- for file in $execute_dlfiles; do
13572+ for file in $opt_dlopen; do
13573 test -f "$file" \
13574 || func_fatal_help "\`$file' is not a file"
13575
13576 dir=
13577 case $file in
13578 *.la)
13579+ func_resolve_sysroot "$file"
13580+ file=$func_resolve_sysroot_result
13581+
13582 # Check to see that this really is a libtool archive.
13583 func_lalib_unsafe_p "$file" \
13584 || func_fatal_help "\`$lib' is not a valid libtool archive"
13585@@ -1882,7 +2553,7 @@ func_mode_execute ()
13586 dir="$func_dirname_result"
13587
13588 if test -f "$dir/$objdir/$dlname"; then
13589- dir="$dir/$objdir"
13590+ func_append dir "/$objdir"
13591 else
13592 if test ! -f "$dir/$dlname"; then
13593 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13594@@ -1907,10 +2578,10 @@ func_mode_execute ()
13595 test -n "$absdir" && dir="$absdir"
13596
13597 # Now add the directory to shlibpath_var.
13598- if eval test -z \"\$$shlibpath_var\"; then
13599- eval $shlibpath_var=\$dir
13600+ if eval "test -z \"\$$shlibpath_var\""; then
13601+ eval "$shlibpath_var=\"\$dir\""
13602 else
13603- eval $shlibpath_var=\$dir:\$$shlibpath_var
13604+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13605 fi
13606 done
13607
13608@@ -1939,8 +2610,7 @@ func_mode_execute ()
13609 ;;
13610 esac
13611 # Quote arguments (to preserve shell metacharacters).
13612- func_quote_for_eval "$file"
13613- args="$args $func_quote_for_eval_result"
13614+ func_append_quoted args "$file"
13615 done
13616
13617 if test "X$opt_dry_run" = Xfalse; then
13618@@ -1972,22 +2642,59 @@ func_mode_execute ()
13619 fi
13620 }
13621
13622-test "$mode" = execute && func_mode_execute ${1+"$@"}
13623+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13624
13625
13626 # func_mode_finish arg...
13627 func_mode_finish ()
13628 {
13629 $opt_debug
13630- libdirs="$nonopt"
13631+ libs=
13632+ libdirs=
13633 admincmds=
13634
13635- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13636- for dir
13637- do
13638- libdirs="$libdirs $dir"
13639- done
13640+ for opt in "$nonopt" ${1+"$@"}
13641+ do
13642+ if test -d "$opt"; then
13643+ func_append libdirs " $opt"
13644
13645+ elif test -f "$opt"; then
13646+ if func_lalib_unsafe_p "$opt"; then
13647+ func_append libs " $opt"
13648+ else
13649+ func_warning "\`$opt' is not a valid libtool archive"
13650+ fi
13651+
13652+ else
13653+ func_fatal_error "invalid argument \`$opt'"
13654+ fi
13655+ done
13656+
13657+ if test -n "$libs"; then
13658+ if test -n "$lt_sysroot"; then
13659+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13660+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13661+ else
13662+ sysroot_cmd=
13663+ fi
13664+
13665+ # Remove sysroot references
13666+ if $opt_dry_run; then
13667+ for lib in $libs; do
13668+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13669+ done
13670+ else
13671+ tmpdir=`func_mktempdir`
13672+ for lib in $libs; do
13673+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13674+ > $tmpdir/tmp-la
13675+ mv -f $tmpdir/tmp-la $lib
13676+ done
13677+ ${RM}r "$tmpdir"
13678+ fi
13679+ fi
13680+
13681+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13682 for libdir in $libdirs; do
13683 if test -n "$finish_cmds"; then
13684 # Do each command in the finish commands.
13685@@ -1997,7 +2704,7 @@ func_mode_finish ()
13686 if test -n "$finish_eval"; then
13687 # Do the single finish_eval.
13688 eval cmds=\"$finish_eval\"
13689- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13690+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13691 $cmds"
13692 fi
13693 done
13694@@ -2006,53 +2713,55 @@ func_mode_finish ()
13695 # Exit here if they wanted silent mode.
13696 $opt_silent && exit $EXIT_SUCCESS
13697
13698- echo "----------------------------------------------------------------------"
13699- echo "Libraries have been installed in:"
13700- for libdir in $libdirs; do
13701- $ECHO " $libdir"
13702- done
13703- echo
13704- echo "If you ever happen to want to link against installed libraries"
13705- echo "in a given directory, LIBDIR, you must either use libtool, and"
13706- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13707- echo "flag during linking and do at least one of the following:"
13708- if test -n "$shlibpath_var"; then
13709- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13710- echo " during execution"
13711- fi
13712- if test -n "$runpath_var"; then
13713- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13714- echo " during linking"
13715- fi
13716- if test -n "$hardcode_libdir_flag_spec"; then
13717- libdir=LIBDIR
13718- eval "flag=\"$hardcode_libdir_flag_spec\""
13719+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13720+ echo "----------------------------------------------------------------------"
13721+ echo "Libraries have been installed in:"
13722+ for libdir in $libdirs; do
13723+ $ECHO " $libdir"
13724+ done
13725+ echo
13726+ echo "If you ever happen to want to link against installed libraries"
13727+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13728+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13729+ echo "flag during linking and do at least one of the following:"
13730+ if test -n "$shlibpath_var"; then
13731+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13732+ echo " during execution"
13733+ fi
13734+ if test -n "$runpath_var"; then
13735+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13736+ echo " during linking"
13737+ fi
13738+ if test -n "$hardcode_libdir_flag_spec"; then
13739+ libdir=LIBDIR
13740+ eval flag=\"$hardcode_libdir_flag_spec\"
13741
13742- $ECHO " - use the \`$flag' linker flag"
13743- fi
13744- if test -n "$admincmds"; then
13745- $ECHO " - have your system administrator run these commands:$admincmds"
13746- fi
13747- if test -f /etc/ld.so.conf; then
13748- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13749- fi
13750- echo
13751+ $ECHO " - use the \`$flag' linker flag"
13752+ fi
13753+ if test -n "$admincmds"; then
13754+ $ECHO " - have your system administrator run these commands:$admincmds"
13755+ fi
13756+ if test -f /etc/ld.so.conf; then
13757+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13758+ fi
13759+ echo
13760
13761- echo "See any operating system documentation about shared libraries for"
13762- case $host in
13763- solaris2.[6789]|solaris2.1[0-9])
13764- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13765- echo "pages."
13766- ;;
13767- *)
13768- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13769- ;;
13770- esac
13771- echo "----------------------------------------------------------------------"
13772+ echo "See any operating system documentation about shared libraries for"
13773+ case $host in
13774+ solaris2.[6789]|solaris2.1[0-9])
13775+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13776+ echo "pages."
13777+ ;;
13778+ *)
13779+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13780+ ;;
13781+ esac
13782+ echo "----------------------------------------------------------------------"
13783+ fi
13784 exit $EXIT_SUCCESS
13785 }
13786
13787-test "$mode" = finish && func_mode_finish ${1+"$@"}
13788+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13789
13790
13791 # func_mode_install arg...
13792@@ -2077,7 +2786,7 @@ func_mode_install ()
13793 # The real first argument should be the name of the installation program.
13794 # Aesthetically quote it.
13795 func_quote_for_eval "$arg"
13796- install_prog="$install_prog$func_quote_for_eval_result"
13797+ func_append install_prog "$func_quote_for_eval_result"
13798 install_shared_prog=$install_prog
13799 case " $install_prog " in
13800 *[\\\ /]cp\ *) install_cp=: ;;
13801@@ -2097,7 +2806,7 @@ func_mode_install ()
13802 do
13803 arg2=
13804 if test -n "$dest"; then
13805- files="$files $dest"
13806+ func_append files " $dest"
13807 dest=$arg
13808 continue
13809 fi
13810@@ -2135,11 +2844,11 @@ func_mode_install ()
13811
13812 # Aesthetically quote the argument.
13813 func_quote_for_eval "$arg"
13814- install_prog="$install_prog $func_quote_for_eval_result"
13815+ func_append install_prog " $func_quote_for_eval_result"
13816 if test -n "$arg2"; then
13817 func_quote_for_eval "$arg2"
13818 fi
13819- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13820+ func_append install_shared_prog " $func_quote_for_eval_result"
13821 done
13822
13823 test -z "$install_prog" && \
13824@@ -2151,7 +2860,7 @@ func_mode_install ()
13825 if test -n "$install_override_mode" && $no_mode; then
13826 if $install_cp; then :; else
13827 func_quote_for_eval "$install_override_mode"
13828- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13829+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13830 fi
13831 fi
13832
13833@@ -2209,10 +2918,13 @@ func_mode_install ()
13834 case $file in
13835 *.$libext)
13836 # Do the static libraries later.
13837- staticlibs="$staticlibs $file"
13838+ func_append staticlibs " $file"
13839 ;;
13840
13841 *.la)
13842+ func_resolve_sysroot "$file"
13843+ file=$func_resolve_sysroot_result
13844+
13845 # Check to see that this really is a libtool archive.
13846 func_lalib_unsafe_p "$file" \
13847 || func_fatal_help "\`$file' is not a valid libtool archive"
13848@@ -2226,23 +2938,30 @@ func_mode_install ()
13849 if test "X$destdir" = "X$libdir"; then
13850 case "$current_libdirs " in
13851 *" $libdir "*) ;;
13852- *) current_libdirs="$current_libdirs $libdir" ;;
13853+ *) func_append current_libdirs " $libdir" ;;
13854 esac
13855 else
13856 # Note the libdir as a future libdir.
13857 case "$future_libdirs " in
13858 *" $libdir "*) ;;
13859- *) future_libdirs="$future_libdirs $libdir" ;;
13860+ *) func_append future_libdirs " $libdir" ;;
13861 esac
13862 fi
13863
13864 func_dirname "$file" "/" ""
13865 dir="$func_dirname_result"
13866- dir="$dir$objdir"
13867+ func_append dir "$objdir"
13868
13869 if test -n "$relink_command"; then
13870+ # Strip any trailing slash from the destination.
13871+ func_stripname '' '/' "$libdir"
13872+ destlibdir=$func_stripname_result
13873+
13874+ func_stripname '' '/' "$destdir"
13875+ s_destdir=$func_stripname_result
13876+
13877 # Determine the prefix the user has applied to our future dir.
13878- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13879+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13880
13881 # Don't allow the user to place us outside of our expected
13882 # location b/c this prevents finding dependent libraries that
13883@@ -2315,7 +3034,7 @@ func_mode_install ()
13884 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13885
13886 # Maybe install the static library, too.
13887- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13888+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13889 ;;
13890
13891 *.lo)
13892@@ -2503,7 +3222,7 @@ func_mode_install ()
13893 test -n "$future_libdirs" && \
13894 func_warning "remember to run \`$progname --finish$future_libdirs'"
13895
13896- if test -n "$current_libdirs" && $opt_finish; then
13897+ if test -n "$current_libdirs"; then
13898 # Maybe just do a dry run.
13899 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13900 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13901@@ -2512,7 +3231,7 @@ func_mode_install ()
13902 fi
13903 }
13904
13905-test "$mode" = install && func_mode_install ${1+"$@"}
13906+test "$opt_mode" = install && func_mode_install ${1+"$@"}
13907
13908
13909 # func_generate_dlsyms outputname originator pic_p
13910@@ -2559,6 +3278,18 @@ extern \"C\" {
13911 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
13912 #endif
13913
13914+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13915+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13916+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13917+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13918+# define LT_DLSYM_CONST
13919+#elif defined(__osf__)
13920+/* This system does not cope well with relocations in const data. */
13921+# define LT_DLSYM_CONST
13922+#else
13923+# define LT_DLSYM_CONST const
13924+#endif
13925+
13926 /* External symbol declarations for the compiler. */\
13927 "
13928
13929@@ -2570,21 +3301,22 @@ extern \"C\" {
13930 # Add our own program objects to the symbol list.
13931 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
13932 for progfile in $progfiles; do
13933- func_verbose "extracting global C symbols from \`$progfile'"
13934- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
13935+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
13936+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
13937+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
13938 done
13939
13940 if test -n "$exclude_expsyms"; then
13941 $opt_dry_run || {
13942- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
13943- $MV "$nlist"T "$nlist"
13944+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
13945+ eval '$MV "$nlist"T "$nlist"'
13946 }
13947 fi
13948
13949 if test -n "$export_symbols_regex"; then
13950 $opt_dry_run || {
13951- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
13952- $MV "$nlist"T "$nlist"
13953+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
13954+ eval '$MV "$nlist"T "$nlist"'
13955 }
13956 fi
13957
13958@@ -2593,23 +3325,23 @@ extern \"C\" {
13959 export_symbols="$output_objdir/$outputname.exp"
13960 $opt_dry_run || {
13961 $RM $export_symbols
13962- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
13963+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13964 case $host in
13965 *cygwin* | *mingw* | *cegcc* )
13966- echo EXPORTS > "$output_objdir/$outputname.def"
13967- cat "$export_symbols" >> "$output_objdir/$outputname.def"
13968+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13969+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
13970 ;;
13971 esac
13972 }
13973 else
13974 $opt_dry_run || {
13975- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
13976- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
13977- $MV "$nlist"T "$nlist"
13978+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
13979+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
13980+ eval '$MV "$nlist"T "$nlist"'
13981 case $host in
13982 *cygwin* | *mingw* | *cegcc* )
13983- echo EXPORTS > "$output_objdir/$outputname.def"
13984- cat "$nlist" >> "$output_objdir/$outputname.def"
13985+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13986+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
13987 ;;
13988 esac
13989 }
13990@@ -2620,10 +3352,52 @@ extern \"C\" {
13991 func_verbose "extracting global C symbols from \`$dlprefile'"
13992 func_basename "$dlprefile"
13993 name="$func_basename_result"
13994- $opt_dry_run || {
13995- $ECHO ": $name " >> "$nlist"
13996- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
13997- }
13998+ case $host in
13999+ *cygwin* | *mingw* | *cegcc* )
14000+ # if an import library, we need to obtain dlname
14001+ if func_win32_import_lib_p "$dlprefile"; then
14002+ func_tr_sh "$dlprefile"
14003+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
14004+ dlprefile_dlbasename=""
14005+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
14006+ # Use subshell, to avoid clobbering current variable values
14007+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
14008+ if test -n "$dlprefile_dlname" ; then
14009+ func_basename "$dlprefile_dlname"
14010+ dlprefile_dlbasename="$func_basename_result"
14011+ else
14012+ # no lafile. user explicitly requested -dlpreopen <import library>.
14013+ $sharedlib_from_linklib_cmd "$dlprefile"
14014+ dlprefile_dlbasename=$sharedlib_from_linklib_result
14015+ fi
14016+ fi
14017+ $opt_dry_run || {
14018+ if test -n "$dlprefile_dlbasename" ; then
14019+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
14020+ else
14021+ func_warning "Could not compute DLL name from $name"
14022+ eval '$ECHO ": $name " >> "$nlist"'
14023+ fi
14024+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14025+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
14026+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
14027+ }
14028+ else # not an import lib
14029+ $opt_dry_run || {
14030+ eval '$ECHO ": $name " >> "$nlist"'
14031+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14032+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14033+ }
14034+ fi
14035+ ;;
14036+ *)
14037+ $opt_dry_run || {
14038+ eval '$ECHO ": $name " >> "$nlist"'
14039+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14040+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14041+ }
14042+ ;;
14043+ esac
14044 done
14045
14046 $opt_dry_run || {
14047@@ -2661,26 +3435,9 @@ typedef struct {
14048 const char *name;
14049 void *address;
14050 } lt_dlsymlist;
14051-"
14052- case $host in
14053- *cygwin* | *mingw* | *cegcc* )
14054- echo >> "$output_objdir/$my_dlsyms" "\
14055-/* DATA imports from DLLs on WIN32 con't be const, because
14056- runtime relocations are performed -- see ld's documentation
14057- on pseudo-relocs. */"
14058- lt_dlsym_const= ;;
14059- *osf5*)
14060- echo >> "$output_objdir/$my_dlsyms" "\
14061-/* This system does not cope well with relocations in const data */"
14062- lt_dlsym_const= ;;
14063- *)
14064- lt_dlsym_const=const ;;
14065- esac
14066-
14067- echo >> "$output_objdir/$my_dlsyms" "\
14068-extern $lt_dlsym_const lt_dlsymlist
14069+extern LT_DLSYM_CONST lt_dlsymlist
14070 lt_${my_prefix}_LTX_preloaded_symbols[];
14071-$lt_dlsym_const lt_dlsymlist
14072+LT_DLSYM_CONST lt_dlsymlist
14073 lt_${my_prefix}_LTX_preloaded_symbols[] =
14074 {\
14075 { \"$my_originator\", (void *) 0 },"
14076@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
14077 for arg in $LTCFLAGS; do
14078 case $arg in
14079 -pie | -fpie | -fPIE) ;;
14080- *) symtab_cflags="$symtab_cflags $arg" ;;
14081+ *) func_append symtab_cflags " $arg" ;;
14082 esac
14083 done
14084
14085@@ -2796,9 +3553,11 @@ func_win32_libid ()
14086 win32_libid_type="x86 archive import"
14087 ;;
14088 *ar\ archive*) # could be an import, or static
14089- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14090- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14091- win32_nmres=`$NM -f posix -A "$1" |
14092+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14093+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14094+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14095+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14096+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14097 $SED -n -e '
14098 1,100{
14099 / I /{
14100@@ -2827,6 +3586,131 @@ func_win32_libid ()
14101 $ECHO "$win32_libid_type"
14102 }
14103
14104+# func_cygming_dll_for_implib ARG
14105+#
14106+# Platform-specific function to extract the
14107+# name of the DLL associated with the specified
14108+# import library ARG.
14109+# Invoked by eval'ing the libtool variable
14110+# $sharedlib_from_linklib_cmd
14111+# Result is available in the variable
14112+# $sharedlib_from_linklib_result
14113+func_cygming_dll_for_implib ()
14114+{
14115+ $opt_debug
14116+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14117+}
14118+
14119+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14120+#
14121+# The is the core of a fallback implementation of a
14122+# platform-specific function to extract the name of the
14123+# DLL associated with the specified import library LIBNAME.
14124+#
14125+# SECTION_NAME is either .idata$6 or .idata$7, depending
14126+# on the platform and compiler that created the implib.
14127+#
14128+# Echos the name of the DLL associated with the
14129+# specified import library.
14130+func_cygming_dll_for_implib_fallback_core ()
14131+{
14132+ $opt_debug
14133+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14134+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14135+ $SED '/^Contents of section '"$match_literal"':/{
14136+ # Place marker at beginning of archive member dllname section
14137+ s/.*/====MARK====/
14138+ p
14139+ d
14140+ }
14141+ # These lines can sometimes be longer than 43 characters, but
14142+ # are always uninteresting
14143+ /:[ ]*file format pe[i]\{,1\}-/d
14144+ /^In archive [^:]*:/d
14145+ # Ensure marker is printed
14146+ /^====MARK====/p
14147+ # Remove all lines with less than 43 characters
14148+ /^.\{43\}/!d
14149+ # From remaining lines, remove first 43 characters
14150+ s/^.\{43\}//' |
14151+ $SED -n '
14152+ # Join marker and all lines until next marker into a single line
14153+ /^====MARK====/ b para
14154+ H
14155+ $ b para
14156+ b
14157+ :para
14158+ x
14159+ s/\n//g
14160+ # Remove the marker
14161+ s/^====MARK====//
14162+ # Remove trailing dots and whitespace
14163+ s/[\. \t]*$//
14164+ # Print
14165+ /./p' |
14166+ # we now have a list, one entry per line, of the stringified
14167+ # contents of the appropriate section of all members of the
14168+ # archive which possess that section. Heuristic: eliminate
14169+ # all those which have a first or second character that is
14170+ # a '.' (that is, objdump's representation of an unprintable
14171+ # character.) This should work for all archives with less than
14172+ # 0x302f exports -- but will fail for DLLs whose name actually
14173+ # begins with a literal '.' or a single character followed by
14174+ # a '.'.
14175+ #
14176+ # Of those that remain, print the first one.
14177+ $SED -e '/^\./d;/^.\./d;q'
14178+}
14179+
14180+# func_cygming_gnu_implib_p ARG
14181+# This predicate returns with zero status (TRUE) if
14182+# ARG is a GNU/binutils-style import library. Returns
14183+# with nonzero status (FALSE) otherwise.
14184+func_cygming_gnu_implib_p ()
14185+{
14186+ $opt_debug
14187+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14188+ 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)$'`
14189+ test -n "$func_cygming_gnu_implib_tmp"
14190+}
14191+
14192+# func_cygming_ms_implib_p ARG
14193+# This predicate returns with zero status (TRUE) if
14194+# ARG is an MS-style import library. Returns
14195+# with nonzero status (FALSE) otherwise.
14196+func_cygming_ms_implib_p ()
14197+{
14198+ $opt_debug
14199+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14200+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14201+ test -n "$func_cygming_ms_implib_tmp"
14202+}
14203+
14204+# func_cygming_dll_for_implib_fallback ARG
14205+# Platform-specific function to extract the
14206+# name of the DLL associated with the specified
14207+# import library ARG.
14208+#
14209+# This fallback implementation is for use when $DLLTOOL
14210+# does not support the --identify-strict option.
14211+# Invoked by eval'ing the libtool variable
14212+# $sharedlib_from_linklib_cmd
14213+# Result is available in the variable
14214+# $sharedlib_from_linklib_result
14215+func_cygming_dll_for_implib_fallback ()
14216+{
14217+ $opt_debug
14218+ if func_cygming_gnu_implib_p "$1" ; then
14219+ # binutils import library
14220+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14221+ elif func_cygming_ms_implib_p "$1" ; then
14222+ # ms-generated import library
14223+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14224+ else
14225+ # unknown
14226+ sharedlib_from_linklib_result=""
14227+ fi
14228+}
14229
14230
14231 # func_extract_an_archive dir oldlib
14232@@ -2917,7 +3801,7 @@ func_extract_archives ()
14233 darwin_file=
14234 darwin_files=
14235 for darwin_file in $darwin_filelist; do
14236- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14237+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14238 $LIPO -create -output "$darwin_file" $darwin_files
14239 done # $darwin_filelist
14240 $RM -rf unfat-$$
14241@@ -2932,7 +3816,7 @@ func_extract_archives ()
14242 func_extract_an_archive "$my_xdir" "$my_xabs"
14243 ;;
14244 esac
14245- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14246+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14247 done
14248
14249 func_extract_archives_result="$my_oldobjs"
14250@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14251 _LTECHO_EOF'
14252 }
14253 ECHO=\"$qECHO\"
14254- fi\
14255+ fi
14256+
14257+# Very basic option parsing. These options are (a) specific to
14258+# the libtool wrapper, (b) are identical between the wrapper
14259+# /script/ and the wrapper /executable/ which is used only on
14260+# windows platforms, and (c) all begin with the string "--lt-"
14261+# (application programs are unlikely to have options which match
14262+# this pattern).
14263+#
14264+# There are only two supported options: --lt-debug and
14265+# --lt-dump-script. There is, deliberately, no --lt-help.
14266+#
14267+# The first argument to this parsing function should be the
14268+# script's $0 value, followed by "$@".
14269+lt_option_debug=
14270+func_parse_lt_options ()
14271+{
14272+ lt_script_arg0=\$0
14273+ shift
14274+ for lt_opt
14275+ do
14276+ case \"\$lt_opt\" in
14277+ --lt-debug) lt_option_debug=1 ;;
14278+ --lt-dump-script)
14279+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14280+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14281+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14282+ cat \"\$lt_dump_D/\$lt_dump_F\"
14283+ exit 0
14284+ ;;
14285+ --lt-*)
14286+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14287+ exit 1
14288+ ;;
14289+ esac
14290+ done
14291+
14292+ # Print the debug banner immediately:
14293+ if test -n \"\$lt_option_debug\"; then
14294+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14295+ fi
14296+}
14297+
14298+# Used when --lt-debug. Prints its arguments to stdout
14299+# (redirection is the responsibility of the caller)
14300+func_lt_dump_args ()
14301+{
14302+ lt_dump_args_N=1;
14303+ for lt_arg
14304+ do
14305+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14306+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14307+ done
14308+}
14309+
14310+# Core function for launching the target application
14311+func_exec_program_core ()
14312+{
14313+"
14314+ case $host in
14315+ # Backslashes separate directories on plain windows
14316+ *-*-mingw | *-*-os2* | *-cegcc*)
14317+ $ECHO "\
14318+ if test -n \"\$lt_option_debug\"; then
14319+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14320+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14321+ fi
14322+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14323+"
14324+ ;;
14325+
14326+ *)
14327+ $ECHO "\
14328+ if test -n \"\$lt_option_debug\"; then
14329+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14330+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14331+ fi
14332+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14333+"
14334+ ;;
14335+ esac
14336+ $ECHO "\
14337+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14338+ exit 1
14339+}
14340+
14341+# A function to encapsulate launching the target application
14342+# Strips options in the --lt-* namespace from \$@ and
14343+# launches target application with the remaining arguments.
14344+func_exec_program ()
14345+{
14346+ for lt_wr_arg
14347+ do
14348+ case \$lt_wr_arg in
14349+ --lt-*) ;;
14350+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14351+ esac
14352+ shift
14353+ done
14354+ func_exec_program_core \${1+\"\$@\"}
14355+}
14356+
14357+ # Parse options
14358+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14359
14360 # Find the directory that this script lives in.
14361 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14362@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14363
14364 # relink executable if necessary
14365 if test -n \"\$relink_command\"; then
14366- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14367+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14368 else
14369 $ECHO \"\$relink_command_output\" >&2
14370 $RM \"\$progdir/\$file\"
14371@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14372
14373 if test -f \"\$progdir/\$program\"; then"
14374
14375+ # fixup the dll searchpath if we need to.
14376+ #
14377+ # Fix the DLL searchpath if we need to. Do this before prepending
14378+ # to shlibpath, because on Windows, both are PATH and uninstalled
14379+ # libraries must come first.
14380+ if test -n "$dllsearchpath"; then
14381+ $ECHO "\
14382+ # Add the dll search path components to the executable PATH
14383+ PATH=$dllsearchpath:\$PATH
14384+"
14385+ fi
14386+
14387 # Export our shlibpath_var if we have one.
14388 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14389 $ECHO "\
14390@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14391 "
14392 fi
14393
14394- # fixup the dll searchpath if we need to.
14395- if test -n "$dllsearchpath"; then
14396- $ECHO "\
14397- # Add the dll search path components to the executable PATH
14398- PATH=$dllsearchpath:\$PATH
14399-"
14400- fi
14401-
14402 $ECHO "\
14403 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14404 # Run the actual program with our arguments.
14405-"
14406- case $host in
14407- # Backslashes separate directories on plain windows
14408- *-*-mingw | *-*-os2* | *-cegcc*)
14409- $ECHO "\
14410- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14411-"
14412- ;;
14413-
14414- *)
14415- $ECHO "\
14416- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14417-"
14418- ;;
14419- esac
14420- $ECHO "\
14421- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14422- exit 1
14423+ func_exec_program \${1+\"\$@\"}
14424 fi
14425 else
14426 # The program doesn't exist.
14427@@ -3158,166 +4132,6 @@ fi\
14428 }
14429
14430
14431-# func_to_host_path arg
14432-#
14433-# Convert paths to host format when used with build tools.
14434-# Intended for use with "native" mingw (where libtool itself
14435-# is running under the msys shell), or in the following cross-
14436-# build environments:
14437-# $build $host
14438-# mingw (msys) mingw [e.g. native]
14439-# cygwin mingw
14440-# *nix + wine mingw
14441-# where wine is equipped with the `winepath' executable.
14442-# In the native mingw case, the (msys) shell automatically
14443-# converts paths for any non-msys applications it launches,
14444-# but that facility isn't available from inside the cwrapper.
14445-# Similar accommodations are necessary for $host mingw and
14446-# $build cygwin. Calling this function does no harm for other
14447-# $host/$build combinations not listed above.
14448-#
14449-# ARG is the path (on $build) that should be converted to
14450-# the proper representation for $host. The result is stored
14451-# in $func_to_host_path_result.
14452-func_to_host_path ()
14453-{
14454- func_to_host_path_result="$1"
14455- if test -n "$1"; then
14456- case $host in
14457- *mingw* )
14458- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14459- case $build in
14460- *mingw* ) # actually, msys
14461- # awkward: cmd appends spaces to result
14462- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14463- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14464- ;;
14465- *cygwin* )
14466- func_to_host_path_result=`cygpath -w "$1" |
14467- $SED -e "$lt_sed_naive_backslashify"`
14468- ;;
14469- * )
14470- # Unfortunately, winepath does not exit with a non-zero
14471- # error code, so we are forced to check the contents of
14472- # stdout. On the other hand, if the command is not
14473- # found, the shell will set an exit code of 127 and print
14474- # *an error message* to stdout. So we must check for both
14475- # error code of zero AND non-empty stdout, which explains
14476- # the odd construction:
14477- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14478- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14479- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14480- $SED -e "$lt_sed_naive_backslashify"`
14481- else
14482- # Allow warning below.
14483- func_to_host_path_result=
14484- fi
14485- ;;
14486- esac
14487- if test -z "$func_to_host_path_result" ; then
14488- func_error "Could not determine host path corresponding to"
14489- func_error " \`$1'"
14490- func_error "Continuing, but uninstalled executables may not work."
14491- # Fallback:
14492- func_to_host_path_result="$1"
14493- fi
14494- ;;
14495- esac
14496- fi
14497-}
14498-# end: func_to_host_path
14499-
14500-# func_to_host_pathlist arg
14501-#
14502-# Convert pathlists to host format when used with build tools.
14503-# See func_to_host_path(), above. This function supports the
14504-# following $build/$host combinations (but does no harm for
14505-# combinations not listed here):
14506-# $build $host
14507-# mingw (msys) mingw [e.g. native]
14508-# cygwin mingw
14509-# *nix + wine mingw
14510-#
14511-# Path separators are also converted from $build format to
14512-# $host format. If ARG begins or ends with a path separator
14513-# character, it is preserved (but converted to $host format)
14514-# on output.
14515-#
14516-# ARG is a pathlist (on $build) that should be converted to
14517-# the proper representation on $host. The result is stored
14518-# in $func_to_host_pathlist_result.
14519-func_to_host_pathlist ()
14520-{
14521- func_to_host_pathlist_result="$1"
14522- if test -n "$1"; then
14523- case $host in
14524- *mingw* )
14525- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14526- # Remove leading and trailing path separator characters from
14527- # ARG. msys behavior is inconsistent here, cygpath turns them
14528- # into '.;' and ';.', and winepath ignores them completely.
14529- func_stripname : : "$1"
14530- func_to_host_pathlist_tmp1=$func_stripname_result
14531- case $build in
14532- *mingw* ) # Actually, msys.
14533- # Awkward: cmd appends spaces to result.
14534- func_to_host_pathlist_result=`
14535- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14536- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14537- ;;
14538- *cygwin* )
14539- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14540- $SED -e "$lt_sed_naive_backslashify"`
14541- ;;
14542- * )
14543- # unfortunately, winepath doesn't convert pathlists
14544- func_to_host_pathlist_result=""
14545- func_to_host_pathlist_oldIFS=$IFS
14546- IFS=:
14547- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14548- IFS=$func_to_host_pathlist_oldIFS
14549- if test -n "$func_to_host_pathlist_f" ; then
14550- func_to_host_path "$func_to_host_pathlist_f"
14551- if test -n "$func_to_host_path_result" ; then
14552- if test -z "$func_to_host_pathlist_result" ; then
14553- func_to_host_pathlist_result="$func_to_host_path_result"
14554- else
14555- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14556- fi
14557- fi
14558- fi
14559- done
14560- IFS=$func_to_host_pathlist_oldIFS
14561- ;;
14562- esac
14563- if test -z "$func_to_host_pathlist_result"; then
14564- func_error "Could not determine the host path(s) corresponding to"
14565- func_error " \`$1'"
14566- func_error "Continuing, but uninstalled executables may not work."
14567- # Fallback. This may break if $1 contains DOS-style drive
14568- # specifications. The fix is not to complicate the expression
14569- # below, but for the user to provide a working wine installation
14570- # with winepath so that path translation in the cross-to-mingw
14571- # case works properly.
14572- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14573- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14574- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14575- fi
14576- # Now, add the leading and trailing path separators back
14577- case "$1" in
14578- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14579- ;;
14580- esac
14581- case "$1" in
14582- *: ) func_append func_to_host_pathlist_result ";"
14583- ;;
14584- esac
14585- ;;
14586- esac
14587- fi
14588-}
14589-# end: func_to_host_pathlist
14590-
14591 # func_emit_cwrapperexe_src
14592 # emit the source code for a wrapper executable on stdout
14593 # Must ONLY be called from within func_mode_link because
14594@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14595
14596 This wrapper executable should never be moved out of the build directory.
14597 If it is, it will not operate correctly.
14598-
14599- Currently, it simply execs the wrapper *script* "$SHELL $output",
14600- but could eventually absorb all of the scripts functionality and
14601- exec $objdir/$outputname directly.
14602 */
14603 EOF
14604 cat <<"EOF"
14605@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
14606 if (stale) { free ((void *) stale); stale = 0; } \
14607 } while (0)
14608
14609-#undef LTWRAPPER_DEBUGPRINTF
14610-#if defined LT_DEBUGWRAPPER
14611-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14612-static void
14613-ltwrapper_debugprintf (const char *fmt, ...)
14614-{
14615- va_list args;
14616- va_start (args, fmt);
14617- (void) vfprintf (stderr, fmt, args);
14618- va_end (args);
14619-}
14620+#if defined(LT_DEBUGWRAPPER)
14621+static int lt_debug = 1;
14622 #else
14623-# define LTWRAPPER_DEBUGPRINTF(args)
14624+static int lt_debug = 0;
14625 #endif
14626
14627-const char *program_name = NULL;
14628+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14629
14630 void *xmalloc (size_t num);
14631 char *xstrdup (const char *string);
14632@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
14633 int make_executable (const char *path);
14634 int check_executable (const char *path);
14635 char *strendzap (char *str, const char *pat);
14636-void lt_fatal (const char *message, ...);
14637+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14638+void lt_fatal (const char *file, int line, const char *message, ...);
14639+static const char *nonnull (const char *s);
14640+static const char *nonempty (const char *s);
14641 void lt_setenv (const char *name, const char *value);
14642 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14643 void lt_update_exe_path (const char *name, const char *value);
14644@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14645 EOF
14646
14647 cat <<EOF
14648-const char * MAGIC_EXE = "$magic_exe";
14649+volatile const char * MAGIC_EXE = "$magic_exe";
14650 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14651 EOF
14652
14653 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14654- func_to_host_pathlist "$temp_rpath"
14655+ func_to_host_path "$temp_rpath"
14656 cat <<EOF
14657-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14658+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14659 EOF
14660 else
14661 cat <<"EOF"
14662@@ -3513,10 +4317,10 @@ EOF
14663 fi
14664
14665 if test -n "$dllsearchpath"; then
14666- func_to_host_pathlist "$dllsearchpath:"
14667+ func_to_host_path "$dllsearchpath:"
14668 cat <<EOF
14669 const char * EXE_PATH_VARNAME = "PATH";
14670-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14671+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14672 EOF
14673 else
14674 cat <<"EOF"
14675@@ -3539,12 +4343,10 @@ EOF
14676 cat <<"EOF"
14677
14678 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14679-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14680
14681-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14682 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14683-
14684 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14685+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14686
14687 int
14688 main (int argc, char *argv[])
14689@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14690 int i;
14691
14692 program_name = (char *) xstrdup (base_name (argv[0]));
14693- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14694- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14695+ newargz = XMALLOC (char *, argc + 1);
14696
14697- /* very simple arg parsing; don't want to rely on getopt */
14698+ /* very simple arg parsing; don't want to rely on getopt
14699+ * also, copy all non cwrapper options to newargz, except
14700+ * argz[0], which is handled differently
14701+ */
14702+ newargc=0;
14703 for (i = 1; i < argc; i++)
14704 {
14705 if (strcmp (argv[i], dumpscript_opt) == 0)
14706@@ -3581,21 +4386,54 @@ EOF
14707 lt_dump_script (stdout);
14708 return 0;
14709 }
14710+ if (strcmp (argv[i], debug_opt) == 0)
14711+ {
14712+ lt_debug = 1;
14713+ continue;
14714+ }
14715+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14716+ {
14717+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14718+ namespace, but it is not one of the ones we know about and
14719+ have already dealt with, above (inluding dump-script), then
14720+ report an error. Otherwise, targets might begin to believe
14721+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14722+ namespace. The first time any user complains about this, we'll
14723+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14724+ or a configure.ac-settable value.
14725+ */
14726+ lt_fatal (__FILE__, __LINE__,
14727+ "unrecognized %s option: '%s'",
14728+ ltwrapper_option_prefix, argv[i]);
14729+ }
14730+ /* otherwise ... */
14731+ newargz[++newargc] = xstrdup (argv[i]);
14732 }
14733+ newargz[++newargc] = NULL;
14734+
14735+EOF
14736+ cat <<EOF
14737+ /* The GNU banner must be the first non-error debug message */
14738+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14739+EOF
14740+ cat <<"EOF"
14741+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14742+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14743
14744- newargz = XMALLOC (char *, argc + 1);
14745 tmp_pathspec = find_executable (argv[0]);
14746 if (tmp_pathspec == NULL)
14747- lt_fatal ("Couldn't find %s", argv[0]);
14748- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14749- tmp_pathspec));
14750+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14751+ lt_debugprintf (__FILE__, __LINE__,
14752+ "(main) found exe (before symlink chase) at: %s\n",
14753+ tmp_pathspec);
14754
14755 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14756- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14757- actual_cwrapper_path));
14758+ lt_debugprintf (__FILE__, __LINE__,
14759+ "(main) found exe (after symlink chase) at: %s\n",
14760+ actual_cwrapper_path);
14761 XFREE (tmp_pathspec);
14762
14763- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14764+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14765 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14766
14767 /* wrapper name transforms */
14768@@ -3613,8 +4451,9 @@ EOF
14769 target_name = tmp_pathspec;
14770 tmp_pathspec = 0;
14771
14772- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14773- target_name));
14774+ lt_debugprintf (__FILE__, __LINE__,
14775+ "(main) libtool target name: %s\n",
14776+ target_name);
14777 EOF
14778
14779 cat <<EOF
14780@@ -3664,35 +4503,19 @@ EOF
14781
14782 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14783 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14784- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14785+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14786+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14787+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14788+ libraries must come first. */
14789 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14790+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14791
14792- newargc=0;
14793- for (i = 1; i < argc; i++)
14794- {
14795- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14796- {
14797- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14798- namespace, but it is not one of the ones we know about and
14799- have already dealt with, above (inluding dump-script), then
14800- report an error. Otherwise, targets might begin to believe
14801- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14802- namespace. The first time any user complains about this, we'll
14803- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14804- or a configure.ac-settable value.
14805- */
14806- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14807- ltwrapper_option_prefix, argv[i]);
14808- }
14809- /* otherwise ... */
14810- newargz[++newargc] = xstrdup (argv[i]);
14811- }
14812- newargz[++newargc] = NULL;
14813-
14814- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14815+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14816+ nonnull (lt_argv_zero));
14817 for (i = 0; i < newargc; i++)
14818 {
14819- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14820+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14821+ i, nonnull (newargz[i]));
14822 }
14823
14824 EOF
14825@@ -3706,7 +4529,9 @@ EOF
14826 if (rval == -1)
14827 {
14828 /* failed to start process */
14829- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14830+ lt_debugprintf (__FILE__, __LINE__,
14831+ "(main) failed to launch target \"%s\": %s\n",
14832+ lt_argv_zero, nonnull (strerror (errno)));
14833 return 127;
14834 }
14835 return rval;
14836@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14837 {
14838 void *p = (void *) malloc (num);
14839 if (!p)
14840- lt_fatal ("Memory exhausted");
14841+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14842
14843 return p;
14844 }
14845@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14846 {
14847 struct stat st;
14848
14849- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14850- path ? (*path ? path : "EMPTY!") : "NULL!"));
14851+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14852+ nonempty (path));
14853 if ((!path) || (!*path))
14854 return 0;
14855
14856@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14857 int rval = 0;
14858 struct stat st;
14859
14860- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14861- path ? (*path ? path : "EMPTY!") : "NULL!"));
14862+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14863+ nonempty (path));
14864 if ((!path) || (!*path))
14865 return 0;
14866
14867@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14868 int tmp_len;
14869 char *concat_name;
14870
14871- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14872- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14873+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14874+ nonempty (wrapper));
14875
14876 if ((wrapper == NULL) || (*wrapper == '\0'))
14877 return NULL;
14878@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14879 {
14880 /* empty path: current directory */
14881 if (getcwd (tmp, LT_PATHMAX) == NULL)
14882- lt_fatal ("getcwd failed");
14883+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14884+ nonnull (strerror (errno)));
14885 tmp_len = strlen (tmp);
14886 concat_name =
14887 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14888@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14889 }
14890 /* Relative path | not found in path: prepend cwd */
14891 if (getcwd (tmp, LT_PATHMAX) == NULL)
14892- lt_fatal ("getcwd failed");
14893+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14894+ nonnull (strerror (errno)));
14895 tmp_len = strlen (tmp);
14896 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14897 memcpy (concat_name, tmp, tmp_len);
14898@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14899 int has_symlinks = 0;
14900 while (strlen (tmp_pathspec) && !has_symlinks)
14901 {
14902- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
14903- tmp_pathspec));
14904+ lt_debugprintf (__FILE__, __LINE__,
14905+ "checking path component for symlinks: %s\n",
14906+ tmp_pathspec);
14907 if (lstat (tmp_pathspec, &s) == 0)
14908 {
14909 if (S_ISLNK (s.st_mode) != 0)
14910@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
14911 }
14912 else
14913 {
14914- char *errstr = strerror (errno);
14915- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
14916+ lt_fatal (__FILE__, __LINE__,
14917+ "error accessing file \"%s\": %s",
14918+ tmp_pathspec, nonnull (strerror (errno)));
14919 }
14920 }
14921 XFREE (tmp_pathspec);
14922@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
14923 tmp_pathspec = realpath (pathspec, buf);
14924 if (tmp_pathspec == 0)
14925 {
14926- lt_fatal ("Could not follow symlinks for %s", pathspec);
14927+ lt_fatal (__FILE__, __LINE__,
14928+ "could not follow symlinks for %s", pathspec);
14929 }
14930 return xstrdup (tmp_pathspec);
14931 #endif
14932@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
14933 return str;
14934 }
14935
14936+void
14937+lt_debugprintf (const char *file, int line, const char *fmt, ...)
14938+{
14939+ va_list args;
14940+ if (lt_debug)
14941+ {
14942+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
14943+ va_start (args, fmt);
14944+ (void) vfprintf (stderr, fmt, args);
14945+ va_end (args);
14946+ }
14947+}
14948+
14949 static void
14950-lt_error_core (int exit_status, const char *mode,
14951+lt_error_core (int exit_status, const char *file,
14952+ int line, const char *mode,
14953 const char *message, va_list ap)
14954 {
14955- fprintf (stderr, "%s: %s: ", program_name, mode);
14956+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
14957 vfprintf (stderr, message, ap);
14958 fprintf (stderr, ".\n");
14959
14960@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
14961 }
14962
14963 void
14964-lt_fatal (const char *message, ...)
14965+lt_fatal (const char *file, int line, const char *message, ...)
14966 {
14967 va_list ap;
14968 va_start (ap, message);
14969- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
14970+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
14971 va_end (ap);
14972 }
14973
14974+static const char *
14975+nonnull (const char *s)
14976+{
14977+ return s ? s : "(null)";
14978+}
14979+
14980+static const char *
14981+nonempty (const char *s)
14982+{
14983+ return (s && !*s) ? "(empty)" : nonnull (s);
14984+}
14985+
14986 void
14987 lt_setenv (const char *name, const char *value)
14988 {
14989- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
14990- (name ? name : "<NULL>"),
14991- (value ? value : "<NULL>")));
14992+ lt_debugprintf (__FILE__, __LINE__,
14993+ "(lt_setenv) setting '%s' to '%s'\n",
14994+ nonnull (name), nonnull (value));
14995 {
14996 #ifdef HAVE_SETENV
14997 /* always make a copy, for consistency with !HAVE_SETENV */
14998@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
14999 void
15000 lt_update_exe_path (const char *name, const char *value)
15001 {
15002- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15003- (name ? name : "<NULL>"),
15004- (value ? value : "<NULL>")));
15005+ lt_debugprintf (__FILE__, __LINE__,
15006+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15007+ nonnull (name), nonnull (value));
15008
15009 if (name && *name && value && *value)
15010 {
15011@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
15012 void
15013 lt_update_lib_path (const char *name, const char *value)
15014 {
15015- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15016- (name ? name : "<NULL>"),
15017- (value ? value : "<NULL>")));
15018+ lt_debugprintf (__FILE__, __LINE__,
15019+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15020+ nonnull (name), nonnull (value));
15021
15022 if (name && *name && value && *value)
15023 {
15024@@ -4222,7 +5078,7 @@ EOF
15025 func_win32_import_lib_p ()
15026 {
15027 $opt_debug
15028- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15029+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15030 *import*) : ;;
15031 *) false ;;
15032 esac
15033@@ -4401,9 +5257,9 @@ func_mode_link ()
15034 ;;
15035 *)
15036 if test "$prev" = dlfiles; then
15037- dlfiles="$dlfiles $arg"
15038+ func_append dlfiles " $arg"
15039 else
15040- dlprefiles="$dlprefiles $arg"
15041+ func_append dlprefiles " $arg"
15042 fi
15043 prev=
15044 continue
15045@@ -4427,7 +5283,7 @@ func_mode_link ()
15046 *-*-darwin*)
15047 case "$deplibs " in
15048 *" $qarg.ltframework "*) ;;
15049- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15050+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15051 ;;
15052 esac
15053 ;;
15054@@ -4446,7 +5302,7 @@ func_mode_link ()
15055 moreargs=
15056 for fil in `cat "$save_arg"`
15057 do
15058-# moreargs="$moreargs $fil"
15059+# func_append moreargs " $fil"
15060 arg=$fil
15061 # A libtool-controlled object.
15062
15063@@ -4475,7 +5331,7 @@ func_mode_link ()
15064
15065 if test "$prev" = dlfiles; then
15066 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15067- dlfiles="$dlfiles $pic_object"
15068+ func_append dlfiles " $pic_object"
15069 prev=
15070 continue
15071 else
15072@@ -4487,7 +5343,7 @@ func_mode_link ()
15073 # CHECK ME: I think I busted this. -Ossama
15074 if test "$prev" = dlprefiles; then
15075 # Preload the old-style object.
15076- dlprefiles="$dlprefiles $pic_object"
15077+ func_append dlprefiles " $pic_object"
15078 prev=
15079 fi
15080
15081@@ -4557,12 +5413,12 @@ func_mode_link ()
15082 if test "$prev" = rpath; then
15083 case "$rpath " in
15084 *" $arg "*) ;;
15085- *) rpath="$rpath $arg" ;;
15086+ *) func_append rpath " $arg" ;;
15087 esac
15088 else
15089 case "$xrpath " in
15090 *" $arg "*) ;;
15091- *) xrpath="$xrpath $arg" ;;
15092+ *) func_append xrpath " $arg" ;;
15093 esac
15094 fi
15095 prev=
15096@@ -4574,28 +5430,28 @@ func_mode_link ()
15097 continue
15098 ;;
15099 weak)
15100- weak_libs="$weak_libs $arg"
15101+ func_append weak_libs " $arg"
15102 prev=
15103 continue
15104 ;;
15105 xcclinker)
15106- linker_flags="$linker_flags $qarg"
15107- compiler_flags="$compiler_flags $qarg"
15108+ func_append linker_flags " $qarg"
15109+ func_append compiler_flags " $qarg"
15110 prev=
15111 func_append compile_command " $qarg"
15112 func_append finalize_command " $qarg"
15113 continue
15114 ;;
15115 xcompiler)
15116- compiler_flags="$compiler_flags $qarg"
15117+ func_append compiler_flags " $qarg"
15118 prev=
15119 func_append compile_command " $qarg"
15120 func_append finalize_command " $qarg"
15121 continue
15122 ;;
15123 xlinker)
15124- linker_flags="$linker_flags $qarg"
15125- compiler_flags="$compiler_flags $wl$qarg"
15126+ func_append linker_flags " $qarg"
15127+ func_append compiler_flags " $wl$qarg"
15128 prev=
15129 func_append compile_command " $wl$qarg"
15130 func_append finalize_command " $wl$qarg"
15131@@ -4686,15 +5542,16 @@ func_mode_link ()
15132 ;;
15133
15134 -L*)
15135- func_stripname '-L' '' "$arg"
15136- dir=$func_stripname_result
15137- if test -z "$dir"; then
15138+ func_stripname "-L" '' "$arg"
15139+ if test -z "$func_stripname_result"; then
15140 if test "$#" -gt 0; then
15141 func_fatal_error "require no space between \`-L' and \`$1'"
15142 else
15143 func_fatal_error "need path for \`-L' option"
15144 fi
15145 fi
15146+ func_resolve_sysroot "$func_stripname_result"
15147+ dir=$func_resolve_sysroot_result
15148 # We need an absolute path.
15149 case $dir in
15150 [\\/]* | [A-Za-z]:[\\/]*) ;;
15151@@ -4706,10 +5563,16 @@ func_mode_link ()
15152 ;;
15153 esac
15154 case "$deplibs " in
15155- *" -L$dir "*) ;;
15156+ *" -L$dir "* | *" $arg "*)
15157+ # Will only happen for absolute or sysroot arguments
15158+ ;;
15159 *)
15160- deplibs="$deplibs -L$dir"
15161- lib_search_path="$lib_search_path $dir"
15162+ # Preserve sysroot, but never include relative directories
15163+ case $dir in
15164+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15165+ *) func_append deplibs " -L$dir" ;;
15166+ esac
15167+ func_append lib_search_path " $dir"
15168 ;;
15169 esac
15170 case $host in
15171@@ -4718,12 +5581,12 @@ func_mode_link ()
15172 case :$dllsearchpath: in
15173 *":$dir:"*) ;;
15174 ::) dllsearchpath=$dir;;
15175- *) dllsearchpath="$dllsearchpath:$dir";;
15176+ *) func_append dllsearchpath ":$dir";;
15177 esac
15178 case :$dllsearchpath: in
15179 *":$testbindir:"*) ;;
15180 ::) dllsearchpath=$testbindir;;
15181- *) dllsearchpath="$dllsearchpath:$testbindir";;
15182+ *) func_append dllsearchpath ":$testbindir";;
15183 esac
15184 ;;
15185 esac
15186@@ -4747,7 +5610,7 @@ func_mode_link ()
15187 ;;
15188 *-*-rhapsody* | *-*-darwin1.[012])
15189 # Rhapsody C and math libraries are in the System framework
15190- deplibs="$deplibs System.ltframework"
15191+ func_append deplibs " System.ltframework"
15192 continue
15193 ;;
15194 *-*-sco3.2v5* | *-*-sco5v6*)
15195@@ -4758,9 +5621,6 @@ func_mode_link ()
15196 # Compiler inserts libc in the correct place for threads to work
15197 test "X$arg" = "X-lc" && continue
15198 ;;
15199- *-*-linux*)
15200- test "X$arg" = "X-lc" && continue
15201- ;;
15202 esac
15203 elif test "X$arg" = "X-lc_r"; then
15204 case $host in
15205@@ -4770,7 +5630,7 @@ func_mode_link ()
15206 ;;
15207 esac
15208 fi
15209- deplibs="$deplibs $arg"
15210+ func_append deplibs " $arg"
15211 continue
15212 ;;
15213
15214@@ -4782,8 +5642,8 @@ func_mode_link ()
15215 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15216 # classes, name mangling, and exception handling.
15217 # Darwin uses the -arch flag to determine output architecture.
15218- -model|-arch|-isysroot)
15219- compiler_flags="$compiler_flags $arg"
15220+ -model|-arch|-isysroot|--sysroot)
15221+ func_append compiler_flags " $arg"
15222 func_append compile_command " $arg"
15223 func_append finalize_command " $arg"
15224 prev=xcompiler
15225@@ -4791,12 +5651,12 @@ func_mode_link ()
15226 ;;
15227
15228 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15229- compiler_flags="$compiler_flags $arg"
15230+ func_append compiler_flags " $arg"
15231 func_append compile_command " $arg"
15232 func_append finalize_command " $arg"
15233 case "$new_inherited_linker_flags " in
15234 *" $arg "*) ;;
15235- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15236+ * ) func_append new_inherited_linker_flags " $arg" ;;
15237 esac
15238 continue
15239 ;;
15240@@ -4863,13 +5723,17 @@ func_mode_link ()
15241 # We need an absolute path.
15242 case $dir in
15243 [\\/]* | [A-Za-z]:[\\/]*) ;;
15244+ =*)
15245+ func_stripname '=' '' "$dir"
15246+ dir=$lt_sysroot$func_stripname_result
15247+ ;;
15248 *)
15249 func_fatal_error "only absolute run-paths are allowed"
15250 ;;
15251 esac
15252 case "$xrpath " in
15253 *" $dir "*) ;;
15254- *) xrpath="$xrpath $dir" ;;
15255+ *) func_append xrpath " $dir" ;;
15256 esac
15257 continue
15258 ;;
15259@@ -4922,8 +5786,8 @@ func_mode_link ()
15260 for flag in $args; do
15261 IFS="$save_ifs"
15262 func_quote_for_eval "$flag"
15263- arg="$arg $func_quote_for_eval_result"
15264- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15265+ func_append arg " $func_quote_for_eval_result"
15266+ func_append compiler_flags " $func_quote_for_eval_result"
15267 done
15268 IFS="$save_ifs"
15269 func_stripname ' ' '' "$arg"
15270@@ -4938,9 +5802,9 @@ func_mode_link ()
15271 for flag in $args; do
15272 IFS="$save_ifs"
15273 func_quote_for_eval "$flag"
15274- arg="$arg $wl$func_quote_for_eval_result"
15275- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15276- linker_flags="$linker_flags $func_quote_for_eval_result"
15277+ func_append arg " $wl$func_quote_for_eval_result"
15278+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15279+ func_append linker_flags " $func_quote_for_eval_result"
15280 done
15281 IFS="$save_ifs"
15282 func_stripname ' ' '' "$arg"
15283@@ -4968,24 +5832,27 @@ func_mode_link ()
15284 arg="$func_quote_for_eval_result"
15285 ;;
15286
15287- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15288- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15289- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15290- # +DA*, +DD* enable 64-bit mode on the HP compiler
15291- # -q* pass through compiler args for the IBM compiler
15292- # -m*, -t[45]*, -txscale* pass through architecture-specific
15293- # compiler args for GCC
15294- # -F/path gives path to uninstalled frameworks, gcc on darwin
15295- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15296- # @file GCC response files
15297- # -tp=* Portland pgcc target processor selection
15298+ # Flags to be passed through unchanged, with rationale:
15299+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15300+ # -r[0-9][0-9]* specify processor for the SGI compiler
15301+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15302+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15303+ # -q* compiler args for the IBM compiler
15304+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15305+ # -F/path path to uninstalled frameworks, gcc on darwin
15306+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15307+ # @file GCC response files
15308+ # -tp=* Portland pgcc target processor selection
15309+ # --sysroot=* for sysroot support
15310+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15311 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15312- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15313+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15314+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15315 func_quote_for_eval "$arg"
15316 arg="$func_quote_for_eval_result"
15317 func_append compile_command " $arg"
15318 func_append finalize_command " $arg"
15319- compiler_flags="$compiler_flags $arg"
15320+ func_append compiler_flags " $arg"
15321 continue
15322 ;;
15323
15324@@ -4997,7 +5864,7 @@ func_mode_link ()
15325
15326 *.$objext)
15327 # A standard object.
15328- objs="$objs $arg"
15329+ func_append objs " $arg"
15330 ;;
15331
15332 *.lo)
15333@@ -5028,7 +5895,7 @@ func_mode_link ()
15334
15335 if test "$prev" = dlfiles; then
15336 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15337- dlfiles="$dlfiles $pic_object"
15338+ func_append dlfiles " $pic_object"
15339 prev=
15340 continue
15341 else
15342@@ -5040,7 +5907,7 @@ func_mode_link ()
15343 # CHECK ME: I think I busted this. -Ossama
15344 if test "$prev" = dlprefiles; then
15345 # Preload the old-style object.
15346- dlprefiles="$dlprefiles $pic_object"
15347+ func_append dlprefiles " $pic_object"
15348 prev=
15349 fi
15350
15351@@ -5085,24 +5952,25 @@ func_mode_link ()
15352
15353 *.$libext)
15354 # An archive.
15355- deplibs="$deplibs $arg"
15356- old_deplibs="$old_deplibs $arg"
15357+ func_append deplibs " $arg"
15358+ func_append old_deplibs " $arg"
15359 continue
15360 ;;
15361
15362 *.la)
15363 # A libtool-controlled library.
15364
15365+ func_resolve_sysroot "$arg"
15366 if test "$prev" = dlfiles; then
15367 # This library was specified with -dlopen.
15368- dlfiles="$dlfiles $arg"
15369+ func_append dlfiles " $func_resolve_sysroot_result"
15370 prev=
15371 elif test "$prev" = dlprefiles; then
15372 # The library was specified with -dlpreopen.
15373- dlprefiles="$dlprefiles $arg"
15374+ func_append dlprefiles " $func_resolve_sysroot_result"
15375 prev=
15376 else
15377- deplibs="$deplibs $arg"
15378+ func_append deplibs " $func_resolve_sysroot_result"
15379 fi
15380 continue
15381 ;;
15382@@ -5127,7 +5995,7 @@ func_mode_link ()
15383 func_fatal_help "the \`$prevarg' option requires an argument"
15384
15385 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15386- eval "arg=\"$export_dynamic_flag_spec\""
15387+ eval arg=\"$export_dynamic_flag_spec\"
15388 func_append compile_command " $arg"
15389 func_append finalize_command " $arg"
15390 fi
15391@@ -5144,11 +6012,13 @@ func_mode_link ()
15392 else
15393 shlib_search_path=
15394 fi
15395- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15396- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15397+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15398+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15399
15400 func_dirname "$output" "/" ""
15401 output_objdir="$func_dirname_result$objdir"
15402+ func_to_tool_file "$output_objdir/"
15403+ tool_output_objdir=$func_to_tool_file_result
15404 # Create the object directory.
15405 func_mkdir_p "$output_objdir"
15406
15407@@ -5169,12 +6039,12 @@ func_mode_link ()
15408 # Find all interdependent deplibs by searching for libraries
15409 # that are linked more than once (e.g. -la -lb -la)
15410 for deplib in $deplibs; do
15411- if $opt_duplicate_deps ; then
15412+ if $opt_preserve_dup_deps ; then
15413 case "$libs " in
15414- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15415+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15416 esac
15417 fi
15418- libs="$libs $deplib"
15419+ func_append libs " $deplib"
15420 done
15421
15422 if test "$linkmode" = lib; then
15423@@ -5187,9 +6057,9 @@ func_mode_link ()
15424 if $opt_duplicate_compiler_generated_deps; then
15425 for pre_post_dep in $predeps $postdeps; do
15426 case "$pre_post_deps " in
15427- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15428+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15429 esac
15430- pre_post_deps="$pre_post_deps $pre_post_dep"
15431+ func_append pre_post_deps " $pre_post_dep"
15432 done
15433 fi
15434 pre_post_deps=
15435@@ -5256,8 +6126,9 @@ func_mode_link ()
15436 for lib in $dlprefiles; do
15437 # Ignore non-libtool-libs
15438 dependency_libs=
15439+ func_resolve_sysroot "$lib"
15440 case $lib in
15441- *.la) func_source "$lib" ;;
15442+ *.la) func_source "$func_resolve_sysroot_result" ;;
15443 esac
15444
15445 # Collect preopened libtool deplibs, except any this library
15446@@ -5267,7 +6138,7 @@ func_mode_link ()
15447 deplib_base=$func_basename_result
15448 case " $weak_libs " in
15449 *" $deplib_base "*) ;;
15450- *) deplibs="$deplibs $deplib" ;;
15451+ *) func_append deplibs " $deplib" ;;
15452 esac
15453 done
15454 done
15455@@ -5288,11 +6159,11 @@ func_mode_link ()
15456 compile_deplibs="$deplib $compile_deplibs"
15457 finalize_deplibs="$deplib $finalize_deplibs"
15458 else
15459- compiler_flags="$compiler_flags $deplib"
15460+ func_append compiler_flags " $deplib"
15461 if test "$linkmode" = lib ; then
15462 case "$new_inherited_linker_flags " in
15463 *" $deplib "*) ;;
15464- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15465+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15466 esac
15467 fi
15468 fi
15469@@ -5377,7 +6248,7 @@ func_mode_link ()
15470 if test "$linkmode" = lib ; then
15471 case "$new_inherited_linker_flags " in
15472 *" $deplib "*) ;;
15473- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15474+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15475 esac
15476 fi
15477 fi
15478@@ -5390,7 +6261,8 @@ func_mode_link ()
15479 test "$pass" = conv && continue
15480 newdependency_libs="$deplib $newdependency_libs"
15481 func_stripname '-L' '' "$deplib"
15482- newlib_search_path="$newlib_search_path $func_stripname_result"
15483+ func_resolve_sysroot "$func_stripname_result"
15484+ func_append newlib_search_path " $func_resolve_sysroot_result"
15485 ;;
15486 prog)
15487 if test "$pass" = conv; then
15488@@ -5404,7 +6276,8 @@ func_mode_link ()
15489 finalize_deplibs="$deplib $finalize_deplibs"
15490 fi
15491 func_stripname '-L' '' "$deplib"
15492- newlib_search_path="$newlib_search_path $func_stripname_result"
15493+ func_resolve_sysroot "$func_stripname_result"
15494+ func_append newlib_search_path " $func_resolve_sysroot_result"
15495 ;;
15496 *)
15497 func_warning "\`-L' is ignored for archives/objects"
15498@@ -5415,17 +6288,21 @@ func_mode_link ()
15499 -R*)
15500 if test "$pass" = link; then
15501 func_stripname '-R' '' "$deplib"
15502- dir=$func_stripname_result
15503+ func_resolve_sysroot "$func_stripname_result"
15504+ dir=$func_resolve_sysroot_result
15505 # Make sure the xrpath contains only unique directories.
15506 case "$xrpath " in
15507 *" $dir "*) ;;
15508- *) xrpath="$xrpath $dir" ;;
15509+ *) func_append xrpath " $dir" ;;
15510 esac
15511 fi
15512 deplibs="$deplib $deplibs"
15513 continue
15514 ;;
15515- *.la) lib="$deplib" ;;
15516+ *.la)
15517+ func_resolve_sysroot "$deplib"
15518+ lib=$func_resolve_sysroot_result
15519+ ;;
15520 *.$libext)
15521 if test "$pass" = conv; then
15522 deplibs="$deplib $deplibs"
15523@@ -5488,11 +6365,11 @@ func_mode_link ()
15524 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15525 # If there is no dlopen support or we're linking statically,
15526 # we need to preload.
15527- newdlprefiles="$newdlprefiles $deplib"
15528+ func_append newdlprefiles " $deplib"
15529 compile_deplibs="$deplib $compile_deplibs"
15530 finalize_deplibs="$deplib $finalize_deplibs"
15531 else
15532- newdlfiles="$newdlfiles $deplib"
15533+ func_append newdlfiles " $deplib"
15534 fi
15535 fi
15536 continue
15537@@ -5538,7 +6415,7 @@ func_mode_link ()
15538 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15539 case " $new_inherited_linker_flags " in
15540 *" $tmp_inherited_linker_flag "*) ;;
15541- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15542+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15543 esac
15544 done
15545 fi
15546@@ -5546,8 +6423,8 @@ func_mode_link ()
15547 if test "$linkmode,$pass" = "lib,link" ||
15548 test "$linkmode,$pass" = "prog,scan" ||
15549 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15550- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15551- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15552+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15553+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15554 fi
15555
15556 if test "$pass" = conv; then
15557@@ -5558,20 +6435,20 @@ func_mode_link ()
15558 func_fatal_error "cannot find name of link library for \`$lib'"
15559 fi
15560 # It is a libtool convenience library, so add in its objects.
15561- convenience="$convenience $ladir/$objdir/$old_library"
15562- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15563+ func_append convenience " $ladir/$objdir/$old_library"
15564+ func_append old_convenience " $ladir/$objdir/$old_library"
15565 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15566 func_fatal_error "\`$lib' is not a convenience library"
15567 fi
15568 tmp_libs=
15569 for deplib in $dependency_libs; do
15570 deplibs="$deplib $deplibs"
15571- if $opt_duplicate_deps ; then
15572+ if $opt_preserve_dup_deps ; then
15573 case "$tmp_libs " in
15574- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15575+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15576 esac
15577 fi
15578- tmp_libs="$tmp_libs $deplib"
15579+ func_append tmp_libs " $deplib"
15580 done
15581 continue
15582 fi # $pass = conv
15583@@ -5579,9 +6456,15 @@ func_mode_link ()
15584
15585 # Get the name of the library we link against.
15586 linklib=
15587- for l in $old_library $library_names; do
15588- linklib="$l"
15589- done
15590+ if test -n "$old_library" &&
15591+ { test "$prefer_static_libs" = yes ||
15592+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15593+ linklib=$old_library
15594+ else
15595+ for l in $old_library $library_names; do
15596+ linklib="$l"
15597+ done
15598+ fi
15599 if test -z "$linklib"; then
15600 func_fatal_error "cannot find name of link library for \`$lib'"
15601 fi
15602@@ -5598,9 +6481,9 @@ func_mode_link ()
15603 # statically, we need to preload. We also need to preload any
15604 # dependent libraries so libltdl's deplib preloader doesn't
15605 # bomb out in the load deplibs phase.
15606- dlprefiles="$dlprefiles $lib $dependency_libs"
15607+ func_append dlprefiles " $lib $dependency_libs"
15608 else
15609- newdlfiles="$newdlfiles $lib"
15610+ func_append newdlfiles " $lib"
15611 fi
15612 continue
15613 fi # $pass = dlopen
15614@@ -5622,14 +6505,14 @@ func_mode_link ()
15615
15616 # Find the relevant object directory and library name.
15617 if test "X$installed" = Xyes; then
15618- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15619+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15620 func_warning "library \`$lib' was moved."
15621 dir="$ladir"
15622 absdir="$abs_ladir"
15623 libdir="$abs_ladir"
15624 else
15625- dir="$libdir"
15626- absdir="$libdir"
15627+ dir="$lt_sysroot$libdir"
15628+ absdir="$lt_sysroot$libdir"
15629 fi
15630 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15631 else
15632@@ -5637,12 +6520,12 @@ func_mode_link ()
15633 dir="$ladir"
15634 absdir="$abs_ladir"
15635 # Remove this search path later
15636- notinst_path="$notinst_path $abs_ladir"
15637+ func_append notinst_path " $abs_ladir"
15638 else
15639 dir="$ladir/$objdir"
15640 absdir="$abs_ladir/$objdir"
15641 # Remove this search path later
15642- notinst_path="$notinst_path $abs_ladir"
15643+ func_append notinst_path " $abs_ladir"
15644 fi
15645 fi # $installed = yes
15646 func_stripname 'lib' '.la' "$laname"
15647@@ -5653,20 +6536,46 @@ func_mode_link ()
15648 if test -z "$libdir" && test "$linkmode" = prog; then
15649 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15650 fi
15651- # Prefer using a static library (so that no silly _DYNAMIC symbols
15652- # are required to link).
15653- if test -n "$old_library"; then
15654- newdlprefiles="$newdlprefiles $dir/$old_library"
15655- # Keep a list of preopened convenience libraries to check
15656- # that they are being used correctly in the link pass.
15657- test -z "$libdir" && \
15658- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15659- # Otherwise, use the dlname, so that lt_dlopen finds it.
15660- elif test -n "$dlname"; then
15661- newdlprefiles="$newdlprefiles $dir/$dlname"
15662- else
15663- newdlprefiles="$newdlprefiles $dir/$linklib"
15664- fi
15665+ case "$host" in
15666+ # special handling for platforms with PE-DLLs.
15667+ *cygwin* | *mingw* | *cegcc* )
15668+ # Linker will automatically link against shared library if both
15669+ # static and shared are present. Therefore, ensure we extract
15670+ # symbols from the import library if a shared library is present
15671+ # (otherwise, the dlopen module name will be incorrect). We do
15672+ # this by putting the import library name into $newdlprefiles.
15673+ # We recover the dlopen module name by 'saving' the la file
15674+ # name in a special purpose variable, and (later) extracting the
15675+ # dlname from the la file.
15676+ if test -n "$dlname"; then
15677+ func_tr_sh "$dir/$linklib"
15678+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15679+ func_append newdlprefiles " $dir/$linklib"
15680+ else
15681+ func_append newdlprefiles " $dir/$old_library"
15682+ # Keep a list of preopened convenience libraries to check
15683+ # that they are being used correctly in the link pass.
15684+ test -z "$libdir" && \
15685+ func_append dlpreconveniencelibs " $dir/$old_library"
15686+ fi
15687+ ;;
15688+ * )
15689+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15690+ # are required to link).
15691+ if test -n "$old_library"; then
15692+ func_append newdlprefiles " $dir/$old_library"
15693+ # Keep a list of preopened convenience libraries to check
15694+ # that they are being used correctly in the link pass.
15695+ test -z "$libdir" && \
15696+ func_append dlpreconveniencelibs " $dir/$old_library"
15697+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15698+ elif test -n "$dlname"; then
15699+ func_append newdlprefiles " $dir/$dlname"
15700+ else
15701+ func_append newdlprefiles " $dir/$linklib"
15702+ fi
15703+ ;;
15704+ esac
15705 fi # $pass = dlpreopen
15706
15707 if test -z "$libdir"; then
15708@@ -5684,7 +6593,7 @@ func_mode_link ()
15709
15710
15711 if test "$linkmode" = prog && test "$pass" != link; then
15712- newlib_search_path="$newlib_search_path $ladir"
15713+ func_append newlib_search_path " $ladir"
15714 deplibs="$lib $deplibs"
15715
15716 linkalldeplibs=no
15717@@ -5697,7 +6606,8 @@ func_mode_link ()
15718 for deplib in $dependency_libs; do
15719 case $deplib in
15720 -L*) func_stripname '-L' '' "$deplib"
15721- newlib_search_path="$newlib_search_path $func_stripname_result"
15722+ func_resolve_sysroot "$func_stripname_result"
15723+ func_append newlib_search_path " $func_resolve_sysroot_result"
15724 ;;
15725 esac
15726 # Need to link against all dependency_libs?
15727@@ -5708,12 +6618,12 @@ func_mode_link ()
15728 # or/and link against static libraries
15729 newdependency_libs="$deplib $newdependency_libs"
15730 fi
15731- if $opt_duplicate_deps ; then
15732+ if $opt_preserve_dup_deps ; then
15733 case "$tmp_libs " in
15734- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15735+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15736 esac
15737 fi
15738- tmp_libs="$tmp_libs $deplib"
15739+ func_append tmp_libs " $deplib"
15740 done # for deplib
15741 continue
15742 fi # $linkmode = prog...
15743@@ -5728,7 +6638,7 @@ func_mode_link ()
15744 # Make sure the rpath contains only unique directories.
15745 case "$temp_rpath:" in
15746 *"$absdir:"*) ;;
15747- *) temp_rpath="$temp_rpath$absdir:" ;;
15748+ *) func_append temp_rpath "$absdir:" ;;
15749 esac
15750 fi
15751
15752@@ -5740,7 +6650,7 @@ func_mode_link ()
15753 *)
15754 case "$compile_rpath " in
15755 *" $absdir "*) ;;
15756- *) compile_rpath="$compile_rpath $absdir"
15757+ *) func_append compile_rpath " $absdir" ;;
15758 esac
15759 ;;
15760 esac
15761@@ -5749,7 +6659,7 @@ func_mode_link ()
15762 *)
15763 case "$finalize_rpath " in
15764 *" $libdir "*) ;;
15765- *) finalize_rpath="$finalize_rpath $libdir"
15766+ *) func_append finalize_rpath " $libdir" ;;
15767 esac
15768 ;;
15769 esac
15770@@ -5774,12 +6684,12 @@ func_mode_link ()
15771 case $host in
15772 *cygwin* | *mingw* | *cegcc*)
15773 # No point in relinking DLLs because paths are not encoded
15774- notinst_deplibs="$notinst_deplibs $lib"
15775+ func_append notinst_deplibs " $lib"
15776 need_relink=no
15777 ;;
15778 *)
15779 if test "$installed" = no; then
15780- notinst_deplibs="$notinst_deplibs $lib"
15781+ func_append notinst_deplibs " $lib"
15782 need_relink=yes
15783 fi
15784 ;;
15785@@ -5814,7 +6724,7 @@ func_mode_link ()
15786 *)
15787 case "$compile_rpath " in
15788 *" $absdir "*) ;;
15789- *) compile_rpath="$compile_rpath $absdir"
15790+ *) func_append compile_rpath " $absdir" ;;
15791 esac
15792 ;;
15793 esac
15794@@ -5823,7 +6733,7 @@ func_mode_link ()
15795 *)
15796 case "$finalize_rpath " in
15797 *" $libdir "*) ;;
15798- *) finalize_rpath="$finalize_rpath $libdir"
15799+ *) func_append finalize_rpath " $libdir" ;;
15800 esac
15801 ;;
15802 esac
15803@@ -5835,7 +6745,7 @@ func_mode_link ()
15804 shift
15805 realname="$1"
15806 shift
15807- eval "libname=\"$libname_spec\""
15808+ libname=`eval "\\$ECHO \"$libname_spec\""`
15809 # use dlname if we got it. it's perfectly good, no?
15810 if test -n "$dlname"; then
15811 soname="$dlname"
15812@@ -5848,7 +6758,7 @@ func_mode_link ()
15813 versuffix="-$major"
15814 ;;
15815 esac
15816- eval "soname=\"$soname_spec\""
15817+ eval soname=\"$soname_spec\"
15818 else
15819 soname="$realname"
15820 fi
15821@@ -5877,7 +6787,7 @@ func_mode_link ()
15822 linklib=$newlib
15823 fi # test -n "$old_archive_from_expsyms_cmds"
15824
15825- if test "$linkmode" = prog || test "$mode" != relink; then
15826+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15827 add_shlibpath=
15828 add_dir=
15829 add=
15830@@ -5933,7 +6843,7 @@ func_mode_link ()
15831 if test -n "$inst_prefix_dir"; then
15832 case $libdir in
15833 [\\/]*)
15834- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15835+ func_append add_dir " -L$inst_prefix_dir$libdir"
15836 ;;
15837 esac
15838 fi
15839@@ -5955,7 +6865,7 @@ func_mode_link ()
15840 if test -n "$add_shlibpath"; then
15841 case :$compile_shlibpath: in
15842 *":$add_shlibpath:"*) ;;
15843- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15844+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15845 esac
15846 fi
15847 if test "$linkmode" = prog; then
15848@@ -5969,13 +6879,13 @@ func_mode_link ()
15849 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 fi
15856 fi
15857 fi
15858
15859- if test "$linkmode" = prog || test "$mode" = relink; then
15860+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15861 add_shlibpath=
15862 add_dir=
15863 add=
15864@@ -5989,7 +6899,7 @@ func_mode_link ()
15865 elif test "$hardcode_shlibpath_var" = yes; then
15866 case :$finalize_shlibpath: in
15867 *":$libdir:"*) ;;
15868- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15869+ *) func_append finalize_shlibpath "$libdir:" ;;
15870 esac
15871 add="-l$name"
15872 elif test "$hardcode_automatic" = yes; then
15873@@ -6001,12 +6911,12 @@ func_mode_link ()
15874 fi
15875 else
15876 # We cannot seem to hardcode it, guess we'll fake it.
15877- add_dir="-L$libdir"
15878+ add_dir="-L$lt_sysroot$libdir"
15879 # Try looking first in the location we're being installed to.
15880 if test -n "$inst_prefix_dir"; then
15881 case $libdir in
15882 [\\/]*)
15883- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15884+ func_append add_dir " -L$inst_prefix_dir$libdir"
15885 ;;
15886 esac
15887 fi
15888@@ -6083,27 +6993,33 @@ func_mode_link ()
15889 temp_xrpath=$func_stripname_result
15890 case " $xrpath " in
15891 *" $temp_xrpath "*) ;;
15892- *) xrpath="$xrpath $temp_xrpath";;
15893+ *) func_append xrpath " $temp_xrpath";;
15894 esac;;
15895- *) temp_deplibs="$temp_deplibs $libdir";;
15896+ *) func_append temp_deplibs " $libdir";;
15897 esac
15898 done
15899 dependency_libs="$temp_deplibs"
15900 fi
15901
15902- newlib_search_path="$newlib_search_path $absdir"
15903+ func_append newlib_search_path " $absdir"
15904 # Link against this library
15905 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
15906 # ... and its dependency_libs
15907 tmp_libs=
15908 for deplib in $dependency_libs; do
15909 newdependency_libs="$deplib $newdependency_libs"
15910- if $opt_duplicate_deps ; then
15911+ case $deplib in
15912+ -L*) func_stripname '-L' '' "$deplib"
15913+ func_resolve_sysroot "$func_stripname_result";;
15914+ *) func_resolve_sysroot "$deplib" ;;
15915+ esac
15916+ if $opt_preserve_dup_deps ; then
15917 case "$tmp_libs " in
15918- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15919+ *" $func_resolve_sysroot_result "*)
15920+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
15921 esac
15922 fi
15923- tmp_libs="$tmp_libs $deplib"
15924+ func_append tmp_libs " $func_resolve_sysroot_result"
15925 done
15926
15927 if test "$link_all_deplibs" != no; then
15928@@ -6113,8 +7029,10 @@ func_mode_link ()
15929 case $deplib in
15930 -L*) path="$deplib" ;;
15931 *.la)
15932+ func_resolve_sysroot "$deplib"
15933+ deplib=$func_resolve_sysroot_result
15934 func_dirname "$deplib" "" "."
15935- dir="$func_dirname_result"
15936+ dir=$func_dirname_result
15937 # We need an absolute path.
15938 case $dir in
15939 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
15940@@ -6130,7 +7048,7 @@ func_mode_link ()
15941 case $host in
15942 *-*-darwin*)
15943 depdepl=
15944- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15945+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15946 if test -n "$deplibrary_names" ; then
15947 for tmp in $deplibrary_names ; do
15948 depdepl=$tmp
15949@@ -6141,8 +7059,8 @@ func_mode_link ()
15950 if test -z "$darwin_install_name"; then
15951 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
15952 fi
15953- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15954- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
15955+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15956+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
15957 path=
15958 fi
15959 fi
15960@@ -6152,7 +7070,7 @@ func_mode_link ()
15961 ;;
15962 esac
15963 else
15964- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15965+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15966 test -z "$libdir" && \
15967 func_fatal_error "\`$deplib' is not a valid libtool archive"
15968 test "$absdir" != "$libdir" && \
15969@@ -6192,7 +7110,7 @@ func_mode_link ()
15970 for dir in $newlib_search_path; do
15971 case "$lib_search_path " in
15972 *" $dir "*) ;;
15973- *) lib_search_path="$lib_search_path $dir" ;;
15974+ *) func_append lib_search_path " $dir" ;;
15975 esac
15976 done
15977 newlib_search_path=
15978@@ -6205,7 +7123,7 @@ func_mode_link ()
15979 fi
15980 for var in $vars dependency_libs; do
15981 # Add libraries to $var in reverse order
15982- eval tmp_libs=\$$var
15983+ eval tmp_libs=\"\$$var\"
15984 new_libs=
15985 for deplib in $tmp_libs; do
15986 # FIXME: Pedantically, this is the right thing to do, so
15987@@ -6250,13 +7168,13 @@ func_mode_link ()
15988 -L*)
15989 case " $tmp_libs " in
15990 *" $deplib "*) ;;
15991- *) tmp_libs="$tmp_libs $deplib" ;;
15992+ *) func_append tmp_libs " $deplib" ;;
15993 esac
15994 ;;
15995- *) tmp_libs="$tmp_libs $deplib" ;;
15996+ *) func_append tmp_libs " $deplib" ;;
15997 esac
15998 done
15999- eval $var=\$tmp_libs
16000+ eval $var=\"$tmp_libs\"
16001 done # for var
16002 fi
16003 # Last step: remove runtime libs from dependency_libs
16004@@ -6269,7 +7187,7 @@ func_mode_link ()
16005 ;;
16006 esac
16007 if test -n "$i" ; then
16008- tmp_libs="$tmp_libs $i"
16009+ func_append tmp_libs " $i"
16010 fi
16011 done
16012 dependency_libs=$tmp_libs
16013@@ -6310,7 +7228,7 @@ func_mode_link ()
16014 # Now set the variables for building old libraries.
16015 build_libtool_libs=no
16016 oldlibs="$output"
16017- objs="$objs$old_deplibs"
16018+ func_append objs "$old_deplibs"
16019 ;;
16020
16021 lib)
16022@@ -6319,8 +7237,8 @@ func_mode_link ()
16023 lib*)
16024 func_stripname 'lib' '.la' "$outputname"
16025 name=$func_stripname_result
16026- eval "shared_ext=\"$shrext_cmds\""
16027- eval "libname=\"$libname_spec\""
16028+ eval shared_ext=\"$shrext_cmds\"
16029+ eval libname=\"$libname_spec\"
16030 ;;
16031 *)
16032 test "$module" = no && \
16033@@ -6330,8 +7248,8 @@ func_mode_link ()
16034 # Add the "lib" prefix for modules if required
16035 func_stripname '' '.la' "$outputname"
16036 name=$func_stripname_result
16037- eval "shared_ext=\"$shrext_cmds\""
16038- eval "libname=\"$libname_spec\""
16039+ eval shared_ext=\"$shrext_cmds\"
16040+ eval libname=\"$libname_spec\"
16041 else
16042 func_stripname '' '.la' "$outputname"
16043 libname=$func_stripname_result
16044@@ -6346,7 +7264,7 @@ func_mode_link ()
16045 echo
16046 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16047 $ECHO "*** objects $objs is not portable!"
16048- libobjs="$libobjs $objs"
16049+ func_append libobjs " $objs"
16050 fi
16051 fi
16052
16053@@ -6544,7 +7462,7 @@ func_mode_link ()
16054 done
16055
16056 # Make executables depend on our current version.
16057- verstring="$verstring:${current}.0"
16058+ func_append verstring ":${current}.0"
16059 ;;
16060
16061 qnx)
16062@@ -6612,10 +7530,10 @@ func_mode_link ()
16063 fi
16064
16065 func_generate_dlsyms "$libname" "$libname" "yes"
16066- libobjs="$libobjs $symfileobj"
16067+ func_append libobjs " $symfileobj"
16068 test "X$libobjs" = "X " && libobjs=
16069
16070- if test "$mode" != relink; then
16071+ if test "$opt_mode" != relink; then
16072 # Remove our outputs, but don't remove object files since they
16073 # may have been created when compiling PIC objects.
16074 removelist=
16075@@ -6631,7 +7549,7 @@ func_mode_link ()
16076 continue
16077 fi
16078 fi
16079- removelist="$removelist $p"
16080+ func_append removelist " $p"
16081 ;;
16082 *) ;;
16083 esac
16084@@ -6642,7 +7560,7 @@ func_mode_link ()
16085
16086 # Now set the variables for building old libraries.
16087 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16088- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16089+ func_append oldlibs " $output_objdir/$libname.$libext"
16090
16091 # Transform .lo files to .o files.
16092 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16093@@ -6659,10 +7577,11 @@ func_mode_link ()
16094 # If the user specified any rpath flags, then add them.
16095 temp_xrpath=
16096 for libdir in $xrpath; do
16097- temp_xrpath="$temp_xrpath -R$libdir"
16098+ func_replace_sysroot "$libdir"
16099+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16100 case "$finalize_rpath " in
16101 *" $libdir "*) ;;
16102- *) finalize_rpath="$finalize_rpath $libdir" ;;
16103+ *) func_append finalize_rpath " $libdir" ;;
16104 esac
16105 done
16106 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16107@@ -6676,7 +7595,7 @@ func_mode_link ()
16108 for lib in $old_dlfiles; do
16109 case " $dlprefiles $dlfiles " in
16110 *" $lib "*) ;;
16111- *) dlfiles="$dlfiles $lib" ;;
16112+ *) func_append dlfiles " $lib" ;;
16113 esac
16114 done
16115
16116@@ -6686,7 +7605,7 @@ func_mode_link ()
16117 for lib in $old_dlprefiles; do
16118 case "$dlprefiles " in
16119 *" $lib "*) ;;
16120- *) dlprefiles="$dlprefiles $lib" ;;
16121+ *) func_append dlprefiles " $lib" ;;
16122 esac
16123 done
16124
16125@@ -6698,7 +7617,7 @@ func_mode_link ()
16126 ;;
16127 *-*-rhapsody* | *-*-darwin1.[012])
16128 # Rhapsody C library is in the System framework
16129- deplibs="$deplibs System.ltframework"
16130+ func_append deplibs " System.ltframework"
16131 ;;
16132 *-*-netbsd*)
16133 # Don't link with libc until the a.out ld.so is fixed.
16134@@ -6715,7 +7634,7 @@ func_mode_link ()
16135 *)
16136 # Add libc to deplibs on all other systems if necessary.
16137 if test "$build_libtool_need_lc" = "yes"; then
16138- deplibs="$deplibs -lc"
16139+ func_append deplibs " -lc"
16140 fi
16141 ;;
16142 esac
16143@@ -6764,18 +7683,18 @@ EOF
16144 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16145 case " $predeps $postdeps " in
16146 *" $i "*)
16147- newdeplibs="$newdeplibs $i"
16148+ func_append newdeplibs " $i"
16149 i=""
16150 ;;
16151 esac
16152 fi
16153 if test -n "$i" ; then
16154- eval "libname=\"$libname_spec\""
16155- eval "deplib_matches=\"$library_names_spec\""
16156+ libname=`eval "\\$ECHO \"$libname_spec\""`
16157+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16158 set dummy $deplib_matches; shift
16159 deplib_match=$1
16160 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16161- newdeplibs="$newdeplibs $i"
16162+ func_append newdeplibs " $i"
16163 else
16164 droppeddeps=yes
16165 echo
16166@@ -6789,7 +7708,7 @@ EOF
16167 fi
16168 ;;
16169 *)
16170- newdeplibs="$newdeplibs $i"
16171+ func_append newdeplibs " $i"
16172 ;;
16173 esac
16174 done
16175@@ -6807,18 +7726,18 @@ EOF
16176 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16177 case " $predeps $postdeps " in
16178 *" $i "*)
16179- newdeplibs="$newdeplibs $i"
16180+ func_append newdeplibs " $i"
16181 i=""
16182 ;;
16183 esac
16184 fi
16185 if test -n "$i" ; then
16186- eval "libname=\"$libname_spec\""
16187- eval "deplib_matches=\"$library_names_spec\""
16188+ libname=`eval "\\$ECHO \"$libname_spec\""`
16189+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16190 set dummy $deplib_matches; shift
16191 deplib_match=$1
16192 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16193- newdeplibs="$newdeplibs $i"
16194+ func_append newdeplibs " $i"
16195 else
16196 droppeddeps=yes
16197 echo
16198@@ -6840,7 +7759,7 @@ EOF
16199 fi
16200 ;;
16201 *)
16202- newdeplibs="$newdeplibs $i"
16203+ func_append newdeplibs " $i"
16204 ;;
16205 esac
16206 done
16207@@ -6857,15 +7776,27 @@ EOF
16208 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16209 case " $predeps $postdeps " in
16210 *" $a_deplib "*)
16211- newdeplibs="$newdeplibs $a_deplib"
16212+ func_append newdeplibs " $a_deplib"
16213 a_deplib=""
16214 ;;
16215 esac
16216 fi
16217 if test -n "$a_deplib" ; then
16218- eval "libname=\"$libname_spec\""
16219+ libname=`eval "\\$ECHO \"$libname_spec\""`
16220+ if test -n "$file_magic_glob"; then
16221+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16222+ else
16223+ libnameglob=$libname
16224+ fi
16225+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16226 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16227- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16228+ if test "$want_nocaseglob" = yes; then
16229+ shopt -s nocaseglob
16230+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16231+ $nocaseglob
16232+ else
16233+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16234+ fi
16235 for potent_lib in $potential_libs; do
16236 # Follow soft links.
16237 if ls -lLd "$potent_lib" 2>/dev/null |
16238@@ -6885,10 +7816,10 @@ EOF
16239 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16240 esac
16241 done
16242- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16243+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16244 $SED -e 10q |
16245 $EGREP "$file_magic_regex" > /dev/null; then
16246- newdeplibs="$newdeplibs $a_deplib"
16247+ func_append newdeplibs " $a_deplib"
16248 a_deplib=""
16249 break 2
16250 fi
16251@@ -6913,7 +7844,7 @@ EOF
16252 ;;
16253 *)
16254 # Add a -L argument.
16255- newdeplibs="$newdeplibs $a_deplib"
16256+ func_append newdeplibs " $a_deplib"
16257 ;;
16258 esac
16259 done # Gone through all deplibs.
16260@@ -6929,20 +7860,20 @@ EOF
16261 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16262 case " $predeps $postdeps " in
16263 *" $a_deplib "*)
16264- newdeplibs="$newdeplibs $a_deplib"
16265+ func_append newdeplibs " $a_deplib"
16266 a_deplib=""
16267 ;;
16268 esac
16269 fi
16270 if test -n "$a_deplib" ; then
16271- eval "libname=\"$libname_spec\""
16272+ libname=`eval "\\$ECHO \"$libname_spec\""`
16273 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16274 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16275 for potent_lib in $potential_libs; do
16276 potlib="$potent_lib" # see symlink-check above in file_magic test
16277 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16278 $EGREP "$match_pattern_regex" > /dev/null; then
16279- newdeplibs="$newdeplibs $a_deplib"
16280+ func_append newdeplibs " $a_deplib"
16281 a_deplib=""
16282 break 2
16283 fi
16284@@ -6967,7 +7898,7 @@ EOF
16285 ;;
16286 *)
16287 # Add a -L argument.
16288- newdeplibs="$newdeplibs $a_deplib"
16289+ func_append newdeplibs " $a_deplib"
16290 ;;
16291 esac
16292 done # Gone through all deplibs.
16293@@ -7071,7 +8002,7 @@ EOF
16294 *)
16295 case " $deplibs " in
16296 *" -L$path/$objdir "*)
16297- new_libs="$new_libs -L$path/$objdir" ;;
16298+ func_append new_libs " -L$path/$objdir" ;;
16299 esac
16300 ;;
16301 esac
16302@@ -7081,10 +8012,10 @@ EOF
16303 -L*)
16304 case " $new_libs " in
16305 *" $deplib "*) ;;
16306- *) new_libs="$new_libs $deplib" ;;
16307+ *) func_append new_libs " $deplib" ;;
16308 esac
16309 ;;
16310- *) new_libs="$new_libs $deplib" ;;
16311+ *) func_append new_libs " $deplib" ;;
16312 esac
16313 done
16314 deplibs="$new_libs"
16315@@ -7101,10 +8032,12 @@ EOF
16316 hardcode_libdirs=
16317 dep_rpath=
16318 rpath="$finalize_rpath"
16319- test "$mode" != relink && rpath="$compile_rpath$rpath"
16320+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16321 for libdir in $rpath; do
16322 if test -n "$hardcode_libdir_flag_spec"; then
16323 if test -n "$hardcode_libdir_separator"; then
16324+ func_replace_sysroot "$libdir"
16325+ libdir=$func_replace_sysroot_result
16326 if test -z "$hardcode_libdirs"; then
16327 hardcode_libdirs="$libdir"
16328 else
16329@@ -7113,18 +8046,18 @@ EOF
16330 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16331 ;;
16332 *)
16333- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16334+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16335 ;;
16336 esac
16337 fi
16338 else
16339- eval "flag=\"$hardcode_libdir_flag_spec\""
16340- dep_rpath="$dep_rpath $flag"
16341+ eval flag=\"$hardcode_libdir_flag_spec\"
16342+ func_append dep_rpath " $flag"
16343 fi
16344 elif test -n "$runpath_var"; then
16345 case "$perm_rpath " in
16346 *" $libdir "*) ;;
16347- *) perm_rpath="$perm_rpath $libdir" ;;
16348+ *) func_apped perm_rpath " $libdir" ;;
16349 esac
16350 fi
16351 done
16352@@ -7133,40 +8066,38 @@ EOF
16353 test -n "$hardcode_libdirs"; then
16354 libdir="$hardcode_libdirs"
16355 if test -n "$hardcode_libdir_flag_spec_ld"; then
16356- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16357+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16358 else
16359- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16360+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16361 fi
16362 fi
16363 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16364 # We should set the runpath_var.
16365 rpath=
16366 for dir in $perm_rpath; do
16367- rpath="$rpath$dir:"
16368+ func_append rpath "$dir:"
16369 done
16370- eval $runpath_var=\$rpath\$$runpath_var
16371- export $runpath_var
16372+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16373 fi
16374 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16375 fi
16376
16377 shlibpath="$finalize_shlibpath"
16378- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16379+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16380 if test -n "$shlibpath"; then
16381- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16382- export $shlibpath_var
16383+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16384 fi
16385
16386 # Get the real and link names of the library.
16387- eval "shared_ext=\"$shrext_cmds\""
16388- eval "library_names=\"$library_names_spec\""
16389+ eval shared_ext=\"$shrext_cmds\"
16390+ eval library_names=\"$library_names_spec\"
16391 set dummy $library_names
16392 shift
16393 realname="$1"
16394 shift
16395
16396 if test -n "$soname_spec"; then
16397- eval "soname=\"$soname_spec\""
16398+ eval soname=\"$soname_spec\"
16399 else
16400 soname="$realname"
16401 fi
16402@@ -7178,7 +8109,7 @@ EOF
16403 linknames=
16404 for link
16405 do
16406- linknames="$linknames $link"
16407+ func_append linknames " $link"
16408 done
16409
16410 # Use standard objects if they are pic
16411@@ -7189,7 +8120,7 @@ EOF
16412 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16413 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16414 export_symbols="$output_objdir/$libname.uexp"
16415- delfiles="$delfiles $export_symbols"
16416+ func_append delfiles " $export_symbols"
16417 fi
16418
16419 orig_export_symbols=
16420@@ -7220,13 +8151,45 @@ EOF
16421 $opt_dry_run || $RM $export_symbols
16422 cmds=$export_symbols_cmds
16423 save_ifs="$IFS"; IFS='~'
16424- for cmd in $cmds; do
16425+ for cmd1 in $cmds; do
16426 IFS="$save_ifs"
16427- eval "cmd=\"$cmd\""
16428- func_len " $cmd"
16429- len=$func_len_result
16430- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16431+ # Take the normal branch if the nm_file_list_spec branch
16432+ # doesn't work or if tool conversion is not needed.
16433+ case $nm_file_list_spec~$to_tool_file_cmd in
16434+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16435+ try_normal_branch=yes
16436+ eval cmd=\"$cmd1\"
16437+ func_len " $cmd"
16438+ len=$func_len_result
16439+ ;;
16440+ *)
16441+ try_normal_branch=no
16442+ ;;
16443+ esac
16444+ if test "$try_normal_branch" = yes \
16445+ && { test "$len" -lt "$max_cmd_len" \
16446+ || test "$max_cmd_len" -le -1; }
16447+ then
16448+ func_show_eval "$cmd" 'exit $?'
16449+ skipped_export=false
16450+ elif test -n "$nm_file_list_spec"; then
16451+ func_basename "$output"
16452+ output_la=$func_basename_result
16453+ save_libobjs=$libobjs
16454+ save_output=$output
16455+ output=${output_objdir}/${output_la}.nm
16456+ func_to_tool_file "$output"
16457+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16458+ func_append delfiles " $output"
16459+ func_verbose "creating $NM input file list: $output"
16460+ for obj in $save_libobjs; do
16461+ func_to_tool_file "$obj"
16462+ $ECHO "$func_to_tool_file_result"
16463+ done > "$output"
16464+ eval cmd=\"$cmd1\"
16465 func_show_eval "$cmd" 'exit $?'
16466+ output=$save_output
16467+ libobjs=$save_libobjs
16468 skipped_export=false
16469 else
16470 # The command line is too long to execute in one step.
16471@@ -7248,7 +8211,7 @@ EOF
16472 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16473 tmp_export_symbols="$export_symbols"
16474 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16475- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16476+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16477 fi
16478
16479 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16480@@ -7260,7 +8223,7 @@ EOF
16481 # global variables. join(1) would be nice here, but unfortunately
16482 # isn't a blessed tool.
16483 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16484- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16485+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16486 export_symbols=$output_objdir/$libname.def
16487 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16488 fi
16489@@ -7270,7 +8233,7 @@ EOF
16490 case " $convenience " in
16491 *" $test_deplib "*) ;;
16492 *)
16493- tmp_deplibs="$tmp_deplibs $test_deplib"
16494+ func_append tmp_deplibs " $test_deplib"
16495 ;;
16496 esac
16497 done
16498@@ -7286,43 +8249,43 @@ EOF
16499 fi
16500 if test -n "$whole_archive_flag_spec"; then
16501 save_libobjs=$libobjs
16502- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16503+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16504 test "X$libobjs" = "X " && libobjs=
16505 else
16506 gentop="$output_objdir/${outputname}x"
16507- generated="$generated $gentop"
16508+ func_append generated " $gentop"
16509
16510 func_extract_archives $gentop $convenience
16511- libobjs="$libobjs $func_extract_archives_result"
16512+ func_append libobjs " $func_extract_archives_result"
16513 test "X$libobjs" = "X " && libobjs=
16514 fi
16515 fi
16516
16517 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16518- eval "flag=\"$thread_safe_flag_spec\""
16519- linker_flags="$linker_flags $flag"
16520+ eval flag=\"$thread_safe_flag_spec\"
16521+ func_append linker_flags " $flag"
16522 fi
16523
16524 # Make a backup of the uninstalled library when relinking
16525- if test "$mode" = relink; then
16526- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16527+ if test "$opt_mode" = relink; then
16528+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16529 fi
16530
16531 # Do each of the archive commands.
16532 if test "$module" = yes && test -n "$module_cmds" ; then
16533 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16534- eval "test_cmds=\"$module_expsym_cmds\""
16535+ eval test_cmds=\"$module_expsym_cmds\"
16536 cmds=$module_expsym_cmds
16537 else
16538- eval "test_cmds=\"$module_cmds\""
16539+ eval test_cmds=\"$module_cmds\"
16540 cmds=$module_cmds
16541 fi
16542 else
16543 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16544- eval "test_cmds=\"$archive_expsym_cmds\""
16545+ eval test_cmds=\"$archive_expsym_cmds\"
16546 cmds=$archive_expsym_cmds
16547 else
16548- eval "test_cmds=\"$archive_cmds\""
16549+ eval test_cmds=\"$archive_cmds\"
16550 cmds=$archive_cmds
16551 fi
16552 fi
16553@@ -7366,10 +8329,13 @@ EOF
16554 echo 'INPUT (' > $output
16555 for obj in $save_libobjs
16556 do
16557- $ECHO "$obj" >> $output
16558+ func_to_tool_file "$obj"
16559+ $ECHO "$func_to_tool_file_result" >> $output
16560 done
16561 echo ')' >> $output
16562- delfiles="$delfiles $output"
16563+ func_append delfiles " $output"
16564+ func_to_tool_file "$output"
16565+ output=$func_to_tool_file_result
16566 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16567 output=${output_objdir}/${output_la}.lnk
16568 func_verbose "creating linker input file list: $output"
16569@@ -7383,15 +8349,17 @@ EOF
16570 fi
16571 for obj
16572 do
16573- $ECHO "$obj" >> $output
16574+ func_to_tool_file "$obj"
16575+ $ECHO "$func_to_tool_file_result" >> $output
16576 done
16577- delfiles="$delfiles $output"
16578- output=$firstobj\"$file_list_spec$output\"
16579+ func_append delfiles " $output"
16580+ func_to_tool_file "$output"
16581+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16582 else
16583 if test -n "$save_libobjs"; then
16584 func_verbose "creating reloadable object files..."
16585 output=$output_objdir/$output_la-${k}.$objext
16586- eval "test_cmds=\"$reload_cmds\""
16587+ eval test_cmds=\"$reload_cmds\"
16588 func_len " $test_cmds"
16589 len0=$func_len_result
16590 len=$len0
16591@@ -7411,12 +8379,12 @@ EOF
16592 if test "$k" -eq 1 ; then
16593 # The first file doesn't have a previous command to add.
16594 reload_objs=$objlist
16595- eval "concat_cmds=\"$reload_cmds\""
16596+ eval concat_cmds=\"$reload_cmds\"
16597 else
16598 # All subsequent reloadable object files will link in
16599 # the last one created.
16600 reload_objs="$objlist $last_robj"
16601- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16602+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16603 fi
16604 last_robj=$output_objdir/$output_la-${k}.$objext
16605 func_arith $k + 1
16606@@ -7433,11 +8401,11 @@ EOF
16607 # files will link in the last one created.
16608 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16609 reload_objs="$objlist $last_robj"
16610- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16611+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16612 if test -n "$last_robj"; then
16613- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16614+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16615 fi
16616- delfiles="$delfiles $output"
16617+ func_append delfiles " $output"
16618
16619 else
16620 output=
16621@@ -7450,9 +8418,9 @@ EOF
16622 libobjs=$output
16623 # Append the command to create the export file.
16624 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16625- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16626+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16627 if test -n "$last_robj"; then
16628- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16629+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16630 fi
16631 fi
16632
16633@@ -7471,7 +8439,7 @@ EOF
16634 lt_exit=$?
16635
16636 # Restore the uninstalled library and exit
16637- if test "$mode" = relink; then
16638+ if test "$opt_mode" = relink; then
16639 ( cd "$output_objdir" && \
16640 $RM "${realname}T" && \
16641 $MV "${realname}U" "$realname" )
16642@@ -7492,7 +8460,7 @@ EOF
16643 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16644 tmp_export_symbols="$export_symbols"
16645 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16646- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16647+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16648 fi
16649
16650 if test -n "$orig_export_symbols"; then
16651@@ -7504,7 +8472,7 @@ EOF
16652 # global variables. join(1) would be nice here, but unfortunately
16653 # isn't a blessed tool.
16654 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16655- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16656+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16657 export_symbols=$output_objdir/$libname.def
16658 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16659 fi
16660@@ -7515,7 +8483,7 @@ EOF
16661 output=$save_output
16662
16663 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16664- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16665+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16666 test "X$libobjs" = "X " && libobjs=
16667 fi
16668 # Expand the library linking commands again to reset the
16669@@ -7539,23 +8507,23 @@ EOF
16670
16671 if test -n "$delfiles"; then
16672 # Append the command to remove temporary files to $cmds.
16673- eval "cmds=\"\$cmds~\$RM $delfiles\""
16674+ eval cmds=\"\$cmds~\$RM $delfiles\"
16675 fi
16676
16677 # Add any objects from preloaded convenience libraries
16678 if test -n "$dlprefiles"; then
16679 gentop="$output_objdir/${outputname}x"
16680- generated="$generated $gentop"
16681+ func_append generated " $gentop"
16682
16683 func_extract_archives $gentop $dlprefiles
16684- libobjs="$libobjs $func_extract_archives_result"
16685+ func_append libobjs " $func_extract_archives_result"
16686 test "X$libobjs" = "X " && libobjs=
16687 fi
16688
16689 save_ifs="$IFS"; IFS='~'
16690 for cmd in $cmds; do
16691 IFS="$save_ifs"
16692- eval "cmd=\"$cmd\""
16693+ eval cmd=\"$cmd\"
16694 $opt_silent || {
16695 func_quote_for_expand "$cmd"
16696 eval "func_echo $func_quote_for_expand_result"
16697@@ -7564,7 +8532,7 @@ EOF
16698 lt_exit=$?
16699
16700 # Restore the uninstalled library and exit
16701- if test "$mode" = relink; then
16702+ if test "$opt_mode" = relink; then
16703 ( cd "$output_objdir" && \
16704 $RM "${realname}T" && \
16705 $MV "${realname}U" "$realname" )
16706@@ -7576,8 +8544,8 @@ EOF
16707 IFS="$save_ifs"
16708
16709 # Restore the uninstalled library and exit
16710- if test "$mode" = relink; then
16711- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16712+ if test "$opt_mode" = relink; then
16713+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16714
16715 if test -n "$convenience"; then
16716 if test -z "$whole_archive_flag_spec"; then
16717@@ -7656,17 +8624,20 @@ EOF
16718
16719 if test -n "$convenience"; then
16720 if test -n "$whole_archive_flag_spec"; then
16721- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16722+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16723 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16724 else
16725 gentop="$output_objdir/${obj}x"
16726- generated="$generated $gentop"
16727+ func_append generated " $gentop"
16728
16729 func_extract_archives $gentop $convenience
16730 reload_conv_objs="$reload_objs $func_extract_archives_result"
16731 fi
16732 fi
16733
16734+ # If we're not building shared, we need to use non_pic_objs
16735+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16736+
16737 # Create the old-style object.
16738 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16739
16740@@ -7690,7 +8661,7 @@ EOF
16741 # Create an invalid libtool object if no PIC, so that we don't
16742 # accidentally link it into a program.
16743 # $show "echo timestamp > $libobj"
16744- # $opt_dry_run || echo timestamp > $libobj || exit $?
16745+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16746 exit $EXIT_SUCCESS
16747 fi
16748
16749@@ -7740,8 +8711,8 @@ EOF
16750 if test "$tagname" = CXX ; then
16751 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16752 10.[0123])
16753- compile_command="$compile_command ${wl}-bind_at_load"
16754- finalize_command="$finalize_command ${wl}-bind_at_load"
16755+ func_append compile_command " ${wl}-bind_at_load"
16756+ func_append finalize_command " ${wl}-bind_at_load"
16757 ;;
16758 esac
16759 fi
16760@@ -7761,7 +8732,7 @@ EOF
16761 *)
16762 case " $compile_deplibs " in
16763 *" -L$path/$objdir "*)
16764- new_libs="$new_libs -L$path/$objdir" ;;
16765+ func_append new_libs " -L$path/$objdir" ;;
16766 esac
16767 ;;
16768 esac
16769@@ -7771,17 +8742,17 @@ EOF
16770 -L*)
16771 case " $new_libs " in
16772 *" $deplib "*) ;;
16773- *) new_libs="$new_libs $deplib" ;;
16774+ *) func_append new_libs " $deplib" ;;
16775 esac
16776 ;;
16777- *) new_libs="$new_libs $deplib" ;;
16778+ *) func_append new_libs " $deplib" ;;
16779 esac
16780 done
16781 compile_deplibs="$new_libs"
16782
16783
16784- compile_command="$compile_command $compile_deplibs"
16785- finalize_command="$finalize_command $finalize_deplibs"
16786+ func_append compile_command " $compile_deplibs"
16787+ func_append finalize_command " $finalize_deplibs"
16788
16789 if test -n "$rpath$xrpath"; then
16790 # If the user specified any rpath flags, then add them.
16791@@ -7789,7 +8760,7 @@ EOF
16792 # This is the magic to use -rpath.
16793 case "$finalize_rpath " in
16794 *" $libdir "*) ;;
16795- *) finalize_rpath="$finalize_rpath $libdir" ;;
16796+ *) func_append finalize_rpath " $libdir" ;;
16797 esac
16798 done
16799 fi
16800@@ -7808,18 +8779,18 @@ EOF
16801 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16802 ;;
16803 *)
16804- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16805+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16806 ;;
16807 esac
16808 fi
16809 else
16810- eval "flag=\"$hardcode_libdir_flag_spec\""
16811- rpath="$rpath $flag"
16812+ eval flag=\"$hardcode_libdir_flag_spec\"
16813+ func_append rpath " $flag"
16814 fi
16815 elif test -n "$runpath_var"; then
16816 case "$perm_rpath " in
16817 *" $libdir "*) ;;
16818- *) perm_rpath="$perm_rpath $libdir" ;;
16819+ *) func_append perm_rpath " $libdir" ;;
16820 esac
16821 fi
16822 case $host in
16823@@ -7828,12 +8799,12 @@ EOF
16824 case :$dllsearchpath: in
16825 *":$libdir:"*) ;;
16826 ::) dllsearchpath=$libdir;;
16827- *) dllsearchpath="$dllsearchpath:$libdir";;
16828+ *) func_append dllsearchpath ":$libdir";;
16829 esac
16830 case :$dllsearchpath: in
16831 *":$testbindir:"*) ;;
16832 ::) dllsearchpath=$testbindir;;
16833- *) dllsearchpath="$dllsearchpath:$testbindir";;
16834+ *) func_append dllsearchpath ":$testbindir";;
16835 esac
16836 ;;
16837 esac
16838@@ -7842,7 +8813,7 @@ EOF
16839 if test -n "$hardcode_libdir_separator" &&
16840 test -n "$hardcode_libdirs"; then
16841 libdir="$hardcode_libdirs"
16842- eval "rpath=\" $hardcode_libdir_flag_spec\""
16843+ eval rpath=\" $hardcode_libdir_flag_spec\"
16844 fi
16845 compile_rpath="$rpath"
16846
16847@@ -7859,18 +8830,18 @@ EOF
16848 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16849 ;;
16850 *)
16851- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16852+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16853 ;;
16854 esac
16855 fi
16856 else
16857- eval "flag=\"$hardcode_libdir_flag_spec\""
16858- rpath="$rpath $flag"
16859+ eval flag=\"$hardcode_libdir_flag_spec\"
16860+ func_append rpath " $flag"
16861 fi
16862 elif test -n "$runpath_var"; then
16863 case "$finalize_perm_rpath " in
16864 *" $libdir "*) ;;
16865- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16866+ *) func_append finalize_perm_rpath " $libdir" ;;
16867 esac
16868 fi
16869 done
16870@@ -7878,7 +8849,7 @@ EOF
16871 if test -n "$hardcode_libdir_separator" &&
16872 test -n "$hardcode_libdirs"; then
16873 libdir="$hardcode_libdirs"
16874- eval "rpath=\" $hardcode_libdir_flag_spec\""
16875+ eval rpath=\" $hardcode_libdir_flag_spec\"
16876 fi
16877 finalize_rpath="$rpath"
16878
16879@@ -7921,6 +8892,12 @@ EOF
16880 exit_status=0
16881 func_show_eval "$link_command" 'exit_status=$?'
16882
16883+ if test -n "$postlink_cmds"; then
16884+ func_to_tool_file "$output"
16885+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16886+ func_execute_cmds "$postlink_cmds" 'exit $?'
16887+ fi
16888+
16889 # Delete the generated files.
16890 if test -f "$output_objdir/${outputname}S.${objext}"; then
16891 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16892@@ -7943,7 +8920,7 @@ EOF
16893 # We should set the runpath_var.
16894 rpath=
16895 for dir in $perm_rpath; do
16896- rpath="$rpath$dir:"
16897+ func_append rpath "$dir:"
16898 done
16899 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16900 fi
16901@@ -7951,7 +8928,7 @@ EOF
16902 # We should set the runpath_var.
16903 rpath=
16904 for dir in $finalize_perm_rpath; do
16905- rpath="$rpath$dir:"
16906+ func_append rpath "$dir:"
16907 done
16908 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
16909 fi
16910@@ -7966,6 +8943,13 @@ EOF
16911 $opt_dry_run || $RM $output
16912 # Link the executable and exit
16913 func_show_eval "$link_command" 'exit $?'
16914+
16915+ if test -n "$postlink_cmds"; then
16916+ func_to_tool_file "$output"
16917+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16918+ func_execute_cmds "$postlink_cmds" 'exit $?'
16919+ fi
16920+
16921 exit $EXIT_SUCCESS
16922 fi
16923
16924@@ -7999,6 +8983,12 @@ EOF
16925
16926 func_show_eval "$link_command" 'exit $?'
16927
16928+ if test -n "$postlink_cmds"; then
16929+ func_to_tool_file "$output_objdir/$outputname"
16930+ 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'`
16931+ func_execute_cmds "$postlink_cmds" 'exit $?'
16932+ fi
16933+
16934 # Now create the wrapper script.
16935 func_verbose "creating $output"
16936
16937@@ -8096,7 +9086,7 @@ EOF
16938 else
16939 oldobjs="$old_deplibs $non_pic_objects"
16940 if test "$preload" = yes && test -f "$symfileobj"; then
16941- oldobjs="$oldobjs $symfileobj"
16942+ func_append oldobjs " $symfileobj"
16943 fi
16944 fi
16945 addlibs="$old_convenience"
16946@@ -8104,10 +9094,10 @@ EOF
16947
16948 if test -n "$addlibs"; then
16949 gentop="$output_objdir/${outputname}x"
16950- generated="$generated $gentop"
16951+ func_append generated " $gentop"
16952
16953 func_extract_archives $gentop $addlibs
16954- oldobjs="$oldobjs $func_extract_archives_result"
16955+ func_append oldobjs " $func_extract_archives_result"
16956 fi
16957
16958 # Do each command in the archive commands.
16959@@ -8118,10 +9108,10 @@ EOF
16960 # Add any objects from preloaded convenience libraries
16961 if test -n "$dlprefiles"; then
16962 gentop="$output_objdir/${outputname}x"
16963- generated="$generated $gentop"
16964+ func_append generated " $gentop"
16965
16966 func_extract_archives $gentop $dlprefiles
16967- oldobjs="$oldobjs $func_extract_archives_result"
16968+ func_append oldobjs " $func_extract_archives_result"
16969 fi
16970
16971 # POSIX demands no paths to be encoded in archives. We have
16972@@ -8139,7 +9129,7 @@ EOF
16973 else
16974 echo "copying selected object files to avoid basename conflicts..."
16975 gentop="$output_objdir/${outputname}x"
16976- generated="$generated $gentop"
16977+ func_append generated " $gentop"
16978 func_mkdir_p "$gentop"
16979 save_oldobjs=$oldobjs
16980 oldobjs=
16981@@ -8163,18 +9153,28 @@ EOF
16982 esac
16983 done
16984 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
16985- oldobjs="$oldobjs $gentop/$newobj"
16986+ func_append oldobjs " $gentop/$newobj"
16987 ;;
16988- *) oldobjs="$oldobjs $obj" ;;
16989+ *) func_append oldobjs " $obj" ;;
16990 esac
16991 done
16992 fi
16993- eval "cmds=\"$old_archive_cmds\""
16994+ eval cmds=\"$old_archive_cmds\"
16995
16996 func_len " $cmds"
16997 len=$func_len_result
16998 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16999 cmds=$old_archive_cmds
17000+ elif test -n "$archiver_list_spec"; then
17001+ func_verbose "using command file archive linking..."
17002+ for obj in $oldobjs
17003+ do
17004+ func_to_tool_file "$obj"
17005+ $ECHO "$func_to_tool_file_result"
17006+ done > $output_objdir/$libname.libcmd
17007+ func_to_tool_file "$output_objdir/$libname.libcmd"
17008+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
17009+ cmds=$old_archive_cmds
17010 else
17011 # the command line is too long to link in one step, link in parts
17012 func_verbose "using piecewise archive linking..."
17013@@ -8189,7 +9189,7 @@ EOF
17014 do
17015 last_oldobj=$obj
17016 done
17017- eval "test_cmds=\"$old_archive_cmds\""
17018+ eval test_cmds=\"$old_archive_cmds\"
17019 func_len " $test_cmds"
17020 len0=$func_len_result
17021 len=$len0
17022@@ -8208,7 +9208,7 @@ EOF
17023 RANLIB=$save_RANLIB
17024 fi
17025 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
17026- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
17027+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17028 objlist=
17029 len=$len0
17030 fi
17031@@ -8216,9 +9216,9 @@ EOF
17032 RANLIB=$save_RANLIB
17033 oldobjs=$objlist
17034 if test "X$oldobjs" = "X" ; then
17035- eval "cmds=\"\$concat_cmds\""
17036+ eval cmds=\"\$concat_cmds\"
17037 else
17038- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17039+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17040 fi
17041 fi
17042 fi
17043@@ -8268,12 +9268,23 @@ EOF
17044 *.la)
17045 func_basename "$deplib"
17046 name="$func_basename_result"
17047- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17048+ func_resolve_sysroot "$deplib"
17049+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17050 test -z "$libdir" && \
17051 func_fatal_error "\`$deplib' is not a valid libtool archive"
17052- newdependency_libs="$newdependency_libs $libdir/$name"
17053+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17054+ ;;
17055+ -L*)
17056+ func_stripname -L '' "$deplib"
17057+ func_replace_sysroot "$func_stripname_result"
17058+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17059 ;;
17060- *) newdependency_libs="$newdependency_libs $deplib" ;;
17061+ -R*)
17062+ func_stripname -R '' "$deplib"
17063+ func_replace_sysroot "$func_stripname_result"
17064+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17065+ ;;
17066+ *) func_append newdependency_libs " $deplib" ;;
17067 esac
17068 done
17069 dependency_libs="$newdependency_libs"
17070@@ -8284,12 +9295,14 @@ EOF
17071 *.la)
17072 func_basename "$lib"
17073 name="$func_basename_result"
17074- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17075+ func_resolve_sysroot "$lib"
17076+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17077+
17078 test -z "$libdir" && \
17079 func_fatal_error "\`$lib' is not a valid libtool archive"
17080- newdlfiles="$newdlfiles $libdir/$name"
17081+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17082 ;;
17083- *) newdlfiles="$newdlfiles $lib" ;;
17084+ *) func_append newdlfiles " $lib" ;;
17085 esac
17086 done
17087 dlfiles="$newdlfiles"
17088@@ -8303,10 +9316,11 @@ EOF
17089 # the library:
17090 func_basename "$lib"
17091 name="$func_basename_result"
17092- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17093+ func_resolve_sysroot "$lib"
17094+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17095 test -z "$libdir" && \
17096 func_fatal_error "\`$lib' is not a valid libtool archive"
17097- newdlprefiles="$newdlprefiles $libdir/$name"
17098+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17099 ;;
17100 esac
17101 done
17102@@ -8318,7 +9332,7 @@ EOF
17103 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17104 *) abs=`pwd`"/$lib" ;;
17105 esac
17106- newdlfiles="$newdlfiles $abs"
17107+ func_append newdlfiles " $abs"
17108 done
17109 dlfiles="$newdlfiles"
17110 newdlprefiles=
17111@@ -8327,7 +9341,7 @@ EOF
17112 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17113 *) abs=`pwd`"/$lib" ;;
17114 esac
17115- newdlprefiles="$newdlprefiles $abs"
17116+ func_append newdlprefiles " $abs"
17117 done
17118 dlprefiles="$newdlprefiles"
17119 fi
17120@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17121 exit $EXIT_SUCCESS
17122 }
17123
17124-{ test "$mode" = link || test "$mode" = relink; } &&
17125+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17126 func_mode_link ${1+"$@"}
17127
17128
17129@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17130 for arg
17131 do
17132 case $arg in
17133- -f) RM="$RM $arg"; rmforce=yes ;;
17134- -*) RM="$RM $arg" ;;
17135- *) files="$files $arg" ;;
17136+ -f) func_append RM " $arg"; rmforce=yes ;;
17137+ -*) func_append RM " $arg" ;;
17138+ *) func_append files " $arg" ;;
17139 esac
17140 done
17141
17142@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17143
17144 rmdirs=
17145
17146- origobjdir="$objdir"
17147 for file in $files; do
17148 func_dirname "$file" "" "."
17149 dir="$func_dirname_result"
17150 if test "X$dir" = X.; then
17151- objdir="$origobjdir"
17152+ odir="$objdir"
17153 else
17154- objdir="$dir/$origobjdir"
17155+ odir="$dir/$objdir"
17156 fi
17157 func_basename "$file"
17158 name="$func_basename_result"
17159- test "$mode" = uninstall && objdir="$dir"
17160+ test "$opt_mode" = uninstall && odir="$dir"
17161
17162- # Remember objdir for removal later, being careful to avoid duplicates
17163- if test "$mode" = clean; then
17164+ # Remember odir for removal later, being careful to avoid duplicates
17165+ if test "$opt_mode" = clean; then
17166 case " $rmdirs " in
17167- *" $objdir "*) ;;
17168- *) rmdirs="$rmdirs $objdir" ;;
17169+ *" $odir "*) ;;
17170+ *) func_append rmdirs " $odir" ;;
17171 esac
17172 fi
17173
17174@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17175
17176 # Delete the libtool libraries and symlinks.
17177 for n in $library_names; do
17178- rmfiles="$rmfiles $objdir/$n"
17179+ func_append rmfiles " $odir/$n"
17180 done
17181- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17182+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17183
17184- case "$mode" in
17185+ case "$opt_mode" in
17186 clean)
17187- case " $library_names " in
17188- # " " in the beginning catches empty $dlname
17189+ case " $library_names " in
17190 *" $dlname "*) ;;
17191- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17192+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17193 esac
17194- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17195+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17196 ;;
17197 uninstall)
17198 if test -n "$library_names"; then
17199@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17200 # Add PIC object to the list of files to remove.
17201 if test -n "$pic_object" &&
17202 test "$pic_object" != none; then
17203- rmfiles="$rmfiles $dir/$pic_object"
17204+ func_append rmfiles " $dir/$pic_object"
17205 fi
17206
17207 # Add non-PIC object to the list of files to remove.
17208 if test -n "$non_pic_object" &&
17209 test "$non_pic_object" != none; then
17210- rmfiles="$rmfiles $dir/$non_pic_object"
17211+ func_append rmfiles " $dir/$non_pic_object"
17212 fi
17213 fi
17214 ;;
17215
17216 *)
17217- if test "$mode" = clean ; then
17218+ if test "$opt_mode" = clean ; then
17219 noexename=$name
17220 case $file in
17221 *.exe)
17222@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17223 noexename=$func_stripname_result
17224 # $file with .exe has already been added to rmfiles,
17225 # add $file without .exe
17226- rmfiles="$rmfiles $file"
17227+ func_append rmfiles " $file"
17228 ;;
17229 esac
17230 # Do a test to see if this is a libtool program.
17231@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17232 func_ltwrapper_scriptname "$file"
17233 relink_command=
17234 func_source $func_ltwrapper_scriptname_result
17235- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17236+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17237 else
17238 relink_command=
17239 func_source $dir/$noexename
17240@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17241
17242 # note $name still contains .exe if it was in $file originally
17243 # as does the version of $file that was added into $rmfiles
17244- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17245+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17246 if test "$fast_install" = yes && test -n "$relink_command"; then
17247- rmfiles="$rmfiles $objdir/lt-$name"
17248+ func_append rmfiles " $odir/lt-$name"
17249 fi
17250 if test "X$noexename" != "X$name" ; then
17251- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17252+ func_append rmfiles " $odir/lt-${noexename}.c"
17253 fi
17254 fi
17255 fi
17256@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17257 esac
17258 func_show_eval "$RM $rmfiles" 'exit_status=1'
17259 done
17260- objdir="$origobjdir"
17261
17262 # Try to remove the ${objdir}s in the directories where we deleted files
17263 for dir in $rmdirs; do
17264@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17265 exit $exit_status
17266 }
17267
17268-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17269+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17270 func_mode_uninstall ${1+"$@"}
17271
17272-test -z "$mode" && {
17273+test -z "$opt_mode" && {
17274 help="$generic_help"
17275 func_fatal_help "you must specify a MODE"
17276 }
17277
17278 test -z "$exec_cmd" && \
17279- func_fatal_help "invalid operation mode \`$mode'"
17280+ func_fatal_help "invalid operation mode \`$opt_mode'"
17281
17282 if test -n "$exec_cmd"; then
17283 eval exec "$exec_cmd"
17284diff --git a/ltoptions.m4 b/ltoptions.m4
17285index 5ef12ced2a..17cfd51c0b 100644
17286--- a/ltoptions.m4
17287+++ b/ltoptions.m4
17288@@ -8,7 +8,7 @@
17289 # unlimited permission to copy and/or distribute it, with or without
17290 # modifications, as long as this notice is preserved.
17291
17292-# serial 6 ltoptions.m4
17293+# serial 7 ltoptions.m4
17294
17295 # This is to help aclocal find these macros, as it can't see m4_define.
17296 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17297diff --git a/ltversion.m4 b/ltversion.m4
17298index bf87f77132..9c7b5d4118 100644
17299--- a/ltversion.m4
17300+++ b/ltversion.m4
17301@@ -7,17 +7,17 @@
17302 # unlimited permission to copy and/or distribute it, with or without
17303 # modifications, as long as this notice is preserved.
17304
17305-# Generated from ltversion.in.
17306+# @configure_input@
17307
17308-# serial 3134 ltversion.m4
17309+# serial 3293 ltversion.m4
17310 # This file is part of GNU Libtool
17311
17312-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17313-m4_define([LT_PACKAGE_REVISION], [1.3134])
17314+m4_define([LT_PACKAGE_VERSION], [2.4])
17315+m4_define([LT_PACKAGE_REVISION], [1.3293])
17316
17317 AC_DEFUN([LTVERSION_VERSION],
17318-[macro_version='2.2.7a'
17319-macro_revision='1.3134'
17320+[macro_version='2.4'
17321+macro_revision='1.3293'
17322 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17323 _LT_DECL(, macro_revision, 0)
17324 ])
17325diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17326index bf92b5e079..c573da90c5 100644
17327--- a/lt~obsolete.m4
17328+++ b/lt~obsolete.m4
17329@@ -7,7 +7,7 @@
17330 # unlimited permission to copy and/or distribute it, with or without
17331 # modifications, as long as this notice is preserved.
17332
17333-# serial 4 lt~obsolete.m4
17334+# serial 5 lt~obsolete.m4
17335
17336 # These exist entirely to fool aclocal when bootstrapping libtool.
17337 #
17338diff --git a/opcodes/configure b/opcodes/configure
17339index 17530f54b9..79b39611c2 100755
17340--- a/opcodes/configure
17341+++ b/opcodes/configure
17342@@ -650,6 +650,9 @@ OTOOL
17343 LIPO
17344 NMEDIT
17345 DSYMUTIL
17346+MANIFEST_TOOL
17347+ac_ct_AR
17348+DLLTOOL
17349 OBJDUMP
17350 LN_S
17351 NM
17352@@ -763,6 +766,7 @@ enable_static
17353 with_pic
17354 enable_fast_install
17355 with_gnu_ld
17356+with_libtool_sysroot
17357 enable_libtool_lock
17358 enable_targets
17359 enable_werror
17360@@ -1423,6 +1427,8 @@ Optional Packages:
17361 --with-pic try to use only PIC/non-PIC objects [default=use
17362 both]
17363 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17364+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17365+ (or the compiler's sysroot if not specified).
17366
17367 Some influential environment variables:
17368 CC C compiler command
17369@@ -5115,8 +5121,8 @@ esac
17370
17371
17372
17373-macro_version='2.2.7a'
17374-macro_revision='1.3134'
17375+macro_version='2.4'
17376+macro_revision='1.3293'
17377
17378
17379
17380@@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17382 $as_echo_n "checking how to print strings... " >&6; }
17383 # Test print first, because it will be a builtin if present.
17384-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17385+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17386 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17387 ECHO='print -r --'
17388 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17389@@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17390 # Try some XSI features
17391 xsi_shell=no
17392 ( _lt_dummy="a/b/c"
17393- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17394- = c,a/b,, \
17395+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17396+ = c,a/b,b/c, \
17397 && eval 'test $(( 1 + 1 )) -eq 2 \
17398 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17399 && xsi_shell=yes
17400@@ -5892,6 +5898,80 @@ esac
17401
17402
17403
17404+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17405+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17406+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
17407+ $as_echo_n "(cached) " >&6
17408+else
17409+ case $host in
17410+ *-*-mingw* )
17411+ case $build in
17412+ *-*-mingw* ) # actually msys
17413+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17414+ ;;
17415+ *-*-cygwin* )
17416+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17417+ ;;
17418+ * ) # otherwise, assume *nix
17419+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17420+ ;;
17421+ esac
17422+ ;;
17423+ *-*-cygwin* )
17424+ case $build in
17425+ *-*-mingw* ) # actually msys
17426+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17427+ ;;
17428+ *-*-cygwin* )
17429+ lt_cv_to_host_file_cmd=func_convert_file_noop
17430+ ;;
17431+ * ) # otherwise, assume *nix
17432+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17433+ ;;
17434+ esac
17435+ ;;
17436+ * ) # unhandled hosts (and "normal" native builds)
17437+ lt_cv_to_host_file_cmd=func_convert_file_noop
17438+ ;;
17439+esac
17440+
17441+fi
17442+
17443+to_host_file_cmd=$lt_cv_to_host_file_cmd
17444+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17445+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17446+
17447+
17448+
17449+
17450+
17451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17452+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17453+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
17454+ $as_echo_n "(cached) " >&6
17455+else
17456+ #assume ordinary cross tools, or native build.
17457+lt_cv_to_tool_file_cmd=func_convert_file_noop
17458+case $host in
17459+ *-*-mingw* )
17460+ case $build in
17461+ *-*-mingw* ) # actually msys
17462+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17463+ ;;
17464+ esac
17465+ ;;
17466+esac
17467+
17468+fi
17469+
17470+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17471+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17472+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17473+
17474+
17475+
17476+
17477+
17478 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17479 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17480 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17481@@ -5908,6 +5988,11 @@ case $reload_flag in
17482 esac
17483 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17484 case $host_os in
17485+ cygwin* | mingw* | pw32* | cegcc*)
17486+ if test "$GCC" != yes; then
17487+ reload_cmds=false
17488+ fi
17489+ ;;
17490 darwin*)
17491 if test "$GCC" = yes; then
17492 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17493@@ -6076,7 +6161,8 @@ mingw* | pw32*)
17494 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17495 lt_cv_file_magic_cmd='func_win32_libid'
17496 else
17497- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17498+ # Keep this pattern in sync with the one in func_win32_libid.
17499+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17500 lt_cv_file_magic_cmd='$OBJDUMP -f'
17501 fi
17502 ;;
17503@@ -6230,6 +6316,21 @@ esac
17504 fi
17505 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17506 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17507+
17508+file_magic_glob=
17509+want_nocaseglob=no
17510+if test "$build" = "$host"; then
17511+ case $host_os in
17512+ mingw* | pw32*)
17513+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17514+ want_nocaseglob=yes
17515+ else
17516+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17517+ fi
17518+ ;;
17519+ esac
17520+fi
17521+
17522 file_magic_cmd=$lt_cv_file_magic_cmd
17523 deplibs_check_method=$lt_cv_deplibs_check_method
17524 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17525@@ -6243,11 +6344,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17526
17527
17528
17529+
17530+
17531+
17532+
17533+
17534+
17535+
17536+
17537+
17538+
17539
17540
17541 if test -n "$ac_tool_prefix"; then
17542- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17543-set dummy ${ac_tool_prefix}ar; ac_word=$2
17544+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17545+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17546+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17547+$as_echo_n "checking for $ac_word... " >&6; }
17548+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
17549+ $as_echo_n "(cached) " >&6
17550+else
17551+ if test -n "$DLLTOOL"; then
17552+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17553+else
17554+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17555+for as_dir in $PATH
17556+do
17557+ IFS=$as_save_IFS
17558+ test -z "$as_dir" && as_dir=.
17559+ for ac_exec_ext in '' $ac_executable_extensions; do
17560+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17561+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17562+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17563+ break 2
17564+ fi
17565+done
17566+ done
17567+IFS=$as_save_IFS
17568+
17569+fi
17570+fi
17571+DLLTOOL=$ac_cv_prog_DLLTOOL
17572+if test -n "$DLLTOOL"; then
17573+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17574+$as_echo "$DLLTOOL" >&6; }
17575+else
17576+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17577+$as_echo "no" >&6; }
17578+fi
17579+
17580+
17581+fi
17582+if test -z "$ac_cv_prog_DLLTOOL"; then
17583+ ac_ct_DLLTOOL=$DLLTOOL
17584+ # Extract the first word of "dlltool", so it can be a program name with args.
17585+set dummy dlltool; ac_word=$2
17586+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17587+$as_echo_n "checking for $ac_word... " >&6; }
17588+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17589+ $as_echo_n "(cached) " >&6
17590+else
17591+ if test -n "$ac_ct_DLLTOOL"; then
17592+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17593+else
17594+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17595+for as_dir in $PATH
17596+do
17597+ IFS=$as_save_IFS
17598+ test -z "$as_dir" && as_dir=.
17599+ for ac_exec_ext in '' $ac_executable_extensions; do
17600+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17601+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17602+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17603+ break 2
17604+ fi
17605+done
17606+ done
17607+IFS=$as_save_IFS
17608+
17609+fi
17610+fi
17611+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17612+if test -n "$ac_ct_DLLTOOL"; then
17613+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17614+$as_echo "$ac_ct_DLLTOOL" >&6; }
17615+else
17616+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17617+$as_echo "no" >&6; }
17618+fi
17619+
17620+ if test "x$ac_ct_DLLTOOL" = x; then
17621+ DLLTOOL="false"
17622+ else
17623+ case $cross_compiling:$ac_tool_warned in
17624+yes:)
17625+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17626+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17627+ac_tool_warned=yes ;;
17628+esac
17629+ DLLTOOL=$ac_ct_DLLTOOL
17630+ fi
17631+else
17632+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17633+fi
17634+
17635+test -z "$DLLTOOL" && DLLTOOL=dlltool
17636+
17637+
17638+
17639+
17640+
17641+
17642+
17643+
17644+
17645+
17646+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17647+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17648+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17649+ $as_echo_n "(cached) " >&6
17650+else
17651+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17652+
17653+case $host_os in
17654+cygwin* | mingw* | pw32* | cegcc*)
17655+ # two different shell functions defined in ltmain.sh
17656+ # decide which to use based on capabilities of $DLLTOOL
17657+ case `$DLLTOOL --help 2>&1` in
17658+ *--identify-strict*)
17659+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17660+ ;;
17661+ *)
17662+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17663+ ;;
17664+ esac
17665+ ;;
17666+*)
17667+ # fallback: assume linklib IS sharedlib
17668+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17669+ ;;
17670+esac
17671+
17672+fi
17673+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17674+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17675+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17676+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17677+
17678+
17679+
17680+
17681+
17682+
17683+
17684+if test -n "$ac_tool_prefix"; then
17685+ for ac_prog in ar
17686+ do
17687+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17688+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17690 $as_echo_n "checking for $ac_word... " >&6; }
17691 if test "${ac_cv_prog_AR+set}" = set; then :
17692@@ -6263,7 +6517,7 @@ do
17693 test -z "$as_dir" && as_dir=.
17694 for ac_exec_ext in '' $ac_executable_extensions; do
17695 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17696- ac_cv_prog_AR="${ac_tool_prefix}ar"
17697+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17698 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17699 break 2
17700 fi
17701@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; }
17702 fi
17703
17704
17705+ test -n "$AR" && break
17706+ done
17707 fi
17708-if test -z "$ac_cv_prog_AR"; then
17709+if test -z "$AR"; then
17710 ac_ct_AR=$AR
17711- # Extract the first word of "ar", so it can be a program name with args.
17712-set dummy ar; ac_word=$2
17713+ for ac_prog in ar
17714+do
17715+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17716+set dummy $ac_prog; ac_word=$2
17717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17718 $as_echo_n "checking for $ac_word... " >&6; }
17719 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17720@@ -6303,7 +6561,7 @@ do
17721 test -z "$as_dir" && as_dir=.
17722 for ac_exec_ext in '' $ac_executable_extensions; do
17723 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17724- ac_cv_prog_ac_ct_AR="ar"
17725+ ac_cv_prog_ac_ct_AR="$ac_prog"
17726 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17727 break 2
17728 fi
17729@@ -6322,6 +6580,10 @@ else
17730 $as_echo "no" >&6; }
17731 fi
17732
17733+
17734+ test -n "$ac_ct_AR" && break
17735+done
17736+
17737 if test "x$ac_ct_AR" = x; then
17738 AR="false"
17739 else
17740@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;;
17741 esac
17742 AR=$ac_ct_AR
17743 fi
17744-else
17745- AR="$ac_cv_prog_AR"
17746 fi
17747
17748-test -z "$AR" && AR=ar
17749-test -z "$AR_FLAGS" && AR_FLAGS=cru
17750+: ${AR=ar}
17751+: ${AR_FLAGS=cru}
17752+
17753+
17754+
17755+
17756+
17757+
17758+
17759+
17760+
17761+
17762+
17763+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17764+$as_echo_n "checking for archiver @FILE support... " >&6; }
17765+if test "${lt_cv_ar_at_file+set}" = set; then :
17766+ $as_echo_n "(cached) " >&6
17767+else
17768+ lt_cv_ar_at_file=no
17769+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17770+/* end confdefs.h. */
17771+
17772+int
17773+main ()
17774+{
17775
17776+ ;
17777+ return 0;
17778+}
17779+_ACEOF
17780+if ac_fn_c_try_compile "$LINENO"; then :
17781+ echo conftest.$ac_objext > conftest.lst
17782+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17783+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17784+ (eval $lt_ar_try) 2>&5
17785+ ac_status=$?
17786+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17787+ test $ac_status = 0; }
17788+ if test "$ac_status" -eq 0; then
17789+ # Ensure the archiver fails upon bogus file names.
17790+ rm -f conftest.$ac_objext libconftest.a
17791+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17792+ (eval $lt_ar_try) 2>&5
17793+ ac_status=$?
17794+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17795+ test $ac_status = 0; }
17796+ if test "$ac_status" -ne 0; then
17797+ lt_cv_ar_at_file=@
17798+ fi
17799+ fi
17800+ rm -f conftest.* libconftest.a
17801
17802+fi
17803+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17804
17805+fi
17806+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17807+$as_echo "$lt_cv_ar_at_file" >&6; }
17808
17809+if test "x$lt_cv_ar_at_file" = xno; then
17810+ archiver_list_spec=
17811+else
17812+ archiver_list_spec=$lt_cv_ar_at_file
17813+fi
17814
17815
17816
17817@@ -6684,8 +7002,8 @@ esac
17818 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17819
17820 # Transform an extracted symbol line into symbol name and symbol address
17821-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17822-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'"
17823+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17824+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'"
17825
17826 # Handle CRLF in mingw tool chain
17827 opt_cr=
17828@@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do
17829 else
17830 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17831 fi
17832+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17833
17834 # Check to see that the pipe works correctly.
17835 pipe_works=no
17836@@ -6762,6 +7081,18 @@ _LT_EOF
17837 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17838 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17839 cat <<_LT_EOF > conftest.$ac_ext
17840+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17841+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17842+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17843+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17844+# define LT_DLSYM_CONST
17845+#elif defined(__osf__)
17846+/* This system does not cope well with relocations in const data. */
17847+# define LT_DLSYM_CONST
17848+#else
17849+# define LT_DLSYM_CONST const
17850+#endif
17851+
17852 #ifdef __cplusplus
17853 extern "C" {
17854 #endif
17855@@ -6773,7 +7104,7 @@ _LT_EOF
17856 cat <<_LT_EOF >> conftest.$ac_ext
17857
17858 /* The mapping between symbol names and symbols. */
17859-const struct {
17860+LT_DLSYM_CONST struct {
17861 const char *name;
17862 void *address;
17863 }
17864@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() {
17865 _LT_EOF
17866 # Now try linking the two files.
17867 mv conftest.$ac_objext conftstm.$ac_objext
17868- lt_save_LIBS="$LIBS"
17869- lt_save_CFLAGS="$CFLAGS"
17870+ lt_globsym_save_LIBS=$LIBS
17871+ lt_globsym_save_CFLAGS=$CFLAGS
17872 LIBS="conftstm.$ac_objext"
17873 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17874 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17875@@ -6810,8 +7141,8 @@ _LT_EOF
17876 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17877 pipe_works=yes
17878 fi
17879- LIBS="$lt_save_LIBS"
17880- CFLAGS="$lt_save_CFLAGS"
17881+ LIBS=$lt_globsym_save_LIBS
17882+ CFLAGS=$lt_globsym_save_CFLAGS
17883 else
17884 echo "cannot find nm_test_func in $nlist" >&5
17885 fi
17886@@ -6848,6 +7179,16 @@ else
17887 $as_echo "ok" >&6; }
17888 fi
17889
17890+# Response file support.
17891+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17892+ nm_file_list_spec='@'
17893+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17894+ nm_file_list_spec='@'
17895+fi
17896+
17897+
17898+
17899+
17900
17901
17902
17903@@ -6864,6 +7205,45 @@ fi
17904
17905
17906
17907+
17908+
17909+
17910+
17911+
17912+
17913+
17914+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17915+$as_echo_n "checking for sysroot... " >&6; }
17916+
17917+# Check whether --with-libtool-sysroot was given.
17918+if test "${with_libtool_sysroot+set}" = set; then :
17919+ withval=$with_libtool_sysroot;
17920+else
17921+ with_libtool_sysroot=no
17922+fi
17923+
17924+
17925+lt_sysroot=
17926+case ${with_libtool_sysroot} in #(
17927+ yes)
17928+ if test "$GCC" = yes; then
17929+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17930+ fi
17931+ ;; #(
17932+ /*)
17933+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17934+ ;; #(
17935+ no|'')
17936+ ;; #(
17937+ *)
17938+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17939+$as_echo "${with_libtool_sysroot}" >&6; }
17940+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17941+ ;;
17942+esac
17943+
17944+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17945+$as_echo "${lt_sysroot:-no}" >&6; }
17946
17947
17948
17949@@ -7075,6 +7455,123 @@ esac
17950
17951 need_locks="$enable_libtool_lock"
17952
17953+if test -n "$ac_tool_prefix"; then
17954+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17955+set dummy ${ac_tool_prefix}mt; ac_word=$2
17956+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17957+$as_echo_n "checking for $ac_word... " >&6; }
17958+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17959+ $as_echo_n "(cached) " >&6
17960+else
17961+ if test -n "$MANIFEST_TOOL"; then
17962+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17963+else
17964+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17965+for as_dir in $PATH
17966+do
17967+ IFS=$as_save_IFS
17968+ test -z "$as_dir" && as_dir=.
17969+ for ac_exec_ext in '' $ac_executable_extensions; do
17970+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17971+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17972+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17973+ break 2
17974+ fi
17975+done
17976+ done
17977+IFS=$as_save_IFS
17978+
17979+fi
17980+fi
17981+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17982+if test -n "$MANIFEST_TOOL"; then
17983+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17984+$as_echo "$MANIFEST_TOOL" >&6; }
17985+else
17986+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17987+$as_echo "no" >&6; }
17988+fi
17989+
17990+
17991+fi
17992+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17993+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17994+ # Extract the first word of "mt", so it can be a program name with args.
17995+set dummy mt; ac_word=$2
17996+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17997+$as_echo_n "checking for $ac_word... " >&6; }
17998+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17999+ $as_echo_n "(cached) " >&6
18000+else
18001+ if test -n "$ac_ct_MANIFEST_TOOL"; then
18002+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
18003+else
18004+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18005+for as_dir in $PATH
18006+do
18007+ IFS=$as_save_IFS
18008+ test -z "$as_dir" && as_dir=.
18009+ for ac_exec_ext in '' $ac_executable_extensions; do
18010+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18011+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
18012+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18013+ break 2
18014+ fi
18015+done
18016+ done
18017+IFS=$as_save_IFS
18018+
18019+fi
18020+fi
18021+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18022+if test -n "$ac_ct_MANIFEST_TOOL"; then
18023+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18024+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18025+else
18026+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18027+$as_echo "no" >&6; }
18028+fi
18029+
18030+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18031+ MANIFEST_TOOL=":"
18032+ else
18033+ case $cross_compiling:$ac_tool_warned in
18034+yes:)
18035+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18036+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18037+ac_tool_warned=yes ;;
18038+esac
18039+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18040+ fi
18041+else
18042+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18043+fi
18044+
18045+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18046+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18047+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18048+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
18049+ $as_echo_n "(cached) " >&6
18050+else
18051+ lt_cv_path_mainfest_tool=no
18052+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18053+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18054+ cat conftest.err >&5
18055+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18056+ lt_cv_path_mainfest_tool=yes
18057+ fi
18058+ rm -f conftest*
18059+fi
18060+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18061+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18062+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18063+ MANIFEST_TOOL=:
18064+fi
18065+
18066+
18067+
18068+
18069+
18070
18071 case $host_os in
18072 rhapsody* | darwin*)
18073@@ -7638,6 +8135,8 @@ _LT_EOF
18074 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18075 echo "$AR cru libconftest.a conftest.o" >&5
18076 $AR cru libconftest.a conftest.o 2>&5
18077+ echo "$RANLIB libconftest.a" >&5
18078+ $RANLIB libconftest.a 2>&5
18079 cat > conftest.c << _LT_EOF
18080 int main() { return 0;}
18081 _LT_EOF
18082@@ -7803,7 +8302,8 @@ fi
18083 LIBTOOL_DEPS="$ltmain"
18084
18085 # Always use our own libtool.
18086-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18087+LIBTOOL='$(SHELL) $(top_builddir)'
18088+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18089
18090
18091
18092@@ -7892,7 +8392,7 @@ aix3*)
18093 esac
18094
18095 # Global variables:
18096-ofile=libtool
18097+ofile=${host_alias}-libtool
18098 can_build_shared=yes
18099
18100 # All known linkers require a `.a' archive for static linking (except MSVC,
18101@@ -8190,8 +8690,6 @@ fi
18102 lt_prog_compiler_pic=
18103 lt_prog_compiler_static=
18104
18105-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18106-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18107
18108 if test "$GCC" = yes; then
18109 lt_prog_compiler_wl='-Wl,'
18110@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18111 lt_prog_compiler_pic='--shared'
18112 lt_prog_compiler_static='--static'
18113 ;;
18114+ nagfor*)
18115+ # NAG Fortran compiler
18116+ lt_prog_compiler_wl='-Wl,-Wl,,'
18117+ lt_prog_compiler_pic='-PIC'
18118+ lt_prog_compiler_static='-Bstatic'
18119+ ;;
18120 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18121 # Portland Group compilers (*not* the Pentium gcc compiler,
18122 # which looks to be a dead project)
18123@@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18124 lt_prog_compiler_pic='-KPIC'
18125 lt_prog_compiler_static='-Bstatic'
18126 case $cc_basename in
18127- f77* | f90* | f95*)
18128+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18129 lt_prog_compiler_wl='-Qoption ld ';;
18130 *)
18131 lt_prog_compiler_wl='-Wl,';;
18132@@ -8476,13 +8980,17 @@ case $host_os in
18133 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18134 ;;
18135 esac
18136-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18137-$as_echo "$lt_prog_compiler_pic" >&6; }
18138-
18139-
18140-
18141-
18142
18143+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18144+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18145+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
18146+ $as_echo_n "(cached) " >&6
18147+else
18148+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18149+fi
18150+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18151+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18152+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18153
18154 #
18155 # Check to make sure the PIC flag actually works.
18156@@ -8543,6 +9051,11 @@ fi
18157
18158
18159
18160+
18161+
18162+
18163+
18164+
18165 #
18166 # Check to make sure the static flag actually works.
18167 #
18168@@ -8893,7 +9406,8 @@ _LT_EOF
18169 allow_undefined_flag=unsupported
18170 always_export_symbols=no
18171 enable_shared_with_static_runtimes=yes
18172- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18173+ 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'
18174+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18175
18176 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18177 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18178@@ -8992,12 +9506,12 @@ _LT_EOF
18179 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18180 hardcode_libdir_flag_spec=
18181 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18182- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18183+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18184 if test "x$supports_anon_versioning" = xyes; then
18185 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18186 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18187 echo "local: *; };" >> $output_objdir/$libname.ver~
18188- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18189+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18190 fi
18191 ;;
18192 esac
18193@@ -9011,8 +9525,8 @@ _LT_EOF
18194 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18195 wlarc=
18196 else
18197- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18198- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18199+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18200+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18201 fi
18202 ;;
18203
18204@@ -9030,8 +9544,8 @@ _LT_EOF
18205
18206 _LT_EOF
18207 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18208- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18209- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18210+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18211+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18212 else
18213 ld_shlibs=no
18214 fi
18215@@ -9077,8 +9591,8 @@ _LT_EOF
18216
18217 *)
18218 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18219- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18220- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18221+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18222+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18223 else
18224 ld_shlibs=no
18225 fi
18226@@ -9208,7 +9722,13 @@ _LT_EOF
18227 allow_undefined_flag='-berok'
18228 # Determine the default libpath from the value encoded in an
18229 # empty executable.
18230- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18231+ if test "${lt_cv_aix_libpath+set}" = set; then
18232+ aix_libpath=$lt_cv_aix_libpath
18233+else
18234+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18235+ $as_echo_n "(cached) " >&6
18236+else
18237+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18238 /* end confdefs.h. */
18239
18240 int
18241@@ -9221,22 +9741,29 @@ main ()
18242 _ACEOF
18243 if ac_fn_c_try_link "$LINENO"; then :
18244
18245-lt_aix_libpath_sed='
18246- /Import File Strings/,/^$/ {
18247- /^0/ {
18248- s/^0 *\(.*\)$/\1/
18249- p
18250- }
18251- }'
18252-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18253-# Check for a 64-bit object if we didn't find anything.
18254-if test -z "$aix_libpath"; then
18255- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18256-fi
18257+ lt_aix_libpath_sed='
18258+ /Import File Strings/,/^$/ {
18259+ /^0/ {
18260+ s/^0 *\([^ ]*\) *$/\1/
18261+ p
18262+ }
18263+ }'
18264+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18265+ # Check for a 64-bit object if we didn't find anything.
18266+ if test -z "$lt_cv_aix_libpath_"; then
18267+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18268+ fi
18269 fi
18270 rm -f core conftest.err conftest.$ac_objext \
18271 conftest$ac_exeext conftest.$ac_ext
18272-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18273+ if test -z "$lt_cv_aix_libpath_"; then
18274+ lt_cv_aix_libpath_="/usr/lib:/lib"
18275+ fi
18276+
18277+fi
18278+
18279+ aix_libpath=$lt_cv_aix_libpath_
18280+fi
18281
18282 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18283 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"
18284@@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18285 else
18286 # Determine the default libpath from the value encoded in an
18287 # empty executable.
18288- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18289+ if test "${lt_cv_aix_libpath+set}" = set; then
18290+ aix_libpath=$lt_cv_aix_libpath
18291+else
18292+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18293+ $as_echo_n "(cached) " >&6
18294+else
18295+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18296 /* end confdefs.h. */
18297
18298 int
18299@@ -9261,22 +9794,29 @@ main ()
18300 _ACEOF
18301 if ac_fn_c_try_link "$LINENO"; then :
18302
18303-lt_aix_libpath_sed='
18304- /Import File Strings/,/^$/ {
18305- /^0/ {
18306- s/^0 *\(.*\)$/\1/
18307- p
18308- }
18309- }'
18310-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18311-# Check for a 64-bit object if we didn't find anything.
18312-if test -z "$aix_libpath"; then
18313- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18314-fi
18315+ lt_aix_libpath_sed='
18316+ /Import File Strings/,/^$/ {
18317+ /^0/ {
18318+ s/^0 *\([^ ]*\) *$/\1/
18319+ p
18320+ }
18321+ }'
18322+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18323+ # Check for a 64-bit object if we didn't find anything.
18324+ if test -z "$lt_cv_aix_libpath_"; then
18325+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18326+ fi
18327 fi
18328 rm -f core conftest.err conftest.$ac_objext \
18329 conftest$ac_exeext conftest.$ac_ext
18330-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18331+ if test -z "$lt_cv_aix_libpath_"; then
18332+ lt_cv_aix_libpath_="/usr/lib:/lib"
18333+ fi
18334+
18335+fi
18336+
18337+ aix_libpath=$lt_cv_aix_libpath_
18338+fi
18339
18340 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18341 # Warning - without using the other run time loading flags,
18342@@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18343 # Microsoft Visual C++.
18344 # hardcode_libdir_flag_spec is actually meaningless, as there is
18345 # no search path for DLLs.
18346- hardcode_libdir_flag_spec=' '
18347- allow_undefined_flag=unsupported
18348- # Tell ltmain to make .lib files, not .a files.
18349- libext=lib
18350- # Tell ltmain to make .dll files, not .so files.
18351- shrext_cmds=".dll"
18352- # FIXME: Setting linknames here is a bad hack.
18353- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18354- # The linker will automatically build a .lib file if we build a DLL.
18355- old_archive_from_new_cmds='true'
18356- # FIXME: Should let the user specify the lib program.
18357- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18358- fix_srcfile_path='`cygpath -w "$srcfile"`'
18359- enable_shared_with_static_runtimes=yes
18360+ case $cc_basename in
18361+ cl*)
18362+ # Native MSVC
18363+ hardcode_libdir_flag_spec=' '
18364+ allow_undefined_flag=unsupported
18365+ always_export_symbols=yes
18366+ file_list_spec='@'
18367+ # Tell ltmain to make .lib files, not .a files.
18368+ libext=lib
18369+ # Tell ltmain to make .dll files, not .so files.
18370+ shrext_cmds=".dll"
18371+ # FIXME: Setting linknames here is a bad hack.
18372+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18373+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18374+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18375+ else
18376+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18377+ fi~
18378+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18379+ linknames='
18380+ # The linker will not automatically build a static lib if we build a DLL.
18381+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18382+ enable_shared_with_static_runtimes=yes
18383+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18384+ # Don't use ranlib
18385+ old_postinstall_cmds='chmod 644 $oldlib'
18386+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18387+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18388+ case $lt_outputfile in
18389+ *.exe|*.EXE) ;;
18390+ *)
18391+ lt_outputfile="$lt_outputfile.exe"
18392+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18393+ ;;
18394+ esac~
18395+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18396+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18397+ $RM "$lt_outputfile.manifest";
18398+ fi'
18399+ ;;
18400+ *)
18401+ # Assume MSVC wrapper
18402+ hardcode_libdir_flag_spec=' '
18403+ allow_undefined_flag=unsupported
18404+ # Tell ltmain to make .lib files, not .a files.
18405+ libext=lib
18406+ # Tell ltmain to make .dll files, not .so files.
18407+ shrext_cmds=".dll"
18408+ # FIXME: Setting linknames here is a bad hack.
18409+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18410+ # The linker will automatically build a .lib file if we build a DLL.
18411+ old_archive_from_new_cmds='true'
18412+ # FIXME: Should let the user specify the lib program.
18413+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18414+ enable_shared_with_static_runtimes=yes
18415+ ;;
18416+ esac
18417 ;;
18418
18419 darwin* | rhapsody*)
18420@@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18421
18422 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18423 freebsd* | dragonfly*)
18424- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18425+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18426 hardcode_libdir_flag_spec='-R$libdir'
18427 hardcode_direct=yes
18428 hardcode_shlibpath_var=no
18429@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18430
18431 hpux9*)
18432 if test "$GCC" = yes; then
18433- 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'
18434+ 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'
18435 else
18436 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'
18437 fi
18438@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18439
18440 hpux10*)
18441 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18442- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18443+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18444 else
18445 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18446 fi
18447@@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18448 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18449 ;;
18450 ia64*)
18451- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18452+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18453 ;;
18454 *)
18455- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18456+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18457 ;;
18458 esac
18459 else
18460@@ -9525,23 +10108,36 @@ fi
18461
18462 irix5* | irix6* | nonstopux*)
18463 if test "$GCC" = yes; then
18464- 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'
18465+ 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'
18466 # Try to use the -exported_symbol ld option, if it does not
18467 # work, assume that -exports_file does not work either and
18468 # implicitly export all symbols.
18469- save_LDFLAGS="$LDFLAGS"
18470- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18471- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18472+ # This should be the same for all languages, so no per-tag cache variable.
18473+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18474+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18475+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
18476+ $as_echo_n "(cached) " >&6
18477+else
18478+ save_LDFLAGS="$LDFLAGS"
18479+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18480+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18481 /* end confdefs.h. */
18482-int foo(void) {}
18483+int foo (void) { return 0; }
18484 _ACEOF
18485 if ac_fn_c_try_link "$LINENO"; then :
18486- 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'
18487-
18488+ lt_cv_irix_exported_symbol=yes
18489+else
18490+ lt_cv_irix_exported_symbol=no
18491 fi
18492 rm -f core conftest.err conftest.$ac_objext \
18493 conftest$ac_exeext conftest.$ac_ext
18494- LDFLAGS="$save_LDFLAGS"
18495+ LDFLAGS="$save_LDFLAGS"
18496+fi
18497+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18498+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18499+ if test "$lt_cv_irix_exported_symbol" = yes; then
18500+ 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'
18501+ fi
18502 else
18503 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'
18504 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'
18505@@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \
18506 osf4* | osf5*) # as osf3* with the addition of -msym flag
18507 if test "$GCC" = yes; then
18508 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18509- 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'
18510+ 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'
18511 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18512 else
18513 allow_undefined_flag=' -expect_unresolved \*'
18514@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \
18515 no_undefined_flag=' -z defs'
18516 if test "$GCC" = yes; then
18517 wlarc='${wl}'
18518- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18519+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18520 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18521- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18522+ $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'
18523 else
18524 case `$CC -V 2>&1` in
18525 *"Compilers 5.0"*)
18526@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18527 need_version=no
18528 need_lib_prefix=no
18529
18530- case $GCC,$host_os in
18531- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18532+ case $GCC,$cc_basename in
18533+ yes,*)
18534+ # gcc
18535 library_names_spec='$libname.dll.a'
18536 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18537 postinstall_cmds='base_file=`basename \${file}`~
18538@@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18539 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18540 ;;
18541 esac
18542+ dynamic_linker='Win32 ld.exe'
18543+ ;;
18544+
18545+ *,cl*)
18546+ # Native MSVC
18547+ libname_spec='$name'
18548+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18549+ library_names_spec='${libname}.dll.lib'
18550+
18551+ case $build_os in
18552+ mingw*)
18553+ sys_lib_search_path_spec=
18554+ lt_save_ifs=$IFS
18555+ IFS=';'
18556+ for lt_path in $LIB
18557+ do
18558+ IFS=$lt_save_ifs
18559+ # Let DOS variable expansion print the short 8.3 style file name.
18560+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18561+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18562+ done
18563+ IFS=$lt_save_ifs
18564+ # Convert to MSYS style.
18565+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18566+ ;;
18567+ cygwin*)
18568+ # Convert to unix form, then to dos form, then back to unix form
18569+ # but this time dos style (no spaces!) so that the unix form looks
18570+ # like /cygdrive/c/PROGRA~1:/cygdr...
18571+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18572+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18573+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18574+ ;;
18575+ *)
18576+ sys_lib_search_path_spec="$LIB"
18577+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18578+ # It is most probably a Windows format PATH.
18579+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18580+ else
18581+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18582+ fi
18583+ # FIXME: find the short name or the path components, as spaces are
18584+ # common. (e.g. "Program Files" -> "PROGRA~1")
18585+ ;;
18586+ esac
18587+
18588+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18589+ postinstall_cmds='base_file=`basename \${file}`~
18590+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18591+ dldir=$destdir/`dirname \$dlpath`~
18592+ test -d \$dldir || mkdir -p \$dldir~
18593+ $install_prog $dir/$dlname \$dldir/$dlname'
18594+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18595+ dlpath=$dir/\$dldll~
18596+ $RM \$dlpath'
18597+ shlibpath_overrides_runpath=yes
18598+ dynamic_linker='Win32 link.exe'
18599 ;;
18600
18601 *)
18602+ # Assume MSVC wrapper
18603 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18604+ dynamic_linker='Win32 ld.exe'
18605 ;;
18606 esac
18607- dynamic_linker='Win32 ld.exe'
18608 # FIXME: first we should search . and the directory the executable is in
18609 shlibpath_var=PATH
18610 ;;
18611@@ -10355,7 +11010,7 @@ haiku*)
18612 soname_spec='${libname}${release}${shared_ext}$major'
18613 shlibpath_var=LIBRARY_PATH
18614 shlibpath_overrides_runpath=yes
18615- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18616+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18617 hardcode_into_libs=yes
18618 ;;
18619
18620@@ -11195,10 +11850,10 @@ else
18621 /* When -fvisbility=hidden is used, assume the code has been annotated
18622 correspondingly for the symbols needed. */
18623 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18624-void fnord () __attribute__((visibility("default")));
18625+int fnord () __attribute__((visibility("default")));
18626 #endif
18627
18628-void fnord () { int i=42; }
18629+int fnord () { return 42; }
18630 int main ()
18631 {
18632 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18633@@ -11301,10 +11956,10 @@ else
18634 /* When -fvisbility=hidden is used, assume the code has been annotated
18635 correspondingly for the symbols needed. */
18636 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18637-void fnord () __attribute__((visibility("default")));
18638+int fnord () __attribute__((visibility("default")));
18639 #endif
18640
18641-void fnord () { int i=42; }
18642+int fnord () { return 42; }
18643 int main ()
18644 {
18645 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18646@@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then
18647 # since libbfd may not pull in the entirety of libiberty.
18648 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18649 if test -n "$x"; then
18650- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18651+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18652 fi
18653
18654 case "${host}" in
18655@@ -13520,13 +14175,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18656 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18657 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18658 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18659+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18660+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18661 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18662 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18663 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18664 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18665 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18666+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18667+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18668+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18669+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18670 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18671 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18672+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18673 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18674 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18675 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18676@@ -13541,14 +14203,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18677 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18678 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18679 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"`'
18680+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18681+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18682 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18683 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18684 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18685-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18686 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18687+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18688 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18689 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18690 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18691+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18692 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18693 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18694 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18695@@ -13581,12 +14246,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18696 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18697 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18698 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18699-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18700 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18701 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18702 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18703 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18704 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18705+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18706 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18707 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18708 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18709@@ -13641,8 +14306,13 @@ reload_flag \
18710 OBJDUMP \
18711 deplibs_check_method \
18712 file_magic_cmd \
18713+file_magic_glob \
18714+want_nocaseglob \
18715+DLLTOOL \
18716+sharedlib_from_linklib_cmd \
18717 AR \
18718 AR_FLAGS \
18719+archiver_list_spec \
18720 STRIP \
18721 RANLIB \
18722 CC \
18723@@ -13652,12 +14322,14 @@ lt_cv_sys_global_symbol_pipe \
18724 lt_cv_sys_global_symbol_to_cdecl \
18725 lt_cv_sys_global_symbol_to_c_name_address \
18726 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18727+nm_file_list_spec \
18728 lt_prog_compiler_no_builtin_flag \
18729-lt_prog_compiler_wl \
18730 lt_prog_compiler_pic \
18731+lt_prog_compiler_wl \
18732 lt_prog_compiler_static \
18733 lt_cv_prog_compiler_c_o \
18734 need_locks \
18735+MANIFEST_TOOL \
18736 DSYMUTIL \
18737 NMEDIT \
18738 LIPO \
18739@@ -13673,7 +14345,6 @@ no_undefined_flag \
18740 hardcode_libdir_flag_spec \
18741 hardcode_libdir_flag_spec_ld \
18742 hardcode_libdir_separator \
18743-fix_srcfile_path \
18744 exclude_expsyms \
18745 include_expsyms \
18746 file_list_spec \
18747@@ -13709,6 +14380,7 @@ module_cmds \
18748 module_expsym_cmds \
18749 export_symbols_cmds \
18750 prelink_cmds \
18751+postlink_cmds \
18752 postinstall_cmds \
18753 postuninstall_cmds \
18754 finish_cmds \
18755@@ -14465,7 +15137,8 @@ $as_echo X"$file" |
18756 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18757 #
18758 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18759-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18760+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18761+# Inc.
18762 # Written by Gordon Matzigkeit, 1996
18763 #
18764 # This file is part of GNU Libtool.
18765@@ -14568,19 +15241,42 @@ SP2NL=$lt_lt_SP2NL
18766 # turn newlines into spaces.
18767 NL2SP=$lt_lt_NL2SP
18768
18769+# convert \$build file names to \$host format.
18770+to_host_file_cmd=$lt_cv_to_host_file_cmd
18771+
18772+# convert \$build files to toolchain format.
18773+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18774+
18775 # An object symbol dumper.
18776 OBJDUMP=$lt_OBJDUMP
18777
18778 # Method to check whether dependent libraries are shared objects.
18779 deplibs_check_method=$lt_deplibs_check_method
18780
18781-# Command to use when deplibs_check_method == "file_magic".
18782+# Command to use when deplibs_check_method = "file_magic".
18783 file_magic_cmd=$lt_file_magic_cmd
18784
18785+# How to find potential files when deplibs_check_method = "file_magic".
18786+file_magic_glob=$lt_file_magic_glob
18787+
18788+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18789+want_nocaseglob=$lt_want_nocaseglob
18790+
18791+# DLL creation program.
18792+DLLTOOL=$lt_DLLTOOL
18793+
18794+# Command to associate shared and link libraries.
18795+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18796+
18797 # The archiver.
18798 AR=$lt_AR
18799+
18800+# Flags to create an archive.
18801 AR_FLAGS=$lt_AR_FLAGS
18802
18803+# How to feed a file listing to the archiver.
18804+archiver_list_spec=$lt_archiver_list_spec
18805+
18806 # A symbol stripping program.
18807 STRIP=$lt_STRIP
18808
18809@@ -14610,6 +15306,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18810 # Transform the output of nm in a C name address pair when lib prefix is needed.
18811 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18812
18813+# Specify filename containing input files for \$NM.
18814+nm_file_list_spec=$lt_nm_file_list_spec
18815+
18816+# The root where to search for dependent libraries,and in which our libraries should be installed.
18817+lt_sysroot=$lt_sysroot
18818+
18819 # The name of the directory that contains temporary libtool files.
18820 objdir=$objdir
18821
18822@@ -14619,6 +15321,9 @@ MAGIC_CMD=$MAGIC_CMD
18823 # Must we lock files when doing compilation?
18824 need_locks=$lt_need_locks
18825
18826+# Manifest tool.
18827+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18828+
18829 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18830 DSYMUTIL=$lt_DSYMUTIL
18831
18832@@ -14733,12 +15438,12 @@ with_gcc=$GCC
18833 # Compiler flag to turn off builtin functions.
18834 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18835
18836-# How to pass a linker flag through the compiler.
18837-wl=$lt_lt_prog_compiler_wl
18838-
18839 # Additional compiler flags for building library objects.
18840 pic_flag=$lt_lt_prog_compiler_pic
18841
18842+# How to pass a linker flag through the compiler.
18843+wl=$lt_lt_prog_compiler_wl
18844+
18845 # Compiler flag to prevent dynamic linking.
18846 link_static_flag=$lt_lt_prog_compiler_static
18847
18848@@ -14825,9 +15530,6 @@ inherit_rpath=$inherit_rpath
18849 # Whether libtool must link a program against all its dependency libraries.
18850 link_all_deplibs=$link_all_deplibs
18851
18852-# Fix the shell variable \$srcfile for the compiler.
18853-fix_srcfile_path=$lt_fix_srcfile_path
18854-
18855 # Set to "yes" if exported symbols are required.
18856 always_export_symbols=$always_export_symbols
18857
18858@@ -14843,6 +15545,9 @@ include_expsyms=$lt_include_expsyms
18859 # Commands necessary for linking programs (against libraries) with templates.
18860 prelink_cmds=$lt_prelink_cmds
18861
18862+# Commands necessary for finishing linking programs.
18863+postlink_cmds=$lt_postlink_cmds
18864+
18865 # Specify filename containing input files.
18866 file_list_spec=$lt_file_list_spec
18867
18868@@ -14875,210 +15580,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18869 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18870 # text mode, it properly converts lines to CR/LF. This bash problem
18871 # is reportedly fixed, but why not run on old versions too?
18872- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18873- || (rm -f "$cfgfile"; exit 1)
18874-
18875- case $xsi_shell in
18876- yes)
18877- cat << \_LT_EOF >> "$cfgfile"
18878-
18879-# func_dirname file append nondir_replacement
18880-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18881-# otherwise set result to NONDIR_REPLACEMENT.
18882-func_dirname ()
18883-{
18884- case ${1} in
18885- */*) func_dirname_result="${1%/*}${2}" ;;
18886- * ) func_dirname_result="${3}" ;;
18887- esac
18888-}
18889-
18890-# func_basename file
18891-func_basename ()
18892-{
18893- func_basename_result="${1##*/}"
18894-}
18895-
18896-# func_dirname_and_basename file append nondir_replacement
18897-# perform func_basename and func_dirname in a single function
18898-# call:
18899-# dirname: Compute the dirname of FILE. If nonempty,
18900-# add APPEND to the result, otherwise set result
18901-# to NONDIR_REPLACEMENT.
18902-# value returned in "$func_dirname_result"
18903-# basename: Compute filename of FILE.
18904-# value retuned in "$func_basename_result"
18905-# Implementation must be kept synchronized with func_dirname
18906-# and func_basename. For efficiency, we do not delegate to
18907-# those functions but instead duplicate the functionality here.
18908-func_dirname_and_basename ()
18909-{
18910- case ${1} in
18911- */*) func_dirname_result="${1%/*}${2}" ;;
18912- * ) func_dirname_result="${3}" ;;
18913- esac
18914- func_basename_result="${1##*/}"
18915-}
18916-
18917-# func_stripname prefix suffix name
18918-# strip PREFIX and SUFFIX off of NAME.
18919-# PREFIX and SUFFIX must not contain globbing or regex special
18920-# characters, hashes, percent signs, but SUFFIX may contain a leading
18921-# dot (in which case that matches only a dot).
18922-func_stripname ()
18923-{
18924- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18925- # positional parameters, so assign one to ordinary parameter first.
18926- func_stripname_result=${3}
18927- func_stripname_result=${func_stripname_result#"${1}"}
18928- func_stripname_result=${func_stripname_result%"${2}"}
18929-}
18930-
18931-# func_opt_split
18932-func_opt_split ()
18933-{
18934- func_opt_split_opt=${1%%=*}
18935- func_opt_split_arg=${1#*=}
18936-}
18937-
18938-# func_lo2o object
18939-func_lo2o ()
18940-{
18941- case ${1} in
18942- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18943- *) func_lo2o_result=${1} ;;
18944- esac
18945-}
18946-
18947-# func_xform libobj-or-source
18948-func_xform ()
18949-{
18950- func_xform_result=${1%.*}.lo
18951-}
18952-
18953-# func_arith arithmetic-term...
18954-func_arith ()
18955-{
18956- func_arith_result=$(( $* ))
18957-}
18958-
18959-# func_len string
18960-# STRING may not start with a hyphen.
18961-func_len ()
18962-{
18963- func_len_result=${#1}
18964-}
18965-
18966-_LT_EOF
18967- ;;
18968- *) # Bourne compatible functions.
18969- cat << \_LT_EOF >> "$cfgfile"
18970-
18971-# func_dirname file append nondir_replacement
18972-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18973-# otherwise set result to NONDIR_REPLACEMENT.
18974-func_dirname ()
18975-{
18976- # Extract subdirectory from the argument.
18977- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18978- if test "X$func_dirname_result" = "X${1}"; then
18979- func_dirname_result="${3}"
18980- else
18981- func_dirname_result="$func_dirname_result${2}"
18982- fi
18983-}
18984-
18985-# func_basename file
18986-func_basename ()
18987-{
18988- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18989-}
18990-
18991-
18992-# func_stripname prefix suffix name
18993-# strip PREFIX and SUFFIX off of NAME.
18994-# PREFIX and SUFFIX must not contain globbing or regex special
18995-# characters, hashes, percent signs, but SUFFIX may contain a leading
18996-# dot (in which case that matches only a dot).
18997-# func_strip_suffix prefix name
18998-func_stripname ()
18999-{
19000- case ${2} in
19001- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
19002- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
19003- esac
19004-}
19005-
19006-# sed scripts:
19007-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
19008-my_sed_long_arg='1s/^-[^=]*=//'
19009-
19010-# func_opt_split
19011-func_opt_split ()
19012-{
19013- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
19014- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
19015-}
19016-
19017-# func_lo2o object
19018-func_lo2o ()
19019-{
19020- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19021-}
19022-
19023-# func_xform libobj-or-source
19024-func_xform ()
19025-{
19026- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19027-}
19028-
19029-# func_arith arithmetic-term...
19030-func_arith ()
19031-{
19032- func_arith_result=`expr "$@"`
19033-}
19034-
19035-# func_len string
19036-# STRING may not start with a hyphen.
19037-func_len ()
19038-{
19039- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19040-}
19041-
19042-_LT_EOF
19043-esac
19044-
19045-case $lt_shell_append in
19046- yes)
19047- cat << \_LT_EOF >> "$cfgfile"
19048-
19049-# func_append var value
19050-# Append VALUE to the end of shell variable VAR.
19051-func_append ()
19052-{
19053- eval "$1+=\$2"
19054-}
19055-_LT_EOF
19056- ;;
19057- *)
19058- cat << \_LT_EOF >> "$cfgfile"
19059-
19060-# func_append var value
19061-# Append VALUE to the end of shell variable VAR.
19062-func_append ()
19063-{
19064- eval "$1=\$$1\$2"
19065-}
19066-
19067-_LT_EOF
19068- ;;
19069- esac
19070-
19071-
19072- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19073- || (rm -f "$cfgfile"; exit 1)
19074-
19075- mv -f "$cfgfile" "$ofile" ||
19076+ sed '$q' "$ltmain" >> "$cfgfile" \
19077+ || (rm -f "$cfgfile"; exit 1)
19078+
19079+ if test x"$xsi_shell" = xyes; then
19080+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19081+func_dirname ()\
19082+{\
19083+\ case ${1} in\
19084+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19085+\ * ) func_dirname_result="${3}" ;;\
19086+\ esac\
19087+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19088+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19089+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19090+test 0 -eq $? || _lt_function_replace_fail=:
19091+
19092+
19093+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19094+func_basename ()\
19095+{\
19096+\ func_basename_result="${1##*/}"\
19097+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19098+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19099+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19100+test 0 -eq $? || _lt_function_replace_fail=:
19101+
19102+
19103+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19104+func_dirname_and_basename ()\
19105+{\
19106+\ case ${1} in\
19107+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19108+\ * ) func_dirname_result="${3}" ;;\
19109+\ esac\
19110+\ func_basename_result="${1##*/}"\
19111+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19112+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19113+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19114+test 0 -eq $? || _lt_function_replace_fail=:
19115+
19116+
19117+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19118+func_stripname ()\
19119+{\
19120+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19121+\ # positional parameters, so assign one to ordinary parameter first.\
19122+\ func_stripname_result=${3}\
19123+\ func_stripname_result=${func_stripname_result#"${1}"}\
19124+\ func_stripname_result=${func_stripname_result%"${2}"}\
19125+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19126+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19127+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19128+test 0 -eq $? || _lt_function_replace_fail=:
19129+
19130+
19131+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19132+func_split_long_opt ()\
19133+{\
19134+\ func_split_long_opt_name=${1%%=*}\
19135+\ func_split_long_opt_arg=${1#*=}\
19136+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19137+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19138+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19139+test 0 -eq $? || _lt_function_replace_fail=:
19140+
19141+
19142+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19143+func_split_short_opt ()\
19144+{\
19145+\ func_split_short_opt_arg=${1#??}\
19146+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19147+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19148+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19149+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19150+test 0 -eq $? || _lt_function_replace_fail=:
19151+
19152+
19153+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19154+func_lo2o ()\
19155+{\
19156+\ case ${1} in\
19157+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19158+\ *) func_lo2o_result=${1} ;;\
19159+\ esac\
19160+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19161+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19162+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19163+test 0 -eq $? || _lt_function_replace_fail=:
19164+
19165+
19166+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19167+func_xform ()\
19168+{\
19169+ func_xform_result=${1%.*}.lo\
19170+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19171+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19172+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19173+test 0 -eq $? || _lt_function_replace_fail=:
19174+
19175+
19176+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19177+func_arith ()\
19178+{\
19179+ func_arith_result=$(( $* ))\
19180+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19181+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19182+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19183+test 0 -eq $? || _lt_function_replace_fail=:
19184+
19185+
19186+ sed -e '/^func_len ()$/,/^} # func_len /c\
19187+func_len ()\
19188+{\
19189+ func_len_result=${#1}\
19190+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
19191+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19192+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19193+test 0 -eq $? || _lt_function_replace_fail=:
19194+
19195+fi
19196+
19197+if test x"$lt_shell_append" = xyes; then
19198+ sed -e '/^func_append ()$/,/^} # func_append /c\
19199+func_append ()\
19200+{\
19201+ eval "${1}+=\\${2}"\
19202+} # Extended-shell func_append implementation' "$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+
19207+
19208+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19209+func_append_quoted ()\
19210+{\
19211+\ func_quote_for_eval "${2}"\
19212+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19213+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19214+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19215+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19216+test 0 -eq $? || _lt_function_replace_fail=:
19217+
19218+
19219+ # Save a `func_append' function call where possible by direct use of '+='
19220+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19221+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19222+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19223+ test 0 -eq $? || _lt_function_replace_fail=:
19224+else
19225+ # Save a `func_append' function call even when '+=' is not available
19226+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19227+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19228+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19229+ test 0 -eq $? || _lt_function_replace_fail=:
19230+fi
19231+
19232+if test x"$_lt_function_replace_fail" = x":"; then
19233+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19234+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19235+fi
19236+
19237+
19238+ mv -f "$cfgfile" "$ofile" ||
19239 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19240 chmod +x "$ofile"
19241
19242diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19243index a9fbfd61f1..c43780f64d 100644
19244--- a/opcodes/configure.ac
19245+++ b/opcodes/configure.ac
19246@@ -167,7 +167,7 @@ changequote(,)dnl
19247 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19248 changequote([,])dnl
19249 if test -n "$x"; then
19250- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19251+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19252 fi
19253
19254 case "${host}" in
19255diff --git a/zlib/configure b/zlib/configure
19256index dc2d9ed383..ed9a492f5c 100755
19257--- a/zlib/configure
19258+++ b/zlib/configure
19259@@ -614,8 +614,11 @@ OTOOL
19260 LIPO
19261 NMEDIT
19262 DSYMUTIL
19263+MANIFEST_TOOL
19264 RANLIB
19265+ac_ct_AR
19266 AR
19267+DLLTOOL
19268 OBJDUMP
19269 LN_S
19270 NM
19271@@ -737,6 +740,7 @@ enable_static
19272 with_pic
19273 enable_fast_install
19274 with_gnu_ld
19275+with_libtool_sysroot
19276 enable_libtool_lock
19277 enable_host_shared
19278 '
19279@@ -1385,6 +1389,8 @@ Optional Packages:
19280 --with-pic try to use only PIC/non-PIC objects [default=use
19281 both]
19282 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19283+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19284+ (or the compiler's sysroot if not specified).
19285
19286 Some influential environment variables:
19287 CC C compiler command
19288@@ -3910,8 +3916,8 @@ esac
19289
19290
19291
19292-macro_version='2.2.7a'
19293-macro_revision='1.3134'
19294+macro_version='2.4'
19295+macro_revision='1.3293'
19296
19297
19298
19299@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19301 $as_echo_n "checking how to print strings... " >&6; }
19302 # Test print first, because it will be a builtin if present.
19303-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19304+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19305 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19306 ECHO='print -r --'
19307 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19308@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19309 # Try some XSI features
19310 xsi_shell=no
19311 ( _lt_dummy="a/b/c"
19312- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19313- = c,a/b,, \
19314+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19315+ = c,a/b,b/c, \
19316 && eval 'test $(( 1 + 1 )) -eq 2 \
19317 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19318 && xsi_shell=yes
19319@@ -4817,6 +4823,80 @@ esac
19320
19321
19322
19323+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19324+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19325+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
19326+ $as_echo_n "(cached) " >&6
19327+else
19328+ case $host in
19329+ *-*-mingw* )
19330+ case $build in
19331+ *-*-mingw* ) # actually msys
19332+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19333+ ;;
19334+ *-*-cygwin* )
19335+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19336+ ;;
19337+ * ) # otherwise, assume *nix
19338+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19339+ ;;
19340+ esac
19341+ ;;
19342+ *-*-cygwin* )
19343+ case $build in
19344+ *-*-mingw* ) # actually msys
19345+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19346+ ;;
19347+ *-*-cygwin* )
19348+ lt_cv_to_host_file_cmd=func_convert_file_noop
19349+ ;;
19350+ * ) # otherwise, assume *nix
19351+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19352+ ;;
19353+ esac
19354+ ;;
19355+ * ) # unhandled hosts (and "normal" native builds)
19356+ lt_cv_to_host_file_cmd=func_convert_file_noop
19357+ ;;
19358+esac
19359+
19360+fi
19361+
19362+to_host_file_cmd=$lt_cv_to_host_file_cmd
19363+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19364+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19365+
19366+
19367+
19368+
19369+
19370+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19371+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19372+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
19373+ $as_echo_n "(cached) " >&6
19374+else
19375+ #assume ordinary cross tools, or native build.
19376+lt_cv_to_tool_file_cmd=func_convert_file_noop
19377+case $host in
19378+ *-*-mingw* )
19379+ case $build in
19380+ *-*-mingw* ) # actually msys
19381+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19382+ ;;
19383+ esac
19384+ ;;
19385+esac
19386+
19387+fi
19388+
19389+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19390+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19391+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19392+
19393+
19394+
19395+
19396+
19397 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19398 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19399 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19400@@ -4833,6 +4913,11 @@ case $reload_flag in
19401 esac
19402 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19403 case $host_os in
19404+ cygwin* | mingw* | pw32* | cegcc*)
19405+ if test "$GCC" != yes; then
19406+ reload_cmds=false
19407+ fi
19408+ ;;
19409 darwin*)
19410 if test "$GCC" = yes; then
19411 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19412@@ -5001,7 +5086,8 @@ mingw* | pw32*)
19413 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19414 lt_cv_file_magic_cmd='func_win32_libid'
19415 else
19416- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19417+ # Keep this pattern in sync with the one in func_win32_libid.
19418+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19419 lt_cv_file_magic_cmd='$OBJDUMP -f'
19420 fi
19421 ;;
19422@@ -5155,6 +5241,21 @@ esac
19423 fi
19424 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19425 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19426+
19427+file_magic_glob=
19428+want_nocaseglob=no
19429+if test "$build" = "$host"; then
19430+ case $host_os in
19431+ mingw* | pw32*)
19432+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19433+ want_nocaseglob=yes
19434+ else
19435+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19436+ fi
19437+ ;;
19438+ esac
19439+fi
19440+
19441 file_magic_cmd=$lt_cv_file_magic_cmd
19442 deplibs_check_method=$lt_cv_deplibs_check_method
19443 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19444@@ -5168,11 +5269,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19445
19446
19447
19448+
19449+
19450+
19451+
19452+
19453+
19454+
19455+
19456+
19457+
19458
19459
19460 if test -n "$ac_tool_prefix"; then
19461- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19462-set dummy ${ac_tool_prefix}ar; ac_word=$2
19463+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19464+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19465+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19466+$as_echo_n "checking for $ac_word... " >&6; }
19467+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
19468+ $as_echo_n "(cached) " >&6
19469+else
19470+ if test -n "$DLLTOOL"; then
19471+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19472+else
19473+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19474+for as_dir in $PATH
19475+do
19476+ IFS=$as_save_IFS
19477+ test -z "$as_dir" && as_dir=.
19478+ for ac_exec_ext in '' $ac_executable_extensions; do
19479+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19480+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19481+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19482+ break 2
19483+ fi
19484+done
19485+ done
19486+IFS=$as_save_IFS
19487+
19488+fi
19489+fi
19490+DLLTOOL=$ac_cv_prog_DLLTOOL
19491+if test -n "$DLLTOOL"; then
19492+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19493+$as_echo "$DLLTOOL" >&6; }
19494+else
19495+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19496+$as_echo "no" >&6; }
19497+fi
19498+
19499+
19500+fi
19501+if test -z "$ac_cv_prog_DLLTOOL"; then
19502+ ac_ct_DLLTOOL=$DLLTOOL
19503+ # Extract the first word of "dlltool", so it can be a program name with args.
19504+set dummy dlltool; ac_word=$2
19505+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19506+$as_echo_n "checking for $ac_word... " >&6; }
19507+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
19508+ $as_echo_n "(cached) " >&6
19509+else
19510+ if test -n "$ac_ct_DLLTOOL"; then
19511+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19512+else
19513+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19514+for as_dir in $PATH
19515+do
19516+ IFS=$as_save_IFS
19517+ test -z "$as_dir" && as_dir=.
19518+ for ac_exec_ext in '' $ac_executable_extensions; do
19519+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19520+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19521+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19522+ break 2
19523+ fi
19524+done
19525+ done
19526+IFS=$as_save_IFS
19527+
19528+fi
19529+fi
19530+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19531+if test -n "$ac_ct_DLLTOOL"; then
19532+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19533+$as_echo "$ac_ct_DLLTOOL" >&6; }
19534+else
19535+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19536+$as_echo "no" >&6; }
19537+fi
19538+
19539+ if test "x$ac_ct_DLLTOOL" = x; then
19540+ DLLTOOL="false"
19541+ else
19542+ case $cross_compiling:$ac_tool_warned in
19543+yes:)
19544+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19545+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19546+ac_tool_warned=yes ;;
19547+esac
19548+ DLLTOOL=$ac_ct_DLLTOOL
19549+ fi
19550+else
19551+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19552+fi
19553+
19554+test -z "$DLLTOOL" && DLLTOOL=dlltool
19555+
19556+
19557+
19558+
19559+
19560+
19561+
19562+
19563+
19564+
19565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19566+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19567+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
19568+ $as_echo_n "(cached) " >&6
19569+else
19570+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19571+
19572+case $host_os in
19573+cygwin* | mingw* | pw32* | cegcc*)
19574+ # two different shell functions defined in ltmain.sh
19575+ # decide which to use based on capabilities of $DLLTOOL
19576+ case `$DLLTOOL --help 2>&1` in
19577+ *--identify-strict*)
19578+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19579+ ;;
19580+ *)
19581+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19582+ ;;
19583+ esac
19584+ ;;
19585+*)
19586+ # fallback: assume linklib IS sharedlib
19587+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19588+ ;;
19589+esac
19590+
19591+fi
19592+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19593+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19594+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19595+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19596+
19597+
19598+
19599+
19600+
19601+
19602+
19603+
19604+if test -n "$ac_tool_prefix"; then
19605+ for ac_prog in ar
19606+ do
19607+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19608+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19609 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19610 $as_echo_n "checking for $ac_word... " >&6; }
19611 if test "${ac_cv_prog_AR+set}" = set; then :
19612@@ -5188,7 +5443,7 @@ do
19613 test -z "$as_dir" && as_dir=.
19614 for ac_exec_ext in '' $ac_executable_extensions; do
19615 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19616- ac_cv_prog_AR="${ac_tool_prefix}ar"
19617+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19618 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19619 break 2
19620 fi
19621@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }
19622 fi
19623
19624
19625+ test -n "$AR" && break
19626+ done
19627 fi
19628-if test -z "$ac_cv_prog_AR"; then
19629+if test -z "$AR"; then
19630 ac_ct_AR=$AR
19631- # Extract the first word of "ar", so it can be a program name with args.
19632-set dummy ar; ac_word=$2
19633+ for ac_prog in ar
19634+do
19635+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19636+set dummy $ac_prog; ac_word=$2
19637 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19638 $as_echo_n "checking for $ac_word... " >&6; }
19639 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19640@@ -5228,7 +5487,7 @@ do
19641 test -z "$as_dir" && as_dir=.
19642 for ac_exec_ext in '' $ac_executable_extensions; do
19643 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19644- ac_cv_prog_ac_ct_AR="ar"
19645+ ac_cv_prog_ac_ct_AR="$ac_prog"
19646 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19647 break 2
19648 fi
19649@@ -5247,6 +5506,10 @@ else
19650 $as_echo "no" >&6; }
19651 fi
19652
19653+
19654+ test -n "$ac_ct_AR" && break
19655+done
19656+
19657 if test "x$ac_ct_AR" = x; then
19658 AR="false"
19659 else
19660@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;
19661 esac
19662 AR=$ac_ct_AR
19663 fi
19664-else
19665- AR="$ac_cv_prog_AR"
19666 fi
19667
19668-test -z "$AR" && AR=ar
19669-test -z "$AR_FLAGS" && AR_FLAGS=cru
19670+: ${AR=ar}
19671+: ${AR_FLAGS=cru}
19672+
19673+
19674+
19675+
19676+
19677+
19678+
19679+
19680+
19681+
19682+
19683+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19684+$as_echo_n "checking for archiver @FILE support... " >&6; }
19685+if test "${lt_cv_ar_at_file+set}" = set; then :
19686+ $as_echo_n "(cached) " >&6
19687+else
19688+ lt_cv_ar_at_file=no
19689+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19690+/* end confdefs.h. */
19691+
19692+int
19693+main ()
19694+{
19695
19696+ ;
19697+ return 0;
19698+}
19699+_ACEOF
19700+if ac_fn_c_try_compile "$LINENO"; then :
19701+ echo conftest.$ac_objext > conftest.lst
19702+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19703+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19704+ (eval $lt_ar_try) 2>&5
19705+ ac_status=$?
19706+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19707+ test $ac_status = 0; }
19708+ if test "$ac_status" -eq 0; then
19709+ # Ensure the archiver fails upon bogus file names.
19710+ rm -f conftest.$ac_objext libconftest.a
19711+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19712+ (eval $lt_ar_try) 2>&5
19713+ ac_status=$?
19714+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19715+ test $ac_status = 0; }
19716+ if test "$ac_status" -ne 0; then
19717+ lt_cv_ar_at_file=@
19718+ fi
19719+ fi
19720+ rm -f conftest.* libconftest.a
19721
19722+fi
19723+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19724
19725+fi
19726+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19727+$as_echo "$lt_cv_ar_at_file" >&6; }
19728
19729+if test "x$lt_cv_ar_at_file" = xno; then
19730+ archiver_list_spec=
19731+else
19732+ archiver_list_spec=$lt_cv_ar_at_file
19733+fi
19734
19735
19736
19737@@ -5609,8 +5928,8 @@ esac
19738 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19739
19740 # Transform an extracted symbol line into symbol name and symbol address
19741-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19742-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'"
19743+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19744+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'"
19745
19746 # Handle CRLF in mingw tool chain
19747 opt_cr=
19748@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do
19749 else
19750 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19751 fi
19752+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19753
19754 # Check to see that the pipe works correctly.
19755 pipe_works=no
19756@@ -5687,6 +6007,18 @@ _LT_EOF
19757 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19758 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19759 cat <<_LT_EOF > conftest.$ac_ext
19760+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19761+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19762+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19763+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19764+# define LT_DLSYM_CONST
19765+#elif defined(__osf__)
19766+/* This system does not cope well with relocations in const data. */
19767+# define LT_DLSYM_CONST
19768+#else
19769+# define LT_DLSYM_CONST const
19770+#endif
19771+
19772 #ifdef __cplusplus
19773 extern "C" {
19774 #endif
19775@@ -5698,7 +6030,7 @@ _LT_EOF
19776 cat <<_LT_EOF >> conftest.$ac_ext
19777
19778 /* The mapping between symbol names and symbols. */
19779-const struct {
19780+LT_DLSYM_CONST struct {
19781 const char *name;
19782 void *address;
19783 }
19784@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {
19785 _LT_EOF
19786 # Now try linking the two files.
19787 mv conftest.$ac_objext conftstm.$ac_objext
19788- lt_save_LIBS="$LIBS"
19789- lt_save_CFLAGS="$CFLAGS"
19790+ lt_globsym_save_LIBS=$LIBS
19791+ lt_globsym_save_CFLAGS=$CFLAGS
19792 LIBS="conftstm.$ac_objext"
19793 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19794 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19795@@ -5735,8 +6067,8 @@ _LT_EOF
19796 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19797 pipe_works=yes
19798 fi
19799- LIBS="$lt_save_LIBS"
19800- CFLAGS="$lt_save_CFLAGS"
19801+ LIBS=$lt_globsym_save_LIBS
19802+ CFLAGS=$lt_globsym_save_CFLAGS
19803 else
19804 echo "cannot find nm_test_func in $nlist" >&5
19805 fi
19806@@ -5773,6 +6105,19 @@ else
19807 $as_echo "ok" >&6; }
19808 fi
19809
19810+# Response file support.
19811+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19812+ nm_file_list_spec='@'
19813+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19814+ nm_file_list_spec='@'
19815+fi
19816+
19817+
19818+
19819+
19820+
19821+
19822+
19823
19824
19825
19826@@ -5790,6 +6135,41 @@ fi
19827
19828
19829
19830+
19831+
19832+
19833+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19834+$as_echo_n "checking for sysroot... " >&6; }
19835+
19836+# Check whether --with-libtool-sysroot was given.
19837+if test "${with_libtool_sysroot+set}" = set; then :
19838+ withval=$with_libtool_sysroot;
19839+else
19840+ with_libtool_sysroot=no
19841+fi
19842+
19843+
19844+lt_sysroot=
19845+case ${with_libtool_sysroot} in #(
19846+ yes)
19847+ if test "$GCC" = yes; then
19848+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19849+ fi
19850+ ;; #(
19851+ /*)
19852+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19853+ ;; #(
19854+ no|'')
19855+ ;; #(
19856+ *)
19857+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19858+$as_echo "${with_libtool_sysroot}" >&6; }
19859+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
19860+ ;;
19861+esac
19862+
19863+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19864+$as_echo "${lt_sysroot:-no}" >&6; }
19865
19866
19867
19868@@ -6004,6 +6384,123 @@ esac
19869
19870 need_locks="$enable_libtool_lock"
19871
19872+if test -n "$ac_tool_prefix"; then
19873+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19874+set dummy ${ac_tool_prefix}mt; ac_word=$2
19875+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19876+$as_echo_n "checking for $ac_word... " >&6; }
19877+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
19878+ $as_echo_n "(cached) " >&6
19879+else
19880+ if test -n "$MANIFEST_TOOL"; then
19881+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19882+else
19883+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19884+for as_dir in $PATH
19885+do
19886+ IFS=$as_save_IFS
19887+ test -z "$as_dir" && as_dir=.
19888+ for ac_exec_ext in '' $ac_executable_extensions; do
19889+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19890+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19891+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19892+ break 2
19893+ fi
19894+done
19895+ done
19896+IFS=$as_save_IFS
19897+
19898+fi
19899+fi
19900+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19901+if test -n "$MANIFEST_TOOL"; then
19902+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19903+$as_echo "$MANIFEST_TOOL" >&6; }
19904+else
19905+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19906+$as_echo "no" >&6; }
19907+fi
19908+
19909+
19910+fi
19911+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19912+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19913+ # Extract the first word of "mt", so it can be a program name with args.
19914+set dummy mt; ac_word=$2
19915+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19916+$as_echo_n "checking for $ac_word... " >&6; }
19917+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
19918+ $as_echo_n "(cached) " >&6
19919+else
19920+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19921+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19922+else
19923+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19924+for as_dir in $PATH
19925+do
19926+ IFS=$as_save_IFS
19927+ test -z "$as_dir" && as_dir=.
19928+ for ac_exec_ext in '' $ac_executable_extensions; do
19929+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19930+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19931+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19932+ break 2
19933+ fi
19934+done
19935+ done
19936+IFS=$as_save_IFS
19937+
19938+fi
19939+fi
19940+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
19941+if test -n "$ac_ct_MANIFEST_TOOL"; then
19942+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
19943+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
19944+else
19945+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19946+$as_echo "no" >&6; }
19947+fi
19948+
19949+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
19950+ MANIFEST_TOOL=":"
19951+ else
19952+ case $cross_compiling:$ac_tool_warned in
19953+yes:)
19954+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19955+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19956+ac_tool_warned=yes ;;
19957+esac
19958+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
19959+ fi
19960+else
19961+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
19962+fi
19963+
19964+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19965+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19966+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19967+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
19968+ $as_echo_n "(cached) " >&6
19969+else
19970+ lt_cv_path_mainfest_tool=no
19971+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
19972+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
19973+ cat conftest.err >&5
19974+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
19975+ lt_cv_path_mainfest_tool=yes
19976+ fi
19977+ rm -f conftest*
19978+fi
19979+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
19980+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
19981+if test "x$lt_cv_path_mainfest_tool" != xyes; then
19982+ MANIFEST_TOOL=:
19983+fi
19984+
19985+
19986+
19987+
19988+
19989
19990 case $host_os in
19991 rhapsody* | darwin*)
19992@@ -6570,6 +7067,8 @@ _LT_EOF
19993 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19994 echo "$AR cru libconftest.a conftest.o" >&5
19995 $AR cru libconftest.a conftest.o 2>&5
19996+ echo "$RANLIB libconftest.a" >&5
19997+ $RANLIB libconftest.a 2>&5
19998 cat > conftest.c << _LT_EOF
19999 int main() { return 0;}
20000 _LT_EOF
20001@@ -7033,7 +7532,8 @@ fi
20002 LIBTOOL_DEPS="$ltmain"
20003
20004 # Always use our own libtool.
20005-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
20006+LIBTOOL='$(SHELL) $(top_builddir)'
20007+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
20008
20009
20010
20011@@ -7122,7 +7622,7 @@ aix3*)
20012 esac
20013
20014 # Global variables:
20015-ofile=libtool
20016+ofile=${host_alias}-libtool
20017 can_build_shared=yes
20018
20019 # All known linkers require a `.a' archive for static linking (except MSVC,
20020@@ -7420,8 +7920,6 @@ fi
20021 lt_prog_compiler_pic=
20022 lt_prog_compiler_static=
20023
20024-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20025-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20026
20027 if test "$GCC" = yes; then
20028 lt_prog_compiler_wl='-Wl,'
20029@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20030 lt_prog_compiler_pic='--shared'
20031 lt_prog_compiler_static='--static'
20032 ;;
20033+ nagfor*)
20034+ # NAG Fortran compiler
20035+ lt_prog_compiler_wl='-Wl,-Wl,,'
20036+ lt_prog_compiler_pic='-PIC'
20037+ lt_prog_compiler_static='-Bstatic'
20038+ ;;
20039 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20040 # Portland Group compilers (*not* the Pentium gcc compiler,
20041 # which looks to be a dead project)
20042@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20043 lt_prog_compiler_pic='-KPIC'
20044 lt_prog_compiler_static='-Bstatic'
20045 case $cc_basename in
20046- f77* | f90* | f95*)
20047+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20048 lt_prog_compiler_wl='-Qoption ld ';;
20049 *)
20050 lt_prog_compiler_wl='-Wl,';;
20051@@ -7706,13 +8210,17 @@ case $host_os in
20052 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20053 ;;
20054 esac
20055-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20056-$as_echo "$lt_prog_compiler_pic" >&6; }
20057-
20058-
20059-
20060-
20061
20062+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20063+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20064+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
20065+ $as_echo_n "(cached) " >&6
20066+else
20067+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20068+fi
20069+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20070+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20071+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20072
20073 #
20074 # Check to make sure the PIC flag actually works.
20075@@ -7773,6 +8281,11 @@ fi
20076
20077
20078
20079+
20080+
20081+
20082+
20083+
20084 #
20085 # Check to make sure the static flag actually works.
20086 #
20087@@ -8123,7 +8636,8 @@ _LT_EOF
20088 allow_undefined_flag=unsupported
20089 always_export_symbols=no
20090 enable_shared_with_static_runtimes=yes
20091- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20092+ 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'
20093+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20094
20095 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20096 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20097@@ -8222,12 +8736,12 @@ _LT_EOF
20098 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20099 hardcode_libdir_flag_spec=
20100 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20101- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20102+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20103 if test "x$supports_anon_versioning" = xyes; then
20104 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20105 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20106 echo "local: *; };" >> $output_objdir/$libname.ver~
20107- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20108+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20109 fi
20110 ;;
20111 esac
20112@@ -8241,8 +8755,8 @@ _LT_EOF
20113 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20114 wlarc=
20115 else
20116- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20117- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20118+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20119+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20120 fi
20121 ;;
20122
20123@@ -8260,8 +8774,8 @@ _LT_EOF
20124
20125 _LT_EOF
20126 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20127- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20128- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20129+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20130+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20131 else
20132 ld_shlibs=no
20133 fi
20134@@ -8307,8 +8821,8 @@ _LT_EOF
20135
20136 *)
20137 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20138- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20139- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20140+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20141+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20142 else
20143 ld_shlibs=no
20144 fi
20145@@ -8438,7 +8952,13 @@ _LT_EOF
20146 allow_undefined_flag='-berok'
20147 # Determine the default libpath from the value encoded in an
20148 # empty executable.
20149- if test x$gcc_no_link = xyes; then
20150+ if test "${lt_cv_aix_libpath+set}" = set; then
20151+ aix_libpath=$lt_cv_aix_libpath
20152+else
20153+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20154+ $as_echo_n "(cached) " >&6
20155+else
20156+ if test x$gcc_no_link = xyes; then
20157 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20158 fi
20159 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20160@@ -8454,22 +8974,29 @@ main ()
20161 _ACEOF
20162 if ac_fn_c_try_link "$LINENO"; then :
20163
20164-lt_aix_libpath_sed='
20165- /Import File Strings/,/^$/ {
20166- /^0/ {
20167- s/^0 *\(.*\)$/\1/
20168- p
20169- }
20170- }'
20171-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20172-# Check for a 64-bit object if we didn't find anything.
20173-if test -z "$aix_libpath"; then
20174- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20175-fi
20176+ lt_aix_libpath_sed='
20177+ /Import File Strings/,/^$/ {
20178+ /^0/ {
20179+ s/^0 *\([^ ]*\) *$/\1/
20180+ p
20181+ }
20182+ }'
20183+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20184+ # Check for a 64-bit object if we didn't find anything.
20185+ if test -z "$lt_cv_aix_libpath_"; then
20186+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20187+ fi
20188 fi
20189 rm -f core conftest.err conftest.$ac_objext \
20190 conftest$ac_exeext conftest.$ac_ext
20191-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20192+ if test -z "$lt_cv_aix_libpath_"; then
20193+ lt_cv_aix_libpath_="/usr/lib:/lib"
20194+ fi
20195+
20196+fi
20197+
20198+ aix_libpath=$lt_cv_aix_libpath_
20199+fi
20200
20201 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20202 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"
20203@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20204 else
20205 # Determine the default libpath from the value encoded in an
20206 # empty executable.
20207- if test x$gcc_no_link = xyes; then
20208+ if test "${lt_cv_aix_libpath+set}" = set; then
20209+ aix_libpath=$lt_cv_aix_libpath
20210+else
20211+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20212+ $as_echo_n "(cached) " >&6
20213+else
20214+ if test x$gcc_no_link = xyes; then
20215 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20216 fi
20217 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20218@@ -8497,22 +9030,29 @@ main ()
20219 _ACEOF
20220 if ac_fn_c_try_link "$LINENO"; then :
20221
20222-lt_aix_libpath_sed='
20223- /Import File Strings/,/^$/ {
20224- /^0/ {
20225- s/^0 *\(.*\)$/\1/
20226- p
20227- }
20228- }'
20229-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20230-# Check for a 64-bit object if we didn't find anything.
20231-if test -z "$aix_libpath"; then
20232- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20233-fi
20234+ lt_aix_libpath_sed='
20235+ /Import File Strings/,/^$/ {
20236+ /^0/ {
20237+ s/^0 *\([^ ]*\) *$/\1/
20238+ p
20239+ }
20240+ }'
20241+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20242+ # Check for a 64-bit object if we didn't find anything.
20243+ if test -z "$lt_cv_aix_libpath_"; then
20244+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20245+ fi
20246 fi
20247 rm -f core conftest.err conftest.$ac_objext \
20248 conftest$ac_exeext conftest.$ac_ext
20249-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20250+ if test -z "$lt_cv_aix_libpath_"; then
20251+ lt_cv_aix_libpath_="/usr/lib:/lib"
20252+ fi
20253+
20254+fi
20255+
20256+ aix_libpath=$lt_cv_aix_libpath_
20257+fi
20258
20259 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20260 # Warning - without using the other run time loading flags,
20261@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20262 # Microsoft Visual C++.
20263 # hardcode_libdir_flag_spec is actually meaningless, as there is
20264 # no search path for DLLs.
20265- hardcode_libdir_flag_spec=' '
20266- allow_undefined_flag=unsupported
20267- # Tell ltmain to make .lib files, not .a files.
20268- libext=lib
20269- # Tell ltmain to make .dll files, not .so files.
20270- shrext_cmds=".dll"
20271- # FIXME: Setting linknames here is a bad hack.
20272- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20273- # The linker will automatically build a .lib file if we build a DLL.
20274- old_archive_from_new_cmds='true'
20275- # FIXME: Should let the user specify the lib program.
20276- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20277- fix_srcfile_path='`cygpath -w "$srcfile"`'
20278- enable_shared_with_static_runtimes=yes
20279+ case $cc_basename in
20280+ cl*)
20281+ # Native MSVC
20282+ hardcode_libdir_flag_spec=' '
20283+ allow_undefined_flag=unsupported
20284+ always_export_symbols=yes
20285+ file_list_spec='@'
20286+ # Tell ltmain to make .lib files, not .a files.
20287+ libext=lib
20288+ # Tell ltmain to make .dll files, not .so files.
20289+ shrext_cmds=".dll"
20290+ # FIXME: Setting linknames here is a bad hack.
20291+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20292+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20293+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20294+ else
20295+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20296+ fi~
20297+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20298+ linknames='
20299+ # The linker will not automatically build a static lib if we build a DLL.
20300+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20301+ enable_shared_with_static_runtimes=yes
20302+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20303+ # Don't use ranlib
20304+ old_postinstall_cmds='chmod 644 $oldlib'
20305+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20306+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20307+ case $lt_outputfile in
20308+ *.exe|*.EXE) ;;
20309+ *)
20310+ lt_outputfile="$lt_outputfile.exe"
20311+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20312+ ;;
20313+ esac~
20314+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20315+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20316+ $RM "$lt_outputfile.manifest";
20317+ fi'
20318+ ;;
20319+ *)
20320+ # Assume MSVC wrapper
20321+ hardcode_libdir_flag_spec=' '
20322+ allow_undefined_flag=unsupported
20323+ # Tell ltmain to make .lib files, not .a files.
20324+ libext=lib
20325+ # Tell ltmain to make .dll files, not .so files.
20326+ shrext_cmds=".dll"
20327+ # FIXME: Setting linknames here is a bad hack.
20328+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20329+ # The linker will automatically build a .lib file if we build a DLL.
20330+ old_archive_from_new_cmds='true'
20331+ # FIXME: Should let the user specify the lib program.
20332+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20333+ enable_shared_with_static_runtimes=yes
20334+ ;;
20335+ esac
20336 ;;
20337
20338 darwin* | rhapsody*)
20339@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20340
20341 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20342 freebsd* | dragonfly*)
20343- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20344+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20345 hardcode_libdir_flag_spec='-R$libdir'
20346 hardcode_direct=yes
20347 hardcode_shlibpath_var=no
20348@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20349
20350 hpux9*)
20351 if test "$GCC" = yes; then
20352- 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'
20353+ 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'
20354 else
20355 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'
20356 fi
20357@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20358
20359 hpux10*)
20360 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20361- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20362+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20363 else
20364 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20365 fi
20366@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20367 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20368 ;;
20369 ia64*)
20370- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20371+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20372 ;;
20373 *)
20374- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20375+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20376 ;;
20377 esac
20378 else
20379@@ -8761,26 +9344,39 @@ fi
20380
20381 irix5* | irix6* | nonstopux*)
20382 if test "$GCC" = yes; then
20383- 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'
20384+ 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'
20385 # Try to use the -exported_symbol ld option, if it does not
20386 # work, assume that -exports_file does not work either and
20387 # implicitly export all symbols.
20388- save_LDFLAGS="$LDFLAGS"
20389- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20390- if test x$gcc_no_link = xyes; then
20391+ # This should be the same for all languages, so no per-tag cache variable.
20392+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20393+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20394+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
20395+ $as_echo_n "(cached) " >&6
20396+else
20397+ save_LDFLAGS="$LDFLAGS"
20398+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20399+ if test x$gcc_no_link = xyes; then
20400 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20401 fi
20402 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20403 /* end confdefs.h. */
20404-int foo(void) {}
20405+int foo (void) { return 0; }
20406 _ACEOF
20407 if ac_fn_c_try_link "$LINENO"; then :
20408- 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'
20409-
20410+ lt_cv_irix_exported_symbol=yes
20411+else
20412+ lt_cv_irix_exported_symbol=no
20413 fi
20414 rm -f core conftest.err conftest.$ac_objext \
20415 conftest$ac_exeext conftest.$ac_ext
20416- LDFLAGS="$save_LDFLAGS"
20417+ LDFLAGS="$save_LDFLAGS"
20418+fi
20419+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20420+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20421+ if test "$lt_cv_irix_exported_symbol" = yes; then
20422+ 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'
20423+ fi
20424 else
20425 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'
20426 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'
20427@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \
20428 osf4* | osf5*) # as osf3* with the addition of -msym flag
20429 if test "$GCC" = yes; then
20430 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20431- 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'
20432+ 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'
20433 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20434 else
20435 allow_undefined_flag=' -expect_unresolved \*'
20436@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \
20437 no_undefined_flag=' -z defs'
20438 if test "$GCC" = yes; then
20439 wlarc='${wl}'
20440- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20441+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20442 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20443- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20444+ $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'
20445 else
20446 case `$CC -V 2>&1` in
20447 *"Compilers 5.0"*)
20448@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20449 need_version=no
20450 need_lib_prefix=no
20451
20452- case $GCC,$host_os in
20453- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20454+ case $GCC,$cc_basename in
20455+ yes,*)
20456+ # gcc
20457 library_names_spec='$libname.dll.a'
20458 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20459 postinstall_cmds='base_file=`basename \${file}`~
20460@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20461 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20462 ;;
20463 esac
20464+ dynamic_linker='Win32 ld.exe'
20465+ ;;
20466+
20467+ *,cl*)
20468+ # Native MSVC
20469+ libname_spec='$name'
20470+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20471+ library_names_spec='${libname}.dll.lib'
20472+
20473+ case $build_os in
20474+ mingw*)
20475+ sys_lib_search_path_spec=
20476+ lt_save_ifs=$IFS
20477+ IFS=';'
20478+ for lt_path in $LIB
20479+ do
20480+ IFS=$lt_save_ifs
20481+ # Let DOS variable expansion print the short 8.3 style file name.
20482+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20483+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20484+ done
20485+ IFS=$lt_save_ifs
20486+ # Convert to MSYS style.
20487+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20488+ ;;
20489+ cygwin*)
20490+ # Convert to unix form, then to dos form, then back to unix form
20491+ # but this time dos style (no spaces!) so that the unix form looks
20492+ # like /cygdrive/c/PROGRA~1:/cygdr...
20493+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20494+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20495+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20496+ ;;
20497+ *)
20498+ sys_lib_search_path_spec="$LIB"
20499+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20500+ # It is most probably a Windows format PATH.
20501+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20502+ else
20503+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20504+ fi
20505+ # FIXME: find the short name or the path components, as spaces are
20506+ # common. (e.g. "Program Files" -> "PROGRA~1")
20507+ ;;
20508+ esac
20509+
20510+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20511+ postinstall_cmds='base_file=`basename \${file}`~
20512+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20513+ dldir=$destdir/`dirname \$dlpath`~
20514+ test -d \$dldir || mkdir -p \$dldir~
20515+ $install_prog $dir/$dlname \$dldir/$dlname'
20516+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20517+ dlpath=$dir/\$dldll~
20518+ $RM \$dlpath'
20519+ shlibpath_overrides_runpath=yes
20520+ dynamic_linker='Win32 link.exe'
20521 ;;
20522
20523 *)
20524+ # Assume MSVC wrapper
20525 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20526+ dynamic_linker='Win32 ld.exe'
20527 ;;
20528 esac
20529- dynamic_linker='Win32 ld.exe'
20530 # FIXME: first we should search . and the directory the executable is in
20531 shlibpath_var=PATH
20532 ;;
20533@@ -9594,7 +10249,7 @@ haiku*)
20534 soname_spec='${libname}${release}${shared_ext}$major'
20535 shlibpath_var=LIBRARY_PATH
20536 shlibpath_overrides_runpath=yes
20537- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20538+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20539 hardcode_into_libs=yes
20540 ;;
20541
20542@@ -10452,10 +11107,10 @@ else
20543 /* When -fvisbility=hidden is used, assume the code has been annotated
20544 correspondingly for the symbols needed. */
20545 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20546-void fnord () __attribute__((visibility("default")));
20547+int fnord () __attribute__((visibility("default")));
20548 #endif
20549
20550-void fnord () { int i=42; }
20551+int fnord () { return 42; }
20552 int main ()
20553 {
20554 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20555@@ -10558,10 +11213,10 @@ else
20556 /* When -fvisbility=hidden is used, assume the code has been annotated
20557 correspondingly for the symbols needed. */
20558 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20559-void fnord () __attribute__((visibility("default")));
20560+int fnord () __attribute__((visibility("default")));
20561 #endif
20562
20563-void fnord () { int i=42; }
20564+int fnord () { return 42; }
20565 int main ()
20566 {
20567 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20568@@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20569 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20570 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20571 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20572+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20573+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20574 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20575 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20576 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20577 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20578 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20579+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20580+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20581+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20582+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20583 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20584 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20585+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20586 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20587 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20588 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20589@@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20590 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20591 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20592 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"`'
20593+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20594+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20595 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20596 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20597 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20598-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20599 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20600+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20601 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20602 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20603 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20604+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20605 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20606 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20607 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20608@@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20609 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20610 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20611 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20612-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20613 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20614 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20615 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20616 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20617 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20618+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20619 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20620 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20621 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20622@@ -12113,8 +12778,13 @@ reload_flag \
20623 OBJDUMP \
20624 deplibs_check_method \
20625 file_magic_cmd \
20626+file_magic_glob \
20627+want_nocaseglob \
20628+DLLTOOL \
20629+sharedlib_from_linklib_cmd \
20630 AR \
20631 AR_FLAGS \
20632+archiver_list_spec \
20633 STRIP \
20634 RANLIB \
20635 CC \
20636@@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \
20637 lt_cv_sys_global_symbol_to_cdecl \
20638 lt_cv_sys_global_symbol_to_c_name_address \
20639 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20640+nm_file_list_spec \
20641 lt_prog_compiler_no_builtin_flag \
20642-lt_prog_compiler_wl \
20643 lt_prog_compiler_pic \
20644+lt_prog_compiler_wl \
20645 lt_prog_compiler_static \
20646 lt_cv_prog_compiler_c_o \
20647 need_locks \
20648+MANIFEST_TOOL \
20649 DSYMUTIL \
20650 NMEDIT \
20651 LIPO \
20652@@ -12145,7 +12817,6 @@ no_undefined_flag \
20653 hardcode_libdir_flag_spec \
20654 hardcode_libdir_flag_spec_ld \
20655 hardcode_libdir_separator \
20656-fix_srcfile_path \
20657 exclude_expsyms \
20658 include_expsyms \
20659 file_list_spec \
20660@@ -12181,6 +12852,7 @@ module_cmds \
20661 module_expsym_cmds \
20662 export_symbols_cmds \
20663 prelink_cmds \
20664+postlink_cmds \
20665 postinstall_cmds \
20666 postuninstall_cmds \
20667 finish_cmds \
20668@@ -12770,7 +13442,8 @@ $as_echo X"$file" |
20669 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20670 #
20671 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20672-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20673+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20674+# Inc.
20675 # Written by Gordon Matzigkeit, 1996
20676 #
20677 # This file is part of GNU Libtool.
20678@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL
20679 # turn newlines into spaces.
20680 NL2SP=$lt_lt_NL2SP
20681
20682+# convert \$build file names to \$host format.
20683+to_host_file_cmd=$lt_cv_to_host_file_cmd
20684+
20685+# convert \$build files to toolchain format.
20686+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20687+
20688 # An object symbol dumper.
20689 OBJDUMP=$lt_OBJDUMP
20690
20691 # Method to check whether dependent libraries are shared objects.
20692 deplibs_check_method=$lt_deplibs_check_method
20693
20694-# Command to use when deplibs_check_method == "file_magic".
20695+# Command to use when deplibs_check_method = "file_magic".
20696 file_magic_cmd=$lt_file_magic_cmd
20697
20698+# How to find potential files when deplibs_check_method = "file_magic".
20699+file_magic_glob=$lt_file_magic_glob
20700+
20701+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20702+want_nocaseglob=$lt_want_nocaseglob
20703+
20704+# DLL creation program.
20705+DLLTOOL=$lt_DLLTOOL
20706+
20707+# Command to associate shared and link libraries.
20708+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20709+
20710 # The archiver.
20711 AR=$lt_AR
20712+
20713+# Flags to create an archive.
20714 AR_FLAGS=$lt_AR_FLAGS
20715
20716+# How to feed a file listing to the archiver.
20717+archiver_list_spec=$lt_archiver_list_spec
20718+
20719 # A symbol stripping program.
20720 STRIP=$lt_STRIP
20721
20722@@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20723 # Transform the output of nm in a C name address pair when lib prefix is needed.
20724 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20725
20726+# Specify filename containing input files for \$NM.
20727+nm_file_list_spec=$lt_nm_file_list_spec
20728+
20729+# The root where to search for dependent libraries,and in which our libraries should be installed.
20730+lt_sysroot=$lt_sysroot
20731+
20732 # The name of the directory that contains temporary libtool files.
20733 objdir=$objdir
20734
20735@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD
20736 # Must we lock files when doing compilation?
20737 need_locks=$lt_need_locks
20738
20739+# Manifest tool.
20740+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20741+
20742 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20743 DSYMUTIL=$lt_DSYMUTIL
20744
20745@@ -13038,12 +13743,12 @@ with_gcc=$GCC
20746 # Compiler flag to turn off builtin functions.
20747 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20748
20749-# How to pass a linker flag through the compiler.
20750-wl=$lt_lt_prog_compiler_wl
20751-
20752 # Additional compiler flags for building library objects.
20753 pic_flag=$lt_lt_prog_compiler_pic
20754
20755+# How to pass a linker flag through the compiler.
20756+wl=$lt_lt_prog_compiler_wl
20757+
20758 # Compiler flag to prevent dynamic linking.
20759 link_static_flag=$lt_lt_prog_compiler_static
20760
20761@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath
20762 # Whether libtool must link a program against all its dependency libraries.
20763 link_all_deplibs=$link_all_deplibs
20764
20765-# Fix the shell variable \$srcfile for the compiler.
20766-fix_srcfile_path=$lt_fix_srcfile_path
20767-
20768 # Set to "yes" if exported symbols are required.
20769 always_export_symbols=$always_export_symbols
20770
20771@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms
20772 # Commands necessary for linking programs (against libraries) with templates.
20773 prelink_cmds=$lt_prelink_cmds
20774
20775+# Commands necessary for finishing linking programs.
20776+postlink_cmds=$lt_postlink_cmds
20777+
20778 # Specify filename containing input files.
20779 file_list_spec=$lt_file_list_spec
20780
20781@@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20782 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20783 # text mode, it properly converts lines to CR/LF. This bash problem
20784 # is reportedly fixed, but why not run on old versions too?
20785- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20786- || (rm -f "$cfgfile"; exit 1)
20787-
20788- case $xsi_shell in
20789- yes)
20790- cat << \_LT_EOF >> "$cfgfile"
20791-
20792-# func_dirname file append nondir_replacement
20793-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20794-# otherwise set result to NONDIR_REPLACEMENT.
20795-func_dirname ()
20796-{
20797- case ${1} in
20798- */*) func_dirname_result="${1%/*}${2}" ;;
20799- * ) func_dirname_result="${3}" ;;
20800- esac
20801-}
20802-
20803-# func_basename file
20804-func_basename ()
20805-{
20806- func_basename_result="${1##*/}"
20807-}
20808-
20809-# func_dirname_and_basename file append nondir_replacement
20810-# perform func_basename and func_dirname in a single function
20811-# call:
20812-# dirname: Compute the dirname of FILE. If nonempty,
20813-# add APPEND to the result, otherwise set result
20814-# to NONDIR_REPLACEMENT.
20815-# value returned in "$func_dirname_result"
20816-# basename: Compute filename of FILE.
20817-# value retuned in "$func_basename_result"
20818-# Implementation must be kept synchronized with func_dirname
20819-# and func_basename. For efficiency, we do not delegate to
20820-# those functions but instead duplicate the functionality here.
20821-func_dirname_and_basename ()
20822-{
20823- case ${1} in
20824- */*) func_dirname_result="${1%/*}${2}" ;;
20825- * ) func_dirname_result="${3}" ;;
20826- esac
20827- func_basename_result="${1##*/}"
20828-}
20829-
20830-# func_stripname prefix suffix name
20831-# strip PREFIX and SUFFIX off of NAME.
20832-# PREFIX and SUFFIX must not contain globbing or regex special
20833-# characters, hashes, percent signs, but SUFFIX may contain a leading
20834-# dot (in which case that matches only a dot).
20835-func_stripname ()
20836-{
20837- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20838- # positional parameters, so assign one to ordinary parameter first.
20839- func_stripname_result=${3}
20840- func_stripname_result=${func_stripname_result#"${1}"}
20841- func_stripname_result=${func_stripname_result%"${2}"}
20842-}
20843-
20844-# func_opt_split
20845-func_opt_split ()
20846-{
20847- func_opt_split_opt=${1%%=*}
20848- func_opt_split_arg=${1#*=}
20849-}
20850-
20851-# func_lo2o object
20852-func_lo2o ()
20853-{
20854- case ${1} in
20855- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20856- *) func_lo2o_result=${1} ;;
20857- esac
20858-}
20859-
20860-# func_xform libobj-or-source
20861-func_xform ()
20862-{
20863- func_xform_result=${1%.*}.lo
20864-}
20865-
20866-# func_arith arithmetic-term...
20867-func_arith ()
20868-{
20869- func_arith_result=$(( $* ))
20870-}
20871-
20872-# func_len string
20873-# STRING may not start with a hyphen.
20874-func_len ()
20875-{
20876- func_len_result=${#1}
20877-}
20878-
20879-_LT_EOF
20880- ;;
20881- *) # Bourne compatible functions.
20882- cat << \_LT_EOF >> "$cfgfile"
20883-
20884-# func_dirname file append nondir_replacement
20885-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20886-# otherwise set result to NONDIR_REPLACEMENT.
20887-func_dirname ()
20888-{
20889- # Extract subdirectory from the argument.
20890- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20891- if test "X$func_dirname_result" = "X${1}"; then
20892- func_dirname_result="${3}"
20893- else
20894- func_dirname_result="$func_dirname_result${2}"
20895- fi
20896-}
20897-
20898-# func_basename file
20899-func_basename ()
20900-{
20901- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20902-}
20903-
20904-
20905-# func_stripname prefix suffix name
20906-# strip PREFIX and SUFFIX off of NAME.
20907-# PREFIX and SUFFIX must not contain globbing or regex special
20908-# characters, hashes, percent signs, but SUFFIX may contain a leading
20909-# dot (in which case that matches only a dot).
20910-# func_strip_suffix prefix name
20911-func_stripname ()
20912-{
20913- case ${2} in
20914- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20915- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20916- esac
20917-}
20918-
20919-# sed scripts:
20920-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20921-my_sed_long_arg='1s/^-[^=]*=//'
20922-
20923-# func_opt_split
20924-func_opt_split ()
20925-{
20926- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
20927- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
20928-}
20929-
20930-# func_lo2o object
20931-func_lo2o ()
20932-{
20933- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
20934-}
20935-
20936-# func_xform libobj-or-source
20937-func_xform ()
20938-{
20939- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
20940-}
20941-
20942-# func_arith arithmetic-term...
20943-func_arith ()
20944-{
20945- func_arith_result=`expr "$@"`
20946-}
20947-
20948-# func_len string
20949-# STRING may not start with a hyphen.
20950-func_len ()
20951-{
20952- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
20953-}
20954-
20955-_LT_EOF
20956-esac
20957-
20958-case $lt_shell_append in
20959- yes)
20960- cat << \_LT_EOF >> "$cfgfile"
20961-
20962-# func_append var value
20963-# Append VALUE to the end of shell variable VAR.
20964-func_append ()
20965-{
20966- eval "$1+=\$2"
20967-}
20968-_LT_EOF
20969- ;;
20970- *)
20971- cat << \_LT_EOF >> "$cfgfile"
20972-
20973-# func_append var value
20974-# Append VALUE to the end of shell variable VAR.
20975-func_append ()
20976-{
20977- eval "$1=\$$1\$2"
20978-}
20979-
20980-_LT_EOF
20981- ;;
20982- esac
20983-
20984-
20985- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
20986- || (rm -f "$cfgfile"; exit 1)
20987-
20988- mv -f "$cfgfile" "$ofile" ||
20989+ sed '$q' "$ltmain" >> "$cfgfile" \
20990+ || (rm -f "$cfgfile"; exit 1)
20991+
20992+ if test x"$xsi_shell" = xyes; then
20993+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
20994+func_dirname ()\
20995+{\
20996+\ case ${1} in\
20997+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20998+\ * ) func_dirname_result="${3}" ;;\
20999+\ esac\
21000+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
21001+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21002+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21003+test 0 -eq $? || _lt_function_replace_fail=:
21004+
21005+
21006+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
21007+func_basename ()\
21008+{\
21009+\ func_basename_result="${1##*/}"\
21010+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
21011+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21012+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21013+test 0 -eq $? || _lt_function_replace_fail=:
21014+
21015+
21016+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
21017+func_dirname_and_basename ()\
21018+{\
21019+\ case ${1} in\
21020+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21021+\ * ) func_dirname_result="${3}" ;;\
21022+\ esac\
21023+\ func_basename_result="${1##*/}"\
21024+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21025+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21026+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21027+test 0 -eq $? || _lt_function_replace_fail=:
21028+
21029+
21030+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21031+func_stripname ()\
21032+{\
21033+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21034+\ # positional parameters, so assign one to ordinary parameter first.\
21035+\ func_stripname_result=${3}\
21036+\ func_stripname_result=${func_stripname_result#"${1}"}\
21037+\ func_stripname_result=${func_stripname_result%"${2}"}\
21038+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21039+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21040+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21041+test 0 -eq $? || _lt_function_replace_fail=:
21042+
21043+
21044+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21045+func_split_long_opt ()\
21046+{\
21047+\ func_split_long_opt_name=${1%%=*}\
21048+\ func_split_long_opt_arg=${1#*=}\
21049+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21050+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21051+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21052+test 0 -eq $? || _lt_function_replace_fail=:
21053+
21054+
21055+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21056+func_split_short_opt ()\
21057+{\
21058+\ func_split_short_opt_arg=${1#??}\
21059+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21060+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21061+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21062+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21063+test 0 -eq $? || _lt_function_replace_fail=:
21064+
21065+
21066+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21067+func_lo2o ()\
21068+{\
21069+\ case ${1} in\
21070+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21071+\ *) func_lo2o_result=${1} ;;\
21072+\ esac\
21073+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
21080+func_xform ()\
21081+{\
21082+ func_xform_result=${1%.*}.lo\
21083+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21084+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21085+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21086+test 0 -eq $? || _lt_function_replace_fail=:
21087+
21088+
21089+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21090+func_arith ()\
21091+{\
21092+ func_arith_result=$(( $* ))\
21093+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21094+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21095+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21096+test 0 -eq $? || _lt_function_replace_fail=:
21097+
21098+
21099+ sed -e '/^func_len ()$/,/^} # func_len /c\
21100+func_len ()\
21101+{\
21102+ func_len_result=${#1}\
21103+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21104+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21105+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21106+test 0 -eq $? || _lt_function_replace_fail=:
21107+
21108+fi
21109+
21110+if test x"$lt_shell_append" = xyes; then
21111+ sed -e '/^func_append ()$/,/^} # func_append /c\
21112+func_append ()\
21113+{\
21114+ eval "${1}+=\\${2}"\
21115+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21116+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21117+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21118+test 0 -eq $? || _lt_function_replace_fail=:
21119+
21120+
21121+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21122+func_append_quoted ()\
21123+{\
21124+\ func_quote_for_eval "${2}"\
21125+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21126+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21127+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21128+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21129+test 0 -eq $? || _lt_function_replace_fail=:
21130+
21131+
21132+ # Save a `func_append' function call where possible by direct use of '+='
21133+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21134+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21135+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21136+ test 0 -eq $? || _lt_function_replace_fail=:
21137+else
21138+ # Save a `func_append' function call even when '+=' is not available
21139+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21140+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21141+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21142+ test 0 -eq $? || _lt_function_replace_fail=:
21143+fi
21144+
21145+if test x"$_lt_function_replace_fail" = x":"; then
21146+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21147+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21148+fi
21149+
21150+
21151+ mv -f "$cfgfile" "$ofile" ||
21152 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21153 chmod +x "$ofile"
21154
21155--
211562.14.0
21157
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-25 01:18:32 +0000