summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-07 00:20:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit4485ea5807dd99b7f140b06b35654a6a70c286e4 (patch)
tree40e240190a18121f3ace7a528e9d836fc3762eb3 /meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
parentee18a2b23391a5308abd9bd817d2e2471ce00270 (diff)
downloadpoky-4485ea5807dd99b7f140b06b35654a6a70c286e4.tar.gz
binutils: Upgrade to 2.28 release
(From OE-Core rev: e9f839d5fe70a222cc7b8942f401ac86a10e6604) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch21177
1 files changed, 0 insertions, 21177 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
deleted file mode 100644
index f0fdf46ae5..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ /dev/null
@@ -1,21177 +0,0 @@
1From 71adcde3648db47f7fa155db12810591ffd3ae34 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/13] Use libtool 2.4
5
6get libtool sysroot support
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 bfd/configure | 1318 +++++++++++++++++------
13 bfd/configure.ac | 2 +-
14 binutils/configure | 1316 +++++++++++++++++------
15 configure | 4 +-
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 | 1320 +++++++++++++++++------
27 15 files changed, 9930 insertions(+), 3697 deletions(-)
28
29diff --git a/bfd/configure b/bfd/configure
30index a437569..575a257 100755
31--- a/bfd/configure
32+++ b/bfd/configure
33@@ -671,6 +671,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@@ -784,6 +787,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@@ -1460,6 +1464,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@@ -5392,8 +5398,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@@ -5433,7 +5439,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@@ -6119,8 +6125,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@@ -6169,6 +6175,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@@ -6185,6 +6265,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@@ -6353,7 +6438,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@@ -6507,6 +6593,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@@ -6522,9 +6623,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
217
218
219
220+
221+
222+
223+
224+
225+
226+
227+
228+
229+
230 if test -n "$ac_tool_prefix"; then
231- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
232-set dummy ${ac_tool_prefix}ar; ac_word=$2
233+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
234+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
236+$as_echo_n "checking for $ac_word... " >&6; }
237+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
238+ $as_echo_n "(cached) " >&6
239+else
240+ if test -n "$DLLTOOL"; then
241+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
242+else
243+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
244+for as_dir in $PATH
245+do
246+ IFS=$as_save_IFS
247+ test -z "$as_dir" && as_dir=.
248+ for ac_exec_ext in '' $ac_executable_extensions; do
249+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
250+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
251+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
252+ break 2
253+ fi
254+done
255+ done
256+IFS=$as_save_IFS
257+
258+fi
259+fi
260+DLLTOOL=$ac_cv_prog_DLLTOOL
261+if test -n "$DLLTOOL"; then
262+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
263+$as_echo "$DLLTOOL" >&6; }
264+else
265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
266+$as_echo "no" >&6; }
267+fi
268+
269+
270+fi
271+if test -z "$ac_cv_prog_DLLTOOL"; then
272+ ac_ct_DLLTOOL=$DLLTOOL
273+ # Extract the first word of "dlltool", so it can be a program name with args.
274+set dummy dlltool; ac_word=$2
275+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
276+$as_echo_n "checking for $ac_word... " >&6; }
277+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
278+ $as_echo_n "(cached) " >&6
279+else
280+ if test -n "$ac_ct_DLLTOOL"; then
281+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
282+else
283+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
284+for as_dir in $PATH
285+do
286+ IFS=$as_save_IFS
287+ test -z "$as_dir" && as_dir=.
288+ for ac_exec_ext in '' $ac_executable_extensions; do
289+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
290+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
291+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
292+ break 2
293+ fi
294+done
295+ done
296+IFS=$as_save_IFS
297+
298+fi
299+fi
300+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
301+if test -n "$ac_ct_DLLTOOL"; then
302+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
303+$as_echo "$ac_ct_DLLTOOL" >&6; }
304+else
305+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
306+$as_echo "no" >&6; }
307+fi
308+
309+ if test "x$ac_ct_DLLTOOL" = x; then
310+ DLLTOOL="false"
311+ else
312+ case $cross_compiling:$ac_tool_warned in
313+yes:)
314+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
315+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
316+ac_tool_warned=yes ;;
317+esac
318+ DLLTOOL=$ac_ct_DLLTOOL
319+ fi
320+else
321+ DLLTOOL="$ac_cv_prog_DLLTOOL"
322+fi
323+
324+test -z "$DLLTOOL" && DLLTOOL=dlltool
325+
326+
327+
328+
329+
330+
331+
332+
333+
334+
335+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
336+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
337+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
338+ $as_echo_n "(cached) " >&6
339+else
340+ lt_cv_sharedlib_from_linklib_cmd='unknown'
341+
342+case $host_os in
343+cygwin* | mingw* | pw32* | cegcc*)
344+ # two different shell functions defined in ltmain.sh
345+ # decide which to use based on capabilities of $DLLTOOL
346+ case `$DLLTOOL --help 2>&1` in
347+ *--identify-strict*)
348+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
349+ ;;
350+ *)
351+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
352+ ;;
353+ esac
354+ ;;
355+*)
356+ # fallback: assume linklib IS sharedlib
357+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
358+ ;;
359+esac
360+
361+fi
362+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
363+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
364+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
365+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
366+
367+
368+
369+
370+
371+
372+
373+if test -n "$ac_tool_prefix"; then
374+ for ac_prog in ar
375+ do
376+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
377+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
379 $as_echo_n "checking for $ac_word... " >&6; }
380 if test "${ac_cv_prog_AR+set}" = set; then :
381@@ -6540,7 +6794,7 @@ do
382 test -z "$as_dir" && as_dir=.
383 for ac_exec_ext in '' $ac_executable_extensions; do
384 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
385- ac_cv_prog_AR="${ac_tool_prefix}ar"
386+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
387 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
388 break 2
389 fi
390@@ -6560,11 +6814,15 @@ $as_echo "no" >&6; }
391 fi
392
393
394+ test -n "$AR" && break
395+ done
396 fi
397-if test -z "$ac_cv_prog_AR"; then
398+if test -z "$AR"; then
399 ac_ct_AR=$AR
400- # Extract the first word of "ar", so it can be a program name with args.
401-set dummy ar; ac_word=$2
402+ for ac_prog in ar
403+do
404+ # Extract the first word of "$ac_prog", so it can be a program name with args.
405+set dummy $ac_prog; ac_word=$2
406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
407 $as_echo_n "checking for $ac_word... " >&6; }
408 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
409@@ -6580,7 +6838,7 @@ do
410 test -z "$as_dir" && as_dir=.
411 for ac_exec_ext in '' $ac_executable_extensions; do
412 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
413- ac_cv_prog_ac_ct_AR="ar"
414+ ac_cv_prog_ac_ct_AR="$ac_prog"
415 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
416 break 2
417 fi
418@@ -6599,6 +6857,10 @@ else
419 $as_echo "no" >&6; }
420 fi
421
422+
423+ test -n "$ac_ct_AR" && break
424+done
425+
426 if test "x$ac_ct_AR" = x; then
427 AR="false"
428 else
429@@ -6610,16 +6872,72 @@ ac_tool_warned=yes ;;
430 esac
431 AR=$ac_ct_AR
432 fi
433-else
434- AR="$ac_cv_prog_AR"
435 fi
436
437-test -z "$AR" && AR=ar
438-test -z "$AR_FLAGS" && AR_FLAGS=cru
439+: ${AR=ar}
440+: ${AR_FLAGS=cru}
441+
442+
443+
444+
445+
446+
447+
448+
449+
450+
451+
452+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
453+$as_echo_n "checking for archiver @FILE support... " >&6; }
454+if test "${lt_cv_ar_at_file+set}" = set; then :
455+ $as_echo_n "(cached) " >&6
456+else
457+ lt_cv_ar_at_file=no
458+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
459+/* end confdefs.h. */
460+
461+int
462+main ()
463+{
464
465+ ;
466+ return 0;
467+}
468+_ACEOF
469+if ac_fn_c_try_compile "$LINENO"; then :
470+ echo conftest.$ac_objext > conftest.lst
471+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
472+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
473+ (eval $lt_ar_try) 2>&5
474+ ac_status=$?
475+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
476+ test $ac_status = 0; }
477+ if test "$ac_status" -eq 0; then
478+ # Ensure the archiver fails upon bogus file names.
479+ rm -f conftest.$ac_objext libconftest.a
480+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
481+ (eval $lt_ar_try) 2>&5
482+ ac_status=$?
483+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
484+ test $ac_status = 0; }
485+ if test "$ac_status" -ne 0; then
486+ lt_cv_ar_at_file=@
487+ fi
488+ fi
489+ rm -f conftest.* libconftest.a
490
491+fi
492+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
493
494+fi
495+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
496+$as_echo "$lt_cv_ar_at_file" >&6; }
497
498+if test "x$lt_cv_ar_at_file" = xno; then
499+ archiver_list_spec=
500+else
501+ archiver_list_spec=$lt_cv_ar_at_file
502+fi
503
504
505
506@@ -6961,8 +7279,8 @@ esac
507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
508
509 # Transform an extracted symbol line into symbol name and symbol address
510-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
511-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'"
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
515 # Handle CRLF in mingw tool chain
516 opt_cr=
517@@ -6998,6 +7316,7 @@ for ac_symprfx in "" "_"; do
518 else
519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
520 fi
521+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
522
523 # Check to see that the pipe works correctly.
524 pipe_works=no
525@@ -7039,6 +7358,18 @@ _LT_EOF
526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
528 cat <<_LT_EOF > conftest.$ac_ext
529+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
530+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
531+/* DATA imports from DLLs on WIN32 con't be const, because runtime
532+ relocations are performed -- see ld's documentation on pseudo-relocs. */
533+# define LT_DLSYM_CONST
534+#elif defined(__osf__)
535+/* This system does not cope well with relocations in const data. */
536+# define LT_DLSYM_CONST
537+#else
538+# define LT_DLSYM_CONST const
539+#endif
540+
541 #ifdef __cplusplus
542 extern "C" {
543 #endif
544@@ -7050,7 +7381,7 @@ _LT_EOF
545 cat <<_LT_EOF >> conftest.$ac_ext
546
547 /* The mapping between symbol names and symbols. */
548-const struct {
549+LT_DLSYM_CONST struct {
550 const char *name;
551 void *address;
552 }
553@@ -7076,8 +7407,8 @@ static const void *lt_preloaded_setup() {
554 _LT_EOF
555 # Now try linking the two files.
556 mv conftest.$ac_objext conftstm.$ac_objext
557- lt_save_LIBS="$LIBS"
558- lt_save_CFLAGS="$CFLAGS"
559+ lt_globsym_save_LIBS=$LIBS
560+ lt_globsym_save_CFLAGS=$CFLAGS
561 LIBS="conftstm.$ac_objext"
562 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
563 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
564@@ -7087,8 +7418,8 @@ _LT_EOF
565 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
566 pipe_works=yes
567 fi
568- LIBS="$lt_save_LIBS"
569- CFLAGS="$lt_save_CFLAGS"
570+ LIBS=$lt_globsym_save_LIBS
571+ CFLAGS=$lt_globsym_save_CFLAGS
572 else
573 echo "cannot find nm_test_func in $nlist" >&5
574 fi
575@@ -7125,6 +7456,16 @@ else
576 $as_echo "ok" >&6; }
577 fi
578
579+# Response file support.
580+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
581+ nm_file_list_spec='@'
582+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
583+ nm_file_list_spec='@'
584+fi
585+
586+
587+
588+
589
590
591
592@@ -7146,6 +7487,45 @@ fi
593
594
595
596+
597+
598+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
599+$as_echo_n "checking for sysroot... " >&6; }
600+
601+# Check whether --with-libtool-sysroot was given.
602+if test "${with_libtool_sysroot+set}" = set; then :
603+ withval=$with_libtool_sysroot;
604+else
605+ with_libtool_sysroot=no
606+fi
607+
608+
609+lt_sysroot=
610+case ${with_libtool_sysroot} in #(
611+ yes)
612+ if test "$GCC" = yes; then
613+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
614+ fi
615+ ;; #(
616+ /*)
617+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
618+ ;; #(
619+ no|'')
620+ ;; #(
621+ *)
622+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
623+$as_echo "${with_libtool_sysroot}" >&6; }
624+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
625+ ;;
626+esac
627+
628+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
629+$as_echo "${lt_sysroot:-no}" >&6; }
630+
631+
632+
633+
634+
635 # Check whether --enable-libtool-lock was given.
636 if test "${enable_libtool_lock+set}" = set; then :
637 enableval=$enable_libtool_lock;
638@@ -7352,6 +7732,123 @@ esac
639
640 need_locks="$enable_libtool_lock"
641
642+if test -n "$ac_tool_prefix"; then
643+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
644+set dummy ${ac_tool_prefix}mt; ac_word=$2
645+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
646+$as_echo_n "checking for $ac_word... " >&6; }
647+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
648+ $as_echo_n "(cached) " >&6
649+else
650+ if test -n "$MANIFEST_TOOL"; then
651+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
652+else
653+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
654+for as_dir in $PATH
655+do
656+ IFS=$as_save_IFS
657+ test -z "$as_dir" && as_dir=.
658+ for ac_exec_ext in '' $ac_executable_extensions; do
659+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
660+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
661+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
662+ break 2
663+ fi
664+done
665+ done
666+IFS=$as_save_IFS
667+
668+fi
669+fi
670+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
671+if test -n "$MANIFEST_TOOL"; then
672+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
673+$as_echo "$MANIFEST_TOOL" >&6; }
674+else
675+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
676+$as_echo "no" >&6; }
677+fi
678+
679+
680+fi
681+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
682+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
683+ # Extract the first word of "mt", so it can be a program name with args.
684+set dummy mt; ac_word=$2
685+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
686+$as_echo_n "checking for $ac_word... " >&6; }
687+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
688+ $as_echo_n "(cached) " >&6
689+else
690+ if test -n "$ac_ct_MANIFEST_TOOL"; then
691+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
692+else
693+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
694+for as_dir in $PATH
695+do
696+ IFS=$as_save_IFS
697+ test -z "$as_dir" && as_dir=.
698+ for ac_exec_ext in '' $ac_executable_extensions; do
699+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
700+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
701+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
702+ break 2
703+ fi
704+done
705+ done
706+IFS=$as_save_IFS
707+
708+fi
709+fi
710+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
711+if test -n "$ac_ct_MANIFEST_TOOL"; then
712+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
713+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
714+else
715+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
716+$as_echo "no" >&6; }
717+fi
718+
719+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
720+ MANIFEST_TOOL=":"
721+ else
722+ case $cross_compiling:$ac_tool_warned in
723+yes:)
724+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
725+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
726+ac_tool_warned=yes ;;
727+esac
728+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
729+ fi
730+else
731+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
732+fi
733+
734+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
735+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
736+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
737+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
738+ $as_echo_n "(cached) " >&6
739+else
740+ lt_cv_path_mainfest_tool=no
741+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
742+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
743+ cat conftest.err >&5
744+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
745+ lt_cv_path_mainfest_tool=yes
746+ fi
747+ rm -f conftest*
748+fi
749+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
750+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
751+if test "x$lt_cv_path_mainfest_tool" != xyes; then
752+ MANIFEST_TOOL=:
753+fi
754+
755+
756+
757+
758+
759
760 case $host_os in
761 rhapsody* | darwin*)
762@@ -7915,6 +8412,8 @@ _LT_EOF
763 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
764 echo "$AR cru libconftest.a conftest.o" >&5
765 $AR cru libconftest.a conftest.o 2>&5
766+ echo "$RANLIB libconftest.a" >&5
767+ $RANLIB libconftest.a 2>&5
768 cat > conftest.c << _LT_EOF
769 int main() { return 0;}
770 _LT_EOF
771@@ -8079,7 +8578,8 @@ fi
772 LIBTOOL_DEPS="$ltmain"
773
774 # Always use our own libtool.
775-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
776+LIBTOOL='$(SHELL) $(top_builddir)'
777+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
778
779
780
781@@ -8168,7 +8668,7 @@ aix3*)
782 esac
783
784 # Global variables:
785-ofile=libtool
786+ofile=${host_alias}-libtool
787 can_build_shared=yes
788
789 # All known linkers require a `.a' archive for static linking (except MSVC,
790@@ -8466,8 +8966,6 @@ fi
791 lt_prog_compiler_pic=
792 lt_prog_compiler_static=
793
794-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
795-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
796
797 if test "$GCC" = yes; then
798 lt_prog_compiler_wl='-Wl,'
799@@ -8633,6 +9131,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
800 lt_prog_compiler_pic='--shared'
801 lt_prog_compiler_static='--static'
802 ;;
803+ nagfor*)
804+ # NAG Fortran compiler
805+ lt_prog_compiler_wl='-Wl,-Wl,,'
806+ lt_prog_compiler_pic='-PIC'
807+ lt_prog_compiler_static='-Bstatic'
808+ ;;
809 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
810 # Portland Group compilers (*not* the Pentium gcc compiler,
811 # which looks to be a dead project)
812@@ -8695,7 +9199,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
813 lt_prog_compiler_pic='-KPIC'
814 lt_prog_compiler_static='-Bstatic'
815 case $cc_basename in
816- f77* | f90* | f95*)
817+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
818 lt_prog_compiler_wl='-Qoption ld ';;
819 *)
820 lt_prog_compiler_wl='-Wl,';;
821@@ -8752,13 +9256,17 @@ case $host_os in
822 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
823 ;;
824 esac
825-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
826-$as_echo "$lt_prog_compiler_pic" >&6; }
827-
828-
829-
830-
831
832+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
833+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
834+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
835+ $as_echo_n "(cached) " >&6
836+else
837+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
838+fi
839+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
840+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
841+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
842
843 #
844 # Check to make sure the PIC flag actually works.
845@@ -8819,6 +9327,11 @@ fi
846
847
848
849+
850+
851+
852+
853+
854 #
855 # Check to make sure the static flag actually works.
856 #
857@@ -9169,7 +9682,8 @@ _LT_EOF
858 allow_undefined_flag=unsupported
859 always_export_symbols=no
860 enable_shared_with_static_runtimes=yes
861- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
862+ 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'
863+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
864
865 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
866 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
867@@ -9268,12 +9782,12 @@ _LT_EOF
868 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
869 hardcode_libdir_flag_spec=
870 hardcode_libdir_flag_spec_ld='-rpath $libdir'
871- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
872+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
873 if test "x$supports_anon_versioning" = xyes; then
874 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
875 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
876 echo "local: *; };" >> $output_objdir/$libname.ver~
877- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
878+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
879 fi
880 ;;
881 esac
882@@ -9287,8 +9801,8 @@ _LT_EOF
883 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
884 wlarc=
885 else
886- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
887- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
888+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
889+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
890 fi
891 ;;
892
893@@ -9306,8 +9820,8 @@ _LT_EOF
894
895 _LT_EOF
896 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
897- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
898- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
899+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
900+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
901 else
902 ld_shlibs=no
903 fi
904@@ -9353,8 +9867,8 @@ _LT_EOF
905
906 *)
907 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
908- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
909- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
910+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
911+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
912 else
913 ld_shlibs=no
914 fi
915@@ -9484,7 +9998,13 @@ _LT_EOF
916 allow_undefined_flag='-berok'
917 # Determine the default libpath from the value encoded in an
918 # empty executable.
919- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
920+ if test "${lt_cv_aix_libpath+set}" = set; then
921+ aix_libpath=$lt_cv_aix_libpath
922+else
923+ if test "${lt_cv_aix_libpath_+set}" = set; then :
924+ $as_echo_n "(cached) " >&6
925+else
926+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
927 /* end confdefs.h. */
928
929 int
930@@ -9497,22 +10017,29 @@ main ()
931 _ACEOF
932 if ac_fn_c_try_link "$LINENO"; then :
933
934-lt_aix_libpath_sed='
935- /Import File Strings/,/^$/ {
936- /^0/ {
937- s/^0 *\(.*\)$/\1/
938- p
939- }
940- }'
941-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
942-# Check for a 64-bit object if we didn't find anything.
943-if test -z "$aix_libpath"; then
944- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
945-fi
946+ lt_aix_libpath_sed='
947+ /Import File Strings/,/^$/ {
948+ /^0/ {
949+ s/^0 *\([^ ]*\) *$/\1/
950+ p
951+ }
952+ }'
953+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
954+ # Check for a 64-bit object if we didn't find anything.
955+ if test -z "$lt_cv_aix_libpath_"; then
956+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
957+ fi
958 fi
959 rm -f core conftest.err conftest.$ac_objext \
960 conftest$ac_exeext conftest.$ac_ext
961-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
962+ if test -z "$lt_cv_aix_libpath_"; then
963+ lt_cv_aix_libpath_="/usr/lib:/lib"
964+ fi
965+
966+fi
967+
968+ aix_libpath=$lt_cv_aix_libpath_
969+fi
970
971 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
972 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"
973@@ -9524,7 +10051,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
974 else
975 # Determine the default libpath from the value encoded in an
976 # empty executable.
977- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
978+ if test "${lt_cv_aix_libpath+set}" = set; then
979+ aix_libpath=$lt_cv_aix_libpath
980+else
981+ if test "${lt_cv_aix_libpath_+set}" = set; then :
982+ $as_echo_n "(cached) " >&6
983+else
984+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
985 /* end confdefs.h. */
986
987 int
988@@ -9537,22 +10070,29 @@ main ()
989 _ACEOF
990 if ac_fn_c_try_link "$LINENO"; then :
991
992-lt_aix_libpath_sed='
993- /Import File Strings/,/^$/ {
994- /^0/ {
995- s/^0 *\(.*\)$/\1/
996- p
997- }
998- }'
999-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1000-# Check for a 64-bit object if we didn't find anything.
1001-if test -z "$aix_libpath"; then
1002- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1003-fi
1004+ lt_aix_libpath_sed='
1005+ /Import File Strings/,/^$/ {
1006+ /^0/ {
1007+ s/^0 *\([^ ]*\) *$/\1/
1008+ p
1009+ }
1010+ }'
1011+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1012+ # Check for a 64-bit object if we didn't find anything.
1013+ if test -z "$lt_cv_aix_libpath_"; then
1014+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1015+ fi
1016 fi
1017 rm -f core conftest.err conftest.$ac_objext \
1018 conftest$ac_exeext conftest.$ac_ext
1019-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1020+ if test -z "$lt_cv_aix_libpath_"; then
1021+ lt_cv_aix_libpath_="/usr/lib:/lib"
1022+ fi
1023+
1024+fi
1025+
1026+ aix_libpath=$lt_cv_aix_libpath_
1027+fi
1028
1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1030 # Warning - without using the other run time loading flags,
1031@@ -9597,20 +10137,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 # Microsoft Visual C++.
1033 # hardcode_libdir_flag_spec is actually meaningless, as there is
1034 # no search path for DLLs.
1035- hardcode_libdir_flag_spec=' '
1036- allow_undefined_flag=unsupported
1037- # Tell ltmain to make .lib files, not .a files.
1038- libext=lib
1039- # Tell ltmain to make .dll files, not .so files.
1040- shrext_cmds=".dll"
1041- # FIXME: Setting linknames here is a bad hack.
1042- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1043- # The linker will automatically build a .lib file if we build a DLL.
1044- old_archive_from_new_cmds='true'
1045- # FIXME: Should let the user specify the lib program.
1046- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1047- fix_srcfile_path='`cygpath -w "$srcfile"`'
1048- enable_shared_with_static_runtimes=yes
1049+ case $cc_basename in
1050+ cl*)
1051+ # Native MSVC
1052+ hardcode_libdir_flag_spec=' '
1053+ allow_undefined_flag=unsupported
1054+ always_export_symbols=yes
1055+ file_list_spec='@'
1056+ # Tell ltmain to make .lib files, not .a files.
1057+ libext=lib
1058+ # Tell ltmain to make .dll files, not .so files.
1059+ shrext_cmds=".dll"
1060+ # FIXME: Setting linknames here is a bad hack.
1061+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1062+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1063+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1064+ else
1065+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1066+ fi~
1067+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1068+ linknames='
1069+ # The linker will not automatically build a static lib if we build a DLL.
1070+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1071+ enable_shared_with_static_runtimes=yes
1072+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1073+ # Don't use ranlib
1074+ old_postinstall_cmds='chmod 644 $oldlib'
1075+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1076+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1077+ case $lt_outputfile in
1078+ *.exe|*.EXE) ;;
1079+ *)
1080+ lt_outputfile="$lt_outputfile.exe"
1081+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1082+ ;;
1083+ esac~
1084+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1085+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1086+ $RM "$lt_outputfile.manifest";
1087+ fi'
1088+ ;;
1089+ *)
1090+ # Assume MSVC wrapper
1091+ hardcode_libdir_flag_spec=' '
1092+ allow_undefined_flag=unsupported
1093+ # Tell ltmain to make .lib files, not .a files.
1094+ libext=lib
1095+ # Tell ltmain to make .dll files, not .so files.
1096+ shrext_cmds=".dll"
1097+ # FIXME: Setting linknames here is a bad hack.
1098+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1099+ # The linker will automatically build a .lib file if we build a DLL.
1100+ old_archive_from_new_cmds='true'
1101+ # FIXME: Should let the user specify the lib program.
1102+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1103+ enable_shared_with_static_runtimes=yes
1104+ ;;
1105+ esac
1106 ;;
1107
1108 darwin* | rhapsody*)
1109@@ -9671,7 +10254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1110
1111 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1112 freebsd* | dragonfly*)
1113- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1114+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1115 hardcode_libdir_flag_spec='-R$libdir'
1116 hardcode_direct=yes
1117 hardcode_shlibpath_var=no
1118@@ -9679,7 +10262,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1119
1120 hpux9*)
1121 if test "$GCC" = yes; then
1122- 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'
1123+ 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'
1124 else
1125 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'
1126 fi
1127@@ -9695,7 +10278,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1128
1129 hpux10*)
1130 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1131- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1132+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1133 else
1134 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1135 fi
1136@@ -9719,10 +10302,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1137 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1138 ;;
1139 ia64*)
1140- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1141+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1142 ;;
1143 *)
1144- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1145+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1146 ;;
1147 esac
1148 else
1149@@ -9801,23 +10384,36 @@ fi
1150
1151 irix5* | irix6* | nonstopux*)
1152 if test "$GCC" = yes; then
1153- 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'
1154+ 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'
1155 # Try to use the -exported_symbol ld option, if it does not
1156 # work, assume that -exports_file does not work either and
1157 # implicitly export all symbols.
1158- save_LDFLAGS="$LDFLAGS"
1159- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1160- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1161+ # This should be the same for all languages, so no per-tag cache variable.
1162+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1163+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1164+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
1165+ $as_echo_n "(cached) " >&6
1166+else
1167+ save_LDFLAGS="$LDFLAGS"
1168+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1169+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1170 /* end confdefs.h. */
1171-int foo(void) {}
1172+int foo (void) { return 0; }
1173 _ACEOF
1174 if ac_fn_c_try_link "$LINENO"; then :
1175- 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'
1176-
1177+ lt_cv_irix_exported_symbol=yes
1178+else
1179+ lt_cv_irix_exported_symbol=no
1180 fi
1181 rm -f core conftest.err conftest.$ac_objext \
1182 conftest$ac_exeext conftest.$ac_ext
1183- LDFLAGS="$save_LDFLAGS"
1184+ LDFLAGS="$save_LDFLAGS"
1185+fi
1186+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1187+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1188+ if test "$lt_cv_irix_exported_symbol" = yes; then
1189+ 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'
1190+ fi
1191 else
1192 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'
1193 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'
1194@@ -9902,7 +10498,7 @@ rm -f core conftest.err conftest.$ac_objext \
1195 osf4* | osf5*) # as osf3* with the addition of -msym flag
1196 if test "$GCC" = yes; then
1197 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1198- 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'
1199+ 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'
1200 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1201 else
1202 allow_undefined_flag=' -expect_unresolved \*'
1203@@ -9921,9 +10517,9 @@ rm -f core conftest.err conftest.$ac_objext \
1204 no_undefined_flag=' -z defs'
1205 if test "$GCC" = yes; then
1206 wlarc='${wl}'
1207- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1208+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1209 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1210- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1211+ $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'
1212 else
1213 case `$CC -V 2>&1` in
1214 *"Compilers 5.0"*)
1215@@ -10499,8 +11095,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1216 need_version=no
1217 need_lib_prefix=no
1218
1219- case $GCC,$host_os in
1220- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1221+ case $GCC,$cc_basename in
1222+ yes,*)
1223+ # gcc
1224 library_names_spec='$libname.dll.a'
1225 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1226 postinstall_cmds='base_file=`basename \${file}`~
1227@@ -10533,13 +11130,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1228 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1229 ;;
1230 esac
1231+ dynamic_linker='Win32 ld.exe'
1232+ ;;
1233+
1234+ *,cl*)
1235+ # Native MSVC
1236+ libname_spec='$name'
1237+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1238+ library_names_spec='${libname}.dll.lib'
1239+
1240+ case $build_os in
1241+ mingw*)
1242+ sys_lib_search_path_spec=
1243+ lt_save_ifs=$IFS
1244+ IFS=';'
1245+ for lt_path in $LIB
1246+ do
1247+ IFS=$lt_save_ifs
1248+ # Let DOS variable expansion print the short 8.3 style file name.
1249+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1250+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1251+ done
1252+ IFS=$lt_save_ifs
1253+ # Convert to MSYS style.
1254+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1255+ ;;
1256+ cygwin*)
1257+ # Convert to unix form, then to dos form, then back to unix form
1258+ # but this time dos style (no spaces!) so that the unix form looks
1259+ # like /cygdrive/c/PROGRA~1:/cygdr...
1260+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1261+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1262+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1263+ ;;
1264+ *)
1265+ sys_lib_search_path_spec="$LIB"
1266+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1267+ # It is most probably a Windows format PATH.
1268+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1269+ else
1270+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1271+ fi
1272+ # FIXME: find the short name or the path components, as spaces are
1273+ # common. (e.g. "Program Files" -> "PROGRA~1")
1274+ ;;
1275+ esac
1276+
1277+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1278+ postinstall_cmds='base_file=`basename \${file}`~
1279+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1280+ dldir=$destdir/`dirname \$dlpath`~
1281+ test -d \$dldir || mkdir -p \$dldir~
1282+ $install_prog $dir/$dlname \$dldir/$dlname'
1283+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1284+ dlpath=$dir/\$dldll~
1285+ $RM \$dlpath'
1286+ shlibpath_overrides_runpath=yes
1287+ dynamic_linker='Win32 link.exe'
1288 ;;
1289
1290 *)
1291+ # Assume MSVC wrapper
1292 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1293+ dynamic_linker='Win32 ld.exe'
1294 ;;
1295 esac
1296- dynamic_linker='Win32 ld.exe'
1297 # FIXME: first we should search . and the directory the executable is in
1298 shlibpath_var=PATH
1299 ;;
1300@@ -10631,7 +11286,7 @@ haiku*)
1301 soname_spec='${libname}${release}${shared_ext}$major'
1302 shlibpath_var=LIBRARY_PATH
1303 shlibpath_overrides_runpath=yes
1304- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1305+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1306 hardcode_into_libs=yes
1307 ;;
1308
1309@@ -11471,10 +12126,10 @@ else
1310 /* When -fvisbility=hidden is used, assume the code has been annotated
1311 correspondingly for the symbols needed. */
1312 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1313-void fnord () __attribute__((visibility("default")));
1314+int fnord () __attribute__((visibility("default")));
1315 #endif
1316
1317-void fnord () { int i=42; }
1318+int fnord () { return 42; }
1319 int main ()
1320 {
1321 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1322@@ -11577,10 +12232,10 @@ else
1323 /* When -fvisbility=hidden is used, assume the code has been annotated
1324 correspondingly for the symbols needed. */
1325 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1326-void fnord () __attribute__((visibility("default")));
1327+int fnord () __attribute__((visibility("default")));
1328 #endif
1329
1330-void fnord () { int i=42; }
1331+int fnord () { return 42; }
1332 int main ()
1333 {
1334 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1335@@ -14078,7 +14733,7 @@ SHARED_LDFLAGS=
1336 if test "$enable_shared" = "yes"; then
1337 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1338 if test -n "$x"; then
1339- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1340+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1341 fi
1342
1343 # More hacks to build DLLs on Windows.
1344@@ -16789,13 +17444,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1345 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1346 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1347 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1348+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1349+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1350 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1351 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1352 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1353 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1354 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1355+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1356+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1357+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1358+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1359 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1360 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1361+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1362 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1363 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1364 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1365@@ -16810,14 +17472,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1366 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1367 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1368 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"`'
1369+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1370+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1371 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1372 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1373 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1374-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1375 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1376+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1377 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1378 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1379 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1380+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1381 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1382 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1383 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1384@@ -16850,12 +17515,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1385 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1386 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1387 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1388-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1389 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1390 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1391 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1392 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1393 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1394+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1395 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1396 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1397 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1398@@ -16910,8 +17575,13 @@ reload_flag \
1399 OBJDUMP \
1400 deplibs_check_method \
1401 file_magic_cmd \
1402+file_magic_glob \
1403+want_nocaseglob \
1404+DLLTOOL \
1405+sharedlib_from_linklib_cmd \
1406 AR \
1407 AR_FLAGS \
1408+archiver_list_spec \
1409 STRIP \
1410 RANLIB \
1411 CC \
1412@@ -16921,12 +17591,14 @@ lt_cv_sys_global_symbol_pipe \
1413 lt_cv_sys_global_symbol_to_cdecl \
1414 lt_cv_sys_global_symbol_to_c_name_address \
1415 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1416+nm_file_list_spec \
1417 lt_prog_compiler_no_builtin_flag \
1418-lt_prog_compiler_wl \
1419 lt_prog_compiler_pic \
1420+lt_prog_compiler_wl \
1421 lt_prog_compiler_static \
1422 lt_cv_prog_compiler_c_o \
1423 need_locks \
1424+MANIFEST_TOOL \
1425 DSYMUTIL \
1426 NMEDIT \
1427 LIPO \
1428@@ -16942,7 +17614,6 @@ no_undefined_flag \
1429 hardcode_libdir_flag_spec \
1430 hardcode_libdir_flag_spec_ld \
1431 hardcode_libdir_separator \
1432-fix_srcfile_path \
1433 exclude_expsyms \
1434 include_expsyms \
1435 file_list_spec \
1436@@ -16978,6 +17649,7 @@ module_cmds \
1437 module_expsym_cmds \
1438 export_symbols_cmds \
1439 prelink_cmds \
1440+postlink_cmds \
1441 postinstall_cmds \
1442 postuninstall_cmds \
1443 finish_cmds \
1444@@ -17757,7 +18429,8 @@ $as_echo X"$file" |
1445 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1446 #
1447 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1448-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1449+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1450+# Inc.
1451 # Written by Gordon Matzigkeit, 1996
1452 #
1453 # This file is part of GNU Libtool.
1454@@ -17860,19 +18533,42 @@ SP2NL=$lt_lt_SP2NL
1455 # turn newlines into spaces.
1456 NL2SP=$lt_lt_NL2SP
1457
1458+# convert \$build file names to \$host format.
1459+to_host_file_cmd=$lt_cv_to_host_file_cmd
1460+
1461+# convert \$build files to toolchain format.
1462+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1463+
1464 # An object symbol dumper.
1465 OBJDUMP=$lt_OBJDUMP
1466
1467 # Method to check whether dependent libraries are shared objects.
1468 deplibs_check_method=$lt_deplibs_check_method
1469
1470-# Command to use when deplibs_check_method == "file_magic".
1471+# Command to use when deplibs_check_method = "file_magic".
1472 file_magic_cmd=$lt_file_magic_cmd
1473
1474+# How to find potential files when deplibs_check_method = "file_magic".
1475+file_magic_glob=$lt_file_magic_glob
1476+
1477+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1478+want_nocaseglob=$lt_want_nocaseglob
1479+
1480+# DLL creation program.
1481+DLLTOOL=$lt_DLLTOOL
1482+
1483+# Command to associate shared and link libraries.
1484+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1485+
1486 # The archiver.
1487 AR=$lt_AR
1488+
1489+# Flags to create an archive.
1490 AR_FLAGS=$lt_AR_FLAGS
1491
1492+# How to feed a file listing to the archiver.
1493+archiver_list_spec=$lt_archiver_list_spec
1494+
1495 # A symbol stripping program.
1496 STRIP=$lt_STRIP
1497
1498@@ -17902,6 +18598,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1499 # Transform the output of nm in a C name address pair when lib prefix is needed.
1500 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1501
1502+# Specify filename containing input files for \$NM.
1503+nm_file_list_spec=$lt_nm_file_list_spec
1504+
1505+# The root where to search for dependent libraries,and in which our libraries should be installed.
1506+lt_sysroot=$lt_sysroot
1507+
1508 # The name of the directory that contains temporary libtool files.
1509 objdir=$objdir
1510
1511@@ -17911,6 +18613,9 @@ MAGIC_CMD=$MAGIC_CMD
1512 # Must we lock files when doing compilation?
1513 need_locks=$lt_need_locks
1514
1515+# Manifest tool.
1516+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1517+
1518 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1519 DSYMUTIL=$lt_DSYMUTIL
1520
1521@@ -18025,12 +18730,12 @@ with_gcc=$GCC
1522 # Compiler flag to turn off builtin functions.
1523 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1524
1525-# How to pass a linker flag through the compiler.
1526-wl=$lt_lt_prog_compiler_wl
1527-
1528 # Additional compiler flags for building library objects.
1529 pic_flag=$lt_lt_prog_compiler_pic
1530
1531+# How to pass a linker flag through the compiler.
1532+wl=$lt_lt_prog_compiler_wl
1533+
1534 # Compiler flag to prevent dynamic linking.
1535 link_static_flag=$lt_lt_prog_compiler_static
1536
1537@@ -18117,9 +18822,6 @@ inherit_rpath=$inherit_rpath
1538 # Whether libtool must link a program against all its dependency libraries.
1539 link_all_deplibs=$link_all_deplibs
1540
1541-# Fix the shell variable \$srcfile for the compiler.
1542-fix_srcfile_path=$lt_fix_srcfile_path
1543-
1544 # Set to "yes" if exported symbols are required.
1545 always_export_symbols=$always_export_symbols
1546
1547@@ -18135,6 +18837,9 @@ include_expsyms=$lt_include_expsyms
1548 # Commands necessary for linking programs (against libraries) with templates.
1549 prelink_cmds=$lt_prelink_cmds
1550
1551+# Commands necessary for finishing linking programs.
1552+postlink_cmds=$lt_postlink_cmds
1553+
1554 # Specify filename containing input files.
1555 file_list_spec=$lt_file_list_spec
1556
1557@@ -18167,210 +18872,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1558 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1559 # text mode, it properly converts lines to CR/LF. This bash problem
1560 # is reportedly fixed, but why not run on old versions too?
1561- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1562- || (rm -f "$cfgfile"; exit 1)
1563-
1564- case $xsi_shell in
1565- yes)
1566- cat << \_LT_EOF >> "$cfgfile"
1567-
1568-# func_dirname file append nondir_replacement
1569-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1570-# otherwise set result to NONDIR_REPLACEMENT.
1571-func_dirname ()
1572-{
1573- case ${1} in
1574- */*) func_dirname_result="${1%/*}${2}" ;;
1575- * ) func_dirname_result="${3}" ;;
1576- esac
1577-}
1578-
1579-# func_basename file
1580-func_basename ()
1581-{
1582- func_basename_result="${1##*/}"
1583-}
1584-
1585-# func_dirname_and_basename file append nondir_replacement
1586-# perform func_basename and func_dirname in a single function
1587-# call:
1588-# dirname: Compute the dirname of FILE. If nonempty,
1589-# add APPEND to the result, otherwise set result
1590-# to NONDIR_REPLACEMENT.
1591-# value returned in "$func_dirname_result"
1592-# basename: Compute filename of FILE.
1593-# value retuned in "$func_basename_result"
1594-# Implementation must be kept synchronized with func_dirname
1595-# and func_basename. For efficiency, we do not delegate to
1596-# those functions but instead duplicate the functionality here.
1597-func_dirname_and_basename ()
1598-{
1599- case ${1} in
1600- */*) func_dirname_result="${1%/*}${2}" ;;
1601- * ) func_dirname_result="${3}" ;;
1602- esac
1603- func_basename_result="${1##*/}"
1604-}
1605-
1606-# func_stripname prefix suffix name
1607-# strip PREFIX and SUFFIX off of NAME.
1608-# PREFIX and SUFFIX must not contain globbing or regex special
1609-# characters, hashes, percent signs, but SUFFIX may contain a leading
1610-# dot (in which case that matches only a dot).
1611-func_stripname ()
1612-{
1613- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1614- # positional parameters, so assign one to ordinary parameter first.
1615- func_stripname_result=${3}
1616- func_stripname_result=${func_stripname_result#"${1}"}
1617- func_stripname_result=${func_stripname_result%"${2}"}
1618-}
1619-
1620-# func_opt_split
1621-func_opt_split ()
1622-{
1623- func_opt_split_opt=${1%%=*}
1624- func_opt_split_arg=${1#*=}
1625-}
1626-
1627-# func_lo2o object
1628-func_lo2o ()
1629-{
1630- case ${1} in
1631- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1632- *) func_lo2o_result=${1} ;;
1633- esac
1634-}
1635-
1636-# func_xform libobj-or-source
1637-func_xform ()
1638-{
1639- func_xform_result=${1%.*}.lo
1640-}
1641-
1642-# func_arith arithmetic-term...
1643-func_arith ()
1644-{
1645- func_arith_result=$(( $* ))
1646-}
1647-
1648-# func_len string
1649-# STRING may not start with a hyphen.
1650-func_len ()
1651-{
1652- func_len_result=${#1}
1653-}
1654-
1655-_LT_EOF
1656- ;;
1657- *) # Bourne compatible functions.
1658- cat << \_LT_EOF >> "$cfgfile"
1659-
1660-# func_dirname file append nondir_replacement
1661-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1662-# otherwise set result to NONDIR_REPLACEMENT.
1663-func_dirname ()
1664-{
1665- # Extract subdirectory from the argument.
1666- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1667- if test "X$func_dirname_result" = "X${1}"; then
1668- func_dirname_result="${3}"
1669- else
1670- func_dirname_result="$func_dirname_result${2}"
1671- fi
1672-}
1673-
1674-# func_basename file
1675-func_basename ()
1676-{
1677- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1678-}
1679-
1680-
1681-# func_stripname prefix suffix name
1682-# strip PREFIX and SUFFIX off of NAME.
1683-# PREFIX and SUFFIX must not contain globbing or regex special
1684-# characters, hashes, percent signs, but SUFFIX may contain a leading
1685-# dot (in which case that matches only a dot).
1686-# func_strip_suffix prefix name
1687-func_stripname ()
1688-{
1689- case ${2} in
1690- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1691- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1692- esac
1693-}
1694-
1695-# sed scripts:
1696-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1697-my_sed_long_arg='1s/^-[^=]*=//'
1698-
1699-# func_opt_split
1700-func_opt_split ()
1701-{
1702- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1703- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1704-}
1705-
1706-# func_lo2o object
1707-func_lo2o ()
1708-{
1709- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1710-}
1711-
1712-# func_xform libobj-or-source
1713-func_xform ()
1714-{
1715- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1716-}
1717-
1718-# func_arith arithmetic-term...
1719-func_arith ()
1720-{
1721- func_arith_result=`expr "$@"`
1722-}
1723-
1724-# func_len string
1725-# STRING may not start with a hyphen.
1726-func_len ()
1727-{
1728- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1729-}
1730-
1731-_LT_EOF
1732-esac
1733-
1734-case $lt_shell_append in
1735- yes)
1736- cat << \_LT_EOF >> "$cfgfile"
1737-
1738-# func_append var value
1739-# Append VALUE to the end of shell variable VAR.
1740-func_append ()
1741-{
1742- eval "$1+=\$2"
1743-}
1744-_LT_EOF
1745- ;;
1746- *)
1747- cat << \_LT_EOF >> "$cfgfile"
1748-
1749-# func_append var value
1750-# Append VALUE to the end of shell variable VAR.
1751-func_append ()
1752-{
1753- eval "$1=\$$1\$2"
1754-}
1755-
1756-_LT_EOF
1757- ;;
1758- esac
1759-
1760-
1761- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1762- || (rm -f "$cfgfile"; exit 1)
1763-
1764- mv -f "$cfgfile" "$ofile" ||
1765+ sed '$q' "$ltmain" >> "$cfgfile" \
1766+ || (rm -f "$cfgfile"; exit 1)
1767+
1768+ if test x"$xsi_shell" = xyes; then
1769+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1770+func_dirname ()\
1771+{\
1772+\ case ${1} in\
1773+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1774+\ * ) func_dirname_result="${3}" ;;\
1775+\ esac\
1776+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1777+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1778+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1779+test 0 -eq $? || _lt_function_replace_fail=:
1780+
1781+
1782+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1783+func_basename ()\
1784+{\
1785+\ func_basename_result="${1##*/}"\
1786+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1787+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1788+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1789+test 0 -eq $? || _lt_function_replace_fail=:
1790+
1791+
1792+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1793+func_dirname_and_basename ()\
1794+{\
1795+\ case ${1} in\
1796+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1797+\ * ) func_dirname_result="${3}" ;;\
1798+\ esac\
1799+\ func_basename_result="${1##*/}"\
1800+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1801+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1802+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1803+test 0 -eq $? || _lt_function_replace_fail=:
1804+
1805+
1806+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1807+func_stripname ()\
1808+{\
1809+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1810+\ # positional parameters, so assign one to ordinary parameter first.\
1811+\ func_stripname_result=${3}\
1812+\ func_stripname_result=${func_stripname_result#"${1}"}\
1813+\ func_stripname_result=${func_stripname_result%"${2}"}\
1814+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1815+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1816+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1817+test 0 -eq $? || _lt_function_replace_fail=:
1818+
1819+
1820+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1821+func_split_long_opt ()\
1822+{\
1823+\ func_split_long_opt_name=${1%%=*}\
1824+\ func_split_long_opt_arg=${1#*=}\
1825+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1826+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1827+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1828+test 0 -eq $? || _lt_function_replace_fail=:
1829+
1830+
1831+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1832+func_split_short_opt ()\
1833+{\
1834+\ func_split_short_opt_arg=${1#??}\
1835+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1836+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1837+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1838+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1839+test 0 -eq $? || _lt_function_replace_fail=:
1840+
1841+
1842+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1843+func_lo2o ()\
1844+{\
1845+\ case ${1} in\
1846+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1847+\ *) func_lo2o_result=${1} ;;\
1848+\ esac\
1849+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1850+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1851+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1852+test 0 -eq $? || _lt_function_replace_fail=:
1853+
1854+
1855+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1856+func_xform ()\
1857+{\
1858+ func_xform_result=${1%.*}.lo\
1859+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1860+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1861+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1862+test 0 -eq $? || _lt_function_replace_fail=:
1863+
1864+
1865+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1866+func_arith ()\
1867+{\
1868+ func_arith_result=$(( $* ))\
1869+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1870+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1871+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1872+test 0 -eq $? || _lt_function_replace_fail=:
1873+
1874+
1875+ sed -e '/^func_len ()$/,/^} # func_len /c\
1876+func_len ()\
1877+{\
1878+ func_len_result=${#1}\
1879+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1880+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1881+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1882+test 0 -eq $? || _lt_function_replace_fail=:
1883+
1884+fi
1885+
1886+if test x"$lt_shell_append" = xyes; then
1887+ sed -e '/^func_append ()$/,/^} # func_append /c\
1888+func_append ()\
1889+{\
1890+ eval "${1}+=\\${2}"\
1891+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1892+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1893+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1894+test 0 -eq $? || _lt_function_replace_fail=:
1895+
1896+
1897+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1898+func_append_quoted ()\
1899+{\
1900+\ func_quote_for_eval "${2}"\
1901+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1902+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1903+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1904+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1905+test 0 -eq $? || _lt_function_replace_fail=:
1906+
1907+
1908+ # Save a `func_append' function call where possible by direct use of '+='
1909+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1910+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1911+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1912+ test 0 -eq $? || _lt_function_replace_fail=:
1913+else
1914+ # Save a `func_append' function call even when '+=' is not available
1915+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1916+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1917+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1918+ test 0 -eq $? || _lt_function_replace_fail=:
1919+fi
1920+
1921+if test x"$_lt_function_replace_fail" = x":"; then
1922+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1923+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1924+fi
1925+
1926+
1927+ mv -f "$cfgfile" "$ofile" ||
1928 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1929 chmod +x "$ofile"
1930
1931diff --git a/bfd/configure.ac b/bfd/configure.ac
1932index 669cff7..5f57877 100644
1933--- a/bfd/configure.ac
1934+++ b/bfd/configure.ac
1935@@ -253,7 +253,7 @@ changequote(,)dnl
1936 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1937 changequote([,])dnl
1938 if test -n "$x"; then
1939- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1940+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1941 fi
1942
1943 # More hacks to build DLLs on Windows.
1944diff --git a/binutils/configure b/binutils/configure
1945index 6cbf17c..6d20600 100755
1946--- a/binutils/configure
1947+++ b/binutils/configure
1948@@ -658,8 +658,11 @@ OTOOL
1949 LIPO
1950 NMEDIT
1951 DSYMUTIL
1952+MANIFEST_TOOL
1953 RANLIB
1954+ac_ct_AR
1955 AR
1956+DLLTOOL
1957 OBJDUMP
1958 LN_S
1959 NM
1960@@ -771,6 +774,7 @@ enable_static
1961 with_pic
1962 enable_fast_install
1963 with_gnu_ld
1964+with_libtool_sysroot
1965 enable_libtool_lock
1966 enable_plugins
1967 enable_largefile
1968@@ -1443,6 +1447,8 @@ Optional Packages:
1969 --with-pic try to use only PIC/non-PIC objects [default=use
1970 both]
1971 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1972+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1973+ (or the compiler's sysroot if not specified).
1974 --with-system-zlib use installed libz
1975 --with-gnu-ld assume the C compiler uses GNU ld default=no
1976 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1977@@ -5159,8 +5165,8 @@ esac
1978
1979
1980
1981-macro_version='2.2.7a'
1982-macro_revision='1.3134'
1983+macro_version='2.4'
1984+macro_revision='1.3293'
1985
1986
1987
1988@@ -5200,7 +5206,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1989 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1990 $as_echo_n "checking how to print strings... " >&6; }
1991 # Test print first, because it will be a builtin if present.
1992-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1993+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
1994 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1995 ECHO='print -r --'
1996 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1997@@ -5886,8 +5892,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
1998 # Try some XSI features
1999 xsi_shell=no
2000 ( _lt_dummy="a/b/c"
2001- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2002- = c,a/b,, \
2003+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2004+ = c,a/b,b/c, \
2005 && eval 'test $(( 1 + 1 )) -eq 2 \
2006 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2007 && xsi_shell=yes
2008@@ -5936,6 +5942,80 @@ esac
2009
2010
2011
2012+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2013+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2014+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
2015+ $as_echo_n "(cached) " >&6
2016+else
2017+ case $host in
2018+ *-*-mingw* )
2019+ case $build in
2020+ *-*-mingw* ) # actually msys
2021+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2022+ ;;
2023+ *-*-cygwin* )
2024+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2025+ ;;
2026+ * ) # otherwise, assume *nix
2027+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2028+ ;;
2029+ esac
2030+ ;;
2031+ *-*-cygwin* )
2032+ case $build in
2033+ *-*-mingw* ) # actually msys
2034+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2035+ ;;
2036+ *-*-cygwin* )
2037+ lt_cv_to_host_file_cmd=func_convert_file_noop
2038+ ;;
2039+ * ) # otherwise, assume *nix
2040+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2041+ ;;
2042+ esac
2043+ ;;
2044+ * ) # unhandled hosts (and "normal" native builds)
2045+ lt_cv_to_host_file_cmd=func_convert_file_noop
2046+ ;;
2047+esac
2048+
2049+fi
2050+
2051+to_host_file_cmd=$lt_cv_to_host_file_cmd
2052+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2053+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2054+
2055+
2056+
2057+
2058+
2059+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2060+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2061+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
2062+ $as_echo_n "(cached) " >&6
2063+else
2064+ #assume ordinary cross tools, or native build.
2065+lt_cv_to_tool_file_cmd=func_convert_file_noop
2066+case $host in
2067+ *-*-mingw* )
2068+ case $build in
2069+ *-*-mingw* ) # actually msys
2070+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2071+ ;;
2072+ esac
2073+ ;;
2074+esac
2075+
2076+fi
2077+
2078+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2079+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2080+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2081+
2082+
2083+
2084+
2085+
2086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2087 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2088 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2089@@ -5952,6 +6032,11 @@ case $reload_flag in
2090 esac
2091 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2092 case $host_os in
2093+ cygwin* | mingw* | pw32* | cegcc*)
2094+ if test "$GCC" != yes; then
2095+ reload_cmds=false
2096+ fi
2097+ ;;
2098 darwin*)
2099 if test "$GCC" = yes; then
2100 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2101@@ -6120,7 +6205,8 @@ mingw* | pw32*)
2102 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2103 lt_cv_file_magic_cmd='func_win32_libid'
2104 else
2105- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2106+ # Keep this pattern in sync with the one in func_win32_libid.
2107+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2108 lt_cv_file_magic_cmd='$OBJDUMP -f'
2109 fi
2110 ;;
2111@@ -6274,6 +6360,21 @@ esac
2112 fi
2113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2114 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2115+
2116+file_magic_glob=
2117+want_nocaseglob=no
2118+if test "$build" = "$host"; then
2119+ case $host_os in
2120+ mingw* | pw32*)
2121+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2122+ want_nocaseglob=yes
2123+ else
2124+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2125+ fi
2126+ ;;
2127+ esac
2128+fi
2129+
2130 file_magic_cmd=$lt_cv_file_magic_cmd
2131 deplibs_check_method=$lt_cv_deplibs_check_method
2132 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2133@@ -6289,9 +6390,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2134
2135
2136
2137+
2138+
2139+
2140+
2141+
2142+
2143+
2144+
2145+
2146+
2147+if test -n "$ac_tool_prefix"; then
2148+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2149+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2150+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2151+$as_echo_n "checking for $ac_word... " >&6; }
2152+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
2153+ $as_echo_n "(cached) " >&6
2154+else
2155+ if test -n "$DLLTOOL"; then
2156+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2157+else
2158+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2159+for as_dir in $PATH
2160+do
2161+ IFS=$as_save_IFS
2162+ test -z "$as_dir" && as_dir=.
2163+ for ac_exec_ext in '' $ac_executable_extensions; do
2164+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2165+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2166+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2167+ break 2
2168+ fi
2169+done
2170+ done
2171+IFS=$as_save_IFS
2172+
2173+fi
2174+fi
2175+DLLTOOL=$ac_cv_prog_DLLTOOL
2176+if test -n "$DLLTOOL"; then
2177+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2178+$as_echo "$DLLTOOL" >&6; }
2179+else
2180+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2181+$as_echo "no" >&6; }
2182+fi
2183+
2184+
2185+fi
2186+if test -z "$ac_cv_prog_DLLTOOL"; then
2187+ ac_ct_DLLTOOL=$DLLTOOL
2188+ # Extract the first word of "dlltool", so it can be a program name with args.
2189+set dummy dlltool; ac_word=$2
2190+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2191+$as_echo_n "checking for $ac_word... " >&6; }
2192+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
2193+ $as_echo_n "(cached) " >&6
2194+else
2195+ if test -n "$ac_ct_DLLTOOL"; then
2196+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2197+else
2198+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2199+for as_dir in $PATH
2200+do
2201+ IFS=$as_save_IFS
2202+ test -z "$as_dir" && as_dir=.
2203+ for ac_exec_ext in '' $ac_executable_extensions; do
2204+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2205+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2206+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2207+ break 2
2208+ fi
2209+done
2210+ done
2211+IFS=$as_save_IFS
2212+
2213+fi
2214+fi
2215+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2216+if test -n "$ac_ct_DLLTOOL"; then
2217+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2218+$as_echo "$ac_ct_DLLTOOL" >&6; }
2219+else
2220+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2221+$as_echo "no" >&6; }
2222+fi
2223+
2224+ if test "x$ac_ct_DLLTOOL" = x; then
2225+ DLLTOOL="false"
2226+ else
2227+ case $cross_compiling:$ac_tool_warned in
2228+yes:)
2229+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2230+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2231+ac_tool_warned=yes ;;
2232+esac
2233+ DLLTOOL=$ac_ct_DLLTOOL
2234+ fi
2235+else
2236+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2237+fi
2238+
2239+test -z "$DLLTOOL" && DLLTOOL=dlltool
2240+
2241+
2242+
2243+
2244+
2245+
2246+
2247+
2248+
2249+
2250+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2251+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2252+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
2253+ $as_echo_n "(cached) " >&6
2254+else
2255+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2256+
2257+case $host_os in
2258+cygwin* | mingw* | pw32* | cegcc*)
2259+ # two different shell functions defined in ltmain.sh
2260+ # decide which to use based on capabilities of $DLLTOOL
2261+ case `$DLLTOOL --help 2>&1` in
2262+ *--identify-strict*)
2263+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2264+ ;;
2265+ *)
2266+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2267+ ;;
2268+ esac
2269+ ;;
2270+*)
2271+ # fallback: assume linklib IS sharedlib
2272+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2273+ ;;
2274+esac
2275+
2276+fi
2277+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2278+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2279+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2280+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2281+
2282+
2283+
2284+
2285+
2286+
2287+
2288 if test -n "$ac_tool_prefix"; then
2289- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2290-set dummy ${ac_tool_prefix}ar; ac_word=$2
2291+ for ac_prog in ar
2292+ do
2293+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2294+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2296 $as_echo_n "checking for $ac_word... " >&6; }
2297 if test "${ac_cv_prog_AR+set}" = set; then :
2298@@ -6307,7 +6561,7 @@ do
2299 test -z "$as_dir" && as_dir=.
2300 for ac_exec_ext in '' $ac_executable_extensions; do
2301 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2302- ac_cv_prog_AR="${ac_tool_prefix}ar"
2303+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2304 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2305 break 2
2306 fi
2307@@ -6327,11 +6581,15 @@ $as_echo "no" >&6; }
2308 fi
2309
2310
2311+ test -n "$AR" && break
2312+ done
2313 fi
2314-if test -z "$ac_cv_prog_AR"; then
2315+if test -z "$AR"; then
2316 ac_ct_AR=$AR
2317- # Extract the first word of "ar", so it can be a program name with args.
2318-set dummy ar; ac_word=$2
2319+ for ac_prog in ar
2320+do
2321+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2322+set dummy $ac_prog; ac_word=$2
2323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2324 $as_echo_n "checking for $ac_word... " >&6; }
2325 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2326@@ -6347,7 +6605,7 @@ do
2327 test -z "$as_dir" && as_dir=.
2328 for ac_exec_ext in '' $ac_executable_extensions; do
2329 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2330- ac_cv_prog_ac_ct_AR="ar"
2331+ ac_cv_prog_ac_ct_AR="$ac_prog"
2332 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2333 break 2
2334 fi
2335@@ -6366,6 +6624,10 @@ else
2336 $as_echo "no" >&6; }
2337 fi
2338
2339+
2340+ test -n "$ac_ct_AR" && break
2341+done
2342+
2343 if test "x$ac_ct_AR" = x; then
2344 AR="false"
2345 else
2346@@ -6377,12 +6639,10 @@ ac_tool_warned=yes ;;
2347 esac
2348 AR=$ac_ct_AR
2349 fi
2350-else
2351- AR="$ac_cv_prog_AR"
2352 fi
2353
2354-test -z "$AR" && AR=ar
2355-test -z "$AR_FLAGS" && AR_FLAGS=cru
2356+: ${AR=ar}
2357+: ${AR_FLAGS=cru}
2358
2359
2360
2361@@ -6394,6 +6654,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2362
2363
2364
2365+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2366+$as_echo_n "checking for archiver @FILE support... " >&6; }
2367+if test "${lt_cv_ar_at_file+set}" = set; then :
2368+ $as_echo_n "(cached) " >&6
2369+else
2370+ lt_cv_ar_at_file=no
2371+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2372+/* end confdefs.h. */
2373+
2374+int
2375+main ()
2376+{
2377+
2378+ ;
2379+ return 0;
2380+}
2381+_ACEOF
2382+if ac_fn_c_try_compile "$LINENO"; then :
2383+ echo conftest.$ac_objext > conftest.lst
2384+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2385+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2386+ (eval $lt_ar_try) 2>&5
2387+ ac_status=$?
2388+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2389+ test $ac_status = 0; }
2390+ if test "$ac_status" -eq 0; then
2391+ # Ensure the archiver fails upon bogus file names.
2392+ rm -f conftest.$ac_objext libconftest.a
2393+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2394+ (eval $lt_ar_try) 2>&5
2395+ ac_status=$?
2396+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2397+ test $ac_status = 0; }
2398+ if test "$ac_status" -ne 0; then
2399+ lt_cv_ar_at_file=@
2400+ fi
2401+ fi
2402+ rm -f conftest.* libconftest.a
2403+
2404+fi
2405+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2406+
2407+fi
2408+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2409+$as_echo "$lt_cv_ar_at_file" >&6; }
2410+
2411+if test "x$lt_cv_ar_at_file" = xno; then
2412+ archiver_list_spec=
2413+else
2414+ archiver_list_spec=$lt_cv_ar_at_file
2415+fi
2416+
2417+
2418+
2419+
2420+
2421+
2422+
2423 if test -n "$ac_tool_prefix"; then
2424 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2425 set dummy ${ac_tool_prefix}strip; ac_word=$2
2426@@ -6728,8 +7046,8 @@ esac
2427 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2428
2429 # Transform an extracted symbol line into symbol name and symbol address
2430-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2431-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'"
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
2435 # Handle CRLF in mingw tool chain
2436 opt_cr=
2437@@ -6765,6 +7083,7 @@ for ac_symprfx in "" "_"; do
2438 else
2439 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2440 fi
2441+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2442
2443 # Check to see that the pipe works correctly.
2444 pipe_works=no
2445@@ -6806,6 +7125,18 @@ _LT_EOF
2446 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2447 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2448 cat <<_LT_EOF > conftest.$ac_ext
2449+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2450+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2451+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2452+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2453+# define LT_DLSYM_CONST
2454+#elif defined(__osf__)
2455+/* This system does not cope well with relocations in const data. */
2456+# define LT_DLSYM_CONST
2457+#else
2458+# define LT_DLSYM_CONST const
2459+#endif
2460+
2461 #ifdef __cplusplus
2462 extern "C" {
2463 #endif
2464@@ -6817,7 +7148,7 @@ _LT_EOF
2465 cat <<_LT_EOF >> conftest.$ac_ext
2466
2467 /* The mapping between symbol names and symbols. */
2468-const struct {
2469+LT_DLSYM_CONST struct {
2470 const char *name;
2471 void *address;
2472 }
2473@@ -6843,8 +7174,8 @@ static const void *lt_preloaded_setup() {
2474 _LT_EOF
2475 # Now try linking the two files.
2476 mv conftest.$ac_objext conftstm.$ac_objext
2477- lt_save_LIBS="$LIBS"
2478- lt_save_CFLAGS="$CFLAGS"
2479+ lt_globsym_save_LIBS=$LIBS
2480+ lt_globsym_save_CFLAGS=$CFLAGS
2481 LIBS="conftstm.$ac_objext"
2482 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2483 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2484@@ -6854,8 +7185,8 @@ _LT_EOF
2485 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2486 pipe_works=yes
2487 fi
2488- LIBS="$lt_save_LIBS"
2489- CFLAGS="$lt_save_CFLAGS"
2490+ LIBS=$lt_globsym_save_LIBS
2491+ CFLAGS=$lt_globsym_save_CFLAGS
2492 else
2493 echo "cannot find nm_test_func in $nlist" >&5
2494 fi
2495@@ -6892,6 +7223,21 @@ else
2496 $as_echo "ok" >&6; }
2497 fi
2498
2499+# Response file support.
2500+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2501+ nm_file_list_spec='@'
2502+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2503+ nm_file_list_spec='@'
2504+fi
2505+
2506+
2507+
2508+
2509+
2510+
2511+
2512+
2513+
2514
2515
2516
2517@@ -6910,6 +7256,40 @@ fi
2518
2519
2520
2521+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2522+$as_echo_n "checking for sysroot... " >&6; }
2523+
2524+# Check whether --with-libtool-sysroot was given.
2525+if test "${with_libtool_sysroot+set}" = set; then :
2526+ withval=$with_libtool_sysroot;
2527+else
2528+ with_libtool_sysroot=no
2529+fi
2530+
2531+
2532+lt_sysroot=
2533+case ${with_libtool_sysroot} in #(
2534+ yes)
2535+ if test "$GCC" = yes; then
2536+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2537+ fi
2538+ ;; #(
2539+ /*)
2540+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2541+ ;; #(
2542+ no|'')
2543+ ;; #(
2544+ *)
2545+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2546+$as_echo "${with_libtool_sysroot}" >&6; }
2547+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
2548+ ;;
2549+esac
2550+
2551+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2552+$as_echo "${lt_sysroot:-no}" >&6; }
2553+
2554+
2555
2556
2557
2558@@ -7119,6 +7499,123 @@ esac
2559
2560 need_locks="$enable_libtool_lock"
2561
2562+if test -n "$ac_tool_prefix"; then
2563+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2564+set dummy ${ac_tool_prefix}mt; ac_word=$2
2565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2566+$as_echo_n "checking for $ac_word... " >&6; }
2567+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
2568+ $as_echo_n "(cached) " >&6
2569+else
2570+ if test -n "$MANIFEST_TOOL"; then
2571+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2572+else
2573+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2574+for as_dir in $PATH
2575+do
2576+ IFS=$as_save_IFS
2577+ test -z "$as_dir" && as_dir=.
2578+ for ac_exec_ext in '' $ac_executable_extensions; do
2579+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2580+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2581+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2582+ break 2
2583+ fi
2584+done
2585+ done
2586+IFS=$as_save_IFS
2587+
2588+fi
2589+fi
2590+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2591+if test -n "$MANIFEST_TOOL"; then
2592+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2593+$as_echo "$MANIFEST_TOOL" >&6; }
2594+else
2595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2596+$as_echo "no" >&6; }
2597+fi
2598+
2599+
2600+fi
2601+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2602+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2603+ # Extract the first word of "mt", so it can be a program name with args.
2604+set dummy mt; ac_word=$2
2605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2606+$as_echo_n "checking for $ac_word... " >&6; }
2607+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
2608+ $as_echo_n "(cached) " >&6
2609+else
2610+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2611+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2612+else
2613+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2614+for as_dir in $PATH
2615+do
2616+ IFS=$as_save_IFS
2617+ test -z "$as_dir" && as_dir=.
2618+ for ac_exec_ext in '' $ac_executable_extensions; do
2619+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2620+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2621+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2622+ break 2
2623+ fi
2624+done
2625+ done
2626+IFS=$as_save_IFS
2627+
2628+fi
2629+fi
2630+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2631+if test -n "$ac_ct_MANIFEST_TOOL"; then
2632+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2633+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2634+else
2635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2636+$as_echo "no" >&6; }
2637+fi
2638+
2639+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2640+ MANIFEST_TOOL=":"
2641+ else
2642+ case $cross_compiling:$ac_tool_warned in
2643+yes:)
2644+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2645+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2646+ac_tool_warned=yes ;;
2647+esac
2648+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2649+ fi
2650+else
2651+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2652+fi
2653+
2654+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2655+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2656+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2657+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
2658+ $as_echo_n "(cached) " >&6
2659+else
2660+ lt_cv_path_mainfest_tool=no
2661+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2662+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2663+ cat conftest.err >&5
2664+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2665+ lt_cv_path_mainfest_tool=yes
2666+ fi
2667+ rm -f conftest*
2668+fi
2669+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2670+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2671+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2672+ MANIFEST_TOOL=:
2673+fi
2674+
2675+
2676+
2677+
2678+
2679
2680 case $host_os in
2681 rhapsody* | darwin*)
2682@@ -7682,6 +8179,8 @@ _LT_EOF
2683 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2684 echo "$AR cru libconftest.a conftest.o" >&5
2685 $AR cru libconftest.a conftest.o 2>&5
2686+ echo "$RANLIB libconftest.a" >&5
2687+ $RANLIB libconftest.a 2>&5
2688 cat > conftest.c << _LT_EOF
2689 int main() { return 0;}
2690 _LT_EOF
2691@@ -7877,7 +8376,8 @@ fi
2692 LIBTOOL_DEPS="$ltmain"
2693
2694 # Always use our own libtool.
2695-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2696+LIBTOOL='$(SHELL) $(top_builddir)'
2697+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2698
2699
2700
2701@@ -7966,7 +8466,7 @@ aix3*)
2702 esac
2703
2704 # Global variables:
2705-ofile=libtool
2706+ofile=${host_alias}-libtool
2707 can_build_shared=yes
2708
2709 # All known linkers require a `.a' archive for static linking (except MSVC,
2710@@ -8264,8 +8764,6 @@ fi
2711 lt_prog_compiler_pic=
2712 lt_prog_compiler_static=
2713
2714-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2715-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2716
2717 if test "$GCC" = yes; then
2718 lt_prog_compiler_wl='-Wl,'
2719@@ -8431,6 +8929,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2720 lt_prog_compiler_pic='--shared'
2721 lt_prog_compiler_static='--static'
2722 ;;
2723+ nagfor*)
2724+ # NAG Fortran compiler
2725+ lt_prog_compiler_wl='-Wl,-Wl,,'
2726+ lt_prog_compiler_pic='-PIC'
2727+ lt_prog_compiler_static='-Bstatic'
2728+ ;;
2729 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2730 # Portland Group compilers (*not* the Pentium gcc compiler,
2731 # which looks to be a dead project)
2732@@ -8493,7 +8997,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2733 lt_prog_compiler_pic='-KPIC'
2734 lt_prog_compiler_static='-Bstatic'
2735 case $cc_basename in
2736- f77* | f90* | f95*)
2737+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2738 lt_prog_compiler_wl='-Qoption ld ';;
2739 *)
2740 lt_prog_compiler_wl='-Wl,';;
2741@@ -8550,13 +9054,17 @@ case $host_os in
2742 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2743 ;;
2744 esac
2745-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2746-$as_echo "$lt_prog_compiler_pic" >&6; }
2747-
2748-
2749-
2750-
2751
2752+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2753+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2754+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
2755+ $as_echo_n "(cached) " >&6
2756+else
2757+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2758+fi
2759+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2760+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2761+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2762
2763 #
2764 # Check to make sure the PIC flag actually works.
2765@@ -8617,6 +9125,11 @@ fi
2766
2767
2768
2769+
2770+
2771+
2772+
2773+
2774 #
2775 # Check to make sure the static flag actually works.
2776 #
2777@@ -8967,7 +9480,8 @@ _LT_EOF
2778 allow_undefined_flag=unsupported
2779 always_export_symbols=no
2780 enable_shared_with_static_runtimes=yes
2781- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2782+ 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'
2783+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2784
2785 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2786 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2787@@ -9066,12 +9580,12 @@ _LT_EOF
2788 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2789 hardcode_libdir_flag_spec=
2790 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2791- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2792+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2793 if test "x$supports_anon_versioning" = xyes; then
2794 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2795 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2796 echo "local: *; };" >> $output_objdir/$libname.ver~
2797- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2798+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2799 fi
2800 ;;
2801 esac
2802@@ -9085,8 +9599,8 @@ _LT_EOF
2803 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2804 wlarc=
2805 else
2806- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2807- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2808+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2809+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2810 fi
2811 ;;
2812
2813@@ -9104,8 +9618,8 @@ _LT_EOF
2814
2815 _LT_EOF
2816 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2817- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2818- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2819+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2820+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2821 else
2822 ld_shlibs=no
2823 fi
2824@@ -9151,8 +9665,8 @@ _LT_EOF
2825
2826 *)
2827 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2828- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2829- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2830+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2831+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2832 else
2833 ld_shlibs=no
2834 fi
2835@@ -9282,7 +9796,13 @@ _LT_EOF
2836 allow_undefined_flag='-berok'
2837 # Determine the default libpath from the value encoded in an
2838 # empty executable.
2839- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2840+ if test "${lt_cv_aix_libpath+set}" = set; then
2841+ aix_libpath=$lt_cv_aix_libpath
2842+else
2843+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2844+ $as_echo_n "(cached) " >&6
2845+else
2846+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2847 /* end confdefs.h. */
2848
2849 int
2850@@ -9295,22 +9815,29 @@ main ()
2851 _ACEOF
2852 if ac_fn_c_try_link "$LINENO"; then :
2853
2854-lt_aix_libpath_sed='
2855- /Import File Strings/,/^$/ {
2856- /^0/ {
2857- s/^0 *\(.*\)$/\1/
2858- p
2859- }
2860- }'
2861-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2862-# Check for a 64-bit object if we didn't find anything.
2863-if test -z "$aix_libpath"; then
2864- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2865-fi
2866+ lt_aix_libpath_sed='
2867+ /Import File Strings/,/^$/ {
2868+ /^0/ {
2869+ s/^0 *\([^ ]*\) *$/\1/
2870+ p
2871+ }
2872+ }'
2873+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2874+ # Check for a 64-bit object if we didn't find anything.
2875+ if test -z "$lt_cv_aix_libpath_"; then
2876+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2877+ fi
2878 fi
2879 rm -f core conftest.err conftest.$ac_objext \
2880 conftest$ac_exeext conftest.$ac_ext
2881-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2882+ if test -z "$lt_cv_aix_libpath_"; then
2883+ lt_cv_aix_libpath_="/usr/lib:/lib"
2884+ fi
2885+
2886+fi
2887+
2888+ aix_libpath=$lt_cv_aix_libpath_
2889+fi
2890
2891 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2892 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"
2893@@ -9322,7 +9849,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2894 else
2895 # Determine the default libpath from the value encoded in an
2896 # empty executable.
2897- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2898+ if test "${lt_cv_aix_libpath+set}" = set; then
2899+ aix_libpath=$lt_cv_aix_libpath
2900+else
2901+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2902+ $as_echo_n "(cached) " >&6
2903+else
2904+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2905 /* end confdefs.h. */
2906
2907 int
2908@@ -9335,22 +9868,29 @@ main ()
2909 _ACEOF
2910 if ac_fn_c_try_link "$LINENO"; then :
2911
2912-lt_aix_libpath_sed='
2913- /Import File Strings/,/^$/ {
2914- /^0/ {
2915- s/^0 *\(.*\)$/\1/
2916- p
2917- }
2918- }'
2919-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2920-# Check for a 64-bit object if we didn't find anything.
2921-if test -z "$aix_libpath"; then
2922- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2923-fi
2924+ lt_aix_libpath_sed='
2925+ /Import File Strings/,/^$/ {
2926+ /^0/ {
2927+ s/^0 *\([^ ]*\) *$/\1/
2928+ p
2929+ }
2930+ }'
2931+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2932+ # Check for a 64-bit object if we didn't find anything.
2933+ if test -z "$lt_cv_aix_libpath_"; then
2934+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2935+ fi
2936 fi
2937 rm -f core conftest.err conftest.$ac_objext \
2938 conftest$ac_exeext conftest.$ac_ext
2939-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2940+ if test -z "$lt_cv_aix_libpath_"; then
2941+ lt_cv_aix_libpath_="/usr/lib:/lib"
2942+ fi
2943+
2944+fi
2945+
2946+ aix_libpath=$lt_cv_aix_libpath_
2947+fi
2948
2949 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2950 # Warning - without using the other run time loading flags,
2951@@ -9395,20 +9935,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2952 # Microsoft Visual C++.
2953 # hardcode_libdir_flag_spec is actually meaningless, as there is
2954 # no search path for DLLs.
2955- hardcode_libdir_flag_spec=' '
2956- allow_undefined_flag=unsupported
2957- # Tell ltmain to make .lib files, not .a files.
2958- libext=lib
2959- # Tell ltmain to make .dll files, not .so files.
2960- shrext_cmds=".dll"
2961- # FIXME: Setting linknames here is a bad hack.
2962- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2963- # The linker will automatically build a .lib file if we build a DLL.
2964- old_archive_from_new_cmds='true'
2965- # FIXME: Should let the user specify the lib program.
2966- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2967- fix_srcfile_path='`cygpath -w "$srcfile"`'
2968- enable_shared_with_static_runtimes=yes
2969+ case $cc_basename in
2970+ cl*)
2971+ # Native MSVC
2972+ hardcode_libdir_flag_spec=' '
2973+ allow_undefined_flag=unsupported
2974+ always_export_symbols=yes
2975+ file_list_spec='@'
2976+ # Tell ltmain to make .lib files, not .a files.
2977+ libext=lib
2978+ # Tell ltmain to make .dll files, not .so files.
2979+ shrext_cmds=".dll"
2980+ # FIXME: Setting linknames here is a bad hack.
2981+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2982+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2983+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2984+ else
2985+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2986+ fi~
2987+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2988+ linknames='
2989+ # The linker will not automatically build a static lib if we build a DLL.
2990+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
2991+ enable_shared_with_static_runtimes=yes
2992+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2993+ # Don't use ranlib
2994+ old_postinstall_cmds='chmod 644 $oldlib'
2995+ postlink_cmds='lt_outputfile="@OUTPUT@"~
2996+ lt_tool_outputfile="@TOOL_OUTPUT@"~
2997+ case $lt_outputfile in
2998+ *.exe|*.EXE) ;;
2999+ *)
3000+ lt_outputfile="$lt_outputfile.exe"
3001+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3002+ ;;
3003+ esac~
3004+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3005+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3006+ $RM "$lt_outputfile.manifest";
3007+ fi'
3008+ ;;
3009+ *)
3010+ # Assume MSVC wrapper
3011+ hardcode_libdir_flag_spec=' '
3012+ allow_undefined_flag=unsupported
3013+ # Tell ltmain to make .lib files, not .a files.
3014+ libext=lib
3015+ # Tell ltmain to make .dll files, not .so files.
3016+ shrext_cmds=".dll"
3017+ # FIXME: Setting linknames here is a bad hack.
3018+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3019+ # The linker will automatically build a .lib file if we build a DLL.
3020+ old_archive_from_new_cmds='true'
3021+ # FIXME: Should let the user specify the lib program.
3022+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3023+ enable_shared_with_static_runtimes=yes
3024+ ;;
3025+ esac
3026 ;;
3027
3028 darwin* | rhapsody*)
3029@@ -9469,7 +10052,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3030
3031 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3032 freebsd* | dragonfly*)
3033- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3034+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3035 hardcode_libdir_flag_spec='-R$libdir'
3036 hardcode_direct=yes
3037 hardcode_shlibpath_var=no
3038@@ -9477,7 +10060,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3039
3040 hpux9*)
3041 if test "$GCC" = yes; then
3042- 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'
3043+ 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'
3044 else
3045 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'
3046 fi
3047@@ -9493,7 +10076,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3048
3049 hpux10*)
3050 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3051- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3052+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3053 else
3054 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3055 fi
3056@@ -9517,10 +10100,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3057 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3058 ;;
3059 ia64*)
3060- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3061+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3062 ;;
3063 *)
3064- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3065+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3066 ;;
3067 esac
3068 else
3069@@ -9599,23 +10182,36 @@ fi
3070
3071 irix5* | irix6* | nonstopux*)
3072 if test "$GCC" = yes; then
3073- 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'
3074+ 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'
3075 # Try to use the -exported_symbol ld option, if it does not
3076 # work, assume that -exports_file does not work either and
3077 # implicitly export all symbols.
3078- save_LDFLAGS="$LDFLAGS"
3079- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3080- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3081+ # This should be the same for all languages, so no per-tag cache variable.
3082+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3083+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3084+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
3085+ $as_echo_n "(cached) " >&6
3086+else
3087+ save_LDFLAGS="$LDFLAGS"
3088+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3089+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3090 /* end confdefs.h. */
3091-int foo(void) {}
3092+int foo (void) { return 0; }
3093 _ACEOF
3094 if ac_fn_c_try_link "$LINENO"; then :
3095- 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'
3096-
3097+ lt_cv_irix_exported_symbol=yes
3098+else
3099+ lt_cv_irix_exported_symbol=no
3100 fi
3101 rm -f core conftest.err conftest.$ac_objext \
3102 conftest$ac_exeext conftest.$ac_ext
3103- LDFLAGS="$save_LDFLAGS"
3104+ LDFLAGS="$save_LDFLAGS"
3105+fi
3106+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3107+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3108+ if test "$lt_cv_irix_exported_symbol" = yes; then
3109+ 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'
3110+ fi
3111 else
3112 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'
3113 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'
3114@@ -9700,7 +10296,7 @@ rm -f core conftest.err conftest.$ac_objext \
3115 osf4* | osf5*) # as osf3* with the addition of -msym flag
3116 if test "$GCC" = yes; then
3117 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3118- 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'
3119+ 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'
3120 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3121 else
3122 allow_undefined_flag=' -expect_unresolved \*'
3123@@ -9719,9 +10315,9 @@ rm -f core conftest.err conftest.$ac_objext \
3124 no_undefined_flag=' -z defs'
3125 if test "$GCC" = yes; then
3126 wlarc='${wl}'
3127- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3128+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3129 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3130- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3131+ $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'
3132 else
3133 case `$CC -V 2>&1` in
3134 *"Compilers 5.0"*)
3135@@ -10297,8 +10893,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3136 need_version=no
3137 need_lib_prefix=no
3138
3139- case $GCC,$host_os in
3140- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3141+ case $GCC,$cc_basename in
3142+ yes,*)
3143+ # gcc
3144 library_names_spec='$libname.dll.a'
3145 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3146 postinstall_cmds='base_file=`basename \${file}`~
3147@@ -10331,13 +10928,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3148 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3149 ;;
3150 esac
3151+ dynamic_linker='Win32 ld.exe'
3152+ ;;
3153+
3154+ *,cl*)
3155+ # Native MSVC
3156+ libname_spec='$name'
3157+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3158+ library_names_spec='${libname}.dll.lib'
3159+
3160+ case $build_os in
3161+ mingw*)
3162+ sys_lib_search_path_spec=
3163+ lt_save_ifs=$IFS
3164+ IFS=';'
3165+ for lt_path in $LIB
3166+ do
3167+ IFS=$lt_save_ifs
3168+ # Let DOS variable expansion print the short 8.3 style file name.
3169+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3170+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3171+ done
3172+ IFS=$lt_save_ifs
3173+ # Convert to MSYS style.
3174+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3175+ ;;
3176+ cygwin*)
3177+ # Convert to unix form, then to dos form, then back to unix form
3178+ # but this time dos style (no spaces!) so that the unix form looks
3179+ # like /cygdrive/c/PROGRA~1:/cygdr...
3180+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3181+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3182+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3183+ ;;
3184+ *)
3185+ sys_lib_search_path_spec="$LIB"
3186+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3187+ # It is most probably a Windows format PATH.
3188+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3189+ else
3190+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3191+ fi
3192+ # FIXME: find the short name or the path components, as spaces are
3193+ # common. (e.g. "Program Files" -> "PROGRA~1")
3194+ ;;
3195+ esac
3196+
3197+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3198+ postinstall_cmds='base_file=`basename \${file}`~
3199+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3200+ dldir=$destdir/`dirname \$dlpath`~
3201+ test -d \$dldir || mkdir -p \$dldir~
3202+ $install_prog $dir/$dlname \$dldir/$dlname'
3203+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3204+ dlpath=$dir/\$dldll~
3205+ $RM \$dlpath'
3206+ shlibpath_overrides_runpath=yes
3207+ dynamic_linker='Win32 link.exe'
3208 ;;
3209
3210 *)
3211+ # Assume MSVC wrapper
3212 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3213+ dynamic_linker='Win32 ld.exe'
3214 ;;
3215 esac
3216- dynamic_linker='Win32 ld.exe'
3217 # FIXME: first we should search . and the directory the executable is in
3218 shlibpath_var=PATH
3219 ;;
3220@@ -10429,7 +11084,7 @@ haiku*)
3221 soname_spec='${libname}${release}${shared_ext}$major'
3222 shlibpath_var=LIBRARY_PATH
3223 shlibpath_overrides_runpath=yes
3224- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3225+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3226 hardcode_into_libs=yes
3227 ;;
3228
3229@@ -11269,10 +11924,10 @@ else
3230 /* When -fvisbility=hidden is used, assume the code has been annotated
3231 correspondingly for the symbols needed. */
3232 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3233-void fnord () __attribute__((visibility("default")));
3234+int fnord () __attribute__((visibility("default")));
3235 #endif
3236
3237-void fnord () { int i=42; }
3238+int fnord () { return 42; }
3239 int main ()
3240 {
3241 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3242@@ -11375,10 +12030,10 @@ else
3243 /* When -fvisbility=hidden is used, assume the code has been annotated
3244 correspondingly for the symbols needed. */
3245 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3246-void fnord () __attribute__((visibility("default")));
3247+int fnord () __attribute__((visibility("default")));
3248 #endif
3249
3250-void fnord () { int i=42; }
3251+int fnord () { return 42; }
3252 int main ()
3253 {
3254 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3255@@ -15392,13 +16047,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3256 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3257 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3258 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3259+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3260+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3261 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3262 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3263 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3264 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3265 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3266+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3267+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3268+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3269+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3270 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3271 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3272+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3273 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3274 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3275 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3276@@ -15413,14 +16075,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3277 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3278 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3279 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"`'
3280+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3281+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3282 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3283 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3284 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3285-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3286 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3287+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3288 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3289 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3290 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3291+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3292 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3293 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3294 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3295@@ -15453,12 +16118,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3296 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3297 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3298 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3299-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3300 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3301 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3302 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3303 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3304 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3305+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3306 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3307 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3308 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3309@@ -15513,8 +16178,13 @@ reload_flag \
3310 OBJDUMP \
3311 deplibs_check_method \
3312 file_magic_cmd \
3313+file_magic_glob \
3314+want_nocaseglob \
3315+DLLTOOL \
3316+sharedlib_from_linklib_cmd \
3317 AR \
3318 AR_FLAGS \
3319+archiver_list_spec \
3320 STRIP \
3321 RANLIB \
3322 CC \
3323@@ -15524,12 +16194,14 @@ lt_cv_sys_global_symbol_pipe \
3324 lt_cv_sys_global_symbol_to_cdecl \
3325 lt_cv_sys_global_symbol_to_c_name_address \
3326 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3327+nm_file_list_spec \
3328 lt_prog_compiler_no_builtin_flag \
3329-lt_prog_compiler_wl \
3330 lt_prog_compiler_pic \
3331+lt_prog_compiler_wl \
3332 lt_prog_compiler_static \
3333 lt_cv_prog_compiler_c_o \
3334 need_locks \
3335+MANIFEST_TOOL \
3336 DSYMUTIL \
3337 NMEDIT \
3338 LIPO \
3339@@ -15545,7 +16217,6 @@ no_undefined_flag \
3340 hardcode_libdir_flag_spec \
3341 hardcode_libdir_flag_spec_ld \
3342 hardcode_libdir_separator \
3343-fix_srcfile_path \
3344 exclude_expsyms \
3345 include_expsyms \
3346 file_list_spec \
3347@@ -15581,6 +16252,7 @@ module_cmds \
3348 module_expsym_cmds \
3349 export_symbols_cmds \
3350 prelink_cmds \
3351+postlink_cmds \
3352 postinstall_cmds \
3353 postuninstall_cmds \
3354 finish_cmds \
3355@@ -16338,7 +17010,8 @@ $as_echo X"$file" |
3356 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3357 #
3358 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3359-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3360+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3361+# Inc.
3362 # Written by Gordon Matzigkeit, 1996
3363 #
3364 # This file is part of GNU Libtool.
3365@@ -16441,19 +17114,42 @@ SP2NL=$lt_lt_SP2NL
3366 # turn newlines into spaces.
3367 NL2SP=$lt_lt_NL2SP
3368
3369+# convert \$build file names to \$host format.
3370+to_host_file_cmd=$lt_cv_to_host_file_cmd
3371+
3372+# convert \$build files to toolchain format.
3373+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3374+
3375 # An object symbol dumper.
3376 OBJDUMP=$lt_OBJDUMP
3377
3378 # Method to check whether dependent libraries are shared objects.
3379 deplibs_check_method=$lt_deplibs_check_method
3380
3381-# Command to use when deplibs_check_method == "file_magic".
3382+# Command to use when deplibs_check_method = "file_magic".
3383 file_magic_cmd=$lt_file_magic_cmd
3384
3385+# How to find potential files when deplibs_check_method = "file_magic".
3386+file_magic_glob=$lt_file_magic_glob
3387+
3388+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3389+want_nocaseglob=$lt_want_nocaseglob
3390+
3391+# DLL creation program.
3392+DLLTOOL=$lt_DLLTOOL
3393+
3394+# Command to associate shared and link libraries.
3395+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3396+
3397 # The archiver.
3398 AR=$lt_AR
3399+
3400+# Flags to create an archive.
3401 AR_FLAGS=$lt_AR_FLAGS
3402
3403+# How to feed a file listing to the archiver.
3404+archiver_list_spec=$lt_archiver_list_spec
3405+
3406 # A symbol stripping program.
3407 STRIP=$lt_STRIP
3408
3409@@ -16483,6 +17179,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3410 # Transform the output of nm in a C name address pair when lib prefix is needed.
3411 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3412
3413+# Specify filename containing input files for \$NM.
3414+nm_file_list_spec=$lt_nm_file_list_spec
3415+
3416+# The root where to search for dependent libraries,and in which our libraries should be installed.
3417+lt_sysroot=$lt_sysroot
3418+
3419 # The name of the directory that contains temporary libtool files.
3420 objdir=$objdir
3421
3422@@ -16492,6 +17194,9 @@ MAGIC_CMD=$MAGIC_CMD
3423 # Must we lock files when doing compilation?
3424 need_locks=$lt_need_locks
3425
3426+# Manifest tool.
3427+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3428+
3429 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3430 DSYMUTIL=$lt_DSYMUTIL
3431
3432@@ -16606,12 +17311,12 @@ with_gcc=$GCC
3433 # Compiler flag to turn off builtin functions.
3434 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3435
3436-# How to pass a linker flag through the compiler.
3437-wl=$lt_lt_prog_compiler_wl
3438-
3439 # Additional compiler flags for building library objects.
3440 pic_flag=$lt_lt_prog_compiler_pic
3441
3442+# How to pass a linker flag through the compiler.
3443+wl=$lt_lt_prog_compiler_wl
3444+
3445 # Compiler flag to prevent dynamic linking.
3446 link_static_flag=$lt_lt_prog_compiler_static
3447
3448@@ -16698,9 +17403,6 @@ inherit_rpath=$inherit_rpath
3449 # Whether libtool must link a program against all its dependency libraries.
3450 link_all_deplibs=$link_all_deplibs
3451
3452-# Fix the shell variable \$srcfile for the compiler.
3453-fix_srcfile_path=$lt_fix_srcfile_path
3454-
3455 # Set to "yes" if exported symbols are required.
3456 always_export_symbols=$always_export_symbols
3457
3458@@ -16716,6 +17418,9 @@ include_expsyms=$lt_include_expsyms
3459 # Commands necessary for linking programs (against libraries) with templates.
3460 prelink_cmds=$lt_prelink_cmds
3461
3462+# Commands necessary for finishing linking programs.
3463+postlink_cmds=$lt_postlink_cmds
3464+
3465 # Specify filename containing input files.
3466 file_list_spec=$lt_file_list_spec
3467
3468@@ -16748,210 +17453,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3469 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3470 # text mode, it properly converts lines to CR/LF. This bash problem
3471 # is reportedly fixed, but why not run on old versions too?
3472- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3473- || (rm -f "$cfgfile"; exit 1)
3474-
3475- case $xsi_shell in
3476- yes)
3477- cat << \_LT_EOF >> "$cfgfile"
3478-
3479-# func_dirname file append nondir_replacement
3480-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3481-# otherwise set result to NONDIR_REPLACEMENT.
3482-func_dirname ()
3483-{
3484- case ${1} in
3485- */*) func_dirname_result="${1%/*}${2}" ;;
3486- * ) func_dirname_result="${3}" ;;
3487- esac
3488-}
3489-
3490-# func_basename file
3491-func_basename ()
3492-{
3493- func_basename_result="${1##*/}"
3494-}
3495-
3496-# func_dirname_and_basename file append nondir_replacement
3497-# perform func_basename and func_dirname in a single function
3498-# call:
3499-# dirname: Compute the dirname of FILE. If nonempty,
3500-# add APPEND to the result, otherwise set result
3501-# to NONDIR_REPLACEMENT.
3502-# value returned in "$func_dirname_result"
3503-# basename: Compute filename of FILE.
3504-# value retuned in "$func_basename_result"
3505-# Implementation must be kept synchronized with func_dirname
3506-# and func_basename. For efficiency, we do not delegate to
3507-# those functions but instead duplicate the functionality here.
3508-func_dirname_and_basename ()
3509-{
3510- case ${1} in
3511- */*) func_dirname_result="${1%/*}${2}" ;;
3512- * ) func_dirname_result="${3}" ;;
3513- esac
3514- func_basename_result="${1##*/}"
3515-}
3516-
3517-# func_stripname prefix suffix name
3518-# strip PREFIX and SUFFIX off of NAME.
3519-# PREFIX and SUFFIX must not contain globbing or regex special
3520-# characters, hashes, percent signs, but SUFFIX may contain a leading
3521-# dot (in which case that matches only a dot).
3522-func_stripname ()
3523-{
3524- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3525- # positional parameters, so assign one to ordinary parameter first.
3526- func_stripname_result=${3}
3527- func_stripname_result=${func_stripname_result#"${1}"}
3528- func_stripname_result=${func_stripname_result%"${2}"}
3529-}
3530-
3531-# func_opt_split
3532-func_opt_split ()
3533-{
3534- func_opt_split_opt=${1%%=*}
3535- func_opt_split_arg=${1#*=}
3536-}
3537-
3538-# func_lo2o object
3539-func_lo2o ()
3540-{
3541- case ${1} in
3542- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3543- *) func_lo2o_result=${1} ;;
3544- esac
3545-}
3546-
3547-# func_xform libobj-or-source
3548-func_xform ()
3549-{
3550- func_xform_result=${1%.*}.lo
3551-}
3552-
3553-# func_arith arithmetic-term...
3554-func_arith ()
3555-{
3556- func_arith_result=$(( $* ))
3557-}
3558-
3559-# func_len string
3560-# STRING may not start with a hyphen.
3561-func_len ()
3562-{
3563- func_len_result=${#1}
3564-}
3565-
3566-_LT_EOF
3567- ;;
3568- *) # Bourne compatible functions.
3569- cat << \_LT_EOF >> "$cfgfile"
3570-
3571-# func_dirname file append nondir_replacement
3572-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3573-# otherwise set result to NONDIR_REPLACEMENT.
3574-func_dirname ()
3575-{
3576- # Extract subdirectory from the argument.
3577- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3578- if test "X$func_dirname_result" = "X${1}"; then
3579- func_dirname_result="${3}"
3580- else
3581- func_dirname_result="$func_dirname_result${2}"
3582- fi
3583-}
3584-
3585-# func_basename file
3586-func_basename ()
3587-{
3588- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3589-}
3590-
3591-
3592-# func_stripname prefix suffix name
3593-# strip PREFIX and SUFFIX off of NAME.
3594-# PREFIX and SUFFIX must not contain globbing or regex special
3595-# characters, hashes, percent signs, but SUFFIX may contain a leading
3596-# dot (in which case that matches only a dot).
3597-# func_strip_suffix prefix name
3598-func_stripname ()
3599-{
3600- case ${2} in
3601- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3602- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3603- esac
3604-}
3605-
3606-# sed scripts:
3607-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3608-my_sed_long_arg='1s/^-[^=]*=//'
3609-
3610-# func_opt_split
3611-func_opt_split ()
3612-{
3613- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3614- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3615-}
3616-
3617-# func_lo2o object
3618-func_lo2o ()
3619-{
3620- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3621-}
3622-
3623-# func_xform libobj-or-source
3624-func_xform ()
3625-{
3626- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3627-}
3628-
3629-# func_arith arithmetic-term...
3630-func_arith ()
3631-{
3632- func_arith_result=`expr "$@"`
3633-}
3634-
3635-# func_len string
3636-# STRING may not start with a hyphen.
3637-func_len ()
3638-{
3639- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3640-}
3641-
3642-_LT_EOF
3643-esac
3644-
3645-case $lt_shell_append in
3646- yes)
3647- cat << \_LT_EOF >> "$cfgfile"
3648-
3649-# func_append var value
3650-# Append VALUE to the end of shell variable VAR.
3651-func_append ()
3652-{
3653- eval "$1+=\$2"
3654-}
3655-_LT_EOF
3656- ;;
3657- *)
3658- cat << \_LT_EOF >> "$cfgfile"
3659-
3660-# func_append var value
3661-# Append VALUE to the end of shell variable VAR.
3662-func_append ()
3663-{
3664- eval "$1=\$$1\$2"
3665-}
3666-
3667-_LT_EOF
3668- ;;
3669- esac
3670-
3671-
3672- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3673- || (rm -f "$cfgfile"; exit 1)
3674-
3675- mv -f "$cfgfile" "$ofile" ||
3676+ sed '$q' "$ltmain" >> "$cfgfile" \
3677+ || (rm -f "$cfgfile"; exit 1)
3678+
3679+ if test x"$xsi_shell" = xyes; then
3680+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3681+func_dirname ()\
3682+{\
3683+\ case ${1} in\
3684+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3685+\ * ) func_dirname_result="${3}" ;;\
3686+\ esac\
3687+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3688+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3689+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3690+test 0 -eq $? || _lt_function_replace_fail=:
3691+
3692+
3693+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3694+func_basename ()\
3695+{\
3696+\ func_basename_result="${1##*/}"\
3697+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3698+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3699+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3700+test 0 -eq $? || _lt_function_replace_fail=:
3701+
3702+
3703+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3704+func_dirname_and_basename ()\
3705+{\
3706+\ case ${1} in\
3707+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3708+\ * ) func_dirname_result="${3}" ;;\
3709+\ esac\
3710+\ func_basename_result="${1##*/}"\
3711+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3712+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3713+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3714+test 0 -eq $? || _lt_function_replace_fail=:
3715+
3716+
3717+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3718+func_stripname ()\
3719+{\
3720+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3721+\ # positional parameters, so assign one to ordinary parameter first.\
3722+\ func_stripname_result=${3}\
3723+\ func_stripname_result=${func_stripname_result#"${1}"}\
3724+\ func_stripname_result=${func_stripname_result%"${2}"}\
3725+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3726+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3727+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3728+test 0 -eq $? || _lt_function_replace_fail=:
3729+
3730+
3731+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3732+func_split_long_opt ()\
3733+{\
3734+\ func_split_long_opt_name=${1%%=*}\
3735+\ func_split_long_opt_arg=${1#*=}\
3736+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3737+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3738+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3739+test 0 -eq $? || _lt_function_replace_fail=:
3740+
3741+
3742+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3743+func_split_short_opt ()\
3744+{\
3745+\ func_split_short_opt_arg=${1#??}\
3746+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3747+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3748+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3749+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3750+test 0 -eq $? || _lt_function_replace_fail=:
3751+
3752+
3753+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3754+func_lo2o ()\
3755+{\
3756+\ case ${1} in\
3757+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3758+\ *) func_lo2o_result=${1} ;;\
3759+\ esac\
3760+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3761+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3762+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3763+test 0 -eq $? || _lt_function_replace_fail=:
3764+
3765+
3766+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3767+func_xform ()\
3768+{\
3769+ func_xform_result=${1%.*}.lo\
3770+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3771+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3772+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3773+test 0 -eq $? || _lt_function_replace_fail=:
3774+
3775+
3776+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3777+func_arith ()\
3778+{\
3779+ func_arith_result=$(( $* ))\
3780+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3781+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3782+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3783+test 0 -eq $? || _lt_function_replace_fail=:
3784+
3785+
3786+ sed -e '/^func_len ()$/,/^} # func_len /c\
3787+func_len ()\
3788+{\
3789+ func_len_result=${#1}\
3790+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3791+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3792+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3793+test 0 -eq $? || _lt_function_replace_fail=:
3794+
3795+fi
3796+
3797+if test x"$lt_shell_append" = xyes; then
3798+ sed -e '/^func_append ()$/,/^} # func_append /c\
3799+func_append ()\
3800+{\
3801+ eval "${1}+=\\${2}"\
3802+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3803+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3804+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3805+test 0 -eq $? || _lt_function_replace_fail=:
3806+
3807+
3808+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3809+func_append_quoted ()\
3810+{\
3811+\ func_quote_for_eval "${2}"\
3812+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3813+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3814+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3815+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3816+test 0 -eq $? || _lt_function_replace_fail=:
3817+
3818+
3819+ # Save a `func_append' function call where possible by direct use of '+='
3820+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3821+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3822+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3823+ test 0 -eq $? || _lt_function_replace_fail=:
3824+else
3825+ # Save a `func_append' function call even when '+=' is not available
3826+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3827+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3828+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3829+ test 0 -eq $? || _lt_function_replace_fail=:
3830+fi
3831+
3832+if test x"$_lt_function_replace_fail" = x":"; then
3833+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3834+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3835+fi
3836+
3837+
3838+ mv -f "$cfgfile" "$ofile" ||
3839 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3840 chmod +x "$ofile"
3841
3842diff --git a/configure b/configure
3843index 2a74a77..ad3dfb7 100755
3844--- a/configure
3845+++ b/configure
3846@@ -3444,7 +3444,7 @@ case "${target}" in
3847 ;;
3848 s390-*-* | s390x-*-*)
3849 ;;
3850- sh*-*-* | sh[34]*-*-*)
3851+ sh-*-* | sh[34]*-*-*)
3852 ;;
3853 sh64-*-* | sh5*-*-*)
3854 ;;
3855@@ -3946,7 +3946,7 @@ case "${target}" in
3856 or1k*-*-*)
3857 noconfigdirs="$noconfigdirs gdb"
3858 ;;
3859- sh*-*-* | sh64-*-*)
3860+ sh-*-* | sh64-*-*)
3861 case "${target}" in
3862 sh*-*-elf)
3863 ;;
3864diff --git a/gas/configure b/gas/configure
3865index f7753b8..45da030 100755
3866--- a/gas/configure
3867+++ b/gas/configure
3868@@ -648,8 +648,11 @@ OTOOL
3869 LIPO
3870 NMEDIT
3871 DSYMUTIL
3872+MANIFEST_TOOL
3873 RANLIB
3874+ac_ct_AR
3875 AR
3876+DLLTOOL
3877 OBJDUMP
3878 LN_S
3879 NM
3880@@ -761,6 +764,7 @@ enable_static
3881 with_pic
3882 enable_fast_install
3883 with_gnu_ld
3884+with_libtool_sysroot
3885 enable_libtool_lock
3886 enable_plugins
3887 enable_largefile
3888@@ -4919,8 +4923,8 @@ esac
3889
3890
3891
3892-macro_version='2.2.7a'
3893-macro_revision='1.3134'
3894+macro_version='2.4'
3895+macro_revision='1.3293'
3896
3897
3898
3899@@ -4960,7 +4964,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3901 $as_echo_n "checking how to print strings... " >&6; }
3902 # Test print first, because it will be a builtin if present.
3903-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3904+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3905 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3906 ECHO='print -r --'
3907 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3908@@ -5646,8 +5650,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3909 # Try some XSI features
3910 xsi_shell=no
3911 ( _lt_dummy="a/b/c"
3912- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3913- = c,a/b,, \
3914+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3915+ = c,a/b,b/c, \
3916 && eval 'test $(( 1 + 1 )) -eq 2 \
3917 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3918 && xsi_shell=yes
3919@@ -5696,6 +5700,80 @@ esac
3920
3921
3922
3923+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3924+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3925+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
3926+ $as_echo_n "(cached) " >&6
3927+else
3928+ case $host in
3929+ *-*-mingw* )
3930+ case $build in
3931+ *-*-mingw* ) # actually msys
3932+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3933+ ;;
3934+ *-*-cygwin* )
3935+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3936+ ;;
3937+ * ) # otherwise, assume *nix
3938+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3939+ ;;
3940+ esac
3941+ ;;
3942+ *-*-cygwin* )
3943+ case $build in
3944+ *-*-mingw* ) # actually msys
3945+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3946+ ;;
3947+ *-*-cygwin* )
3948+ lt_cv_to_host_file_cmd=func_convert_file_noop
3949+ ;;
3950+ * ) # otherwise, assume *nix
3951+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3952+ ;;
3953+ esac
3954+ ;;
3955+ * ) # unhandled hosts (and "normal" native builds)
3956+ lt_cv_to_host_file_cmd=func_convert_file_noop
3957+ ;;
3958+esac
3959+
3960+fi
3961+
3962+to_host_file_cmd=$lt_cv_to_host_file_cmd
3963+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3964+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3965+
3966+
3967+
3968+
3969+
3970+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3971+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3972+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
3973+ $as_echo_n "(cached) " >&6
3974+else
3975+ #assume ordinary cross tools, or native build.
3976+lt_cv_to_tool_file_cmd=func_convert_file_noop
3977+case $host in
3978+ *-*-mingw* )
3979+ case $build in
3980+ *-*-mingw* ) # actually msys
3981+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3982+ ;;
3983+ esac
3984+ ;;
3985+esac
3986+
3987+fi
3988+
3989+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3990+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
3991+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
3992+
3993+
3994+
3995+
3996+
3997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3998 $as_echo_n "checking for $LD option to reload object files... " >&6; }
3999 if test "${lt_cv_ld_reload_flag+set}" = set; then :
4000@@ -5712,6 +5790,11 @@ case $reload_flag in
4001 esac
4002 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4003 case $host_os in
4004+ cygwin* | mingw* | pw32* | cegcc*)
4005+ if test "$GCC" != yes; then
4006+ reload_cmds=false
4007+ fi
4008+ ;;
4009 darwin*)
4010 if test "$GCC" = yes; then
4011 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4012@@ -5880,7 +5963,8 @@ mingw* | pw32*)
4013 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4014 lt_cv_file_magic_cmd='func_win32_libid'
4015 else
4016- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4017+ # Keep this pattern in sync with the one in func_win32_libid.
4018+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4019 lt_cv_file_magic_cmd='$OBJDUMP -f'
4020 fi
4021 ;;
4022@@ -6034,6 +6118,21 @@ esac
4023 fi
4024 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4025 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4026+
4027+file_magic_glob=
4028+want_nocaseglob=no
4029+if test "$build" = "$host"; then
4030+ case $host_os in
4031+ mingw* | pw32*)
4032+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4033+ want_nocaseglob=yes
4034+ else
4035+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4036+ fi
4037+ ;;
4038+ esac
4039+fi
4040+
4041 file_magic_cmd=$lt_cv_file_magic_cmd
4042 deplibs_check_method=$lt_cv_deplibs_check_method
4043 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4044@@ -6049,9 +6148,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4045
4046
4047
4048+
4049+
4050+
4051+
4052+
4053+
4054+
4055+
4056+
4057+
4058+if test -n "$ac_tool_prefix"; then
4059+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4060+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4061+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4062+$as_echo_n "checking for $ac_word... " >&6; }
4063+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
4064+ $as_echo_n "(cached) " >&6
4065+else
4066+ if test -n "$DLLTOOL"; then
4067+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4068+else
4069+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4070+for as_dir in $PATH
4071+do
4072+ IFS=$as_save_IFS
4073+ test -z "$as_dir" && as_dir=.
4074+ for ac_exec_ext in '' $ac_executable_extensions; do
4075+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4076+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4077+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4078+ break 2
4079+ fi
4080+done
4081+ done
4082+IFS=$as_save_IFS
4083+
4084+fi
4085+fi
4086+DLLTOOL=$ac_cv_prog_DLLTOOL
4087+if test -n "$DLLTOOL"; then
4088+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4089+$as_echo "$DLLTOOL" >&6; }
4090+else
4091+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4092+$as_echo "no" >&6; }
4093+fi
4094+
4095+
4096+fi
4097+if test -z "$ac_cv_prog_DLLTOOL"; then
4098+ ac_ct_DLLTOOL=$DLLTOOL
4099+ # Extract the first word of "dlltool", so it can be a program name with args.
4100+set dummy dlltool; ac_word=$2
4101+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4102+$as_echo_n "checking for $ac_word... " >&6; }
4103+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
4104+ $as_echo_n "(cached) " >&6
4105+else
4106+ if test -n "$ac_ct_DLLTOOL"; then
4107+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4108+else
4109+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4110+for as_dir in $PATH
4111+do
4112+ IFS=$as_save_IFS
4113+ test -z "$as_dir" && as_dir=.
4114+ for ac_exec_ext in '' $ac_executable_extensions; do
4115+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4116+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4117+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4118+ break 2
4119+ fi
4120+done
4121+ done
4122+IFS=$as_save_IFS
4123+
4124+fi
4125+fi
4126+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4127+if test -n "$ac_ct_DLLTOOL"; then
4128+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4129+$as_echo "$ac_ct_DLLTOOL" >&6; }
4130+else
4131+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4132+$as_echo "no" >&6; }
4133+fi
4134+
4135+ if test "x$ac_ct_DLLTOOL" = x; then
4136+ DLLTOOL="false"
4137+ else
4138+ case $cross_compiling:$ac_tool_warned in
4139+yes:)
4140+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4141+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4142+ac_tool_warned=yes ;;
4143+esac
4144+ DLLTOOL=$ac_ct_DLLTOOL
4145+ fi
4146+else
4147+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4148+fi
4149+
4150+test -z "$DLLTOOL" && DLLTOOL=dlltool
4151+
4152+
4153+
4154+
4155+
4156+
4157+
4158+
4159+
4160+
4161+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4162+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4163+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
4164+ $as_echo_n "(cached) " >&6
4165+else
4166+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4167+
4168+case $host_os in
4169+cygwin* | mingw* | pw32* | cegcc*)
4170+ # two different shell functions defined in ltmain.sh
4171+ # decide which to use based on capabilities of $DLLTOOL
4172+ case `$DLLTOOL --help 2>&1` in
4173+ *--identify-strict*)
4174+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4175+ ;;
4176+ *)
4177+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4178+ ;;
4179+ esac
4180+ ;;
4181+*)
4182+ # fallback: assume linklib IS sharedlib
4183+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4184+ ;;
4185+esac
4186+
4187+fi
4188+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4189+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4190+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4191+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4192+
4193+
4194+
4195+
4196+
4197+
4198+
4199 if test -n "$ac_tool_prefix"; then
4200- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4201-set dummy ${ac_tool_prefix}ar; ac_word=$2
4202+ for ac_prog in ar
4203+ do
4204+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4205+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4207 $as_echo_n "checking for $ac_word... " >&6; }
4208 if test "${ac_cv_prog_AR+set}" = set; then :
4209@@ -6067,7 +6319,7 @@ do
4210 test -z "$as_dir" && as_dir=.
4211 for ac_exec_ext in '' $ac_executable_extensions; do
4212 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4213- ac_cv_prog_AR="${ac_tool_prefix}ar"
4214+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4215 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4216 break 2
4217 fi
4218@@ -6087,11 +6339,15 @@ $as_echo "no" >&6; }
4219 fi
4220
4221
4222+ test -n "$AR" && break
4223+ done
4224 fi
4225-if test -z "$ac_cv_prog_AR"; then
4226+if test -z "$AR"; then
4227 ac_ct_AR=$AR
4228- # Extract the first word of "ar", so it can be a program name with args.
4229-set dummy ar; ac_word=$2
4230+ for ac_prog in ar
4231+do
4232+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4233+set dummy $ac_prog; ac_word=$2
4234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4235 $as_echo_n "checking for $ac_word... " >&6; }
4236 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4237@@ -6107,7 +6363,7 @@ do
4238 test -z "$as_dir" && as_dir=.
4239 for ac_exec_ext in '' $ac_executable_extensions; do
4240 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4241- ac_cv_prog_ac_ct_AR="ar"
4242+ ac_cv_prog_ac_ct_AR="$ac_prog"
4243 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4244 break 2
4245 fi
4246@@ -6126,6 +6382,10 @@ else
4247 $as_echo "no" >&6; }
4248 fi
4249
4250+
4251+ test -n "$ac_ct_AR" && break
4252+done
4253+
4254 if test "x$ac_ct_AR" = x; then
4255 AR="false"
4256 else
4257@@ -6137,12 +6397,10 @@ ac_tool_warned=yes ;;
4258 esac
4259 AR=$ac_ct_AR
4260 fi
4261-else
4262- AR="$ac_cv_prog_AR"
4263 fi
4264
4265-test -z "$AR" && AR=ar
4266-test -z "$AR_FLAGS" && AR_FLAGS=cru
4267+: ${AR=ar}
4268+: ${AR_FLAGS=cru}
4269
4270
4271
4272@@ -6154,6 +6412,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4273
4274
4275
4276+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4277+$as_echo_n "checking for archiver @FILE support... " >&6; }
4278+if test "${lt_cv_ar_at_file+set}" = set; then :
4279+ $as_echo_n "(cached) " >&6
4280+else
4281+ lt_cv_ar_at_file=no
4282+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4283+/* end confdefs.h. */
4284+
4285+int
4286+main ()
4287+{
4288+
4289+ ;
4290+ return 0;
4291+}
4292+_ACEOF
4293+if ac_fn_c_try_compile "$LINENO"; then :
4294+ echo conftest.$ac_objext > conftest.lst
4295+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4296+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4297+ (eval $lt_ar_try) 2>&5
4298+ ac_status=$?
4299+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4300+ test $ac_status = 0; }
4301+ if test "$ac_status" -eq 0; then
4302+ # Ensure the archiver fails upon bogus file names.
4303+ rm -f conftest.$ac_objext libconftest.a
4304+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4305+ (eval $lt_ar_try) 2>&5
4306+ ac_status=$?
4307+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4308+ test $ac_status = 0; }
4309+ if test "$ac_status" -ne 0; then
4310+ lt_cv_ar_at_file=@
4311+ fi
4312+ fi
4313+ rm -f conftest.* libconftest.a
4314+
4315+fi
4316+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4317+
4318+fi
4319+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4320+$as_echo "$lt_cv_ar_at_file" >&6; }
4321+
4322+if test "x$lt_cv_ar_at_file" = xno; then
4323+ archiver_list_spec=
4324+else
4325+ archiver_list_spec=$lt_cv_ar_at_file
4326+fi
4327+
4328+
4329+
4330+
4331+
4332+
4333+
4334 if test -n "$ac_tool_prefix"; then
4335 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4336 set dummy ${ac_tool_prefix}strip; ac_word=$2
4337@@ -6488,8 +6804,8 @@ esac
4338 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4339
4340 # Transform an extracted symbol line into symbol name and symbol address
4341-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4342-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'"
4343+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4344+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'"
4345
4346 # Handle CRLF in mingw tool chain
4347 opt_cr=
4348@@ -6525,6 +6841,7 @@ for ac_symprfx in "" "_"; do
4349 else
4350 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4351 fi
4352+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4353
4354 # Check to see that the pipe works correctly.
4355 pipe_works=no
4356@@ -6566,6 +6883,18 @@ _LT_EOF
4357 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4358 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4359 cat <<_LT_EOF > conftest.$ac_ext
4360+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4361+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4362+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4363+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4364+# define LT_DLSYM_CONST
4365+#elif defined(__osf__)
4366+/* This system does not cope well with relocations in const data. */
4367+# define LT_DLSYM_CONST
4368+#else
4369+# define LT_DLSYM_CONST const
4370+#endif
4371+
4372 #ifdef __cplusplus
4373 extern "C" {
4374 #endif
4375@@ -6577,7 +6906,7 @@ _LT_EOF
4376 cat <<_LT_EOF >> conftest.$ac_ext
4377
4378 /* The mapping between symbol names and symbols. */
4379-const struct {
4380+LT_DLSYM_CONST struct {
4381 const char *name;
4382 void *address;
4383 }
4384@@ -6603,8 +6932,8 @@ static const void *lt_preloaded_setup() {
4385 _LT_EOF
4386 # Now try linking the two files.
4387 mv conftest.$ac_objext conftstm.$ac_objext
4388- lt_save_LIBS="$LIBS"
4389- lt_save_CFLAGS="$CFLAGS"
4390+ lt_globsym_save_LIBS=$LIBS
4391+ lt_globsym_save_CFLAGS=$CFLAGS
4392 LIBS="conftstm.$ac_objext"
4393 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4394 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4395@@ -6614,8 +6943,8 @@ _LT_EOF
4396 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4397 pipe_works=yes
4398 fi
4399- LIBS="$lt_save_LIBS"
4400- CFLAGS="$lt_save_CFLAGS"
4401+ LIBS=$lt_globsym_save_LIBS
4402+ CFLAGS=$lt_globsym_save_CFLAGS
4403 else
4404 echo "cannot find nm_test_func in $nlist" >&5
4405 fi
4406@@ -6652,6 +6981,21 @@ else
4407 $as_echo "ok" >&6; }
4408 fi
4409
4410+# Response file support.
4411+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4412+ nm_file_list_spec='@'
4413+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4414+ nm_file_list_spec='@'
4415+fi
4416+
4417+
4418+
4419+
4420+
4421+
4422+
4423+
4424+
4425
4426
4427
4428@@ -6670,6 +7014,40 @@ fi
4429
4430
4431
4432+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4433+$as_echo_n "checking for sysroot... " >&6; }
4434+
4435+# Check whether --with-libtool-sysroot was given.
4436+if test "${with_libtool_sysroot+set}" = set; then :
4437+ withval=$with_libtool_sysroot;
4438+else
4439+ with_libtool_sysroot=no
4440+fi
4441+
4442+
4443+lt_sysroot=
4444+case ${with_libtool_sysroot} in #(
4445+ yes)
4446+ if test "$GCC" = yes; then
4447+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4448+ fi
4449+ ;; #(
4450+ /*)
4451+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4452+ ;; #(
4453+ no|'')
4454+ ;; #(
4455+ *)
4456+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4457+$as_echo "${with_libtool_sysroot}" >&6; }
4458+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
4459+ ;;
4460+esac
4461+
4462+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4463+$as_echo "${lt_sysroot:-no}" >&6; }
4464+
4465+
4466
4467
4468
4469@@ -6879,6 +7257,123 @@ esac
4470
4471 need_locks="$enable_libtool_lock"
4472
4473+if test -n "$ac_tool_prefix"; then
4474+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4475+set dummy ${ac_tool_prefix}mt; ac_word=$2
4476+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4477+$as_echo_n "checking for $ac_word... " >&6; }
4478+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
4479+ $as_echo_n "(cached) " >&6
4480+else
4481+ if test -n "$MANIFEST_TOOL"; then
4482+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4483+else
4484+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4485+for as_dir in $PATH
4486+do
4487+ IFS=$as_save_IFS
4488+ test -z "$as_dir" && as_dir=.
4489+ for ac_exec_ext in '' $ac_executable_extensions; do
4490+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4491+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4492+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4493+ break 2
4494+ fi
4495+done
4496+ done
4497+IFS=$as_save_IFS
4498+
4499+fi
4500+fi
4501+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4502+if test -n "$MANIFEST_TOOL"; then
4503+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4504+$as_echo "$MANIFEST_TOOL" >&6; }
4505+else
4506+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4507+$as_echo "no" >&6; }
4508+fi
4509+
4510+
4511+fi
4512+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4513+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4514+ # Extract the first word of "mt", so it can be a program name with args.
4515+set dummy mt; ac_word=$2
4516+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4517+$as_echo_n "checking for $ac_word... " >&6; }
4518+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
4519+ $as_echo_n "(cached) " >&6
4520+else
4521+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4522+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4523+else
4524+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4525+for as_dir in $PATH
4526+do
4527+ IFS=$as_save_IFS
4528+ test -z "$as_dir" && as_dir=.
4529+ for ac_exec_ext in '' $ac_executable_extensions; do
4530+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4531+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4532+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4533+ break 2
4534+ fi
4535+done
4536+ done
4537+IFS=$as_save_IFS
4538+
4539+fi
4540+fi
4541+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4542+if test -n "$ac_ct_MANIFEST_TOOL"; then
4543+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4544+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4545+else
4546+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4547+$as_echo "no" >&6; }
4548+fi
4549+
4550+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4551+ MANIFEST_TOOL=":"
4552+ else
4553+ case $cross_compiling:$ac_tool_warned in
4554+yes:)
4555+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4556+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4557+ac_tool_warned=yes ;;
4558+esac
4559+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4560+ fi
4561+else
4562+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4563+fi
4564+
4565+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4566+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4567+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4568+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
4569+ $as_echo_n "(cached) " >&6
4570+else
4571+ lt_cv_path_mainfest_tool=no
4572+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4573+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4574+ cat conftest.err >&5
4575+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4576+ lt_cv_path_mainfest_tool=yes
4577+ fi
4578+ rm -f conftest*
4579+fi
4580+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4581+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4582+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4583+ MANIFEST_TOOL=:
4584+fi
4585+
4586+
4587+
4588+
4589+
4590
4591 case $host_os in
4592 rhapsody* | darwin*)
4593@@ -7442,6 +7937,8 @@ _LT_EOF
4594 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4595 echo "$AR cru libconftest.a conftest.o" >&5
4596 $AR cru libconftest.a conftest.o 2>&5
4597+ echo "$RANLIB libconftest.a" >&5
4598+ $RANLIB libconftest.a 2>&5
4599 cat > conftest.c << _LT_EOF
4600 int main() { return 0;}
4601 _LT_EOF
4602@@ -7637,7 +8134,8 @@ fi
4603 LIBTOOL_DEPS="$ltmain"
4604
4605 # Always use our own libtool.
4606-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4607+LIBTOOL='$(SHELL) $(top_builddir)'
4608+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4609
4610
4611
4612@@ -7726,7 +8224,7 @@ aix3*)
4613 esac
4614
4615 # Global variables:
4616-ofile=libtool
4617+ofile=${host_alias}-libtool
4618 can_build_shared=yes
4619
4620 # All known linkers require a `.a' archive for static linking (except MSVC,
4621@@ -8024,8 +8522,6 @@ fi
4622 lt_prog_compiler_pic=
4623 lt_prog_compiler_static=
4624
4625-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4626-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4627
4628 if test "$GCC" = yes; then
4629 lt_prog_compiler_wl='-Wl,'
4630@@ -8191,6 +8687,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4631 lt_prog_compiler_pic='--shared'
4632 lt_prog_compiler_static='--static'
4633 ;;
4634+ nagfor*)
4635+ # NAG Fortran compiler
4636+ lt_prog_compiler_wl='-Wl,-Wl,,'
4637+ lt_prog_compiler_pic='-PIC'
4638+ lt_prog_compiler_static='-Bstatic'
4639+ ;;
4640 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4641 # Portland Group compilers (*not* the Pentium gcc compiler,
4642 # which looks to be a dead project)
4643@@ -8253,7 +8755,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4644 lt_prog_compiler_pic='-KPIC'
4645 lt_prog_compiler_static='-Bstatic'
4646 case $cc_basename in
4647- f77* | f90* | f95*)
4648+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4649 lt_prog_compiler_wl='-Qoption ld ';;
4650 *)
4651 lt_prog_compiler_wl='-Wl,';;
4652@@ -8310,13 +8812,17 @@ case $host_os in
4653 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4654 ;;
4655 esac
4656-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4657-$as_echo "$lt_prog_compiler_pic" >&6; }
4658-
4659-
4660-
4661-
4662
4663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4664+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4665+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
4666+ $as_echo_n "(cached) " >&6
4667+else
4668+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4669+fi
4670+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4671+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4672+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4673
4674 #
4675 # Check to make sure the PIC flag actually works.
4676@@ -8377,6 +8883,11 @@ fi
4677
4678
4679
4680+
4681+
4682+
4683+
4684+
4685 #
4686 # Check to make sure the static flag actually works.
4687 #
4688@@ -8727,7 +9238,8 @@ _LT_EOF
4689 allow_undefined_flag=unsupported
4690 always_export_symbols=no
4691 enable_shared_with_static_runtimes=yes
4692- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4693+ 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'
4694+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4695
4696 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4697 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4698@@ -8826,12 +9338,12 @@ _LT_EOF
4699 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4700 hardcode_libdir_flag_spec=
4701 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4702- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4703+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4704 if test "x$supports_anon_versioning" = xyes; then
4705 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4706 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4707 echo "local: *; };" >> $output_objdir/$libname.ver~
4708- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4709+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4710 fi
4711 ;;
4712 esac
4713@@ -8845,8 +9357,8 @@ _LT_EOF
4714 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4715 wlarc=
4716 else
4717- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4718- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4719+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4720+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4721 fi
4722 ;;
4723
4724@@ -8864,8 +9376,8 @@ _LT_EOF
4725
4726 _LT_EOF
4727 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4728- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4729- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4730+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4731+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4732 else
4733 ld_shlibs=no
4734 fi
4735@@ -8911,8 +9423,8 @@ _LT_EOF
4736
4737 *)
4738 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4739- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4740- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4741+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4742+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4743 else
4744 ld_shlibs=no
4745 fi
4746@@ -9042,7 +9554,13 @@ _LT_EOF
4747 allow_undefined_flag='-berok'
4748 # Determine the default libpath from the value encoded in an
4749 # empty executable.
4750- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4751+ if test "${lt_cv_aix_libpath+set}" = set; then
4752+ aix_libpath=$lt_cv_aix_libpath
4753+else
4754+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4755+ $as_echo_n "(cached) " >&6
4756+else
4757+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4758 /* end confdefs.h. */
4759
4760 int
4761@@ -9055,22 +9573,29 @@ main ()
4762 _ACEOF
4763 if ac_fn_c_try_link "$LINENO"; then :
4764
4765-lt_aix_libpath_sed='
4766- /Import File Strings/,/^$/ {
4767- /^0/ {
4768- s/^0 *\(.*\)$/\1/
4769- p
4770- }
4771- }'
4772-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4773-# Check for a 64-bit object if we didn't find anything.
4774-if test -z "$aix_libpath"; then
4775- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4776-fi
4777+ lt_aix_libpath_sed='
4778+ /Import File Strings/,/^$/ {
4779+ /^0/ {
4780+ s/^0 *\([^ ]*\) *$/\1/
4781+ p
4782+ }
4783+ }'
4784+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4785+ # Check for a 64-bit object if we didn't find anything.
4786+ if test -z "$lt_cv_aix_libpath_"; then
4787+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4788+ fi
4789 fi
4790 rm -f core conftest.err conftest.$ac_objext \
4791 conftest$ac_exeext conftest.$ac_ext
4792-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4793+ if test -z "$lt_cv_aix_libpath_"; then
4794+ lt_cv_aix_libpath_="/usr/lib:/lib"
4795+ fi
4796+
4797+fi
4798+
4799+ aix_libpath=$lt_cv_aix_libpath_
4800+fi
4801
4802 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4803 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"
4804@@ -9082,7 +9607,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4805 else
4806 # Determine the default libpath from the value encoded in an
4807 # empty executable.
4808- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4809+ if test "${lt_cv_aix_libpath+set}" = set; then
4810+ aix_libpath=$lt_cv_aix_libpath
4811+else
4812+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4813+ $as_echo_n "(cached) " >&6
4814+else
4815+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4816 /* end confdefs.h. */
4817
4818 int
4819@@ -9095,22 +9626,29 @@ main ()
4820 _ACEOF
4821 if ac_fn_c_try_link "$LINENO"; then :
4822
4823-lt_aix_libpath_sed='
4824- /Import File Strings/,/^$/ {
4825- /^0/ {
4826- s/^0 *\(.*\)$/\1/
4827- p
4828- }
4829- }'
4830-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4831-# Check for a 64-bit object if we didn't find anything.
4832-if test -z "$aix_libpath"; then
4833- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4834-fi
4835+ lt_aix_libpath_sed='
4836+ /Import File Strings/,/^$/ {
4837+ /^0/ {
4838+ s/^0 *\([^ ]*\) *$/\1/
4839+ p
4840+ }
4841+ }'
4842+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4843+ # Check for a 64-bit object if we didn't find anything.
4844+ if test -z "$lt_cv_aix_libpath_"; then
4845+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4846+ fi
4847 fi
4848 rm -f core conftest.err conftest.$ac_objext \
4849 conftest$ac_exeext conftest.$ac_ext
4850-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4851+ if test -z "$lt_cv_aix_libpath_"; then
4852+ lt_cv_aix_libpath_="/usr/lib:/lib"
4853+ fi
4854+
4855+fi
4856+
4857+ aix_libpath=$lt_cv_aix_libpath_
4858+fi
4859
4860 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4861 # Warning - without using the other run time loading flags,
4862@@ -9155,20 +9693,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4863 # Microsoft Visual C++.
4864 # hardcode_libdir_flag_spec is actually meaningless, as there is
4865 # no search path for DLLs.
4866- hardcode_libdir_flag_spec=' '
4867- allow_undefined_flag=unsupported
4868- # Tell ltmain to make .lib files, not .a files.
4869- libext=lib
4870- # Tell ltmain to make .dll files, not .so files.
4871- shrext_cmds=".dll"
4872- # FIXME: Setting linknames here is a bad hack.
4873- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4874- # The linker will automatically build a .lib file if we build a DLL.
4875- old_archive_from_new_cmds='true'
4876- # FIXME: Should let the user specify the lib program.
4877- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4878- fix_srcfile_path='`cygpath -w "$srcfile"`'
4879- enable_shared_with_static_runtimes=yes
4880+ case $cc_basename in
4881+ cl*)
4882+ # Native MSVC
4883+ hardcode_libdir_flag_spec=' '
4884+ allow_undefined_flag=unsupported
4885+ always_export_symbols=yes
4886+ file_list_spec='@'
4887+ # Tell ltmain to make .lib files, not .a files.
4888+ libext=lib
4889+ # Tell ltmain to make .dll files, not .so files.
4890+ shrext_cmds=".dll"
4891+ # FIXME: Setting linknames here is a bad hack.
4892+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4893+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4894+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4895+ else
4896+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4897+ fi~
4898+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4899+ linknames='
4900+ # The linker will not automatically build a static lib if we build a DLL.
4901+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4902+ enable_shared_with_static_runtimes=yes
4903+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4904+ # Don't use ranlib
4905+ old_postinstall_cmds='chmod 644 $oldlib'
4906+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4907+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4908+ case $lt_outputfile in
4909+ *.exe|*.EXE) ;;
4910+ *)
4911+ lt_outputfile="$lt_outputfile.exe"
4912+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4913+ ;;
4914+ esac~
4915+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4916+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4917+ $RM "$lt_outputfile.manifest";
4918+ fi'
4919+ ;;
4920+ *)
4921+ # Assume MSVC wrapper
4922+ hardcode_libdir_flag_spec=' '
4923+ allow_undefined_flag=unsupported
4924+ # Tell ltmain to make .lib files, not .a files.
4925+ libext=lib
4926+ # Tell ltmain to make .dll files, not .so files.
4927+ shrext_cmds=".dll"
4928+ # FIXME: Setting linknames here is a bad hack.
4929+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4930+ # The linker will automatically build a .lib file if we build a DLL.
4931+ old_archive_from_new_cmds='true'
4932+ # FIXME: Should let the user specify the lib program.
4933+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4934+ enable_shared_with_static_runtimes=yes
4935+ ;;
4936+ esac
4937 ;;
4938
4939 darwin* | rhapsody*)
4940@@ -9229,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4941
4942 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4943 freebsd* | dragonfly*)
4944- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4945+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4946 hardcode_libdir_flag_spec='-R$libdir'
4947 hardcode_direct=yes
4948 hardcode_shlibpath_var=no
4949@@ -9237,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4950
4951 hpux9*)
4952 if test "$GCC" = yes; then
4953- 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'
4954+ 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'
4955 else
4956 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'
4957 fi
4958@@ -9253,7 +9834,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4959
4960 hpux10*)
4961 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4962- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4963+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4964 else
4965 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4966 fi
4967@@ -9277,10 +9858,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4968 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4969 ;;
4970 ia64*)
4971- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4972+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4973 ;;
4974 *)
4975- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4976+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4977 ;;
4978 esac
4979 else
4980@@ -9359,23 +9940,36 @@ fi
4981
4982 irix5* | irix6* | nonstopux*)
4983 if test "$GCC" = yes; then
4984- 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'
4985+ 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'
4986 # Try to use the -exported_symbol ld option, if it does not
4987 # work, assume that -exports_file does not work either and
4988 # implicitly export all symbols.
4989- save_LDFLAGS="$LDFLAGS"
4990- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4991- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4992+ # This should be the same for all languages, so no per-tag cache variable.
4993+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
4994+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
4995+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
4996+ $as_echo_n "(cached) " >&6
4997+else
4998+ save_LDFLAGS="$LDFLAGS"
4999+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5000+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5001 /* end confdefs.h. */
5002-int foo(void) {}
5003+int foo (void) { return 0; }
5004 _ACEOF
5005 if ac_fn_c_try_link "$LINENO"; then :
5006- 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'
5007-
5008+ lt_cv_irix_exported_symbol=yes
5009+else
5010+ lt_cv_irix_exported_symbol=no
5011 fi
5012 rm -f core conftest.err conftest.$ac_objext \
5013 conftest$ac_exeext conftest.$ac_ext
5014- LDFLAGS="$save_LDFLAGS"
5015+ LDFLAGS="$save_LDFLAGS"
5016+fi
5017+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5018+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5019+ if test "$lt_cv_irix_exported_symbol" = yes; then
5020+ 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'
5021+ fi
5022 else
5023 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'
5024 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'
5025@@ -9460,7 +10054,7 @@ rm -f core conftest.err conftest.$ac_objext \
5026 osf4* | osf5*) # as osf3* with the addition of -msym flag
5027 if test "$GCC" = yes; then
5028 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5029- 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'
5030+ 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'
5031 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5032 else
5033 allow_undefined_flag=' -expect_unresolved \*'
5034@@ -9479,9 +10073,9 @@ rm -f core conftest.err conftest.$ac_objext \
5035 no_undefined_flag=' -z defs'
5036 if test "$GCC" = yes; then
5037 wlarc='${wl}'
5038- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5039+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5040 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5041- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5042+ $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'
5043 else
5044 case `$CC -V 2>&1` in
5045 *"Compilers 5.0"*)
5046@@ -10057,8 +10651,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5047 need_version=no
5048 need_lib_prefix=no
5049
5050- case $GCC,$host_os in
5051- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5052+ case $GCC,$cc_basename in
5053+ yes,*)
5054+ # gcc
5055 library_names_spec='$libname.dll.a'
5056 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5057 postinstall_cmds='base_file=`basename \${file}`~
5058@@ -10091,13 +10686,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5059 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5060 ;;
5061 esac
5062+ dynamic_linker='Win32 ld.exe'
5063+ ;;
5064+
5065+ *,cl*)
5066+ # Native MSVC
5067+ libname_spec='$name'
5068+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5069+ library_names_spec='${libname}.dll.lib'
5070+
5071+ case $build_os in
5072+ mingw*)
5073+ sys_lib_search_path_spec=
5074+ lt_save_ifs=$IFS
5075+ IFS=';'
5076+ for lt_path in $LIB
5077+ do
5078+ IFS=$lt_save_ifs
5079+ # Let DOS variable expansion print the short 8.3 style file name.
5080+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5081+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5082+ done
5083+ IFS=$lt_save_ifs
5084+ # Convert to MSYS style.
5085+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5086+ ;;
5087+ cygwin*)
5088+ # Convert to unix form, then to dos form, then back to unix form
5089+ # but this time dos style (no spaces!) so that the unix form looks
5090+ # like /cygdrive/c/PROGRA~1:/cygdr...
5091+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5092+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5093+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5094+ ;;
5095+ *)
5096+ sys_lib_search_path_spec="$LIB"
5097+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5098+ # It is most probably a Windows format PATH.
5099+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5100+ else
5101+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5102+ fi
5103+ # FIXME: find the short name or the path components, as spaces are
5104+ # common. (e.g. "Program Files" -> "PROGRA~1")
5105+ ;;
5106+ esac
5107+
5108+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5109+ postinstall_cmds='base_file=`basename \${file}`~
5110+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5111+ dldir=$destdir/`dirname \$dlpath`~
5112+ test -d \$dldir || mkdir -p \$dldir~
5113+ $install_prog $dir/$dlname \$dldir/$dlname'
5114+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5115+ dlpath=$dir/\$dldll~
5116+ $RM \$dlpath'
5117+ shlibpath_overrides_runpath=yes
5118+ dynamic_linker='Win32 link.exe'
5119 ;;
5120
5121 *)
5122+ # Assume MSVC wrapper
5123 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5124+ dynamic_linker='Win32 ld.exe'
5125 ;;
5126 esac
5127- dynamic_linker='Win32 ld.exe'
5128 # FIXME: first we should search . and the directory the executable is in
5129 shlibpath_var=PATH
5130 ;;
5131@@ -10189,7 +10842,7 @@ haiku*)
5132 soname_spec='${libname}${release}${shared_ext}$major'
5133 shlibpath_var=LIBRARY_PATH
5134 shlibpath_overrides_runpath=yes
5135- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5136+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5137 hardcode_into_libs=yes
5138 ;;
5139
5140@@ -11029,10 +11682,10 @@ else
5141 /* When -fvisbility=hidden is used, assume the code has been annotated
5142 correspondingly for the symbols needed. */
5143 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5144-void fnord () __attribute__((visibility("default")));
5145+int fnord () __attribute__((visibility("default")));
5146 #endif
5147
5148-void fnord () { int i=42; }
5149+int fnord () { return 42; }
5150 int main ()
5151 {
5152 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5153@@ -11135,10 +11788,10 @@ else
5154 /* When -fvisbility=hidden is used, assume the code has been annotated
5155 correspondingly for the symbols needed. */
5156 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5157-void fnord () __attribute__((visibility("default")));
5158+int fnord () __attribute__((visibility("default")));
5159 #endif
5160
5161-void fnord () { int i=42; }
5162+int fnord () { return 42; }
5163 int main ()
5164 {
5165 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5166@@ -15350,13 +16003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5167 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5168 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5169 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5170+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5171+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5172 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5173 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5174 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5175 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5176 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5177+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5178+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5179+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5180+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5181 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5182 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5183+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5184 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5185 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5186 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5187@@ -15371,14 +16031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5188 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5189 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5190 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"`'
5191+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5192+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5193 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5194 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5195 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5196-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5197 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5198+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5199 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5200 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5201 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5202+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5203 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5204 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5205 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5206@@ -15411,12 +16074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5207 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5208 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5209 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5210-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5211 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5212 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5213 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5214 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5215 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5216+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5217 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5218 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5219 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5220@@ -15471,8 +16134,13 @@ reload_flag \
5221 OBJDUMP \
5222 deplibs_check_method \
5223 file_magic_cmd \
5224+file_magic_glob \
5225+want_nocaseglob \
5226+DLLTOOL \
5227+sharedlib_from_linklib_cmd \
5228 AR \
5229 AR_FLAGS \
5230+archiver_list_spec \
5231 STRIP \
5232 RANLIB \
5233 CC \
5234@@ -15482,12 +16150,14 @@ lt_cv_sys_global_symbol_pipe \
5235 lt_cv_sys_global_symbol_to_cdecl \
5236 lt_cv_sys_global_symbol_to_c_name_address \
5237 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5238+nm_file_list_spec \
5239 lt_prog_compiler_no_builtin_flag \
5240-lt_prog_compiler_wl \
5241 lt_prog_compiler_pic \
5242+lt_prog_compiler_wl \
5243 lt_prog_compiler_static \
5244 lt_cv_prog_compiler_c_o \
5245 need_locks \
5246+MANIFEST_TOOL \
5247 DSYMUTIL \
5248 NMEDIT \
5249 LIPO \
5250@@ -15503,7 +16173,6 @@ no_undefined_flag \
5251 hardcode_libdir_flag_spec \
5252 hardcode_libdir_flag_spec_ld \
5253 hardcode_libdir_separator \
5254-fix_srcfile_path \
5255 exclude_expsyms \
5256 include_expsyms \
5257 file_list_spec \
5258@@ -15539,6 +16208,7 @@ module_cmds \
5259 module_expsym_cmds \
5260 export_symbols_cmds \
5261 prelink_cmds \
5262+postlink_cmds \
5263 postinstall_cmds \
5264 postuninstall_cmds \
5265 finish_cmds \
5266@@ -16303,7 +16973,8 @@ $as_echo X"$file" |
5267 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5268 #
5269 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5270-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5271+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5272+# Inc.
5273 # Written by Gordon Matzigkeit, 1996
5274 #
5275 # This file is part of GNU Libtool.
5276@@ -16406,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL
5277 # turn newlines into spaces.
5278 NL2SP=$lt_lt_NL2SP
5279
5280+# convert \$build file names to \$host format.
5281+to_host_file_cmd=$lt_cv_to_host_file_cmd
5282+
5283+# convert \$build files to toolchain format.
5284+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5285+
5286 # An object symbol dumper.
5287 OBJDUMP=$lt_OBJDUMP
5288
5289 # Method to check whether dependent libraries are shared objects.
5290 deplibs_check_method=$lt_deplibs_check_method
5291
5292-# Command to use when deplibs_check_method == "file_magic".
5293+# Command to use when deplibs_check_method = "file_magic".
5294 file_magic_cmd=$lt_file_magic_cmd
5295
5296+# How to find potential files when deplibs_check_method = "file_magic".
5297+file_magic_glob=$lt_file_magic_glob
5298+
5299+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5300+want_nocaseglob=$lt_want_nocaseglob
5301+
5302+# DLL creation program.
5303+DLLTOOL=$lt_DLLTOOL
5304+
5305+# Command to associate shared and link libraries.
5306+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5307+
5308 # The archiver.
5309 AR=$lt_AR
5310+
5311+# Flags to create an archive.
5312 AR_FLAGS=$lt_AR_FLAGS
5313
5314+# How to feed a file listing to the archiver.
5315+archiver_list_spec=$lt_archiver_list_spec
5316+
5317 # A symbol stripping program.
5318 STRIP=$lt_STRIP
5319
5320@@ -16448,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5321 # Transform the output of nm in a C name address pair when lib prefix is needed.
5322 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5323
5324+# Specify filename containing input files for \$NM.
5325+nm_file_list_spec=$lt_nm_file_list_spec
5326+
5327+# The root where to search for dependent libraries,and in which our libraries should be installed.
5328+lt_sysroot=$lt_sysroot
5329+
5330 # The name of the directory that contains temporary libtool files.
5331 objdir=$objdir
5332
5333@@ -16457,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD
5334 # Must we lock files when doing compilation?
5335 need_locks=$lt_need_locks
5336
5337+# Manifest tool.
5338+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5339+
5340 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5341 DSYMUTIL=$lt_DSYMUTIL
5342
5343@@ -16571,12 +17274,12 @@ with_gcc=$GCC
5344 # Compiler flag to turn off builtin functions.
5345 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5346
5347-# How to pass a linker flag through the compiler.
5348-wl=$lt_lt_prog_compiler_wl
5349-
5350 # Additional compiler flags for building library objects.
5351 pic_flag=$lt_lt_prog_compiler_pic
5352
5353+# How to pass a linker flag through the compiler.
5354+wl=$lt_lt_prog_compiler_wl
5355+
5356 # Compiler flag to prevent dynamic linking.
5357 link_static_flag=$lt_lt_prog_compiler_static
5358
5359@@ -16663,9 +17366,6 @@ inherit_rpath=$inherit_rpath
5360 # Whether libtool must link a program against all its dependency libraries.
5361 link_all_deplibs=$link_all_deplibs
5362
5363-# Fix the shell variable \$srcfile for the compiler.
5364-fix_srcfile_path=$lt_fix_srcfile_path
5365-
5366 # Set to "yes" if exported symbols are required.
5367 always_export_symbols=$always_export_symbols
5368
5369@@ -16681,6 +17381,9 @@ include_expsyms=$lt_include_expsyms
5370 # Commands necessary for linking programs (against libraries) with templates.
5371 prelink_cmds=$lt_prelink_cmds
5372
5373+# Commands necessary for finishing linking programs.
5374+postlink_cmds=$lt_postlink_cmds
5375+
5376 # Specify filename containing input files.
5377 file_list_spec=$lt_file_list_spec
5378
5379@@ -16713,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5380 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5381 # text mode, it properly converts lines to CR/LF. This bash problem
5382 # is reportedly fixed, but why not run on old versions too?
5383- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5384- || (rm -f "$cfgfile"; exit 1)
5385-
5386- case $xsi_shell in
5387- yes)
5388- cat << \_LT_EOF >> "$cfgfile"
5389-
5390-# func_dirname file append nondir_replacement
5391-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5392-# otherwise set result to NONDIR_REPLACEMENT.
5393-func_dirname ()
5394-{
5395- case ${1} in
5396- */*) func_dirname_result="${1%/*}${2}" ;;
5397- * ) func_dirname_result="${3}" ;;
5398- esac
5399-}
5400-
5401-# func_basename file
5402-func_basename ()
5403-{
5404- func_basename_result="${1##*/}"
5405-}
5406-
5407-# func_dirname_and_basename file append nondir_replacement
5408-# perform func_basename and func_dirname in a single function
5409-# call:
5410-# dirname: Compute the dirname of FILE. If nonempty,
5411-# add APPEND to the result, otherwise set result
5412-# to NONDIR_REPLACEMENT.
5413-# value returned in "$func_dirname_result"
5414-# basename: Compute filename of FILE.
5415-# value retuned in "$func_basename_result"
5416-# Implementation must be kept synchronized with func_dirname
5417-# and func_basename. For efficiency, we do not delegate to
5418-# those functions but instead duplicate the functionality here.
5419-func_dirname_and_basename ()
5420-{
5421- case ${1} in
5422- */*) func_dirname_result="${1%/*}${2}" ;;
5423- * ) func_dirname_result="${3}" ;;
5424- esac
5425- func_basename_result="${1##*/}"
5426-}
5427-
5428-# func_stripname prefix suffix name
5429-# strip PREFIX and SUFFIX off of NAME.
5430-# PREFIX and SUFFIX must not contain globbing or regex special
5431-# characters, hashes, percent signs, but SUFFIX may contain a leading
5432-# dot (in which case that matches only a dot).
5433-func_stripname ()
5434-{
5435- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5436- # positional parameters, so assign one to ordinary parameter first.
5437- func_stripname_result=${3}
5438- func_stripname_result=${func_stripname_result#"${1}"}
5439- func_stripname_result=${func_stripname_result%"${2}"}
5440-}
5441-
5442-# func_opt_split
5443-func_opt_split ()
5444-{
5445- func_opt_split_opt=${1%%=*}
5446- func_opt_split_arg=${1#*=}
5447-}
5448-
5449-# func_lo2o object
5450-func_lo2o ()
5451-{
5452- case ${1} in
5453- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5454- *) func_lo2o_result=${1} ;;
5455- esac
5456-}
5457-
5458-# func_xform libobj-or-source
5459-func_xform ()
5460-{
5461- func_xform_result=${1%.*}.lo
5462-}
5463-
5464-# func_arith arithmetic-term...
5465-func_arith ()
5466-{
5467- func_arith_result=$(( $* ))
5468-}
5469-
5470-# func_len string
5471-# STRING may not start with a hyphen.
5472-func_len ()
5473-{
5474- func_len_result=${#1}
5475-}
5476-
5477-_LT_EOF
5478- ;;
5479- *) # Bourne compatible functions.
5480- cat << \_LT_EOF >> "$cfgfile"
5481-
5482-# func_dirname file append nondir_replacement
5483-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5484-# otherwise set result to NONDIR_REPLACEMENT.
5485-func_dirname ()
5486-{
5487- # Extract subdirectory from the argument.
5488- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5489- if test "X$func_dirname_result" = "X${1}"; then
5490- func_dirname_result="${3}"
5491- else
5492- func_dirname_result="$func_dirname_result${2}"
5493- fi
5494-}
5495-
5496-# func_basename file
5497-func_basename ()
5498-{
5499- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5500-}
5501-
5502-
5503-# func_stripname prefix suffix name
5504-# strip PREFIX and SUFFIX off of NAME.
5505-# PREFIX and SUFFIX must not contain globbing or regex special
5506-# characters, hashes, percent signs, but SUFFIX may contain a leading
5507-# dot (in which case that matches only a dot).
5508-# func_strip_suffix prefix name
5509-func_stripname ()
5510-{
5511- case ${2} in
5512- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5513- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5514- esac
5515-}
5516-
5517-# sed scripts:
5518-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5519-my_sed_long_arg='1s/^-[^=]*=//'
5520-
5521-# func_opt_split
5522-func_opt_split ()
5523-{
5524- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5525- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5526-}
5527-
5528-# func_lo2o object
5529-func_lo2o ()
5530-{
5531- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5532-}
5533-
5534-# func_xform libobj-or-source
5535-func_xform ()
5536-{
5537- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5538-}
5539-
5540-# func_arith arithmetic-term...
5541-func_arith ()
5542-{
5543- func_arith_result=`expr "$@"`
5544-}
5545-
5546-# func_len string
5547-# STRING may not start with a hyphen.
5548-func_len ()
5549-{
5550- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5551-}
5552-
5553-_LT_EOF
5554-esac
5555-
5556-case $lt_shell_append in
5557- yes)
5558- cat << \_LT_EOF >> "$cfgfile"
5559-
5560-# func_append var value
5561-# Append VALUE to the end of shell variable VAR.
5562-func_append ()
5563-{
5564- eval "$1+=\$2"
5565-}
5566-_LT_EOF
5567- ;;
5568- *)
5569- cat << \_LT_EOF >> "$cfgfile"
5570-
5571-# func_append var value
5572-# Append VALUE to the end of shell variable VAR.
5573-func_append ()
5574-{
5575- eval "$1=\$$1\$2"
5576-}
5577-
5578-_LT_EOF
5579- ;;
5580- esac
5581-
5582-
5583- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5584- || (rm -f "$cfgfile"; exit 1)
5585-
5586- mv -f "$cfgfile" "$ofile" ||
5587+ sed '$q' "$ltmain" >> "$cfgfile" \
5588+ || (rm -f "$cfgfile"; exit 1)
5589+
5590+ if test x"$xsi_shell" = xyes; then
5591+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5592+func_dirname ()\
5593+{\
5594+\ case ${1} in\
5595+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5596+\ * ) func_dirname_result="${3}" ;;\
5597+\ esac\
5598+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5599+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5600+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5601+test 0 -eq $? || _lt_function_replace_fail=:
5602+
5603+
5604+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5605+func_basename ()\
5606+{\
5607+\ func_basename_result="${1##*/}"\
5608+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5609+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5610+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5611+test 0 -eq $? || _lt_function_replace_fail=:
5612+
5613+
5614+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5615+func_dirname_and_basename ()\
5616+{\
5617+\ case ${1} in\
5618+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5619+\ * ) func_dirname_result="${3}" ;;\
5620+\ esac\
5621+\ func_basename_result="${1##*/}"\
5622+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5623+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5624+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5625+test 0 -eq $? || _lt_function_replace_fail=:
5626+
5627+
5628+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5629+func_stripname ()\
5630+{\
5631+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5632+\ # positional parameters, so assign one to ordinary parameter first.\
5633+\ func_stripname_result=${3}\
5634+\ func_stripname_result=${func_stripname_result#"${1}"}\
5635+\ func_stripname_result=${func_stripname_result%"${2}"}\
5636+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5637+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5638+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5639+test 0 -eq $? || _lt_function_replace_fail=:
5640+
5641+
5642+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5643+func_split_long_opt ()\
5644+{\
5645+\ func_split_long_opt_name=${1%%=*}\
5646+\ func_split_long_opt_arg=${1#*=}\
5647+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5648+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5649+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5650+test 0 -eq $? || _lt_function_replace_fail=:
5651+
5652+
5653+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5654+func_split_short_opt ()\
5655+{\
5656+\ func_split_short_opt_arg=${1#??}\
5657+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5658+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5659+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5660+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5661+test 0 -eq $? || _lt_function_replace_fail=:
5662+
5663+
5664+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5665+func_lo2o ()\
5666+{\
5667+\ case ${1} in\
5668+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5669+\ *) func_lo2o_result=${1} ;;\
5670+\ esac\
5671+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5672+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5673+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5674+test 0 -eq $? || _lt_function_replace_fail=:
5675+
5676+
5677+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5678+func_xform ()\
5679+{\
5680+ func_xform_result=${1%.*}.lo\
5681+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5682+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5683+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5684+test 0 -eq $? || _lt_function_replace_fail=:
5685+
5686+
5687+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5688+func_arith ()\
5689+{\
5690+ func_arith_result=$(( $* ))\
5691+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5692+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5693+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5694+test 0 -eq $? || _lt_function_replace_fail=:
5695+
5696+
5697+ sed -e '/^func_len ()$/,/^} # func_len /c\
5698+func_len ()\
5699+{\
5700+ func_len_result=${#1}\
5701+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5702+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5703+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5704+test 0 -eq $? || _lt_function_replace_fail=:
5705+
5706+fi
5707+
5708+if test x"$lt_shell_append" = xyes; then
5709+ sed -e '/^func_append ()$/,/^} # func_append /c\
5710+func_append ()\
5711+{\
5712+ eval "${1}+=\\${2}"\
5713+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5714+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5715+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5716+test 0 -eq $? || _lt_function_replace_fail=:
5717+
5718+
5719+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5720+func_append_quoted ()\
5721+{\
5722+\ func_quote_for_eval "${2}"\
5723+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5724+} # Extended-shell func_append_quoted implementation' "$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+
5729+
5730+ # Save a `func_append' function call where possible by direct use of '+='
5731+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5732+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5733+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5734+ test 0 -eq $? || _lt_function_replace_fail=:
5735+else
5736+ # Save a `func_append' function call even when '+=' is not available
5737+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5738+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5739+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5740+ test 0 -eq $? || _lt_function_replace_fail=:
5741+fi
5742+
5743+if test x"$_lt_function_replace_fail" = x":"; then
5744+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5745+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5746+fi
5747+
5748+
5749+ mv -f "$cfgfile" "$ofile" ||
5750 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5751 chmod +x "$ofile"
5752
5753diff --git a/gprof/configure b/gprof/configure
5754index 626e1c7..a88719c 100755
5755--- a/gprof/configure
5756+++ b/gprof/configure
5757@@ -630,8 +630,11 @@ OTOOL
5758 LIPO
5759 NMEDIT
5760 DSYMUTIL
5761+MANIFEST_TOOL
5762 RANLIB
5763+ac_ct_AR
5764 AR
5765+DLLTOOL
5766 OBJDUMP
5767 LN_S
5768 NM
5769@@ -743,6 +746,7 @@ enable_static
5770 with_pic
5771 enable_fast_install
5772 with_gnu_ld
5773+with_libtool_sysroot
5774 enable_libtool_lock
5775 enable_plugins
5776 enable_largefile
5777@@ -1401,6 +1405,8 @@ Optional Packages:
5778 --with-pic try to use only PIC/non-PIC objects [default=use
5779 both]
5780 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5781+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5782+ (or the compiler's sysroot if not specified).
5783
5784 Some influential environment variables:
5785 CC C compiler command
5786@@ -4835,8 +4841,8 @@ esac
5787
5788
5789
5790-macro_version='2.2.7a'
5791-macro_revision='1.3134'
5792+macro_version='2.4'
5793+macro_revision='1.3293'
5794
5795
5796
5797@@ -4876,7 +4882,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5799 $as_echo_n "checking how to print strings... " >&6; }
5800 # Test print first, because it will be a builtin if present.
5801-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5802+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5803 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5804 ECHO='print -r --'
5805 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5806@@ -5562,8 +5568,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5807 # Try some XSI features
5808 xsi_shell=no
5809 ( _lt_dummy="a/b/c"
5810- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5811- = c,a/b,, \
5812+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5813+ = c,a/b,b/c, \
5814 && eval 'test $(( 1 + 1 )) -eq 2 \
5815 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5816 && xsi_shell=yes
5817@@ -5612,6 +5618,80 @@ esac
5818
5819
5820
5821+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5822+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5823+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
5824+ $as_echo_n "(cached) " >&6
5825+else
5826+ case $host in
5827+ *-*-mingw* )
5828+ case $build in
5829+ *-*-mingw* ) # actually msys
5830+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5831+ ;;
5832+ *-*-cygwin* )
5833+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5834+ ;;
5835+ * ) # otherwise, assume *nix
5836+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5837+ ;;
5838+ esac
5839+ ;;
5840+ *-*-cygwin* )
5841+ case $build in
5842+ *-*-mingw* ) # actually msys
5843+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5844+ ;;
5845+ *-*-cygwin* )
5846+ lt_cv_to_host_file_cmd=func_convert_file_noop
5847+ ;;
5848+ * ) # otherwise, assume *nix
5849+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5850+ ;;
5851+ esac
5852+ ;;
5853+ * ) # unhandled hosts (and "normal" native builds)
5854+ lt_cv_to_host_file_cmd=func_convert_file_noop
5855+ ;;
5856+esac
5857+
5858+fi
5859+
5860+to_host_file_cmd=$lt_cv_to_host_file_cmd
5861+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5862+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5863+
5864+
5865+
5866+
5867+
5868+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5869+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5870+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
5871+ $as_echo_n "(cached) " >&6
5872+else
5873+ #assume ordinary cross tools, or native build.
5874+lt_cv_to_tool_file_cmd=func_convert_file_noop
5875+case $host in
5876+ *-*-mingw* )
5877+ case $build in
5878+ *-*-mingw* ) # actually msys
5879+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5880+ ;;
5881+ esac
5882+ ;;
5883+esac
5884+
5885+fi
5886+
5887+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5888+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5889+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5890+
5891+
5892+
5893+
5894+
5895 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5896 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5897 if test "${lt_cv_ld_reload_flag+set}" = set; then :
5898@@ -5628,6 +5708,11 @@ case $reload_flag in
5899 esac
5900 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5901 case $host_os in
5902+ cygwin* | mingw* | pw32* | cegcc*)
5903+ if test "$GCC" != yes; then
5904+ reload_cmds=false
5905+ fi
5906+ ;;
5907 darwin*)
5908 if test "$GCC" = yes; then
5909 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5910@@ -5796,7 +5881,8 @@ mingw* | pw32*)
5911 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5912 lt_cv_file_magic_cmd='func_win32_libid'
5913 else
5914- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5915+ # Keep this pattern in sync with the one in func_win32_libid.
5916+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5917 lt_cv_file_magic_cmd='$OBJDUMP -f'
5918 fi
5919 ;;
5920@@ -5873,11 +5959,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5921 lt_cv_deplibs_check_method=pass_all
5922 ;;
5923
5924-linux-uclibc*)
5925- lt_cv_deplibs_check_method=pass_all
5926- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5927- ;;
5928-
5929 netbsd*)
5930 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5931 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5932@@ -5955,6 +6036,21 @@ esac
5933 fi
5934 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5935 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5936+
5937+file_magic_glob=
5938+want_nocaseglob=no
5939+if test "$build" = "$host"; then
5940+ case $host_os in
5941+ mingw* | pw32*)
5942+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5943+ want_nocaseglob=yes
5944+ else
5945+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5946+ fi
5947+ ;;
5948+ esac
5949+fi
5950+
5951 file_magic_cmd=$lt_cv_file_magic_cmd
5952 deplibs_check_method=$lt_cv_deplibs_check_method
5953 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5954@@ -5970,9 +6066,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5955
5956
5957
5958+
5959+
5960+
5961+
5962+
5963+
5964+
5965+
5966+
5967+
5968+if test -n "$ac_tool_prefix"; then
5969+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5970+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5971+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5972+$as_echo_n "checking for $ac_word... " >&6; }
5973+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5974+ $as_echo_n "(cached) " >&6
5975+else
5976+ if test -n "$DLLTOOL"; then
5977+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
5978+else
5979+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5980+for as_dir in $PATH
5981+do
5982+ IFS=$as_save_IFS
5983+ test -z "$as_dir" && as_dir=.
5984+ for ac_exec_ext in '' $ac_executable_extensions; do
5985+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5986+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5987+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5988+ break 2
5989+ fi
5990+done
5991+ done
5992+IFS=$as_save_IFS
5993+
5994+fi
5995+fi
5996+DLLTOOL=$ac_cv_prog_DLLTOOL
5997+if test -n "$DLLTOOL"; then
5998+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
5999+$as_echo "$DLLTOOL" >&6; }
6000+else
6001+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6002+$as_echo "no" >&6; }
6003+fi
6004+
6005+
6006+fi
6007+if test -z "$ac_cv_prog_DLLTOOL"; then
6008+ ac_ct_DLLTOOL=$DLLTOOL
6009+ # Extract the first word of "dlltool", so it can be a program name with args.
6010+set dummy dlltool; ac_word=$2
6011+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6012+$as_echo_n "checking for $ac_word... " >&6; }
6013+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
6014+ $as_echo_n "(cached) " >&6
6015+else
6016+ if test -n "$ac_ct_DLLTOOL"; then
6017+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6018+else
6019+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6020+for as_dir in $PATH
6021+do
6022+ IFS=$as_save_IFS
6023+ test -z "$as_dir" && as_dir=.
6024+ for ac_exec_ext in '' $ac_executable_extensions; do
6025+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6026+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6027+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6028+ break 2
6029+ fi
6030+done
6031+ done
6032+IFS=$as_save_IFS
6033+
6034+fi
6035+fi
6036+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6037+if test -n "$ac_ct_DLLTOOL"; then
6038+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6039+$as_echo "$ac_ct_DLLTOOL" >&6; }
6040+else
6041+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6042+$as_echo "no" >&6; }
6043+fi
6044+
6045+ if test "x$ac_ct_DLLTOOL" = x; then
6046+ DLLTOOL="false"
6047+ else
6048+ case $cross_compiling:$ac_tool_warned in
6049+yes:)
6050+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6051+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6052+ac_tool_warned=yes ;;
6053+esac
6054+ DLLTOOL=$ac_ct_DLLTOOL
6055+ fi
6056+else
6057+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6058+fi
6059+
6060+test -z "$DLLTOOL" && DLLTOOL=dlltool
6061+
6062+
6063+
6064+
6065+
6066+
6067+
6068+
6069+
6070+
6071+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6072+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6073+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6074+ $as_echo_n "(cached) " >&6
6075+else
6076+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6077+
6078+case $host_os in
6079+cygwin* | mingw* | pw32* | cegcc*)
6080+ # two different shell functions defined in ltmain.sh
6081+ # decide which to use based on capabilities of $DLLTOOL
6082+ case `$DLLTOOL --help 2>&1` in
6083+ *--identify-strict*)
6084+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6085+ ;;
6086+ *)
6087+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6088+ ;;
6089+ esac
6090+ ;;
6091+*)
6092+ # fallback: assume linklib IS sharedlib
6093+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6094+ ;;
6095+esac
6096+
6097+fi
6098+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6099+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6100+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6101+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6102+
6103+
6104+
6105+
6106+
6107+
6108+
6109 if test -n "$ac_tool_prefix"; then
6110- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6111-set dummy ${ac_tool_prefix}ar; ac_word=$2
6112+ for ac_prog in ar
6113+ do
6114+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6115+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6117 $as_echo_n "checking for $ac_word... " >&6; }
6118 if test "${ac_cv_prog_AR+set}" = set; then :
6119@@ -5988,7 +6237,7 @@ do
6120 test -z "$as_dir" && as_dir=.
6121 for ac_exec_ext in '' $ac_executable_extensions; do
6122 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6123- ac_cv_prog_AR="${ac_tool_prefix}ar"
6124+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6126 break 2
6127 fi
6128@@ -6008,11 +6257,15 @@ $as_echo "no" >&6; }
6129 fi
6130
6131
6132+ test -n "$AR" && break
6133+ done
6134 fi
6135-if test -z "$ac_cv_prog_AR"; then
6136+if test -z "$AR"; then
6137 ac_ct_AR=$AR
6138- # Extract the first word of "ar", so it can be a program name with args.
6139-set dummy ar; ac_word=$2
6140+ for ac_prog in ar
6141+do
6142+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6143+set dummy $ac_prog; ac_word=$2
6144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6145 $as_echo_n "checking for $ac_word... " >&6; }
6146 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6147@@ -6028,7 +6281,7 @@ do
6148 test -z "$as_dir" && as_dir=.
6149 for ac_exec_ext in '' $ac_executable_extensions; do
6150 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6151- ac_cv_prog_ac_ct_AR="ar"
6152+ ac_cv_prog_ac_ct_AR="$ac_prog"
6153 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6154 break 2
6155 fi
6156@@ -6047,6 +6300,10 @@ else
6157 $as_echo "no" >&6; }
6158 fi
6159
6160+
6161+ test -n "$ac_ct_AR" && break
6162+done
6163+
6164 if test "x$ac_ct_AR" = x; then
6165 AR="false"
6166 else
6167@@ -6058,12 +6315,10 @@ ac_tool_warned=yes ;;
6168 esac
6169 AR=$ac_ct_AR
6170 fi
6171-else
6172- AR="$ac_cv_prog_AR"
6173 fi
6174
6175-test -z "$AR" && AR=ar
6176-test -z "$AR_FLAGS" && AR_FLAGS=cru
6177+: ${AR=ar}
6178+: ${AR_FLAGS=cru}
6179
6180
6181
6182@@ -6075,6 +6330,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6183
6184
6185
6186+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6187+$as_echo_n "checking for archiver @FILE support... " >&6; }
6188+if test "${lt_cv_ar_at_file+set}" = set; then :
6189+ $as_echo_n "(cached) " >&6
6190+else
6191+ lt_cv_ar_at_file=no
6192+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6193+/* end confdefs.h. */
6194+
6195+int
6196+main ()
6197+{
6198+
6199+ ;
6200+ return 0;
6201+}
6202+_ACEOF
6203+if ac_fn_c_try_compile "$LINENO"; then :
6204+ echo conftest.$ac_objext > conftest.lst
6205+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6206+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6207+ (eval $lt_ar_try) 2>&5
6208+ ac_status=$?
6209+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6210+ test $ac_status = 0; }
6211+ if test "$ac_status" -eq 0; then
6212+ # Ensure the archiver fails upon bogus file names.
6213+ rm -f conftest.$ac_objext libconftest.a
6214+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6215+ (eval $lt_ar_try) 2>&5
6216+ ac_status=$?
6217+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6218+ test $ac_status = 0; }
6219+ if test "$ac_status" -ne 0; then
6220+ lt_cv_ar_at_file=@
6221+ fi
6222+ fi
6223+ rm -f conftest.* libconftest.a
6224+
6225+fi
6226+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6227+
6228+fi
6229+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6230+$as_echo "$lt_cv_ar_at_file" >&6; }
6231+
6232+if test "x$lt_cv_ar_at_file" = xno; then
6233+ archiver_list_spec=
6234+else
6235+ archiver_list_spec=$lt_cv_ar_at_file
6236+fi
6237+
6238+
6239+
6240+
6241+
6242+
6243+
6244 if test -n "$ac_tool_prefix"; then
6245 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6246 set dummy ${ac_tool_prefix}strip; ac_word=$2
6247@@ -6409,8 +6722,8 @@ esac
6248 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6249
6250 # Transform an extracted symbol line into symbol name and symbol address
6251-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6252-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'"
6253+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6254+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'"
6255
6256 # Handle CRLF in mingw tool chain
6257 opt_cr=
6258@@ -6446,6 +6759,7 @@ for ac_symprfx in "" "_"; do
6259 else
6260 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6261 fi
6262+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6263
6264 # Check to see that the pipe works correctly.
6265 pipe_works=no
6266@@ -6487,6 +6801,18 @@ _LT_EOF
6267 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6268 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6269 cat <<_LT_EOF > conftest.$ac_ext
6270+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6271+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6272+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6273+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6274+# define LT_DLSYM_CONST
6275+#elif defined(__osf__)
6276+/* This system does not cope well with relocations in const data. */
6277+# define LT_DLSYM_CONST
6278+#else
6279+# define LT_DLSYM_CONST const
6280+#endif
6281+
6282 #ifdef __cplusplus
6283 extern "C" {
6284 #endif
6285@@ -6498,7 +6824,7 @@ _LT_EOF
6286 cat <<_LT_EOF >> conftest.$ac_ext
6287
6288 /* The mapping between symbol names and symbols. */
6289-const struct {
6290+LT_DLSYM_CONST struct {
6291 const char *name;
6292 void *address;
6293 }
6294@@ -6524,8 +6850,8 @@ static const void *lt_preloaded_setup() {
6295 _LT_EOF
6296 # Now try linking the two files.
6297 mv conftest.$ac_objext conftstm.$ac_objext
6298- lt_save_LIBS="$LIBS"
6299- lt_save_CFLAGS="$CFLAGS"
6300+ lt_globsym_save_LIBS=$LIBS
6301+ lt_globsym_save_CFLAGS=$CFLAGS
6302 LIBS="conftstm.$ac_objext"
6303 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6304 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6305@@ -6535,8 +6861,8 @@ _LT_EOF
6306 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6307 pipe_works=yes
6308 fi
6309- LIBS="$lt_save_LIBS"
6310- CFLAGS="$lt_save_CFLAGS"
6311+ LIBS=$lt_globsym_save_LIBS
6312+ CFLAGS=$lt_globsym_save_CFLAGS
6313 else
6314 echo "cannot find nm_test_func in $nlist" >&5
6315 fi
6316@@ -6573,6 +6899,18 @@ else
6317 $as_echo "ok" >&6; }
6318 fi
6319
6320+# Response file support.
6321+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6322+ nm_file_list_spec='@'
6323+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6324+ nm_file_list_spec='@'
6325+fi
6326+
6327+
6328+
6329+
6330+
6331+
6332
6333
6334
6335@@ -6594,6 +6932,43 @@ fi
6336
6337
6338
6339+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6340+$as_echo_n "checking for sysroot... " >&6; }
6341+
6342+# Check whether --with-libtool-sysroot was given.
6343+if test "${with_libtool_sysroot+set}" = set; then :
6344+ withval=$with_libtool_sysroot;
6345+else
6346+ with_libtool_sysroot=no
6347+fi
6348+
6349+
6350+lt_sysroot=
6351+case ${with_libtool_sysroot} in #(
6352+ yes)
6353+ if test "$GCC" = yes; then
6354+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6355+ fi
6356+ ;; #(
6357+ /*)
6358+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6359+ ;; #(
6360+ no|'')
6361+ ;; #(
6362+ *)
6363+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6364+$as_echo "${with_libtool_sysroot}" >&6; }
6365+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6366+ ;;
6367+esac
6368+
6369+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6370+$as_echo "${lt_sysroot:-no}" >&6; }
6371+
6372+
6373+
6374+
6375+
6376 # Check whether --enable-libtool-lock was given.
6377 if test "${enable_libtool_lock+set}" = set; then :
6378 enableval=$enable_libtool_lock;
6379@@ -6800,6 +7175,123 @@ esac
6380
6381 need_locks="$enable_libtool_lock"
6382
6383+if test -n "$ac_tool_prefix"; then
6384+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6385+set dummy ${ac_tool_prefix}mt; ac_word=$2
6386+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6387+$as_echo_n "checking for $ac_word... " >&6; }
6388+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6389+ $as_echo_n "(cached) " >&6
6390+else
6391+ if test -n "$MANIFEST_TOOL"; then
6392+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6393+else
6394+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6395+for as_dir in $PATH
6396+do
6397+ IFS=$as_save_IFS
6398+ test -z "$as_dir" && as_dir=.
6399+ for ac_exec_ext in '' $ac_executable_extensions; do
6400+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6401+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6402+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6403+ break 2
6404+ fi
6405+done
6406+ done
6407+IFS=$as_save_IFS
6408+
6409+fi
6410+fi
6411+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6412+if test -n "$MANIFEST_TOOL"; then
6413+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6414+$as_echo "$MANIFEST_TOOL" >&6; }
6415+else
6416+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6417+$as_echo "no" >&6; }
6418+fi
6419+
6420+
6421+fi
6422+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6423+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6424+ # Extract the first word of "mt", so it can be a program name with args.
6425+set dummy mt; ac_word=$2
6426+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6427+$as_echo_n "checking for $ac_word... " >&6; }
6428+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6429+ $as_echo_n "(cached) " >&6
6430+else
6431+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6432+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6433+else
6434+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6435+for as_dir in $PATH
6436+do
6437+ IFS=$as_save_IFS
6438+ test -z "$as_dir" && as_dir=.
6439+ for ac_exec_ext in '' $ac_executable_extensions; do
6440+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6441+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6442+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6443+ break 2
6444+ fi
6445+done
6446+ done
6447+IFS=$as_save_IFS
6448+
6449+fi
6450+fi
6451+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6452+if test -n "$ac_ct_MANIFEST_TOOL"; then
6453+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6454+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6455+else
6456+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6457+$as_echo "no" >&6; }
6458+fi
6459+
6460+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6461+ MANIFEST_TOOL=":"
6462+ else
6463+ case $cross_compiling:$ac_tool_warned in
6464+yes:)
6465+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6466+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6467+ac_tool_warned=yes ;;
6468+esac
6469+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6470+ fi
6471+else
6472+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6473+fi
6474+
6475+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6476+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6477+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6478+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6479+ $as_echo_n "(cached) " >&6
6480+else
6481+ lt_cv_path_mainfest_tool=no
6482+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6483+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6484+ cat conftest.err >&5
6485+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6486+ lt_cv_path_mainfest_tool=yes
6487+ fi
6488+ rm -f conftest*
6489+fi
6490+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6491+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6492+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6493+ MANIFEST_TOOL=:
6494+fi
6495+
6496+
6497+
6498+
6499+
6500
6501 case $host_os in
6502 rhapsody* | darwin*)
6503@@ -7363,6 +7855,8 @@ _LT_EOF
6504 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6505 echo "$AR cru libconftest.a conftest.o" >&5
6506 $AR cru libconftest.a conftest.o 2>&5
6507+ echo "$RANLIB libconftest.a" >&5
6508+ $RANLIB libconftest.a 2>&5
6509 cat > conftest.c << _LT_EOF
6510 int main() { return 0;}
6511 _LT_EOF
6512@@ -7558,7 +8052,8 @@ fi
6513 LIBTOOL_DEPS="$ltmain"
6514
6515 # Always use our own libtool.
6516-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6517+LIBTOOL='$(SHELL) $(top_builddir)'
6518+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6519
6520
6521
6522@@ -7647,7 +8142,7 @@ aix3*)
6523 esac
6524
6525 # Global variables:
6526-ofile=libtool
6527+ofile=${host_alias}-libtool
6528 can_build_shared=yes
6529
6530 # All known linkers require a `.a' archive for static linking (except MSVC,
6531@@ -7945,8 +8440,6 @@ fi
6532 lt_prog_compiler_pic=
6533 lt_prog_compiler_static=
6534
6535-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6536-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6537
6538 if test "$GCC" = yes; then
6539 lt_prog_compiler_wl='-Wl,'
6540@@ -8112,6 +8605,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6541 lt_prog_compiler_pic='--shared'
6542 lt_prog_compiler_static='--static'
6543 ;;
6544+ nagfor*)
6545+ # NAG Fortran compiler
6546+ lt_prog_compiler_wl='-Wl,-Wl,,'
6547+ lt_prog_compiler_pic='-PIC'
6548+ lt_prog_compiler_static='-Bstatic'
6549+ ;;
6550 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6551 # Portland Group compilers (*not* the Pentium gcc compiler,
6552 # which looks to be a dead project)
6553@@ -8174,7 +8673,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6554 lt_prog_compiler_pic='-KPIC'
6555 lt_prog_compiler_static='-Bstatic'
6556 case $cc_basename in
6557- f77* | f90* | f95*)
6558+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6559 lt_prog_compiler_wl='-Qoption ld ';;
6560 *)
6561 lt_prog_compiler_wl='-Wl,';;
6562@@ -8231,13 +8730,17 @@ case $host_os in
6563 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6564 ;;
6565 esac
6566-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6567-$as_echo "$lt_prog_compiler_pic" >&6; }
6568-
6569-
6570-
6571-
6572
6573+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6574+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6575+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6576+ $as_echo_n "(cached) " >&6
6577+else
6578+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6579+fi
6580+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6581+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6582+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6583
6584 #
6585 # Check to make sure the PIC flag actually works.
6586@@ -8298,6 +8801,11 @@ fi
6587
6588
6589
6590+
6591+
6592+
6593+
6594+
6595 #
6596 # Check to make sure the static flag actually works.
6597 #
6598@@ -8648,7 +9156,8 @@ _LT_EOF
6599 allow_undefined_flag=unsupported
6600 always_export_symbols=no
6601 enable_shared_with_static_runtimes=yes
6602- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6603+ 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'
6604+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6605
6606 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6607 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6608@@ -8747,12 +9256,12 @@ _LT_EOF
6609 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6610 hardcode_libdir_flag_spec=
6611 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6612- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6613+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6614 if test "x$supports_anon_versioning" = xyes; then
6615 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6616 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6617 echo "local: *; };" >> $output_objdir/$libname.ver~
6618- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6619+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6620 fi
6621 ;;
6622 esac
6623@@ -8766,8 +9275,8 @@ _LT_EOF
6624 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6625 wlarc=
6626 else
6627- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6628- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6629+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6630+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6631 fi
6632 ;;
6633
6634@@ -8785,8 +9294,8 @@ _LT_EOF
6635
6636 _LT_EOF
6637 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6638- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6639- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6640+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6641+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6642 else
6643 ld_shlibs=no
6644 fi
6645@@ -8832,8 +9341,8 @@ _LT_EOF
6646
6647 *)
6648 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6649- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6650- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6651+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6652+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6653 else
6654 ld_shlibs=no
6655 fi
6656@@ -8963,7 +9472,13 @@ _LT_EOF
6657 allow_undefined_flag='-berok'
6658 # Determine the default libpath from the value encoded in an
6659 # empty executable.
6660- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6661+ if test "${lt_cv_aix_libpath+set}" = set; then
6662+ aix_libpath=$lt_cv_aix_libpath
6663+else
6664+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6665+ $as_echo_n "(cached) " >&6
6666+else
6667+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6668 /* end confdefs.h. */
6669
6670 int
6671@@ -8976,22 +9491,29 @@ main ()
6672 _ACEOF
6673 if ac_fn_c_try_link "$LINENO"; then :
6674
6675-lt_aix_libpath_sed='
6676- /Import File Strings/,/^$/ {
6677- /^0/ {
6678- s/^0 *\(.*\)$/\1/
6679- p
6680- }
6681- }'
6682-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6683-# Check for a 64-bit object if we didn't find anything.
6684-if test -z "$aix_libpath"; then
6685- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6686-fi
6687+ lt_aix_libpath_sed='
6688+ /Import File Strings/,/^$/ {
6689+ /^0/ {
6690+ s/^0 *\([^ ]*\) *$/\1/
6691+ p
6692+ }
6693+ }'
6694+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6695+ # Check for a 64-bit object if we didn't find anything.
6696+ if test -z "$lt_cv_aix_libpath_"; then
6697+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6698+ fi
6699 fi
6700 rm -f core conftest.err conftest.$ac_objext \
6701 conftest$ac_exeext conftest.$ac_ext
6702-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6703+ if test -z "$lt_cv_aix_libpath_"; then
6704+ lt_cv_aix_libpath_="/usr/lib:/lib"
6705+ fi
6706+
6707+fi
6708+
6709+ aix_libpath=$lt_cv_aix_libpath_
6710+fi
6711
6712 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6713 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"
6714@@ -9003,7 +9525,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6715 else
6716 # Determine the default libpath from the value encoded in an
6717 # empty executable.
6718- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6719+ if test "${lt_cv_aix_libpath+set}" = set; then
6720+ aix_libpath=$lt_cv_aix_libpath
6721+else
6722+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6723+ $as_echo_n "(cached) " >&6
6724+else
6725+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6726 /* end confdefs.h. */
6727
6728 int
6729@@ -9016,22 +9544,29 @@ main ()
6730 _ACEOF
6731 if ac_fn_c_try_link "$LINENO"; then :
6732
6733-lt_aix_libpath_sed='
6734- /Import File Strings/,/^$/ {
6735- /^0/ {
6736- s/^0 *\(.*\)$/\1/
6737- p
6738- }
6739- }'
6740-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6741-# Check for a 64-bit object if we didn't find anything.
6742-if test -z "$aix_libpath"; then
6743- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6744-fi
6745+ lt_aix_libpath_sed='
6746+ /Import File Strings/,/^$/ {
6747+ /^0/ {
6748+ s/^0 *\([^ ]*\) *$/\1/
6749+ p
6750+ }
6751+ }'
6752+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6753+ # Check for a 64-bit object if we didn't find anything.
6754+ if test -z "$lt_cv_aix_libpath_"; then
6755+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6756+ fi
6757 fi
6758 rm -f core conftest.err conftest.$ac_objext \
6759 conftest$ac_exeext conftest.$ac_ext
6760-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6761+ if test -z "$lt_cv_aix_libpath_"; then
6762+ lt_cv_aix_libpath_="/usr/lib:/lib"
6763+ fi
6764+
6765+fi
6766+
6767+ aix_libpath=$lt_cv_aix_libpath_
6768+fi
6769
6770 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6771 # Warning - without using the other run time loading flags,
6772@@ -9076,20 +9611,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6773 # Microsoft Visual C++.
6774 # hardcode_libdir_flag_spec is actually meaningless, as there is
6775 # no search path for DLLs.
6776- hardcode_libdir_flag_spec=' '
6777- allow_undefined_flag=unsupported
6778- # Tell ltmain to make .lib files, not .a files.
6779- libext=lib
6780- # Tell ltmain to make .dll files, not .so files.
6781- shrext_cmds=".dll"
6782- # FIXME: Setting linknames here is a bad hack.
6783- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6784- # The linker will automatically build a .lib file if we build a DLL.
6785- old_archive_from_new_cmds='true'
6786- # FIXME: Should let the user specify the lib program.
6787- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6788- fix_srcfile_path='`cygpath -w "$srcfile"`'
6789- enable_shared_with_static_runtimes=yes
6790+ case $cc_basename in
6791+ cl*)
6792+ # Native MSVC
6793+ hardcode_libdir_flag_spec=' '
6794+ allow_undefined_flag=unsupported
6795+ always_export_symbols=yes
6796+ file_list_spec='@'
6797+ # Tell ltmain to make .lib files, not .a files.
6798+ libext=lib
6799+ # Tell ltmain to make .dll files, not .so files.
6800+ shrext_cmds=".dll"
6801+ # FIXME: Setting linknames here is a bad hack.
6802+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6803+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6804+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6805+ else
6806+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6807+ fi~
6808+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6809+ linknames='
6810+ # The linker will not automatically build a static lib if we build a DLL.
6811+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6812+ enable_shared_with_static_runtimes=yes
6813+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6814+ # Don't use ranlib
6815+ old_postinstall_cmds='chmod 644 $oldlib'
6816+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6817+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6818+ case $lt_outputfile in
6819+ *.exe|*.EXE) ;;
6820+ *)
6821+ lt_outputfile="$lt_outputfile.exe"
6822+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6823+ ;;
6824+ esac~
6825+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6826+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6827+ $RM "$lt_outputfile.manifest";
6828+ fi'
6829+ ;;
6830+ *)
6831+ # Assume MSVC wrapper
6832+ hardcode_libdir_flag_spec=' '
6833+ allow_undefined_flag=unsupported
6834+ # Tell ltmain to make .lib files, not .a files.
6835+ libext=lib
6836+ # Tell ltmain to make .dll files, not .so files.
6837+ shrext_cmds=".dll"
6838+ # FIXME: Setting linknames here is a bad hack.
6839+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6840+ # The linker will automatically build a .lib file if we build a DLL.
6841+ old_archive_from_new_cmds='true'
6842+ # FIXME: Should let the user specify the lib program.
6843+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6844+ enable_shared_with_static_runtimes=yes
6845+ ;;
6846+ esac
6847 ;;
6848
6849 darwin* | rhapsody*)
6850@@ -9150,7 +9728,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6851
6852 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6853 freebsd* | dragonfly*)
6854- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6855+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6856 hardcode_libdir_flag_spec='-R$libdir'
6857 hardcode_direct=yes
6858 hardcode_shlibpath_var=no
6859@@ -9158,7 +9736,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6860
6861 hpux9*)
6862 if test "$GCC" = yes; then
6863- 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'
6864+ 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'
6865 else
6866 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'
6867 fi
6868@@ -9174,7 +9752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6869
6870 hpux10*)
6871 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6872- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6873+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6874 else
6875 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6876 fi
6877@@ -9198,10 +9776,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6878 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6879 ;;
6880 ia64*)
6881- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6882+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6883 ;;
6884 *)
6885- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6886+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6887 ;;
6888 esac
6889 else
6890@@ -9280,23 +9858,36 @@ fi
6891
6892 irix5* | irix6* | nonstopux*)
6893 if test "$GCC" = yes; then
6894- 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'
6895+ 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'
6896 # Try to use the -exported_symbol ld option, if it does not
6897 # work, assume that -exports_file does not work either and
6898 # implicitly export all symbols.
6899- save_LDFLAGS="$LDFLAGS"
6900- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6901- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6902+ # This should be the same for all languages, so no per-tag cache variable.
6903+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6904+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6905+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6906+ $as_echo_n "(cached) " >&6
6907+else
6908+ save_LDFLAGS="$LDFLAGS"
6909+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6910+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6911 /* end confdefs.h. */
6912-int foo(void) {}
6913+int foo (void) { return 0; }
6914 _ACEOF
6915 if ac_fn_c_try_link "$LINENO"; then :
6916- 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'
6917-
6918+ lt_cv_irix_exported_symbol=yes
6919+else
6920+ lt_cv_irix_exported_symbol=no
6921 fi
6922 rm -f core conftest.err conftest.$ac_objext \
6923 conftest$ac_exeext conftest.$ac_ext
6924- LDFLAGS="$save_LDFLAGS"
6925+ LDFLAGS="$save_LDFLAGS"
6926+fi
6927+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6928+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6929+ if test "$lt_cv_irix_exported_symbol" = yes; then
6930+ 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'
6931+ fi
6932 else
6933 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'
6934 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'
6935@@ -9381,7 +9972,7 @@ rm -f core conftest.err conftest.$ac_objext \
6936 osf4* | osf5*) # as osf3* with the addition of -msym flag
6937 if test "$GCC" = yes; then
6938 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6939- 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'
6940+ 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'
6941 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6942 else
6943 allow_undefined_flag=' -expect_unresolved \*'
6944@@ -9400,9 +9991,9 @@ rm -f core conftest.err conftest.$ac_objext \
6945 no_undefined_flag=' -z defs'
6946 if test "$GCC" = yes; then
6947 wlarc='${wl}'
6948- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6949+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6950 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6951- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6952+ $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'
6953 else
6954 case `$CC -V 2>&1` in
6955 *"Compilers 5.0"*)
6956@@ -9978,8 +10569,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6957 need_version=no
6958 need_lib_prefix=no
6959
6960- case $GCC,$host_os in
6961- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6962+ case $GCC,$cc_basename in
6963+ yes,*)
6964+ # gcc
6965 library_names_spec='$libname.dll.a'
6966 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6967 postinstall_cmds='base_file=`basename \${file}`~
6968@@ -10012,13 +10604,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6969 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6970 ;;
6971 esac
6972+ dynamic_linker='Win32 ld.exe'
6973+ ;;
6974+
6975+ *,cl*)
6976+ # Native MSVC
6977+ libname_spec='$name'
6978+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6979+ library_names_spec='${libname}.dll.lib'
6980+
6981+ case $build_os in
6982+ mingw*)
6983+ sys_lib_search_path_spec=
6984+ lt_save_ifs=$IFS
6985+ IFS=';'
6986+ for lt_path in $LIB
6987+ do
6988+ IFS=$lt_save_ifs
6989+ # Let DOS variable expansion print the short 8.3 style file name.
6990+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
6991+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
6992+ done
6993+ IFS=$lt_save_ifs
6994+ # Convert to MSYS style.
6995+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
6996+ ;;
6997+ cygwin*)
6998+ # Convert to unix form, then to dos form, then back to unix form
6999+ # but this time dos style (no spaces!) so that the unix form looks
7000+ # like /cygdrive/c/PROGRA~1:/cygdr...
7001+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7002+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7003+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7004+ ;;
7005+ *)
7006+ sys_lib_search_path_spec="$LIB"
7007+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7008+ # It is most probably a Windows format PATH.
7009+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7010+ else
7011+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7012+ fi
7013+ # FIXME: find the short name or the path components, as spaces are
7014+ # common. (e.g. "Program Files" -> "PROGRA~1")
7015+ ;;
7016+ esac
7017+
7018+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7019+ postinstall_cmds='base_file=`basename \${file}`~
7020+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7021+ dldir=$destdir/`dirname \$dlpath`~
7022+ test -d \$dldir || mkdir -p \$dldir~
7023+ $install_prog $dir/$dlname \$dldir/$dlname'
7024+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7025+ dlpath=$dir/\$dldll~
7026+ $RM \$dlpath'
7027+ shlibpath_overrides_runpath=yes
7028+ dynamic_linker='Win32 link.exe'
7029 ;;
7030
7031 *)
7032+ # Assume MSVC wrapper
7033 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7034+ dynamic_linker='Win32 ld.exe'
7035 ;;
7036 esac
7037- dynamic_linker='Win32 ld.exe'
7038 # FIXME: first we should search . and the directory the executable is in
7039 shlibpath_var=PATH
7040 ;;
7041@@ -10110,7 +10760,7 @@ haiku*)
7042 soname_spec='${libname}${release}${shared_ext}$major'
7043 shlibpath_var=LIBRARY_PATH
7044 shlibpath_overrides_runpath=yes
7045- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7046+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7047 hardcode_into_libs=yes
7048 ;;
7049
7050@@ -10950,10 +11600,10 @@ else
7051 /* When -fvisbility=hidden is used, assume the code has been annotated
7052 correspondingly for the symbols needed. */
7053 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7054-void fnord () __attribute__((visibility("default")));
7055+int fnord () __attribute__((visibility("default")));
7056 #endif
7057
7058-void fnord () { int i=42; }
7059+int fnord () { return 42; }
7060 int main ()
7061 {
7062 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7063@@ -11056,10 +11706,10 @@ else
7064 /* When -fvisbility=hidden is used, assume the code has been annotated
7065 correspondingly for the symbols needed. */
7066 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7067-void fnord () __attribute__((visibility("default")));
7068+int fnord () __attribute__((visibility("default")));
7069 #endif
7070
7071-void fnord () { int i=42; }
7072+int fnord () { return 42; }
7073 int main ()
7074 {
7075 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7076@@ -12961,13 +13611,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7077 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7078 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7079 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7080+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7081+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7082 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7083 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7084 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7085 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7086 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7087+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7088+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7089+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7090+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7091 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7092 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7093+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7094 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7095 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7096 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7097@@ -12982,14 +13639,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7098 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7099 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7100 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"`'
7101+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7102+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7103 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7104 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7105 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7106-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7107 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7108+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7109 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7110 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7111 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7112+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7113 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7114 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7115 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7116@@ -13022,12 +13682,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7117 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7118 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7119 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7120-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7121 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7122 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7123 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7124 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7125 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7126+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7127 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7128 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7129 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7130@@ -13082,8 +13742,13 @@ reload_flag \
7131 OBJDUMP \
7132 deplibs_check_method \
7133 file_magic_cmd \
7134+file_magic_glob \
7135+want_nocaseglob \
7136+DLLTOOL \
7137+sharedlib_from_linklib_cmd \
7138 AR \
7139 AR_FLAGS \
7140+archiver_list_spec \
7141 STRIP \
7142 RANLIB \
7143 CC \
7144@@ -13093,12 +13758,14 @@ lt_cv_sys_global_symbol_pipe \
7145 lt_cv_sys_global_symbol_to_cdecl \
7146 lt_cv_sys_global_symbol_to_c_name_address \
7147 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7148+nm_file_list_spec \
7149 lt_prog_compiler_no_builtin_flag \
7150-lt_prog_compiler_wl \
7151 lt_prog_compiler_pic \
7152+lt_prog_compiler_wl \
7153 lt_prog_compiler_static \
7154 lt_cv_prog_compiler_c_o \
7155 need_locks \
7156+MANIFEST_TOOL \
7157 DSYMUTIL \
7158 NMEDIT \
7159 LIPO \
7160@@ -13114,7 +13781,6 @@ no_undefined_flag \
7161 hardcode_libdir_flag_spec \
7162 hardcode_libdir_flag_spec_ld \
7163 hardcode_libdir_separator \
7164-fix_srcfile_path \
7165 exclude_expsyms \
7166 include_expsyms \
7167 file_list_spec \
7168@@ -13150,6 +13816,7 @@ module_cmds \
7169 module_expsym_cmds \
7170 export_symbols_cmds \
7171 prelink_cmds \
7172+postlink_cmds \
7173 postinstall_cmds \
7174 postuninstall_cmds \
7175 finish_cmds \
7176@@ -13906,7 +14573,8 @@ $as_echo X"$file" |
7177 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7178 #
7179 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7180-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7181+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7182+# Inc.
7183 # Written by Gordon Matzigkeit, 1996
7184 #
7185 # This file is part of GNU Libtool.
7186@@ -14009,19 +14677,42 @@ SP2NL=$lt_lt_SP2NL
7187 # turn newlines into spaces.
7188 NL2SP=$lt_lt_NL2SP
7189
7190+# convert \$build file names to \$host format.
7191+to_host_file_cmd=$lt_cv_to_host_file_cmd
7192+
7193+# convert \$build files to toolchain format.
7194+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7195+
7196 # An object symbol dumper.
7197 OBJDUMP=$lt_OBJDUMP
7198
7199 # Method to check whether dependent libraries are shared objects.
7200 deplibs_check_method=$lt_deplibs_check_method
7201
7202-# Command to use when deplibs_check_method == "file_magic".
7203+# Command to use when deplibs_check_method = "file_magic".
7204 file_magic_cmd=$lt_file_magic_cmd
7205
7206+# How to find potential files when deplibs_check_method = "file_magic".
7207+file_magic_glob=$lt_file_magic_glob
7208+
7209+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7210+want_nocaseglob=$lt_want_nocaseglob
7211+
7212+# DLL creation program.
7213+DLLTOOL=$lt_DLLTOOL
7214+
7215+# Command to associate shared and link libraries.
7216+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7217+
7218 # The archiver.
7219 AR=$lt_AR
7220+
7221+# Flags to create an archive.
7222 AR_FLAGS=$lt_AR_FLAGS
7223
7224+# How to feed a file listing to the archiver.
7225+archiver_list_spec=$lt_archiver_list_spec
7226+
7227 # A symbol stripping program.
7228 STRIP=$lt_STRIP
7229
7230@@ -14051,6 +14742,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7231 # Transform the output of nm in a C name address pair when lib prefix is needed.
7232 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7233
7234+# Specify filename containing input files for \$NM.
7235+nm_file_list_spec=$lt_nm_file_list_spec
7236+
7237+# The root where to search for dependent libraries,and in which our libraries should be installed.
7238+lt_sysroot=$lt_sysroot
7239+
7240 # The name of the directory that contains temporary libtool files.
7241 objdir=$objdir
7242
7243@@ -14060,6 +14757,9 @@ MAGIC_CMD=$MAGIC_CMD
7244 # Must we lock files when doing compilation?
7245 need_locks=$lt_need_locks
7246
7247+# Manifest tool.
7248+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7249+
7250 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7251 DSYMUTIL=$lt_DSYMUTIL
7252
7253@@ -14174,12 +14874,12 @@ with_gcc=$GCC
7254 # Compiler flag to turn off builtin functions.
7255 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7256
7257-# How to pass a linker flag through the compiler.
7258-wl=$lt_lt_prog_compiler_wl
7259-
7260 # Additional compiler flags for building library objects.
7261 pic_flag=$lt_lt_prog_compiler_pic
7262
7263+# How to pass a linker flag through the compiler.
7264+wl=$lt_lt_prog_compiler_wl
7265+
7266 # Compiler flag to prevent dynamic linking.
7267 link_static_flag=$lt_lt_prog_compiler_static
7268
7269@@ -14266,9 +14966,6 @@ inherit_rpath=$inherit_rpath
7270 # Whether libtool must link a program against all its dependency libraries.
7271 link_all_deplibs=$link_all_deplibs
7272
7273-# Fix the shell variable \$srcfile for the compiler.
7274-fix_srcfile_path=$lt_fix_srcfile_path
7275-
7276 # Set to "yes" if exported symbols are required.
7277 always_export_symbols=$always_export_symbols
7278
7279@@ -14284,6 +14981,9 @@ include_expsyms=$lt_include_expsyms
7280 # Commands necessary for linking programs (against libraries) with templates.
7281 prelink_cmds=$lt_prelink_cmds
7282
7283+# Commands necessary for finishing linking programs.
7284+postlink_cmds=$lt_postlink_cmds
7285+
7286 # Specify filename containing input files.
7287 file_list_spec=$lt_file_list_spec
7288
7289@@ -14316,210 +15016,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7290 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7291 # text mode, it properly converts lines to CR/LF. This bash problem
7292 # is reportedly fixed, but why not run on old versions too?
7293- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7294- || (rm -f "$cfgfile"; exit 1)
7295-
7296- case $xsi_shell in
7297- yes)
7298- cat << \_LT_EOF >> "$cfgfile"
7299-
7300-# func_dirname file append nondir_replacement
7301-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7302-# otherwise set result to NONDIR_REPLACEMENT.
7303-func_dirname ()
7304-{
7305- case ${1} in
7306- */*) func_dirname_result="${1%/*}${2}" ;;
7307- * ) func_dirname_result="${3}" ;;
7308- esac
7309-}
7310-
7311-# func_basename file
7312-func_basename ()
7313-{
7314- func_basename_result="${1##*/}"
7315-}
7316-
7317-# func_dirname_and_basename file append nondir_replacement
7318-# perform func_basename and func_dirname in a single function
7319-# call:
7320-# dirname: Compute the dirname of FILE. If nonempty,
7321-# add APPEND to the result, otherwise set result
7322-# to NONDIR_REPLACEMENT.
7323-# value returned in "$func_dirname_result"
7324-# basename: Compute filename of FILE.
7325-# value retuned in "$func_basename_result"
7326-# Implementation must be kept synchronized with func_dirname
7327-# and func_basename. For efficiency, we do not delegate to
7328-# those functions but instead duplicate the functionality here.
7329-func_dirname_and_basename ()
7330-{
7331- case ${1} in
7332- */*) func_dirname_result="${1%/*}${2}" ;;
7333- * ) func_dirname_result="${3}" ;;
7334- esac
7335- func_basename_result="${1##*/}"
7336-}
7337-
7338-# func_stripname prefix suffix name
7339-# strip PREFIX and SUFFIX off of NAME.
7340-# PREFIX and SUFFIX must not contain globbing or regex special
7341-# characters, hashes, percent signs, but SUFFIX may contain a leading
7342-# dot (in which case that matches only a dot).
7343-func_stripname ()
7344-{
7345- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7346- # positional parameters, so assign one to ordinary parameter first.
7347- func_stripname_result=${3}
7348- func_stripname_result=${func_stripname_result#"${1}"}
7349- func_stripname_result=${func_stripname_result%"${2}"}
7350-}
7351-
7352-# func_opt_split
7353-func_opt_split ()
7354-{
7355- func_opt_split_opt=${1%%=*}
7356- func_opt_split_arg=${1#*=}
7357-}
7358-
7359-# func_lo2o object
7360-func_lo2o ()
7361-{
7362- case ${1} in
7363- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7364- *) func_lo2o_result=${1} ;;
7365- esac
7366-}
7367-
7368-# func_xform libobj-or-source
7369-func_xform ()
7370-{
7371- func_xform_result=${1%.*}.lo
7372-}
7373-
7374-# func_arith arithmetic-term...
7375-func_arith ()
7376-{
7377- func_arith_result=$(( $* ))
7378-}
7379-
7380-# func_len string
7381-# STRING may not start with a hyphen.
7382-func_len ()
7383-{
7384- func_len_result=${#1}
7385-}
7386-
7387-_LT_EOF
7388- ;;
7389- *) # Bourne compatible functions.
7390- cat << \_LT_EOF >> "$cfgfile"
7391-
7392-# func_dirname file append nondir_replacement
7393-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7394-# otherwise set result to NONDIR_REPLACEMENT.
7395-func_dirname ()
7396-{
7397- # Extract subdirectory from the argument.
7398- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7399- if test "X$func_dirname_result" = "X${1}"; then
7400- func_dirname_result="${3}"
7401- else
7402- func_dirname_result="$func_dirname_result${2}"
7403- fi
7404-}
7405-
7406-# func_basename file
7407-func_basename ()
7408-{
7409- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7410-}
7411-
7412-
7413-# func_stripname prefix suffix name
7414-# strip PREFIX and SUFFIX off of NAME.
7415-# PREFIX and SUFFIX must not contain globbing or regex special
7416-# characters, hashes, percent signs, but SUFFIX may contain a leading
7417-# dot (in which case that matches only a dot).
7418-# func_strip_suffix prefix name
7419-func_stripname ()
7420-{
7421- case ${2} in
7422- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7423- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7424- esac
7425-}
7426-
7427-# sed scripts:
7428-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7429-my_sed_long_arg='1s/^-[^=]*=//'
7430-
7431-# func_opt_split
7432-func_opt_split ()
7433-{
7434- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7435- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7436-}
7437-
7438-# func_lo2o object
7439-func_lo2o ()
7440-{
7441- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7442-}
7443-
7444-# func_xform libobj-or-source
7445-func_xform ()
7446-{
7447- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7448-}
7449-
7450-# func_arith arithmetic-term...
7451-func_arith ()
7452-{
7453- func_arith_result=`expr "$@"`
7454-}
7455-
7456-# func_len string
7457-# STRING may not start with a hyphen.
7458-func_len ()
7459-{
7460- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7461-}
7462-
7463-_LT_EOF
7464-esac
7465-
7466-case $lt_shell_append in
7467- yes)
7468- cat << \_LT_EOF >> "$cfgfile"
7469-
7470-# func_append var value
7471-# Append VALUE to the end of shell variable VAR.
7472-func_append ()
7473-{
7474- eval "$1+=\$2"
7475-}
7476-_LT_EOF
7477- ;;
7478- *)
7479- cat << \_LT_EOF >> "$cfgfile"
7480-
7481-# func_append var value
7482-# Append VALUE to the end of shell variable VAR.
7483-func_append ()
7484-{
7485- eval "$1=\$$1\$2"
7486-}
7487-
7488-_LT_EOF
7489- ;;
7490- esac
7491-
7492-
7493- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7494- || (rm -f "$cfgfile"; exit 1)
7495-
7496- mv -f "$cfgfile" "$ofile" ||
7497+ sed '$q' "$ltmain" >> "$cfgfile" \
7498+ || (rm -f "$cfgfile"; exit 1)
7499+
7500+ if test x"$xsi_shell" = xyes; then
7501+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7502+func_dirname ()\
7503+{\
7504+\ case ${1} in\
7505+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7506+\ * ) func_dirname_result="${3}" ;;\
7507+\ esac\
7508+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7509+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7510+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7511+test 0 -eq $? || _lt_function_replace_fail=:
7512+
7513+
7514+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7515+func_basename ()\
7516+{\
7517+\ func_basename_result="${1##*/}"\
7518+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7519+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7520+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7521+test 0 -eq $? || _lt_function_replace_fail=:
7522+
7523+
7524+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7525+func_dirname_and_basename ()\
7526+{\
7527+\ case ${1} in\
7528+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7529+\ * ) func_dirname_result="${3}" ;;\
7530+\ esac\
7531+\ func_basename_result="${1##*/}"\
7532+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7533+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7534+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7535+test 0 -eq $? || _lt_function_replace_fail=:
7536+
7537+
7538+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7539+func_stripname ()\
7540+{\
7541+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7542+\ # positional parameters, so assign one to ordinary parameter first.\
7543+\ func_stripname_result=${3}\
7544+\ func_stripname_result=${func_stripname_result#"${1}"}\
7545+\ func_stripname_result=${func_stripname_result%"${2}"}\
7546+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7547+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7548+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7549+test 0 -eq $? || _lt_function_replace_fail=:
7550+
7551+
7552+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7553+func_split_long_opt ()\
7554+{\
7555+\ func_split_long_opt_name=${1%%=*}\
7556+\ func_split_long_opt_arg=${1#*=}\
7557+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7558+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7559+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7560+test 0 -eq $? || _lt_function_replace_fail=:
7561+
7562+
7563+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7564+func_split_short_opt ()\
7565+{\
7566+\ func_split_short_opt_arg=${1#??}\
7567+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7568+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7569+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7570+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7571+test 0 -eq $? || _lt_function_replace_fail=:
7572+
7573+
7574+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7575+func_lo2o ()\
7576+{\
7577+\ case ${1} in\
7578+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7579+\ *) func_lo2o_result=${1} ;;\
7580+\ esac\
7581+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7582+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7583+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7584+test 0 -eq $? || _lt_function_replace_fail=:
7585+
7586+
7587+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7588+func_xform ()\
7589+{\
7590+ func_xform_result=${1%.*}.lo\
7591+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7592+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7593+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7594+test 0 -eq $? || _lt_function_replace_fail=:
7595+
7596+
7597+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7598+func_arith ()\
7599+{\
7600+ func_arith_result=$(( $* ))\
7601+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7602+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7603+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7604+test 0 -eq $? || _lt_function_replace_fail=:
7605+
7606+
7607+ sed -e '/^func_len ()$/,/^} # func_len /c\
7608+func_len ()\
7609+{\
7610+ func_len_result=${#1}\
7611+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7612+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7613+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7614+test 0 -eq $? || _lt_function_replace_fail=:
7615+
7616+fi
7617+
7618+if test x"$lt_shell_append" = xyes; then
7619+ sed -e '/^func_append ()$/,/^} # func_append /c\
7620+func_append ()\
7621+{\
7622+ eval "${1}+=\\${2}"\
7623+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7624+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7625+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7626+test 0 -eq $? || _lt_function_replace_fail=:
7627+
7628+
7629+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7630+func_append_quoted ()\
7631+{\
7632+\ func_quote_for_eval "${2}"\
7633+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7634+} # Extended-shell func_append_quoted implementation' "$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+
7639+
7640+ # Save a `func_append' function call where possible by direct use of '+='
7641+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7642+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7643+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7644+ test 0 -eq $? || _lt_function_replace_fail=:
7645+else
7646+ # Save a `func_append' function call even when '+=' is not available
7647+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7648+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7649+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7650+ test 0 -eq $? || _lt_function_replace_fail=:
7651+fi
7652+
7653+if test x"$_lt_function_replace_fail" = x":"; then
7654+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7655+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7656+fi
7657+
7658+
7659+ mv -f "$cfgfile" "$ofile" ||
7660 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7661 chmod +x "$ofile"
7662
7663diff --git a/ld/configure b/ld/configure
7664index f9be51a..3df1149 100755
7665--- a/ld/configure
7666+++ b/ld/configure
7667@@ -658,8 +658,11 @@ OTOOL
7668 LIPO
7669 NMEDIT
7670 DSYMUTIL
7671+MANIFEST_TOOL
7672 RANLIB
7673+ac_ct_AR
7674 AR
7675+DLLTOOL
7676 OBJDUMP
7677 LN_S
7678 NM
7679@@ -781,6 +784,7 @@ enable_static
7680 with_pic
7681 enable_fast_install
7682 with_gnu_ld
7683+with_libtool_sysroot
7684 enable_libtool_lock
7685 enable_plugins
7686 enable_largefile
7687@@ -1462,6 +1466,8 @@ Optional Packages:
7688 --with-pic try to use only PIC/non-PIC objects [default=use
7689 both]
7690 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7691+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7692+ (or the compiler's sysroot if not specified).
7693 --with-lib-path=dir1:dir2... set default LIB_PATH
7694 --with-sysroot=DIR Search for usr/lib et al within DIR.
7695
7696@@ -5656,8 +5662,8 @@ esac
7697
7698
7699
7700-macro_version='2.2.7a'
7701-macro_revision='1.3134'
7702+macro_version='2.4'
7703+macro_revision='1.3293'
7704
7705
7706
7707@@ -5697,7 +5703,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7709 $as_echo_n "checking how to print strings... " >&6; }
7710 # Test print first, because it will be a builtin if present.
7711-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7712+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7713 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7714 ECHO='print -r --'
7715 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7716@@ -6383,8 +6389,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7717 # Try some XSI features
7718 xsi_shell=no
7719 ( _lt_dummy="a/b/c"
7720- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7721- = c,a/b,, \
7722+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7723+ = c,a/b,b/c, \
7724 && eval 'test $(( 1 + 1 )) -eq 2 \
7725 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7726 && xsi_shell=yes
7727@@ -6433,6 +6439,80 @@ esac
7728
7729
7730
7731+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7732+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7733+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7734+ $as_echo_n "(cached) " >&6
7735+else
7736+ case $host in
7737+ *-*-mingw* )
7738+ case $build in
7739+ *-*-mingw* ) # actually msys
7740+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7741+ ;;
7742+ *-*-cygwin* )
7743+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7744+ ;;
7745+ * ) # otherwise, assume *nix
7746+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7747+ ;;
7748+ esac
7749+ ;;
7750+ *-*-cygwin* )
7751+ case $build in
7752+ *-*-mingw* ) # actually msys
7753+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7754+ ;;
7755+ *-*-cygwin* )
7756+ lt_cv_to_host_file_cmd=func_convert_file_noop
7757+ ;;
7758+ * ) # otherwise, assume *nix
7759+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7760+ ;;
7761+ esac
7762+ ;;
7763+ * ) # unhandled hosts (and "normal" native builds)
7764+ lt_cv_to_host_file_cmd=func_convert_file_noop
7765+ ;;
7766+esac
7767+
7768+fi
7769+
7770+to_host_file_cmd=$lt_cv_to_host_file_cmd
7771+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7772+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7773+
7774+
7775+
7776+
7777+
7778+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7779+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7780+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7781+ $as_echo_n "(cached) " >&6
7782+else
7783+ #assume ordinary cross tools, or native build.
7784+lt_cv_to_tool_file_cmd=func_convert_file_noop
7785+case $host in
7786+ *-*-mingw* )
7787+ case $build in
7788+ *-*-mingw* ) # actually msys
7789+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7790+ ;;
7791+ esac
7792+ ;;
7793+esac
7794+
7795+fi
7796+
7797+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7798+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7799+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7800+
7801+
7802+
7803+
7804+
7805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7806 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7807 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7808@@ -6449,6 +6529,11 @@ case $reload_flag in
7809 esac
7810 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7811 case $host_os in
7812+ cygwin* | mingw* | pw32* | cegcc*)
7813+ if test "$GCC" != yes; then
7814+ reload_cmds=false
7815+ fi
7816+ ;;
7817 darwin*)
7818 if test "$GCC" = yes; then
7819 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7820@@ -6617,7 +6702,8 @@ mingw* | pw32*)
7821 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7822 lt_cv_file_magic_cmd='func_win32_libid'
7823 else
7824- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7825+ # Keep this pattern in sync with the one in func_win32_libid.
7826+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7827 lt_cv_file_magic_cmd='$OBJDUMP -f'
7828 fi
7829 ;;
7830@@ -6771,6 +6857,21 @@ esac
7831 fi
7832 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7833 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7834+
7835+file_magic_glob=
7836+want_nocaseglob=no
7837+if test "$build" = "$host"; then
7838+ case $host_os in
7839+ mingw* | pw32*)
7840+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7841+ want_nocaseglob=yes
7842+ else
7843+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7844+ fi
7845+ ;;
7846+ esac
7847+fi
7848+
7849 file_magic_cmd=$lt_cv_file_magic_cmd
7850 deplibs_check_method=$lt_cv_deplibs_check_method
7851 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7852@@ -6786,9 +6887,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7853
7854
7855
7856+
7857+
7858+
7859+
7860+
7861+
7862+
7863+
7864+
7865+
7866+if test -n "$ac_tool_prefix"; then
7867+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7868+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7869+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7870+$as_echo_n "checking for $ac_word... " >&6; }
7871+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7872+ $as_echo_n "(cached) " >&6
7873+else
7874+ if test -n "$DLLTOOL"; then
7875+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7876+else
7877+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7878+for as_dir in $PATH
7879+do
7880+ IFS=$as_save_IFS
7881+ test -z "$as_dir" && as_dir=.
7882+ for ac_exec_ext in '' $ac_executable_extensions; do
7883+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7884+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7885+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7886+ break 2
7887+ fi
7888+done
7889+ done
7890+IFS=$as_save_IFS
7891+
7892+fi
7893+fi
7894+DLLTOOL=$ac_cv_prog_DLLTOOL
7895+if test -n "$DLLTOOL"; then
7896+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7897+$as_echo "$DLLTOOL" >&6; }
7898+else
7899+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7900+$as_echo "no" >&6; }
7901+fi
7902+
7903+
7904+fi
7905+if test -z "$ac_cv_prog_DLLTOOL"; then
7906+ ac_ct_DLLTOOL=$DLLTOOL
7907+ # Extract the first word of "dlltool", so it can be a program name with args.
7908+set dummy dlltool; ac_word=$2
7909+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7910+$as_echo_n "checking for $ac_word... " >&6; }
7911+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7912+ $as_echo_n "(cached) " >&6
7913+else
7914+ if test -n "$ac_ct_DLLTOOL"; then
7915+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7916+else
7917+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7918+for as_dir in $PATH
7919+do
7920+ IFS=$as_save_IFS
7921+ test -z "$as_dir" && as_dir=.
7922+ for ac_exec_ext in '' $ac_executable_extensions; do
7923+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7924+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7925+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7926+ break 2
7927+ fi
7928+done
7929+ done
7930+IFS=$as_save_IFS
7931+
7932+fi
7933+fi
7934+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7935+if test -n "$ac_ct_DLLTOOL"; then
7936+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7937+$as_echo "$ac_ct_DLLTOOL" >&6; }
7938+else
7939+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7940+$as_echo "no" >&6; }
7941+fi
7942+
7943+ if test "x$ac_ct_DLLTOOL" = x; then
7944+ DLLTOOL="false"
7945+ else
7946+ case $cross_compiling:$ac_tool_warned in
7947+yes:)
7948+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7949+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7950+ac_tool_warned=yes ;;
7951+esac
7952+ DLLTOOL=$ac_ct_DLLTOOL
7953+ fi
7954+else
7955+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7956+fi
7957+
7958+test -z "$DLLTOOL" && DLLTOOL=dlltool
7959+
7960+
7961+
7962+
7963+
7964+
7965+
7966+
7967+
7968+
7969+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7970+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7971+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7972+ $as_echo_n "(cached) " >&6
7973+else
7974+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7975+
7976+case $host_os in
7977+cygwin* | mingw* | pw32* | cegcc*)
7978+ # two different shell functions defined in ltmain.sh
7979+ # decide which to use based on capabilities of $DLLTOOL
7980+ case `$DLLTOOL --help 2>&1` in
7981+ *--identify-strict*)
7982+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7983+ ;;
7984+ *)
7985+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7986+ ;;
7987+ esac
7988+ ;;
7989+*)
7990+ # fallback: assume linklib IS sharedlib
7991+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7992+ ;;
7993+esac
7994+
7995+fi
7996+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7997+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7998+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7999+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8000+
8001+
8002+
8003+
8004+
8005+
8006+
8007 if test -n "$ac_tool_prefix"; then
8008- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8009-set dummy ${ac_tool_prefix}ar; ac_word=$2
8010+ for ac_prog in ar
8011+ do
8012+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8013+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8014 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8015 $as_echo_n "checking for $ac_word... " >&6; }
8016 if test "${ac_cv_prog_AR+set}" = set; then :
8017@@ -6804,7 +7058,7 @@ do
8018 test -z "$as_dir" && as_dir=.
8019 for ac_exec_ext in '' $ac_executable_extensions; do
8020 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8021- ac_cv_prog_AR="${ac_tool_prefix}ar"
8022+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8023 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8024 break 2
8025 fi
8026@@ -6824,11 +7078,15 @@ $as_echo "no" >&6; }
8027 fi
8028
8029
8030+ test -n "$AR" && break
8031+ done
8032 fi
8033-if test -z "$ac_cv_prog_AR"; then
8034+if test -z "$AR"; then
8035 ac_ct_AR=$AR
8036- # Extract the first word of "ar", so it can be a program name with args.
8037-set dummy ar; ac_word=$2
8038+ for ac_prog in ar
8039+do
8040+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8041+set dummy $ac_prog; ac_word=$2
8042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8043 $as_echo_n "checking for $ac_word... " >&6; }
8044 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8045@@ -6844,7 +7102,7 @@ do
8046 test -z "$as_dir" && as_dir=.
8047 for ac_exec_ext in '' $ac_executable_extensions; do
8048 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8049- ac_cv_prog_ac_ct_AR="ar"
8050+ ac_cv_prog_ac_ct_AR="$ac_prog"
8051 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8052 break 2
8053 fi
8054@@ -6863,6 +7121,10 @@ else
8055 $as_echo "no" >&6; }
8056 fi
8057
8058+
8059+ test -n "$ac_ct_AR" && break
8060+done
8061+
8062 if test "x$ac_ct_AR" = x; then
8063 AR="false"
8064 else
8065@@ -6874,12 +7136,12 @@ ac_tool_warned=yes ;;
8066 esac
8067 AR=$ac_ct_AR
8068 fi
8069-else
8070- AR="$ac_cv_prog_AR"
8071 fi
8072
8073-test -z "$AR" && AR=ar
8074-test -z "$AR_FLAGS" && AR_FLAGS=cru
8075+: ${AR=ar}
8076+: ${AR_FLAGS=cru}
8077+
8078+
8079
8080
8081
8082@@ -6889,6 +7151,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8083
8084
8085
8086+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8087+$as_echo_n "checking for archiver @FILE support... " >&6; }
8088+if test "${lt_cv_ar_at_file+set}" = set; then :
8089+ $as_echo_n "(cached) " >&6
8090+else
8091+ lt_cv_ar_at_file=no
8092+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8093+/* end confdefs.h. */
8094+
8095+int
8096+main ()
8097+{
8098+
8099+ ;
8100+ return 0;
8101+}
8102+_ACEOF
8103+if ac_fn_c_try_compile "$LINENO"; then :
8104+ echo conftest.$ac_objext > conftest.lst
8105+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8106+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8107+ (eval $lt_ar_try) 2>&5
8108+ ac_status=$?
8109+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8110+ test $ac_status = 0; }
8111+ if test "$ac_status" -eq 0; then
8112+ # Ensure the archiver fails upon bogus file names.
8113+ rm -f conftest.$ac_objext libconftest.a
8114+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8115+ (eval $lt_ar_try) 2>&5
8116+ ac_status=$?
8117+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8118+ test $ac_status = 0; }
8119+ if test "$ac_status" -ne 0; then
8120+ lt_cv_ar_at_file=@
8121+ fi
8122+ fi
8123+ rm -f conftest.* libconftest.a
8124+
8125+fi
8126+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8127+
8128+fi
8129+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8130+$as_echo "$lt_cv_ar_at_file" >&6; }
8131+
8132+if test "x$lt_cv_ar_at_file" = xno; then
8133+ archiver_list_spec=
8134+else
8135+ archiver_list_spec=$lt_cv_ar_at_file
8136+fi
8137+
8138+
8139+
8140+
8141+
8142
8143
8144 if test -n "$ac_tool_prefix"; then
8145@@ -7225,8 +7543,8 @@ esac
8146 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8147
8148 # Transform an extracted symbol line into symbol name and symbol address
8149-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8150-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'"
8151+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8152+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'"
8153
8154 # Handle CRLF in mingw tool chain
8155 opt_cr=
8156@@ -7262,6 +7580,7 @@ for ac_symprfx in "" "_"; do
8157 else
8158 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8159 fi
8160+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8161
8162 # Check to see that the pipe works correctly.
8163 pipe_works=no
8164@@ -7303,6 +7622,18 @@ _LT_EOF
8165 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8166 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8167 cat <<_LT_EOF > conftest.$ac_ext
8168+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8169+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8170+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8171+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8172+# define LT_DLSYM_CONST
8173+#elif defined(__osf__)
8174+/* This system does not cope well with relocations in const data. */
8175+# define LT_DLSYM_CONST
8176+#else
8177+# define LT_DLSYM_CONST const
8178+#endif
8179+
8180 #ifdef __cplusplus
8181 extern "C" {
8182 #endif
8183@@ -7314,7 +7645,7 @@ _LT_EOF
8184 cat <<_LT_EOF >> conftest.$ac_ext
8185
8186 /* The mapping between symbol names and symbols. */
8187-const struct {
8188+LT_DLSYM_CONST struct {
8189 const char *name;
8190 void *address;
8191 }
8192@@ -7340,8 +7671,8 @@ static const void *lt_preloaded_setup() {
8193 _LT_EOF
8194 # Now try linking the two files.
8195 mv conftest.$ac_objext conftstm.$ac_objext
8196- lt_save_LIBS="$LIBS"
8197- lt_save_CFLAGS="$CFLAGS"
8198+ lt_globsym_save_LIBS=$LIBS
8199+ lt_globsym_save_CFLAGS=$CFLAGS
8200 LIBS="conftstm.$ac_objext"
8201 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8202 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8203@@ -7351,8 +7682,8 @@ _LT_EOF
8204 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8205 pipe_works=yes
8206 fi
8207- LIBS="$lt_save_LIBS"
8208- CFLAGS="$lt_save_CFLAGS"
8209+ LIBS=$lt_globsym_save_LIBS
8210+ CFLAGS=$lt_globsym_save_CFLAGS
8211 else
8212 echo "cannot find nm_test_func in $nlist" >&5
8213 fi
8214@@ -7389,6 +7720,19 @@ else
8215 $as_echo "ok" >&6; }
8216 fi
8217
8218+# Response file support.
8219+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8220+ nm_file_list_spec='@'
8221+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8222+ nm_file_list_spec='@'
8223+fi
8224+
8225+
8226+
8227+
8228+
8229+
8230+
8231
8232
8233
8234@@ -7409,6 +7753,42 @@ fi
8235
8236
8237
8238+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8239+$as_echo_n "checking for sysroot... " >&6; }
8240+
8241+# Check whether --with-libtool-sysroot was given.
8242+if test "${with_libtool_sysroot+set}" = set; then :
8243+ withval=$with_libtool_sysroot;
8244+else
8245+ with_libtool_sysroot=no
8246+fi
8247+
8248+
8249+lt_sysroot=
8250+case ${with_libtool_sysroot} in #(
8251+ yes)
8252+ if test "$GCC" = yes; then
8253+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8254+ fi
8255+ ;; #(
8256+ /*)
8257+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8258+ ;; #(
8259+ no|'')
8260+ ;; #(
8261+ *)
8262+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8263+$as_echo "${with_libtool_sysroot}" >&6; }
8264+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
8265+ ;;
8266+esac
8267+
8268+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8269+$as_echo "${lt_sysroot:-no}" >&6; }
8270+
8271+
8272+
8273+
8274
8275 # Check whether --enable-libtool-lock was given.
8276 if test "${enable_libtool_lock+set}" = set; then :
8277@@ -7616,6 +7996,123 @@ esac
8278
8279 need_locks="$enable_libtool_lock"
8280
8281+if test -n "$ac_tool_prefix"; then
8282+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8283+set dummy ${ac_tool_prefix}mt; ac_word=$2
8284+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8285+$as_echo_n "checking for $ac_word... " >&6; }
8286+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
8287+ $as_echo_n "(cached) " >&6
8288+else
8289+ if test -n "$MANIFEST_TOOL"; then
8290+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8291+else
8292+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8293+for as_dir in $PATH
8294+do
8295+ IFS=$as_save_IFS
8296+ test -z "$as_dir" && as_dir=.
8297+ for ac_exec_ext in '' $ac_executable_extensions; do
8298+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8299+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8300+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8301+ break 2
8302+ fi
8303+done
8304+ done
8305+IFS=$as_save_IFS
8306+
8307+fi
8308+fi
8309+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8310+if test -n "$MANIFEST_TOOL"; then
8311+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8312+$as_echo "$MANIFEST_TOOL" >&6; }
8313+else
8314+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8315+$as_echo "no" >&6; }
8316+fi
8317+
8318+
8319+fi
8320+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8321+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8322+ # Extract the first word of "mt", so it can be a program name with args.
8323+set dummy mt; ac_word=$2
8324+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8325+$as_echo_n "checking for $ac_word... " >&6; }
8326+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
8327+ $as_echo_n "(cached) " >&6
8328+else
8329+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8330+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8331+else
8332+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8333+for as_dir in $PATH
8334+do
8335+ IFS=$as_save_IFS
8336+ test -z "$as_dir" && as_dir=.
8337+ for ac_exec_ext in '' $ac_executable_extensions; do
8338+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8339+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8340+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8341+ break 2
8342+ fi
8343+done
8344+ done
8345+IFS=$as_save_IFS
8346+
8347+fi
8348+fi
8349+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8350+if test -n "$ac_ct_MANIFEST_TOOL"; then
8351+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8352+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8353+else
8354+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8355+$as_echo "no" >&6; }
8356+fi
8357+
8358+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8359+ MANIFEST_TOOL=":"
8360+ else
8361+ case $cross_compiling:$ac_tool_warned in
8362+yes:)
8363+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8364+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8365+ac_tool_warned=yes ;;
8366+esac
8367+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8368+ fi
8369+else
8370+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8371+fi
8372+
8373+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8374+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8375+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8376+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
8377+ $as_echo_n "(cached) " >&6
8378+else
8379+ lt_cv_path_mainfest_tool=no
8380+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8381+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8382+ cat conftest.err >&5
8383+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8384+ lt_cv_path_mainfest_tool=yes
8385+ fi
8386+ rm -f conftest*
8387+fi
8388+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8389+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8390+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8391+ MANIFEST_TOOL=:
8392+fi
8393+
8394+
8395+
8396+
8397+
8398
8399 case $host_os in
8400 rhapsody* | darwin*)
8401@@ -8179,6 +8676,8 @@ _LT_EOF
8402 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8403 echo "$AR cru libconftest.a conftest.o" >&5
8404 $AR cru libconftest.a conftest.o 2>&5
8405+ echo "$RANLIB libconftest.a" >&5
8406+ $RANLIB libconftest.a 2>&5
8407 cat > conftest.c << _LT_EOF
8408 int main() { return 0;}
8409 _LT_EOF
8410@@ -8247,6 +8746,16 @@ done
8411
8412
8413
8414+func_stripname_cnf ()
8415+{
8416+ case ${2} in
8417+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8418+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8419+ esac
8420+} # func_stripname_cnf
8421+
8422+
8423+
8424
8425
8426 # Set options
8427@@ -8375,7 +8884,8 @@ fi
8428 LIBTOOL_DEPS="$ltmain"
8429
8430 # Always use our own libtool.
8431-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8432+LIBTOOL='$(SHELL) $(top_builddir)'
8433+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8434
8435
8436
8437@@ -8464,7 +8974,7 @@ aix3*)
8438 esac
8439
8440 # Global variables:
8441-ofile=libtool
8442+ofile=${host_alias}-libtool
8443 can_build_shared=yes
8444
8445 # All known linkers require a `.a' archive for static linking (except MSVC,
8446@@ -8762,8 +9272,6 @@ fi
8447 lt_prog_compiler_pic=
8448 lt_prog_compiler_static=
8449
8450-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8451-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8452
8453 if test "$GCC" = yes; then
8454 lt_prog_compiler_wl='-Wl,'
8455@@ -8929,6 +9437,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8456 lt_prog_compiler_pic='--shared'
8457 lt_prog_compiler_static='--static'
8458 ;;
8459+ nagfor*)
8460+ # NAG Fortran compiler
8461+ lt_prog_compiler_wl='-Wl,-Wl,,'
8462+ lt_prog_compiler_pic='-PIC'
8463+ lt_prog_compiler_static='-Bstatic'
8464+ ;;
8465 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8466 # Portland Group compilers (*not* the Pentium gcc compiler,
8467 # which looks to be a dead project)
8468@@ -8991,7 +9505,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8469 lt_prog_compiler_pic='-KPIC'
8470 lt_prog_compiler_static='-Bstatic'
8471 case $cc_basename in
8472- f77* | f90* | f95*)
8473+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8474 lt_prog_compiler_wl='-Qoption ld ';;
8475 *)
8476 lt_prog_compiler_wl='-Wl,';;
8477@@ -9048,13 +9562,17 @@ case $host_os in
8478 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8479 ;;
8480 esac
8481-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8482-$as_echo "$lt_prog_compiler_pic" >&6; }
8483-
8484-
8485-
8486-
8487
8488+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8489+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8490+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
8491+ $as_echo_n "(cached) " >&6
8492+else
8493+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8494+fi
8495+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8496+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8497+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8498
8499 #
8500 # Check to make sure the PIC flag actually works.
8501@@ -9115,6 +9633,11 @@ fi
8502
8503
8504
8505+
8506+
8507+
8508+
8509+
8510 #
8511 # Check to make sure the static flag actually works.
8512 #
8513@@ -9465,7 +9988,8 @@ _LT_EOF
8514 allow_undefined_flag=unsupported
8515 always_export_symbols=no
8516 enable_shared_with_static_runtimes=yes
8517- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8518+ 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'
8519+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8520
8521 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8522 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8523@@ -9564,12 +10088,12 @@ _LT_EOF
8524 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8525 hardcode_libdir_flag_spec=
8526 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8527- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8528+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8529 if test "x$supports_anon_versioning" = xyes; then
8530 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8531 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8532 echo "local: *; };" >> $output_objdir/$libname.ver~
8533- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8534+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8535 fi
8536 ;;
8537 esac
8538@@ -9583,8 +10107,8 @@ _LT_EOF
8539 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8540 wlarc=
8541 else
8542- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8543- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8544+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8545+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8546 fi
8547 ;;
8548
8549@@ -9602,8 +10126,8 @@ _LT_EOF
8550
8551 _LT_EOF
8552 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8553- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8554- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8555+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8556+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8557 else
8558 ld_shlibs=no
8559 fi
8560@@ -9649,8 +10173,8 @@ _LT_EOF
8561
8562 *)
8563 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8564- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8565- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8566+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8567+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8568 else
8569 ld_shlibs=no
8570 fi
8571@@ -9780,7 +10304,13 @@ _LT_EOF
8572 allow_undefined_flag='-berok'
8573 # Determine the default libpath from the value encoded in an
8574 # empty executable.
8575- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8576+ if test "${lt_cv_aix_libpath+set}" = set; then
8577+ aix_libpath=$lt_cv_aix_libpath
8578+else
8579+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8580+ $as_echo_n "(cached) " >&6
8581+else
8582+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8583 /* end confdefs.h. */
8584
8585 int
8586@@ -9793,22 +10323,29 @@ main ()
8587 _ACEOF
8588 if ac_fn_c_try_link "$LINENO"; then :
8589
8590-lt_aix_libpath_sed='
8591- /Import File Strings/,/^$/ {
8592- /^0/ {
8593- s/^0 *\(.*\)$/\1/
8594- p
8595- }
8596- }'
8597-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8598-# Check for a 64-bit object if we didn't find anything.
8599-if test -z "$aix_libpath"; then
8600- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8601-fi
8602+ lt_aix_libpath_sed='
8603+ /Import File Strings/,/^$/ {
8604+ /^0/ {
8605+ s/^0 *\([^ ]*\) *$/\1/
8606+ p
8607+ }
8608+ }'
8609+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8610+ # Check for a 64-bit object if we didn't find anything.
8611+ if test -z "$lt_cv_aix_libpath_"; then
8612+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8613+ fi
8614 fi
8615 rm -f core conftest.err conftest.$ac_objext \
8616 conftest$ac_exeext conftest.$ac_ext
8617-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8618+ if test -z "$lt_cv_aix_libpath_"; then
8619+ lt_cv_aix_libpath_="/usr/lib:/lib"
8620+ fi
8621+
8622+fi
8623+
8624+ aix_libpath=$lt_cv_aix_libpath_
8625+fi
8626
8627 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8628 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"
8629@@ -9820,7 +10357,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8630 else
8631 # Determine the default libpath from the value encoded in an
8632 # empty executable.
8633- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8634+ if test "${lt_cv_aix_libpath+set}" = set; then
8635+ aix_libpath=$lt_cv_aix_libpath
8636+else
8637+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8638+ $as_echo_n "(cached) " >&6
8639+else
8640+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8641 /* end confdefs.h. */
8642
8643 int
8644@@ -9833,22 +10376,29 @@ main ()
8645 _ACEOF
8646 if ac_fn_c_try_link "$LINENO"; then :
8647
8648-lt_aix_libpath_sed='
8649- /Import File Strings/,/^$/ {
8650- /^0/ {
8651- s/^0 *\(.*\)$/\1/
8652- p
8653- }
8654- }'
8655-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8656-# Check for a 64-bit object if we didn't find anything.
8657-if test -z "$aix_libpath"; then
8658- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8659-fi
8660+ lt_aix_libpath_sed='
8661+ /Import File Strings/,/^$/ {
8662+ /^0/ {
8663+ s/^0 *\([^ ]*\) *$/\1/
8664+ p
8665+ }
8666+ }'
8667+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8668+ # Check for a 64-bit object if we didn't find anything.
8669+ if test -z "$lt_cv_aix_libpath_"; then
8670+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8671+ fi
8672 fi
8673 rm -f core conftest.err conftest.$ac_objext \
8674 conftest$ac_exeext conftest.$ac_ext
8675-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8676+ if test -z "$lt_cv_aix_libpath_"; then
8677+ lt_cv_aix_libpath_="/usr/lib:/lib"
8678+ fi
8679+
8680+fi
8681+
8682+ aix_libpath=$lt_cv_aix_libpath_
8683+fi
8684
8685 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8686 # Warning - without using the other run time loading flags,
8687@@ -9892,21 +10442,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8688 # When not using gcc, we currently assume that we are using
8689 # Microsoft Visual C++.
8690 # hardcode_libdir_flag_spec is actually meaningless, as there is
8691- # no search path for DLLs.
8692- hardcode_libdir_flag_spec=' '
8693- allow_undefined_flag=unsupported
8694- # Tell ltmain to make .lib files, not .a files.
8695- libext=lib
8696- # Tell ltmain to make .dll files, not .so files.
8697- shrext_cmds=".dll"
8698- # FIXME: Setting linknames here is a bad hack.
8699- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8700- # The linker will automatically build a .lib file if we build a DLL.
8701- old_archive_from_new_cmds='true'
8702- # FIXME: Should let the user specify the lib program.
8703- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8704- fix_srcfile_path='`cygpath -w "$srcfile"`'
8705- enable_shared_with_static_runtimes=yes
8706+ # no search path for DLLs.
8707+ case $cc_basename in
8708+ cl*)
8709+ # Native MSVC
8710+ hardcode_libdir_flag_spec=' '
8711+ allow_undefined_flag=unsupported
8712+ always_export_symbols=yes
8713+ file_list_spec='@'
8714+ # Tell ltmain to make .lib files, not .a files.
8715+ libext=lib
8716+ # Tell ltmain to make .dll files, not .so files.
8717+ shrext_cmds=".dll"
8718+ # FIXME: Setting linknames here is a bad hack.
8719+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8720+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8721+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8722+ else
8723+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8724+ fi~
8725+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8726+ linknames='
8727+ # The linker will not automatically build a static lib if we build a DLL.
8728+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8729+ enable_shared_with_static_runtimes=yes
8730+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8731+ # Don't use ranlib
8732+ old_postinstall_cmds='chmod 644 $oldlib'
8733+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8734+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8735+ case $lt_outputfile in
8736+ *.exe|*.EXE) ;;
8737+ *)
8738+ lt_outputfile="$lt_outputfile.exe"
8739+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8740+ ;;
8741+ esac~
8742+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8743+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8744+ $RM "$lt_outputfile.manifest";
8745+ fi'
8746+ ;;
8747+ *)
8748+ # Assume MSVC wrapper
8749+ hardcode_libdir_flag_spec=' '
8750+ allow_undefined_flag=unsupported
8751+ # Tell ltmain to make .lib files, not .a files.
8752+ libext=lib
8753+ # Tell ltmain to make .dll files, not .so files.
8754+ shrext_cmds=".dll"
8755+ # FIXME: Setting linknames here is a bad hack.
8756+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8757+ # The linker will automatically build a .lib file if we build a DLL.
8758+ old_archive_from_new_cmds='true'
8759+ # FIXME: Should let the user specify the lib program.
8760+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8761+ enable_shared_with_static_runtimes=yes
8762+ ;;
8763+ esac
8764 ;;
8765
8766 darwin* | rhapsody*)
8767@@ -9967,7 +10560,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8768
8769 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8770 freebsd* | dragonfly*)
8771- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8772+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8773 hardcode_libdir_flag_spec='-R$libdir'
8774 hardcode_direct=yes
8775 hardcode_shlibpath_var=no
8776@@ -9975,7 +10568,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8777
8778 hpux9*)
8779 if test "$GCC" = yes; then
8780- 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'
8781+ 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'
8782 else
8783 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'
8784 fi
8785@@ -9991,7 +10584,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8786
8787 hpux10*)
8788 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8789- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8790+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8791 else
8792 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8793 fi
8794@@ -10015,10 +10608,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8795 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8796 ;;
8797 ia64*)
8798- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8799+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8800 ;;
8801 *)
8802- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8803+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8804 ;;
8805 esac
8806 else
8807@@ -10097,23 +10690,36 @@ fi
8808
8809 irix5* | irix6* | nonstopux*)
8810 if test "$GCC" = yes; then
8811- 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'
8812+ 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'
8813 # Try to use the -exported_symbol ld option, if it does not
8814 # work, assume that -exports_file does not work either and
8815 # implicitly export all symbols.
8816- save_LDFLAGS="$LDFLAGS"
8817- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8818- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8819+ # This should be the same for all languages, so no per-tag cache variable.
8820+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8821+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8822+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8823+ $as_echo_n "(cached) " >&6
8824+else
8825+ save_LDFLAGS="$LDFLAGS"
8826+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8827+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8828 /* end confdefs.h. */
8829-int foo(void) {}
8830+int foo (void) { return 0; }
8831 _ACEOF
8832 if ac_fn_c_try_link "$LINENO"; then :
8833- 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'
8834-
8835+ lt_cv_irix_exported_symbol=yes
8836+else
8837+ lt_cv_irix_exported_symbol=no
8838 fi
8839 rm -f core conftest.err conftest.$ac_objext \
8840 conftest$ac_exeext conftest.$ac_ext
8841- LDFLAGS="$save_LDFLAGS"
8842+ LDFLAGS="$save_LDFLAGS"
8843+fi
8844+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8845+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8846+ if test "$lt_cv_irix_exported_symbol" = yes; then
8847+ 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'
8848+ fi
8849 else
8850 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'
8851 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'
8852@@ -10198,7 +10804,7 @@ rm -f core conftest.err conftest.$ac_objext \
8853 osf4* | osf5*) # as osf3* with the addition of -msym flag
8854 if test "$GCC" = yes; then
8855 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8856- 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'
8857+ 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'
8858 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8859 else
8860 allow_undefined_flag=' -expect_unresolved \*'
8861@@ -10217,9 +10823,9 @@ rm -f core conftest.err conftest.$ac_objext \
8862 no_undefined_flag=' -z defs'
8863 if test "$GCC" = yes; then
8864 wlarc='${wl}'
8865- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8866+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8867 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8868- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8869+ $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'
8870 else
8871 case `$CC -V 2>&1` in
8872 *"Compilers 5.0"*)
8873@@ -10795,8 +11401,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8874 need_version=no
8875 need_lib_prefix=no
8876
8877- case $GCC,$host_os in
8878- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8879+ case $GCC,$cc_basename in
8880+ yes,*)
8881+ # gcc
8882 library_names_spec='$libname.dll.a'
8883 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8884 postinstall_cmds='base_file=`basename \${file}`~
8885@@ -10829,13 +11436,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8886 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8887 ;;
8888 esac
8889+ dynamic_linker='Win32 ld.exe'
8890+ ;;
8891+
8892+ *,cl*)
8893+ # Native MSVC
8894+ libname_spec='$name'
8895+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8896+ library_names_spec='${libname}.dll.lib'
8897+
8898+ case $build_os in
8899+ mingw*)
8900+ sys_lib_search_path_spec=
8901+ lt_save_ifs=$IFS
8902+ IFS=';'
8903+ for lt_path in $LIB
8904+ do
8905+ IFS=$lt_save_ifs
8906+ # Let DOS variable expansion print the short 8.3 style file name.
8907+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8908+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8909+ done
8910+ IFS=$lt_save_ifs
8911+ # Convert to MSYS style.
8912+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8913+ ;;
8914+ cygwin*)
8915+ # Convert to unix form, then to dos form, then back to unix form
8916+ # but this time dos style (no spaces!) so that the unix form looks
8917+ # like /cygdrive/c/PROGRA~1:/cygdr...
8918+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8919+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8920+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8921+ ;;
8922+ *)
8923+ sys_lib_search_path_spec="$LIB"
8924+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8925+ # It is most probably a Windows format PATH.
8926+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8927+ else
8928+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8929+ fi
8930+ # FIXME: find the short name or the path components, as spaces are
8931+ # common. (e.g. "Program Files" -> "PROGRA~1")
8932+ ;;
8933+ esac
8934+
8935+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8936+ postinstall_cmds='base_file=`basename \${file}`~
8937+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8938+ dldir=$destdir/`dirname \$dlpath`~
8939+ test -d \$dldir || mkdir -p \$dldir~
8940+ $install_prog $dir/$dlname \$dldir/$dlname'
8941+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8942+ dlpath=$dir/\$dldll~
8943+ $RM \$dlpath'
8944+ shlibpath_overrides_runpath=yes
8945+ dynamic_linker='Win32 link.exe'
8946 ;;
8947
8948 *)
8949+ # Assume MSVC wrapper
8950 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8951+ dynamic_linker='Win32 ld.exe'
8952 ;;
8953 esac
8954- dynamic_linker='Win32 ld.exe'
8955 # FIXME: first we should search . and the directory the executable is in
8956 shlibpath_var=PATH
8957 ;;
8958@@ -10927,7 +11592,7 @@ haiku*)
8959 soname_spec='${libname}${release}${shared_ext}$major'
8960 shlibpath_var=LIBRARY_PATH
8961 shlibpath_overrides_runpath=yes
8962- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8963+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8964 hardcode_into_libs=yes
8965 ;;
8966
8967@@ -11767,10 +12432,10 @@ else
8968 /* When -fvisbility=hidden is used, assume the code has been annotated
8969 correspondingly for the symbols needed. */
8970 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8971-void fnord () __attribute__((visibility("default")));
8972+int fnord () __attribute__((visibility("default")));
8973 #endif
8974
8975-void fnord () { int i=42; }
8976+int fnord () { return 42; }
8977 int main ()
8978 {
8979 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8980@@ -11873,10 +12538,10 @@ else
8981 /* When -fvisbility=hidden is used, assume the code has been annotated
8982 correspondingly for the symbols needed. */
8983 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8984-void fnord () __attribute__((visibility("default")));
8985+int fnord () __attribute__((visibility("default")));
8986 #endif
8987
8988-void fnord () { int i=42; }
8989+int fnord () { return 42; }
8990 int main ()
8991 {
8992 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8993@@ -12268,6 +12933,7 @@ $RM -r conftest*
8994
8995 # Allow CC to be a program name with arguments.
8996 lt_save_CC=$CC
8997+ lt_save_CFLAGS=$CFLAGS
8998 lt_save_LD=$LD
8999 lt_save_GCC=$GCC
9000 GCC=$GXX
9001@@ -12285,6 +12951,7 @@ $RM -r conftest*
9002 fi
9003 test -z "${LDCXX+set}" || LD=$LDCXX
9004 CC=${CXX-"c++"}
9005+ CFLAGS=$CXXFLAGS
9006 compiler=$CC
9007 compiler_CXX=$CC
9008 for cc_temp in $compiler""; do
9009@@ -12567,7 +13234,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9010 allow_undefined_flag_CXX='-berok'
9011 # Determine the default libpath from the value encoded in an empty
9012 # executable.
9013- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9014+ if test "${lt_cv_aix_libpath+set}" = set; then
9015+ aix_libpath=$lt_cv_aix_libpath
9016+else
9017+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9018+ $as_echo_n "(cached) " >&6
9019+else
9020+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9021 /* end confdefs.h. */
9022
9023 int
9024@@ -12580,22 +13253,29 @@ main ()
9025 _ACEOF
9026 if ac_fn_cxx_try_link "$LINENO"; then :
9027
9028-lt_aix_libpath_sed='
9029- /Import File Strings/,/^$/ {
9030- /^0/ {
9031- s/^0 *\(.*\)$/\1/
9032- p
9033- }
9034- }'
9035-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9036-# Check for a 64-bit object if we didn't find anything.
9037-if test -z "$aix_libpath"; then
9038- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9039-fi
9040+ lt_aix_libpath_sed='
9041+ /Import File Strings/,/^$/ {
9042+ /^0/ {
9043+ s/^0 *\([^ ]*\) *$/\1/
9044+ p
9045+ }
9046+ }'
9047+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9048+ # Check for a 64-bit object if we didn't find anything.
9049+ if test -z "$lt_cv_aix_libpath__CXX"; then
9050+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9051+ fi
9052 fi
9053 rm -f core conftest.err conftest.$ac_objext \
9054 conftest$ac_exeext conftest.$ac_ext
9055-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9056+ if test -z "$lt_cv_aix_libpath__CXX"; then
9057+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9058+ fi
9059+
9060+fi
9061+
9062+ aix_libpath=$lt_cv_aix_libpath__CXX
9063+fi
9064
9065 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9066
9067@@ -12608,7 +13288,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9068 else
9069 # Determine the default libpath from the value encoded in an
9070 # empty executable.
9071- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9072+ if test "${lt_cv_aix_libpath+set}" = set; then
9073+ aix_libpath=$lt_cv_aix_libpath
9074+else
9075+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9076+ $as_echo_n "(cached) " >&6
9077+else
9078+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9079 /* end confdefs.h. */
9080
9081 int
9082@@ -12621,22 +13307,29 @@ main ()
9083 _ACEOF
9084 if ac_fn_cxx_try_link "$LINENO"; then :
9085
9086-lt_aix_libpath_sed='
9087- /Import File Strings/,/^$/ {
9088- /^0/ {
9089- s/^0 *\(.*\)$/\1/
9090- p
9091- }
9092- }'
9093-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9094-# Check for a 64-bit object if we didn't find anything.
9095-if test -z "$aix_libpath"; then
9096- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9097-fi
9098+ lt_aix_libpath_sed='
9099+ /Import File Strings/,/^$/ {
9100+ /^0/ {
9101+ s/^0 *\([^ ]*\) *$/\1/
9102+ p
9103+ }
9104+ }'
9105+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9106+ # Check for a 64-bit object if we didn't find anything.
9107+ if test -z "$lt_cv_aix_libpath__CXX"; then
9108+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9109+ fi
9110 fi
9111 rm -f core conftest.err conftest.$ac_objext \
9112 conftest$ac_exeext conftest.$ac_ext
9113-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9114+ if test -z "$lt_cv_aix_libpath__CXX"; then
9115+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9116+ fi
9117+
9118+fi
9119+
9120+ aix_libpath=$lt_cv_aix_libpath__CXX
9121+fi
9122
9123 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9124 # Warning - without using the other run time loading flags,
9125@@ -12679,29 +13372,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9126 ;;
9127
9128 cygwin* | mingw* | pw32* | cegcc*)
9129- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9130- # as there is no search path for DLLs.
9131- hardcode_libdir_flag_spec_CXX='-L$libdir'
9132- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9133- allow_undefined_flag_CXX=unsupported
9134- always_export_symbols_CXX=no
9135- enable_shared_with_static_runtimes_CXX=yes
9136-
9137- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9138- 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'
9139- # If the export-symbols file already is a .def file (1st line
9140- # is EXPORTS), use it as is; otherwise, prepend...
9141- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9142- cp $export_symbols $output_objdir/$soname.def;
9143- else
9144- echo EXPORTS > $output_objdir/$soname.def;
9145- cat $export_symbols >> $output_objdir/$soname.def;
9146- fi~
9147- $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'
9148- else
9149- ld_shlibs_CXX=no
9150- fi
9151- ;;
9152+ case $GXX,$cc_basename in
9153+ ,cl* | no,cl*)
9154+ # Native MSVC
9155+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9156+ # no search path for DLLs.
9157+ hardcode_libdir_flag_spec_CXX=' '
9158+ allow_undefined_flag_CXX=unsupported
9159+ always_export_symbols_CXX=yes
9160+ file_list_spec_CXX='@'
9161+ # Tell ltmain to make .lib files, not .a files.
9162+ libext=lib
9163+ # Tell ltmain to make .dll files, not .so files.
9164+ shrext_cmds=".dll"
9165+ # FIXME: Setting linknames here is a bad hack.
9166+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9167+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9168+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9169+ else
9170+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9171+ fi~
9172+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9173+ linknames='
9174+ # The linker will not automatically build a static lib if we build a DLL.
9175+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9176+ enable_shared_with_static_runtimes_CXX=yes
9177+ # Don't use ranlib
9178+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9179+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9180+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9181+ case $lt_outputfile in
9182+ *.exe|*.EXE) ;;
9183+ *)
9184+ lt_outputfile="$lt_outputfile.exe"
9185+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9186+ ;;
9187+ esac~
9188+ func_to_tool_file "$lt_outputfile"~
9189+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9190+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9191+ $RM "$lt_outputfile.manifest";
9192+ fi'
9193+ ;;
9194+ *)
9195+ # g++
9196+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9197+ # as there is no search path for DLLs.
9198+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9199+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9200+ allow_undefined_flag_CXX=unsupported
9201+ always_export_symbols_CXX=no
9202+ enable_shared_with_static_runtimes_CXX=yes
9203+
9204+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9205+ 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'
9206+ # If the export-symbols file already is a .def file (1st line
9207+ # is EXPORTS), use it as is; otherwise, prepend...
9208+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9209+ cp $export_symbols $output_objdir/$soname.def;
9210+ else
9211+ echo EXPORTS > $output_objdir/$soname.def;
9212+ cat $export_symbols >> $output_objdir/$soname.def;
9213+ fi~
9214+ $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'
9215+ else
9216+ ld_shlibs_CXX=no
9217+ fi
9218+ ;;
9219+ esac
9220+ ;;
9221 darwin* | rhapsody*)
9222
9223
9224@@ -12807,7 +13546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9225 ;;
9226 *)
9227 if test "$GXX" = yes; then
9228- 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'
9229+ 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'
9230 else
9231 # FIXME: insert proper C++ library support
9232 ld_shlibs_CXX=no
9233@@ -12878,10 +13617,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9234 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9235 ;;
9236 ia64*)
9237- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9238+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9239 ;;
9240 *)
9241- 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'
9242+ 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'
9243 ;;
9244 esac
9245 fi
9246@@ -12922,9 +13661,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9247 *)
9248 if test "$GXX" = yes; then
9249 if test "$with_gnu_ld" = no; then
9250- 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'
9251+ 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'
9252 else
9253- 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'
9254+ 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'
9255 fi
9256 fi
9257 link_all_deplibs_CXX=yes
9258@@ -12994,20 +13733,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9259 prelink_cmds_CXX='tpldir=Template.dir~
9260 rm -rf $tpldir~
9261 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9262- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9263+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9264 old_archive_cmds_CXX='tpldir=Template.dir~
9265 rm -rf $tpldir~
9266 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9267- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9268+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9269 $RANLIB $oldlib'
9270 archive_cmds_CXX='tpldir=Template.dir~
9271 rm -rf $tpldir~
9272 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9273- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9274+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9275 archive_expsym_cmds_CXX='tpldir=Template.dir~
9276 rm -rf $tpldir~
9277 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9278- $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'
9279+ $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'
9280 ;;
9281 *) # Version 6 and above use weak symbols
9282 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9283@@ -13202,7 +13941,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9284 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'
9285 ;;
9286 *)
9287- 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'
9288+ 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'
9289 ;;
9290 esac
9291
9292@@ -13248,7 +13987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9293
9294 solaris*)
9295 case $cc_basename in
9296- CC*)
9297+ CC* | sunCC*)
9298 # Sun C++ 4.2, 5.x and Centerline C++
9299 archive_cmds_need_lc_CXX=yes
9300 no_undefined_flag_CXX=' -zdefs'
9301@@ -13289,9 +14028,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9302 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9303 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9304 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9305- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9306+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9307 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9308- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9309+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9310
9311 # Commands to make compiler produce verbose output that lists
9312 # what "hidden" libraries, object files and flags are used when
9313@@ -13426,6 +14165,13 @@ private:
9314 };
9315 _LT_EOF
9316
9317+
9318+_lt_libdeps_save_CFLAGS=$CFLAGS
9319+case "$CC $CFLAGS " in #(
9320+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9321+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9322+esac
9323+
9324 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9325 (eval $ac_compile) 2>&5
9326 ac_status=$?
9327@@ -13439,7 +14185,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9328 pre_test_object_deps_done=no
9329
9330 for p in `eval "$output_verbose_link_cmd"`; do
9331- case $p in
9332+ case ${prev}${p} in
9333
9334 -L* | -R* | -l*)
9335 # Some compilers place space between "-{L,R}" and the path.
9336@@ -13448,13 +14194,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9337 test $p = "-R"; then
9338 prev=$p
9339 continue
9340- else
9341- prev=
9342 fi
9343
9344+ # Expand the sysroot to ease extracting the directories later.
9345+ if test -z "$prev"; then
9346+ case $p in
9347+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9348+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9349+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9350+ esac
9351+ fi
9352+ case $p in
9353+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9354+ esac
9355 if test "$pre_test_object_deps_done" = no; then
9356- case $p in
9357- -L* | -R*)
9358+ case ${prev} in
9359+ -L | -R)
9360 # Internal compiler library paths should come after those
9361 # provided the user. The postdeps already come after the
9362 # user supplied libs so there is no need to process them.
9363@@ -13474,8 +14229,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9364 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9365 fi
9366 fi
9367+ prev=
9368 ;;
9369
9370+ *.lto.$objext) ;; # Ignore GCC LTO objects
9371 *.$objext)
9372 # This assumes that the test object file only shows up
9373 # once in the compiler output.
9374@@ -13511,6 +14268,7 @@ else
9375 fi
9376
9377 $RM -f confest.$objext
9378+CFLAGS=$_lt_libdeps_save_CFLAGS
9379
9380 # PORTME: override above test on systems where it is broken
9381 case $host_os in
9382@@ -13546,7 +14304,7 @@ linux*)
9383
9384 solaris*)
9385 case $cc_basename in
9386- CC*)
9387+ CC* | sunCC*)
9388 # The more standards-conforming stlport4 library is
9389 # incompatible with the Cstd library. Avoid specifying
9390 # it if it's in CXXFLAGS. Ignore libCrun as
9391@@ -13611,8 +14369,6 @@ fi
9392 lt_prog_compiler_pic_CXX=
9393 lt_prog_compiler_static_CXX=
9394
9395-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9396-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9397
9398 # C++ specific cases for pic, static, wl, etc.
9399 if test "$GXX" = yes; then
9400@@ -13717,6 +14473,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9401 ;;
9402 esac
9403 ;;
9404+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9405+ # This hack is so that the source file can tell whether it is being
9406+ # built for inclusion in a dll (and should export symbols for example).
9407+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9408+ ;;
9409 dgux*)
9410 case $cc_basename in
9411 ec++*)
9412@@ -13869,7 +14630,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9413 ;;
9414 solaris*)
9415 case $cc_basename in
9416- CC*)
9417+ CC* | sunCC*)
9418 # Sun C++ 4.2, 5.x and Centerline C++
9419 lt_prog_compiler_pic_CXX='-KPIC'
9420 lt_prog_compiler_static_CXX='-Bstatic'
9421@@ -13934,10 +14695,17 @@ case $host_os in
9422 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9423 ;;
9424 esac
9425-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9426-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9427-
9428
9429+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9430+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9431+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
9432+ $as_echo_n "(cached) " >&6
9433+else
9434+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9435+fi
9436+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9437+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9438+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9439
9440 #
9441 # Check to make sure the PIC flag actually works.
9442@@ -13995,6 +14763,8 @@ fi
9443
9444
9445
9446+
9447+
9448 #
9449 # Check to make sure the static flag actually works.
9450 #
9451@@ -14172,6 +14942,7 @@ fi
9452 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9453
9454 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9455+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9456 case $host_os in
9457 aix[4-9]*)
9458 # If we're using GNU nm, then we don't want the "-C" option.
9459@@ -14186,15 +14957,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9460 ;;
9461 pw32*)
9462 export_symbols_cmds_CXX="$ltdll_cmds"
9463- ;;
9464+ ;;
9465 cygwin* | mingw* | cegcc*)
9466- 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'
9467- ;;
9468+ case $cc_basename in
9469+ cl*) ;;
9470+ *)
9471+ 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'
9472+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9473+ ;;
9474+ esac
9475+ ;;
9476 *)
9477 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9478- ;;
9479+ ;;
9480 esac
9481- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9482
9483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9484 $as_echo "$ld_shlibs_CXX" >&6; }
9485@@ -14457,8 +15233,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9486 need_version=no
9487 need_lib_prefix=no
9488
9489- case $GCC,$host_os in
9490- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9491+ case $GCC,$cc_basename in
9492+ yes,*)
9493+ # gcc
9494 library_names_spec='$libname.dll.a'
9495 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9496 postinstall_cmds='base_file=`basename \${file}`~
9497@@ -14490,13 +15267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9498 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9499 ;;
9500 esac
9501+ dynamic_linker='Win32 ld.exe'
9502+ ;;
9503+
9504+ *,cl*)
9505+ # Native MSVC
9506+ libname_spec='$name'
9507+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9508+ library_names_spec='${libname}.dll.lib'
9509+
9510+ case $build_os in
9511+ mingw*)
9512+ sys_lib_search_path_spec=
9513+ lt_save_ifs=$IFS
9514+ IFS=';'
9515+ for lt_path in $LIB
9516+ do
9517+ IFS=$lt_save_ifs
9518+ # Let DOS variable expansion print the short 8.3 style file name.
9519+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9520+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9521+ done
9522+ IFS=$lt_save_ifs
9523+ # Convert to MSYS style.
9524+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9525+ ;;
9526+ cygwin*)
9527+ # Convert to unix form, then to dos form, then back to unix form
9528+ # but this time dos style (no spaces!) so that the unix form looks
9529+ # like /cygdrive/c/PROGRA~1:/cygdr...
9530+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9531+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9532+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9533+ ;;
9534+ *)
9535+ sys_lib_search_path_spec="$LIB"
9536+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9537+ # It is most probably a Windows format PATH.
9538+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9539+ else
9540+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9541+ fi
9542+ # FIXME: find the short name or the path components, as spaces are
9543+ # common. (e.g. "Program Files" -> "PROGRA~1")
9544+ ;;
9545+ esac
9546+
9547+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9548+ postinstall_cmds='base_file=`basename \${file}`~
9549+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9550+ dldir=$destdir/`dirname \$dlpath`~
9551+ test -d \$dldir || mkdir -p \$dldir~
9552+ $install_prog $dir/$dlname \$dldir/$dlname'
9553+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9554+ dlpath=$dir/\$dldll~
9555+ $RM \$dlpath'
9556+ shlibpath_overrides_runpath=yes
9557+ dynamic_linker='Win32 link.exe'
9558 ;;
9559
9560 *)
9561+ # Assume MSVC wrapper
9562 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9563+ dynamic_linker='Win32 ld.exe'
9564 ;;
9565 esac
9566- dynamic_linker='Win32 ld.exe'
9567 # FIXME: first we should search . and the directory the executable is in
9568 shlibpath_var=PATH
9569 ;;
9570@@ -14587,7 +15422,7 @@ haiku*)
9571 soname_spec='${libname}${release}${shared_ext}$major'
9572 shlibpath_var=LIBRARY_PATH
9573 shlibpath_overrides_runpath=yes
9574- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9575+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9576 hardcode_into_libs=yes
9577 ;;
9578
9579@@ -15046,6 +15881,7 @@ fi
9580 fi # test -n "$compiler"
9581
9582 CC=$lt_save_CC
9583+ CFLAGS=$lt_save_CFLAGS
9584 LDCXX=$LD
9585 LD=$lt_save_LD
9586 GCC=$lt_save_GCC
9587@@ -17982,13 +18818,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9588 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9589 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9590 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9591+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9592+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9593 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9594 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9595 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9596 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9597 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9598+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9599+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9600+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9601+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9602 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9603 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9604+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9605 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9606 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9607 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9608@@ -18003,14 +18846,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9609 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9610 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9611 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"`'
9612+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9613+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9614 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9615 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9616 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9617-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9618 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9619+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9620 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9621 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9622 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9623+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9624 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9625 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9626 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9627@@ -18043,12 +18889,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9628 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9629 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9630 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9631-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9632 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9633 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9634 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9635 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9636 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9637+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9638 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9639 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9640 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9641@@ -18087,8 +18933,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9642 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9643 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9644 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9645-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9646 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9647+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9648 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9649 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9650 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9651@@ -18115,12 +18961,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9652 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9653 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9654 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9655-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9656 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9657 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9658 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9659 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9660 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9661+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9662 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9663 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9664 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9665@@ -18158,8 +19004,13 @@ reload_flag \
9666 OBJDUMP \
9667 deplibs_check_method \
9668 file_magic_cmd \
9669+file_magic_glob \
9670+want_nocaseglob \
9671+DLLTOOL \
9672+sharedlib_from_linklib_cmd \
9673 AR \
9674 AR_FLAGS \
9675+archiver_list_spec \
9676 STRIP \
9677 RANLIB \
9678 CC \
9679@@ -18169,12 +19020,14 @@ lt_cv_sys_global_symbol_pipe \
9680 lt_cv_sys_global_symbol_to_cdecl \
9681 lt_cv_sys_global_symbol_to_c_name_address \
9682 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9683+nm_file_list_spec \
9684 lt_prog_compiler_no_builtin_flag \
9685-lt_prog_compiler_wl \
9686 lt_prog_compiler_pic \
9687+lt_prog_compiler_wl \
9688 lt_prog_compiler_static \
9689 lt_cv_prog_compiler_c_o \
9690 need_locks \
9691+MANIFEST_TOOL \
9692 DSYMUTIL \
9693 NMEDIT \
9694 LIPO \
9695@@ -18190,7 +19043,6 @@ no_undefined_flag \
9696 hardcode_libdir_flag_spec \
9697 hardcode_libdir_flag_spec_ld \
9698 hardcode_libdir_separator \
9699-fix_srcfile_path \
9700 exclude_expsyms \
9701 include_expsyms \
9702 file_list_spec \
9703@@ -18212,8 +19064,8 @@ LD_CXX \
9704 reload_flag_CXX \
9705 compiler_CXX \
9706 lt_prog_compiler_no_builtin_flag_CXX \
9707-lt_prog_compiler_wl_CXX \
9708 lt_prog_compiler_pic_CXX \
9709+lt_prog_compiler_wl_CXX \
9710 lt_prog_compiler_static_CXX \
9711 lt_cv_prog_compiler_c_o_CXX \
9712 export_dynamic_flag_spec_CXX \
9713@@ -18225,7 +19077,6 @@ no_undefined_flag_CXX \
9714 hardcode_libdir_flag_spec_CXX \
9715 hardcode_libdir_flag_spec_ld_CXX \
9716 hardcode_libdir_separator_CXX \
9717-fix_srcfile_path_CXX \
9718 exclude_expsyms_CXX \
9719 include_expsyms_CXX \
9720 file_list_spec_CXX \
9721@@ -18259,6 +19110,7 @@ module_cmds \
9722 module_expsym_cmds \
9723 export_symbols_cmds \
9724 prelink_cmds \
9725+postlink_cmds \
9726 postinstall_cmds \
9727 postuninstall_cmds \
9728 finish_cmds \
9729@@ -18273,7 +19125,8 @@ archive_expsym_cmds_CXX \
9730 module_cmds_CXX \
9731 module_expsym_cmds_CXX \
9732 export_symbols_cmds_CXX \
9733-prelink_cmds_CXX; do
9734+prelink_cmds_CXX \
9735+postlink_cmds_CXX; do
9736 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9737 *[\\\\\\\`\\"\\\$]*)
9738 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9739@@ -19066,7 +19919,8 @@ $as_echo X"$file" |
9740 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9741 #
9742 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9743-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9744+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9745+# Inc.
9746 # Written by Gordon Matzigkeit, 1996
9747 #
9748 # This file is part of GNU Libtool.
9749@@ -19169,19 +20023,42 @@ SP2NL=$lt_lt_SP2NL
9750 # turn newlines into spaces.
9751 NL2SP=$lt_lt_NL2SP
9752
9753+# convert \$build file names to \$host format.
9754+to_host_file_cmd=$lt_cv_to_host_file_cmd
9755+
9756+# convert \$build files to toolchain format.
9757+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9758+
9759 # An object symbol dumper.
9760 OBJDUMP=$lt_OBJDUMP
9761
9762 # Method to check whether dependent libraries are shared objects.
9763 deplibs_check_method=$lt_deplibs_check_method
9764
9765-# Command to use when deplibs_check_method == "file_magic".
9766+# Command to use when deplibs_check_method = "file_magic".
9767 file_magic_cmd=$lt_file_magic_cmd
9768
9769+# How to find potential files when deplibs_check_method = "file_magic".
9770+file_magic_glob=$lt_file_magic_glob
9771+
9772+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9773+want_nocaseglob=$lt_want_nocaseglob
9774+
9775+# DLL creation program.
9776+DLLTOOL=$lt_DLLTOOL
9777+
9778+# Command to associate shared and link libraries.
9779+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9780+
9781 # The archiver.
9782 AR=$lt_AR
9783+
9784+# Flags to create an archive.
9785 AR_FLAGS=$lt_AR_FLAGS
9786
9787+# How to feed a file listing to the archiver.
9788+archiver_list_spec=$lt_archiver_list_spec
9789+
9790 # A symbol stripping program.
9791 STRIP=$lt_STRIP
9792
9793@@ -19211,6 +20088,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9794 # Transform the output of nm in a C name address pair when lib prefix is needed.
9795 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9796
9797+# Specify filename containing input files for \$NM.
9798+nm_file_list_spec=$lt_nm_file_list_spec
9799+
9800+# The root where to search for dependent libraries,and in which our libraries should be installed.
9801+lt_sysroot=$lt_sysroot
9802+
9803 # The name of the directory that contains temporary libtool files.
9804 objdir=$objdir
9805
9806@@ -19220,6 +20103,9 @@ MAGIC_CMD=$MAGIC_CMD
9807 # Must we lock files when doing compilation?
9808 need_locks=$lt_need_locks
9809
9810+# Manifest tool.
9811+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9812+
9813 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9814 DSYMUTIL=$lt_DSYMUTIL
9815
9816@@ -19334,12 +20220,12 @@ with_gcc=$GCC
9817 # Compiler flag to turn off builtin functions.
9818 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9819
9820-# How to pass a linker flag through the compiler.
9821-wl=$lt_lt_prog_compiler_wl
9822-
9823 # Additional compiler flags for building library objects.
9824 pic_flag=$lt_lt_prog_compiler_pic
9825
9826+# How to pass a linker flag through the compiler.
9827+wl=$lt_lt_prog_compiler_wl
9828+
9829 # Compiler flag to prevent dynamic linking.
9830 link_static_flag=$lt_lt_prog_compiler_static
9831
9832@@ -19426,9 +20312,6 @@ inherit_rpath=$inherit_rpath
9833 # Whether libtool must link a program against all its dependency libraries.
9834 link_all_deplibs=$link_all_deplibs
9835
9836-# Fix the shell variable \$srcfile for the compiler.
9837-fix_srcfile_path=$lt_fix_srcfile_path
9838-
9839 # Set to "yes" if exported symbols are required.
9840 always_export_symbols=$always_export_symbols
9841
9842@@ -19444,6 +20327,9 @@ include_expsyms=$lt_include_expsyms
9843 # Commands necessary for linking programs (against libraries) with templates.
9844 prelink_cmds=$lt_prelink_cmds
9845
9846+# Commands necessary for finishing linking programs.
9847+postlink_cmds=$lt_postlink_cmds
9848+
9849 # Specify filename containing input files.
9850 file_list_spec=$lt_file_list_spec
9851
9852@@ -19490,210 +20376,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9853 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9854 # text mode, it properly converts lines to CR/LF. This bash problem
9855 # is reportedly fixed, but why not run on old versions too?
9856- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9857- || (rm -f "$cfgfile"; exit 1)
9858-
9859- case $xsi_shell in
9860- yes)
9861- cat << \_LT_EOF >> "$cfgfile"
9862-
9863-# func_dirname file append nondir_replacement
9864-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9865-# otherwise set result to NONDIR_REPLACEMENT.
9866-func_dirname ()
9867-{
9868- case ${1} in
9869- */*) func_dirname_result="${1%/*}${2}" ;;
9870- * ) func_dirname_result="${3}" ;;
9871- esac
9872-}
9873-
9874-# func_basename file
9875-func_basename ()
9876-{
9877- func_basename_result="${1##*/}"
9878-}
9879-
9880-# func_dirname_and_basename file append nondir_replacement
9881-# perform func_basename and func_dirname in a single function
9882-# call:
9883-# dirname: Compute the dirname of FILE. If nonempty,
9884-# add APPEND to the result, otherwise set result
9885-# to NONDIR_REPLACEMENT.
9886-# value returned in "$func_dirname_result"
9887-# basename: Compute filename of FILE.
9888-# value retuned in "$func_basename_result"
9889-# Implementation must be kept synchronized with func_dirname
9890-# and func_basename. For efficiency, we do not delegate to
9891-# those functions but instead duplicate the functionality here.
9892-func_dirname_and_basename ()
9893-{
9894- case ${1} in
9895- */*) func_dirname_result="${1%/*}${2}" ;;
9896- * ) func_dirname_result="${3}" ;;
9897- esac
9898- func_basename_result="${1##*/}"
9899-}
9900-
9901-# func_stripname prefix suffix name
9902-# strip PREFIX and SUFFIX off of NAME.
9903-# PREFIX and SUFFIX must not contain globbing or regex special
9904-# characters, hashes, percent signs, but SUFFIX may contain a leading
9905-# dot (in which case that matches only a dot).
9906-func_stripname ()
9907-{
9908- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9909- # positional parameters, so assign one to ordinary parameter first.
9910- func_stripname_result=${3}
9911- func_stripname_result=${func_stripname_result#"${1}"}
9912- func_stripname_result=${func_stripname_result%"${2}"}
9913-}
9914-
9915-# func_opt_split
9916-func_opt_split ()
9917-{
9918- func_opt_split_opt=${1%%=*}
9919- func_opt_split_arg=${1#*=}
9920-}
9921-
9922-# func_lo2o object
9923-func_lo2o ()
9924-{
9925- case ${1} in
9926- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9927- *) func_lo2o_result=${1} ;;
9928- esac
9929-}
9930-
9931-# func_xform libobj-or-source
9932-func_xform ()
9933-{
9934- func_xform_result=${1%.*}.lo
9935-}
9936-
9937-# func_arith arithmetic-term...
9938-func_arith ()
9939-{
9940- func_arith_result=$(( $* ))
9941-}
9942-
9943-# func_len string
9944-# STRING may not start with a hyphen.
9945-func_len ()
9946-{
9947- func_len_result=${#1}
9948-}
9949-
9950-_LT_EOF
9951- ;;
9952- *) # Bourne compatible functions.
9953- cat << \_LT_EOF >> "$cfgfile"
9954-
9955-# func_dirname file append nondir_replacement
9956-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9957-# otherwise set result to NONDIR_REPLACEMENT.
9958-func_dirname ()
9959-{
9960- # Extract subdirectory from the argument.
9961- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9962- if test "X$func_dirname_result" = "X${1}"; then
9963- func_dirname_result="${3}"
9964- else
9965- func_dirname_result="$func_dirname_result${2}"
9966- fi
9967-}
9968-
9969-# func_basename file
9970-func_basename ()
9971-{
9972- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9973-}
9974-
9975-
9976-# func_stripname prefix suffix name
9977-# strip PREFIX and SUFFIX off of NAME.
9978-# PREFIX and SUFFIX must not contain globbing or regex special
9979-# characters, hashes, percent signs, but SUFFIX may contain a leading
9980-# dot (in which case that matches only a dot).
9981-# func_strip_suffix prefix name
9982-func_stripname ()
9983-{
9984- case ${2} in
9985- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
9986- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
9987- esac
9988-}
9989-
9990-# sed scripts:
9991-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
9992-my_sed_long_arg='1s/^-[^=]*=//'
9993-
9994-# func_opt_split
9995-func_opt_split ()
9996-{
9997- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
9998- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
9999-}
10000-
10001-# func_lo2o object
10002-func_lo2o ()
10003-{
10004- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10005-}
10006-
10007-# func_xform libobj-or-source
10008-func_xform ()
10009-{
10010- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10011-}
10012-
10013-# func_arith arithmetic-term...
10014-func_arith ()
10015-{
10016- func_arith_result=`expr "$@"`
10017-}
10018-
10019-# func_len string
10020-# STRING may not start with a hyphen.
10021-func_len ()
10022-{
10023- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10024-}
10025-
10026-_LT_EOF
10027-esac
10028-
10029-case $lt_shell_append in
10030- yes)
10031- cat << \_LT_EOF >> "$cfgfile"
10032-
10033-# func_append var value
10034-# Append VALUE to the end of shell variable VAR.
10035-func_append ()
10036-{
10037- eval "$1+=\$2"
10038-}
10039-_LT_EOF
10040- ;;
10041- *)
10042- cat << \_LT_EOF >> "$cfgfile"
10043-
10044-# func_append var value
10045-# Append VALUE to the end of shell variable VAR.
10046-func_append ()
10047-{
10048- eval "$1=\$$1\$2"
10049-}
10050-
10051-_LT_EOF
10052- ;;
10053- esac
10054-
10055-
10056- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10057- || (rm -f "$cfgfile"; exit 1)
10058-
10059- mv -f "$cfgfile" "$ofile" ||
10060+ sed '$q' "$ltmain" >> "$cfgfile" \
10061+ || (rm -f "$cfgfile"; exit 1)
10062+
10063+ if test x"$xsi_shell" = xyes; then
10064+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10065+func_dirname ()\
10066+{\
10067+\ case ${1} in\
10068+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10069+\ * ) func_dirname_result="${3}" ;;\
10070+\ esac\
10071+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10072+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10073+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10074+test 0 -eq $? || _lt_function_replace_fail=:
10075+
10076+
10077+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10078+func_basename ()\
10079+{\
10080+\ func_basename_result="${1##*/}"\
10081+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10082+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10083+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10084+test 0 -eq $? || _lt_function_replace_fail=:
10085+
10086+
10087+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10088+func_dirname_and_basename ()\
10089+{\
10090+\ case ${1} in\
10091+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10092+\ * ) func_dirname_result="${3}" ;;\
10093+\ esac\
10094+\ func_basename_result="${1##*/}"\
10095+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10096+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10097+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10098+test 0 -eq $? || _lt_function_replace_fail=:
10099+
10100+
10101+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10102+func_stripname ()\
10103+{\
10104+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10105+\ # positional parameters, so assign one to ordinary parameter first.\
10106+\ func_stripname_result=${3}\
10107+\ func_stripname_result=${func_stripname_result#"${1}"}\
10108+\ func_stripname_result=${func_stripname_result%"${2}"}\
10109+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10110+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10111+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10112+test 0 -eq $? || _lt_function_replace_fail=:
10113+
10114+
10115+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10116+func_split_long_opt ()\
10117+{\
10118+\ func_split_long_opt_name=${1%%=*}\
10119+\ func_split_long_opt_arg=${1#*=}\
10120+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10121+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10122+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10123+test 0 -eq $? || _lt_function_replace_fail=:
10124+
10125+
10126+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10127+func_split_short_opt ()\
10128+{\
10129+\ func_split_short_opt_arg=${1#??}\
10130+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10131+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10132+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10133+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10134+test 0 -eq $? || _lt_function_replace_fail=:
10135+
10136+
10137+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10138+func_lo2o ()\
10139+{\
10140+\ case ${1} in\
10141+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10142+\ *) func_lo2o_result=${1} ;;\
10143+\ esac\
10144+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10145+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10146+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10147+test 0 -eq $? || _lt_function_replace_fail=:
10148+
10149+
10150+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10151+func_xform ()\
10152+{\
10153+ func_xform_result=${1%.*}.lo\
10154+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10155+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10156+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10157+test 0 -eq $? || _lt_function_replace_fail=:
10158+
10159+
10160+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10161+func_arith ()\
10162+{\
10163+ func_arith_result=$(( $* ))\
10164+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10165+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10166+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10167+test 0 -eq $? || _lt_function_replace_fail=:
10168+
10169+
10170+ sed -e '/^func_len ()$/,/^} # func_len /c\
10171+func_len ()\
10172+{\
10173+ func_len_result=${#1}\
10174+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10175+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10176+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10177+test 0 -eq $? || _lt_function_replace_fail=:
10178+
10179+fi
10180+
10181+if test x"$lt_shell_append" = xyes; then
10182+ sed -e '/^func_append ()$/,/^} # func_append /c\
10183+func_append ()\
10184+{\
10185+ eval "${1}+=\\${2}"\
10186+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10187+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10188+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10189+test 0 -eq $? || _lt_function_replace_fail=:
10190+
10191+
10192+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10193+func_append_quoted ()\
10194+{\
10195+\ func_quote_for_eval "${2}"\
10196+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10197+} # Extended-shell func_append_quoted implementation' "$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+
10202+
10203+ # Save a `func_append' function call where possible by direct use of '+='
10204+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10205+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10206+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10207+ test 0 -eq $? || _lt_function_replace_fail=:
10208+else
10209+ # Save a `func_append' function call even when '+=' is not available
10210+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10211+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10212+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10213+ test 0 -eq $? || _lt_function_replace_fail=:
10214+fi
10215+
10216+if test x"$_lt_function_replace_fail" = x":"; then
10217+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10218+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10219+fi
10220+
10221+
10222+ mv -f "$cfgfile" "$ofile" ||
10223 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10224 chmod +x "$ofile"
10225
10226@@ -19721,12 +20566,12 @@ with_gcc=$GCC_CXX
10227 # Compiler flag to turn off builtin functions.
10228 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10229
10230-# How to pass a linker flag through the compiler.
10231-wl=$lt_lt_prog_compiler_wl_CXX
10232-
10233 # Additional compiler flags for building library objects.
10234 pic_flag=$lt_lt_prog_compiler_pic_CXX
10235
10236+# How to pass a linker flag through the compiler.
10237+wl=$lt_lt_prog_compiler_wl_CXX
10238+
10239 # Compiler flag to prevent dynamic linking.
10240 link_static_flag=$lt_lt_prog_compiler_static_CXX
10241
10242@@ -19813,9 +20658,6 @@ inherit_rpath=$inherit_rpath_CXX
10243 # Whether libtool must link a program against all its dependency libraries.
10244 link_all_deplibs=$link_all_deplibs_CXX
10245
10246-# Fix the shell variable \$srcfile for the compiler.
10247-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10248-
10249 # Set to "yes" if exported symbols are required.
10250 always_export_symbols=$always_export_symbols_CXX
10251
10252@@ -19831,6 +20673,9 @@ include_expsyms=$lt_include_expsyms_CXX
10253 # Commands necessary for linking programs (against libraries) with templates.
10254 prelink_cmds=$lt_prelink_cmds_CXX
10255
10256+# Commands necessary for finishing linking programs.
10257+postlink_cmds=$lt_postlink_cmds_CXX
10258+
10259 # Specify filename containing input files.
10260 file_list_spec=$lt_file_list_spec_CXX
10261
10262diff --git a/libtool.m4 b/libtool.m4
10263index 24d13f3..e45fdc6 100644
10264--- a/libtool.m4
10265+++ b/libtool.m4
10266@@ -1,7 +1,8 @@
10267 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10268 #
10269 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10270-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10271+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10272+# Inc.
10273 # Written by Gordon Matzigkeit, 1996
10274 #
10275 # This file is free software; the Free Software Foundation gives
10276@@ -10,7 +11,8 @@
10277
10278 m4_define([_LT_COPYING], [dnl
10279 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10280-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10281+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10282+# Inc.
10283 # Written by Gordon Matzigkeit, 1996
10284 #
10285 # This file is part of GNU Libtool.
10286@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10287 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10288 ])
10289
10290-# serial 56 LT_INIT
10291+# serial 57 LT_INIT
10292
10293
10294 # LT_PREREQ(VERSION)
10295@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10296 LIBTOOL_DEPS="$ltmain"
10297
10298 # Always use our own libtool.
10299-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10300+LIBTOOL='$(SHELL) $(top_builddir)'
10301+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10302 AC_SUBST(LIBTOOL)dnl
10303
10304 _LT_SETUP
10305@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
10306 dnl
10307 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10308 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10309+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10310 m4_require([_LT_CMD_RELOAD])dnl
10311 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10312+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10313 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10314 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10315+m4_require([_LT_WITH_SYSROOT])dnl
10316
10317 _LT_CONFIG_LIBTOOL_INIT([
10318 # See if we are running on zsh, and set the options which allow our
10319@@ -199,7 +205,7 @@ aix3*)
10320 esac
10321
10322 # Global variables:
10323-ofile=libtool
10324+ofile=${host_alias}-libtool
10325 can_build_shared=yes
10326
10327 # All known linkers require a `.a' archive for static linking (except MSVC,
10328@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
10329 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10330 configured by $[0], generated by m4_PACKAGE_STRING.
10331
10332-Copyright (C) 2009 Free Software Foundation, Inc.
10333+Copyright (C) 2010 Free Software Foundation, Inc.
10334 This config.lt script is free software; the Free Software Foundation
10335 gives unlimited permision to copy, distribute and modify it."
10336
10337@@ -746,15 +752,12 @@ _LT_EOF
10338 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10339 # text mode, it properly converts lines to CR/LF. This bash problem
10340 # is reportedly fixed, but why not run on old versions too?
10341- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10342- || (rm -f "$cfgfile"; exit 1)
10343+ sed '$q' "$ltmain" >> "$cfgfile" \
10344+ || (rm -f "$cfgfile"; exit 1)
10345
10346- _LT_PROG_XSI_SHELLFNS
10347+ _LT_PROG_REPLACE_SHELLFNS
10348
10349- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10350- || (rm -f "$cfgfile"; exit 1)
10351-
10352- mv -f "$cfgfile" "$ofile" ||
10353+ mv -f "$cfgfile" "$ofile" ||
10354 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10355 chmod +x "$ofile"
10356 ],
10357@@ -980,6 +983,8 @@ _LT_EOF
10358 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10359 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10360 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10361+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10362+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10363 cat > conftest.c << _LT_EOF
10364 int main() { return 0;}
10365 _LT_EOF
10366@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10367 fi
10368 ])
10369
10370-# _LT_SYS_MODULE_PATH_AIX
10371-# -----------------------
10372+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10373+# ----------------------------------
10374 # Links a minimal program and checks the executable
10375 # for the system default hardcoded library path. In most cases,
10376 # this is /usr/lib:/lib, but when the MPI compilers are used
10377 # the location of the communication and MPI libs are included too.
10378 # If we don't find anything, use the default library path according
10379 # to the aix ld manual.
10380+# Store the results from the different compilers for each TAGNAME.
10381+# Allow to override them for all tags through lt_cv_aix_libpath.
10382 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10383 [m4_require([_LT_DECL_SED])dnl
10384-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
10385-lt_aix_libpath_sed='
10386- /Import File Strings/,/^$/ {
10387- /^0/ {
10388- s/^0 *\(.*\)$/\1/
10389- p
10390- }
10391- }'
10392-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10393-# Check for a 64-bit object if we didn't find anything.
10394-if test -z "$aix_libpath"; then
10395- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10396-fi],[])
10397-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10398+if test "${lt_cv_aix_libpath+set}" = set; then
10399+ aix_libpath=$lt_cv_aix_libpath
10400+else
10401+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10402+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10403+ lt_aix_libpath_sed='[
10404+ /Import File Strings/,/^$/ {
10405+ /^0/ {
10406+ s/^0 *\([^ ]*\) *$/\1/
10407+ p
10408+ }
10409+ }]'
10410+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10411+ # Check for a 64-bit object if we didn't find anything.
10412+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10413+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10414+ fi],[])
10415+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10416+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10417+ fi
10418+ ])
10419+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10420+fi
10421 ])# _LT_SYS_MODULE_PATH_AIX
10422
10423
10424@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10425
10426 AC_MSG_CHECKING([how to print strings])
10427 # Test print first, because it will be a builtin if present.
10428-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10429+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10430 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10431 ECHO='print -r --'
10432 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10433@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
10434 ])# _LT_PROG_ECHO_BACKSLASH
10435
10436
10437+# _LT_WITH_SYSROOT
10438+# ----------------
10439+AC_DEFUN([_LT_WITH_SYSROOT],
10440+[AC_MSG_CHECKING([for sysroot])
10441+AC_ARG_WITH([libtool-sysroot],
10442+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10443+ (or the compiler's sysroot if not specified).],
10444+[], [with_libtool_sysroot=no])
10445+
10446+dnl lt_sysroot will always be passed unquoted. We quote it here
10447+dnl in case the user passed a directory name.
10448+lt_sysroot=
10449+case ${with_libtool_sysroot} in #(
10450+ yes)
10451+ if test "$GCC" = yes; then
10452+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10453+ fi
10454+ ;; #(
10455+ /*)
10456+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10457+ ;; #(
10458+ no|'')
10459+ ;; #(
10460+ *)
10461+ AC_MSG_RESULT([${with_libtool_sysroot}])
10462+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10463+ ;;
10464+esac
10465+
10466+ AC_MSG_RESULT([${lt_sysroot:-no}])
10467+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10468+[dependent libraries, and in which our libraries should be installed.])])
10469+
10470 # _LT_ENABLE_LOCK
10471 # ---------------
10472 m4_defun([_LT_ENABLE_LOCK],
10473@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10474 ])# _LT_ENABLE_LOCK
10475
10476
10477+# _LT_PROG_AR
10478+# -----------
10479+m4_defun([_LT_PROG_AR],
10480+[AC_CHECK_TOOLS(AR, [ar], false)
10481+: ${AR=ar}
10482+: ${AR_FLAGS=cru}
10483+_LT_DECL([], [AR], [1], [The archiver])
10484+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10485+
10486+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10487+ [lt_cv_ar_at_file=no
10488+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10489+ [echo conftest.$ac_objext > conftest.lst
10490+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10491+ AC_TRY_EVAL([lt_ar_try])
10492+ if test "$ac_status" -eq 0; then
10493+ # Ensure the archiver fails upon bogus file names.
10494+ rm -f conftest.$ac_objext libconftest.a
10495+ AC_TRY_EVAL([lt_ar_try])
10496+ if test "$ac_status" -ne 0; then
10497+ lt_cv_ar_at_file=@
10498+ fi
10499+ fi
10500+ rm -f conftest.* libconftest.a
10501+ ])
10502+ ])
10503+
10504+if test "x$lt_cv_ar_at_file" = xno; then
10505+ archiver_list_spec=
10506+else
10507+ archiver_list_spec=$lt_cv_ar_at_file
10508+fi
10509+_LT_DECL([], [archiver_list_spec], [1],
10510+ [How to feed a file listing to the archiver])
10511+])# _LT_PROG_AR
10512+
10513+
10514 # _LT_CMD_OLD_ARCHIVE
10515 # -------------------
10516 m4_defun([_LT_CMD_OLD_ARCHIVE],
10517-[AC_CHECK_TOOL(AR, ar, false)
10518-test -z "$AR" && AR=ar
10519-test -z "$AR_FLAGS" && AR_FLAGS=cru
10520-_LT_DECL([], [AR], [1], [The archiver])
10521-_LT_DECL([], [AR_FLAGS], [1])
10522+[_LT_PROG_AR
10523
10524 AC_CHECK_TOOL(STRIP, strip, :)
10525 test -z "$STRIP" && STRIP=:
10526@@ -1623,7 +1705,7 @@ else
10527 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10528 lt_status=$lt_dlunknown
10529 cat > conftest.$ac_ext <<_LT_EOF
10530-[#line __oline__ "configure"
10531+[#line $LINENO "configure"
10532 #include "confdefs.h"
10533
10534 #if HAVE_DLFCN_H
10535@@ -1667,10 +1749,10 @@ else
10536 /* When -fvisbility=hidden is used, assume the code has been annotated
10537 correspondingly for the symbols needed. */
10538 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10539-void fnord () __attribute__((visibility("default")));
10540+int fnord () __attribute__((visibility("default")));
10541 #endif
10542
10543-void fnord () { int i=42; }
10544+int fnord () { return 42; }
10545 int main ()
10546 {
10547 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10548@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10549 need_version=no
10550 need_lib_prefix=no
10551
10552- case $GCC,$host_os in
10553- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10554+ case $GCC,$cc_basename in
10555+ yes,*)
10556+ # gcc
10557 library_names_spec='$libname.dll.a'
10558 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10559 postinstall_cmds='base_file=`basename \${file}`~
10560@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10561 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10562 ;;
10563 esac
10564+ dynamic_linker='Win32 ld.exe'
10565+ ;;
10566+
10567+ *,cl*)
10568+ # Native MSVC
10569+ libname_spec='$name'
10570+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10571+ library_names_spec='${libname}.dll.lib'
10572+
10573+ case $build_os in
10574+ mingw*)
10575+ sys_lib_search_path_spec=
10576+ lt_save_ifs=$IFS
10577+ IFS=';'
10578+ for lt_path in $LIB
10579+ do
10580+ IFS=$lt_save_ifs
10581+ # Let DOS variable expansion print the short 8.3 style file name.
10582+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10583+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10584+ done
10585+ IFS=$lt_save_ifs
10586+ # Convert to MSYS style.
10587+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10588+ ;;
10589+ cygwin*)
10590+ # Convert to unix form, then to dos form, then back to unix form
10591+ # but this time dos style (no spaces!) so that the unix form looks
10592+ # like /cygdrive/c/PROGRA~1:/cygdr...
10593+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10594+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10595+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10596+ ;;
10597+ *)
10598+ sys_lib_search_path_spec="$LIB"
10599+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10600+ # It is most probably a Windows format PATH.
10601+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10602+ else
10603+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10604+ fi
10605+ # FIXME: find the short name or the path components, as spaces are
10606+ # common. (e.g. "Program Files" -> "PROGRA~1")
10607+ ;;
10608+ esac
10609+
10610+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10611+ postinstall_cmds='base_file=`basename \${file}`~
10612+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10613+ dldir=$destdir/`dirname \$dlpath`~
10614+ test -d \$dldir || mkdir -p \$dldir~
10615+ $install_prog $dir/$dlname \$dldir/$dlname'
10616+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10617+ dlpath=$dir/\$dldll~
10618+ $RM \$dlpath'
10619+ shlibpath_overrides_runpath=yes
10620+ dynamic_linker='Win32 link.exe'
10621 ;;
10622
10623 *)
10624+ # Assume MSVC wrapper
10625 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10626+ dynamic_linker='Win32 ld.exe'
10627 ;;
10628 esac
10629- dynamic_linker='Win32 ld.exe'
10630 # FIXME: first we should search . and the directory the executable is in
10631 shlibpath_var=PATH
10632 ;;
10633@@ -2342,7 +2483,7 @@ haiku*)
10634 soname_spec='${libname}${release}${shared_ext}$major'
10635 shlibpath_var=LIBRARY_PATH
10636 shlibpath_overrides_runpath=yes
10637- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10638+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10639 hardcode_into_libs=yes
10640 ;;
10641
10642@@ -2950,6 +3091,11 @@ case $reload_flag in
10643 esac
10644 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10645 case $host_os in
10646+ cygwin* | mingw* | pw32* | cegcc*)
10647+ if test "$GCC" != yes; then
10648+ reload_cmds=false
10649+ fi
10650+ ;;
10651 darwin*)
10652 if test "$GCC" = yes; then
10653 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10654@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10655 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10656 lt_cv_file_magic_cmd='func_win32_libid'
10657 else
10658- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10659+ # Keep this pattern in sync with the one in func_win32_libid.
10660+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10661 lt_cv_file_magic_cmd='$OBJDUMP -f'
10662 fi
10663 ;;
10664@@ -3167,6 +3314,21 @@ tpf*)
10665 ;;
10666 esac
10667 ])
10668+
10669+file_magic_glob=
10670+want_nocaseglob=no
10671+if test "$build" = "$host"; then
10672+ case $host_os in
10673+ mingw* | pw32*)
10674+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10675+ want_nocaseglob=yes
10676+ else
10677+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10678+ fi
10679+ ;;
10680+ esac
10681+fi
10682+
10683 file_magic_cmd=$lt_cv_file_magic_cmd
10684 deplibs_check_method=$lt_cv_deplibs_check_method
10685 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10686@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10687 _LT_DECL([], [deplibs_check_method], [1],
10688 [Method to check whether dependent libraries are shared objects])
10689 _LT_DECL([], [file_magic_cmd], [1],
10690- [Command to use when deplibs_check_method == "file_magic"])
10691+ [Command to use when deplibs_check_method = "file_magic"])
10692+_LT_DECL([], [file_magic_glob], [1],
10693+ [How to find potential files when deplibs_check_method = "file_magic"])
10694+_LT_DECL([], [want_nocaseglob], [1],
10695+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10696 ])# _LT_CHECK_MAGIC_METHOD
10697
10698
10699@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10700 dnl AC_DEFUN([AM_PROG_NM], [])
10701 dnl AC_DEFUN([AC_PROG_NM], [])
10702
10703+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10704+# --------------------------------
10705+# how to determine the name of the shared library
10706+# associated with a specific link library.
10707+# -- PORTME fill in with the dynamic library characteristics
10708+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10709+[m4_require([_LT_DECL_EGREP])
10710+m4_require([_LT_DECL_OBJDUMP])
10711+m4_require([_LT_DECL_DLLTOOL])
10712+AC_CACHE_CHECK([how to associate runtime and link libraries],
10713+lt_cv_sharedlib_from_linklib_cmd,
10714+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10715+
10716+case $host_os in
10717+cygwin* | mingw* | pw32* | cegcc*)
10718+ # two different shell functions defined in ltmain.sh
10719+ # decide which to use based on capabilities of $DLLTOOL
10720+ case `$DLLTOOL --help 2>&1` in
10721+ *--identify-strict*)
10722+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10723+ ;;
10724+ *)
10725+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10726+ ;;
10727+ esac
10728+ ;;
10729+*)
10730+ # fallback: assume linklib IS sharedlib
10731+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10732+ ;;
10733+esac
10734+])
10735+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10736+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10737+
10738+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10739+ [Command to associate shared and link libraries])
10740+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10741+
10742+
10743+# _LT_PATH_MANIFEST_TOOL
10744+# ----------------------
10745+# locate the manifest tool
10746+m4_defun([_LT_PATH_MANIFEST_TOOL],
10747+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10748+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10749+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10750+ [lt_cv_path_mainfest_tool=no
10751+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10752+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10753+ cat conftest.err >&AS_MESSAGE_LOG_FD
10754+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10755+ lt_cv_path_mainfest_tool=yes
10756+ fi
10757+ rm -f conftest*])
10758+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10759+ MANIFEST_TOOL=:
10760+fi
10761+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10762+])# _LT_PATH_MANIFEST_TOOL
10763+
10764
10765 # LT_LIB_M
10766 # --------
10767@@ -3403,8 +3630,8 @@ esac
10768 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10769
10770 # Transform an extracted symbol line into symbol name and symbol address
10771-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10772-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'"
10773+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10774+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'"
10775
10776 # Handle CRLF in mingw tool chain
10777 opt_cr=
10778@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10779 else
10780 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10781 fi
10782+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10783
10784 # Check to see that the pipe works correctly.
10785 pipe_works=no
10786@@ -3473,6 +3701,18 @@ _LT_EOF
10787 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10788 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10789 cat <<_LT_EOF > conftest.$ac_ext
10790+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10791+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10792+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10793+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10794+# define LT@&t@_DLSYM_CONST
10795+#elif defined(__osf__)
10796+/* This system does not cope well with relocations in const data. */
10797+# define LT@&t@_DLSYM_CONST
10798+#else
10799+# define LT@&t@_DLSYM_CONST const
10800+#endif
10801+
10802 #ifdef __cplusplus
10803 extern "C" {
10804 #endif
10805@@ -3484,7 +3724,7 @@ _LT_EOF
10806 cat <<_LT_EOF >> conftest.$ac_ext
10807
10808 /* The mapping between symbol names and symbols. */
10809-const struct {
10810+LT@&t@_DLSYM_CONST struct {
10811 const char *name;
10812 void *address;
10813 }
10814@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
10815 _LT_EOF
10816 # Now try linking the two files.
10817 mv conftest.$ac_objext conftstm.$ac_objext
10818- lt_save_LIBS="$LIBS"
10819- lt_save_CFLAGS="$CFLAGS"
10820+ lt_globsym_save_LIBS=$LIBS
10821+ lt_globsym_save_CFLAGS=$CFLAGS
10822 LIBS="conftstm.$ac_objext"
10823 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10824 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10825 pipe_works=yes
10826 fi
10827- LIBS="$lt_save_LIBS"
10828- CFLAGS="$lt_save_CFLAGS"
10829+ LIBS=$lt_globsym_save_LIBS
10830+ CFLAGS=$lt_globsym_save_CFLAGS
10831 else
10832 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10833 fi
10834@@ -3551,6 +3791,13 @@ else
10835 AC_MSG_RESULT(ok)
10836 fi
10837
10838+# Response file support.
10839+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10840+ nm_file_list_spec='@'
10841+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10842+ nm_file_list_spec='@'
10843+fi
10844+
10845 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10846 [Take the output of nm and produce a listing of raw symbols and C names])
10847 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10848@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
10849 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10850 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10851 [Transform the output of nm in a C name address pair when lib prefix is needed])
10852+_LT_DECL([], [nm_file_list_spec], [1],
10853+ [Specify filename containing input files for $NM])
10854 ]) # _LT_CMD_GLOBAL_SYMBOLS
10855
10856
10857@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10858 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10859 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10860
10861-AC_MSG_CHECKING([for $compiler option to produce PIC])
10862 m4_if([$1], [CXX], [
10863 # C++ specific cases for pic, static, wl, etc.
10864 if test "$GXX" = yes; then
10865@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10866 ;;
10867 esac
10868 ;;
10869+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10870+ # This hack is so that the source file can tell whether it is being
10871+ # built for inclusion in a dll (and should export symbols for example).
10872+ m4_if([$1], [GCJ], [],
10873+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10874+ ;;
10875 dgux*)
10876 case $cc_basename in
10877 ec++*)
10878@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10879 ;;
10880 solaris*)
10881 case $cc_basename in
10882- CC*)
10883+ CC* | sunCC*)
10884 # Sun C++ 4.2, 5.x and Centerline C++
10885 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10886 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10887@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10888 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10889 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10890 ;;
10891+ nagfor*)
10892+ # NAG Fortran compiler
10893+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10894+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10895+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10896+ ;;
10897 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10898 # Portland Group compilers (*not* the Pentium gcc compiler,
10899 # which looks to be a dead project)
10900@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10901 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10902 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10903 case $cc_basename in
10904- f77* | f90* | f95*)
10905+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10906 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10907 *)
10908 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10909@@ -4172,9 +4432,11 @@ case $host_os in
10910 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10911 ;;
10912 esac
10913-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10914-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10915- [How to pass a linker flag through the compiler])
10916+
10917+AC_CACHE_CHECK([for $compiler option to produce PIC],
10918+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10919+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10920+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10921
10922 #
10923 # Check to make sure the PIC flag actually works.
10924@@ -4193,6 +4455,8 @@ fi
10925 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10926 [Additional compiler flags for building library objects])
10927
10928+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10929+ [How to pass a linker flag through the compiler])
10930 #
10931 # Check to make sure the static flag actually works.
10932 #
10933@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
10934 m4_defun([_LT_LINKER_SHLIBS],
10935 [AC_REQUIRE([LT_PATH_LD])dnl
10936 AC_REQUIRE([LT_PATH_NM])dnl
10937+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
10938 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10939 m4_require([_LT_DECL_EGREP])dnl
10940 m4_require([_LT_DECL_SED])dnl
10941@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
10942 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10943 m4_if([$1], [CXX], [
10944 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10945+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10946 case $host_os in
10947 aix[[4-9]]*)
10948 # If we're using GNU nm, then we don't want the "-C" option.
10949@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
10950 ;;
10951 pw32*)
10952 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10953- ;;
10954+ ;;
10955 cygwin* | mingw* | cegcc*)
10956- _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'
10957- ;;
10958+ case $cc_basename in
10959+ cl*) ;;
10960+ *)
10961+ _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'
10962+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10963+ ;;
10964+ esac
10965+ ;;
10966 *)
10967 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10968- ;;
10969+ ;;
10970 esac
10971- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10972 ], [
10973 runpath_var=
10974 _LT_TAGVAR(allow_undefined_flag, $1)=
10975@@ -4411,7 +4682,8 @@ _LT_EOF
10976 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
10977 _LT_TAGVAR(always_export_symbols, $1)=no
10978 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10979- _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'
10980+ _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'
10981+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10982
10983 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
10984 _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'
10985@@ -4510,12 +4782,12 @@ _LT_EOF
10986 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
10987 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
10988 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
10989- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
10990+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
10991 if test "x$supports_anon_versioning" = xyes; then
10992 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
10993 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10994 echo "local: *; };" >> $output_objdir/$libname.ver~
10995- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10996+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10997 fi
10998 ;;
10999 esac
11000@@ -4529,8 +4801,8 @@ _LT_EOF
11001 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11002 wlarc=
11003 else
11004- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11005- _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'
11006+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11007+ _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'
11008 fi
11009 ;;
11010
11011@@ -4548,8 +4820,8 @@ _LT_EOF
11012
11013 _LT_EOF
11014 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11015- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11016- _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'
11017+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11018+ _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'
11019 else
11020 _LT_TAGVAR(ld_shlibs, $1)=no
11021 fi
11022@@ -4595,8 +4867,8 @@ _LT_EOF
11023
11024 *)
11025 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11026- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11027- _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'
11028+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11029+ _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'
11030 else
11031 _LT_TAGVAR(ld_shlibs, $1)=no
11032 fi
11033@@ -4726,7 +4998,7 @@ _LT_EOF
11034 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11035 # Determine the default libpath from the value encoded in an
11036 # empty executable.
11037- _LT_SYS_MODULE_PATH_AIX
11038+ _LT_SYS_MODULE_PATH_AIX([$1])
11039 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11040 _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"
11041 else
11042@@ -4737,7 +5009,7 @@ _LT_EOF
11043 else
11044 # Determine the default libpath from the value encoded in an
11045 # empty executable.
11046- _LT_SYS_MODULE_PATH_AIX
11047+ _LT_SYS_MODULE_PATH_AIX([$1])
11048 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11049 # Warning - without using the other run time loading flags,
11050 # -berok will link without error, but may produce a broken library.
11051@@ -4781,20 +5053,63 @@ _LT_EOF
11052 # Microsoft Visual C++.
11053 # hardcode_libdir_flag_spec is actually meaningless, as there is
11054 # no search path for DLLs.
11055- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11056- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11057- # Tell ltmain to make .lib files, not .a files.
11058- libext=lib
11059- # Tell ltmain to make .dll files, not .so files.
11060- shrext_cmds=".dll"
11061- # FIXME: Setting linknames here is a bad hack.
11062- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11063- # The linker will automatically build a .lib file if we build a DLL.
11064- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11065- # FIXME: Should let the user specify the lib program.
11066- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11067- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11068- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11069+ case $cc_basename in
11070+ cl*)
11071+ # Native MSVC
11072+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11073+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11074+ _LT_TAGVAR(always_export_symbols, $1)=yes
11075+ _LT_TAGVAR(file_list_spec, $1)='@'
11076+ # Tell ltmain to make .lib files, not .a files.
11077+ libext=lib
11078+ # Tell ltmain to make .dll files, not .so files.
11079+ shrext_cmds=".dll"
11080+ # FIXME: Setting linknames here is a bad hack.
11081+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11082+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11083+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11084+ else
11085+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11086+ fi~
11087+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11088+ linknames='
11089+ # The linker will not automatically build a static lib if we build a DLL.
11090+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11091+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11092+ _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'
11093+ # Don't use ranlib
11094+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11095+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11096+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11097+ case $lt_outputfile in
11098+ *.exe|*.EXE) ;;
11099+ *)
11100+ lt_outputfile="$lt_outputfile.exe"
11101+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11102+ ;;
11103+ esac~
11104+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11105+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11106+ $RM "$lt_outputfile.manifest";
11107+ fi'
11108+ ;;
11109+ *)
11110+ # Assume MSVC wrapper
11111+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11112+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11113+ # Tell ltmain to make .lib files, not .a files.
11114+ libext=lib
11115+ # Tell ltmain to make .dll files, not .so files.
11116+ shrext_cmds=".dll"
11117+ # FIXME: Setting linknames here is a bad hack.
11118+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11119+ # The linker will automatically build a .lib file if we build a DLL.
11120+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11121+ # FIXME: Should let the user specify the lib program.
11122+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11123+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11124+ ;;
11125+ esac
11126 ;;
11127
11128 darwin* | rhapsody*)
11129@@ -4828,7 +5143,7 @@ _LT_EOF
11130
11131 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11132 freebsd* | dragonfly*)
11133- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11134+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11135 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11136 _LT_TAGVAR(hardcode_direct, $1)=yes
11137 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11138@@ -4836,7 +5151,7 @@ _LT_EOF
11139
11140 hpux9*)
11141 if test "$GCC" = yes; then
11142- _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'
11143+ _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'
11144 else
11145 _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'
11146 fi
11147@@ -4852,7 +5167,7 @@ _LT_EOF
11148
11149 hpux10*)
11150 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11151- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11152+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11153 else
11154 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11155 fi
11156@@ -4876,10 +5191,10 @@ _LT_EOF
11157 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11158 ;;
11159 ia64*)
11160- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11161+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11162 ;;
11163 *)
11164- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11165+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11166 ;;
11167 esac
11168 else
11169@@ -4926,16 +5241,31 @@ _LT_EOF
11170
11171 irix5* | irix6* | nonstopux*)
11172 if test "$GCC" = yes; then
11173- _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'
11174+ _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'
11175 # Try to use the -exported_symbol ld option, if it does not
11176 # work, assume that -exports_file does not work either and
11177 # implicitly export all symbols.
11178- save_LDFLAGS="$LDFLAGS"
11179- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11180- AC_LINK_IFELSE(int foo(void) {},
11181- _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'
11182- )
11183- LDFLAGS="$save_LDFLAGS"
11184+ # This should be the same for all languages, so no per-tag cache variable.
11185+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11186+ [lt_cv_irix_exported_symbol],
11187+ [save_LDFLAGS="$LDFLAGS"
11188+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11189+ AC_LINK_IFELSE(
11190+ [AC_LANG_SOURCE(
11191+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11192+ [C++], [[int foo (void) { return 0; }]],
11193+ [Fortran 77], [[
11194+ subroutine foo
11195+ end]],
11196+ [Fortran], [[
11197+ subroutine foo
11198+ end]])])],
11199+ [lt_cv_irix_exported_symbol=yes],
11200+ [lt_cv_irix_exported_symbol=no])
11201+ LDFLAGS="$save_LDFLAGS"])
11202+ if test "$lt_cv_irix_exported_symbol" = yes; then
11203+ _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'
11204+ fi
11205 else
11206 _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'
11207 _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'
11208@@ -5020,7 +5350,7 @@ _LT_EOF
11209 osf4* | osf5*) # as osf3* with the addition of -msym flag
11210 if test "$GCC" = yes; then
11211 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11212- _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'
11213+ _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'
11214 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11215 else
11216 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11217@@ -5039,9 +5369,9 @@ _LT_EOF
11218 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11219 if test "$GCC" = yes; then
11220 wlarc='${wl}'
11221- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11222+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11223 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11224- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11225+ $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'
11226 else
11227 case `$CC -V 2>&1` in
11228 *"Compilers 5.0"*)
11229@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11230 to runtime path list])
11231 _LT_TAGDECL([], [link_all_deplibs], [0],
11232 [Whether libtool must link a program against all its dependency libraries])
11233-_LT_TAGDECL([], [fix_srcfile_path], [1],
11234- [Fix the shell variable $srcfile for the compiler])
11235 _LT_TAGDECL([], [always_export_symbols], [0],
11236 [Set to "yes" if exported symbols are required])
11237 _LT_TAGDECL([], [export_symbols_cmds], [2],
11238@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11239 [Symbols that must always be exported])
11240 _LT_TAGDECL([], [prelink_cmds], [2],
11241 [Commands necessary for linking programs (against libraries) with templates])
11242+_LT_TAGDECL([], [postlink_cmds], [2],
11243+ [Commands necessary for finishing linking programs])
11244 _LT_TAGDECL([], [file_list_spec], [1],
11245 [Specify filename containing input files])
11246 dnl FIXME: Not yet implemented
11247@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11248 m4_defun([_LT_LANG_CXX_CONFIG],
11249 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11250 m4_require([_LT_DECL_EGREP])dnl
11251+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11252 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11253 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11254 (test "X$CXX" != "Xg++"))) ; then
11255@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11256
11257 # Allow CC to be a program name with arguments.
11258 lt_save_CC=$CC
11259+ lt_save_CFLAGS=$CFLAGS
11260 lt_save_LD=$LD
11261 lt_save_GCC=$GCC
11262 GCC=$GXX
11263@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11264 fi
11265 test -z "${LDCXX+set}" || LD=$LDCXX
11266 CC=${CXX-"c++"}
11267+ CFLAGS=$CXXFLAGS
11268 compiler=$CC
11269 _LT_TAGVAR(compiler, $1)=$CC
11270 _LT_CC_BASENAME([$compiler])
11271@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11272 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11273 # Determine the default libpath from the value encoded in an empty
11274 # executable.
11275- _LT_SYS_MODULE_PATH_AIX
11276+ _LT_SYS_MODULE_PATH_AIX([$1])
11277 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11278
11279 _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"
11280@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11281 else
11282 # Determine the default libpath from the value encoded in an
11283 # empty executable.
11284- _LT_SYS_MODULE_PATH_AIX
11285+ _LT_SYS_MODULE_PATH_AIX([$1])
11286 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11287 # Warning - without using the other run time loading flags,
11288 # -berok will link without error, but may produce a broken library.
11289@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
11290 ;;
11291
11292 cygwin* | mingw* | pw32* | cegcc*)
11293- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11294- # as there is no search path for DLLs.
11295- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11296- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11297- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11298- _LT_TAGVAR(always_export_symbols, $1)=no
11299- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11300-
11301- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11302- _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'
11303- # If the export-symbols file already is a .def file (1st line
11304- # is EXPORTS), use it as is; otherwise, prepend...
11305- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11306- cp $export_symbols $output_objdir/$soname.def;
11307- else
11308- echo EXPORTS > $output_objdir/$soname.def;
11309- cat $export_symbols >> $output_objdir/$soname.def;
11310- fi~
11311- $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'
11312- else
11313- _LT_TAGVAR(ld_shlibs, $1)=no
11314- fi
11315- ;;
11316+ case $GXX,$cc_basename in
11317+ ,cl* | no,cl*)
11318+ # Native MSVC
11319+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11320+ # no search path for DLLs.
11321+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11322+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11323+ _LT_TAGVAR(always_export_symbols, $1)=yes
11324+ _LT_TAGVAR(file_list_spec, $1)='@'
11325+ # Tell ltmain to make .lib files, not .a files.
11326+ libext=lib
11327+ # Tell ltmain to make .dll files, not .so files.
11328+ shrext_cmds=".dll"
11329+ # FIXME: Setting linknames here is a bad hack.
11330+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11331+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11332+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11333+ else
11334+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11335+ fi~
11336+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11337+ linknames='
11338+ # The linker will not automatically build a static lib if we build a DLL.
11339+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11340+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11341+ # Don't use ranlib
11342+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11343+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11344+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11345+ case $lt_outputfile in
11346+ *.exe|*.EXE) ;;
11347+ *)
11348+ lt_outputfile="$lt_outputfile.exe"
11349+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11350+ ;;
11351+ esac~
11352+ func_to_tool_file "$lt_outputfile"~
11353+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11354+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11355+ $RM "$lt_outputfile.manifest";
11356+ fi'
11357+ ;;
11358+ *)
11359+ # g++
11360+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11361+ # as there is no search path for DLLs.
11362+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11363+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11364+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11365+ _LT_TAGVAR(always_export_symbols, $1)=no
11366+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11367+
11368+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11369+ _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'
11370+ # If the export-symbols file already is a .def file (1st line
11371+ # is EXPORTS), use it as is; otherwise, prepend...
11372+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11373+ cp $export_symbols $output_objdir/$soname.def;
11374+ else
11375+ echo EXPORTS > $output_objdir/$soname.def;
11376+ cat $export_symbols >> $output_objdir/$soname.def;
11377+ fi~
11378+ $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'
11379+ else
11380+ _LT_TAGVAR(ld_shlibs, $1)=no
11381+ fi
11382+ ;;
11383+ esac
11384+ ;;
11385 darwin* | rhapsody*)
11386 _LT_DARWIN_LINKER_FEATURES($1)
11387 ;;
11388@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11389 ;;
11390 *)
11391 if test "$GXX" = yes; then
11392- _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'
11393+ _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'
11394 else
11395 # FIXME: insert proper C++ library support
11396 _LT_TAGVAR(ld_shlibs, $1)=no
11397@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
11398 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11399 ;;
11400 ia64*)
11401- _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'
11402+ _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'
11403 ;;
11404 *)
11405- _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'
11406+ _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'
11407 ;;
11408 esac
11409 fi
11410@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11411 *)
11412 if test "$GXX" = yes; then
11413 if test "$with_gnu_ld" = no; then
11414- _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'
11415+ _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'
11416 else
11417- _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'
11418+ _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'
11419 fi
11420 fi
11421 _LT_TAGVAR(link_all_deplibs, $1)=yes
11422@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
11423 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11424 rm -rf $tpldir~
11425 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11426- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11427+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11428 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11429 rm -rf $tpldir~
11430 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11431- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11432+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11433 $RANLIB $oldlib'
11434 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11435 rm -rf $tpldir~
11436 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11437- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11438+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11439 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11440 rm -rf $tpldir~
11441 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11442- $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'
11443+ $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'
11444 ;;
11445 *) # Version 6 and above use weak symbols
11446 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11447@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11448 _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'
11449 ;;
11450 *)
11451- _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'
11452+ _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'
11453 ;;
11454 esac
11455
11456@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11457
11458 solaris*)
11459 case $cc_basename in
11460- CC*)
11461+ CC* | sunCC*)
11462 # Sun C++ 4.2, 5.x and Centerline C++
11463 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11464 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11465@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11466 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11467 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11468 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11469- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11470+ _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'
11471 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11472- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11473+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11474
11475 # Commands to make compiler produce verbose output that lists
11476 # what "hidden" libraries, object files and flags are used when
11477@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11478 fi # test -n "$compiler"
11479
11480 CC=$lt_save_CC
11481+ CFLAGS=$lt_save_CFLAGS
11482 LDCXX=$LD
11483 LD=$lt_save_LD
11484 GCC=$lt_save_GCC
11485@@ -6445,6 +6825,29 @@ AC_LANG_POP
11486 ])# _LT_LANG_CXX_CONFIG
11487
11488
11489+# _LT_FUNC_STRIPNAME_CNF
11490+# ----------------------
11491+# func_stripname_cnf prefix suffix name
11492+# strip PREFIX and SUFFIX off of NAME.
11493+# PREFIX and SUFFIX must not contain globbing or regex special
11494+# characters, hashes, percent signs, but SUFFIX may contain a leading
11495+# dot (in which case that matches only a dot).
11496+#
11497+# This function is identical to the (non-XSI) version of func_stripname,
11498+# except this one can be used by m4 code that may be executed by configure,
11499+# rather than the libtool script.
11500+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11501+AC_REQUIRE([_LT_DECL_SED])
11502+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11503+func_stripname_cnf ()
11504+{
11505+ case ${2} in
11506+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11507+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11508+ esac
11509+} # func_stripname_cnf
11510+])# _LT_FUNC_STRIPNAME_CNF
11511+
11512 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11513 # ---------------------------------
11514 # Figure out "hidden" library dependencies from verbose
11515@@ -6453,6 +6856,7 @@ AC_LANG_POP
11516 # objects, libraries and library flags.
11517 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11518 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11519+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11520 # Dependencies to place before and after the object being linked:
11521 _LT_TAGVAR(predep_objects, $1)=
11522 _LT_TAGVAR(postdep_objects, $1)=
11523@@ -6503,6 +6907,13 @@ public class foo {
11524 };
11525 _LT_EOF
11526 ])
11527+
11528+_lt_libdeps_save_CFLAGS=$CFLAGS
11529+case "$CC $CFLAGS " in #(
11530+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11531+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11532+esac
11533+
11534 dnl Parse the compiler output and extract the necessary
11535 dnl objects, libraries and library flags.
11536 if AC_TRY_EVAL(ac_compile); then
11537@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11538 pre_test_object_deps_done=no
11539
11540 for p in `eval "$output_verbose_link_cmd"`; do
11541- case $p in
11542+ case ${prev}${p} in
11543
11544 -L* | -R* | -l*)
11545 # Some compilers place space between "-{L,R}" and the path.
11546@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11547 test $p = "-R"; then
11548 prev=$p
11549 continue
11550- else
11551- prev=
11552 fi
11553
11554+ # Expand the sysroot to ease extracting the directories later.
11555+ if test -z "$prev"; then
11556+ case $p in
11557+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11558+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11559+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11560+ esac
11561+ fi
11562+ case $p in
11563+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11564+ esac
11565 if test "$pre_test_object_deps_done" = no; then
11566- case $p in
11567- -L* | -R*)
11568+ case ${prev} in
11569+ -L | -R)
11570 # Internal compiler library paths should come after those
11571 # provided the user. The postdeps already come after the
11572 # user supplied libs so there is no need to process them.
11573@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11574 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11575 fi
11576 fi
11577+ prev=
11578 ;;
11579
11580+ *.lto.$objext) ;; # Ignore GCC LTO objects
11581 *.$objext)
11582 # This assumes that the test object file only shows up
11583 # once in the compiler output.
11584@@ -6586,6 +7008,7 @@ else
11585 fi
11586
11587 $RM -f confest.$objext
11588+CFLAGS=$_lt_libdeps_save_CFLAGS
11589
11590 # PORTME: override above test on systems where it is broken
11591 m4_if([$1], [CXX],
11592@@ -6622,7 +7045,7 @@ linux*)
11593
11594 solaris*)
11595 case $cc_basename in
11596- CC*)
11597+ CC* | sunCC*)
11598 # The more standards-conforming stlport4 library is
11599 # incompatible with the Cstd library. Avoid specifying
11600 # it if it's in CXXFLAGS. Ignore libCrun as
11601@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11602 # Allow CC to be a program name with arguments.
11603 lt_save_CC="$CC"
11604 lt_save_GCC=$GCC
11605+ lt_save_CFLAGS=$CFLAGS
11606 CC=${F77-"f77"}
11607+ CFLAGS=$FFLAGS
11608 compiler=$CC
11609 _LT_TAGVAR(compiler, $1)=$CC
11610 _LT_CC_BASENAME([$compiler])
11611@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11612
11613 GCC=$lt_save_GCC
11614 CC="$lt_save_CC"
11615+ CFLAGS="$lt_save_CFLAGS"
11616 fi # test "$_lt_disable_F77" != yes
11617
11618 AC_LANG_POP
11619@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11620 # Allow CC to be a program name with arguments.
11621 lt_save_CC="$CC"
11622 lt_save_GCC=$GCC
11623+ lt_save_CFLAGS=$CFLAGS
11624 CC=${FC-"f95"}
11625+ CFLAGS=$FCFLAGS
11626 compiler=$CC
11627 GCC=$ac_cv_fc_compiler_gnu
11628
11629@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11630 fi # test -n "$compiler"
11631
11632 GCC=$lt_save_GCC
11633- CC="$lt_save_CC"
11634+ CC=$lt_save_CC
11635+ CFLAGS=$lt_save_CFLAGS
11636 fi # test "$_lt_disable_FC" != yes
11637
11638 AC_LANG_POP
11639@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11640 _LT_LINKER_BOILERPLATE
11641
11642 # Allow CC to be a program name with arguments.
11643-lt_save_CC="$CC"
11644+lt_save_CC=$CC
11645+lt_save_CFLAGS=$CFLAGS
11646 lt_save_GCC=$GCC
11647 GCC=yes
11648 CC=${GCJ-"gcj"}
11649+CFLAGS=$GCJFLAGS
11650 compiler=$CC
11651 _LT_TAGVAR(compiler, $1)=$CC
11652 _LT_TAGVAR(LD, $1)="$LD"
11653@@ -6992,7 +7423,8 @@ fi
11654 AC_LANG_RESTORE
11655
11656 GCC=$lt_save_GCC
11657-CC="$lt_save_CC"
11658+CC=$lt_save_CC
11659+CFLAGS=$lt_save_CFLAGS
11660 ])# _LT_LANG_GCJ_CONFIG
11661
11662
11663@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11664
11665 # Allow CC to be a program name with arguments.
11666 lt_save_CC="$CC"
11667+lt_save_CFLAGS=$CFLAGS
11668 lt_save_GCC=$GCC
11669 GCC=
11670 CC=${RC-"windres"}
11671+CFLAGS=
11672 compiler=$CC
11673 _LT_TAGVAR(compiler, $1)=$CC
11674 _LT_CC_BASENAME([$compiler])
11675@@ -7042,7 +7476,8 @@ fi
11676
11677 GCC=$lt_save_GCC
11678 AC_LANG_RESTORE
11679-CC="$lt_save_CC"
11680+CC=$lt_save_CC
11681+CFLAGS=$lt_save_CFLAGS
11682 ])# _LT_LANG_RC_CONFIG
11683
11684
11685@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
11686 AC_SUBST([OBJDUMP])
11687 ])
11688
11689+# _LT_DECL_DLLTOOL
11690+# ----------------
11691+# Ensure DLLTOOL variable is set.
11692+m4_defun([_LT_DECL_DLLTOOL],
11693+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11694+test -z "$DLLTOOL" && DLLTOOL=dlltool
11695+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11696+AC_SUBST([DLLTOOL])
11697+])
11698
11699 # _LT_DECL_SED
11700 # ------------
11701@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11702 # Try some XSI features
11703 xsi_shell=no
11704 ( _lt_dummy="a/b/c"
11705- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11706- = c,a/b,, \
11707+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11708+ = c,a/b,b/c, \
11709 && eval 'test $(( 1 + 1 )) -eq 2 \
11710 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11711 && xsi_shell=yes
11712@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
11713 ])# _LT_CHECK_SHELL_FEATURES
11714
11715
11716-# _LT_PROG_XSI_SHELLFNS
11717-# ---------------------
11718-# Bourne and XSI compatible variants of some useful shell functions.
11719-m4_defun([_LT_PROG_XSI_SHELLFNS],
11720-[case $xsi_shell in
11721- yes)
11722- cat << \_LT_EOF >> "$cfgfile"
11723-
11724-# func_dirname file append nondir_replacement
11725-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11726-# otherwise set result to NONDIR_REPLACEMENT.
11727-func_dirname ()
11728-{
11729- case ${1} in
11730- */*) func_dirname_result="${1%/*}${2}" ;;
11731- * ) func_dirname_result="${3}" ;;
11732- esac
11733-}
11734-
11735-# func_basename file
11736-func_basename ()
11737-{
11738- func_basename_result="${1##*/}"
11739-}
11740-
11741-# func_dirname_and_basename file append nondir_replacement
11742-# perform func_basename and func_dirname in a single function
11743-# call:
11744-# dirname: Compute the dirname of FILE. If nonempty,
11745-# add APPEND to the result, otherwise set result
11746-# to NONDIR_REPLACEMENT.
11747-# value returned in "$func_dirname_result"
11748-# basename: Compute filename of FILE.
11749-# value retuned in "$func_basename_result"
11750-# Implementation must be kept synchronized with func_dirname
11751-# and func_basename. For efficiency, we do not delegate to
11752-# those functions but instead duplicate the functionality here.
11753-func_dirname_and_basename ()
11754-{
11755- case ${1} in
11756- */*) func_dirname_result="${1%/*}${2}" ;;
11757- * ) func_dirname_result="${3}" ;;
11758- esac
11759- func_basename_result="${1##*/}"
11760-}
11761-
11762-# func_stripname prefix suffix name
11763-# strip PREFIX and SUFFIX off of NAME.
11764-# PREFIX and SUFFIX must not contain globbing or regex special
11765-# characters, hashes, percent signs, but SUFFIX may contain a leading
11766-# dot (in which case that matches only a dot).
11767-func_stripname ()
11768-{
11769- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11770- # positional parameters, so assign one to ordinary parameter first.
11771- func_stripname_result=${3}
11772- func_stripname_result=${func_stripname_result#"${1}"}
11773- func_stripname_result=${func_stripname_result%"${2}"}
11774-}
11775-
11776-# func_opt_split
11777-func_opt_split ()
11778-{
11779- func_opt_split_opt=${1%%=*}
11780- func_opt_split_arg=${1#*=}
11781-}
11782-
11783-# func_lo2o object
11784-func_lo2o ()
11785-{
11786- case ${1} in
11787- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11788- *) func_lo2o_result=${1} ;;
11789- esac
11790-}
11791-
11792-# func_xform libobj-or-source
11793-func_xform ()
11794-{
11795- func_xform_result=${1%.*}.lo
11796-}
11797-
11798-# func_arith arithmetic-term...
11799-func_arith ()
11800-{
11801- func_arith_result=$(( $[*] ))
11802-}
11803-
11804-# func_len string
11805-# STRING may not start with a hyphen.
11806-func_len ()
11807-{
11808- func_len_result=${#1}
11809-}
11810+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11811+# ------------------------------------------------------
11812+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11813+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11814+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11815+[dnl {
11816+sed -e '/^$1 ()$/,/^} # $1 /c\
11817+$1 ()\
11818+{\
11819+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11820+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11821+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11822+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11823+test 0 -eq $? || _lt_function_replace_fail=:
11824+])
11825
11826-_LT_EOF
11827- ;;
11828- *) # Bourne compatible functions.
11829- cat << \_LT_EOF >> "$cfgfile"
11830
11831-# func_dirname file append nondir_replacement
11832-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11833-# otherwise set result to NONDIR_REPLACEMENT.
11834-func_dirname ()
11835-{
11836- # Extract subdirectory from the argument.
11837- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11838- if test "X$func_dirname_result" = "X${1}"; then
11839- func_dirname_result="${3}"
11840- else
11841- func_dirname_result="$func_dirname_result${2}"
11842- fi
11843-}
11844+# _LT_PROG_REPLACE_SHELLFNS
11845+# -------------------------
11846+# Replace existing portable implementations of several shell functions with
11847+# equivalent extended shell implementations where those features are available..
11848+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11849+[if test x"$xsi_shell" = xyes; then
11850+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11851+ case ${1} in
11852+ */*) func_dirname_result="${1%/*}${2}" ;;
11853+ * ) func_dirname_result="${3}" ;;
11854+ esac])
11855+
11856+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11857+ func_basename_result="${1##*/}"])
11858+
11859+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11860+ case ${1} in
11861+ */*) func_dirname_result="${1%/*}${2}" ;;
11862+ * ) func_dirname_result="${3}" ;;
11863+ esac
11864+ func_basename_result="${1##*/}"])
11865
11866-# func_basename file
11867-func_basename ()
11868-{
11869- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11870-}
11871+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11872+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11873+ # positional parameters, so assign one to ordinary parameter first.
11874+ func_stripname_result=${3}
11875+ func_stripname_result=${func_stripname_result#"${1}"}
11876+ func_stripname_result=${func_stripname_result%"${2}"}])
11877
11878-dnl func_dirname_and_basename
11879-dnl A portable version of this function is already defined in general.m4sh
11880-dnl so there is no need for it here.
11881+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11882+ func_split_long_opt_name=${1%%=*}
11883+ func_split_long_opt_arg=${1#*=}])
11884
11885-# func_stripname prefix suffix name
11886-# strip PREFIX and SUFFIX off of NAME.
11887-# PREFIX and SUFFIX must not contain globbing or regex special
11888-# characters, hashes, percent signs, but SUFFIX may contain a leading
11889-# dot (in which case that matches only a dot).
11890-# func_strip_suffix prefix name
11891-func_stripname ()
11892-{
11893- case ${2} in
11894- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11895- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11896- esac
11897-}
11898+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11899+ func_split_short_opt_arg=${1#??}
11900+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11901
11902-# sed scripts:
11903-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11904-my_sed_long_arg='1s/^-[[^=]]*=//'
11905+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11906+ case ${1} in
11907+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11908+ *) func_lo2o_result=${1} ;;
11909+ esac])
11910
11911-# func_opt_split
11912-func_opt_split ()
11913-{
11914- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
11915- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
11916-}
11917+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
11918
11919-# func_lo2o object
11920-func_lo2o ()
11921-{
11922- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
11923-}
11924+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
11925
11926-# func_xform libobj-or-source
11927-func_xform ()
11928-{
11929- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
11930-}
11931+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
11932+fi
11933
11934-# func_arith arithmetic-term...
11935-func_arith ()
11936-{
11937- func_arith_result=`expr "$[@]"`
11938-}
11939+if test x"$lt_shell_append" = xyes; then
11940+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
11941
11942-# func_len string
11943-# STRING may not start with a hyphen.
11944-func_len ()
11945-{
11946- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
11947-}
11948+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
11949+ func_quote_for_eval "${2}"
11950+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11951+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11952
11953-_LT_EOF
11954-esac
11955+ # Save a `func_append' function call where possible by direct use of '+='
11956+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11957+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11958+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11959+ test 0 -eq $? || _lt_function_replace_fail=:
11960+else
11961+ # Save a `func_append' function call even when '+=' is not available
11962+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
11963+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11964+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11965+ test 0 -eq $? || _lt_function_replace_fail=:
11966+fi
11967
11968-case $lt_shell_append in
11969- yes)
11970- cat << \_LT_EOF >> "$cfgfile"
11971+if test x"$_lt_function_replace_fail" = x":"; then
11972+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11973+fi
11974+])
11975
11976-# func_append var value
11977-# Append VALUE to the end of shell variable VAR.
11978-func_append ()
11979-{
11980- eval "$[1]+=\$[2]"
11981-}
11982-_LT_EOF
11983+# _LT_PATH_CONVERSION_FUNCTIONS
11984+# -----------------------------
11985+# Determine which file name conversion functions should be used by
11986+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
11987+# for certain cross-compile configurations and native mingw.
11988+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
11989+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
11990+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
11991+AC_MSG_CHECKING([how to convert $build file names to $host format])
11992+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
11993+[case $host in
11994+ *-*-mingw* )
11995+ case $build in
11996+ *-*-mingw* ) # actually msys
11997+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11998+ ;;
11999+ *-*-cygwin* )
12000+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
12001+ ;;
12002+ * ) # otherwise, assume *nix
12003+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
12004+ ;;
12005+ esac
12006 ;;
12007- *)
12008- cat << \_LT_EOF >> "$cfgfile"
12009-
12010-# func_append var value
12011-# Append VALUE to the end of shell variable VAR.
12012-func_append ()
12013-{
12014- eval "$[1]=\$$[1]\$[2]"
12015-}
12016-
12017-_LT_EOF
12018+ *-*-cygwin* )
12019+ case $build in
12020+ *-*-mingw* ) # actually msys
12021+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
12022+ ;;
12023+ *-*-cygwin* )
12024+ lt_cv_to_host_file_cmd=func_convert_file_noop
12025+ ;;
12026+ * ) # otherwise, assume *nix
12027+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
12028+ ;;
12029+ esac
12030 ;;
12031- esac
12032+ * ) # unhandled hosts (and "normal" native builds)
12033+ lt_cv_to_host_file_cmd=func_convert_file_noop
12034+ ;;
12035+esac
12036+])
12037+to_host_file_cmd=$lt_cv_to_host_file_cmd
12038+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12039+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12040+ [0], [convert $build file names to $host format])dnl
12041+
12042+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12043+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12044+[#assume ordinary cross tools, or native build.
12045+lt_cv_to_tool_file_cmd=func_convert_file_noop
12046+case $host in
12047+ *-*-mingw* )
12048+ case $build in
12049+ *-*-mingw* ) # actually msys
12050+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12051+ ;;
12052+ esac
12053+ ;;
12054+esac
12055 ])
12056+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12057+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12058+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12059+ [0], [convert $build files to toolchain format])dnl
12060+])# _LT_PATH_CONVERSION_FUNCTIONS
12061diff --git a/ltmain.sh b/ltmain.sh
12062index 9503ec8..70e856e 100644
12063--- a/ltmain.sh
12064+++ b/ltmain.sh
12065@@ -1,10 +1,9 @@
12066-# Generated from ltmain.m4sh.
12067
12068-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12069+# libtool (GNU libtool) 2.4
12070 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12071
12072 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12073-# 2007, 2008, 2009 Free Software Foundation, Inc.
12074+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12075 # This is free software; see the source for copying conditions. There is NO
12076 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12077
12078@@ -38,7 +37,6 @@
12079 # -n, --dry-run display commands without modifying any files
12080 # --features display basic configuration information and exit
12081 # --mode=MODE use operation mode MODE
12082-# --no-finish let install mode avoid finish commands
12083 # --preserve-dup-deps don't remove duplicate dependency libraries
12084 # --quiet, --silent don't print informational messages
12085 # --no-quiet, --no-silent
12086@@ -71,17 +69,19 @@
12087 # compiler: $LTCC
12088 # compiler flags: $LTCFLAGS
12089 # linker: $LD (gnu? $with_gnu_ld)
12090-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12091+# $progname: (GNU libtool) 2.4
12092 # automake: $automake_version
12093 # autoconf: $autoconf_version
12094 #
12095 # Report bugs to <bug-libtool@gnu.org>.
12096+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12097+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12098
12099 PROGRAM=libtool
12100 PACKAGE=libtool
12101-VERSION=2.2.7a
12102-TIMESTAMP=" 1.3134 2009-11-29"
12103-package_revision=1.3134
12104+VERSION=2.4
12105+TIMESTAMP=""
12106+package_revision=1.3293
12107
12108 # Be Bourne compatible
12109 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12110@@ -106,9 +106,6 @@ _LTECHO_EOF'
12111 }
12112
12113 # NLS nuisances: We save the old values to restore during execute mode.
12114-# Only set LANG and LC_ALL to C if already set.
12115-# These must not be set unconditionally because not all systems understand
12116-# e.g. LANG=C (notably SCO).
12117 lt_user_locale=
12118 lt_safe_locale=
12119 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12120@@ -121,15 +118,13 @@ do
12121 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12122 fi"
12123 done
12124+LC_ALL=C
12125+LANGUAGE=C
12126+export LANGUAGE LC_ALL
12127
12128 $lt_unset CDPATH
12129
12130
12131-
12132-
12133-
12134-
12135-
12136 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12137 # is ksh but when the shell is invoked as "sh" and the current value of
12138 # the _XPG environment variable is not equal to 1 (one), the special
12139@@ -140,7 +135,7 @@ progpath="$0"
12140
12141
12142 : ${CP="cp -f"}
12143-: ${ECHO=$as_echo}
12144+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12145 : ${EGREP="/bin/grep -E"}
12146 : ${FGREP="/bin/grep -F"}
12147 : ${GREP="/bin/grep"}
12148@@ -149,7 +144,7 @@ progpath="$0"
12149 : ${MKDIR="mkdir"}
12150 : ${MV="mv -f"}
12151 : ${RM="rm -f"}
12152-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12153+: ${SED="/bin/sed"}
12154 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12155 : ${Xsed="$SED -e 1s/^X//"}
12156
12157@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12158 dirname="s,/[^/]*$,,"
12159 basename="s,^.*/,,"
12160
12161+# func_dirname file append nondir_replacement
12162+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12163+# otherwise set result to NONDIR_REPLACEMENT.
12164+func_dirname ()
12165+{
12166+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12167+ if test "X$func_dirname_result" = "X${1}"; then
12168+ func_dirname_result="${3}"
12169+ else
12170+ func_dirname_result="$func_dirname_result${2}"
12171+ fi
12172+} # func_dirname may be replaced by extended shell implementation
12173+
12174+
12175+# func_basename file
12176+func_basename ()
12177+{
12178+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12179+} # func_basename may be replaced by extended shell implementation
12180+
12181+
12182 # func_dirname_and_basename file append nondir_replacement
12183 # perform func_basename and func_dirname in a single function
12184 # call:
12185@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12186 # those functions but instead duplicate the functionality here.
12187 func_dirname_and_basename ()
12188 {
12189- # Extract subdirectory from the argument.
12190- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12191- if test "X$func_dirname_result" = "X${1}"; then
12192- func_dirname_result="${3}"
12193- else
12194- func_dirname_result="$func_dirname_result${2}"
12195- fi
12196- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12197-}
12198+ # Extract subdirectory from the argument.
12199+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12200+ if test "X$func_dirname_result" = "X${1}"; then
12201+ func_dirname_result="${3}"
12202+ else
12203+ func_dirname_result="$func_dirname_result${2}"
12204+ fi
12205+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12206+} # func_dirname_and_basename may be replaced by extended shell implementation
12207+
12208+
12209+# func_stripname prefix suffix name
12210+# strip PREFIX and SUFFIX off of NAME.
12211+# PREFIX and SUFFIX must not contain globbing or regex special
12212+# characters, hashes, percent signs, but SUFFIX may contain a leading
12213+# dot (in which case that matches only a dot).
12214+# func_strip_suffix prefix name
12215+func_stripname ()
12216+{
12217+ case ${2} in
12218+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12219+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12220+ esac
12221+} # func_stripname may be replaced by extended shell implementation
12222
12223-# Generated shell functions inserted here.
12224
12225 # These SED scripts presuppose an absolute path with a trailing slash.
12226 pathcar='s,^/\([^/]*\).*$,\1,'
12227@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12228 # Same as above, but do not quote variable references.
12229 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12230
12231+# Sed substitution that turns a string into a regex matching for the
12232+# string literally.
12233+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12234+
12235+# Sed substitution that converts a w32 file name or path
12236+# which contains forward slashes, into one that contains
12237+# (escaped) backslashes. A very naive implementation.
12238+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12239+
12240 # Re-`\' parameter expansions in output of double_quote_subst that were
12241 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12242 # in input to double_quote_subst, that '$' was protected from expansion.
12243@@ -404,7 +443,7 @@ opt_warning=:
12244 # name if it has been set yet.
12245 func_echo ()
12246 {
12247- $ECHO "$progname${mode+: }$mode: $*"
12248+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12249 }
12250
12251 # func_verbose arg...
12252@@ -430,14 +469,14 @@ func_echo_all ()
12253 # Echo program name prefixed message to standard error.
12254 func_error ()
12255 {
12256- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12257+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12258 }
12259
12260 # func_warning arg...
12261 # Echo program name prefixed warning message to standard error.
12262 func_warning ()
12263 {
12264- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12265+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12266
12267 # bash bug again:
12268 :
12269@@ -656,19 +695,35 @@ func_show_eval_locale ()
12270 fi
12271 }
12272
12273-
12274-
12275+# func_tr_sh
12276+# Turn $1 into a string suitable for a shell variable name.
12277+# Result is stored in $func_tr_sh_result. All characters
12278+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12279+# if $1 begins with a digit, a '_' is prepended as well.
12280+func_tr_sh ()
12281+{
12282+ case $1 in
12283+ [0-9]* | *[!a-zA-Z0-9_]*)
12284+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12285+ ;;
12286+ * )
12287+ func_tr_sh_result=$1
12288+ ;;
12289+ esac
12290+}
12291
12292
12293 # func_version
12294 # Echo version message to standard output and exit.
12295 func_version ()
12296 {
12297+ $opt_debug
12298+
12299 $SED -n '/(C)/!b go
12300 :more
12301 /\./!{
12302 N
12303- s/\n# //
12304+ s/\n# / /
12305 b more
12306 }
12307 :go
12308@@ -685,7 +740,9 @@ func_version ()
12309 # Echo short help message to standard output and exit.
12310 func_usage ()
12311 {
12312- $SED -n '/^# Usage:/,/^# *-h/ {
12313+ $opt_debug
12314+
12315+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12316 s/^# //
12317 s/^# *$//
12318 s/\$progname/'$progname'/
12319@@ -701,7 +758,10 @@ func_usage ()
12320 # unless 'noexit' is passed as argument.
12321 func_help ()
12322 {
12323+ $opt_debug
12324+
12325 $SED -n '/^# Usage:/,/# Report bugs to/ {
12326+ :print
12327 s/^# //
12328 s/^# *$//
12329 s*\$progname*'$progname'*
12330@@ -714,7 +774,11 @@ func_help ()
12331 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12332 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12333 p
12334- }' < "$progpath"
12335+ d
12336+ }
12337+ /^# .* home page:/b print
12338+ /^# General help using/b print
12339+ ' < "$progpath"
12340 ret=$?
12341 if test -z "$1"; then
12342 exit $ret
12343@@ -726,12 +790,39 @@ func_help ()
12344 # exit_cmd.
12345 func_missing_arg ()
12346 {
12347- func_error "missing argument for $1"
12348+ $opt_debug
12349+
12350+ func_error "missing argument for $1."
12351 exit_cmd=exit
12352 }
12353
12354-exit_cmd=:
12355
12356+# func_split_short_opt shortopt
12357+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12358+# variables after splitting SHORTOPT after the 2nd character.
12359+func_split_short_opt ()
12360+{
12361+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12362+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12363+
12364+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12365+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12366+} # func_split_short_opt may be replaced by extended shell implementation
12367+
12368+
12369+# func_split_long_opt longopt
12370+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12371+# variables after splitting LONGOPT at the `=' sign.
12372+func_split_long_opt ()
12373+{
12374+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12375+ my_sed_long_arg='1s/^--[^=]*=//'
12376+
12377+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12378+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12379+} # func_split_long_opt may be replaced by extended shell implementation
12380+
12381+exit_cmd=:
12382
12383
12384
12385@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12386 magic_exe="%%%MAGIC EXE variable%%%"
12387
12388 # Global variables.
12389-# $mode is unset
12390 nonopt=
12391-execute_dlfiles=
12392 preserve_args=
12393 lo2o="s/\\.lo\$/.${objext}/"
12394 o2lo="s/\\.${objext}\$/.lo/"
12395 extracted_archives=
12396 extracted_serial=0
12397
12398-opt_dry_run=false
12399-opt_finish=:
12400-opt_duplicate_deps=false
12401-opt_silent=false
12402-opt_debug=:
12403-
12404 # If this variable is set in any of the actions, the command in it
12405 # will be execed at the end. This prevents here-documents from being
12406 # left over by shells.
12407 exec_cmd=
12408
12409+# func_append var value
12410+# Append VALUE to the end of shell variable VAR.
12411+func_append ()
12412+{
12413+ eval "${1}=\$${1}\${2}"
12414+} # func_append may be replaced by extended shell implementation
12415+
12416+# func_append_quoted var value
12417+# Quote VALUE and append to the end of shell variable VAR, separated
12418+# by a space.
12419+func_append_quoted ()
12420+{
12421+ func_quote_for_eval "${2}"
12422+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12423+} # func_append_quoted may be replaced by extended shell implementation
12424+
12425+
12426+# func_arith arithmetic-term...
12427+func_arith ()
12428+{
12429+ func_arith_result=`expr "${@}"`
12430+} # func_arith may be replaced by extended shell implementation
12431+
12432+
12433+# func_len string
12434+# STRING may not start with a hyphen.
12435+func_len ()
12436+{
12437+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12438+} # func_len may be replaced by extended shell implementation
12439+
12440+
12441+# func_lo2o object
12442+func_lo2o ()
12443+{
12444+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12445+} # func_lo2o may be replaced by extended shell implementation
12446+
12447+
12448+# func_xform libobj-or-source
12449+func_xform ()
12450+{
12451+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12452+} # func_xform may be replaced by extended shell implementation
12453+
12454+
12455 # func_fatal_configuration arg...
12456 # Echo program name prefixed message to standard error, followed by
12457 # a configuration failure hint, and exit.
12458@@ -850,130 +979,204 @@ func_enable_tag ()
12459 esac
12460 }
12461
12462-# Parse options once, thoroughly. This comes as soon as possible in
12463-# the script to make things like `libtool --version' happen quickly.
12464+# func_check_version_match
12465+# Ensure that we are using m4 macros, and libtool script from the same
12466+# release of libtool.
12467+func_check_version_match ()
12468 {
12469+ if test "$package_revision" != "$macro_revision"; then
12470+ if test "$VERSION" != "$macro_version"; then
12471+ if test -z "$macro_version"; then
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 an older release.
12475+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12476+$progname: and run autoconf again.
12477+_LT_EOF
12478+ else
12479+ cat >&2 <<_LT_EOF
12480+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12481+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12482+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12483+$progname: and run autoconf again.
12484+_LT_EOF
12485+ fi
12486+ else
12487+ cat >&2 <<_LT_EOF
12488+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12489+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12490+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12491+$progname: of $PACKAGE $VERSION and run autoconf again.
12492+_LT_EOF
12493+ fi
12494
12495- # Shorthand for --mode=foo, only valid as the first argument
12496- case $1 in
12497- clean|clea|cle|cl)
12498- shift; set dummy --mode clean ${1+"$@"}; shift
12499- ;;
12500- compile|compil|compi|comp|com|co|c)
12501- shift; set dummy --mode compile ${1+"$@"}; shift
12502- ;;
12503- execute|execut|execu|exec|exe|ex|e)
12504- shift; set dummy --mode execute ${1+"$@"}; shift
12505- ;;
12506- finish|finis|fini|fin|fi|f)
12507- shift; set dummy --mode finish ${1+"$@"}; shift
12508- ;;
12509- install|instal|insta|inst|ins|in|i)
12510- shift; set dummy --mode install ${1+"$@"}; shift
12511- ;;
12512- link|lin|li|l)
12513- shift; set dummy --mode link ${1+"$@"}; shift
12514- ;;
12515- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12516- shift; set dummy --mode uninstall ${1+"$@"}; shift
12517- ;;
12518- esac
12519+ exit $EXIT_MISMATCH
12520+ fi
12521+}
12522+
12523+
12524+# Shorthand for --mode=foo, only valid as the first argument
12525+case $1 in
12526+clean|clea|cle|cl)
12527+ shift; set dummy --mode clean ${1+"$@"}; shift
12528+ ;;
12529+compile|compil|compi|comp|com|co|c)
12530+ shift; set dummy --mode compile ${1+"$@"}; shift
12531+ ;;
12532+execute|execut|execu|exec|exe|ex|e)
12533+ shift; set dummy --mode execute ${1+"$@"}; shift
12534+ ;;
12535+finish|finis|fini|fin|fi|f)
12536+ shift; set dummy --mode finish ${1+"$@"}; shift
12537+ ;;
12538+install|instal|insta|inst|ins|in|i)
12539+ shift; set dummy --mode install ${1+"$@"}; shift
12540+ ;;
12541+link|lin|li|l)
12542+ shift; set dummy --mode link ${1+"$@"}; shift
12543+ ;;
12544+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12545+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12546+ ;;
12547+esac
12548
12549- # Parse non-mode specific arguments:
12550- while test "$#" -gt 0; do
12551+
12552+
12553+# Option defaults:
12554+opt_debug=:
12555+opt_dry_run=false
12556+opt_config=false
12557+opt_preserve_dup_deps=false
12558+opt_features=false
12559+opt_finish=false
12560+opt_help=false
12561+opt_help_all=false
12562+opt_silent=:
12563+opt_verbose=:
12564+opt_silent=false
12565+opt_verbose=false
12566+
12567+
12568+# Parse options once, thoroughly. This comes as soon as possible in the
12569+# script to make things like `--version' happen as quickly as we can.
12570+{
12571+ # this just eases exit handling
12572+ while test $# -gt 0; do
12573 opt="$1"
12574 shift
12575-
12576 case $opt in
12577- --config) func_config ;;
12578-
12579- --debug) preserve_args="$preserve_args $opt"
12580+ --debug|-x) opt_debug='set -x'
12581 func_echo "enabling shell trace mode"
12582- opt_debug='set -x'
12583 $opt_debug
12584 ;;
12585-
12586- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12587- execute_dlfiles="$execute_dlfiles $1"
12588- shift
12589+ --dry-run|--dryrun|-n)
12590+ opt_dry_run=:
12591 ;;
12592-
12593- --dry-run | -n) opt_dry_run=: ;;
12594- --features) func_features ;;
12595- --finish) mode="finish" ;;
12596- --no-finish) opt_finish=false ;;
12597-
12598- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12599- case $1 in
12600- # Valid mode arguments:
12601- clean) ;;
12602- compile) ;;
12603- execute) ;;
12604- finish) ;;
12605- install) ;;
12606- link) ;;
12607- relink) ;;
12608- uninstall) ;;
12609-
12610- # Catch anything else as an error
12611- *) func_error "invalid argument for $opt"
12612- exit_cmd=exit
12613- break
12614- ;;
12615- esac
12616-
12617- mode="$1"
12618+ --config)
12619+ opt_config=:
12620+func_config
12621+ ;;
12622+ --dlopen|-dlopen)
12623+ optarg="$1"
12624+ opt_dlopen="${opt_dlopen+$opt_dlopen
12625+}$optarg"
12626 shift
12627 ;;
12628-
12629 --preserve-dup-deps)
12630- opt_duplicate_deps=: ;;
12631-
12632- --quiet|--silent) preserve_args="$preserve_args $opt"
12633- opt_silent=:
12634- opt_verbose=false
12635+ opt_preserve_dup_deps=:
12636 ;;
12637-
12638- --no-quiet|--no-silent)
12639- preserve_args="$preserve_args $opt"
12640- opt_silent=false
12641+ --features)
12642+ opt_features=:
12643+func_features
12644 ;;
12645-
12646- --verbose| -v) preserve_args="$preserve_args $opt"
12647+ --finish)
12648+ opt_finish=:
12649+set dummy --mode finish ${1+"$@"}; shift
12650+ ;;
12651+ --help)
12652+ opt_help=:
12653+ ;;
12654+ --help-all)
12655+ opt_help_all=:
12656+opt_help=': help-all'
12657+ ;;
12658+ --mode)
12659+ test $# = 0 && func_missing_arg $opt && break
12660+ optarg="$1"
12661+ opt_mode="$optarg"
12662+case $optarg in
12663+ # Valid mode arguments:
12664+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12665+
12666+ # Catch anything else as an error
12667+ *) func_error "invalid argument for $opt"
12668+ exit_cmd=exit
12669+ break
12670+ ;;
12671+esac
12672+ shift
12673+ ;;
12674+ --no-silent|--no-quiet)
12675 opt_silent=false
12676- opt_verbose=:
12677+func_append preserve_args " $opt"
12678 ;;
12679-
12680- --no-verbose) preserve_args="$preserve_args $opt"
12681+ --no-verbose)
12682 opt_verbose=false
12683+func_append preserve_args " $opt"
12684 ;;
12685-
12686- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12687- preserve_args="$preserve_args $opt $1"
12688- func_enable_tag "$1" # tagname is set here
12689+ --silent|--quiet)
12690+ opt_silent=:
12691+func_append preserve_args " $opt"
12692+ opt_verbose=false
12693+ ;;
12694+ --verbose|-v)
12695+ opt_verbose=:
12696+func_append preserve_args " $opt"
12697+opt_silent=false
12698+ ;;
12699+ --tag)
12700+ test $# = 0 && func_missing_arg $opt && break
12701+ optarg="$1"
12702+ opt_tag="$optarg"
12703+func_append preserve_args " $opt $optarg"
12704+func_enable_tag "$optarg"
12705 shift
12706 ;;
12707
12708+ -\?|-h) func_usage ;;
12709+ --help) func_help ;;
12710+ --version) func_version ;;
12711+
12712 # Separate optargs to long options:
12713- -dlopen=*|--mode=*|--tag=*)
12714- func_opt_split "$opt"
12715- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12716+ --*=*)
12717+ func_split_long_opt "$opt"
12718+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12719 shift
12720 ;;
12721
12722- -\?|-h) func_usage ;;
12723- --help) opt_help=: ;;
12724- --help-all) opt_help=': help-all' ;;
12725- --version) func_version ;;
12726-
12727- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12728-
12729- *) nonopt="$opt"
12730- break
12731+ # Separate non-argument short options:
12732+ -\?*|-h*|-n*|-v*)
12733+ func_split_short_opt "$opt"
12734+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12735+ shift
12736 ;;
12737+
12738+ --) break ;;
12739+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12740+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12741 esac
12742 done
12743
12744+ # Validate options:
12745+
12746+ # save first non-option argument
12747+ if test "$#" -gt 0; then
12748+ nonopt="$opt"
12749+ shift
12750+ fi
12751+
12752+ # preserve --debug
12753+ test "$opt_debug" = : || func_append preserve_args " --debug"
12754
12755 case $host in
12756 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12757@@ -981,82 +1184,44 @@ func_enable_tag ()
12758 opt_duplicate_compiler_generated_deps=:
12759 ;;
12760 *)
12761- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12762+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12763 ;;
12764 esac
12765
12766- # Having warned about all mis-specified options, bail out if
12767- # anything was wrong.
12768- $exit_cmd $EXIT_FAILURE
12769-}
12770+ $opt_help || {
12771+ # Sanity checks first:
12772+ func_check_version_match
12773
12774-# func_check_version_match
12775-# Ensure that we are using m4 macros, and libtool script from the same
12776-# release of libtool.
12777-func_check_version_match ()
12778-{
12779- if test "$package_revision" != "$macro_revision"; then
12780- if test "$VERSION" != "$macro_version"; then
12781- if test -z "$macro_version"; then
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 an older release.
12785-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12786-$progname: and run autoconf again.
12787-_LT_EOF
12788- else
12789- cat >&2 <<_LT_EOF
12790-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12791-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12792-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12793-$progname: and run autoconf again.
12794-_LT_EOF
12795- fi
12796- else
12797- cat >&2 <<_LT_EOF
12798-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12799-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12800-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12801-$progname: of $PACKAGE $VERSION and run autoconf again.
12802-_LT_EOF
12803+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12804+ func_fatal_configuration "not configured to build any kind of library"
12805 fi
12806
12807- exit $EXIT_MISMATCH
12808- fi
12809-}
12810-
12811+ # Darwin sucks
12812+ eval std_shrext=\"$shrext_cmds\"
12813
12814-## ----------- ##
12815-## Main. ##
12816-## ----------- ##
12817-
12818-$opt_help || {
12819- # Sanity checks first:
12820- func_check_version_match
12821-
12822- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12823- func_fatal_configuration "not configured to build any kind of library"
12824- fi
12825+ # Only execute mode is allowed to have -dlopen flags.
12826+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12827+ func_error "unrecognized option \`-dlopen'"
12828+ $ECHO "$help" 1>&2
12829+ exit $EXIT_FAILURE
12830+ fi
12831
12832- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12833+ # Change the help message to a mode-specific one.
12834+ generic_help="$help"
12835+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12836+ }
12837
12838
12839- # Darwin sucks
12840- eval "std_shrext=\"$shrext_cmds\""
12841+ # Bail if the options were screwed
12842+ $exit_cmd $EXIT_FAILURE
12843+}
12844
12845
12846- # Only execute mode is allowed to have -dlopen flags.
12847- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12848- func_error "unrecognized option \`-dlopen'"
12849- $ECHO "$help" 1>&2
12850- exit $EXIT_FAILURE
12851- fi
12852
12853- # Change the help message to a mode-specific one.
12854- generic_help="$help"
12855- help="Try \`$progname --help --mode=$mode' for more information."
12856-}
12857
12858+## ----------- ##
12859+## Main. ##
12860+## ----------- ##
12861
12862 # func_lalib_p file
12863 # True iff FILE is a libtool `.la' library or `.lo' object file.
12864@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12865 # temporary ltwrapper_script.
12866 func_ltwrapper_scriptname ()
12867 {
12868- func_ltwrapper_scriptname_result=""
12869- if func_ltwrapper_executable_p "$1"; then
12870- func_dirname_and_basename "$1" "" "."
12871- func_stripname '' '.exe' "$func_basename_result"
12872- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12873- fi
12874+ func_dirname_and_basename "$1" "" "."
12875+ func_stripname '' '.exe' "$func_basename_result"
12876+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12877 }
12878
12879 # func_ltwrapper_p file
12880@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12881 save_ifs=$IFS; IFS='~'
12882 for cmd in $1; do
12883 IFS=$save_ifs
12884- eval "cmd=\"$cmd\""
12885+ eval cmd=\"$cmd\"
12886 func_show_eval "$cmd" "${2-:}"
12887 done
12888 IFS=$save_ifs
12889@@ -1172,6 +1334,37 @@ func_source ()
12890 }
12891
12892
12893+# func_resolve_sysroot PATH
12894+# Replace a leading = in PATH with a sysroot. Store the result into
12895+# func_resolve_sysroot_result
12896+func_resolve_sysroot ()
12897+{
12898+ func_resolve_sysroot_result=$1
12899+ case $func_resolve_sysroot_result in
12900+ =*)
12901+ func_stripname '=' '' "$func_resolve_sysroot_result"
12902+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12903+ ;;
12904+ esac
12905+}
12906+
12907+# func_replace_sysroot PATH
12908+# If PATH begins with the sysroot, replace it with = and
12909+# store the result into func_replace_sysroot_result.
12910+func_replace_sysroot ()
12911+{
12912+ case "$lt_sysroot:$1" in
12913+ ?*:"$lt_sysroot"*)
12914+ func_stripname "$lt_sysroot" '' "$1"
12915+ func_replace_sysroot_result="=$func_stripname_result"
12916+ ;;
12917+ *)
12918+ # Including no sysroot.
12919+ func_replace_sysroot_result=$1
12920+ ;;
12921+ esac
12922+}
12923+
12924 # func_infer_tag arg
12925 # Infer tagged configuration to use if any are available and
12926 # if one wasn't chosen via the "--tag" command line option.
12927@@ -1184,8 +1377,7 @@ func_infer_tag ()
12928 if test -n "$available_tags" && test -z "$tagname"; then
12929 CC_quoted=
12930 for arg in $CC; do
12931- func_quote_for_eval "$arg"
12932- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12933+ func_append_quoted CC_quoted "$arg"
12934 done
12935 CC_expanded=`func_echo_all $CC`
12936 CC_quoted_expanded=`func_echo_all $CC_quoted`
12937@@ -1204,8 +1396,7 @@ func_infer_tag ()
12938 CC_quoted=
12939 for arg in $CC; do
12940 # Double-quote args containing other shell metacharacters.
12941- func_quote_for_eval "$arg"
12942- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12943+ func_append_quoted CC_quoted "$arg"
12944 done
12945 CC_expanded=`func_echo_all $CC`
12946 CC_quoted_expanded=`func_echo_all $CC_quoted`
12947@@ -1274,6 +1465,486 @@ EOF
12948 }
12949 }
12950
12951+
12952+##################################################
12953+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
12954+##################################################
12955+
12956+# func_convert_core_file_wine_to_w32 ARG
12957+# Helper function used by file name conversion functions when $build is *nix,
12958+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
12959+# correctly configured wine environment available, with the winepath program
12960+# in $build's $PATH.
12961+#
12962+# ARG is the $build file name to be converted to w32 format.
12963+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
12964+# be empty on error (or when ARG is empty)
12965+func_convert_core_file_wine_to_w32 ()
12966+{
12967+ $opt_debug
12968+ func_convert_core_file_wine_to_w32_result="$1"
12969+ if test -n "$1"; then
12970+ # Unfortunately, winepath does not exit with a non-zero error code, so we
12971+ # are forced to check the contents of stdout. On the other hand, if the
12972+ # command is not found, the shell will set an exit code of 127 and print
12973+ # *an error message* to stdout. So we must check for both error code of
12974+ # zero AND non-empty stdout, which explains the odd construction:
12975+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
12976+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
12977+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
12978+ $SED -e "$lt_sed_naive_backslashify"`
12979+ else
12980+ func_convert_core_file_wine_to_w32_result=
12981+ fi
12982+ fi
12983+}
12984+# end: func_convert_core_file_wine_to_w32
12985+
12986+
12987+# func_convert_core_path_wine_to_w32 ARG
12988+# Helper function used by path conversion functions when $build is *nix, and
12989+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
12990+# configured wine environment available, with the winepath program in $build's
12991+# $PATH. Assumes ARG has no leading or trailing path separator characters.
12992+#
12993+# ARG is path to be converted from $build format to win32.
12994+# Result is available in $func_convert_core_path_wine_to_w32_result.
12995+# Unconvertible file (directory) names in ARG are skipped; if no directory names
12996+# are convertible, then the result may be empty.
12997+func_convert_core_path_wine_to_w32 ()
12998+{
12999+ $opt_debug
13000+ # unfortunately, winepath doesn't convert paths, only file names
13001+ func_convert_core_path_wine_to_w32_result=""
13002+ if test -n "$1"; then
13003+ oldIFS=$IFS
13004+ IFS=:
13005+ for func_convert_core_path_wine_to_w32_f in $1; do
13006+ IFS=$oldIFS
13007+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
13008+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
13009+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
13010+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
13011+ else
13012+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
13013+ fi
13014+ fi
13015+ done
13016+ IFS=$oldIFS
13017+ fi
13018+}
13019+# end: func_convert_core_path_wine_to_w32
13020+
13021+
13022+# func_cygpath ARGS...
13023+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
13024+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
13025+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
13026+# (2), returns the Cygwin file name or path in func_cygpath_result (input
13027+# file name or path is assumed to be in w32 format, as previously converted
13028+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
13029+# or path in func_cygpath_result (input file name or path is assumed to be in
13030+# Cygwin format). Returns an empty string on error.
13031+#
13032+# ARGS are passed to cygpath, with the last one being the file name or path to
13033+# be converted.
13034+#
13035+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13036+# environment variable; do not put it in $PATH.
13037+func_cygpath ()
13038+{
13039+ $opt_debug
13040+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13041+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13042+ if test "$?" -ne 0; then
13043+ # on failure, ensure result is empty
13044+ func_cygpath_result=
13045+ fi
13046+ else
13047+ func_cygpath_result=
13048+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13049+ fi
13050+}
13051+#end: func_cygpath
13052+
13053+
13054+# func_convert_core_msys_to_w32 ARG
13055+# Convert file name or path ARG from MSYS format to w32 format. Return
13056+# result in func_convert_core_msys_to_w32_result.
13057+func_convert_core_msys_to_w32 ()
13058+{
13059+ $opt_debug
13060+ # awkward: cmd appends spaces to result
13061+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13062+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13063+}
13064+#end: func_convert_core_msys_to_w32
13065+
13066+
13067+# func_convert_file_check ARG1 ARG2
13068+# Verify that ARG1 (a file name in $build format) was converted to $host
13069+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13070+# func_to_host_file_result to ARG1).
13071+func_convert_file_check ()
13072+{
13073+ $opt_debug
13074+ if test -z "$2" && test -n "$1" ; then
13075+ func_error "Could not determine host file name corresponding to"
13076+ func_error " \`$1'"
13077+ func_error "Continuing, but uninstalled executables may not work."
13078+ # Fallback:
13079+ func_to_host_file_result="$1"
13080+ fi
13081+}
13082+# end func_convert_file_check
13083+
13084+
13085+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13086+# Verify that FROM_PATH (a path in $build format) was converted to $host
13087+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13088+# func_to_host_file_result to a simplistic fallback value (see below).
13089+func_convert_path_check ()
13090+{
13091+ $opt_debug
13092+ if test -z "$4" && test -n "$3"; then
13093+ func_error "Could not determine the host path corresponding to"
13094+ func_error " \`$3'"
13095+ func_error "Continuing, but uninstalled executables may not work."
13096+ # Fallback. This is a deliberately simplistic "conversion" and
13097+ # should not be "improved". See libtool.info.
13098+ if test "x$1" != "x$2"; then
13099+ lt_replace_pathsep_chars="s|$1|$2|g"
13100+ func_to_host_path_result=`echo "$3" |
13101+ $SED -e "$lt_replace_pathsep_chars"`
13102+ else
13103+ func_to_host_path_result="$3"
13104+ fi
13105+ fi
13106+}
13107+# end func_convert_path_check
13108+
13109+
13110+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13111+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13112+# and appending REPL if ORIG matches BACKPAT.
13113+func_convert_path_front_back_pathsep ()
13114+{
13115+ $opt_debug
13116+ case $4 in
13117+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13118+ ;;
13119+ esac
13120+ case $4 in
13121+ $2 ) func_append func_to_host_path_result "$3"
13122+ ;;
13123+ esac
13124+}
13125+# end func_convert_path_front_back_pathsep
13126+
13127+
13128+##################################################
13129+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13130+##################################################
13131+# invoked via `$to_host_file_cmd ARG'
13132+#
13133+# In each case, ARG is the path to be converted from $build to $host format.
13134+# Result will be available in $func_to_host_file_result.
13135+
13136+
13137+# func_to_host_file ARG
13138+# Converts the file name ARG from $build format to $host format. Return result
13139+# in func_to_host_file_result.
13140+func_to_host_file ()
13141+{
13142+ $opt_debug
13143+ $to_host_file_cmd "$1"
13144+}
13145+# end func_to_host_file
13146+
13147+
13148+# func_to_tool_file ARG LAZY
13149+# converts the file name ARG from $build format to toolchain format. Return
13150+# result in func_to_tool_file_result. If the conversion in use is listed
13151+# in (the comma separated) LAZY, no conversion takes place.
13152+func_to_tool_file ()
13153+{
13154+ $opt_debug
13155+ case ,$2, in
13156+ *,"$to_tool_file_cmd",*)
13157+ func_to_tool_file_result=$1
13158+ ;;
13159+ *)
13160+ $to_tool_file_cmd "$1"
13161+ func_to_tool_file_result=$func_to_host_file_result
13162+ ;;
13163+ esac
13164+}
13165+# end func_to_tool_file
13166+
13167+
13168+# func_convert_file_noop ARG
13169+# Copy ARG to func_to_host_file_result.
13170+func_convert_file_noop ()
13171+{
13172+ func_to_host_file_result="$1"
13173+}
13174+# end func_convert_file_noop
13175+
13176+
13177+# func_convert_file_msys_to_w32 ARG
13178+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13179+# conversion to w32 is not available inside the cwrapper. Returns result in
13180+# func_to_host_file_result.
13181+func_convert_file_msys_to_w32 ()
13182+{
13183+ $opt_debug
13184+ func_to_host_file_result="$1"
13185+ if test -n "$1"; then
13186+ func_convert_core_msys_to_w32 "$1"
13187+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13188+ fi
13189+ func_convert_file_check "$1" "$func_to_host_file_result"
13190+}
13191+# end func_convert_file_msys_to_w32
13192+
13193+
13194+# func_convert_file_cygwin_to_w32 ARG
13195+# Convert file name ARG from Cygwin to w32 format. Returns result in
13196+# func_to_host_file_result.
13197+func_convert_file_cygwin_to_w32 ()
13198+{
13199+ $opt_debug
13200+ func_to_host_file_result="$1"
13201+ if test -n "$1"; then
13202+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13203+ # LT_CYGPATH in this case.
13204+ func_to_host_file_result=`cygpath -m "$1"`
13205+ fi
13206+ func_convert_file_check "$1" "$func_to_host_file_result"
13207+}
13208+# end func_convert_file_cygwin_to_w32
13209+
13210+
13211+# func_convert_file_nix_to_w32 ARG
13212+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13213+# and a working winepath. Returns result in func_to_host_file_result.
13214+func_convert_file_nix_to_w32 ()
13215+{
13216+ $opt_debug
13217+ func_to_host_file_result="$1"
13218+ if test -n "$1"; then
13219+ func_convert_core_file_wine_to_w32 "$1"
13220+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13221+ fi
13222+ func_convert_file_check "$1" "$func_to_host_file_result"
13223+}
13224+# end func_convert_file_nix_to_w32
13225+
13226+
13227+# func_convert_file_msys_to_cygwin ARG
13228+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13229+# Returns result in func_to_host_file_result.
13230+func_convert_file_msys_to_cygwin ()
13231+{
13232+ $opt_debug
13233+ func_to_host_file_result="$1"
13234+ if test -n "$1"; then
13235+ func_convert_core_msys_to_w32 "$1"
13236+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13237+ func_to_host_file_result="$func_cygpath_result"
13238+ fi
13239+ func_convert_file_check "$1" "$func_to_host_file_result"
13240+}
13241+# end func_convert_file_msys_to_cygwin
13242+
13243+
13244+# func_convert_file_nix_to_cygwin ARG
13245+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13246+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13247+# in func_to_host_file_result.
13248+func_convert_file_nix_to_cygwin ()
13249+{
13250+ $opt_debug
13251+ func_to_host_file_result="$1"
13252+ if test -n "$1"; then
13253+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13254+ func_convert_core_file_wine_to_w32 "$1"
13255+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13256+ func_to_host_file_result="$func_cygpath_result"
13257+ fi
13258+ func_convert_file_check "$1" "$func_to_host_file_result"
13259+}
13260+# end func_convert_file_nix_to_cygwin
13261+
13262+
13263+#############################################
13264+# $build to $host PATH CONVERSION FUNCTIONS #
13265+#############################################
13266+# invoked via `$to_host_path_cmd ARG'
13267+#
13268+# In each case, ARG is the path to be converted from $build to $host format.
13269+# The result will be available in $func_to_host_path_result.
13270+#
13271+# Path separators are also converted from $build format to $host format. If
13272+# ARG begins or ends with a path separator character, it is preserved (but
13273+# converted to $host format) on output.
13274+#
13275+# All path conversion functions are named using the following convention:
13276+# file name conversion function : func_convert_file_X_to_Y ()
13277+# path conversion function : func_convert_path_X_to_Y ()
13278+# where, for any given $build/$host combination the 'X_to_Y' value is the
13279+# same. If conversion functions are added for new $build/$host combinations,
13280+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13281+# will break.
13282+
13283+
13284+# func_init_to_host_path_cmd
13285+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13286+# appropriate value, based on the value of $to_host_file_cmd.
13287+to_host_path_cmd=
13288+func_init_to_host_path_cmd ()
13289+{
13290+ $opt_debug
13291+ if test -z "$to_host_path_cmd"; then
13292+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13293+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13294+ fi
13295+}
13296+
13297+
13298+# func_to_host_path ARG
13299+# Converts the path ARG from $build format to $host format. Return result
13300+# in func_to_host_path_result.
13301+func_to_host_path ()
13302+{
13303+ $opt_debug
13304+ func_init_to_host_path_cmd
13305+ $to_host_path_cmd "$1"
13306+}
13307+# end func_to_host_path
13308+
13309+
13310+# func_convert_path_noop ARG
13311+# Copy ARG to func_to_host_path_result.
13312+func_convert_path_noop ()
13313+{
13314+ func_to_host_path_result="$1"
13315+}
13316+# end func_convert_path_noop
13317+
13318+
13319+# func_convert_path_msys_to_w32 ARG
13320+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13321+# conversion to w32 is not available inside the cwrapper. Returns result in
13322+# func_to_host_path_result.
13323+func_convert_path_msys_to_w32 ()
13324+{
13325+ $opt_debug
13326+ func_to_host_path_result="$1"
13327+ if test -n "$1"; then
13328+ # Remove leading and trailing path separator characters from ARG. MSYS
13329+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13330+ # and winepath ignores them completely.
13331+ func_stripname : : "$1"
13332+ func_to_host_path_tmp1=$func_stripname_result
13333+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13334+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13335+ func_convert_path_check : ";" \
13336+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13337+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13338+ fi
13339+}
13340+# end func_convert_path_msys_to_w32
13341+
13342+
13343+# func_convert_path_cygwin_to_w32 ARG
13344+# Convert path ARG from Cygwin to w32 format. Returns result in
13345+# func_to_host_file_result.
13346+func_convert_path_cygwin_to_w32 ()
13347+{
13348+ $opt_debug
13349+ func_to_host_path_result="$1"
13350+ if test -n "$1"; then
13351+ # See func_convert_path_msys_to_w32:
13352+ func_stripname : : "$1"
13353+ func_to_host_path_tmp1=$func_stripname_result
13354+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13355+ func_convert_path_check : ";" \
13356+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13357+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13358+ fi
13359+}
13360+# end func_convert_path_cygwin_to_w32
13361+
13362+
13363+# func_convert_path_nix_to_w32 ARG
13364+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13365+# a working winepath. Returns result in func_to_host_file_result.
13366+func_convert_path_nix_to_w32 ()
13367+{
13368+ $opt_debug
13369+ func_to_host_path_result="$1"
13370+ if test -n "$1"; then
13371+ # See func_convert_path_msys_to_w32:
13372+ func_stripname : : "$1"
13373+ func_to_host_path_tmp1=$func_stripname_result
13374+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13375+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13376+ func_convert_path_check : ";" \
13377+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13378+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13379+ fi
13380+}
13381+# end func_convert_path_nix_to_w32
13382+
13383+
13384+# func_convert_path_msys_to_cygwin ARG
13385+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13386+# Returns result in func_to_host_file_result.
13387+func_convert_path_msys_to_cygwin ()
13388+{
13389+ $opt_debug
13390+ func_to_host_path_result="$1"
13391+ if test -n "$1"; then
13392+ # See func_convert_path_msys_to_w32:
13393+ func_stripname : : "$1"
13394+ func_to_host_path_tmp1=$func_stripname_result
13395+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13396+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13397+ func_to_host_path_result="$func_cygpath_result"
13398+ func_convert_path_check : : \
13399+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13400+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13401+ fi
13402+}
13403+# end func_convert_path_msys_to_cygwin
13404+
13405+
13406+# func_convert_path_nix_to_cygwin ARG
13407+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13408+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13409+# func_to_host_file_result.
13410+func_convert_path_nix_to_cygwin ()
13411+{
13412+ $opt_debug
13413+ func_to_host_path_result="$1"
13414+ if test -n "$1"; then
13415+ # Remove leading and trailing path separator characters from
13416+ # ARG. msys behavior is inconsistent here, cygpath turns them
13417+ # into '.;' and ';.', and winepath ignores them completely.
13418+ func_stripname : : "$1"
13419+ func_to_host_path_tmp1=$func_stripname_result
13420+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13421+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13422+ func_to_host_path_result="$func_cygpath_result"
13423+ func_convert_path_check : : \
13424+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13425+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13426+ fi
13427+}
13428+# end func_convert_path_nix_to_cygwin
13429+
13430+
13431 # func_mode_compile arg...
13432 func_mode_compile ()
13433 {
13434@@ -1314,12 +1985,12 @@ func_mode_compile ()
13435 ;;
13436
13437 -pie | -fpie | -fPIE)
13438- pie_flag="$pie_flag $arg"
13439+ func_append pie_flag " $arg"
13440 continue
13441 ;;
13442
13443 -shared | -static | -prefer-pic | -prefer-non-pic)
13444- later="$later $arg"
13445+ func_append later " $arg"
13446 continue
13447 ;;
13448
13449@@ -1340,15 +2011,14 @@ func_mode_compile ()
13450 save_ifs="$IFS"; IFS=','
13451 for arg in $args; do
13452 IFS="$save_ifs"
13453- func_quote_for_eval "$arg"
13454- lastarg="$lastarg $func_quote_for_eval_result"
13455+ func_append_quoted lastarg "$arg"
13456 done
13457 IFS="$save_ifs"
13458 func_stripname ' ' '' "$lastarg"
13459 lastarg=$func_stripname_result
13460
13461 # Add the arguments to base_compile.
13462- base_compile="$base_compile $lastarg"
13463+ func_append base_compile " $lastarg"
13464 continue
13465 ;;
13466
13467@@ -1364,8 +2034,7 @@ func_mode_compile ()
13468 esac # case $arg_mode
13469
13470 # Aesthetically quote the previous argument.
13471- func_quote_for_eval "$lastarg"
13472- base_compile="$base_compile $func_quote_for_eval_result"
13473+ func_append_quoted base_compile "$lastarg"
13474 done # for arg
13475
13476 case $arg_mode in
13477@@ -1496,17 +2165,16 @@ compiler."
13478 $opt_dry_run || $RM $removelist
13479 exit $EXIT_FAILURE
13480 fi
13481- removelist="$removelist $output_obj"
13482+ func_append removelist " $output_obj"
13483 $ECHO "$srcfile" > "$lockfile"
13484 fi
13485
13486 $opt_dry_run || $RM $removelist
13487- removelist="$removelist $lockfile"
13488+ func_append removelist " $lockfile"
13489 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13490
13491- if test -n "$fix_srcfile_path"; then
13492- eval "srcfile=\"$fix_srcfile_path\""
13493- fi
13494+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13495+ srcfile=$func_to_tool_file_result
13496 func_quote_for_eval "$srcfile"
13497 qsrcfile=$func_quote_for_eval_result
13498
13499@@ -1526,7 +2194,7 @@ compiler."
13500
13501 if test -z "$output_obj"; then
13502 # Place PIC objects in $objdir
13503- command="$command -o $lobj"
13504+ func_append command " -o $lobj"
13505 fi
13506
13507 func_show_eval_locale "$command" \
13508@@ -1573,11 +2241,11 @@ compiler."
13509 command="$base_compile $qsrcfile $pic_flag"
13510 fi
13511 if test "$compiler_c_o" = yes; then
13512- command="$command -o $obj"
13513+ func_append command " -o $obj"
13514 fi
13515
13516 # Suppress compiler output if we already did a PIC compilation.
13517- command="$command$suppress_output"
13518+ func_append command "$suppress_output"
13519 func_show_eval_locale "$command" \
13520 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13521
13522@@ -1622,13 +2290,13 @@ compiler."
13523 }
13524
13525 $opt_help || {
13526- test "$mode" = compile && func_mode_compile ${1+"$@"}
13527+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13528 }
13529
13530 func_mode_help ()
13531 {
13532 # We need to display help for each of the modes.
13533- case $mode in
13534+ case $opt_mode in
13535 "")
13536 # Generic help is extracted from the usage comments
13537 # at the start of this file.
13538@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
13539
13540 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13541 -no-suppress do not suppress compiler output for multiple passes
13542- -prefer-pic try to building PIC objects only
13543- -prefer-non-pic try to building non-PIC objects only
13544+ -prefer-pic try to build PIC objects only
13545+ -prefer-non-pic try to build non-PIC objects only
13546 -shared do not build a \`.o' file suitable for static linking
13547 -static only build a \`.o' file suitable for static linking
13548 -Wc,FLAG pass FLAG directly to the compiler
13549@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
13550 ;;
13551
13552 *)
13553- func_fatal_help "invalid operation mode \`$mode'"
13554+ func_fatal_help "invalid operation mode \`$opt_mode'"
13555 ;;
13556 esac
13557
13558@@ -1819,13 +2487,13 @@ if $opt_help; then
13559 else
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 func_mode_help
13565 done
13566 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13567 {
13568 func_help noexit
13569- for mode in compile link execute install finish uninstall clean; do
13570+ for opt_mode in compile link execute install finish uninstall clean; do
13571 echo
13572 func_mode_help
13573 done
13574@@ -1854,13 +2522,16 @@ func_mode_execute ()
13575 func_fatal_help "you must specify a COMMAND"
13576
13577 # Handle -dlopen flags immediately.
13578- for file in $execute_dlfiles; do
13579+ for file in $opt_dlopen; do
13580 test -f "$file" \
13581 || func_fatal_help "\`$file' is not a file"
13582
13583 dir=
13584 case $file in
13585 *.la)
13586+ func_resolve_sysroot "$file"
13587+ file=$func_resolve_sysroot_result
13588+
13589 # Check to see that this really is a libtool archive.
13590 func_lalib_unsafe_p "$file" \
13591 || func_fatal_help "\`$lib' is not a valid libtool archive"
13592@@ -1882,7 +2553,7 @@ func_mode_execute ()
13593 dir="$func_dirname_result"
13594
13595 if test -f "$dir/$objdir/$dlname"; then
13596- dir="$dir/$objdir"
13597+ func_append dir "/$objdir"
13598 else
13599 if test ! -f "$dir/$dlname"; then
13600 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13601@@ -1907,10 +2578,10 @@ func_mode_execute ()
13602 test -n "$absdir" && dir="$absdir"
13603
13604 # Now add the directory to shlibpath_var.
13605- if eval test -z \"\$$shlibpath_var\"; then
13606- eval $shlibpath_var=\$dir
13607+ if eval "test -z \"\$$shlibpath_var\""; then
13608+ eval "$shlibpath_var=\"\$dir\""
13609 else
13610- eval $shlibpath_var=\$dir:\$$shlibpath_var
13611+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13612 fi
13613 done
13614
13615@@ -1939,8 +2610,7 @@ func_mode_execute ()
13616 ;;
13617 esac
13618 # Quote arguments (to preserve shell metacharacters).
13619- func_quote_for_eval "$file"
13620- args="$args $func_quote_for_eval_result"
13621+ func_append_quoted args "$file"
13622 done
13623
13624 if test "X$opt_dry_run" = Xfalse; then
13625@@ -1972,22 +2642,59 @@ func_mode_execute ()
13626 fi
13627 }
13628
13629-test "$mode" = execute && func_mode_execute ${1+"$@"}
13630+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13631
13632
13633 # func_mode_finish arg...
13634 func_mode_finish ()
13635 {
13636 $opt_debug
13637- libdirs="$nonopt"
13638+ libs=
13639+ libdirs=
13640 admincmds=
13641
13642- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13643- for dir
13644- do
13645- libdirs="$libdirs $dir"
13646- done
13647+ for opt in "$nonopt" ${1+"$@"}
13648+ do
13649+ if test -d "$opt"; then
13650+ func_append libdirs " $opt"
13651
13652+ elif test -f "$opt"; then
13653+ if func_lalib_unsafe_p "$opt"; then
13654+ func_append libs " $opt"
13655+ else
13656+ func_warning "\`$opt' is not a valid libtool archive"
13657+ fi
13658+
13659+ else
13660+ func_fatal_error "invalid argument \`$opt'"
13661+ fi
13662+ done
13663+
13664+ if test -n "$libs"; then
13665+ if test -n "$lt_sysroot"; then
13666+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13667+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13668+ else
13669+ sysroot_cmd=
13670+ fi
13671+
13672+ # Remove sysroot references
13673+ if $opt_dry_run; then
13674+ for lib in $libs; do
13675+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13676+ done
13677+ else
13678+ tmpdir=`func_mktempdir`
13679+ for lib in $libs; do
13680+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13681+ > $tmpdir/tmp-la
13682+ mv -f $tmpdir/tmp-la $lib
13683+ done
13684+ ${RM}r "$tmpdir"
13685+ fi
13686+ fi
13687+
13688+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13689 for libdir in $libdirs; do
13690 if test -n "$finish_cmds"; then
13691 # Do each command in the finish commands.
13692@@ -1997,7 +2704,7 @@ func_mode_finish ()
13693 if test -n "$finish_eval"; then
13694 # Do the single finish_eval.
13695 eval cmds=\"$finish_eval\"
13696- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13697+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13698 $cmds"
13699 fi
13700 done
13701@@ -2006,53 +2713,55 @@ func_mode_finish ()
13702 # Exit here if they wanted silent mode.
13703 $opt_silent && exit $EXIT_SUCCESS
13704
13705- echo "----------------------------------------------------------------------"
13706- echo "Libraries have been installed in:"
13707- for libdir in $libdirs; do
13708- $ECHO " $libdir"
13709- done
13710- echo
13711- echo "If you ever happen to want to link against installed libraries"
13712- echo "in a given directory, LIBDIR, you must either use libtool, and"
13713- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13714- echo "flag during linking and do at least one of the following:"
13715- if test -n "$shlibpath_var"; then
13716- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13717- echo " during execution"
13718- fi
13719- if test -n "$runpath_var"; then
13720- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13721- echo " during linking"
13722- fi
13723- if test -n "$hardcode_libdir_flag_spec"; then
13724- libdir=LIBDIR
13725- eval "flag=\"$hardcode_libdir_flag_spec\""
13726+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13727+ echo "----------------------------------------------------------------------"
13728+ echo "Libraries have been installed in:"
13729+ for libdir in $libdirs; do
13730+ $ECHO " $libdir"
13731+ done
13732+ echo
13733+ echo "If you ever happen to want to link against installed libraries"
13734+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13735+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13736+ echo "flag during linking and do at least one of the following:"
13737+ if test -n "$shlibpath_var"; then
13738+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13739+ echo " during execution"
13740+ fi
13741+ if test -n "$runpath_var"; then
13742+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13743+ echo " during linking"
13744+ fi
13745+ if test -n "$hardcode_libdir_flag_spec"; then
13746+ libdir=LIBDIR
13747+ eval flag=\"$hardcode_libdir_flag_spec\"
13748
13749- $ECHO " - use the \`$flag' linker flag"
13750- fi
13751- if test -n "$admincmds"; then
13752- $ECHO " - have your system administrator run these commands:$admincmds"
13753- fi
13754- if test -f /etc/ld.so.conf; then
13755- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13756- fi
13757- echo
13758+ $ECHO " - use the \`$flag' linker flag"
13759+ fi
13760+ if test -n "$admincmds"; then
13761+ $ECHO " - have your system administrator run these commands:$admincmds"
13762+ fi
13763+ if test -f /etc/ld.so.conf; then
13764+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13765+ fi
13766+ echo
13767
13768- echo "See any operating system documentation about shared libraries for"
13769- case $host in
13770- solaris2.[6789]|solaris2.1[0-9])
13771- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13772- echo "pages."
13773- ;;
13774- *)
13775- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13776- ;;
13777- esac
13778- echo "----------------------------------------------------------------------"
13779+ echo "See any operating system documentation about shared libraries for"
13780+ case $host in
13781+ solaris2.[6789]|solaris2.1[0-9])
13782+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13783+ echo "pages."
13784+ ;;
13785+ *)
13786+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13787+ ;;
13788+ esac
13789+ echo "----------------------------------------------------------------------"
13790+ fi
13791 exit $EXIT_SUCCESS
13792 }
13793
13794-test "$mode" = finish && func_mode_finish ${1+"$@"}
13795+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13796
13797
13798 # func_mode_install arg...
13799@@ -2077,7 +2786,7 @@ func_mode_install ()
13800 # The real first argument should be the name of the installation program.
13801 # Aesthetically quote it.
13802 func_quote_for_eval "$arg"
13803- install_prog="$install_prog$func_quote_for_eval_result"
13804+ func_append install_prog "$func_quote_for_eval_result"
13805 install_shared_prog=$install_prog
13806 case " $install_prog " in
13807 *[\\\ /]cp\ *) install_cp=: ;;
13808@@ -2097,7 +2806,7 @@ func_mode_install ()
13809 do
13810 arg2=
13811 if test -n "$dest"; then
13812- files="$files $dest"
13813+ func_append files " $dest"
13814 dest=$arg
13815 continue
13816 fi
13817@@ -2135,11 +2844,11 @@ func_mode_install ()
13818
13819 # Aesthetically quote the argument.
13820 func_quote_for_eval "$arg"
13821- install_prog="$install_prog $func_quote_for_eval_result"
13822+ func_append install_prog " $func_quote_for_eval_result"
13823 if test -n "$arg2"; then
13824 func_quote_for_eval "$arg2"
13825 fi
13826- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13827+ func_append install_shared_prog " $func_quote_for_eval_result"
13828 done
13829
13830 test -z "$install_prog" && \
13831@@ -2151,7 +2860,7 @@ func_mode_install ()
13832 if test -n "$install_override_mode" && $no_mode; then
13833 if $install_cp; then :; else
13834 func_quote_for_eval "$install_override_mode"
13835- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13836+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13837 fi
13838 fi
13839
13840@@ -2209,10 +2918,13 @@ func_mode_install ()
13841 case $file in
13842 *.$libext)
13843 # Do the static libraries later.
13844- staticlibs="$staticlibs $file"
13845+ func_append staticlibs " $file"
13846 ;;
13847
13848 *.la)
13849+ func_resolve_sysroot "$file"
13850+ file=$func_resolve_sysroot_result
13851+
13852 # Check to see that this really is a libtool archive.
13853 func_lalib_unsafe_p "$file" \
13854 || func_fatal_help "\`$file' is not a valid libtool archive"
13855@@ -2226,23 +2938,30 @@ func_mode_install ()
13856 if test "X$destdir" = "X$libdir"; then
13857 case "$current_libdirs " in
13858 *" $libdir "*) ;;
13859- *) current_libdirs="$current_libdirs $libdir" ;;
13860+ *) func_append current_libdirs " $libdir" ;;
13861 esac
13862 else
13863 # Note the libdir as a future libdir.
13864 case "$future_libdirs " in
13865 *" $libdir "*) ;;
13866- *) future_libdirs="$future_libdirs $libdir" ;;
13867+ *) func_append future_libdirs " $libdir" ;;
13868 esac
13869 fi
13870
13871 func_dirname "$file" "/" ""
13872 dir="$func_dirname_result"
13873- dir="$dir$objdir"
13874+ func_append dir "$objdir"
13875
13876 if test -n "$relink_command"; then
13877+ # Strip any trailing slash from the destination.
13878+ func_stripname '' '/' "$libdir"
13879+ destlibdir=$func_stripname_result
13880+
13881+ func_stripname '' '/' "$destdir"
13882+ s_destdir=$func_stripname_result
13883+
13884 # Determine the prefix the user has applied to our future dir.
13885- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13886+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13887
13888 # Don't allow the user to place us outside of our expected
13889 # location b/c this prevents finding dependent libraries that
13890@@ -2315,7 +3034,7 @@ func_mode_install ()
13891 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13892
13893 # Maybe install the static library, too.
13894- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13895+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13896 ;;
13897
13898 *.lo)
13899@@ -2503,7 +3222,7 @@ func_mode_install ()
13900 test -n "$future_libdirs" && \
13901 func_warning "remember to run \`$progname --finish$future_libdirs'"
13902
13903- if test -n "$current_libdirs" && $opt_finish; then
13904+ if test -n "$current_libdirs"; then
13905 # Maybe just do a dry run.
13906 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13907 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13908@@ -2512,7 +3231,7 @@ func_mode_install ()
13909 fi
13910 }
13911
13912-test "$mode" = install && func_mode_install ${1+"$@"}
13913+test "$opt_mode" = install && func_mode_install ${1+"$@"}
13914
13915
13916 # func_generate_dlsyms outputname originator pic_p
13917@@ -2559,6 +3278,18 @@ extern \"C\" {
13918 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
13919 #endif
13920
13921+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13922+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13923+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13924+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13925+# define LT_DLSYM_CONST
13926+#elif defined(__osf__)
13927+/* This system does not cope well with relocations in const data. */
13928+# define LT_DLSYM_CONST
13929+#else
13930+# define LT_DLSYM_CONST const
13931+#endif
13932+
13933 /* External symbol declarations for the compiler. */\
13934 "
13935
13936@@ -2570,21 +3301,22 @@ extern \"C\" {
13937 # Add our own program objects to the symbol list.
13938 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
13939 for progfile in $progfiles; do
13940- func_verbose "extracting global C symbols from \`$progfile'"
13941- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
13942+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
13943+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
13944+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
13945 done
13946
13947 if test -n "$exclude_expsyms"; then
13948 $opt_dry_run || {
13949- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
13950- $MV "$nlist"T "$nlist"
13951+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
13952+ eval '$MV "$nlist"T "$nlist"'
13953 }
13954 fi
13955
13956 if test -n "$export_symbols_regex"; then
13957 $opt_dry_run || {
13958- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
13959- $MV "$nlist"T "$nlist"
13960+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
13961+ eval '$MV "$nlist"T "$nlist"'
13962 }
13963 fi
13964
13965@@ -2593,23 +3325,23 @@ extern \"C\" {
13966 export_symbols="$output_objdir/$outputname.exp"
13967 $opt_dry_run || {
13968 $RM $export_symbols
13969- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
13970+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13971 case $host in
13972 *cygwin* | *mingw* | *cegcc* )
13973- echo EXPORTS > "$output_objdir/$outputname.def"
13974- cat "$export_symbols" >> "$output_objdir/$outputname.def"
13975+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13976+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
13977 ;;
13978 esac
13979 }
13980 else
13981 $opt_dry_run || {
13982- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
13983- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
13984- $MV "$nlist"T "$nlist"
13985+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
13986+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
13987+ eval '$MV "$nlist"T "$nlist"'
13988 case $host in
13989 *cygwin* | *mingw* | *cegcc* )
13990- echo EXPORTS > "$output_objdir/$outputname.def"
13991- cat "$nlist" >> "$output_objdir/$outputname.def"
13992+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13993+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
13994 ;;
13995 esac
13996 }
13997@@ -2620,10 +3352,52 @@ extern \"C\" {
13998 func_verbose "extracting global C symbols from \`$dlprefile'"
13999 func_basename "$dlprefile"
14000 name="$func_basename_result"
14001- $opt_dry_run || {
14002- $ECHO ": $name " >> "$nlist"
14003- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14004- }
14005+ case $host in
14006+ *cygwin* | *mingw* | *cegcc* )
14007+ # if an import library, we need to obtain dlname
14008+ if func_win32_import_lib_p "$dlprefile"; then
14009+ func_tr_sh "$dlprefile"
14010+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
14011+ dlprefile_dlbasename=""
14012+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
14013+ # Use subshell, to avoid clobbering current variable values
14014+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
14015+ if test -n "$dlprefile_dlname" ; then
14016+ func_basename "$dlprefile_dlname"
14017+ dlprefile_dlbasename="$func_basename_result"
14018+ else
14019+ # no lafile. user explicitly requested -dlpreopen <import library>.
14020+ $sharedlib_from_linklib_cmd "$dlprefile"
14021+ dlprefile_dlbasename=$sharedlib_from_linklib_result
14022+ fi
14023+ fi
14024+ $opt_dry_run || {
14025+ if test -n "$dlprefile_dlbasename" ; then
14026+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
14027+ else
14028+ func_warning "Could not compute DLL name from $name"
14029+ eval '$ECHO ": $name " >> "$nlist"'
14030+ fi
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 |
14033+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
14034+ }
14035+ else # not an import lib
14036+ $opt_dry_run || {
14037+ eval '$ECHO ": $name " >> "$nlist"'
14038+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14039+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14040+ }
14041+ fi
14042+ ;;
14043+ *)
14044+ $opt_dry_run || {
14045+ eval '$ECHO ": $name " >> "$nlist"'
14046+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14047+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14048+ }
14049+ ;;
14050+ esac
14051 done
14052
14053 $opt_dry_run || {
14054@@ -2661,26 +3435,9 @@ typedef struct {
14055 const char *name;
14056 void *address;
14057 } lt_dlsymlist;
14058-"
14059- case $host in
14060- *cygwin* | *mingw* | *cegcc* )
14061- echo >> "$output_objdir/$my_dlsyms" "\
14062-/* DATA imports from DLLs on WIN32 con't be const, because
14063- runtime relocations are performed -- see ld's documentation
14064- on pseudo-relocs. */"
14065- lt_dlsym_const= ;;
14066- *osf5*)
14067- echo >> "$output_objdir/$my_dlsyms" "\
14068-/* This system does not cope well with relocations in const data */"
14069- lt_dlsym_const= ;;
14070- *)
14071- lt_dlsym_const=const ;;
14072- esac
14073-
14074- echo >> "$output_objdir/$my_dlsyms" "\
14075-extern $lt_dlsym_const lt_dlsymlist
14076+extern LT_DLSYM_CONST lt_dlsymlist
14077 lt_${my_prefix}_LTX_preloaded_symbols[];
14078-$lt_dlsym_const lt_dlsymlist
14079+LT_DLSYM_CONST lt_dlsymlist
14080 lt_${my_prefix}_LTX_preloaded_symbols[] =
14081 {\
14082 { \"$my_originator\", (void *) 0 },"
14083@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
14084 for arg in $LTCFLAGS; do
14085 case $arg in
14086 -pie | -fpie | -fPIE) ;;
14087- *) symtab_cflags="$symtab_cflags $arg" ;;
14088+ *) func_append symtab_cflags " $arg" ;;
14089 esac
14090 done
14091
14092@@ -2796,9 +3553,11 @@ func_win32_libid ()
14093 win32_libid_type="x86 archive import"
14094 ;;
14095 *ar\ archive*) # could be an import, or static
14096- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14097- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14098- win32_nmres=`$NM -f posix -A "$1" |
14099+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14100+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14101+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14102+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14103+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14104 $SED -n -e '
14105 1,100{
14106 / I /{
14107@@ -2827,6 +3586,131 @@ func_win32_libid ()
14108 $ECHO "$win32_libid_type"
14109 }
14110
14111+# func_cygming_dll_for_implib ARG
14112+#
14113+# Platform-specific function to extract the
14114+# name of the DLL associated with the specified
14115+# import library ARG.
14116+# Invoked by eval'ing the libtool variable
14117+# $sharedlib_from_linklib_cmd
14118+# Result is available in the variable
14119+# $sharedlib_from_linklib_result
14120+func_cygming_dll_for_implib ()
14121+{
14122+ $opt_debug
14123+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14124+}
14125+
14126+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14127+#
14128+# The is the core of a fallback implementation of a
14129+# platform-specific function to extract the name of the
14130+# DLL associated with the specified import library LIBNAME.
14131+#
14132+# SECTION_NAME is either .idata$6 or .idata$7, depending
14133+# on the platform and compiler that created the implib.
14134+#
14135+# Echos the name of the DLL associated with the
14136+# specified import library.
14137+func_cygming_dll_for_implib_fallback_core ()
14138+{
14139+ $opt_debug
14140+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14141+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14142+ $SED '/^Contents of section '"$match_literal"':/{
14143+ # Place marker at beginning of archive member dllname section
14144+ s/.*/====MARK====/
14145+ p
14146+ d
14147+ }
14148+ # These lines can sometimes be longer than 43 characters, but
14149+ # are always uninteresting
14150+ /:[ ]*file format pe[i]\{,1\}-/d
14151+ /^In archive [^:]*:/d
14152+ # Ensure marker is printed
14153+ /^====MARK====/p
14154+ # Remove all lines with less than 43 characters
14155+ /^.\{43\}/!d
14156+ # From remaining lines, remove first 43 characters
14157+ s/^.\{43\}//' |
14158+ $SED -n '
14159+ # Join marker and all lines until next marker into a single line
14160+ /^====MARK====/ b para
14161+ H
14162+ $ b para
14163+ b
14164+ :para
14165+ x
14166+ s/\n//g
14167+ # Remove the marker
14168+ s/^====MARK====//
14169+ # Remove trailing dots and whitespace
14170+ s/[\. \t]*$//
14171+ # Print
14172+ /./p' |
14173+ # we now have a list, one entry per line, of the stringified
14174+ # contents of the appropriate section of all members of the
14175+ # archive which possess that section. Heuristic: eliminate
14176+ # all those which have a first or second character that is
14177+ # a '.' (that is, objdump's representation of an unprintable
14178+ # character.) This should work for all archives with less than
14179+ # 0x302f exports -- but will fail for DLLs whose name actually
14180+ # begins with a literal '.' or a single character followed by
14181+ # a '.'.
14182+ #
14183+ # Of those that remain, print the first one.
14184+ $SED -e '/^\./d;/^.\./d;q'
14185+}
14186+
14187+# func_cygming_gnu_implib_p ARG
14188+# This predicate returns with zero status (TRUE) if
14189+# ARG is a GNU/binutils-style import library. Returns
14190+# with nonzero status (FALSE) otherwise.
14191+func_cygming_gnu_implib_p ()
14192+{
14193+ $opt_debug
14194+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14195+ 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)$'`
14196+ test -n "$func_cygming_gnu_implib_tmp"
14197+}
14198+
14199+# func_cygming_ms_implib_p ARG
14200+# This predicate returns with zero status (TRUE) if
14201+# ARG is an MS-style import library. Returns
14202+# with nonzero status (FALSE) otherwise.
14203+func_cygming_ms_implib_p ()
14204+{
14205+ $opt_debug
14206+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14207+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14208+ test -n "$func_cygming_ms_implib_tmp"
14209+}
14210+
14211+# func_cygming_dll_for_implib_fallback ARG
14212+# Platform-specific function to extract the
14213+# name of the DLL associated with the specified
14214+# import library ARG.
14215+#
14216+# This fallback implementation is for use when $DLLTOOL
14217+# does not support the --identify-strict option.
14218+# Invoked by eval'ing the libtool variable
14219+# $sharedlib_from_linklib_cmd
14220+# Result is available in the variable
14221+# $sharedlib_from_linklib_result
14222+func_cygming_dll_for_implib_fallback ()
14223+{
14224+ $opt_debug
14225+ if func_cygming_gnu_implib_p "$1" ; then
14226+ # binutils import library
14227+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14228+ elif func_cygming_ms_implib_p "$1" ; then
14229+ # ms-generated import library
14230+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14231+ else
14232+ # unknown
14233+ sharedlib_from_linklib_result=""
14234+ fi
14235+}
14236
14237
14238 # func_extract_an_archive dir oldlib
14239@@ -2917,7 +3801,7 @@ func_extract_archives ()
14240 darwin_file=
14241 darwin_files=
14242 for darwin_file in $darwin_filelist; do
14243- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14244+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14245 $LIPO -create -output "$darwin_file" $darwin_files
14246 done # $darwin_filelist
14247 $RM -rf unfat-$$
14248@@ -2932,7 +3816,7 @@ func_extract_archives ()
14249 func_extract_an_archive "$my_xdir" "$my_xabs"
14250 ;;
14251 esac
14252- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14253+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14254 done
14255
14256 func_extract_archives_result="$my_oldobjs"
14257@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14258 _LTECHO_EOF'
14259 }
14260 ECHO=\"$qECHO\"
14261- fi\
14262+ fi
14263+
14264+# Very basic option parsing. These options are (a) specific to
14265+# the libtool wrapper, (b) are identical between the wrapper
14266+# /script/ and the wrapper /executable/ which is used only on
14267+# windows platforms, and (c) all begin with the string "--lt-"
14268+# (application programs are unlikely to have options which match
14269+# this pattern).
14270+#
14271+# There are only two supported options: --lt-debug and
14272+# --lt-dump-script. There is, deliberately, no --lt-help.
14273+#
14274+# The first argument to this parsing function should be the
14275+# script's $0 value, followed by "$@".
14276+lt_option_debug=
14277+func_parse_lt_options ()
14278+{
14279+ lt_script_arg0=\$0
14280+ shift
14281+ for lt_opt
14282+ do
14283+ case \"\$lt_opt\" in
14284+ --lt-debug) lt_option_debug=1 ;;
14285+ --lt-dump-script)
14286+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14287+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14288+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14289+ cat \"\$lt_dump_D/\$lt_dump_F\"
14290+ exit 0
14291+ ;;
14292+ --lt-*)
14293+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14294+ exit 1
14295+ ;;
14296+ esac
14297+ done
14298+
14299+ # Print the debug banner immediately:
14300+ if test -n \"\$lt_option_debug\"; then
14301+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14302+ fi
14303+}
14304+
14305+# Used when --lt-debug. Prints its arguments to stdout
14306+# (redirection is the responsibility of the caller)
14307+func_lt_dump_args ()
14308+{
14309+ lt_dump_args_N=1;
14310+ for lt_arg
14311+ do
14312+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14313+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14314+ done
14315+}
14316+
14317+# Core function for launching the target application
14318+func_exec_program_core ()
14319+{
14320+"
14321+ case $host in
14322+ # Backslashes separate directories on plain windows
14323+ *-*-mingw | *-*-os2* | *-cegcc*)
14324+ $ECHO "\
14325+ if test -n \"\$lt_option_debug\"; then
14326+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14327+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14328+ fi
14329+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14330+"
14331+ ;;
14332+
14333+ *)
14334+ $ECHO "\
14335+ if test -n \"\$lt_option_debug\"; then
14336+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14337+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14338+ fi
14339+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14340+"
14341+ ;;
14342+ esac
14343+ $ECHO "\
14344+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14345+ exit 1
14346+}
14347+
14348+# A function to encapsulate launching the target application
14349+# Strips options in the --lt-* namespace from \$@ and
14350+# launches target application with the remaining arguments.
14351+func_exec_program ()
14352+{
14353+ for lt_wr_arg
14354+ do
14355+ case \$lt_wr_arg in
14356+ --lt-*) ;;
14357+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14358+ esac
14359+ shift
14360+ done
14361+ func_exec_program_core \${1+\"\$@\"}
14362+}
14363+
14364+ # Parse options
14365+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14366
14367 # Find the directory that this script lives in.
14368 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14369@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14370
14371 # relink executable if necessary
14372 if test -n \"\$relink_command\"; then
14373- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14374+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14375 else
14376 $ECHO \"\$relink_command_output\" >&2
14377 $RM \"\$progdir/\$file\"
14378@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14379
14380 if test -f \"\$progdir/\$program\"; then"
14381
14382+ # fixup the dll searchpath if we need to.
14383+ #
14384+ # Fix the DLL searchpath if we need to. Do this before prepending
14385+ # to shlibpath, because on Windows, both are PATH and uninstalled
14386+ # libraries must come first.
14387+ if test -n "$dllsearchpath"; then
14388+ $ECHO "\
14389+ # Add the dll search path components to the executable PATH
14390+ PATH=$dllsearchpath:\$PATH
14391+"
14392+ fi
14393+
14394 # Export our shlibpath_var if we have one.
14395 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14396 $ECHO "\
14397@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14398 "
14399 fi
14400
14401- # fixup the dll searchpath if we need to.
14402- if test -n "$dllsearchpath"; then
14403- $ECHO "\
14404- # Add the dll search path components to the executable PATH
14405- PATH=$dllsearchpath:\$PATH
14406-"
14407- fi
14408-
14409 $ECHO "\
14410 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14411 # Run the actual program with our arguments.
14412-"
14413- case $host in
14414- # Backslashes separate directories on plain windows
14415- *-*-mingw | *-*-os2* | *-cegcc*)
14416- $ECHO "\
14417- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14418-"
14419- ;;
14420-
14421- *)
14422- $ECHO "\
14423- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14424-"
14425- ;;
14426- esac
14427- $ECHO "\
14428- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14429- exit 1
14430+ func_exec_program \${1+\"\$@\"}
14431 fi
14432 else
14433 # The program doesn't exist.
14434@@ -3158,166 +4132,6 @@ fi\
14435 }
14436
14437
14438-# func_to_host_path arg
14439-#
14440-# Convert paths to host format when used with build tools.
14441-# Intended for use with "native" mingw (where libtool itself
14442-# is running under the msys shell), or in the following cross-
14443-# build environments:
14444-# $build $host
14445-# mingw (msys) mingw [e.g. native]
14446-# cygwin mingw
14447-# *nix + wine mingw
14448-# where wine is equipped with the `winepath' executable.
14449-# In the native mingw case, the (msys) shell automatically
14450-# converts paths for any non-msys applications it launches,
14451-# but that facility isn't available from inside the cwrapper.
14452-# Similar accommodations are necessary for $host mingw and
14453-# $build cygwin. Calling this function does no harm for other
14454-# $host/$build combinations not listed above.
14455-#
14456-# ARG is the path (on $build) that should be converted to
14457-# the proper representation for $host. The result is stored
14458-# in $func_to_host_path_result.
14459-func_to_host_path ()
14460-{
14461- func_to_host_path_result="$1"
14462- if test -n "$1"; then
14463- case $host in
14464- *mingw* )
14465- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14466- case $build in
14467- *mingw* ) # actually, msys
14468- # awkward: cmd appends spaces to result
14469- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14470- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14471- ;;
14472- *cygwin* )
14473- func_to_host_path_result=`cygpath -w "$1" |
14474- $SED -e "$lt_sed_naive_backslashify"`
14475- ;;
14476- * )
14477- # Unfortunately, winepath does not exit with a non-zero
14478- # error code, so we are forced to check the contents of
14479- # stdout. On the other hand, if the command is not
14480- # found, the shell will set an exit code of 127 and print
14481- # *an error message* to stdout. So we must check for both
14482- # error code of zero AND non-empty stdout, which explains
14483- # the odd construction:
14484- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14485- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14486- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14487- $SED -e "$lt_sed_naive_backslashify"`
14488- else
14489- # Allow warning below.
14490- func_to_host_path_result=
14491- fi
14492- ;;
14493- esac
14494- if test -z "$func_to_host_path_result" ; then
14495- func_error "Could not determine host path corresponding to"
14496- func_error " \`$1'"
14497- func_error "Continuing, but uninstalled executables may not work."
14498- # Fallback:
14499- func_to_host_path_result="$1"
14500- fi
14501- ;;
14502- esac
14503- fi
14504-}
14505-# end: func_to_host_path
14506-
14507-# func_to_host_pathlist arg
14508-#
14509-# Convert pathlists to host format when used with build tools.
14510-# See func_to_host_path(), above. This function supports the
14511-# following $build/$host combinations (but does no harm for
14512-# combinations not listed here):
14513-# $build $host
14514-# mingw (msys) mingw [e.g. native]
14515-# cygwin mingw
14516-# *nix + wine mingw
14517-#
14518-# Path separators are also converted from $build format to
14519-# $host format. If ARG begins or ends with a path separator
14520-# character, it is preserved (but converted to $host format)
14521-# on output.
14522-#
14523-# ARG is a pathlist (on $build) that should be converted to
14524-# the proper representation on $host. The result is stored
14525-# in $func_to_host_pathlist_result.
14526-func_to_host_pathlist ()
14527-{
14528- func_to_host_pathlist_result="$1"
14529- if test -n "$1"; then
14530- case $host in
14531- *mingw* )
14532- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14533- # Remove leading and trailing path separator characters from
14534- # ARG. msys behavior is inconsistent here, cygpath turns them
14535- # into '.;' and ';.', and winepath ignores them completely.
14536- func_stripname : : "$1"
14537- func_to_host_pathlist_tmp1=$func_stripname_result
14538- case $build in
14539- *mingw* ) # Actually, msys.
14540- # Awkward: cmd appends spaces to result.
14541- func_to_host_pathlist_result=`
14542- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14543- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14544- ;;
14545- *cygwin* )
14546- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14547- $SED -e "$lt_sed_naive_backslashify"`
14548- ;;
14549- * )
14550- # unfortunately, winepath doesn't convert pathlists
14551- func_to_host_pathlist_result=""
14552- func_to_host_pathlist_oldIFS=$IFS
14553- IFS=:
14554- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14555- IFS=$func_to_host_pathlist_oldIFS
14556- if test -n "$func_to_host_pathlist_f" ; then
14557- func_to_host_path "$func_to_host_pathlist_f"
14558- if test -n "$func_to_host_path_result" ; then
14559- if test -z "$func_to_host_pathlist_result" ; then
14560- func_to_host_pathlist_result="$func_to_host_path_result"
14561- else
14562- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14563- fi
14564- fi
14565- fi
14566- done
14567- IFS=$func_to_host_pathlist_oldIFS
14568- ;;
14569- esac
14570- if test -z "$func_to_host_pathlist_result"; then
14571- func_error "Could not determine the host path(s) corresponding to"
14572- func_error " \`$1'"
14573- func_error "Continuing, but uninstalled executables may not work."
14574- # Fallback. This may break if $1 contains DOS-style drive
14575- # specifications. The fix is not to complicate the expression
14576- # below, but for the user to provide a working wine installation
14577- # with winepath so that path translation in the cross-to-mingw
14578- # case works properly.
14579- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14580- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14581- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14582- fi
14583- # Now, add the leading and trailing path separators back
14584- case "$1" in
14585- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14586- ;;
14587- esac
14588- case "$1" in
14589- *: ) func_append func_to_host_pathlist_result ";"
14590- ;;
14591- esac
14592- ;;
14593- esac
14594- fi
14595-}
14596-# end: func_to_host_pathlist
14597-
14598 # func_emit_cwrapperexe_src
14599 # emit the source code for a wrapper executable on stdout
14600 # Must ONLY be called from within func_mode_link because
14601@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14602
14603 This wrapper executable should never be moved out of the build directory.
14604 If it is, it will not operate correctly.
14605-
14606- Currently, it simply execs the wrapper *script* "$SHELL $output",
14607- but could eventually absorb all of the scripts functionality and
14608- exec $objdir/$outputname directly.
14609 */
14610 EOF
14611 cat <<"EOF"
14612@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
14613 if (stale) { free ((void *) stale); stale = 0; } \
14614 } while (0)
14615
14616-#undef LTWRAPPER_DEBUGPRINTF
14617-#if defined LT_DEBUGWRAPPER
14618-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14619-static void
14620-ltwrapper_debugprintf (const char *fmt, ...)
14621-{
14622- va_list args;
14623- va_start (args, fmt);
14624- (void) vfprintf (stderr, fmt, args);
14625- va_end (args);
14626-}
14627+#if defined(LT_DEBUGWRAPPER)
14628+static int lt_debug = 1;
14629 #else
14630-# define LTWRAPPER_DEBUGPRINTF(args)
14631+static int lt_debug = 0;
14632 #endif
14633
14634-const char *program_name = NULL;
14635+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14636
14637 void *xmalloc (size_t num);
14638 char *xstrdup (const char *string);
14639@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
14640 int make_executable (const char *path);
14641 int check_executable (const char *path);
14642 char *strendzap (char *str, const char *pat);
14643-void lt_fatal (const char *message, ...);
14644+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14645+void lt_fatal (const char *file, int line, const char *message, ...);
14646+static const char *nonnull (const char *s);
14647+static const char *nonempty (const char *s);
14648 void lt_setenv (const char *name, const char *value);
14649 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14650 void lt_update_exe_path (const char *name, const char *value);
14651@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14652 EOF
14653
14654 cat <<EOF
14655-const char * MAGIC_EXE = "$magic_exe";
14656+volatile const char * MAGIC_EXE = "$magic_exe";
14657 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14658 EOF
14659
14660 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14661- func_to_host_pathlist "$temp_rpath"
14662+ func_to_host_path "$temp_rpath"
14663 cat <<EOF
14664-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14665+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14666 EOF
14667 else
14668 cat <<"EOF"
14669@@ -3513,10 +4317,10 @@ EOF
14670 fi
14671
14672 if test -n "$dllsearchpath"; then
14673- func_to_host_pathlist "$dllsearchpath:"
14674+ func_to_host_path "$dllsearchpath:"
14675 cat <<EOF
14676 const char * EXE_PATH_VARNAME = "PATH";
14677-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14678+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14679 EOF
14680 else
14681 cat <<"EOF"
14682@@ -3539,12 +4343,10 @@ EOF
14683 cat <<"EOF"
14684
14685 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14686-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14687
14688-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14689 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14690-
14691 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14692+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14693
14694 int
14695 main (int argc, char *argv[])
14696@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14697 int i;
14698
14699 program_name = (char *) xstrdup (base_name (argv[0]));
14700- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14701- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14702+ newargz = XMALLOC (char *, argc + 1);
14703
14704- /* very simple arg parsing; don't want to rely on getopt */
14705+ /* very simple arg parsing; don't want to rely on getopt
14706+ * also, copy all non cwrapper options to newargz, except
14707+ * argz[0], which is handled differently
14708+ */
14709+ newargc=0;
14710 for (i = 1; i < argc; i++)
14711 {
14712 if (strcmp (argv[i], dumpscript_opt) == 0)
14713@@ -3581,21 +4386,54 @@ EOF
14714 lt_dump_script (stdout);
14715 return 0;
14716 }
14717+ if (strcmp (argv[i], debug_opt) == 0)
14718+ {
14719+ lt_debug = 1;
14720+ continue;
14721+ }
14722+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14723+ {
14724+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14725+ namespace, but it is not one of the ones we know about and
14726+ have already dealt with, above (inluding dump-script), then
14727+ report an error. Otherwise, targets might begin to believe
14728+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14729+ namespace. The first time any user complains about this, we'll
14730+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14731+ or a configure.ac-settable value.
14732+ */
14733+ lt_fatal (__FILE__, __LINE__,
14734+ "unrecognized %s option: '%s'",
14735+ ltwrapper_option_prefix, argv[i]);
14736+ }
14737+ /* otherwise ... */
14738+ newargz[++newargc] = xstrdup (argv[i]);
14739 }
14740+ newargz[++newargc] = NULL;
14741+
14742+EOF
14743+ cat <<EOF
14744+ /* The GNU banner must be the first non-error debug message */
14745+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14746+EOF
14747+ cat <<"EOF"
14748+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14749+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14750
14751- newargz = XMALLOC (char *, argc + 1);
14752 tmp_pathspec = find_executable (argv[0]);
14753 if (tmp_pathspec == NULL)
14754- lt_fatal ("Couldn't find %s", argv[0]);
14755- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14756- tmp_pathspec));
14757+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14758+ lt_debugprintf (__FILE__, __LINE__,
14759+ "(main) found exe (before symlink chase) at: %s\n",
14760+ tmp_pathspec);
14761
14762 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14763- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14764- actual_cwrapper_path));
14765+ lt_debugprintf (__FILE__, __LINE__,
14766+ "(main) found exe (after symlink chase) at: %s\n",
14767+ actual_cwrapper_path);
14768 XFREE (tmp_pathspec);
14769
14770- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14771+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14772 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14773
14774 /* wrapper name transforms */
14775@@ -3613,8 +4451,9 @@ EOF
14776 target_name = tmp_pathspec;
14777 tmp_pathspec = 0;
14778
14779- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14780- target_name));
14781+ lt_debugprintf (__FILE__, __LINE__,
14782+ "(main) libtool target name: %s\n",
14783+ target_name);
14784 EOF
14785
14786 cat <<EOF
14787@@ -3664,35 +4503,19 @@ EOF
14788
14789 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14790 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14791- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14792+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14793+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14794+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14795+ libraries must come first. */
14796 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14797+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14798
14799- newargc=0;
14800- for (i = 1; i < argc; i++)
14801- {
14802- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14803- {
14804- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14805- namespace, but it is not one of the ones we know about and
14806- have already dealt with, above (inluding dump-script), then
14807- report an error. Otherwise, targets might begin to believe
14808- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14809- namespace. The first time any user complains about this, we'll
14810- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14811- or a configure.ac-settable value.
14812- */
14813- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14814- ltwrapper_option_prefix, argv[i]);
14815- }
14816- /* otherwise ... */
14817- newargz[++newargc] = xstrdup (argv[i]);
14818- }
14819- newargz[++newargc] = NULL;
14820-
14821- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14822+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14823+ nonnull (lt_argv_zero));
14824 for (i = 0; i < newargc; i++)
14825 {
14826- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14827+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14828+ i, nonnull (newargz[i]));
14829 }
14830
14831 EOF
14832@@ -3706,7 +4529,9 @@ EOF
14833 if (rval == -1)
14834 {
14835 /* failed to start process */
14836- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14837+ lt_debugprintf (__FILE__, __LINE__,
14838+ "(main) failed to launch target \"%s\": %s\n",
14839+ lt_argv_zero, nonnull (strerror (errno)));
14840 return 127;
14841 }
14842 return rval;
14843@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14844 {
14845 void *p = (void *) malloc (num);
14846 if (!p)
14847- lt_fatal ("Memory exhausted");
14848+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14849
14850 return p;
14851 }
14852@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14853 {
14854 struct stat st;
14855
14856- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14857- path ? (*path ? path : "EMPTY!") : "NULL!"));
14858+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14859+ nonempty (path));
14860 if ((!path) || (!*path))
14861 return 0;
14862
14863@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14864 int rval = 0;
14865 struct stat st;
14866
14867- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14868- path ? (*path ? path : "EMPTY!") : "NULL!"));
14869+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14870+ nonempty (path));
14871 if ((!path) || (!*path))
14872 return 0;
14873
14874@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14875 int tmp_len;
14876 char *concat_name;
14877
14878- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14879- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14880+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14881+ nonempty (wrapper));
14882
14883 if ((wrapper == NULL) || (*wrapper == '\0'))
14884 return NULL;
14885@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14886 {
14887 /* empty path: current directory */
14888 if (getcwd (tmp, LT_PATHMAX) == NULL)
14889- lt_fatal ("getcwd failed");
14890+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14891+ nonnull (strerror (errno)));
14892 tmp_len = strlen (tmp);
14893 concat_name =
14894 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14895@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14896 }
14897 /* Relative path | not found in path: prepend cwd */
14898 if (getcwd (tmp, LT_PATHMAX) == NULL)
14899- lt_fatal ("getcwd failed");
14900+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14901+ nonnull (strerror (errno)));
14902 tmp_len = strlen (tmp);
14903 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14904 memcpy (concat_name, tmp, tmp_len);
14905@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14906 int has_symlinks = 0;
14907 while (strlen (tmp_pathspec) && !has_symlinks)
14908 {
14909- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
14910- tmp_pathspec));
14911+ lt_debugprintf (__FILE__, __LINE__,
14912+ "checking path component for symlinks: %s\n",
14913+ tmp_pathspec);
14914 if (lstat (tmp_pathspec, &s) == 0)
14915 {
14916 if (S_ISLNK (s.st_mode) != 0)
14917@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
14918 }
14919 else
14920 {
14921- char *errstr = strerror (errno);
14922- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
14923+ lt_fatal (__FILE__, __LINE__,
14924+ "error accessing file \"%s\": %s",
14925+ tmp_pathspec, nonnull (strerror (errno)));
14926 }
14927 }
14928 XFREE (tmp_pathspec);
14929@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
14930 tmp_pathspec = realpath (pathspec, buf);
14931 if (tmp_pathspec == 0)
14932 {
14933- lt_fatal ("Could not follow symlinks for %s", pathspec);
14934+ lt_fatal (__FILE__, __LINE__,
14935+ "could not follow symlinks for %s", pathspec);
14936 }
14937 return xstrdup (tmp_pathspec);
14938 #endif
14939@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
14940 return str;
14941 }
14942
14943+void
14944+lt_debugprintf (const char *file, int line, const char *fmt, ...)
14945+{
14946+ va_list args;
14947+ if (lt_debug)
14948+ {
14949+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
14950+ va_start (args, fmt);
14951+ (void) vfprintf (stderr, fmt, args);
14952+ va_end (args);
14953+ }
14954+}
14955+
14956 static void
14957-lt_error_core (int exit_status, const char *mode,
14958+lt_error_core (int exit_status, const char *file,
14959+ int line, const char *mode,
14960 const char *message, va_list ap)
14961 {
14962- fprintf (stderr, "%s: %s: ", program_name, mode);
14963+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
14964 vfprintf (stderr, message, ap);
14965 fprintf (stderr, ".\n");
14966
14967@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
14968 }
14969
14970 void
14971-lt_fatal (const char *message, ...)
14972+lt_fatal (const char *file, int line, const char *message, ...)
14973 {
14974 va_list ap;
14975 va_start (ap, message);
14976- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
14977+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
14978 va_end (ap);
14979 }
14980
14981+static const char *
14982+nonnull (const char *s)
14983+{
14984+ return s ? s : "(null)";
14985+}
14986+
14987+static const char *
14988+nonempty (const char *s)
14989+{
14990+ return (s && !*s) ? "(empty)" : nonnull (s);
14991+}
14992+
14993 void
14994 lt_setenv (const char *name, const char *value)
14995 {
14996- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
14997- (name ? name : "<NULL>"),
14998- (value ? value : "<NULL>")));
14999+ lt_debugprintf (__FILE__, __LINE__,
15000+ "(lt_setenv) setting '%s' to '%s'\n",
15001+ nonnull (name), nonnull (value));
15002 {
15003 #ifdef HAVE_SETENV
15004 /* always make a copy, for consistency with !HAVE_SETENV */
15005@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
15006 void
15007 lt_update_exe_path (const char *name, const char *value)
15008 {
15009- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15010- (name ? name : "<NULL>"),
15011- (value ? value : "<NULL>")));
15012+ lt_debugprintf (__FILE__, __LINE__,
15013+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15014+ nonnull (name), nonnull (value));
15015
15016 if (name && *name && value && *value)
15017 {
15018@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
15019 void
15020 lt_update_lib_path (const char *name, const char *value)
15021 {
15022- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15023- (name ? name : "<NULL>"),
15024- (value ? value : "<NULL>")));
15025+ lt_debugprintf (__FILE__, __LINE__,
15026+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15027+ nonnull (name), nonnull (value));
15028
15029 if (name && *name && value && *value)
15030 {
15031@@ -4222,7 +5078,7 @@ EOF
15032 func_win32_import_lib_p ()
15033 {
15034 $opt_debug
15035- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15036+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15037 *import*) : ;;
15038 *) false ;;
15039 esac
15040@@ -4401,9 +5257,9 @@ func_mode_link ()
15041 ;;
15042 *)
15043 if test "$prev" = dlfiles; then
15044- dlfiles="$dlfiles $arg"
15045+ func_append dlfiles " $arg"
15046 else
15047- dlprefiles="$dlprefiles $arg"
15048+ func_append dlprefiles " $arg"
15049 fi
15050 prev=
15051 continue
15052@@ -4427,7 +5283,7 @@ func_mode_link ()
15053 *-*-darwin*)
15054 case "$deplibs " in
15055 *" $qarg.ltframework "*) ;;
15056- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15057+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15058 ;;
15059 esac
15060 ;;
15061@@ -4446,7 +5302,7 @@ func_mode_link ()
15062 moreargs=
15063 for fil in `cat "$save_arg"`
15064 do
15065-# moreargs="$moreargs $fil"
15066+# func_append moreargs " $fil"
15067 arg=$fil
15068 # A libtool-controlled object.
15069
15070@@ -4475,7 +5331,7 @@ func_mode_link ()
15071
15072 if test "$prev" = dlfiles; then
15073 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15074- dlfiles="$dlfiles $pic_object"
15075+ func_append dlfiles " $pic_object"
15076 prev=
15077 continue
15078 else
15079@@ -4487,7 +5343,7 @@ func_mode_link ()
15080 # CHECK ME: I think I busted this. -Ossama
15081 if test "$prev" = dlprefiles; then
15082 # Preload the old-style object.
15083- dlprefiles="$dlprefiles $pic_object"
15084+ func_append dlprefiles " $pic_object"
15085 prev=
15086 fi
15087
15088@@ -4557,12 +5413,12 @@ func_mode_link ()
15089 if test "$prev" = rpath; then
15090 case "$rpath " in
15091 *" $arg "*) ;;
15092- *) rpath="$rpath $arg" ;;
15093+ *) func_append rpath " $arg" ;;
15094 esac
15095 else
15096 case "$xrpath " in
15097 *" $arg "*) ;;
15098- *) xrpath="$xrpath $arg" ;;
15099+ *) func_append xrpath " $arg" ;;
15100 esac
15101 fi
15102 prev=
15103@@ -4574,28 +5430,28 @@ func_mode_link ()
15104 continue
15105 ;;
15106 weak)
15107- weak_libs="$weak_libs $arg"
15108+ func_append weak_libs " $arg"
15109 prev=
15110 continue
15111 ;;
15112 xcclinker)
15113- linker_flags="$linker_flags $qarg"
15114- compiler_flags="$compiler_flags $qarg"
15115+ func_append linker_flags " $qarg"
15116+ func_append compiler_flags " $qarg"
15117 prev=
15118 func_append compile_command " $qarg"
15119 func_append finalize_command " $qarg"
15120 continue
15121 ;;
15122 xcompiler)
15123- compiler_flags="$compiler_flags $qarg"
15124+ func_append compiler_flags " $qarg"
15125 prev=
15126 func_append compile_command " $qarg"
15127 func_append finalize_command " $qarg"
15128 continue
15129 ;;
15130 xlinker)
15131- linker_flags="$linker_flags $qarg"
15132- compiler_flags="$compiler_flags $wl$qarg"
15133+ func_append linker_flags " $qarg"
15134+ func_append compiler_flags " $wl$qarg"
15135 prev=
15136 func_append compile_command " $wl$qarg"
15137 func_append finalize_command " $wl$qarg"
15138@@ -4686,15 +5542,16 @@ func_mode_link ()
15139 ;;
15140
15141 -L*)
15142- func_stripname '-L' '' "$arg"
15143- dir=$func_stripname_result
15144- if test -z "$dir"; then
15145+ func_stripname "-L" '' "$arg"
15146+ if test -z "$func_stripname_result"; then
15147 if test "$#" -gt 0; then
15148 func_fatal_error "require no space between \`-L' and \`$1'"
15149 else
15150 func_fatal_error "need path for \`-L' option"
15151 fi
15152 fi
15153+ func_resolve_sysroot "$func_stripname_result"
15154+ dir=$func_resolve_sysroot_result
15155 # We need an absolute path.
15156 case $dir in
15157 [\\/]* | [A-Za-z]:[\\/]*) ;;
15158@@ -4706,10 +5563,16 @@ func_mode_link ()
15159 ;;
15160 esac
15161 case "$deplibs " in
15162- *" -L$dir "*) ;;
15163+ *" -L$dir "* | *" $arg "*)
15164+ # Will only happen for absolute or sysroot arguments
15165+ ;;
15166 *)
15167- deplibs="$deplibs -L$dir"
15168- lib_search_path="$lib_search_path $dir"
15169+ # Preserve sysroot, but never include relative directories
15170+ case $dir in
15171+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15172+ *) func_append deplibs " -L$dir" ;;
15173+ esac
15174+ func_append lib_search_path " $dir"
15175 ;;
15176 esac
15177 case $host in
15178@@ -4718,12 +5581,12 @@ func_mode_link ()
15179 case :$dllsearchpath: in
15180 *":$dir:"*) ;;
15181 ::) dllsearchpath=$dir;;
15182- *) dllsearchpath="$dllsearchpath:$dir";;
15183+ *) func_append dllsearchpath ":$dir";;
15184 esac
15185 case :$dllsearchpath: in
15186 *":$testbindir:"*) ;;
15187 ::) dllsearchpath=$testbindir;;
15188- *) dllsearchpath="$dllsearchpath:$testbindir";;
15189+ *) func_append dllsearchpath ":$testbindir";;
15190 esac
15191 ;;
15192 esac
15193@@ -4747,7 +5610,7 @@ func_mode_link ()
15194 ;;
15195 *-*-rhapsody* | *-*-darwin1.[012])
15196 # Rhapsody C and math libraries are in the System framework
15197- deplibs="$deplibs System.ltframework"
15198+ func_append deplibs " System.ltframework"
15199 continue
15200 ;;
15201 *-*-sco3.2v5* | *-*-sco5v6*)
15202@@ -4758,9 +5621,6 @@ func_mode_link ()
15203 # Compiler inserts libc in the correct place for threads to work
15204 test "X$arg" = "X-lc" && continue
15205 ;;
15206- *-*-linux*)
15207- test "X$arg" = "X-lc" && continue
15208- ;;
15209 esac
15210 elif test "X$arg" = "X-lc_r"; then
15211 case $host in
15212@@ -4770,7 +5630,7 @@ func_mode_link ()
15213 ;;
15214 esac
15215 fi
15216- deplibs="$deplibs $arg"
15217+ func_append deplibs " $arg"
15218 continue
15219 ;;
15220
15221@@ -4782,8 +5642,8 @@ func_mode_link ()
15222 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15223 # classes, name mangling, and exception handling.
15224 # Darwin uses the -arch flag to determine output architecture.
15225- -model|-arch|-isysroot)
15226- compiler_flags="$compiler_flags $arg"
15227+ -model|-arch|-isysroot|--sysroot)
15228+ func_append compiler_flags " $arg"
15229 func_append compile_command " $arg"
15230 func_append finalize_command " $arg"
15231 prev=xcompiler
15232@@ -4791,12 +5651,12 @@ func_mode_link ()
15233 ;;
15234
15235 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15236- compiler_flags="$compiler_flags $arg"
15237+ func_append compiler_flags " $arg"
15238 func_append compile_command " $arg"
15239 func_append finalize_command " $arg"
15240 case "$new_inherited_linker_flags " in
15241 *" $arg "*) ;;
15242- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15243+ * ) func_append new_inherited_linker_flags " $arg" ;;
15244 esac
15245 continue
15246 ;;
15247@@ -4863,13 +5723,17 @@ func_mode_link ()
15248 # We need an absolute path.
15249 case $dir in
15250 [\\/]* | [A-Za-z]:[\\/]*) ;;
15251+ =*)
15252+ func_stripname '=' '' "$dir"
15253+ dir=$lt_sysroot$func_stripname_result
15254+ ;;
15255 *)
15256 func_fatal_error "only absolute run-paths are allowed"
15257 ;;
15258 esac
15259 case "$xrpath " in
15260 *" $dir "*) ;;
15261- *) xrpath="$xrpath $dir" ;;
15262+ *) func_append xrpath " $dir" ;;
15263 esac
15264 continue
15265 ;;
15266@@ -4922,8 +5786,8 @@ func_mode_link ()
15267 for flag in $args; do
15268 IFS="$save_ifs"
15269 func_quote_for_eval "$flag"
15270- arg="$arg $func_quote_for_eval_result"
15271- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15272+ func_append arg " $func_quote_for_eval_result"
15273+ func_append compiler_flags " $func_quote_for_eval_result"
15274 done
15275 IFS="$save_ifs"
15276 func_stripname ' ' '' "$arg"
15277@@ -4938,9 +5802,9 @@ func_mode_link ()
15278 for flag in $args; do
15279 IFS="$save_ifs"
15280 func_quote_for_eval "$flag"
15281- arg="$arg $wl$func_quote_for_eval_result"
15282- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15283- linker_flags="$linker_flags $func_quote_for_eval_result"
15284+ func_append arg " $wl$func_quote_for_eval_result"
15285+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15286+ func_append linker_flags " $func_quote_for_eval_result"
15287 done
15288 IFS="$save_ifs"
15289 func_stripname ' ' '' "$arg"
15290@@ -4968,24 +5832,27 @@ func_mode_link ()
15291 arg="$func_quote_for_eval_result"
15292 ;;
15293
15294- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15295- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15296- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15297- # +DA*, +DD* enable 64-bit mode on the HP compiler
15298- # -q* pass through compiler args for the IBM compiler
15299- # -m*, -t[45]*, -txscale* pass through architecture-specific
15300- # compiler args for GCC
15301- # -F/path gives path to uninstalled frameworks, gcc on darwin
15302- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15303- # @file GCC response files
15304- # -tp=* Portland pgcc target processor selection
15305+ # Flags to be passed through unchanged, with rationale:
15306+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15307+ # -r[0-9][0-9]* specify processor for the SGI compiler
15308+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15309+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15310+ # -q* compiler args for the IBM compiler
15311+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15312+ # -F/path path to uninstalled frameworks, gcc on darwin
15313+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15314+ # @file GCC response files
15315+ # -tp=* Portland pgcc target processor selection
15316+ # --sysroot=* for sysroot support
15317+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15318 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15319- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15320+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15321+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15322 func_quote_for_eval "$arg"
15323 arg="$func_quote_for_eval_result"
15324 func_append compile_command " $arg"
15325 func_append finalize_command " $arg"
15326- compiler_flags="$compiler_flags $arg"
15327+ func_append compiler_flags " $arg"
15328 continue
15329 ;;
15330
15331@@ -4997,7 +5864,7 @@ func_mode_link ()
15332
15333 *.$objext)
15334 # A standard object.
15335- objs="$objs $arg"
15336+ func_append objs " $arg"
15337 ;;
15338
15339 *.lo)
15340@@ -5028,7 +5895,7 @@ func_mode_link ()
15341
15342 if test "$prev" = dlfiles; then
15343 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15344- dlfiles="$dlfiles $pic_object"
15345+ func_append dlfiles " $pic_object"
15346 prev=
15347 continue
15348 else
15349@@ -5040,7 +5907,7 @@ func_mode_link ()
15350 # CHECK ME: I think I busted this. -Ossama
15351 if test "$prev" = dlprefiles; then
15352 # Preload the old-style object.
15353- dlprefiles="$dlprefiles $pic_object"
15354+ func_append dlprefiles " $pic_object"
15355 prev=
15356 fi
15357
15358@@ -5085,24 +5952,25 @@ func_mode_link ()
15359
15360 *.$libext)
15361 # An archive.
15362- deplibs="$deplibs $arg"
15363- old_deplibs="$old_deplibs $arg"
15364+ func_append deplibs " $arg"
15365+ func_append old_deplibs " $arg"
15366 continue
15367 ;;
15368
15369 *.la)
15370 # A libtool-controlled library.
15371
15372+ func_resolve_sysroot "$arg"
15373 if test "$prev" = dlfiles; then
15374 # This library was specified with -dlopen.
15375- dlfiles="$dlfiles $arg"
15376+ func_append dlfiles " $func_resolve_sysroot_result"
15377 prev=
15378 elif test "$prev" = dlprefiles; then
15379 # The library was specified with -dlpreopen.
15380- dlprefiles="$dlprefiles $arg"
15381+ func_append dlprefiles " $func_resolve_sysroot_result"
15382 prev=
15383 else
15384- deplibs="$deplibs $arg"
15385+ func_append deplibs " $func_resolve_sysroot_result"
15386 fi
15387 continue
15388 ;;
15389@@ -5127,7 +5995,7 @@ func_mode_link ()
15390 func_fatal_help "the \`$prevarg' option requires an argument"
15391
15392 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15393- eval "arg=\"$export_dynamic_flag_spec\""
15394+ eval arg=\"$export_dynamic_flag_spec\"
15395 func_append compile_command " $arg"
15396 func_append finalize_command " $arg"
15397 fi
15398@@ -5144,11 +6012,13 @@ func_mode_link ()
15399 else
15400 shlib_search_path=
15401 fi
15402- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15403- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15404+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15405+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15406
15407 func_dirname "$output" "/" ""
15408 output_objdir="$func_dirname_result$objdir"
15409+ func_to_tool_file "$output_objdir/"
15410+ tool_output_objdir=$func_to_tool_file_result
15411 # Create the object directory.
15412 func_mkdir_p "$output_objdir"
15413
15414@@ -5169,12 +6039,12 @@ func_mode_link ()
15415 # Find all interdependent deplibs by searching for libraries
15416 # that are linked more than once (e.g. -la -lb -la)
15417 for deplib in $deplibs; do
15418- if $opt_duplicate_deps ; then
15419+ if $opt_preserve_dup_deps ; then
15420 case "$libs " in
15421- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15422+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15423 esac
15424 fi
15425- libs="$libs $deplib"
15426+ func_append libs " $deplib"
15427 done
15428
15429 if test "$linkmode" = lib; then
15430@@ -5187,9 +6057,9 @@ func_mode_link ()
15431 if $opt_duplicate_compiler_generated_deps; then
15432 for pre_post_dep in $predeps $postdeps; do
15433 case "$pre_post_deps " in
15434- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15435+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15436 esac
15437- pre_post_deps="$pre_post_deps $pre_post_dep"
15438+ func_append pre_post_deps " $pre_post_dep"
15439 done
15440 fi
15441 pre_post_deps=
15442@@ -5256,8 +6126,9 @@ func_mode_link ()
15443 for lib in $dlprefiles; do
15444 # Ignore non-libtool-libs
15445 dependency_libs=
15446+ func_resolve_sysroot "$lib"
15447 case $lib in
15448- *.la) func_source "$lib" ;;
15449+ *.la) func_source "$func_resolve_sysroot_result" ;;
15450 esac
15451
15452 # Collect preopened libtool deplibs, except any this library
15453@@ -5267,7 +6138,7 @@ func_mode_link ()
15454 deplib_base=$func_basename_result
15455 case " $weak_libs " in
15456 *" $deplib_base "*) ;;
15457- *) deplibs="$deplibs $deplib" ;;
15458+ *) func_append deplibs " $deplib" ;;
15459 esac
15460 done
15461 done
15462@@ -5288,11 +6159,11 @@ func_mode_link ()
15463 compile_deplibs="$deplib $compile_deplibs"
15464 finalize_deplibs="$deplib $finalize_deplibs"
15465 else
15466- compiler_flags="$compiler_flags $deplib"
15467+ func_append compiler_flags " $deplib"
15468 if test "$linkmode" = lib ; then
15469 case "$new_inherited_linker_flags " in
15470 *" $deplib "*) ;;
15471- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15472+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15473 esac
15474 fi
15475 fi
15476@@ -5377,7 +6248,7 @@ func_mode_link ()
15477 if test "$linkmode" = lib ; then
15478 case "$new_inherited_linker_flags " in
15479 *" $deplib "*) ;;
15480- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15481+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15482 esac
15483 fi
15484 fi
15485@@ -5390,7 +6261,8 @@ func_mode_link ()
15486 test "$pass" = conv && continue
15487 newdependency_libs="$deplib $newdependency_libs"
15488 func_stripname '-L' '' "$deplib"
15489- newlib_search_path="$newlib_search_path $func_stripname_result"
15490+ func_resolve_sysroot "$func_stripname_result"
15491+ func_append newlib_search_path " $func_resolve_sysroot_result"
15492 ;;
15493 prog)
15494 if test "$pass" = conv; then
15495@@ -5404,7 +6276,8 @@ func_mode_link ()
15496 finalize_deplibs="$deplib $finalize_deplibs"
15497 fi
15498 func_stripname '-L' '' "$deplib"
15499- newlib_search_path="$newlib_search_path $func_stripname_result"
15500+ func_resolve_sysroot "$func_stripname_result"
15501+ func_append newlib_search_path " $func_resolve_sysroot_result"
15502 ;;
15503 *)
15504 func_warning "\`-L' is ignored for archives/objects"
15505@@ -5415,17 +6288,21 @@ func_mode_link ()
15506 -R*)
15507 if test "$pass" = link; then
15508 func_stripname '-R' '' "$deplib"
15509- dir=$func_stripname_result
15510+ func_resolve_sysroot "$func_stripname_result"
15511+ dir=$func_resolve_sysroot_result
15512 # Make sure the xrpath contains only unique directories.
15513 case "$xrpath " in
15514 *" $dir "*) ;;
15515- *) xrpath="$xrpath $dir" ;;
15516+ *) func_append xrpath " $dir" ;;
15517 esac
15518 fi
15519 deplibs="$deplib $deplibs"
15520 continue
15521 ;;
15522- *.la) lib="$deplib" ;;
15523+ *.la)
15524+ func_resolve_sysroot "$deplib"
15525+ lib=$func_resolve_sysroot_result
15526+ ;;
15527 *.$libext)
15528 if test "$pass" = conv; then
15529 deplibs="$deplib $deplibs"
15530@@ -5488,11 +6365,11 @@ func_mode_link ()
15531 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15532 # If there is no dlopen support or we're linking statically,
15533 # we need to preload.
15534- newdlprefiles="$newdlprefiles $deplib"
15535+ func_append newdlprefiles " $deplib"
15536 compile_deplibs="$deplib $compile_deplibs"
15537 finalize_deplibs="$deplib $finalize_deplibs"
15538 else
15539- newdlfiles="$newdlfiles $deplib"
15540+ func_append newdlfiles " $deplib"
15541 fi
15542 fi
15543 continue
15544@@ -5538,7 +6415,7 @@ func_mode_link ()
15545 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15546 case " $new_inherited_linker_flags " in
15547 *" $tmp_inherited_linker_flag "*) ;;
15548- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15549+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15550 esac
15551 done
15552 fi
15553@@ -5546,8 +6423,8 @@ func_mode_link ()
15554 if test "$linkmode,$pass" = "lib,link" ||
15555 test "$linkmode,$pass" = "prog,scan" ||
15556 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15557- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15558- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15559+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15560+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15561 fi
15562
15563 if test "$pass" = conv; then
15564@@ -5558,20 +6435,20 @@ func_mode_link ()
15565 func_fatal_error "cannot find name of link library for \`$lib'"
15566 fi
15567 # It is a libtool convenience library, so add in its objects.
15568- convenience="$convenience $ladir/$objdir/$old_library"
15569- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15570+ func_append convenience " $ladir/$objdir/$old_library"
15571+ func_append old_convenience " $ladir/$objdir/$old_library"
15572 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15573 func_fatal_error "\`$lib' is not a convenience library"
15574 fi
15575 tmp_libs=
15576 for deplib in $dependency_libs; do
15577 deplibs="$deplib $deplibs"
15578- if $opt_duplicate_deps ; then
15579+ if $opt_preserve_dup_deps ; then
15580 case "$tmp_libs " in
15581- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15582+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15583 esac
15584 fi
15585- tmp_libs="$tmp_libs $deplib"
15586+ func_append tmp_libs " $deplib"
15587 done
15588 continue
15589 fi # $pass = conv
15590@@ -5579,9 +6456,15 @@ func_mode_link ()
15591
15592 # Get the name of the library we link against.
15593 linklib=
15594- for l in $old_library $library_names; do
15595- linklib="$l"
15596- done
15597+ if test -n "$old_library" &&
15598+ { test "$prefer_static_libs" = yes ||
15599+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15600+ linklib=$old_library
15601+ else
15602+ for l in $old_library $library_names; do
15603+ linklib="$l"
15604+ done
15605+ fi
15606 if test -z "$linklib"; then
15607 func_fatal_error "cannot find name of link library for \`$lib'"
15608 fi
15609@@ -5598,9 +6481,9 @@ func_mode_link ()
15610 # statically, we need to preload. We also need to preload any
15611 # dependent libraries so libltdl's deplib preloader doesn't
15612 # bomb out in the load deplibs phase.
15613- dlprefiles="$dlprefiles $lib $dependency_libs"
15614+ func_append dlprefiles " $lib $dependency_libs"
15615 else
15616- newdlfiles="$newdlfiles $lib"
15617+ func_append newdlfiles " $lib"
15618 fi
15619 continue
15620 fi # $pass = dlopen
15621@@ -5622,14 +6505,14 @@ func_mode_link ()
15622
15623 # Find the relevant object directory and library name.
15624 if test "X$installed" = Xyes; then
15625- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15626+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15627 func_warning "library \`$lib' was moved."
15628 dir="$ladir"
15629 absdir="$abs_ladir"
15630 libdir="$abs_ladir"
15631 else
15632- dir="$libdir"
15633- absdir="$libdir"
15634+ dir="$lt_sysroot$libdir"
15635+ absdir="$lt_sysroot$libdir"
15636 fi
15637 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15638 else
15639@@ -5637,12 +6520,12 @@ func_mode_link ()
15640 dir="$ladir"
15641 absdir="$abs_ladir"
15642 # Remove this search path later
15643- notinst_path="$notinst_path $abs_ladir"
15644+ func_append notinst_path " $abs_ladir"
15645 else
15646 dir="$ladir/$objdir"
15647 absdir="$abs_ladir/$objdir"
15648 # Remove this search path later
15649- notinst_path="$notinst_path $abs_ladir"
15650+ func_append notinst_path " $abs_ladir"
15651 fi
15652 fi # $installed = yes
15653 func_stripname 'lib' '.la' "$laname"
15654@@ -5653,20 +6536,46 @@ func_mode_link ()
15655 if test -z "$libdir" && test "$linkmode" = prog; then
15656 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15657 fi
15658- # Prefer using a static library (so that no silly _DYNAMIC symbols
15659- # are required to link).
15660- if test -n "$old_library"; then
15661- newdlprefiles="$newdlprefiles $dir/$old_library"
15662- # Keep a list of preopened convenience libraries to check
15663- # that they are being used correctly in the link pass.
15664- test -z "$libdir" && \
15665- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15666- # Otherwise, use the dlname, so that lt_dlopen finds it.
15667- elif test -n "$dlname"; then
15668- newdlprefiles="$newdlprefiles $dir/$dlname"
15669- else
15670- newdlprefiles="$newdlprefiles $dir/$linklib"
15671- fi
15672+ case "$host" in
15673+ # special handling for platforms with PE-DLLs.
15674+ *cygwin* | *mingw* | *cegcc* )
15675+ # Linker will automatically link against shared library if both
15676+ # static and shared are present. Therefore, ensure we extract
15677+ # symbols from the import library if a shared library is present
15678+ # (otherwise, the dlopen module name will be incorrect). We do
15679+ # this by putting the import library name into $newdlprefiles.
15680+ # We recover the dlopen module name by 'saving' the la file
15681+ # name in a special purpose variable, and (later) extracting the
15682+ # dlname from the la file.
15683+ if test -n "$dlname"; then
15684+ func_tr_sh "$dir/$linklib"
15685+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15686+ func_append newdlprefiles " $dir/$linklib"
15687+ else
15688+ func_append newdlprefiles " $dir/$old_library"
15689+ # Keep a list of preopened convenience libraries to check
15690+ # that they are being used correctly in the link pass.
15691+ test -z "$libdir" && \
15692+ func_append dlpreconveniencelibs " $dir/$old_library"
15693+ fi
15694+ ;;
15695+ * )
15696+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15697+ # are required to link).
15698+ if test -n "$old_library"; then
15699+ func_append newdlprefiles " $dir/$old_library"
15700+ # Keep a list of preopened convenience libraries to check
15701+ # that they are being used correctly in the link pass.
15702+ test -z "$libdir" && \
15703+ func_append dlpreconveniencelibs " $dir/$old_library"
15704+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15705+ elif test -n "$dlname"; then
15706+ func_append newdlprefiles " $dir/$dlname"
15707+ else
15708+ func_append newdlprefiles " $dir/$linklib"
15709+ fi
15710+ ;;
15711+ esac
15712 fi # $pass = dlpreopen
15713
15714 if test -z "$libdir"; then
15715@@ -5684,7 +6593,7 @@ func_mode_link ()
15716
15717
15718 if test "$linkmode" = prog && test "$pass" != link; then
15719- newlib_search_path="$newlib_search_path $ladir"
15720+ func_append newlib_search_path " $ladir"
15721 deplibs="$lib $deplibs"
15722
15723 linkalldeplibs=no
15724@@ -5697,7 +6606,8 @@ func_mode_link ()
15725 for deplib in $dependency_libs; do
15726 case $deplib in
15727 -L*) func_stripname '-L' '' "$deplib"
15728- newlib_search_path="$newlib_search_path $func_stripname_result"
15729+ func_resolve_sysroot "$func_stripname_result"
15730+ func_append newlib_search_path " $func_resolve_sysroot_result"
15731 ;;
15732 esac
15733 # Need to link against all dependency_libs?
15734@@ -5708,12 +6618,12 @@ func_mode_link ()
15735 # or/and link against static libraries
15736 newdependency_libs="$deplib $newdependency_libs"
15737 fi
15738- if $opt_duplicate_deps ; then
15739+ if $opt_preserve_dup_deps ; then
15740 case "$tmp_libs " in
15741- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15742+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15743 esac
15744 fi
15745- tmp_libs="$tmp_libs $deplib"
15746+ func_append tmp_libs " $deplib"
15747 done # for deplib
15748 continue
15749 fi # $linkmode = prog...
15750@@ -5728,7 +6638,7 @@ func_mode_link ()
15751 # Make sure the rpath contains only unique directories.
15752 case "$temp_rpath:" in
15753 *"$absdir:"*) ;;
15754- *) temp_rpath="$temp_rpath$absdir:" ;;
15755+ *) func_append temp_rpath "$absdir:" ;;
15756 esac
15757 fi
15758
15759@@ -5740,7 +6650,7 @@ func_mode_link ()
15760 *)
15761 case "$compile_rpath " in
15762 *" $absdir "*) ;;
15763- *) compile_rpath="$compile_rpath $absdir"
15764+ *) func_append compile_rpath " $absdir" ;;
15765 esac
15766 ;;
15767 esac
15768@@ -5749,7 +6659,7 @@ func_mode_link ()
15769 *)
15770 case "$finalize_rpath " in
15771 *" $libdir "*) ;;
15772- *) finalize_rpath="$finalize_rpath $libdir"
15773+ *) func_append finalize_rpath " $libdir" ;;
15774 esac
15775 ;;
15776 esac
15777@@ -5774,12 +6684,12 @@ func_mode_link ()
15778 case $host in
15779 *cygwin* | *mingw* | *cegcc*)
15780 # No point in relinking DLLs because paths are not encoded
15781- notinst_deplibs="$notinst_deplibs $lib"
15782+ func_append notinst_deplibs " $lib"
15783 need_relink=no
15784 ;;
15785 *)
15786 if test "$installed" = no; then
15787- notinst_deplibs="$notinst_deplibs $lib"
15788+ func_append notinst_deplibs " $lib"
15789 need_relink=yes
15790 fi
15791 ;;
15792@@ -5814,7 +6724,7 @@ func_mode_link ()
15793 *)
15794 case "$compile_rpath " in
15795 *" $absdir "*) ;;
15796- *) compile_rpath="$compile_rpath $absdir"
15797+ *) func_append compile_rpath " $absdir" ;;
15798 esac
15799 ;;
15800 esac
15801@@ -5823,7 +6733,7 @@ func_mode_link ()
15802 *)
15803 case "$finalize_rpath " in
15804 *" $libdir "*) ;;
15805- *) finalize_rpath="$finalize_rpath $libdir"
15806+ *) func_append finalize_rpath " $libdir" ;;
15807 esac
15808 ;;
15809 esac
15810@@ -5835,7 +6745,7 @@ func_mode_link ()
15811 shift
15812 realname="$1"
15813 shift
15814- eval "libname=\"$libname_spec\""
15815+ libname=`eval "\\$ECHO \"$libname_spec\""`
15816 # use dlname if we got it. it's perfectly good, no?
15817 if test -n "$dlname"; then
15818 soname="$dlname"
15819@@ -5848,7 +6758,7 @@ func_mode_link ()
15820 versuffix="-$major"
15821 ;;
15822 esac
15823- eval "soname=\"$soname_spec\""
15824+ eval soname=\"$soname_spec\"
15825 else
15826 soname="$realname"
15827 fi
15828@@ -5877,7 +6787,7 @@ func_mode_link ()
15829 linklib=$newlib
15830 fi # test -n "$old_archive_from_expsyms_cmds"
15831
15832- if test "$linkmode" = prog || test "$mode" != relink; then
15833+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15834 add_shlibpath=
15835 add_dir=
15836 add=
15837@@ -5933,7 +6843,7 @@ func_mode_link ()
15838 if test -n "$inst_prefix_dir"; then
15839 case $libdir in
15840 [\\/]*)
15841- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15842+ func_append add_dir " -L$inst_prefix_dir$libdir"
15843 ;;
15844 esac
15845 fi
15846@@ -5955,7 +6865,7 @@ func_mode_link ()
15847 if test -n "$add_shlibpath"; then
15848 case :$compile_shlibpath: in
15849 *":$add_shlibpath:"*) ;;
15850- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15851+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15852 esac
15853 fi
15854 if test "$linkmode" = prog; then
15855@@ -5969,13 +6879,13 @@ func_mode_link ()
15856 test "$hardcode_shlibpath_var" = yes; then
15857 case :$finalize_shlibpath: in
15858 *":$libdir:"*) ;;
15859- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15860+ *) func_append finalize_shlibpath "$libdir:" ;;
15861 esac
15862 fi
15863 fi
15864 fi
15865
15866- if test "$linkmode" = prog || test "$mode" = relink; then
15867+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15868 add_shlibpath=
15869 add_dir=
15870 add=
15871@@ -5989,7 +6899,7 @@ func_mode_link ()
15872 elif test "$hardcode_shlibpath_var" = yes; then
15873 case :$finalize_shlibpath: in
15874 *":$libdir:"*) ;;
15875- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15876+ *) func_append finalize_shlibpath "$libdir:" ;;
15877 esac
15878 add="-l$name"
15879 elif test "$hardcode_automatic" = yes; then
15880@@ -6001,12 +6911,12 @@ func_mode_link ()
15881 fi
15882 else
15883 # We cannot seem to hardcode it, guess we'll fake it.
15884- add_dir="-L$libdir"
15885+ add_dir="-L$lt_sysroot$libdir"
15886 # Try looking first in the location we're being installed to.
15887 if test -n "$inst_prefix_dir"; then
15888 case $libdir in
15889 [\\/]*)
15890- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15891+ func_append add_dir " -L$inst_prefix_dir$libdir"
15892 ;;
15893 esac
15894 fi
15895@@ -6083,27 +6993,33 @@ func_mode_link ()
15896 temp_xrpath=$func_stripname_result
15897 case " $xrpath " in
15898 *" $temp_xrpath "*) ;;
15899- *) xrpath="$xrpath $temp_xrpath";;
15900+ *) func_append xrpath " $temp_xrpath";;
15901 esac;;
15902- *) temp_deplibs="$temp_deplibs $libdir";;
15903+ *) func_append temp_deplibs " $libdir";;
15904 esac
15905 done
15906 dependency_libs="$temp_deplibs"
15907 fi
15908
15909- newlib_search_path="$newlib_search_path $absdir"
15910+ func_append newlib_search_path " $absdir"
15911 # Link against this library
15912 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
15913 # ... and its dependency_libs
15914 tmp_libs=
15915 for deplib in $dependency_libs; do
15916 newdependency_libs="$deplib $newdependency_libs"
15917- if $opt_duplicate_deps ; then
15918+ case $deplib in
15919+ -L*) func_stripname '-L' '' "$deplib"
15920+ func_resolve_sysroot "$func_stripname_result";;
15921+ *) func_resolve_sysroot "$deplib" ;;
15922+ esac
15923+ if $opt_preserve_dup_deps ; then
15924 case "$tmp_libs " in
15925- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15926+ *" $func_resolve_sysroot_result "*)
15927+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
15928 esac
15929 fi
15930- tmp_libs="$tmp_libs $deplib"
15931+ func_append tmp_libs " $func_resolve_sysroot_result"
15932 done
15933
15934 if test "$link_all_deplibs" != no; then
15935@@ -6113,8 +7029,10 @@ func_mode_link ()
15936 case $deplib in
15937 -L*) path="$deplib" ;;
15938 *.la)
15939+ func_resolve_sysroot "$deplib"
15940+ deplib=$func_resolve_sysroot_result
15941 func_dirname "$deplib" "" "."
15942- dir="$func_dirname_result"
15943+ dir=$func_dirname_result
15944 # We need an absolute path.
15945 case $dir in
15946 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
15947@@ -6130,7 +7048,7 @@ func_mode_link ()
15948 case $host in
15949 *-*-darwin*)
15950 depdepl=
15951- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15952+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15953 if test -n "$deplibrary_names" ; then
15954 for tmp in $deplibrary_names ; do
15955 depdepl=$tmp
15956@@ -6141,8 +7059,8 @@ func_mode_link ()
15957 if test -z "$darwin_install_name"; then
15958 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
15959 fi
15960- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15961- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
15962+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15963+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
15964 path=
15965 fi
15966 fi
15967@@ -6152,7 +7070,7 @@ func_mode_link ()
15968 ;;
15969 esac
15970 else
15971- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15972+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15973 test -z "$libdir" && \
15974 func_fatal_error "\`$deplib' is not a valid libtool archive"
15975 test "$absdir" != "$libdir" && \
15976@@ -6192,7 +7110,7 @@ func_mode_link ()
15977 for dir in $newlib_search_path; do
15978 case "$lib_search_path " in
15979 *" $dir "*) ;;
15980- *) lib_search_path="$lib_search_path $dir" ;;
15981+ *) func_append lib_search_path " $dir" ;;
15982 esac
15983 done
15984 newlib_search_path=
15985@@ -6205,7 +7123,7 @@ func_mode_link ()
15986 fi
15987 for var in $vars dependency_libs; do
15988 # Add libraries to $var in reverse order
15989- eval tmp_libs=\$$var
15990+ eval tmp_libs=\"\$$var\"
15991 new_libs=
15992 for deplib in $tmp_libs; do
15993 # FIXME: Pedantically, this is the right thing to do, so
15994@@ -6250,13 +7168,13 @@ func_mode_link ()
15995 -L*)
15996 case " $tmp_libs " in
15997 *" $deplib "*) ;;
15998- *) tmp_libs="$tmp_libs $deplib" ;;
15999+ *) func_append tmp_libs " $deplib" ;;
16000 esac
16001 ;;
16002- *) tmp_libs="$tmp_libs $deplib" ;;
16003+ *) func_append tmp_libs " $deplib" ;;
16004 esac
16005 done
16006- eval $var=\$tmp_libs
16007+ eval $var=\"$tmp_libs\"
16008 done # for var
16009 fi
16010 # Last step: remove runtime libs from dependency_libs
16011@@ -6269,7 +7187,7 @@ func_mode_link ()
16012 ;;
16013 esac
16014 if test -n "$i" ; then
16015- tmp_libs="$tmp_libs $i"
16016+ func_append tmp_libs " $i"
16017 fi
16018 done
16019 dependency_libs=$tmp_libs
16020@@ -6310,7 +7228,7 @@ func_mode_link ()
16021 # Now set the variables for building old libraries.
16022 build_libtool_libs=no
16023 oldlibs="$output"
16024- objs="$objs$old_deplibs"
16025+ func_append objs "$old_deplibs"
16026 ;;
16027
16028 lib)
16029@@ -6319,8 +7237,8 @@ func_mode_link ()
16030 lib*)
16031 func_stripname 'lib' '.la' "$outputname"
16032 name=$func_stripname_result
16033- eval "shared_ext=\"$shrext_cmds\""
16034- eval "libname=\"$libname_spec\""
16035+ eval shared_ext=\"$shrext_cmds\"
16036+ eval libname=\"$libname_spec\"
16037 ;;
16038 *)
16039 test "$module" = no && \
16040@@ -6330,8 +7248,8 @@ func_mode_link ()
16041 # Add the "lib" prefix for modules if required
16042 func_stripname '' '.la' "$outputname"
16043 name=$func_stripname_result
16044- eval "shared_ext=\"$shrext_cmds\""
16045- eval "libname=\"$libname_spec\""
16046+ eval shared_ext=\"$shrext_cmds\"
16047+ eval libname=\"$libname_spec\"
16048 else
16049 func_stripname '' '.la' "$outputname"
16050 libname=$func_stripname_result
16051@@ -6346,7 +7264,7 @@ func_mode_link ()
16052 echo
16053 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16054 $ECHO "*** objects $objs is not portable!"
16055- libobjs="$libobjs $objs"
16056+ func_append libobjs " $objs"
16057 fi
16058 fi
16059
16060@@ -6544,7 +7462,7 @@ func_mode_link ()
16061 done
16062
16063 # Make executables depend on our current version.
16064- verstring="$verstring:${current}.0"
16065+ func_append verstring ":${current}.0"
16066 ;;
16067
16068 qnx)
16069@@ -6612,10 +7530,10 @@ func_mode_link ()
16070 fi
16071
16072 func_generate_dlsyms "$libname" "$libname" "yes"
16073- libobjs="$libobjs $symfileobj"
16074+ func_append libobjs " $symfileobj"
16075 test "X$libobjs" = "X " && libobjs=
16076
16077- if test "$mode" != relink; then
16078+ if test "$opt_mode" != relink; then
16079 # Remove our outputs, but don't remove object files since they
16080 # may have been created when compiling PIC objects.
16081 removelist=
16082@@ -6631,7 +7549,7 @@ func_mode_link ()
16083 continue
16084 fi
16085 fi
16086- removelist="$removelist $p"
16087+ func_append removelist " $p"
16088 ;;
16089 *) ;;
16090 esac
16091@@ -6642,7 +7560,7 @@ func_mode_link ()
16092
16093 # Now set the variables for building old libraries.
16094 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16095- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16096+ func_append oldlibs " $output_objdir/$libname.$libext"
16097
16098 # Transform .lo files to .o files.
16099 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16100@@ -6659,10 +7577,11 @@ func_mode_link ()
16101 # If the user specified any rpath flags, then add them.
16102 temp_xrpath=
16103 for libdir in $xrpath; do
16104- temp_xrpath="$temp_xrpath -R$libdir"
16105+ func_replace_sysroot "$libdir"
16106+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16107 case "$finalize_rpath " in
16108 *" $libdir "*) ;;
16109- *) finalize_rpath="$finalize_rpath $libdir" ;;
16110+ *) func_append finalize_rpath " $libdir" ;;
16111 esac
16112 done
16113 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16114@@ -6676,7 +7595,7 @@ func_mode_link ()
16115 for lib in $old_dlfiles; do
16116 case " $dlprefiles $dlfiles " in
16117 *" $lib "*) ;;
16118- *) dlfiles="$dlfiles $lib" ;;
16119+ *) func_append dlfiles " $lib" ;;
16120 esac
16121 done
16122
16123@@ -6686,7 +7605,7 @@ func_mode_link ()
16124 for lib in $old_dlprefiles; do
16125 case "$dlprefiles " in
16126 *" $lib "*) ;;
16127- *) dlprefiles="$dlprefiles $lib" ;;
16128+ *) func_append dlprefiles " $lib" ;;
16129 esac
16130 done
16131
16132@@ -6698,7 +7617,7 @@ func_mode_link ()
16133 ;;
16134 *-*-rhapsody* | *-*-darwin1.[012])
16135 # Rhapsody C library is in the System framework
16136- deplibs="$deplibs System.ltframework"
16137+ func_append deplibs " System.ltframework"
16138 ;;
16139 *-*-netbsd*)
16140 # Don't link with libc until the a.out ld.so is fixed.
16141@@ -6715,7 +7634,7 @@ func_mode_link ()
16142 *)
16143 # Add libc to deplibs on all other systems if necessary.
16144 if test "$build_libtool_need_lc" = "yes"; then
16145- deplibs="$deplibs -lc"
16146+ func_append deplibs " -lc"
16147 fi
16148 ;;
16149 esac
16150@@ -6764,18 +7683,18 @@ EOF
16151 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16152 case " $predeps $postdeps " in
16153 *" $i "*)
16154- newdeplibs="$newdeplibs $i"
16155+ func_append newdeplibs " $i"
16156 i=""
16157 ;;
16158 esac
16159 fi
16160 if test -n "$i" ; then
16161- eval "libname=\"$libname_spec\""
16162- eval "deplib_matches=\"$library_names_spec\""
16163+ libname=`eval "\\$ECHO \"$libname_spec\""`
16164+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16165 set dummy $deplib_matches; shift
16166 deplib_match=$1
16167 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16168- newdeplibs="$newdeplibs $i"
16169+ func_append newdeplibs " $i"
16170 else
16171 droppeddeps=yes
16172 echo
16173@@ -6789,7 +7708,7 @@ EOF
16174 fi
16175 ;;
16176 *)
16177- newdeplibs="$newdeplibs $i"
16178+ func_append newdeplibs " $i"
16179 ;;
16180 esac
16181 done
16182@@ -6807,18 +7726,18 @@ EOF
16183 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16184 case " $predeps $postdeps " in
16185 *" $i "*)
16186- newdeplibs="$newdeplibs $i"
16187+ func_append newdeplibs " $i"
16188 i=""
16189 ;;
16190 esac
16191 fi
16192 if test -n "$i" ; then
16193- eval "libname=\"$libname_spec\""
16194- eval "deplib_matches=\"$library_names_spec\""
16195+ libname=`eval "\\$ECHO \"$libname_spec\""`
16196+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16197 set dummy $deplib_matches; shift
16198 deplib_match=$1
16199 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16200- newdeplibs="$newdeplibs $i"
16201+ func_append newdeplibs " $i"
16202 else
16203 droppeddeps=yes
16204 echo
16205@@ -6840,7 +7759,7 @@ EOF
16206 fi
16207 ;;
16208 *)
16209- newdeplibs="$newdeplibs $i"
16210+ func_append newdeplibs " $i"
16211 ;;
16212 esac
16213 done
16214@@ -6857,15 +7776,27 @@ EOF
16215 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16216 case " $predeps $postdeps " in
16217 *" $a_deplib "*)
16218- newdeplibs="$newdeplibs $a_deplib"
16219+ func_append newdeplibs " $a_deplib"
16220 a_deplib=""
16221 ;;
16222 esac
16223 fi
16224 if test -n "$a_deplib" ; then
16225- eval "libname=\"$libname_spec\""
16226+ libname=`eval "\\$ECHO \"$libname_spec\""`
16227+ if test -n "$file_magic_glob"; then
16228+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16229+ else
16230+ libnameglob=$libname
16231+ fi
16232+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16233 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16234- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16235+ if test "$want_nocaseglob" = yes; then
16236+ shopt -s nocaseglob
16237+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16238+ $nocaseglob
16239+ else
16240+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16241+ fi
16242 for potent_lib in $potential_libs; do
16243 # Follow soft links.
16244 if ls -lLd "$potent_lib" 2>/dev/null |
16245@@ -6885,10 +7816,10 @@ EOF
16246 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16247 esac
16248 done
16249- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16250+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16251 $SED -e 10q |
16252 $EGREP "$file_magic_regex" > /dev/null; then
16253- newdeplibs="$newdeplibs $a_deplib"
16254+ func_append newdeplibs " $a_deplib"
16255 a_deplib=""
16256 break 2
16257 fi
16258@@ -6913,7 +7844,7 @@ EOF
16259 ;;
16260 *)
16261 # Add a -L argument.
16262- newdeplibs="$newdeplibs $a_deplib"
16263+ func_append newdeplibs " $a_deplib"
16264 ;;
16265 esac
16266 done # Gone through all deplibs.
16267@@ -6929,20 +7860,20 @@ EOF
16268 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16269 case " $predeps $postdeps " in
16270 *" $a_deplib "*)
16271- newdeplibs="$newdeplibs $a_deplib"
16272+ func_append newdeplibs " $a_deplib"
16273 a_deplib=""
16274 ;;
16275 esac
16276 fi
16277 if test -n "$a_deplib" ; then
16278- eval "libname=\"$libname_spec\""
16279+ libname=`eval "\\$ECHO \"$libname_spec\""`
16280 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16281 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16282 for potent_lib in $potential_libs; do
16283 potlib="$potent_lib" # see symlink-check above in file_magic test
16284 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16285 $EGREP "$match_pattern_regex" > /dev/null; then
16286- newdeplibs="$newdeplibs $a_deplib"
16287+ func_append newdeplibs " $a_deplib"
16288 a_deplib=""
16289 break 2
16290 fi
16291@@ -6967,7 +7898,7 @@ EOF
16292 ;;
16293 *)
16294 # Add a -L argument.
16295- newdeplibs="$newdeplibs $a_deplib"
16296+ func_append newdeplibs " $a_deplib"
16297 ;;
16298 esac
16299 done # Gone through all deplibs.
16300@@ -7071,7 +8002,7 @@ EOF
16301 *)
16302 case " $deplibs " in
16303 *" -L$path/$objdir "*)
16304- new_libs="$new_libs -L$path/$objdir" ;;
16305+ func_append new_libs " -L$path/$objdir" ;;
16306 esac
16307 ;;
16308 esac
16309@@ -7081,10 +8012,10 @@ EOF
16310 -L*)
16311 case " $new_libs " in
16312 *" $deplib "*) ;;
16313- *) new_libs="$new_libs $deplib" ;;
16314+ *) func_append new_libs " $deplib" ;;
16315 esac
16316 ;;
16317- *) new_libs="$new_libs $deplib" ;;
16318+ *) func_append new_libs " $deplib" ;;
16319 esac
16320 done
16321 deplibs="$new_libs"
16322@@ -7101,10 +8032,12 @@ EOF
16323 hardcode_libdirs=
16324 dep_rpath=
16325 rpath="$finalize_rpath"
16326- test "$mode" != relink && rpath="$compile_rpath$rpath"
16327+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16328 for libdir in $rpath; do
16329 if test -n "$hardcode_libdir_flag_spec"; then
16330 if test -n "$hardcode_libdir_separator"; then
16331+ func_replace_sysroot "$libdir"
16332+ libdir=$func_replace_sysroot_result
16333 if test -z "$hardcode_libdirs"; then
16334 hardcode_libdirs="$libdir"
16335 else
16336@@ -7113,18 +8046,18 @@ EOF
16337 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16338 ;;
16339 *)
16340- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16341+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16342 ;;
16343 esac
16344 fi
16345 else
16346- eval "flag=\"$hardcode_libdir_flag_spec\""
16347- dep_rpath="$dep_rpath $flag"
16348+ eval flag=\"$hardcode_libdir_flag_spec\"
16349+ func_append dep_rpath " $flag"
16350 fi
16351 elif test -n "$runpath_var"; then
16352 case "$perm_rpath " in
16353 *" $libdir "*) ;;
16354- *) perm_rpath="$perm_rpath $libdir" ;;
16355+ *) func_append perm_rpath " $libdir" ;;
16356 esac
16357 fi
16358 done
16359@@ -7133,40 +8066,38 @@ EOF
16360 test -n "$hardcode_libdirs"; then
16361 libdir="$hardcode_libdirs"
16362 if test -n "$hardcode_libdir_flag_spec_ld"; then
16363- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16364+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16365 else
16366- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16367+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16368 fi
16369 fi
16370 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16371 # We should set the runpath_var.
16372 rpath=
16373 for dir in $perm_rpath; do
16374- rpath="$rpath$dir:"
16375+ func_append rpath "$dir:"
16376 done
16377- eval $runpath_var=\$rpath\$$runpath_var
16378- export $runpath_var
16379+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16380 fi
16381 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16382 fi
16383
16384 shlibpath="$finalize_shlibpath"
16385- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16386+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16387 if test -n "$shlibpath"; then
16388- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16389- export $shlibpath_var
16390+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16391 fi
16392
16393 # Get the real and link names of the library.
16394- eval "shared_ext=\"$shrext_cmds\""
16395- eval "library_names=\"$library_names_spec\""
16396+ eval shared_ext=\"$shrext_cmds\"
16397+ eval library_names=\"$library_names_spec\"
16398 set dummy $library_names
16399 shift
16400 realname="$1"
16401 shift
16402
16403 if test -n "$soname_spec"; then
16404- eval "soname=\"$soname_spec\""
16405+ eval soname=\"$soname_spec\"
16406 else
16407 soname="$realname"
16408 fi
16409@@ -7178,7 +8109,7 @@ EOF
16410 linknames=
16411 for link
16412 do
16413- linknames="$linknames $link"
16414+ func_append linknames " $link"
16415 done
16416
16417 # Use standard objects if they are pic
16418@@ -7189,7 +8120,7 @@ EOF
16419 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16420 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16421 export_symbols="$output_objdir/$libname.uexp"
16422- delfiles="$delfiles $export_symbols"
16423+ func_append delfiles " $export_symbols"
16424 fi
16425
16426 orig_export_symbols=
16427@@ -7220,13 +8151,45 @@ EOF
16428 $opt_dry_run || $RM $export_symbols
16429 cmds=$export_symbols_cmds
16430 save_ifs="$IFS"; IFS='~'
16431- for cmd in $cmds; do
16432+ for cmd1 in $cmds; do
16433 IFS="$save_ifs"
16434- eval "cmd=\"$cmd\""
16435- func_len " $cmd"
16436- len=$func_len_result
16437- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16438+ # Take the normal branch if the nm_file_list_spec branch
16439+ # doesn't work or if tool conversion is not needed.
16440+ case $nm_file_list_spec~$to_tool_file_cmd in
16441+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16442+ try_normal_branch=yes
16443+ eval cmd=\"$cmd1\"
16444+ func_len " $cmd"
16445+ len=$func_len_result
16446+ ;;
16447+ *)
16448+ try_normal_branch=no
16449+ ;;
16450+ esac
16451+ if test "$try_normal_branch" = yes \
16452+ && { test "$len" -lt "$max_cmd_len" \
16453+ || test "$max_cmd_len" -le -1; }
16454+ then
16455+ func_show_eval "$cmd" 'exit $?'
16456+ skipped_export=false
16457+ elif test -n "$nm_file_list_spec"; then
16458+ func_basename "$output"
16459+ output_la=$func_basename_result
16460+ save_libobjs=$libobjs
16461+ save_output=$output
16462+ output=${output_objdir}/${output_la}.nm
16463+ func_to_tool_file "$output"
16464+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16465+ func_append delfiles " $output"
16466+ func_verbose "creating $NM input file list: $output"
16467+ for obj in $save_libobjs; do
16468+ func_to_tool_file "$obj"
16469+ $ECHO "$func_to_tool_file_result"
16470+ done > "$output"
16471+ eval cmd=\"$cmd1\"
16472 func_show_eval "$cmd" 'exit $?'
16473+ output=$save_output
16474+ libobjs=$save_libobjs
16475 skipped_export=false
16476 else
16477 # The command line is too long to execute in one step.
16478@@ -7248,7 +8211,7 @@ EOF
16479 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16480 tmp_export_symbols="$export_symbols"
16481 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16482- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16483+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16484 fi
16485
16486 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16487@@ -7260,7 +8223,7 @@ EOF
16488 # global variables. join(1) would be nice here, but unfortunately
16489 # isn't a blessed tool.
16490 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16491- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16492+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16493 export_symbols=$output_objdir/$libname.def
16494 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16495 fi
16496@@ -7270,7 +8233,7 @@ EOF
16497 case " $convenience " in
16498 *" $test_deplib "*) ;;
16499 *)
16500- tmp_deplibs="$tmp_deplibs $test_deplib"
16501+ func_append tmp_deplibs " $test_deplib"
16502 ;;
16503 esac
16504 done
16505@@ -7286,43 +8249,43 @@ EOF
16506 fi
16507 if test -n "$whole_archive_flag_spec"; then
16508 save_libobjs=$libobjs
16509- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16510+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16511 test "X$libobjs" = "X " && libobjs=
16512 else
16513 gentop="$output_objdir/${outputname}x"
16514- generated="$generated $gentop"
16515+ func_append generated " $gentop"
16516
16517 func_extract_archives $gentop $convenience
16518- libobjs="$libobjs $func_extract_archives_result"
16519+ func_append libobjs " $func_extract_archives_result"
16520 test "X$libobjs" = "X " && libobjs=
16521 fi
16522 fi
16523
16524 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16525- eval "flag=\"$thread_safe_flag_spec\""
16526- linker_flags="$linker_flags $flag"
16527+ eval flag=\"$thread_safe_flag_spec\"
16528+ func_append linker_flags " $flag"
16529 fi
16530
16531 # Make a backup of the uninstalled library when relinking
16532- if test "$mode" = relink; then
16533- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16534+ if test "$opt_mode" = relink; then
16535+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16536 fi
16537
16538 # Do each of the archive commands.
16539 if test "$module" = yes && test -n "$module_cmds" ; then
16540 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16541- eval "test_cmds=\"$module_expsym_cmds\""
16542+ eval test_cmds=\"$module_expsym_cmds\"
16543 cmds=$module_expsym_cmds
16544 else
16545- eval "test_cmds=\"$module_cmds\""
16546+ eval test_cmds=\"$module_cmds\"
16547 cmds=$module_cmds
16548 fi
16549 else
16550 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16551- eval "test_cmds=\"$archive_expsym_cmds\""
16552+ eval test_cmds=\"$archive_expsym_cmds\"
16553 cmds=$archive_expsym_cmds
16554 else
16555- eval "test_cmds=\"$archive_cmds\""
16556+ eval test_cmds=\"$archive_cmds\"
16557 cmds=$archive_cmds
16558 fi
16559 fi
16560@@ -7366,10 +8329,13 @@ EOF
16561 echo 'INPUT (' > $output
16562 for obj in $save_libobjs
16563 do
16564- $ECHO "$obj" >> $output
16565+ func_to_tool_file "$obj"
16566+ $ECHO "$func_to_tool_file_result" >> $output
16567 done
16568 echo ')' >> $output
16569- delfiles="$delfiles $output"
16570+ func_append delfiles " $output"
16571+ func_to_tool_file "$output"
16572+ output=$func_to_tool_file_result
16573 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16574 output=${output_objdir}/${output_la}.lnk
16575 func_verbose "creating linker input file list: $output"
16576@@ -7383,15 +8349,17 @@ EOF
16577 fi
16578 for obj
16579 do
16580- $ECHO "$obj" >> $output
16581+ func_to_tool_file "$obj"
16582+ $ECHO "$func_to_tool_file_result" >> $output
16583 done
16584- delfiles="$delfiles $output"
16585- output=$firstobj\"$file_list_spec$output\"
16586+ func_append delfiles " $output"
16587+ func_to_tool_file "$output"
16588+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16589 else
16590 if test -n "$save_libobjs"; then
16591 func_verbose "creating reloadable object files..."
16592 output=$output_objdir/$output_la-${k}.$objext
16593- eval "test_cmds=\"$reload_cmds\""
16594+ eval test_cmds=\"$reload_cmds\"
16595 func_len " $test_cmds"
16596 len0=$func_len_result
16597 len=$len0
16598@@ -7411,12 +8379,12 @@ EOF
16599 if test "$k" -eq 1 ; then
16600 # The first file doesn't have a previous command to add.
16601 reload_objs=$objlist
16602- eval "concat_cmds=\"$reload_cmds\""
16603+ eval concat_cmds=\"$reload_cmds\"
16604 else
16605 # All subsequent reloadable object files will link in
16606 # the last one created.
16607 reload_objs="$objlist $last_robj"
16608- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16609+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16610 fi
16611 last_robj=$output_objdir/$output_la-${k}.$objext
16612 func_arith $k + 1
16613@@ -7433,11 +8401,11 @@ EOF
16614 # files will link in the last one created.
16615 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16616 reload_objs="$objlist $last_robj"
16617- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16618+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16619 if test -n "$last_robj"; then
16620- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16621+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16622 fi
16623- delfiles="$delfiles $output"
16624+ func_append delfiles " $output"
16625
16626 else
16627 output=
16628@@ -7450,9 +8418,9 @@ EOF
16629 libobjs=$output
16630 # Append the command to create the export file.
16631 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16632- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16633+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16634 if test -n "$last_robj"; then
16635- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16636+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16637 fi
16638 fi
16639
16640@@ -7471,7 +8439,7 @@ EOF
16641 lt_exit=$?
16642
16643 # Restore the uninstalled library and exit
16644- if test "$mode" = relink; then
16645+ if test "$opt_mode" = relink; then
16646 ( cd "$output_objdir" && \
16647 $RM "${realname}T" && \
16648 $MV "${realname}U" "$realname" )
16649@@ -7492,7 +8460,7 @@ EOF
16650 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16651 tmp_export_symbols="$export_symbols"
16652 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16653- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16654+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16655 fi
16656
16657 if test -n "$orig_export_symbols"; then
16658@@ -7504,7 +8472,7 @@ EOF
16659 # global variables. join(1) would be nice here, but unfortunately
16660 # isn't a blessed tool.
16661 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16662- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16663+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16664 export_symbols=$output_objdir/$libname.def
16665 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16666 fi
16667@@ -7515,7 +8483,7 @@ EOF
16668 output=$save_output
16669
16670 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16671- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16672+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16673 test "X$libobjs" = "X " && libobjs=
16674 fi
16675 # Expand the library linking commands again to reset the
16676@@ -7539,23 +8507,23 @@ EOF
16677
16678 if test -n "$delfiles"; then
16679 # Append the command to remove temporary files to $cmds.
16680- eval "cmds=\"\$cmds~\$RM $delfiles\""
16681+ eval cmds=\"\$cmds~\$RM $delfiles\"
16682 fi
16683
16684 # Add any objects from preloaded convenience libraries
16685 if test -n "$dlprefiles"; then
16686 gentop="$output_objdir/${outputname}x"
16687- generated="$generated $gentop"
16688+ func_append generated " $gentop"
16689
16690 func_extract_archives $gentop $dlprefiles
16691- libobjs="$libobjs $func_extract_archives_result"
16692+ func_append libobjs " $func_extract_archives_result"
16693 test "X$libobjs" = "X " && libobjs=
16694 fi
16695
16696 save_ifs="$IFS"; IFS='~'
16697 for cmd in $cmds; do
16698 IFS="$save_ifs"
16699- eval "cmd=\"$cmd\""
16700+ eval cmd=\"$cmd\"
16701 $opt_silent || {
16702 func_quote_for_expand "$cmd"
16703 eval "func_echo $func_quote_for_expand_result"
16704@@ -7564,7 +8532,7 @@ EOF
16705 lt_exit=$?
16706
16707 # Restore the uninstalled library and exit
16708- if test "$mode" = relink; then
16709+ if test "$opt_mode" = relink; then
16710 ( cd "$output_objdir" && \
16711 $RM "${realname}T" && \
16712 $MV "${realname}U" "$realname" )
16713@@ -7576,8 +8544,8 @@ EOF
16714 IFS="$save_ifs"
16715
16716 # Restore the uninstalled library and exit
16717- if test "$mode" = relink; then
16718- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16719+ if test "$opt_mode" = relink; then
16720+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16721
16722 if test -n "$convenience"; then
16723 if test -z "$whole_archive_flag_spec"; then
16724@@ -7656,17 +8624,20 @@ EOF
16725
16726 if test -n "$convenience"; then
16727 if test -n "$whole_archive_flag_spec"; then
16728- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16729+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16730 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16731 else
16732 gentop="$output_objdir/${obj}x"
16733- generated="$generated $gentop"
16734+ func_append generated " $gentop"
16735
16736 func_extract_archives $gentop $convenience
16737 reload_conv_objs="$reload_objs $func_extract_archives_result"
16738 fi
16739 fi
16740
16741+ # If we're not building shared, we need to use non_pic_objs
16742+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16743+
16744 # Create the old-style object.
16745 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16746
16747@@ -7690,7 +8661,7 @@ EOF
16748 # Create an invalid libtool object if no PIC, so that we don't
16749 # accidentally link it into a program.
16750 # $show "echo timestamp > $libobj"
16751- # $opt_dry_run || echo timestamp > $libobj || exit $?
16752+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16753 exit $EXIT_SUCCESS
16754 fi
16755
16756@@ -7740,8 +8711,8 @@ EOF
16757 if test "$tagname" = CXX ; then
16758 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16759 10.[0123])
16760- compile_command="$compile_command ${wl}-bind_at_load"
16761- finalize_command="$finalize_command ${wl}-bind_at_load"
16762+ func_append compile_command " ${wl}-bind_at_load"
16763+ func_append finalize_command " ${wl}-bind_at_load"
16764 ;;
16765 esac
16766 fi
16767@@ -7761,7 +8732,7 @@ EOF
16768 *)
16769 case " $compile_deplibs " in
16770 *" -L$path/$objdir "*)
16771- new_libs="$new_libs -L$path/$objdir" ;;
16772+ func_append new_libs " -L$path/$objdir" ;;
16773 esac
16774 ;;
16775 esac
16776@@ -7771,17 +8742,17 @@ EOF
16777 -L*)
16778 case " $new_libs " in
16779 *" $deplib "*) ;;
16780- *) new_libs="$new_libs $deplib" ;;
16781+ *) func_append new_libs " $deplib" ;;
16782 esac
16783 ;;
16784- *) new_libs="$new_libs $deplib" ;;
16785+ *) func_append new_libs " $deplib" ;;
16786 esac
16787 done
16788 compile_deplibs="$new_libs"
16789
16790
16791- compile_command="$compile_command $compile_deplibs"
16792- finalize_command="$finalize_command $finalize_deplibs"
16793+ func_append compile_command " $compile_deplibs"
16794+ func_append finalize_command " $finalize_deplibs"
16795
16796 if test -n "$rpath$xrpath"; then
16797 # If the user specified any rpath flags, then add them.
16798@@ -7789,7 +8760,7 @@ EOF
16799 # This is the magic to use -rpath.
16800 case "$finalize_rpath " in
16801 *" $libdir "*) ;;
16802- *) finalize_rpath="$finalize_rpath $libdir" ;;
16803+ *) func_append finalize_rpath " $libdir" ;;
16804 esac
16805 done
16806 fi
16807@@ -7808,18 +8779,18 @@ EOF
16808 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16809 ;;
16810 *)
16811- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16812+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16813 ;;
16814 esac
16815 fi
16816 else
16817- eval "flag=\"$hardcode_libdir_flag_spec\""
16818- rpath="$rpath $flag"
16819+ eval flag=\"$hardcode_libdir_flag_spec\"
16820+ func_append rpath " $flag"
16821 fi
16822 elif test -n "$runpath_var"; then
16823 case "$perm_rpath " in
16824 *" $libdir "*) ;;
16825- *) perm_rpath="$perm_rpath $libdir" ;;
16826+ *) func_append perm_rpath " $libdir" ;;
16827 esac
16828 fi
16829 case $host in
16830@@ -7828,12 +8799,12 @@ EOF
16831 case :$dllsearchpath: in
16832 *":$libdir:"*) ;;
16833 ::) dllsearchpath=$libdir;;
16834- *) dllsearchpath="$dllsearchpath:$libdir";;
16835+ *) func_append dllsearchpath ":$libdir";;
16836 esac
16837 case :$dllsearchpath: in
16838 *":$testbindir:"*) ;;
16839 ::) dllsearchpath=$testbindir;;
16840- *) dllsearchpath="$dllsearchpath:$testbindir";;
16841+ *) func_append dllsearchpath ":$testbindir";;
16842 esac
16843 ;;
16844 esac
16845@@ -7842,7 +8813,7 @@ EOF
16846 if test -n "$hardcode_libdir_separator" &&
16847 test -n "$hardcode_libdirs"; then
16848 libdir="$hardcode_libdirs"
16849- eval "rpath=\" $hardcode_libdir_flag_spec\""
16850+ eval rpath=\" $hardcode_libdir_flag_spec\"
16851 fi
16852 compile_rpath="$rpath"
16853
16854@@ -7859,18 +8830,18 @@ EOF
16855 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16856 ;;
16857 *)
16858- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16859+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16860 ;;
16861 esac
16862 fi
16863 else
16864- eval "flag=\"$hardcode_libdir_flag_spec\""
16865- rpath="$rpath $flag"
16866+ eval flag=\"$hardcode_libdir_flag_spec\"
16867+ func_append rpath " $flag"
16868 fi
16869 elif test -n "$runpath_var"; then
16870 case "$finalize_perm_rpath " in
16871 *" $libdir "*) ;;
16872- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16873+ *) func_append finalize_perm_rpath " $libdir" ;;
16874 esac
16875 fi
16876 done
16877@@ -7878,7 +8849,7 @@ EOF
16878 if test -n "$hardcode_libdir_separator" &&
16879 test -n "$hardcode_libdirs"; then
16880 libdir="$hardcode_libdirs"
16881- eval "rpath=\" $hardcode_libdir_flag_spec\""
16882+ eval rpath=\" $hardcode_libdir_flag_spec\"
16883 fi
16884 finalize_rpath="$rpath"
16885
16886@@ -7921,6 +8892,12 @@ EOF
16887 exit_status=0
16888 func_show_eval "$link_command" 'exit_status=$?'
16889
16890+ if test -n "$postlink_cmds"; then
16891+ func_to_tool_file "$output"
16892+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16893+ func_execute_cmds "$postlink_cmds" 'exit $?'
16894+ fi
16895+
16896 # Delete the generated files.
16897 if test -f "$output_objdir/${outputname}S.${objext}"; then
16898 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16899@@ -7943,7 +8920,7 @@ EOF
16900 # We should set the runpath_var.
16901 rpath=
16902 for dir in $perm_rpath; do
16903- rpath="$rpath$dir:"
16904+ func_append rpath "$dir:"
16905 done
16906 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16907 fi
16908@@ -7951,7 +8928,7 @@ EOF
16909 # We should set the runpath_var.
16910 rpath=
16911 for dir in $finalize_perm_rpath; do
16912- rpath="$rpath$dir:"
16913+ func_append rpath "$dir:"
16914 done
16915 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
16916 fi
16917@@ -7966,6 +8943,13 @@ EOF
16918 $opt_dry_run || $RM $output
16919 # Link the executable and exit
16920 func_show_eval "$link_command" 'exit $?'
16921+
16922+ if test -n "$postlink_cmds"; then
16923+ func_to_tool_file "$output"
16924+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16925+ func_execute_cmds "$postlink_cmds" 'exit $?'
16926+ fi
16927+
16928 exit $EXIT_SUCCESS
16929 fi
16930
16931@@ -7999,6 +8983,12 @@ EOF
16932
16933 func_show_eval "$link_command" 'exit $?'
16934
16935+ if test -n "$postlink_cmds"; then
16936+ func_to_tool_file "$output_objdir/$outputname"
16937+ 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'`
16938+ func_execute_cmds "$postlink_cmds" 'exit $?'
16939+ fi
16940+
16941 # Now create the wrapper script.
16942 func_verbose "creating $output"
16943
16944@@ -8096,7 +9086,7 @@ EOF
16945 else
16946 oldobjs="$old_deplibs $non_pic_objects"
16947 if test "$preload" = yes && test -f "$symfileobj"; then
16948- oldobjs="$oldobjs $symfileobj"
16949+ func_append oldobjs " $symfileobj"
16950 fi
16951 fi
16952 addlibs="$old_convenience"
16953@@ -8104,10 +9094,10 @@ EOF
16954
16955 if test -n "$addlibs"; then
16956 gentop="$output_objdir/${outputname}x"
16957- generated="$generated $gentop"
16958+ func_append generated " $gentop"
16959
16960 func_extract_archives $gentop $addlibs
16961- oldobjs="$oldobjs $func_extract_archives_result"
16962+ func_append oldobjs " $func_extract_archives_result"
16963 fi
16964
16965 # Do each command in the archive commands.
16966@@ -8118,10 +9108,10 @@ EOF
16967 # Add any objects from preloaded convenience libraries
16968 if test -n "$dlprefiles"; then
16969 gentop="$output_objdir/${outputname}x"
16970- generated="$generated $gentop"
16971+ func_append generated " $gentop"
16972
16973 func_extract_archives $gentop $dlprefiles
16974- oldobjs="$oldobjs $func_extract_archives_result"
16975+ func_append oldobjs " $func_extract_archives_result"
16976 fi
16977
16978 # POSIX demands no paths to be encoded in archives. We have
16979@@ -8139,7 +9129,7 @@ EOF
16980 else
16981 echo "copying selected object files to avoid basename conflicts..."
16982 gentop="$output_objdir/${outputname}x"
16983- generated="$generated $gentop"
16984+ func_append generated " $gentop"
16985 func_mkdir_p "$gentop"
16986 save_oldobjs=$oldobjs
16987 oldobjs=
16988@@ -8163,18 +9153,28 @@ EOF
16989 esac
16990 done
16991 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
16992- oldobjs="$oldobjs $gentop/$newobj"
16993+ func_append oldobjs " $gentop/$newobj"
16994 ;;
16995- *) oldobjs="$oldobjs $obj" ;;
16996+ *) func_append oldobjs " $obj" ;;
16997 esac
16998 done
16999 fi
17000- eval "cmds=\"$old_archive_cmds\""
17001+ eval cmds=\"$old_archive_cmds\"
17002
17003 func_len " $cmds"
17004 len=$func_len_result
17005 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
17006 cmds=$old_archive_cmds
17007+ elif test -n "$archiver_list_spec"; then
17008+ func_verbose "using command file archive linking..."
17009+ for obj in $oldobjs
17010+ do
17011+ func_to_tool_file "$obj"
17012+ $ECHO "$func_to_tool_file_result"
17013+ done > $output_objdir/$libname.libcmd
17014+ func_to_tool_file "$output_objdir/$libname.libcmd"
17015+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
17016+ cmds=$old_archive_cmds
17017 else
17018 # the command line is too long to link in one step, link in parts
17019 func_verbose "using piecewise archive linking..."
17020@@ -8189,7 +9189,7 @@ EOF
17021 do
17022 last_oldobj=$obj
17023 done
17024- eval "test_cmds=\"$old_archive_cmds\""
17025+ eval test_cmds=\"$old_archive_cmds\"
17026 func_len " $test_cmds"
17027 len0=$func_len_result
17028 len=$len0
17029@@ -8208,7 +9208,7 @@ EOF
17030 RANLIB=$save_RANLIB
17031 fi
17032 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
17033- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
17034+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17035 objlist=
17036 len=$len0
17037 fi
17038@@ -8216,9 +9216,9 @@ EOF
17039 RANLIB=$save_RANLIB
17040 oldobjs=$objlist
17041 if test "X$oldobjs" = "X" ; then
17042- eval "cmds=\"\$concat_cmds\""
17043+ eval cmds=\"\$concat_cmds\"
17044 else
17045- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17046+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17047 fi
17048 fi
17049 fi
17050@@ -8268,12 +9268,23 @@ EOF
17051 *.la)
17052 func_basename "$deplib"
17053 name="$func_basename_result"
17054- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17055+ func_resolve_sysroot "$deplib"
17056+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17057 test -z "$libdir" && \
17058 func_fatal_error "\`$deplib' is not a valid libtool archive"
17059- newdependency_libs="$newdependency_libs $libdir/$name"
17060+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17061+ ;;
17062+ -L*)
17063+ func_stripname -L '' "$deplib"
17064+ func_replace_sysroot "$func_stripname_result"
17065+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17066 ;;
17067- *) newdependency_libs="$newdependency_libs $deplib" ;;
17068+ -R*)
17069+ func_stripname -R '' "$deplib"
17070+ func_replace_sysroot "$func_stripname_result"
17071+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17072+ ;;
17073+ *) func_append newdependency_libs " $deplib" ;;
17074 esac
17075 done
17076 dependency_libs="$newdependency_libs"
17077@@ -8284,12 +9295,14 @@ EOF
17078 *.la)
17079 func_basename "$lib"
17080 name="$func_basename_result"
17081- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17082+ func_resolve_sysroot "$lib"
17083+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17084+
17085 test -z "$libdir" && \
17086 func_fatal_error "\`$lib' is not a valid libtool archive"
17087- newdlfiles="$newdlfiles $libdir/$name"
17088+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17089 ;;
17090- *) newdlfiles="$newdlfiles $lib" ;;
17091+ *) func_append newdlfiles " $lib" ;;
17092 esac
17093 done
17094 dlfiles="$newdlfiles"
17095@@ -8303,10 +9316,11 @@ EOF
17096 # the library:
17097 func_basename "$lib"
17098 name="$func_basename_result"
17099- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17100+ func_resolve_sysroot "$lib"
17101+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17102 test -z "$libdir" && \
17103 func_fatal_error "\`$lib' is not a valid libtool archive"
17104- newdlprefiles="$newdlprefiles $libdir/$name"
17105+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17106 ;;
17107 esac
17108 done
17109@@ -8318,7 +9332,7 @@ EOF
17110 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17111 *) abs=`pwd`"/$lib" ;;
17112 esac
17113- newdlfiles="$newdlfiles $abs"
17114+ func_append newdlfiles " $abs"
17115 done
17116 dlfiles="$newdlfiles"
17117 newdlprefiles=
17118@@ -8327,7 +9341,7 @@ EOF
17119 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17120 *) abs=`pwd`"/$lib" ;;
17121 esac
17122- newdlprefiles="$newdlprefiles $abs"
17123+ func_append newdlprefiles " $abs"
17124 done
17125 dlprefiles="$newdlprefiles"
17126 fi
17127@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17128 exit $EXIT_SUCCESS
17129 }
17130
17131-{ test "$mode" = link || test "$mode" = relink; } &&
17132+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17133 func_mode_link ${1+"$@"}
17134
17135
17136@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17137 for arg
17138 do
17139 case $arg in
17140- -f) RM="$RM $arg"; rmforce=yes ;;
17141- -*) RM="$RM $arg" ;;
17142- *) files="$files $arg" ;;
17143+ -f) func_append RM " $arg"; rmforce=yes ;;
17144+ -*) func_append RM " $arg" ;;
17145+ *) func_append files " $arg" ;;
17146 esac
17147 done
17148
17149@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17150
17151 rmdirs=
17152
17153- origobjdir="$objdir"
17154 for file in $files; do
17155 func_dirname "$file" "" "."
17156 dir="$func_dirname_result"
17157 if test "X$dir" = X.; then
17158- objdir="$origobjdir"
17159+ odir="$objdir"
17160 else
17161- objdir="$dir/$origobjdir"
17162+ odir="$dir/$objdir"
17163 fi
17164 func_basename "$file"
17165 name="$func_basename_result"
17166- test "$mode" = uninstall && objdir="$dir"
17167+ test "$opt_mode" = uninstall && odir="$dir"
17168
17169- # Remember objdir for removal later, being careful to avoid duplicates
17170- if test "$mode" = clean; then
17171+ # Remember odir for removal later, being careful to avoid duplicates
17172+ if test "$opt_mode" = clean; then
17173 case " $rmdirs " in
17174- *" $objdir "*) ;;
17175- *) rmdirs="$rmdirs $objdir" ;;
17176+ *" $odir "*) ;;
17177+ *) func_append rmdirs " $odir" ;;
17178 esac
17179 fi
17180
17181@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17182
17183 # Delete the libtool libraries and symlinks.
17184 for n in $library_names; do
17185- rmfiles="$rmfiles $objdir/$n"
17186+ func_append rmfiles " $odir/$n"
17187 done
17188- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17189+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17190
17191- case "$mode" in
17192+ case "$opt_mode" in
17193 clean)
17194- case " $library_names " in
17195- # " " in the beginning catches empty $dlname
17196+ case " $library_names " in
17197 *" $dlname "*) ;;
17198- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17199+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17200 esac
17201- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17202+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17203 ;;
17204 uninstall)
17205 if test -n "$library_names"; then
17206@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17207 # Add PIC object to the list of files to remove.
17208 if test -n "$pic_object" &&
17209 test "$pic_object" != none; then
17210- rmfiles="$rmfiles $dir/$pic_object"
17211+ func_append rmfiles " $dir/$pic_object"
17212 fi
17213
17214 # Add non-PIC object to the list of files to remove.
17215 if test -n "$non_pic_object" &&
17216 test "$non_pic_object" != none; then
17217- rmfiles="$rmfiles $dir/$non_pic_object"
17218+ func_append rmfiles " $dir/$non_pic_object"
17219 fi
17220 fi
17221 ;;
17222
17223 *)
17224- if test "$mode" = clean ; then
17225+ if test "$opt_mode" = clean ; then
17226 noexename=$name
17227 case $file in
17228 *.exe)
17229@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17230 noexename=$func_stripname_result
17231 # $file with .exe has already been added to rmfiles,
17232 # add $file without .exe
17233- rmfiles="$rmfiles $file"
17234+ func_append rmfiles " $file"
17235 ;;
17236 esac
17237 # Do a test to see if this is a libtool program.
17238@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17239 func_ltwrapper_scriptname "$file"
17240 relink_command=
17241 func_source $func_ltwrapper_scriptname_result
17242- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17243+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17244 else
17245 relink_command=
17246 func_source $dir/$noexename
17247@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17248
17249 # note $name still contains .exe if it was in $file originally
17250 # as does the version of $file that was added into $rmfiles
17251- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17252+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17253 if test "$fast_install" = yes && test -n "$relink_command"; then
17254- rmfiles="$rmfiles $objdir/lt-$name"
17255+ func_append rmfiles " $odir/lt-$name"
17256 fi
17257 if test "X$noexename" != "X$name" ; then
17258- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17259+ func_append rmfiles " $odir/lt-${noexename}.c"
17260 fi
17261 fi
17262 fi
17263@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17264 esac
17265 func_show_eval "$RM $rmfiles" 'exit_status=1'
17266 done
17267- objdir="$origobjdir"
17268
17269 # Try to remove the ${objdir}s in the directories where we deleted files
17270 for dir in $rmdirs; do
17271@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17272 exit $exit_status
17273 }
17274
17275-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17276+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17277 func_mode_uninstall ${1+"$@"}
17278
17279-test -z "$mode" && {
17280+test -z "$opt_mode" && {
17281 help="$generic_help"
17282 func_fatal_help "you must specify a MODE"
17283 }
17284
17285 test -z "$exec_cmd" && \
17286- func_fatal_help "invalid operation mode \`$mode'"
17287+ func_fatal_help "invalid operation mode \`$opt_mode'"
17288
17289 if test -n "$exec_cmd"; then
17290 eval exec "$exec_cmd"
17291diff --git a/ltoptions.m4 b/ltoptions.m4
17292index 5ef12ce..17cfd51 100644
17293--- a/ltoptions.m4
17294+++ b/ltoptions.m4
17295@@ -8,7 +8,7 @@
17296 # unlimited permission to copy and/or distribute it, with or without
17297 # modifications, as long as this notice is preserved.
17298
17299-# serial 6 ltoptions.m4
17300+# serial 7 ltoptions.m4
17301
17302 # This is to help aclocal find these macros, as it can't see m4_define.
17303 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17304diff --git a/ltversion.m4 b/ltversion.m4
17305index bf87f77..9c7b5d4 100644
17306--- a/ltversion.m4
17307+++ b/ltversion.m4
17308@@ -7,17 +7,17 @@
17309 # unlimited permission to copy and/or distribute it, with or without
17310 # modifications, as long as this notice is preserved.
17311
17312-# Generated from ltversion.in.
17313+# @configure_input@
17314
17315-# serial 3134 ltversion.m4
17316+# serial 3293 ltversion.m4
17317 # This file is part of GNU Libtool
17318
17319-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17320-m4_define([LT_PACKAGE_REVISION], [1.3134])
17321+m4_define([LT_PACKAGE_VERSION], [2.4])
17322+m4_define([LT_PACKAGE_REVISION], [1.3293])
17323
17324 AC_DEFUN([LTVERSION_VERSION],
17325-[macro_version='2.2.7a'
17326-macro_revision='1.3134'
17327+[macro_version='2.4'
17328+macro_revision='1.3293'
17329 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17330 _LT_DECL(, macro_revision, 0)
17331 ])
17332diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17333index bf92b5e..c573da9 100644
17334--- a/lt~obsolete.m4
17335+++ b/lt~obsolete.m4
17336@@ -7,7 +7,7 @@
17337 # unlimited permission to copy and/or distribute it, with or without
17338 # modifications, as long as this notice is preserved.
17339
17340-# serial 4 lt~obsolete.m4
17341+# serial 5 lt~obsolete.m4
17342
17343 # These exist entirely to fool aclocal when bootstrapping libtool.
17344 #
17345diff --git a/opcodes/configure b/opcodes/configure
17346index f615634..a340983 100755
17347--- a/opcodes/configure
17348+++ b/opcodes/configure
17349@@ -649,6 +649,9 @@ OTOOL
17350 LIPO
17351 NMEDIT
17352 DSYMUTIL
17353+MANIFEST_TOOL
17354+ac_ct_AR
17355+DLLTOOL
17356 OBJDUMP
17357 LN_S
17358 NM
17359@@ -762,6 +765,7 @@ enable_static
17360 with_pic
17361 enable_fast_install
17362 with_gnu_ld
17363+with_libtool_sysroot
17364 enable_libtool_lock
17365 enable_targets
17366 enable_werror
17367@@ -1422,6 +1426,8 @@ Optional Packages:
17368 --with-pic try to use only PIC/non-PIC objects [default=use
17369 both]
17370 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17371+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17372+ (or the compiler's sysroot if not specified).
17373
17374 Some influential environment variables:
17375 CC C compiler command
17376@@ -5114,8 +5120,8 @@ esac
17377
17378
17379
17380-macro_version='2.2.7a'
17381-macro_revision='1.3134'
17382+macro_version='2.4'
17383+macro_revision='1.3293'
17384
17385
17386
17387@@ -5155,7 +5161,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17389 $as_echo_n "checking how to print strings... " >&6; }
17390 # Test print first, because it will be a builtin if present.
17391-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17392+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17393 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17394 ECHO='print -r --'
17395 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17396@@ -5841,8 +5847,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17397 # Try some XSI features
17398 xsi_shell=no
17399 ( _lt_dummy="a/b/c"
17400- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17401- = c,a/b,, \
17402+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17403+ = c,a/b,b/c, \
17404 && eval 'test $(( 1 + 1 )) -eq 2 \
17405 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17406 && xsi_shell=yes
17407@@ -5891,6 +5897,80 @@ esac
17408
17409
17410
17411+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17412+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17413+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
17414+ $as_echo_n "(cached) " >&6
17415+else
17416+ case $host in
17417+ *-*-mingw* )
17418+ case $build in
17419+ *-*-mingw* ) # actually msys
17420+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17421+ ;;
17422+ *-*-cygwin* )
17423+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17424+ ;;
17425+ * ) # otherwise, assume *nix
17426+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17427+ ;;
17428+ esac
17429+ ;;
17430+ *-*-cygwin* )
17431+ case $build in
17432+ *-*-mingw* ) # actually msys
17433+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17434+ ;;
17435+ *-*-cygwin* )
17436+ lt_cv_to_host_file_cmd=func_convert_file_noop
17437+ ;;
17438+ * ) # otherwise, assume *nix
17439+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17440+ ;;
17441+ esac
17442+ ;;
17443+ * ) # unhandled hosts (and "normal" native builds)
17444+ lt_cv_to_host_file_cmd=func_convert_file_noop
17445+ ;;
17446+esac
17447+
17448+fi
17449+
17450+to_host_file_cmd=$lt_cv_to_host_file_cmd
17451+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17452+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17453+
17454+
17455+
17456+
17457+
17458+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17459+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17460+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
17461+ $as_echo_n "(cached) " >&6
17462+else
17463+ #assume ordinary cross tools, or native build.
17464+lt_cv_to_tool_file_cmd=func_convert_file_noop
17465+case $host in
17466+ *-*-mingw* )
17467+ case $build in
17468+ *-*-mingw* ) # actually msys
17469+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17470+ ;;
17471+ esac
17472+ ;;
17473+esac
17474+
17475+fi
17476+
17477+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17478+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17479+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17480+
17481+
17482+
17483+
17484+
17485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17486 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17487 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17488@@ -5907,6 +5987,11 @@ case $reload_flag in
17489 esac
17490 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17491 case $host_os in
17492+ cygwin* | mingw* | pw32* | cegcc*)
17493+ if test "$GCC" != yes; then
17494+ reload_cmds=false
17495+ fi
17496+ ;;
17497 darwin*)
17498 if test "$GCC" = yes; then
17499 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17500@@ -6075,7 +6160,8 @@ mingw* | pw32*)
17501 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17502 lt_cv_file_magic_cmd='func_win32_libid'
17503 else
17504- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17505+ # Keep this pattern in sync with the one in func_win32_libid.
17506+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17507 lt_cv_file_magic_cmd='$OBJDUMP -f'
17508 fi
17509 ;;
17510@@ -6229,6 +6315,21 @@ esac
17511 fi
17512 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17513 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17514+
17515+file_magic_glob=
17516+want_nocaseglob=no
17517+if test "$build" = "$host"; then
17518+ case $host_os in
17519+ mingw* | pw32*)
17520+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17521+ want_nocaseglob=yes
17522+ else
17523+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17524+ fi
17525+ ;;
17526+ esac
17527+fi
17528+
17529 file_magic_cmd=$lt_cv_file_magic_cmd
17530 deplibs_check_method=$lt_cv_deplibs_check_method
17531 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17532@@ -6244,9 +6345,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17533
17534
17535
17536+
17537+
17538+
17539+
17540+
17541+
17542+
17543+
17544+
17545+
17546 if test -n "$ac_tool_prefix"; then
17547- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17548-set dummy ${ac_tool_prefix}ar; ac_word=$2
17549+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17550+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17551+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17552+$as_echo_n "checking for $ac_word... " >&6; }
17553+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
17554+ $as_echo_n "(cached) " >&6
17555+else
17556+ if test -n "$DLLTOOL"; then
17557+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17558+else
17559+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17560+for as_dir in $PATH
17561+do
17562+ IFS=$as_save_IFS
17563+ test -z "$as_dir" && as_dir=.
17564+ for ac_exec_ext in '' $ac_executable_extensions; do
17565+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17566+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17567+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17568+ break 2
17569+ fi
17570+done
17571+ done
17572+IFS=$as_save_IFS
17573+
17574+fi
17575+fi
17576+DLLTOOL=$ac_cv_prog_DLLTOOL
17577+if test -n "$DLLTOOL"; then
17578+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17579+$as_echo "$DLLTOOL" >&6; }
17580+else
17581+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17582+$as_echo "no" >&6; }
17583+fi
17584+
17585+
17586+fi
17587+if test -z "$ac_cv_prog_DLLTOOL"; then
17588+ ac_ct_DLLTOOL=$DLLTOOL
17589+ # Extract the first word of "dlltool", so it can be a program name with args.
17590+set dummy dlltool; ac_word=$2
17591+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17592+$as_echo_n "checking for $ac_word... " >&6; }
17593+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17594+ $as_echo_n "(cached) " >&6
17595+else
17596+ if test -n "$ac_ct_DLLTOOL"; then
17597+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17598+else
17599+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17600+for as_dir in $PATH
17601+do
17602+ IFS=$as_save_IFS
17603+ test -z "$as_dir" && as_dir=.
17604+ for ac_exec_ext in '' $ac_executable_extensions; do
17605+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17606+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17607+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17608+ break 2
17609+ fi
17610+done
17611+ done
17612+IFS=$as_save_IFS
17613+
17614+fi
17615+fi
17616+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17617+if test -n "$ac_ct_DLLTOOL"; then
17618+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17619+$as_echo "$ac_ct_DLLTOOL" >&6; }
17620+else
17621+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17622+$as_echo "no" >&6; }
17623+fi
17624+
17625+ if test "x$ac_ct_DLLTOOL" = x; then
17626+ DLLTOOL="false"
17627+ else
17628+ case $cross_compiling:$ac_tool_warned in
17629+yes:)
17630+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17631+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17632+ac_tool_warned=yes ;;
17633+esac
17634+ DLLTOOL=$ac_ct_DLLTOOL
17635+ fi
17636+else
17637+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17638+fi
17639+
17640+test -z "$DLLTOOL" && DLLTOOL=dlltool
17641+
17642+
17643+
17644+
17645+
17646+
17647+
17648+
17649+
17650+
17651+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17652+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17653+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17654+ $as_echo_n "(cached) " >&6
17655+else
17656+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17657+
17658+case $host_os in
17659+cygwin* | mingw* | pw32* | cegcc*)
17660+ # two different shell functions defined in ltmain.sh
17661+ # decide which to use based on capabilities of $DLLTOOL
17662+ case `$DLLTOOL --help 2>&1` in
17663+ *--identify-strict*)
17664+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17665+ ;;
17666+ *)
17667+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17668+ ;;
17669+ esac
17670+ ;;
17671+*)
17672+ # fallback: assume linklib IS sharedlib
17673+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17674+ ;;
17675+esac
17676+
17677+fi
17678+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17679+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17680+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17681+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17682+
17683+
17684+
17685+
17686+
17687+
17688+
17689+if test -n "$ac_tool_prefix"; then
17690+ for ac_prog in ar
17691+ do
17692+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17693+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17695 $as_echo_n "checking for $ac_word... " >&6; }
17696 if test "${ac_cv_prog_AR+set}" = set; then :
17697@@ -6262,7 +6516,7 @@ do
17698 test -z "$as_dir" && as_dir=.
17699 for ac_exec_ext in '' $ac_executable_extensions; do
17700 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17701- ac_cv_prog_AR="${ac_tool_prefix}ar"
17702+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17703 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17704 break 2
17705 fi
17706@@ -6282,11 +6536,15 @@ $as_echo "no" >&6; }
17707 fi
17708
17709
17710+ test -n "$AR" && break
17711+ done
17712 fi
17713-if test -z "$ac_cv_prog_AR"; then
17714+if test -z "$AR"; then
17715 ac_ct_AR=$AR
17716- # Extract the first word of "ar", so it can be a program name with args.
17717-set dummy ar; ac_word=$2
17718+ for ac_prog in ar
17719+do
17720+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17721+set dummy $ac_prog; ac_word=$2
17722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17723 $as_echo_n "checking for $ac_word... " >&6; }
17724 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17725@@ -6302,7 +6560,7 @@ do
17726 test -z "$as_dir" && as_dir=.
17727 for ac_exec_ext in '' $ac_executable_extensions; do
17728 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17729- ac_cv_prog_ac_ct_AR="ar"
17730+ ac_cv_prog_ac_ct_AR="$ac_prog"
17731 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17732 break 2
17733 fi
17734@@ -6321,6 +6579,10 @@ else
17735 $as_echo "no" >&6; }
17736 fi
17737
17738+
17739+ test -n "$ac_ct_AR" && break
17740+done
17741+
17742 if test "x$ac_ct_AR" = x; then
17743 AR="false"
17744 else
17745@@ -6332,16 +6594,72 @@ ac_tool_warned=yes ;;
17746 esac
17747 AR=$ac_ct_AR
17748 fi
17749-else
17750- AR="$ac_cv_prog_AR"
17751 fi
17752
17753-test -z "$AR" && AR=ar
17754-test -z "$AR_FLAGS" && AR_FLAGS=cru
17755+: ${AR=ar}
17756+: ${AR_FLAGS=cru}
17757+
17758+
17759+
17760+
17761+
17762+
17763+
17764+
17765+
17766+
17767+
17768+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17769+$as_echo_n "checking for archiver @FILE support... " >&6; }
17770+if test "${lt_cv_ar_at_file+set}" = set; then :
17771+ $as_echo_n "(cached) " >&6
17772+else
17773+ lt_cv_ar_at_file=no
17774+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17775+/* end confdefs.h. */
17776+
17777+int
17778+main ()
17779+{
17780
17781+ ;
17782+ return 0;
17783+}
17784+_ACEOF
17785+if ac_fn_c_try_compile "$LINENO"; then :
17786+ echo conftest.$ac_objext > conftest.lst
17787+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17788+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17789+ (eval $lt_ar_try) 2>&5
17790+ ac_status=$?
17791+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17792+ test $ac_status = 0; }
17793+ if test "$ac_status" -eq 0; then
17794+ # Ensure the archiver fails upon bogus file names.
17795+ rm -f conftest.$ac_objext libconftest.a
17796+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17797+ (eval $lt_ar_try) 2>&5
17798+ ac_status=$?
17799+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17800+ test $ac_status = 0; }
17801+ if test "$ac_status" -ne 0; then
17802+ lt_cv_ar_at_file=@
17803+ fi
17804+ fi
17805+ rm -f conftest.* libconftest.a
17806
17807+fi
17808+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17809
17810+fi
17811+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17812+$as_echo "$lt_cv_ar_at_file" >&6; }
17813
17814+if test "x$lt_cv_ar_at_file" = xno; then
17815+ archiver_list_spec=
17816+else
17817+ archiver_list_spec=$lt_cv_ar_at_file
17818+fi
17819
17820
17821
17822@@ -6683,8 +7001,8 @@ esac
17823 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17824
17825 # Transform an extracted symbol line into symbol name and symbol address
17826-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17827-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'"
17828+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17829+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'"
17830
17831 # Handle CRLF in mingw tool chain
17832 opt_cr=
17833@@ -6720,6 +7038,7 @@ for ac_symprfx in "" "_"; do
17834 else
17835 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17836 fi
17837+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17838
17839 # Check to see that the pipe works correctly.
17840 pipe_works=no
17841@@ -6761,6 +7080,18 @@ _LT_EOF
17842 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17843 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17844 cat <<_LT_EOF > conftest.$ac_ext
17845+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17846+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17847+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17848+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17849+# define LT_DLSYM_CONST
17850+#elif defined(__osf__)
17851+/* This system does not cope well with relocations in const data. */
17852+# define LT_DLSYM_CONST
17853+#else
17854+# define LT_DLSYM_CONST const
17855+#endif
17856+
17857 #ifdef __cplusplus
17858 extern "C" {
17859 #endif
17860@@ -6772,7 +7103,7 @@ _LT_EOF
17861 cat <<_LT_EOF >> conftest.$ac_ext
17862
17863 /* The mapping between symbol names and symbols. */
17864-const struct {
17865+LT_DLSYM_CONST struct {
17866 const char *name;
17867 void *address;
17868 }
17869@@ -6798,8 +7129,8 @@ static const void *lt_preloaded_setup() {
17870 _LT_EOF
17871 # Now try linking the two files.
17872 mv conftest.$ac_objext conftstm.$ac_objext
17873- lt_save_LIBS="$LIBS"
17874- lt_save_CFLAGS="$CFLAGS"
17875+ lt_globsym_save_LIBS=$LIBS
17876+ lt_globsym_save_CFLAGS=$CFLAGS
17877 LIBS="conftstm.$ac_objext"
17878 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17879 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17880@@ -6809,8 +7140,8 @@ _LT_EOF
17881 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17882 pipe_works=yes
17883 fi
17884- LIBS="$lt_save_LIBS"
17885- CFLAGS="$lt_save_CFLAGS"
17886+ LIBS=$lt_globsym_save_LIBS
17887+ CFLAGS=$lt_globsym_save_CFLAGS
17888 else
17889 echo "cannot find nm_test_func in $nlist" >&5
17890 fi
17891@@ -6847,6 +7178,16 @@ else
17892 $as_echo "ok" >&6; }
17893 fi
17894
17895+# Response file support.
17896+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17897+ nm_file_list_spec='@'
17898+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17899+ nm_file_list_spec='@'
17900+fi
17901+
17902+
17903+
17904+
17905
17906
17907
17908@@ -6868,6 +7209,45 @@ fi
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+
17950+
17951 # Check whether --enable-libtool-lock was given.
17952 if test "${enable_libtool_lock+set}" = set; then :
17953 enableval=$enable_libtool_lock;
17954@@ -7074,6 +7454,123 @@ esac
17955
17956 need_locks="$enable_libtool_lock"
17957
17958+if test -n "$ac_tool_prefix"; then
17959+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17960+set dummy ${ac_tool_prefix}mt; ac_word=$2
17961+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17962+$as_echo_n "checking for $ac_word... " >&6; }
17963+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17964+ $as_echo_n "(cached) " >&6
17965+else
17966+ if test -n "$MANIFEST_TOOL"; then
17967+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17968+else
17969+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17970+for as_dir in $PATH
17971+do
17972+ IFS=$as_save_IFS
17973+ test -z "$as_dir" && as_dir=.
17974+ for ac_exec_ext in '' $ac_executable_extensions; do
17975+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17976+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17977+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17978+ break 2
17979+ fi
17980+done
17981+ done
17982+IFS=$as_save_IFS
17983+
17984+fi
17985+fi
17986+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17987+if test -n "$MANIFEST_TOOL"; then
17988+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17989+$as_echo "$MANIFEST_TOOL" >&6; }
17990+else
17991+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17992+$as_echo "no" >&6; }
17993+fi
17994+
17995+
17996+fi
17997+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17998+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17999+ # Extract the first word of "mt", so it can be a program name with args.
18000+set dummy mt; ac_word=$2
18001+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18002+$as_echo_n "checking for $ac_word... " >&6; }
18003+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
18004+ $as_echo_n "(cached) " >&6
18005+else
18006+ if test -n "$ac_ct_MANIFEST_TOOL"; then
18007+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
18008+else
18009+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18010+for as_dir in $PATH
18011+do
18012+ IFS=$as_save_IFS
18013+ test -z "$as_dir" && as_dir=.
18014+ for ac_exec_ext in '' $ac_executable_extensions; do
18015+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18016+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
18017+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18018+ break 2
18019+ fi
18020+done
18021+ done
18022+IFS=$as_save_IFS
18023+
18024+fi
18025+fi
18026+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18027+if test -n "$ac_ct_MANIFEST_TOOL"; then
18028+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18029+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18030+else
18031+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18032+$as_echo "no" >&6; }
18033+fi
18034+
18035+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18036+ MANIFEST_TOOL=":"
18037+ else
18038+ case $cross_compiling:$ac_tool_warned in
18039+yes:)
18040+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18041+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18042+ac_tool_warned=yes ;;
18043+esac
18044+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18045+ fi
18046+else
18047+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18048+fi
18049+
18050+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18051+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18052+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18053+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
18054+ $as_echo_n "(cached) " >&6
18055+else
18056+ lt_cv_path_mainfest_tool=no
18057+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18058+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18059+ cat conftest.err >&5
18060+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18061+ lt_cv_path_mainfest_tool=yes
18062+ fi
18063+ rm -f conftest*
18064+fi
18065+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18066+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18067+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18068+ MANIFEST_TOOL=:
18069+fi
18070+
18071+
18072+
18073+
18074+
18075
18076 case $host_os in
18077 rhapsody* | darwin*)
18078@@ -7637,6 +8134,8 @@ _LT_EOF
18079 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18080 echo "$AR cru libconftest.a conftest.o" >&5
18081 $AR cru libconftest.a conftest.o 2>&5
18082+ echo "$RANLIB libconftest.a" >&5
18083+ $RANLIB libconftest.a 2>&5
18084 cat > conftest.c << _LT_EOF
18085 int main() { return 0;}
18086 _LT_EOF
18087@@ -7802,7 +8301,8 @@ fi
18088 LIBTOOL_DEPS="$ltmain"
18089
18090 # Always use our own libtool.
18091-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18092+LIBTOOL='$(SHELL) $(top_builddir)'
18093+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18094
18095
18096
18097@@ -7891,7 +8391,7 @@ aix3*)
18098 esac
18099
18100 # Global variables:
18101-ofile=libtool
18102+ofile=${host_alias}-libtool
18103 can_build_shared=yes
18104
18105 # All known linkers require a `.a' archive for static linking (except MSVC,
18106@@ -8189,8 +8689,6 @@ fi
18107 lt_prog_compiler_pic=
18108 lt_prog_compiler_static=
18109
18110-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18111-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18112
18113 if test "$GCC" = yes; then
18114 lt_prog_compiler_wl='-Wl,'
18115@@ -8356,6 +8854,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18116 lt_prog_compiler_pic='--shared'
18117 lt_prog_compiler_static='--static'
18118 ;;
18119+ nagfor*)
18120+ # NAG Fortran compiler
18121+ lt_prog_compiler_wl='-Wl,-Wl,,'
18122+ lt_prog_compiler_pic='-PIC'
18123+ lt_prog_compiler_static='-Bstatic'
18124+ ;;
18125 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18126 # Portland Group compilers (*not* the Pentium gcc compiler,
18127 # which looks to be a dead project)
18128@@ -8418,7 +8922,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18129 lt_prog_compiler_pic='-KPIC'
18130 lt_prog_compiler_static='-Bstatic'
18131 case $cc_basename in
18132- f77* | f90* | f95*)
18133+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18134 lt_prog_compiler_wl='-Qoption ld ';;
18135 *)
18136 lt_prog_compiler_wl='-Wl,';;
18137@@ -8475,13 +8979,17 @@ case $host_os in
18138 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18139 ;;
18140 esac
18141-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18142-$as_echo "$lt_prog_compiler_pic" >&6; }
18143-
18144-
18145-
18146-
18147
18148+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18149+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18150+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
18151+ $as_echo_n "(cached) " >&6
18152+else
18153+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18154+fi
18155+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18156+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18157+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18158
18159 #
18160 # Check to make sure the PIC flag actually works.
18161@@ -8542,6 +9050,11 @@ fi
18162
18163
18164
18165+
18166+
18167+
18168+
18169+
18170 #
18171 # Check to make sure the static flag actually works.
18172 #
18173@@ -8892,7 +9405,8 @@ _LT_EOF
18174 allow_undefined_flag=unsupported
18175 always_export_symbols=no
18176 enable_shared_with_static_runtimes=yes
18177- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18178+ 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'
18179+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18180
18181 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18182 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18183@@ -8991,12 +9505,12 @@ _LT_EOF
18184 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18185 hardcode_libdir_flag_spec=
18186 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18187- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18188+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18189 if test "x$supports_anon_versioning" = xyes; then
18190 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18191 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18192 echo "local: *; };" >> $output_objdir/$libname.ver~
18193- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18194+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18195 fi
18196 ;;
18197 esac
18198@@ -9010,8 +9524,8 @@ _LT_EOF
18199 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18200 wlarc=
18201 else
18202- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18203- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18204+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18205+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18206 fi
18207 ;;
18208
18209@@ -9029,8 +9543,8 @@ _LT_EOF
18210
18211 _LT_EOF
18212 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18213- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18214- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18215+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18216+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18217 else
18218 ld_shlibs=no
18219 fi
18220@@ -9076,8 +9590,8 @@ _LT_EOF
18221
18222 *)
18223 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18224- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18225- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18226+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18227+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18228 else
18229 ld_shlibs=no
18230 fi
18231@@ -9207,7 +9721,13 @@ _LT_EOF
18232 allow_undefined_flag='-berok'
18233 # Determine the default libpath from the value encoded in an
18234 # empty executable.
18235- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18236+ if test "${lt_cv_aix_libpath+set}" = set; then
18237+ aix_libpath=$lt_cv_aix_libpath
18238+else
18239+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18240+ $as_echo_n "(cached) " >&6
18241+else
18242+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18243 /* end confdefs.h. */
18244
18245 int
18246@@ -9220,22 +9740,29 @@ main ()
18247 _ACEOF
18248 if ac_fn_c_try_link "$LINENO"; then :
18249
18250-lt_aix_libpath_sed='
18251- /Import File Strings/,/^$/ {
18252- /^0/ {
18253- s/^0 *\(.*\)$/\1/
18254- p
18255- }
18256- }'
18257-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18258-# Check for a 64-bit object if we didn't find anything.
18259-if test -z "$aix_libpath"; then
18260- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18261-fi
18262+ lt_aix_libpath_sed='
18263+ /Import File Strings/,/^$/ {
18264+ /^0/ {
18265+ s/^0 *\([^ ]*\) *$/\1/
18266+ p
18267+ }
18268+ }'
18269+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18270+ # Check for a 64-bit object if we didn't find anything.
18271+ if test -z "$lt_cv_aix_libpath_"; then
18272+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18273+ fi
18274 fi
18275 rm -f core conftest.err conftest.$ac_objext \
18276 conftest$ac_exeext conftest.$ac_ext
18277-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18278+ if test -z "$lt_cv_aix_libpath_"; then
18279+ lt_cv_aix_libpath_="/usr/lib:/lib"
18280+ fi
18281+
18282+fi
18283+
18284+ aix_libpath=$lt_cv_aix_libpath_
18285+fi
18286
18287 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18288 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"
18289@@ -9247,7 +9774,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18290 else
18291 # Determine the default libpath from the value encoded in an
18292 # empty executable.
18293- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18294+ if test "${lt_cv_aix_libpath+set}" = set; then
18295+ aix_libpath=$lt_cv_aix_libpath
18296+else
18297+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18298+ $as_echo_n "(cached) " >&6
18299+else
18300+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18301 /* end confdefs.h. */
18302
18303 int
18304@@ -9260,22 +9793,29 @@ main ()
18305 _ACEOF
18306 if ac_fn_c_try_link "$LINENO"; then :
18307
18308-lt_aix_libpath_sed='
18309- /Import File Strings/,/^$/ {
18310- /^0/ {
18311- s/^0 *\(.*\)$/\1/
18312- p
18313- }
18314- }'
18315-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18316-# Check for a 64-bit object if we didn't find anything.
18317-if test -z "$aix_libpath"; then
18318- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18319-fi
18320+ lt_aix_libpath_sed='
18321+ /Import File Strings/,/^$/ {
18322+ /^0/ {
18323+ s/^0 *\([^ ]*\) *$/\1/
18324+ p
18325+ }
18326+ }'
18327+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18328+ # Check for a 64-bit object if we didn't find anything.
18329+ if test -z "$lt_cv_aix_libpath_"; then
18330+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18331+ fi
18332 fi
18333 rm -f core conftest.err conftest.$ac_objext \
18334 conftest$ac_exeext conftest.$ac_ext
18335-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18336+ if test -z "$lt_cv_aix_libpath_"; then
18337+ lt_cv_aix_libpath_="/usr/lib:/lib"
18338+ fi
18339+
18340+fi
18341+
18342+ aix_libpath=$lt_cv_aix_libpath_
18343+fi
18344
18345 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18346 # Warning - without using the other run time loading flags,
18347@@ -9320,20 +9860,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18348 # Microsoft Visual C++.
18349 # hardcode_libdir_flag_spec is actually meaningless, as there is
18350 # no search path for DLLs.
18351- hardcode_libdir_flag_spec=' '
18352- allow_undefined_flag=unsupported
18353- # Tell ltmain to make .lib files, not .a files.
18354- libext=lib
18355- # Tell ltmain to make .dll files, not .so files.
18356- shrext_cmds=".dll"
18357- # FIXME: Setting linknames here is a bad hack.
18358- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18359- # The linker will automatically build a .lib file if we build a DLL.
18360- old_archive_from_new_cmds='true'
18361- # FIXME: Should let the user specify the lib program.
18362- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18363- fix_srcfile_path='`cygpath -w "$srcfile"`'
18364- enable_shared_with_static_runtimes=yes
18365+ case $cc_basename in
18366+ cl*)
18367+ # Native MSVC
18368+ hardcode_libdir_flag_spec=' '
18369+ allow_undefined_flag=unsupported
18370+ always_export_symbols=yes
18371+ file_list_spec='@'
18372+ # Tell ltmain to make .lib files, not .a files.
18373+ libext=lib
18374+ # Tell ltmain to make .dll files, not .so files.
18375+ shrext_cmds=".dll"
18376+ # FIXME: Setting linknames here is a bad hack.
18377+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18378+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18379+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18380+ else
18381+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18382+ fi~
18383+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18384+ linknames='
18385+ # The linker will not automatically build a static lib if we build a DLL.
18386+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18387+ enable_shared_with_static_runtimes=yes
18388+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18389+ # Don't use ranlib
18390+ old_postinstall_cmds='chmod 644 $oldlib'
18391+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18392+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18393+ case $lt_outputfile in
18394+ *.exe|*.EXE) ;;
18395+ *)
18396+ lt_outputfile="$lt_outputfile.exe"
18397+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18398+ ;;
18399+ esac~
18400+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18401+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18402+ $RM "$lt_outputfile.manifest";
18403+ fi'
18404+ ;;
18405+ *)
18406+ # Assume MSVC wrapper
18407+ hardcode_libdir_flag_spec=' '
18408+ allow_undefined_flag=unsupported
18409+ # Tell ltmain to make .lib files, not .a files.
18410+ libext=lib
18411+ # Tell ltmain to make .dll files, not .so files.
18412+ shrext_cmds=".dll"
18413+ # FIXME: Setting linknames here is a bad hack.
18414+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18415+ # The linker will automatically build a .lib file if we build a DLL.
18416+ old_archive_from_new_cmds='true'
18417+ # FIXME: Should let the user specify the lib program.
18418+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18419+ enable_shared_with_static_runtimes=yes
18420+ ;;
18421+ esac
18422 ;;
18423
18424 darwin* | rhapsody*)
18425@@ -9394,7 +9977,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18426
18427 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18428 freebsd* | dragonfly*)
18429- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18430+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18431 hardcode_libdir_flag_spec='-R$libdir'
18432 hardcode_direct=yes
18433 hardcode_shlibpath_var=no
18434@@ -9402,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18435
18436 hpux9*)
18437 if test "$GCC" = yes; then
18438- 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'
18439+ 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'
18440 else
18441 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'
18442 fi
18443@@ -9418,7 +10001,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18444
18445 hpux10*)
18446 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18447- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18448+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18449 else
18450 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18451 fi
18452@@ -9442,10 +10025,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18453 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18454 ;;
18455 ia64*)
18456- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18457+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18458 ;;
18459 *)
18460- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18461+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18462 ;;
18463 esac
18464 else
18465@@ -9524,23 +10107,36 @@ fi
18466
18467 irix5* | irix6* | nonstopux*)
18468 if test "$GCC" = yes; then
18469- 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'
18470+ 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'
18471 # Try to use the -exported_symbol ld option, if it does not
18472 # work, assume that -exports_file does not work either and
18473 # implicitly export all symbols.
18474- save_LDFLAGS="$LDFLAGS"
18475- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18476- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18477+ # This should be the same for all languages, so no per-tag cache variable.
18478+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18479+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18480+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
18481+ $as_echo_n "(cached) " >&6
18482+else
18483+ save_LDFLAGS="$LDFLAGS"
18484+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18485+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18486 /* end confdefs.h. */
18487-int foo(void) {}
18488+int foo (void) { return 0; }
18489 _ACEOF
18490 if ac_fn_c_try_link "$LINENO"; then :
18491- 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'
18492-
18493+ lt_cv_irix_exported_symbol=yes
18494+else
18495+ lt_cv_irix_exported_symbol=no
18496 fi
18497 rm -f core conftest.err conftest.$ac_objext \
18498 conftest$ac_exeext conftest.$ac_ext
18499- LDFLAGS="$save_LDFLAGS"
18500+ LDFLAGS="$save_LDFLAGS"
18501+fi
18502+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18503+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18504+ if test "$lt_cv_irix_exported_symbol" = yes; then
18505+ 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'
18506+ fi
18507 else
18508 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'
18509 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'
18510@@ -9625,7 +10221,7 @@ rm -f core conftest.err conftest.$ac_objext \
18511 osf4* | osf5*) # as osf3* with the addition of -msym flag
18512 if test "$GCC" = yes; then
18513 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18514- 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'
18515+ 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'
18516 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18517 else
18518 allow_undefined_flag=' -expect_unresolved \*'
18519@@ -9644,9 +10240,9 @@ rm -f core conftest.err conftest.$ac_objext \
18520 no_undefined_flag=' -z defs'
18521 if test "$GCC" = yes; then
18522 wlarc='${wl}'
18523- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18524+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18525 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18526- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18527+ $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'
18528 else
18529 case `$CC -V 2>&1` in
18530 *"Compilers 5.0"*)
18531@@ -10222,8 +10818,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18532 need_version=no
18533 need_lib_prefix=no
18534
18535- case $GCC,$host_os in
18536- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18537+ case $GCC,$cc_basename in
18538+ yes,*)
18539+ # gcc
18540 library_names_spec='$libname.dll.a'
18541 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18542 postinstall_cmds='base_file=`basename \${file}`~
18543@@ -10256,13 +10853,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18544 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18545 ;;
18546 esac
18547+ dynamic_linker='Win32 ld.exe'
18548+ ;;
18549+
18550+ *,cl*)
18551+ # Native MSVC
18552+ libname_spec='$name'
18553+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18554+ library_names_spec='${libname}.dll.lib'
18555+
18556+ case $build_os in
18557+ mingw*)
18558+ sys_lib_search_path_spec=
18559+ lt_save_ifs=$IFS
18560+ IFS=';'
18561+ for lt_path in $LIB
18562+ do
18563+ IFS=$lt_save_ifs
18564+ # Let DOS variable expansion print the short 8.3 style file name.
18565+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18566+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18567+ done
18568+ IFS=$lt_save_ifs
18569+ # Convert to MSYS style.
18570+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18571+ ;;
18572+ cygwin*)
18573+ # Convert to unix form, then to dos form, then back to unix form
18574+ # but this time dos style (no spaces!) so that the unix form looks
18575+ # like /cygdrive/c/PROGRA~1:/cygdr...
18576+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18577+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18578+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18579+ ;;
18580+ *)
18581+ sys_lib_search_path_spec="$LIB"
18582+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18583+ # It is most probably a Windows format PATH.
18584+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18585+ else
18586+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18587+ fi
18588+ # FIXME: find the short name or the path components, as spaces are
18589+ # common. (e.g. "Program Files" -> "PROGRA~1")
18590+ ;;
18591+ esac
18592+
18593+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18594+ postinstall_cmds='base_file=`basename \${file}`~
18595+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18596+ dldir=$destdir/`dirname \$dlpath`~
18597+ test -d \$dldir || mkdir -p \$dldir~
18598+ $install_prog $dir/$dlname \$dldir/$dlname'
18599+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18600+ dlpath=$dir/\$dldll~
18601+ $RM \$dlpath'
18602+ shlibpath_overrides_runpath=yes
18603+ dynamic_linker='Win32 link.exe'
18604 ;;
18605
18606 *)
18607+ # Assume MSVC wrapper
18608 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18609+ dynamic_linker='Win32 ld.exe'
18610 ;;
18611 esac
18612- dynamic_linker='Win32 ld.exe'
18613 # FIXME: first we should search . and the directory the executable is in
18614 shlibpath_var=PATH
18615 ;;
18616@@ -10354,7 +11009,7 @@ haiku*)
18617 soname_spec='${libname}${release}${shared_ext}$major'
18618 shlibpath_var=LIBRARY_PATH
18619 shlibpath_overrides_runpath=yes
18620- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18621+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18622 hardcode_into_libs=yes
18623 ;;
18624
18625@@ -11194,10 +11849,10 @@ else
18626 /* When -fvisbility=hidden is used, assume the code has been annotated
18627 correspondingly for the symbols needed. */
18628 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18629-void fnord () __attribute__((visibility("default")));
18630+int fnord () __attribute__((visibility("default")));
18631 #endif
18632
18633-void fnord () { int i=42; }
18634+int fnord () { return 42; }
18635 int main ()
18636 {
18637 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18638@@ -11300,10 +11955,10 @@ else
18639 /* When -fvisbility=hidden is used, assume the code has been annotated
18640 correspondingly for the symbols needed. */
18641 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18642-void fnord () __attribute__((visibility("default")));
18643+int fnord () __attribute__((visibility("default")));
18644 #endif
18645
18646-void fnord () { int i=42; }
18647+int fnord () { return 42; }
18648 int main ()
18649 {
18650 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18651@@ -12499,7 +13154,7 @@ if test "$enable_shared" = "yes"; then
18652 # since libbfd may not pull in the entirety of libiberty.
18653 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18654 if test -n "$x"; then
18655- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18656+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18657 fi
18658
18659 case "${host}" in
18660@@ -13473,13 +14128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18661 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18662 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18663 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18664+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18665+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18666 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18667 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18668 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18669 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18670 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18671+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18672+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18673+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18674+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18675 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18676 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18677+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18678 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18679 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18680 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18681@@ -13494,14 +14156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18682 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18683 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18684 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"`'
18685+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18686+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18687 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18688 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18689 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18690-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18691 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18692+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18693 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18694 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18695 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18696+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18697 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18698 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18699 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18700@@ -13534,12 +14199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18701 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18702 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18703 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18704-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18705 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18706 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18707 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18708 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18709 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18710+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18711 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18712 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18713 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18714@@ -13594,8 +14259,13 @@ reload_flag \
18715 OBJDUMP \
18716 deplibs_check_method \
18717 file_magic_cmd \
18718+file_magic_glob \
18719+want_nocaseglob \
18720+DLLTOOL \
18721+sharedlib_from_linklib_cmd \
18722 AR \
18723 AR_FLAGS \
18724+archiver_list_spec \
18725 STRIP \
18726 RANLIB \
18727 CC \
18728@@ -13605,12 +14275,14 @@ lt_cv_sys_global_symbol_pipe \
18729 lt_cv_sys_global_symbol_to_cdecl \
18730 lt_cv_sys_global_symbol_to_c_name_address \
18731 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18732+nm_file_list_spec \
18733 lt_prog_compiler_no_builtin_flag \
18734-lt_prog_compiler_wl \
18735 lt_prog_compiler_pic \
18736+lt_prog_compiler_wl \
18737 lt_prog_compiler_static \
18738 lt_cv_prog_compiler_c_o \
18739 need_locks \
18740+MANIFEST_TOOL \
18741 DSYMUTIL \
18742 NMEDIT \
18743 LIPO \
18744@@ -13626,7 +14298,6 @@ no_undefined_flag \
18745 hardcode_libdir_flag_spec \
18746 hardcode_libdir_flag_spec_ld \
18747 hardcode_libdir_separator \
18748-fix_srcfile_path \
18749 exclude_expsyms \
18750 include_expsyms \
18751 file_list_spec \
18752@@ -13662,6 +14333,7 @@ module_cmds \
18753 module_expsym_cmds \
18754 export_symbols_cmds \
18755 prelink_cmds \
18756+postlink_cmds \
18757 postinstall_cmds \
18758 postuninstall_cmds \
18759 finish_cmds \
18760@@ -14418,7 +15090,8 @@ $as_echo X"$file" |
18761 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18762 #
18763 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18764-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18765+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18766+# Inc.
18767 # Written by Gordon Matzigkeit, 1996
18768 #
18769 # This file is part of GNU Libtool.
18770@@ -14521,19 +15194,42 @@ SP2NL=$lt_lt_SP2NL
18771 # turn newlines into spaces.
18772 NL2SP=$lt_lt_NL2SP
18773
18774+# convert \$build file names to \$host format.
18775+to_host_file_cmd=$lt_cv_to_host_file_cmd
18776+
18777+# convert \$build files to toolchain format.
18778+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18779+
18780 # An object symbol dumper.
18781 OBJDUMP=$lt_OBJDUMP
18782
18783 # Method to check whether dependent libraries are shared objects.
18784 deplibs_check_method=$lt_deplibs_check_method
18785
18786-# Command to use when deplibs_check_method == "file_magic".
18787+# Command to use when deplibs_check_method = "file_magic".
18788 file_magic_cmd=$lt_file_magic_cmd
18789
18790+# How to find potential files when deplibs_check_method = "file_magic".
18791+file_magic_glob=$lt_file_magic_glob
18792+
18793+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18794+want_nocaseglob=$lt_want_nocaseglob
18795+
18796+# DLL creation program.
18797+DLLTOOL=$lt_DLLTOOL
18798+
18799+# Command to associate shared and link libraries.
18800+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18801+
18802 # The archiver.
18803 AR=$lt_AR
18804+
18805+# Flags to create an archive.
18806 AR_FLAGS=$lt_AR_FLAGS
18807
18808+# How to feed a file listing to the archiver.
18809+archiver_list_spec=$lt_archiver_list_spec
18810+
18811 # A symbol stripping program.
18812 STRIP=$lt_STRIP
18813
18814@@ -14563,6 +15259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18815 # Transform the output of nm in a C name address pair when lib prefix is needed.
18816 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18817
18818+# Specify filename containing input files for \$NM.
18819+nm_file_list_spec=$lt_nm_file_list_spec
18820+
18821+# The root where to search for dependent libraries,and in which our libraries should be installed.
18822+lt_sysroot=$lt_sysroot
18823+
18824 # The name of the directory that contains temporary libtool files.
18825 objdir=$objdir
18826
18827@@ -14572,6 +15274,9 @@ MAGIC_CMD=$MAGIC_CMD
18828 # Must we lock files when doing compilation?
18829 need_locks=$lt_need_locks
18830
18831+# Manifest tool.
18832+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18833+
18834 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18835 DSYMUTIL=$lt_DSYMUTIL
18836
18837@@ -14686,12 +15391,12 @@ with_gcc=$GCC
18838 # Compiler flag to turn off builtin functions.
18839 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18840
18841-# How to pass a linker flag through the compiler.
18842-wl=$lt_lt_prog_compiler_wl
18843-
18844 # Additional compiler flags for building library objects.
18845 pic_flag=$lt_lt_prog_compiler_pic
18846
18847+# How to pass a linker flag through the compiler.
18848+wl=$lt_lt_prog_compiler_wl
18849+
18850 # Compiler flag to prevent dynamic linking.
18851 link_static_flag=$lt_lt_prog_compiler_static
18852
18853@@ -14778,9 +15483,6 @@ inherit_rpath=$inherit_rpath
18854 # Whether libtool must link a program against all its dependency libraries.
18855 link_all_deplibs=$link_all_deplibs
18856
18857-# Fix the shell variable \$srcfile for the compiler.
18858-fix_srcfile_path=$lt_fix_srcfile_path
18859-
18860 # Set to "yes" if exported symbols are required.
18861 always_export_symbols=$always_export_symbols
18862
18863@@ -14796,6 +15498,9 @@ include_expsyms=$lt_include_expsyms
18864 # Commands necessary for linking programs (against libraries) with templates.
18865 prelink_cmds=$lt_prelink_cmds
18866
18867+# Commands necessary for finishing linking programs.
18868+postlink_cmds=$lt_postlink_cmds
18869+
18870 # Specify filename containing input files.
18871 file_list_spec=$lt_file_list_spec
18872
18873@@ -14828,210 +15533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18874 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18875 # text mode, it properly converts lines to CR/LF. This bash problem
18876 # is reportedly fixed, but why not run on old versions too?
18877- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18878- || (rm -f "$cfgfile"; exit 1)
18879-
18880- case $xsi_shell in
18881- yes)
18882- cat << \_LT_EOF >> "$cfgfile"
18883-
18884-# func_dirname file append nondir_replacement
18885-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18886-# otherwise set result to NONDIR_REPLACEMENT.
18887-func_dirname ()
18888-{
18889- case ${1} in
18890- */*) func_dirname_result="${1%/*}${2}" ;;
18891- * ) func_dirname_result="${3}" ;;
18892- esac
18893-}
18894-
18895-# func_basename file
18896-func_basename ()
18897-{
18898- func_basename_result="${1##*/}"
18899-}
18900-
18901-# func_dirname_and_basename file append nondir_replacement
18902-# perform func_basename and func_dirname in a single function
18903-# call:
18904-# dirname: Compute the dirname of FILE. If nonempty,
18905-# add APPEND to the result, otherwise set result
18906-# to NONDIR_REPLACEMENT.
18907-# value returned in "$func_dirname_result"
18908-# basename: Compute filename of FILE.
18909-# value retuned in "$func_basename_result"
18910-# Implementation must be kept synchronized with func_dirname
18911-# and func_basename. For efficiency, we do not delegate to
18912-# those functions but instead duplicate the functionality here.
18913-func_dirname_and_basename ()
18914-{
18915- case ${1} in
18916- */*) func_dirname_result="${1%/*}${2}" ;;
18917- * ) func_dirname_result="${3}" ;;
18918- esac
18919- func_basename_result="${1##*/}"
18920-}
18921-
18922-# func_stripname prefix suffix name
18923-# strip PREFIX and SUFFIX off of NAME.
18924-# PREFIX and SUFFIX must not contain globbing or regex special
18925-# characters, hashes, percent signs, but SUFFIX may contain a leading
18926-# dot (in which case that matches only a dot).
18927-func_stripname ()
18928-{
18929- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18930- # positional parameters, so assign one to ordinary parameter first.
18931- func_stripname_result=${3}
18932- func_stripname_result=${func_stripname_result#"${1}"}
18933- func_stripname_result=${func_stripname_result%"${2}"}
18934-}
18935-
18936-# func_opt_split
18937-func_opt_split ()
18938-{
18939- func_opt_split_opt=${1%%=*}
18940- func_opt_split_arg=${1#*=}
18941-}
18942-
18943-# func_lo2o object
18944-func_lo2o ()
18945-{
18946- case ${1} in
18947- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18948- *) func_lo2o_result=${1} ;;
18949- esac
18950-}
18951-
18952-# func_xform libobj-or-source
18953-func_xform ()
18954-{
18955- func_xform_result=${1%.*}.lo
18956-}
18957-
18958-# func_arith arithmetic-term...
18959-func_arith ()
18960-{
18961- func_arith_result=$(( $* ))
18962-}
18963-
18964-# func_len string
18965-# STRING may not start with a hyphen.
18966-func_len ()
18967-{
18968- func_len_result=${#1}
18969-}
18970-
18971-_LT_EOF
18972- ;;
18973- *) # Bourne compatible functions.
18974- cat << \_LT_EOF >> "$cfgfile"
18975-
18976-# func_dirname file append nondir_replacement
18977-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18978-# otherwise set result to NONDIR_REPLACEMENT.
18979-func_dirname ()
18980-{
18981- # Extract subdirectory from the argument.
18982- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18983- if test "X$func_dirname_result" = "X${1}"; then
18984- func_dirname_result="${3}"
18985- else
18986- func_dirname_result="$func_dirname_result${2}"
18987- fi
18988-}
18989-
18990-# func_basename file
18991-func_basename ()
18992-{
18993- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18994-}
18995-
18996-
18997-# func_stripname prefix suffix name
18998-# strip PREFIX and SUFFIX off of NAME.
18999-# PREFIX and SUFFIX must not contain globbing or regex special
19000-# characters, hashes, percent signs, but SUFFIX may contain a leading
19001-# dot (in which case that matches only a dot).
19002-# func_strip_suffix prefix name
19003-func_stripname ()
19004-{
19005- case ${2} in
19006- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
19007- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
19008- esac
19009-}
19010-
19011-# sed scripts:
19012-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
19013-my_sed_long_arg='1s/^-[^=]*=//'
19014-
19015-# func_opt_split
19016-func_opt_split ()
19017-{
19018- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
19019- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
19020-}
19021-
19022-# func_lo2o object
19023-func_lo2o ()
19024-{
19025- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19026-}
19027-
19028-# func_xform libobj-or-source
19029-func_xform ()
19030-{
19031- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19032-}
19033-
19034-# func_arith arithmetic-term...
19035-func_arith ()
19036-{
19037- func_arith_result=`expr "$@"`
19038-}
19039-
19040-# func_len string
19041-# STRING may not start with a hyphen.
19042-func_len ()
19043-{
19044- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19045-}
19046-
19047-_LT_EOF
19048-esac
19049-
19050-case $lt_shell_append in
19051- yes)
19052- cat << \_LT_EOF >> "$cfgfile"
19053-
19054-# func_append var value
19055-# Append VALUE to the end of shell variable VAR.
19056-func_append ()
19057-{
19058- eval "$1+=\$2"
19059-}
19060-_LT_EOF
19061- ;;
19062- *)
19063- cat << \_LT_EOF >> "$cfgfile"
19064-
19065-# func_append var value
19066-# Append VALUE to the end of shell variable VAR.
19067-func_append ()
19068-{
19069- eval "$1=\$$1\$2"
19070-}
19071-
19072-_LT_EOF
19073- ;;
19074- esac
19075-
19076-
19077- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19078- || (rm -f "$cfgfile"; exit 1)
19079-
19080- mv -f "$cfgfile" "$ofile" ||
19081+ sed '$q' "$ltmain" >> "$cfgfile" \
19082+ || (rm -f "$cfgfile"; exit 1)
19083+
19084+ if test x"$xsi_shell" = xyes; then
19085+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19086+func_dirname ()\
19087+{\
19088+\ case ${1} in\
19089+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19090+\ * ) func_dirname_result="${3}" ;;\
19091+\ esac\
19092+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19093+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19094+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19095+test 0 -eq $? || _lt_function_replace_fail=:
19096+
19097+
19098+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19099+func_basename ()\
19100+{\
19101+\ func_basename_result="${1##*/}"\
19102+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19103+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19104+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19105+test 0 -eq $? || _lt_function_replace_fail=:
19106+
19107+
19108+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19109+func_dirname_and_basename ()\
19110+{\
19111+\ case ${1} in\
19112+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19113+\ * ) func_dirname_result="${3}" ;;\
19114+\ esac\
19115+\ func_basename_result="${1##*/}"\
19116+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19117+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19118+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19119+test 0 -eq $? || _lt_function_replace_fail=:
19120+
19121+
19122+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19123+func_stripname ()\
19124+{\
19125+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19126+\ # positional parameters, so assign one to ordinary parameter first.\
19127+\ func_stripname_result=${3}\
19128+\ func_stripname_result=${func_stripname_result#"${1}"}\
19129+\ func_stripname_result=${func_stripname_result%"${2}"}\
19130+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19131+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19132+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19133+test 0 -eq $? || _lt_function_replace_fail=:
19134+
19135+
19136+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19137+func_split_long_opt ()\
19138+{\
19139+\ func_split_long_opt_name=${1%%=*}\
19140+\ func_split_long_opt_arg=${1#*=}\
19141+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19142+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19143+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19144+test 0 -eq $? || _lt_function_replace_fail=:
19145+
19146+
19147+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19148+func_split_short_opt ()\
19149+{\
19150+\ func_split_short_opt_arg=${1#??}\
19151+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19152+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19153+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19154+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19155+test 0 -eq $? || _lt_function_replace_fail=:
19156+
19157+
19158+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19159+func_lo2o ()\
19160+{\
19161+\ case ${1} in\
19162+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19163+\ *) func_lo2o_result=${1} ;;\
19164+\ esac\
19165+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19166+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19167+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19168+test 0 -eq $? || _lt_function_replace_fail=:
19169+
19170+
19171+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19172+func_xform ()\
19173+{\
19174+ func_xform_result=${1%.*}.lo\
19175+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19176+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19177+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19178+test 0 -eq $? || _lt_function_replace_fail=:
19179+
19180+
19181+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19182+func_arith ()\
19183+{\
19184+ func_arith_result=$(( $* ))\
19185+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19186+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19187+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19188+test 0 -eq $? || _lt_function_replace_fail=:
19189+
19190+
19191+ sed -e '/^func_len ()$/,/^} # func_len /c\
19192+func_len ()\
19193+{\
19194+ func_len_result=${#1}\
19195+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
19196+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19197+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19198+test 0 -eq $? || _lt_function_replace_fail=:
19199+
19200+fi
19201+
19202+if test x"$lt_shell_append" = xyes; then
19203+ sed -e '/^func_append ()$/,/^} # func_append /c\
19204+func_append ()\
19205+{\
19206+ eval "${1}+=\\${2}"\
19207+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
19208+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19209+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19210+test 0 -eq $? || _lt_function_replace_fail=:
19211+
19212+
19213+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19214+func_append_quoted ()\
19215+{\
19216+\ func_quote_for_eval "${2}"\
19217+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19218+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19219+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19220+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19221+test 0 -eq $? || _lt_function_replace_fail=:
19222+
19223+
19224+ # Save a `func_append' function call where possible by direct use of '+='
19225+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19226+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19227+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19228+ test 0 -eq $? || _lt_function_replace_fail=:
19229+else
19230+ # Save a `func_append' function call even when '+=' is not available
19231+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19232+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19233+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19234+ test 0 -eq $? || _lt_function_replace_fail=:
19235+fi
19236+
19237+if test x"$_lt_function_replace_fail" = x":"; then
19238+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19239+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19240+fi
19241+
19242+
19243+ mv -f "$cfgfile" "$ofile" ||
19244 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19245 chmod +x "$ofile"
19246
19247diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19248index c7f4783..f2e002d 100644
19249--- a/opcodes/configure.ac
19250+++ b/opcodes/configure.ac
19251@@ -167,7 +167,7 @@ changequote(,)dnl
19252 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19253 changequote([,])dnl
19254 if test -n "$x"; then
19255- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19256+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19257 fi
19258
19259 case "${host}" in
19260diff --git a/zlib/configure b/zlib/configure
19261index bba9fd2..25a2dae 100755
19262--- a/zlib/configure
19263+++ b/zlib/configure
19264@@ -614,8 +614,11 @@ OTOOL
19265 LIPO
19266 NMEDIT
19267 DSYMUTIL
19268+MANIFEST_TOOL
19269 RANLIB
19270+ac_ct_AR
19271 AR
19272+DLLTOOL
19273 OBJDUMP
19274 LN_S
19275 NM
19276@@ -737,6 +740,7 @@ enable_static
19277 with_pic
19278 enable_fast_install
19279 with_gnu_ld
19280+with_libtool_sysroot
19281 enable_libtool_lock
19282 enable_host_shared
19283 '
19284@@ -1385,6 +1389,8 @@ Optional Packages:
19285 --with-pic try to use only PIC/non-PIC objects [default=use
19286 both]
19287 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19288+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19289+ (or the compiler's sysroot if not specified).
19290
19291 Some influential environment variables:
19292 CC C compiler command
19293@@ -3910,8 +3916,8 @@ esac
19294
19295
19296
19297-macro_version='2.2.7a'
19298-macro_revision='1.3134'
19299+macro_version='2.4'
19300+macro_revision='1.3293'
19301
19302
19303
19304@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19306 $as_echo_n "checking how to print strings... " >&6; }
19307 # Test print first, because it will be a builtin if present.
19308-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19309+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19310 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19311 ECHO='print -r --'
19312 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19313@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19314 # Try some XSI features
19315 xsi_shell=no
19316 ( _lt_dummy="a/b/c"
19317- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19318- = c,a/b,, \
19319+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19320+ = c,a/b,b/c, \
19321 && eval 'test $(( 1 + 1 )) -eq 2 \
19322 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19323 && xsi_shell=yes
19324@@ -4817,6 +4823,80 @@ esac
19325
19326
19327
19328+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19329+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19330+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
19331+ $as_echo_n "(cached) " >&6
19332+else
19333+ case $host in
19334+ *-*-mingw* )
19335+ case $build in
19336+ *-*-mingw* ) # actually msys
19337+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19338+ ;;
19339+ *-*-cygwin* )
19340+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19341+ ;;
19342+ * ) # otherwise, assume *nix
19343+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19344+ ;;
19345+ esac
19346+ ;;
19347+ *-*-cygwin* )
19348+ case $build in
19349+ *-*-mingw* ) # actually msys
19350+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19351+ ;;
19352+ *-*-cygwin* )
19353+ lt_cv_to_host_file_cmd=func_convert_file_noop
19354+ ;;
19355+ * ) # otherwise, assume *nix
19356+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19357+ ;;
19358+ esac
19359+ ;;
19360+ * ) # unhandled hosts (and "normal" native builds)
19361+ lt_cv_to_host_file_cmd=func_convert_file_noop
19362+ ;;
19363+esac
19364+
19365+fi
19366+
19367+to_host_file_cmd=$lt_cv_to_host_file_cmd
19368+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19369+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19370+
19371+
19372+
19373+
19374+
19375+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19376+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19377+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
19378+ $as_echo_n "(cached) " >&6
19379+else
19380+ #assume ordinary cross tools, or native build.
19381+lt_cv_to_tool_file_cmd=func_convert_file_noop
19382+case $host in
19383+ *-*-mingw* )
19384+ case $build in
19385+ *-*-mingw* ) # actually msys
19386+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19387+ ;;
19388+ esac
19389+ ;;
19390+esac
19391+
19392+fi
19393+
19394+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19395+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19396+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19397+
19398+
19399+
19400+
19401+
19402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19403 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19404 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19405@@ -4833,6 +4913,11 @@ case $reload_flag in
19406 esac
19407 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19408 case $host_os in
19409+ cygwin* | mingw* | pw32* | cegcc*)
19410+ if test "$GCC" != yes; then
19411+ reload_cmds=false
19412+ fi
19413+ ;;
19414 darwin*)
19415 if test "$GCC" = yes; then
19416 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19417@@ -5001,7 +5086,8 @@ mingw* | pw32*)
19418 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19419 lt_cv_file_magic_cmd='func_win32_libid'
19420 else
19421- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19422+ # Keep this pattern in sync with the one in func_win32_libid.
19423+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19424 lt_cv_file_magic_cmd='$OBJDUMP -f'
19425 fi
19426 ;;
19427@@ -5155,6 +5241,21 @@ esac
19428 fi
19429 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19430 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19431+
19432+file_magic_glob=
19433+want_nocaseglob=no
19434+if test "$build" = "$host"; then
19435+ case $host_os in
19436+ mingw* | pw32*)
19437+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19438+ want_nocaseglob=yes
19439+ else
19440+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19441+ fi
19442+ ;;
19443+ esac
19444+fi
19445+
19446 file_magic_cmd=$lt_cv_file_magic_cmd
19447 deplibs_check_method=$lt_cv_deplibs_check_method
19448 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19449@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19450
19451
19452
19453+
19454+
19455+
19456+
19457+
19458+
19459+
19460+
19461+
19462+
19463 if test -n "$ac_tool_prefix"; then
19464- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19465-set dummy ${ac_tool_prefix}ar; ac_word=$2
19466+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19467+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19468+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19469+$as_echo_n "checking for $ac_word... " >&6; }
19470+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
19471+ $as_echo_n "(cached) " >&6
19472+else
19473+ if test -n "$DLLTOOL"; then
19474+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19475+else
19476+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19477+for as_dir in $PATH
19478+do
19479+ IFS=$as_save_IFS
19480+ test -z "$as_dir" && as_dir=.
19481+ for ac_exec_ext in '' $ac_executable_extensions; do
19482+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19483+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19484+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19485+ break 2
19486+ fi
19487+done
19488+ done
19489+IFS=$as_save_IFS
19490+
19491+fi
19492+fi
19493+DLLTOOL=$ac_cv_prog_DLLTOOL
19494+if test -n "$DLLTOOL"; then
19495+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19496+$as_echo "$DLLTOOL" >&6; }
19497+else
19498+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19499+$as_echo "no" >&6; }
19500+fi
19501+
19502+
19503+fi
19504+if test -z "$ac_cv_prog_DLLTOOL"; then
19505+ ac_ct_DLLTOOL=$DLLTOOL
19506+ # Extract the first word of "dlltool", so it can be a program name with args.
19507+set dummy dlltool; ac_word=$2
19508+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19509+$as_echo_n "checking for $ac_word... " >&6; }
19510+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
19511+ $as_echo_n "(cached) " >&6
19512+else
19513+ if test -n "$ac_ct_DLLTOOL"; then
19514+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19515+else
19516+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19517+for as_dir in $PATH
19518+do
19519+ IFS=$as_save_IFS
19520+ test -z "$as_dir" && as_dir=.
19521+ for ac_exec_ext in '' $ac_executable_extensions; do
19522+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19523+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19524+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19525+ break 2
19526+ fi
19527+done
19528+ done
19529+IFS=$as_save_IFS
19530+
19531+fi
19532+fi
19533+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19534+if test -n "$ac_ct_DLLTOOL"; then
19535+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19536+$as_echo "$ac_ct_DLLTOOL" >&6; }
19537+else
19538+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19539+$as_echo "no" >&6; }
19540+fi
19541+
19542+ if test "x$ac_ct_DLLTOOL" = x; then
19543+ DLLTOOL="false"
19544+ else
19545+ case $cross_compiling:$ac_tool_warned in
19546+yes:)
19547+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19548+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19549+ac_tool_warned=yes ;;
19550+esac
19551+ DLLTOOL=$ac_ct_DLLTOOL
19552+ fi
19553+else
19554+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19555+fi
19556+
19557+test -z "$DLLTOOL" && DLLTOOL=dlltool
19558+
19559+
19560+
19561+
19562+
19563+
19564+
19565+
19566+
19567+
19568+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19569+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19570+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
19571+ $as_echo_n "(cached) " >&6
19572+else
19573+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19574+
19575+case $host_os in
19576+cygwin* | mingw* | pw32* | cegcc*)
19577+ # two different shell functions defined in ltmain.sh
19578+ # decide which to use based on capabilities of $DLLTOOL
19579+ case `$DLLTOOL --help 2>&1` in
19580+ *--identify-strict*)
19581+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19582+ ;;
19583+ *)
19584+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19585+ ;;
19586+ esac
19587+ ;;
19588+*)
19589+ # fallback: assume linklib IS sharedlib
19590+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19591+ ;;
19592+esac
19593+
19594+fi
19595+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19596+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19597+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19598+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19599+
19600+
19601+
19602+
19603+
19604+
19605+
19606+
19607+if test -n "$ac_tool_prefix"; then
19608+ for ac_prog in ar
19609+ do
19610+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19611+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19613 $as_echo_n "checking for $ac_word... " >&6; }
19614 if test "${ac_cv_prog_AR+set}" = set; then :
19615@@ -5188,7 +5443,7 @@ do
19616 test -z "$as_dir" && as_dir=.
19617 for ac_exec_ext in '' $ac_executable_extensions; do
19618 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19619- ac_cv_prog_AR="${ac_tool_prefix}ar"
19620+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19621 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19622 break 2
19623 fi
19624@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }
19625 fi
19626
19627
19628+ test -n "$AR" && break
19629+ done
19630 fi
19631-if test -z "$ac_cv_prog_AR"; then
19632+if test -z "$AR"; then
19633 ac_ct_AR=$AR
19634- # Extract the first word of "ar", so it can be a program name with args.
19635-set dummy ar; ac_word=$2
19636+ for ac_prog in ar
19637+do
19638+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19639+set dummy $ac_prog; ac_word=$2
19640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19641 $as_echo_n "checking for $ac_word... " >&6; }
19642 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19643@@ -5228,7 +5487,7 @@ do
19644 test -z "$as_dir" && as_dir=.
19645 for ac_exec_ext in '' $ac_executable_extensions; do
19646 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19647- ac_cv_prog_ac_ct_AR="ar"
19648+ ac_cv_prog_ac_ct_AR="$ac_prog"
19649 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19650 break 2
19651 fi
19652@@ -5247,6 +5506,10 @@ else
19653 $as_echo "no" >&6; }
19654 fi
19655
19656+
19657+ test -n "$ac_ct_AR" && break
19658+done
19659+
19660 if test "x$ac_ct_AR" = x; then
19661 AR="false"
19662 else
19663@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;
19664 esac
19665 AR=$ac_ct_AR
19666 fi
19667-else
19668- AR="$ac_cv_prog_AR"
19669 fi
19670
19671-test -z "$AR" && AR=ar
19672-test -z "$AR_FLAGS" && AR_FLAGS=cru
19673+: ${AR=ar}
19674+: ${AR_FLAGS=cru}
19675+
19676+
19677+
19678+
19679+
19680+
19681+
19682+
19683+
19684+
19685+
19686+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19687+$as_echo_n "checking for archiver @FILE support... " >&6; }
19688+if test "${lt_cv_ar_at_file+set}" = set; then :
19689+ $as_echo_n "(cached) " >&6
19690+else
19691+ lt_cv_ar_at_file=no
19692+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19693+/* end confdefs.h. */
19694+
19695+int
19696+main ()
19697+{
19698
19699+ ;
19700+ return 0;
19701+}
19702+_ACEOF
19703+if ac_fn_c_try_compile "$LINENO"; then :
19704+ echo conftest.$ac_objext > conftest.lst
19705+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19706+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19707+ (eval $lt_ar_try) 2>&5
19708+ ac_status=$?
19709+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19710+ test $ac_status = 0; }
19711+ if test "$ac_status" -eq 0; then
19712+ # Ensure the archiver fails upon bogus file names.
19713+ rm -f conftest.$ac_objext libconftest.a
19714+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19715+ (eval $lt_ar_try) 2>&5
19716+ ac_status=$?
19717+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19718+ test $ac_status = 0; }
19719+ if test "$ac_status" -ne 0; then
19720+ lt_cv_ar_at_file=@
19721+ fi
19722+ fi
19723+ rm -f conftest.* libconftest.a
19724
19725+fi
19726+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19727
19728+fi
19729+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19730+$as_echo "$lt_cv_ar_at_file" >&6; }
19731
19732+if test "x$lt_cv_ar_at_file" = xno; then
19733+ archiver_list_spec=
19734+else
19735+ archiver_list_spec=$lt_cv_ar_at_file
19736+fi
19737
19738
19739
19740@@ -5609,8 +5928,8 @@ esac
19741 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19742
19743 # Transform an extracted symbol line into symbol name and symbol address
19744-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19745-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'"
19746+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19747+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'"
19748
19749 # Handle CRLF in mingw tool chain
19750 opt_cr=
19751@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do
19752 else
19753 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19754 fi
19755+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19756
19757 # Check to see that the pipe works correctly.
19758 pipe_works=no
19759@@ -5687,6 +6007,18 @@ _LT_EOF
19760 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19761 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19762 cat <<_LT_EOF > conftest.$ac_ext
19763+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19764+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19765+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19766+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19767+# define LT_DLSYM_CONST
19768+#elif defined(__osf__)
19769+/* This system does not cope well with relocations in const data. */
19770+# define LT_DLSYM_CONST
19771+#else
19772+# define LT_DLSYM_CONST const
19773+#endif
19774+
19775 #ifdef __cplusplus
19776 extern "C" {
19777 #endif
19778@@ -5698,7 +6030,7 @@ _LT_EOF
19779 cat <<_LT_EOF >> conftest.$ac_ext
19780
19781 /* The mapping between symbol names and symbols. */
19782-const struct {
19783+LT_DLSYM_CONST struct {
19784 const char *name;
19785 void *address;
19786 }
19787@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {
19788 _LT_EOF
19789 # Now try linking the two files.
19790 mv conftest.$ac_objext conftstm.$ac_objext
19791- lt_save_LIBS="$LIBS"
19792- lt_save_CFLAGS="$CFLAGS"
19793+ lt_globsym_save_LIBS=$LIBS
19794+ lt_globsym_save_CFLAGS=$CFLAGS
19795 LIBS="conftstm.$ac_objext"
19796 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19797 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19798@@ -5735,8 +6067,8 @@ _LT_EOF
19799 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19800 pipe_works=yes
19801 fi
19802- LIBS="$lt_save_LIBS"
19803- CFLAGS="$lt_save_CFLAGS"
19804+ LIBS=$lt_globsym_save_LIBS
19805+ CFLAGS=$lt_globsym_save_CFLAGS
19806 else
19807 echo "cannot find nm_test_func in $nlist" >&5
19808 fi
19809@@ -5773,6 +6105,19 @@ else
19810 $as_echo "ok" >&6; }
19811 fi
19812
19813+# Response file support.
19814+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19815+ nm_file_list_spec='@'
19816+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19817+ nm_file_list_spec='@'
19818+fi
19819+
19820+
19821+
19822+
19823+
19824+
19825+
19826
19827
19828
19829@@ -5793,6 +6138,41 @@ fi
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
19869
19870 # Check whether --enable-libtool-lock was given.
19871@@ -6004,6 +6384,123 @@ esac
19872
19873 need_locks="$enable_libtool_lock"
19874
19875+if test -n "$ac_tool_prefix"; then
19876+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19877+set dummy ${ac_tool_prefix}mt; ac_word=$2
19878+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19879+$as_echo_n "checking for $ac_word... " >&6; }
19880+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
19881+ $as_echo_n "(cached) " >&6
19882+else
19883+ if test -n "$MANIFEST_TOOL"; then
19884+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19885+else
19886+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19887+for as_dir in $PATH
19888+do
19889+ IFS=$as_save_IFS
19890+ test -z "$as_dir" && as_dir=.
19891+ for ac_exec_ext in '' $ac_executable_extensions; do
19892+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19893+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19894+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19895+ break 2
19896+ fi
19897+done
19898+ done
19899+IFS=$as_save_IFS
19900+
19901+fi
19902+fi
19903+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19904+if test -n "$MANIFEST_TOOL"; then
19905+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19906+$as_echo "$MANIFEST_TOOL" >&6; }
19907+else
19908+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19909+$as_echo "no" >&6; }
19910+fi
19911+
19912+
19913+fi
19914+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19915+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19916+ # Extract the first word of "mt", so it can be a program name with args.
19917+set dummy mt; ac_word=$2
19918+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19919+$as_echo_n "checking for $ac_word... " >&6; }
19920+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
19921+ $as_echo_n "(cached) " >&6
19922+else
19923+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19924+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19925+else
19926+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19927+for as_dir in $PATH
19928+do
19929+ IFS=$as_save_IFS
19930+ test -z "$as_dir" && as_dir=.
19931+ for ac_exec_ext in '' $ac_executable_extensions; do
19932+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19933+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19934+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19935+ break 2
19936+ fi
19937+done
19938+ done
19939+IFS=$as_save_IFS
19940+
19941+fi
19942+fi
19943+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
19944+if test -n "$ac_ct_MANIFEST_TOOL"; then
19945+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
19946+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
19947+else
19948+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19949+$as_echo "no" >&6; }
19950+fi
19951+
19952+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
19953+ MANIFEST_TOOL=":"
19954+ else
19955+ case $cross_compiling:$ac_tool_warned in
19956+yes:)
19957+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19958+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19959+ac_tool_warned=yes ;;
19960+esac
19961+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
19962+ fi
19963+else
19964+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
19965+fi
19966+
19967+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19968+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19969+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19970+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
19971+ $as_echo_n "(cached) " >&6
19972+else
19973+ lt_cv_path_mainfest_tool=no
19974+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
19975+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
19976+ cat conftest.err >&5
19977+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
19978+ lt_cv_path_mainfest_tool=yes
19979+ fi
19980+ rm -f conftest*
19981+fi
19982+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
19983+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
19984+if test "x$lt_cv_path_mainfest_tool" != xyes; then
19985+ MANIFEST_TOOL=:
19986+fi
19987+
19988+
19989+
19990+
19991+
19992
19993 case $host_os in
19994 rhapsody* | darwin*)
19995@@ -6570,6 +7067,8 @@ _LT_EOF
19996 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19997 echo "$AR cru libconftest.a conftest.o" >&5
19998 $AR cru libconftest.a conftest.o 2>&5
19999+ echo "$RANLIB libconftest.a" >&5
20000+ $RANLIB libconftest.a 2>&5
20001 cat > conftest.c << _LT_EOF
20002 int main() { return 0;}
20003 _LT_EOF
20004@@ -7033,7 +7532,8 @@ fi
20005 LIBTOOL_DEPS="$ltmain"
20006
20007 # Always use our own libtool.
20008-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
20009+LIBTOOL='$(SHELL) $(top_builddir)'
20010+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
20011
20012
20013
20014@@ -7122,7 +7622,7 @@ aix3*)
20015 esac
20016
20017 # Global variables:
20018-ofile=libtool
20019+ofile=${host_alias}-libtool
20020 can_build_shared=yes
20021
20022 # All known linkers require a `.a' archive for static linking (except MSVC,
20023@@ -7420,8 +7920,6 @@ fi
20024 lt_prog_compiler_pic=
20025 lt_prog_compiler_static=
20026
20027-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20028-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20029
20030 if test "$GCC" = yes; then
20031 lt_prog_compiler_wl='-Wl,'
20032@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20033 lt_prog_compiler_pic='--shared'
20034 lt_prog_compiler_static='--static'
20035 ;;
20036+ nagfor*)
20037+ # NAG Fortran compiler
20038+ lt_prog_compiler_wl='-Wl,-Wl,,'
20039+ lt_prog_compiler_pic='-PIC'
20040+ lt_prog_compiler_static='-Bstatic'
20041+ ;;
20042 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20043 # Portland Group compilers (*not* the Pentium gcc compiler,
20044 # which looks to be a dead project)
20045@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20046 lt_prog_compiler_pic='-KPIC'
20047 lt_prog_compiler_static='-Bstatic'
20048 case $cc_basename in
20049- f77* | f90* | f95*)
20050+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20051 lt_prog_compiler_wl='-Qoption ld ';;
20052 *)
20053 lt_prog_compiler_wl='-Wl,';;
20054@@ -7706,13 +8210,17 @@ case $host_os in
20055 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20056 ;;
20057 esac
20058-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20059-$as_echo "$lt_prog_compiler_pic" >&6; }
20060-
20061-
20062-
20063-
20064
20065+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20066+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20067+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
20068+ $as_echo_n "(cached) " >&6
20069+else
20070+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20071+fi
20072+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20073+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20074+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20075
20076 #
20077 # Check to make sure the PIC flag actually works.
20078@@ -7773,6 +8281,11 @@ fi
20079
20080
20081
20082+
20083+
20084+
20085+
20086+
20087 #
20088 # Check to make sure the static flag actually works.
20089 #
20090@@ -8123,7 +8636,8 @@ _LT_EOF
20091 allow_undefined_flag=unsupported
20092 always_export_symbols=no
20093 enable_shared_with_static_runtimes=yes
20094- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20095+ 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'
20096+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20097
20098 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20099 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20100@@ -8222,12 +8736,12 @@ _LT_EOF
20101 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20102 hardcode_libdir_flag_spec=
20103 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20104- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20105+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20106 if test "x$supports_anon_versioning" = xyes; then
20107 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20108 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20109 echo "local: *; };" >> $output_objdir/$libname.ver~
20110- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20111+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20112 fi
20113 ;;
20114 esac
20115@@ -8241,8 +8755,8 @@ _LT_EOF
20116 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20117 wlarc=
20118 else
20119- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20120- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20121+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20122+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20123 fi
20124 ;;
20125
20126@@ -8260,8 +8774,8 @@ _LT_EOF
20127
20128 _LT_EOF
20129 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20130- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20131- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20132+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20133+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20134 else
20135 ld_shlibs=no
20136 fi
20137@@ -8307,8 +8821,8 @@ _LT_EOF
20138
20139 *)
20140 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20141- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20142- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20143+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20144+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20145 else
20146 ld_shlibs=no
20147 fi
20148@@ -8438,7 +8952,13 @@ _LT_EOF
20149 allow_undefined_flag='-berok'
20150 # Determine the default libpath from the value encoded in an
20151 # empty executable.
20152- if test x$gcc_no_link = xyes; then
20153+ if test "${lt_cv_aix_libpath+set}" = set; then
20154+ aix_libpath=$lt_cv_aix_libpath
20155+else
20156+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20157+ $as_echo_n "(cached) " >&6
20158+else
20159+ if test x$gcc_no_link = xyes; then
20160 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20161 fi
20162 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20163@@ -8454,22 +8974,29 @@ main ()
20164 _ACEOF
20165 if ac_fn_c_try_link "$LINENO"; then :
20166
20167-lt_aix_libpath_sed='
20168- /Import File Strings/,/^$/ {
20169- /^0/ {
20170- s/^0 *\(.*\)$/\1/
20171- p
20172- }
20173- }'
20174-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20175-# Check for a 64-bit object if we didn't find anything.
20176-if test -z "$aix_libpath"; then
20177- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20178-fi
20179+ lt_aix_libpath_sed='
20180+ /Import File Strings/,/^$/ {
20181+ /^0/ {
20182+ s/^0 *\([^ ]*\) *$/\1/
20183+ p
20184+ }
20185+ }'
20186+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20187+ # Check for a 64-bit object if we didn't find anything.
20188+ if test -z "$lt_cv_aix_libpath_"; then
20189+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20190+ fi
20191 fi
20192 rm -f core conftest.err conftest.$ac_objext \
20193 conftest$ac_exeext conftest.$ac_ext
20194-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20195+ if test -z "$lt_cv_aix_libpath_"; then
20196+ lt_cv_aix_libpath_="/usr/lib:/lib"
20197+ fi
20198+
20199+fi
20200+
20201+ aix_libpath=$lt_cv_aix_libpath_
20202+fi
20203
20204 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20205 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"
20206@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20207 else
20208 # Determine the default libpath from the value encoded in an
20209 # empty executable.
20210- if test x$gcc_no_link = xyes; then
20211+ if test "${lt_cv_aix_libpath+set}" = set; then
20212+ aix_libpath=$lt_cv_aix_libpath
20213+else
20214+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20215+ $as_echo_n "(cached) " >&6
20216+else
20217+ if test x$gcc_no_link = xyes; then
20218 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20219 fi
20220 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20221@@ -8497,22 +9030,29 @@ main ()
20222 _ACEOF
20223 if ac_fn_c_try_link "$LINENO"; then :
20224
20225-lt_aix_libpath_sed='
20226- /Import File Strings/,/^$/ {
20227- /^0/ {
20228- s/^0 *\(.*\)$/\1/
20229- p
20230- }
20231- }'
20232-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20233-# Check for a 64-bit object if we didn't find anything.
20234-if test -z "$aix_libpath"; then
20235- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20236-fi
20237+ lt_aix_libpath_sed='
20238+ /Import File Strings/,/^$/ {
20239+ /^0/ {
20240+ s/^0 *\([^ ]*\) *$/\1/
20241+ p
20242+ }
20243+ }'
20244+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20245+ # Check for a 64-bit object if we didn't find anything.
20246+ if test -z "$lt_cv_aix_libpath_"; then
20247+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20248+ fi
20249 fi
20250 rm -f core conftest.err conftest.$ac_objext \
20251 conftest$ac_exeext conftest.$ac_ext
20252-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20253+ if test -z "$lt_cv_aix_libpath_"; then
20254+ lt_cv_aix_libpath_="/usr/lib:/lib"
20255+ fi
20256+
20257+fi
20258+
20259+ aix_libpath=$lt_cv_aix_libpath_
20260+fi
20261
20262 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20263 # Warning - without using the other run time loading flags,
20264@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20265 # Microsoft Visual C++.
20266 # hardcode_libdir_flag_spec is actually meaningless, as there is
20267 # no search path for DLLs.
20268- hardcode_libdir_flag_spec=' '
20269- allow_undefined_flag=unsupported
20270- # Tell ltmain to make .lib files, not .a files.
20271- libext=lib
20272- # Tell ltmain to make .dll files, not .so files.
20273- shrext_cmds=".dll"
20274- # FIXME: Setting linknames here is a bad hack.
20275- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20276- # The linker will automatically build a .lib file if we build a DLL.
20277- old_archive_from_new_cmds='true'
20278- # FIXME: Should let the user specify the lib program.
20279- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20280- fix_srcfile_path='`cygpath -w "$srcfile"`'
20281- enable_shared_with_static_runtimes=yes
20282+ case $cc_basename in
20283+ cl*)
20284+ # Native MSVC
20285+ hardcode_libdir_flag_spec=' '
20286+ allow_undefined_flag=unsupported
20287+ always_export_symbols=yes
20288+ file_list_spec='@'
20289+ # Tell ltmain to make .lib files, not .a files.
20290+ libext=lib
20291+ # Tell ltmain to make .dll files, not .so files.
20292+ shrext_cmds=".dll"
20293+ # FIXME: Setting linknames here is a bad hack.
20294+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20295+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20296+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20297+ else
20298+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20299+ fi~
20300+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20301+ linknames='
20302+ # The linker will not automatically build a static lib if we build a DLL.
20303+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20304+ enable_shared_with_static_runtimes=yes
20305+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20306+ # Don't use ranlib
20307+ old_postinstall_cmds='chmod 644 $oldlib'
20308+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20309+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20310+ case $lt_outputfile in
20311+ *.exe|*.EXE) ;;
20312+ *)
20313+ lt_outputfile="$lt_outputfile.exe"
20314+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20315+ ;;
20316+ esac~
20317+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20318+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20319+ $RM "$lt_outputfile.manifest";
20320+ fi'
20321+ ;;
20322+ *)
20323+ # Assume MSVC wrapper
20324+ hardcode_libdir_flag_spec=' '
20325+ allow_undefined_flag=unsupported
20326+ # Tell ltmain to make .lib files, not .a files.
20327+ libext=lib
20328+ # Tell ltmain to make .dll files, not .so files.
20329+ shrext_cmds=".dll"
20330+ # FIXME: Setting linknames here is a bad hack.
20331+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20332+ # The linker will automatically build a .lib file if we build a DLL.
20333+ old_archive_from_new_cmds='true'
20334+ # FIXME: Should let the user specify the lib program.
20335+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20336+ enable_shared_with_static_runtimes=yes
20337+ ;;
20338+ esac
20339 ;;
20340
20341 darwin* | rhapsody*)
20342@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20343
20344 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20345 freebsd* | dragonfly*)
20346- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20347+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20348 hardcode_libdir_flag_spec='-R$libdir'
20349 hardcode_direct=yes
20350 hardcode_shlibpath_var=no
20351@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20352
20353 hpux9*)
20354 if test "$GCC" = yes; then
20355- 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'
20356+ 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'
20357 else
20358 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'
20359 fi
20360@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20361
20362 hpux10*)
20363 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20364- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20365+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20366 else
20367 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20368 fi
20369@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20370 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20371 ;;
20372 ia64*)
20373- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20374+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20375 ;;
20376 *)
20377- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20378+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20379 ;;
20380 esac
20381 else
20382@@ -8761,26 +9344,39 @@ fi
20383
20384 irix5* | irix6* | nonstopux*)
20385 if test "$GCC" = yes; then
20386- 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'
20387+ 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'
20388 # Try to use the -exported_symbol ld option, if it does not
20389 # work, assume that -exports_file does not work either and
20390 # implicitly export all symbols.
20391- save_LDFLAGS="$LDFLAGS"
20392- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20393- if test x$gcc_no_link = xyes; then
20394+ # This should be the same for all languages, so no per-tag cache variable.
20395+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20396+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20397+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
20398+ $as_echo_n "(cached) " >&6
20399+else
20400+ save_LDFLAGS="$LDFLAGS"
20401+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20402+ if test x$gcc_no_link = xyes; then
20403 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20404 fi
20405 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20406 /* end confdefs.h. */
20407-int foo(void) {}
20408+int foo (void) { return 0; }
20409 _ACEOF
20410 if ac_fn_c_try_link "$LINENO"; then :
20411- 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'
20412-
20413+ lt_cv_irix_exported_symbol=yes
20414+else
20415+ lt_cv_irix_exported_symbol=no
20416 fi
20417 rm -f core conftest.err conftest.$ac_objext \
20418 conftest$ac_exeext conftest.$ac_ext
20419- LDFLAGS="$save_LDFLAGS"
20420+ LDFLAGS="$save_LDFLAGS"
20421+fi
20422+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20423+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20424+ if test "$lt_cv_irix_exported_symbol" = yes; then
20425+ 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'
20426+ fi
20427 else
20428 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'
20429 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'
20430@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \
20431 osf4* | osf5*) # as osf3* with the addition of -msym flag
20432 if test "$GCC" = yes; then
20433 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20434- 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'
20435+ 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'
20436 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20437 else
20438 allow_undefined_flag=' -expect_unresolved \*'
20439@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \
20440 no_undefined_flag=' -z defs'
20441 if test "$GCC" = yes; then
20442 wlarc='${wl}'
20443- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20444+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20445 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20446- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20447+ $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'
20448 else
20449 case `$CC -V 2>&1` in
20450 *"Compilers 5.0"*)
20451@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20452 need_version=no
20453 need_lib_prefix=no
20454
20455- case $GCC,$host_os in
20456- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20457+ case $GCC,$cc_basename in
20458+ yes,*)
20459+ # gcc
20460 library_names_spec='$libname.dll.a'
20461 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20462 postinstall_cmds='base_file=`basename \${file}`~
20463@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20464 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20465 ;;
20466 esac
20467+ dynamic_linker='Win32 ld.exe'
20468+ ;;
20469+
20470+ *,cl*)
20471+ # Native MSVC
20472+ libname_spec='$name'
20473+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20474+ library_names_spec='${libname}.dll.lib'
20475+
20476+ case $build_os in
20477+ mingw*)
20478+ sys_lib_search_path_spec=
20479+ lt_save_ifs=$IFS
20480+ IFS=';'
20481+ for lt_path in $LIB
20482+ do
20483+ IFS=$lt_save_ifs
20484+ # Let DOS variable expansion print the short 8.3 style file name.
20485+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20486+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20487+ done
20488+ IFS=$lt_save_ifs
20489+ # Convert to MSYS style.
20490+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20491+ ;;
20492+ cygwin*)
20493+ # Convert to unix form, then to dos form, then back to unix form
20494+ # but this time dos style (no spaces!) so that the unix form looks
20495+ # like /cygdrive/c/PROGRA~1:/cygdr...
20496+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20497+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20498+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20499+ ;;
20500+ *)
20501+ sys_lib_search_path_spec="$LIB"
20502+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20503+ # It is most probably a Windows format PATH.
20504+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20505+ else
20506+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20507+ fi
20508+ # FIXME: find the short name or the path components, as spaces are
20509+ # common. (e.g. "Program Files" -> "PROGRA~1")
20510+ ;;
20511+ esac
20512+
20513+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20514+ postinstall_cmds='base_file=`basename \${file}`~
20515+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20516+ dldir=$destdir/`dirname \$dlpath`~
20517+ test -d \$dldir || mkdir -p \$dldir~
20518+ $install_prog $dir/$dlname \$dldir/$dlname'
20519+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20520+ dlpath=$dir/\$dldll~
20521+ $RM \$dlpath'
20522+ shlibpath_overrides_runpath=yes
20523+ dynamic_linker='Win32 link.exe'
20524 ;;
20525
20526 *)
20527+ # Assume MSVC wrapper
20528 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20529+ dynamic_linker='Win32 ld.exe'
20530 ;;
20531 esac
20532- dynamic_linker='Win32 ld.exe'
20533 # FIXME: first we should search . and the directory the executable is in
20534 shlibpath_var=PATH
20535 ;;
20536@@ -9594,7 +10249,7 @@ haiku*)
20537 soname_spec='${libname}${release}${shared_ext}$major'
20538 shlibpath_var=LIBRARY_PATH
20539 shlibpath_overrides_runpath=yes
20540- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20541+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20542 hardcode_into_libs=yes
20543 ;;
20544
20545@@ -10408,7 +11063,7 @@ else
20546 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20547 lt_status=$lt_dlunknown
20548 cat > conftest.$ac_ext <<_LT_EOF
20549-#line 10411 "configure"
20550+#line $LINENO "configure"
20551 #include "confdefs.h"
20552
20553 #if HAVE_DLFCN_H
20554@@ -10452,10 +11107,10 @@ else
20555 /* When -fvisbility=hidden is used, assume the code has been annotated
20556 correspondingly for the symbols needed. */
20557 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20558-void fnord () __attribute__((visibility("default")));
20559+int fnord () __attribute__((visibility("default")));
20560 #endif
20561
20562-void fnord () { int i=42; }
20563+int fnord () { return 42; }
20564 int main ()
20565 {
20566 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20567@@ -10514,7 +11169,7 @@ else
20568 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20569 lt_status=$lt_dlunknown
20570 cat > conftest.$ac_ext <<_LT_EOF
20571-#line 10517 "configure"
20572+#line $LINENO "configure"
20573 #include "confdefs.h"
20574
20575 #if HAVE_DLFCN_H
20576@@ -10558,10 +11213,10 @@ else
20577 /* When -fvisbility=hidden is used, assume the code has been annotated
20578 correspondingly for the symbols needed. */
20579 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20580-void fnord () __attribute__((visibility("default")));
20581+int fnord () __attribute__((visibility("default")));
20582 #endif
20583
20584-void fnord () { int i=42; }
20585+int fnord () { return 42; }
20586 int main ()
20587 {
20588 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20589@@ -11993,13 +12648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20590 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20591 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20592 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20593+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20594+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20595 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20596 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20597 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20598 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20599 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20600+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20601+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20602+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20603+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20604 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20605 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20606+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20607 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20608 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20609 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20610@@ -12014,14 +12676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20611 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20612 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20613 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"`'
20614+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20615+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20616 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20617 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20618 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20619-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20620 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20621+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20622 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20623 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20624 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20625+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20626 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20627 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20628 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20629@@ -12054,12 +12719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20630 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20631 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20632 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20633-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20634 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20635 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20636 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20637 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20638 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20639+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20640 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20641 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20642 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20643@@ -12114,8 +12779,13 @@ reload_flag \
20644 OBJDUMP \
20645 deplibs_check_method \
20646 file_magic_cmd \
20647+file_magic_glob \
20648+want_nocaseglob \
20649+DLLTOOL \
20650+sharedlib_from_linklib_cmd \
20651 AR \
20652 AR_FLAGS \
20653+archiver_list_spec \
20654 STRIP \
20655 RANLIB \
20656 CC \
20657@@ -12125,12 +12795,14 @@ lt_cv_sys_global_symbol_pipe \
20658 lt_cv_sys_global_symbol_to_cdecl \
20659 lt_cv_sys_global_symbol_to_c_name_address \
20660 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20661+nm_file_list_spec \
20662 lt_prog_compiler_no_builtin_flag \
20663-lt_prog_compiler_wl \
20664 lt_prog_compiler_pic \
20665+lt_prog_compiler_wl \
20666 lt_prog_compiler_static \
20667 lt_cv_prog_compiler_c_o \
20668 need_locks \
20669+MANIFEST_TOOL \
20670 DSYMUTIL \
20671 NMEDIT \
20672 LIPO \
20673@@ -12146,7 +12818,6 @@ no_undefined_flag \
20674 hardcode_libdir_flag_spec \
20675 hardcode_libdir_flag_spec_ld \
20676 hardcode_libdir_separator \
20677-fix_srcfile_path \
20678 exclude_expsyms \
20679 include_expsyms \
20680 file_list_spec \
20681@@ -12182,6 +12853,7 @@ module_cmds \
20682 module_expsym_cmds \
20683 export_symbols_cmds \
20684 prelink_cmds \
20685+postlink_cmds \
20686 postinstall_cmds \
20687 postuninstall_cmds \
20688 finish_cmds \
20689@@ -12771,7 +13443,8 @@ $as_echo X"$file" |
20690 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20691 #
20692 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20693-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20694+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20695+# Inc.
20696 # Written by Gordon Matzigkeit, 1996
20697 #
20698 # This file is part of GNU Libtool.
20699@@ -12874,19 +13547,42 @@ SP2NL=$lt_lt_SP2NL
20700 # turn newlines into spaces.
20701 NL2SP=$lt_lt_NL2SP
20702
20703+# convert \$build file names to \$host format.
20704+to_host_file_cmd=$lt_cv_to_host_file_cmd
20705+
20706+# convert \$build files to toolchain format.
20707+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20708+
20709 # An object symbol dumper.
20710 OBJDUMP=$lt_OBJDUMP
20711
20712 # Method to check whether dependent libraries are shared objects.
20713 deplibs_check_method=$lt_deplibs_check_method
20714
20715-# Command to use when deplibs_check_method == "file_magic".
20716+# Command to use when deplibs_check_method = "file_magic".
20717 file_magic_cmd=$lt_file_magic_cmd
20718
20719+# How to find potential files when deplibs_check_method = "file_magic".
20720+file_magic_glob=$lt_file_magic_glob
20721+
20722+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20723+want_nocaseglob=$lt_want_nocaseglob
20724+
20725+# DLL creation program.
20726+DLLTOOL=$lt_DLLTOOL
20727+
20728+# Command to associate shared and link libraries.
20729+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20730+
20731 # The archiver.
20732 AR=$lt_AR
20733+
20734+# Flags to create an archive.
20735 AR_FLAGS=$lt_AR_FLAGS
20736
20737+# How to feed a file listing to the archiver.
20738+archiver_list_spec=$lt_archiver_list_spec
20739+
20740 # A symbol stripping program.
20741 STRIP=$lt_STRIP
20742
20743@@ -12916,6 +13612,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20744 # Transform the output of nm in a C name address pair when lib prefix is needed.
20745 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20746
20747+# Specify filename containing input files for \$NM.
20748+nm_file_list_spec=$lt_nm_file_list_spec
20749+
20750+# The root where to search for dependent libraries,and in which our libraries should be installed.
20751+lt_sysroot=$lt_sysroot
20752+
20753 # The name of the directory that contains temporary libtool files.
20754 objdir=$objdir
20755
20756@@ -12925,6 +13627,9 @@ MAGIC_CMD=$MAGIC_CMD
20757 # Must we lock files when doing compilation?
20758 need_locks=$lt_need_locks
20759
20760+# Manifest tool.
20761+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20762+
20763 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20764 DSYMUTIL=$lt_DSYMUTIL
20765
20766@@ -13039,12 +13744,12 @@ with_gcc=$GCC
20767 # Compiler flag to turn off builtin functions.
20768 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20769
20770-# How to pass a linker flag through the compiler.
20771-wl=$lt_lt_prog_compiler_wl
20772-
20773 # Additional compiler flags for building library objects.
20774 pic_flag=$lt_lt_prog_compiler_pic
20775
20776+# How to pass a linker flag through the compiler.
20777+wl=$lt_lt_prog_compiler_wl
20778+
20779 # Compiler flag to prevent dynamic linking.
20780 link_static_flag=$lt_lt_prog_compiler_static
20781
20782@@ -13131,9 +13836,6 @@ inherit_rpath=$inherit_rpath
20783 # Whether libtool must link a program against all its dependency libraries.
20784 link_all_deplibs=$link_all_deplibs
20785
20786-# Fix the shell variable \$srcfile for the compiler.
20787-fix_srcfile_path=$lt_fix_srcfile_path
20788-
20789 # Set to "yes" if exported symbols are required.
20790 always_export_symbols=$always_export_symbols
20791
20792@@ -13149,6 +13851,9 @@ include_expsyms=$lt_include_expsyms
20793 # Commands necessary for linking programs (against libraries) with templates.
20794 prelink_cmds=$lt_prelink_cmds
20795
20796+# Commands necessary for finishing linking programs.
20797+postlink_cmds=$lt_postlink_cmds
20798+
20799 # Specify filename containing input files.
20800 file_list_spec=$lt_file_list_spec
20801
20802@@ -13181,210 +13886,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20803 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20804 # text mode, it properly converts lines to CR/LF. This bash problem
20805 # is reportedly fixed, but why not run on old versions too?
20806- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20807- || (rm -f "$cfgfile"; exit 1)
20808-
20809- case $xsi_shell in
20810- yes)
20811- cat << \_LT_EOF >> "$cfgfile"
20812-
20813-# func_dirname file append nondir_replacement
20814-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20815-# otherwise set result to NONDIR_REPLACEMENT.
20816-func_dirname ()
20817-{
20818- case ${1} in
20819- */*) func_dirname_result="${1%/*}${2}" ;;
20820- * ) func_dirname_result="${3}" ;;
20821- esac
20822-}
20823-
20824-# func_basename file
20825-func_basename ()
20826-{
20827- func_basename_result="${1##*/}"
20828-}
20829-
20830-# func_dirname_and_basename file append nondir_replacement
20831-# perform func_basename and func_dirname in a single function
20832-# call:
20833-# dirname: Compute the dirname of FILE. If nonempty,
20834-# add APPEND to the result, otherwise set result
20835-# to NONDIR_REPLACEMENT.
20836-# value returned in "$func_dirname_result"
20837-# basename: Compute filename of FILE.
20838-# value retuned in "$func_basename_result"
20839-# Implementation must be kept synchronized with func_dirname
20840-# and func_basename. For efficiency, we do not delegate to
20841-# those functions but instead duplicate the functionality here.
20842-func_dirname_and_basename ()
20843-{
20844- case ${1} in
20845- */*) func_dirname_result="${1%/*}${2}" ;;
20846- * ) func_dirname_result="${3}" ;;
20847- esac
20848- func_basename_result="${1##*/}"
20849-}
20850-
20851-# func_stripname prefix suffix name
20852-# strip PREFIX and SUFFIX off of NAME.
20853-# PREFIX and SUFFIX must not contain globbing or regex special
20854-# characters, hashes, percent signs, but SUFFIX may contain a leading
20855-# dot (in which case that matches only a dot).
20856-func_stripname ()
20857-{
20858- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20859- # positional parameters, so assign one to ordinary parameter first.
20860- func_stripname_result=${3}
20861- func_stripname_result=${func_stripname_result#"${1}"}
20862- func_stripname_result=${func_stripname_result%"${2}"}
20863-}
20864-
20865-# func_opt_split
20866-func_opt_split ()
20867-{
20868- func_opt_split_opt=${1%%=*}
20869- func_opt_split_arg=${1#*=}
20870-}
20871-
20872-# func_lo2o object
20873-func_lo2o ()
20874-{
20875- case ${1} in
20876- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20877- *) func_lo2o_result=${1} ;;
20878- esac
20879-}
20880-
20881-# func_xform libobj-or-source
20882-func_xform ()
20883-{
20884- func_xform_result=${1%.*}.lo
20885-}
20886-
20887-# func_arith arithmetic-term...
20888-func_arith ()
20889-{
20890- func_arith_result=$(( $* ))
20891-}
20892-
20893-# func_len string
20894-# STRING may not start with a hyphen.
20895-func_len ()
20896-{
20897- func_len_result=${#1}
20898-}
20899-
20900-_LT_EOF
20901- ;;
20902- *) # Bourne compatible functions.
20903- cat << \_LT_EOF >> "$cfgfile"
20904-
20905-# func_dirname file append nondir_replacement
20906-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20907-# otherwise set result to NONDIR_REPLACEMENT.
20908-func_dirname ()
20909-{
20910- # Extract subdirectory from the argument.
20911- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20912- if test "X$func_dirname_result" = "X${1}"; then
20913- func_dirname_result="${3}"
20914- else
20915- func_dirname_result="$func_dirname_result${2}"
20916- fi
20917-}
20918-
20919-# func_basename file
20920-func_basename ()
20921-{
20922- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20923-}
20924-
20925-
20926-# func_stripname prefix suffix name
20927-# strip PREFIX and SUFFIX off of NAME.
20928-# PREFIX and SUFFIX must not contain globbing or regex special
20929-# characters, hashes, percent signs, but SUFFIX may contain a leading
20930-# dot (in which case that matches only a dot).
20931-# func_strip_suffix prefix name
20932-func_stripname ()
20933-{
20934- case ${2} in
20935- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20936- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20937- esac
20938-}
20939-
20940-# sed scripts:
20941-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20942-my_sed_long_arg='1s/^-[^=]*=//'
20943-
20944-# func_opt_split
20945-func_opt_split ()
20946-{
20947- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
20948- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
20949-}
20950-
20951-# func_lo2o object
20952-func_lo2o ()
20953-{
20954- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
20955-}
20956-
20957-# func_xform libobj-or-source
20958-func_xform ()
20959-{
20960- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
20961-}
20962-
20963-# func_arith arithmetic-term...
20964-func_arith ()
20965-{
20966- func_arith_result=`expr "$@"`
20967-}
20968-
20969-# func_len string
20970-# STRING may not start with a hyphen.
20971-func_len ()
20972-{
20973- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
20974-}
20975-
20976-_LT_EOF
20977-esac
20978-
20979-case $lt_shell_append in
20980- yes)
20981- cat << \_LT_EOF >> "$cfgfile"
20982-
20983-# func_append var value
20984-# Append VALUE to the end of shell variable VAR.
20985-func_append ()
20986-{
20987- eval "$1+=\$2"
20988-}
20989-_LT_EOF
20990- ;;
20991- *)
20992- cat << \_LT_EOF >> "$cfgfile"
20993-
20994-# func_append var value
20995-# Append VALUE to the end of shell variable VAR.
20996-func_append ()
20997-{
20998- eval "$1=\$$1\$2"
20999-}
21000-
21001-_LT_EOF
21002- ;;
21003- esac
21004-
21005-
21006- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21007- || (rm -f "$cfgfile"; exit 1)
21008-
21009- mv -f "$cfgfile" "$ofile" ||
21010+ sed '$q' "$ltmain" >> "$cfgfile" \
21011+ || (rm -f "$cfgfile"; exit 1)
21012+
21013+ if test x"$xsi_shell" = xyes; then
21014+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
21015+func_dirname ()\
21016+{\
21017+\ case ${1} in\
21018+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21019+\ * ) func_dirname_result="${3}" ;;\
21020+\ esac\
21021+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
21022+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21023+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21024+test 0 -eq $? || _lt_function_replace_fail=:
21025+
21026+
21027+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
21028+func_basename ()\
21029+{\
21030+\ func_basename_result="${1##*/}"\
21031+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
21032+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21033+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21034+test 0 -eq $? || _lt_function_replace_fail=:
21035+
21036+
21037+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
21038+func_dirname_and_basename ()\
21039+{\
21040+\ case ${1} in\
21041+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21042+\ * ) func_dirname_result="${3}" ;;\
21043+\ esac\
21044+\ func_basename_result="${1##*/}"\
21045+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21046+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21047+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21048+test 0 -eq $? || _lt_function_replace_fail=:
21049+
21050+
21051+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21052+func_stripname ()\
21053+{\
21054+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21055+\ # positional parameters, so assign one to ordinary parameter first.\
21056+\ func_stripname_result=${3}\
21057+\ func_stripname_result=${func_stripname_result#"${1}"}\
21058+\ func_stripname_result=${func_stripname_result%"${2}"}\
21059+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21060+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21061+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21062+test 0 -eq $? || _lt_function_replace_fail=:
21063+
21064+
21065+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21066+func_split_long_opt ()\
21067+{\
21068+\ func_split_long_opt_name=${1%%=*}\
21069+\ func_split_long_opt_arg=${1#*=}\
21070+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21071+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21072+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21073+test 0 -eq $? || _lt_function_replace_fail=:
21074+
21075+
21076+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21077+func_split_short_opt ()\
21078+{\
21079+\ func_split_short_opt_arg=${1#??}\
21080+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21081+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21082+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21083+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21084+test 0 -eq $? || _lt_function_replace_fail=:
21085+
21086+
21087+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21088+func_lo2o ()\
21089+{\
21090+\ case ${1} in\
21091+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21092+\ *) func_lo2o_result=${1} ;;\
21093+\ esac\
21094+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21095+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21096+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21097+test 0 -eq $? || _lt_function_replace_fail=:
21098+
21099+
21100+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21101+func_xform ()\
21102+{\
21103+ func_xform_result=${1%.*}.lo\
21104+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21105+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21106+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21107+test 0 -eq $? || _lt_function_replace_fail=:
21108+
21109+
21110+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21111+func_arith ()\
21112+{\
21113+ func_arith_result=$(( $* ))\
21114+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21115+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21116+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21117+test 0 -eq $? || _lt_function_replace_fail=:
21118+
21119+
21120+ sed -e '/^func_len ()$/,/^} # func_len /c\
21121+func_len ()\
21122+{\
21123+ func_len_result=${#1}\
21124+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21125+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21126+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21127+test 0 -eq $? || _lt_function_replace_fail=:
21128+
21129+fi
21130+
21131+if test x"$lt_shell_append" = xyes; then
21132+ sed -e '/^func_append ()$/,/^} # func_append /c\
21133+func_append ()\
21134+{\
21135+ eval "${1}+=\\${2}"\
21136+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21137+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21138+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21139+test 0 -eq $? || _lt_function_replace_fail=:
21140+
21141+
21142+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21143+func_append_quoted ()\
21144+{\
21145+\ func_quote_for_eval "${2}"\
21146+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21147+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21148+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21149+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21150+test 0 -eq $? || _lt_function_replace_fail=:
21151+
21152+
21153+ # Save a `func_append' function call where possible by direct use of '+='
21154+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21155+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21156+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21157+ test 0 -eq $? || _lt_function_replace_fail=:
21158+else
21159+ # Save a `func_append' function call even when '+=' is not available
21160+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21161+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21162+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21163+ test 0 -eq $? || _lt_function_replace_fail=:
21164+fi
21165+
21166+if test x"$_lt_function_replace_fail" = x":"; then
21167+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21168+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21169+fi
21170+
21171+
21172+ mv -f "$cfgfile" "$ofile" ||
21173 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21174 chmod +x "$ofile"
21175
21176--
211772.9.0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-07 14:37:25 +0000