summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch34382
1 files changed, 34382 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
new file mode 100644
index 0000000000..05f1ed0dc5
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
@@ -0,0 +1,34382 @@
1From da089ddacb6506f406acd8939389183a4356ebf0 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] Use libtool 2.4
5
6get libtool sysroot support
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/Makefile.in | 3 +
13 bfd/configure | 1333 +++++++++---
14 bfd/configure.ac | 2 +-
15 binutils/Makefile.in | 3 +
16 binutils/configure | 1331 +++++++++---
17 gas/Makefile.in | 3 +
18 gas/configure | 1331 +++++++++---
19 gprof/Makefile.in | 3 +
20 gprof/configure | 1331 +++++++++---
21 gprofng/Makefile.in | 2 +
22 gprofng/configure | 1693 ++++++++++++----
23 gprofng/doc/Makefile.in | 2 +
24 gprofng/gp-display-html/Makefile.in | 2 +
25 gprofng/libcollector/Makefile.in | 2 +
26 gprofng/libcollector/configure | 1693 ++++++++++++----
27 gprofng/src/Makefile.in | 2 +
28 ld/Makefile.in | 3 +
29 ld/configure | 1694 ++++++++++++----
30 libbacktrace/Makefile.in | 108 +-
31 libbacktrace/aclocal.m4 | 73 +-
32 libbacktrace/configure | 1441 +++++++++----
33 libctf/Makefile.in | 2 +
34 libctf/configure | 1334 +++++++++---
35 libsframe/Makefile.in | 344 ++--
36 libsframe/aclocal.m4 | 220 +-
37 libsframe/configure | 1553 ++++++++++----
38 libtool.m4 | 1085 ++++++----
39 ltmain.sh | 2921 ++++++++++++++++++---------
40 ltoptions.m4 | 2 +-
41 ltversion.m4 | 12 +-
42 lt~obsolete.m4 | 2 +-
43 opcodes/Makefile.in | 3 +
44 opcodes/configure | 1331 +++++++++---
45 zlib/Makefile.in | 3 +
46 zlib/configure | 1331 +++++++++---
47 35 files changed, 16094 insertions(+), 6104 deletions(-)
48
49diff --git a/bfd/Makefile.in b/bfd/Makefile.in
50index faaa0c424b8..5371e093163 100644
51--- a/bfd/Makefile.in
52+++ b/bfd/Makefile.in
53@@ -340,6 +340,7 @@ DATADIRNAME = @DATADIRNAME@
54 DEBUGDIR = @DEBUGDIR@
55 DEFS = @DEFS@
56 DEPDIR = @DEPDIR@
57+DLLTOOL = @DLLTOOL@
58 DSYMUTIL = @DSYMUTIL@
59 DUMPBIN = @DUMPBIN@
60 ECHO_C = @ECHO_C@
61@@ -379,6 +380,7 @@ LTLIBINTL = @LTLIBINTL@
62 LTLIBOBJS = @LTLIBOBJS@
63 MAINT = @MAINT@
64 MAKEINFO = @MAKEINFO@
65+MANIFEST_TOOL = @MANIFEST_TOOL@
66 MKDIR_P = @MKDIR_P@
67 MKINSTALLDIRS = @MKINSTALLDIRS@
68 MSGFMT = @MSGFMT@
69@@ -425,6 +427,7 @@ abs_builddir = @abs_builddir@
70 abs_srcdir = @abs_srcdir@
71 abs_top_builddir = @abs_top_builddir@
72 abs_top_srcdir = @abs_top_srcdir@
73+ac_ct_AR = @ac_ct_AR@
74 ac_ct_CC = @ac_ct_CC@
75 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
76 all_backends = @all_backends@
77diff --git a/bfd/configure b/bfd/configure
78index acbac2f364a..a53a9d52719 100755
79--- a/bfd/configure
80+++ b/bfd/configure
81@@ -712,6 +712,9 @@ OTOOL
82 LIPO
83 NMEDIT
84 DSYMUTIL
85+MANIFEST_TOOL
86+ac_ct_AR
87+DLLTOOL
88 OBJDUMP
89 LN_S
90 NM
91@@ -830,6 +833,7 @@ enable_static
92 with_pic
93 enable_fast_install
94 with_gnu_ld
95+with_libtool_sysroot
96 enable_libtool_lock
97 enable_plugins
98 enable_largefile
99@@ -1526,6 +1530,8 @@ Optional Packages:
100 --with-pic try to use only PIC/non-PIC objects [default=use
101 both]
102 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
103+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
104+ (or the compiler's sysroot if not specified).
105 --with-mmap try using mmap for BFD input files if available
106 --with-separate-debug-dir=DIR
107 Look for global separate debug info in DIR
108@@ -5063,8 +5069,8 @@ esac
109
110
111
112-macro_version='2.2.7a'
113-macro_revision='1.3134'
114+macro_version='2.4'
115+macro_revision='1.3293'
116
117
118
119@@ -5104,7 +5110,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
121 $as_echo_n "checking how to print strings... " >&6; }
122 # Test print first, because it will be a builtin if present.
123-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
124+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
125 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
126 ECHO='print -r --'
127 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
128@@ -5797,8 +5803,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
129 # Try some XSI features
130 xsi_shell=no
131 ( _lt_dummy="a/b/c"
132- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
133- = c,a/b,, \
134+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
135+ = c,a/b,b/c, \
136 && eval 'test $(( 1 + 1 )) -eq 2 \
137 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
138 && xsi_shell=yes
139@@ -5847,6 +5853,80 @@ esac
140
141
142
143+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
144+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
145+if ${lt_cv_to_host_file_cmd+:} false; then :
146+ $as_echo_n "(cached) " >&6
147+else
148+ case $host in
149+ *-*-mingw* )
150+ case $build in
151+ *-*-mingw* ) # actually msys
152+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
153+ ;;
154+ *-*-cygwin* )
155+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
156+ ;;
157+ * ) # otherwise, assume *nix
158+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
159+ ;;
160+ esac
161+ ;;
162+ *-*-cygwin* )
163+ case $build in
164+ *-*-mingw* ) # actually msys
165+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
166+ ;;
167+ *-*-cygwin* )
168+ lt_cv_to_host_file_cmd=func_convert_file_noop
169+ ;;
170+ * ) # otherwise, assume *nix
171+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
172+ ;;
173+ esac
174+ ;;
175+ * ) # unhandled hosts (and "normal" native builds)
176+ lt_cv_to_host_file_cmd=func_convert_file_noop
177+ ;;
178+esac
179+
180+fi
181+
182+to_host_file_cmd=$lt_cv_to_host_file_cmd
183+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
184+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
185+
186+
187+
188+
189+
190+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
191+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
192+if ${lt_cv_to_tool_file_cmd+:} false; then :
193+ $as_echo_n "(cached) " >&6
194+else
195+ #assume ordinary cross tools, or native build.
196+lt_cv_to_tool_file_cmd=func_convert_file_noop
197+case $host in
198+ *-*-mingw* )
199+ case $build in
200+ *-*-mingw* ) # actually msys
201+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
202+ ;;
203+ esac
204+ ;;
205+esac
206+
207+fi
208+
209+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
210+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
211+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
212+
213+
214+
215+
216+
217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
218 $as_echo_n "checking for $LD option to reload object files... " >&6; }
219 if ${lt_cv_ld_reload_flag+:} false; then :
220@@ -5863,6 +5943,11 @@ case $reload_flag in
221 esac
222 reload_cmds='$LD$reload_flag -o $output$reload_objs'
223 case $host_os in
224+ cygwin* | mingw* | pw32* | cegcc*)
225+ if test "$GCC" != yes; then
226+ reload_cmds=false
227+ fi
228+ ;;
229 darwin*)
230 if test "$GCC" = yes; then
231 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
232@@ -6031,7 +6116,8 @@ mingw* | pw32*)
233 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
234 lt_cv_file_magic_cmd='func_win32_libid'
235 else
236- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
237+ # Keep this pattern in sync with the one in func_win32_libid.
238+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
239 lt_cv_file_magic_cmd='$OBJDUMP -f'
240 fi
241 ;;
242@@ -6190,6 +6276,21 @@ esac
243 fi
244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
245 $as_echo "$lt_cv_deplibs_check_method" >&6; }
246+
247+file_magic_glob=
248+want_nocaseglob=no
249+if test "$build" = "$host"; then
250+ case $host_os in
251+ mingw* | pw32*)
252+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
253+ want_nocaseglob=yes
254+ else
255+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
256+ fi
257+ ;;
258+ esac
259+fi
260+
261 file_magic_cmd=$lt_cv_file_magic_cmd
262 deplibs_check_method=$lt_cv_deplibs_check_method
263 test -z "$deplibs_check_method" && deplibs_check_method=unknown
264@@ -6205,6 +6306,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
265
266
267
268+
269+
270+
271+
272+
273+
274+
275+
276+
277+
278+if test -n "$ac_tool_prefix"; then
279+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
280+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
281+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
282+$as_echo_n "checking for $ac_word... " >&6; }
283+if ${ac_cv_prog_DLLTOOL+:} false; then :
284+ $as_echo_n "(cached) " >&6
285+else
286+ if test -n "$DLLTOOL"; then
287+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
288+else
289+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
290+for as_dir in $PATH
291+do
292+ IFS=$as_save_IFS
293+ test -z "$as_dir" && as_dir=.
294+ for ac_exec_ext in '' $ac_executable_extensions; do
295+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
296+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
297+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
298+ break 2
299+ fi
300+done
301+ done
302+IFS=$as_save_IFS
303+
304+fi
305+fi
306+DLLTOOL=$ac_cv_prog_DLLTOOL
307+if test -n "$DLLTOOL"; then
308+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
309+$as_echo "$DLLTOOL" >&6; }
310+else
311+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
312+$as_echo "no" >&6; }
313+fi
314+
315+
316+fi
317+if test -z "$ac_cv_prog_DLLTOOL"; then
318+ ac_ct_DLLTOOL=$DLLTOOL
319+ # Extract the first word of "dlltool", so it can be a program name with args.
320+set dummy dlltool; ac_word=$2
321+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
322+$as_echo_n "checking for $ac_word... " >&6; }
323+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
324+ $as_echo_n "(cached) " >&6
325+else
326+ if test -n "$ac_ct_DLLTOOL"; then
327+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
328+else
329+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
330+for as_dir in $PATH
331+do
332+ IFS=$as_save_IFS
333+ test -z "$as_dir" && as_dir=.
334+ for ac_exec_ext in '' $ac_executable_extensions; do
335+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
336+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
337+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
338+ break 2
339+ fi
340+done
341+ done
342+IFS=$as_save_IFS
343+
344+fi
345+fi
346+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
347+if test -n "$ac_ct_DLLTOOL"; then
348+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
349+$as_echo "$ac_ct_DLLTOOL" >&6; }
350+else
351+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
352+$as_echo "no" >&6; }
353+fi
354+
355+ if test "x$ac_ct_DLLTOOL" = x; then
356+ DLLTOOL="false"
357+ else
358+ case $cross_compiling:$ac_tool_warned in
359+yes:)
360+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
361+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
362+ac_tool_warned=yes ;;
363+esac
364+ DLLTOOL=$ac_ct_DLLTOOL
365+ fi
366+else
367+ DLLTOOL="$ac_cv_prog_DLLTOOL"
368+fi
369+
370+test -z "$DLLTOOL" && DLLTOOL=dlltool
371+
372+
373+
374+
375+
376+
377+
378+
379+
380+
381+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
382+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
383+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
384+ $as_echo_n "(cached) " >&6
385+else
386+ lt_cv_sharedlib_from_linklib_cmd='unknown'
387+
388+case $host_os in
389+cygwin* | mingw* | pw32* | cegcc*)
390+ # two different shell functions defined in ltmain.sh
391+ # decide which to use based on capabilities of $DLLTOOL
392+ case `$DLLTOOL --help 2>&1` in
393+ *--identify-strict*)
394+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
395+ ;;
396+ *)
397+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
398+ ;;
399+ esac
400+ ;;
401+*)
402+ # fallback: assume linklib IS sharedlib
403+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
404+ ;;
405+esac
406+
407+fi
408+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
409+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
410+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
411+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
412+
413+
414+
415+
416+
417+
418+
419 plugin_option=
420 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
421 for plugin in $plugin_names; do
422@@ -6219,8 +6471,10 @@ for plugin in $plugin_names; do
423 done
424
425 if test -n "$ac_tool_prefix"; then
426- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
427-set dummy ${ac_tool_prefix}ar; ac_word=$2
428+ for ac_prog in ar
429+ do
430+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
431+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
433 $as_echo_n "checking for $ac_word... " >&6; }
434 if ${ac_cv_prog_AR+:} false; then :
435@@ -6236,7 +6490,7 @@ do
436 test -z "$as_dir" && as_dir=.
437 for ac_exec_ext in '' $ac_executable_extensions; do
438 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
439- ac_cv_prog_AR="${ac_tool_prefix}ar"
440+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
441 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
442 break 2
443 fi
444@@ -6256,11 +6510,15 @@ $as_echo "no" >&6; }
445 fi
446
447
448+ test -n "$AR" && break
449+ done
450 fi
451-if test -z "$ac_cv_prog_AR"; then
452+if test -z "$AR"; then
453 ac_ct_AR=$AR
454- # Extract the first word of "ar", so it can be a program name with args.
455-set dummy ar; ac_word=$2
456+ for ac_prog in ar
457+do
458+ # Extract the first word of "$ac_prog", so it can be a program name with args.
459+set dummy $ac_prog; ac_word=$2
460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
461 $as_echo_n "checking for $ac_word... " >&6; }
462 if ${ac_cv_prog_ac_ct_AR+:} false; then :
463@@ -6276,7 +6534,7 @@ do
464 test -z "$as_dir" && as_dir=.
465 for ac_exec_ext in '' $ac_executable_extensions; do
466 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
467- ac_cv_prog_ac_ct_AR="ar"
468+ ac_cv_prog_ac_ct_AR="$ac_prog"
469 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
470 break 2
471 fi
472@@ -6295,6 +6553,10 @@ else
473 $as_echo "no" >&6; }
474 fi
475
476+
477+ test -n "$ac_ct_AR" && break
478+done
479+
480 if test "x$ac_ct_AR" = x; then
481 AR="false"
482 else
483@@ -6306,25 +6568,20 @@ ac_tool_warned=yes ;;
484 esac
485 AR=$ac_ct_AR
486 fi
487-else
488- AR="$ac_cv_prog_AR"
489 fi
490
491-test -z "$AR" && AR=ar
492-if test -n "$plugin_option"; then
493- if $AR --help 2>&1 | grep -q "\--plugin"; then
494- touch conftest.c
495- $AR $plugin_option rc conftest.a conftest.c
496- if test "$?" != 0; then
497- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
498+ touch conftest.c
499+ $AR $plugin_option rc conftest.a conftest.c
500+ if test "$?" != 0; then
501+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
502 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
503- else
504- AR="$AR $plugin_option"
505- fi
506- rm -f conftest.*
507+ else
508+ AR="$AR $plugin_option"
509 fi
510-fi
511-test -z "$AR_FLAGS" && AR_FLAGS=cru
512+ rm -f conftest.*
513+: ${AR=ar}
514+: ${AR_FLAGS=cru}
515+
516
517
518
519@@ -6335,6 +6592,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
520
521
522
523+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
524+$as_echo_n "checking for archiver @FILE support... " >&6; }
525+if ${lt_cv_ar_at_file+:} false; then :
526+ $as_echo_n "(cached) " >&6
527+else
528+ lt_cv_ar_at_file=no
529+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
530+/* end confdefs.h. */
531+
532+int
533+main ()
534+{
535+
536+ ;
537+ return 0;
538+}
539+_ACEOF
540+if ac_fn_c_try_compile "$LINENO"; then :
541+ echo conftest.$ac_objext > conftest.lst
542+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
543+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
544+ (eval $lt_ar_try) 2>&5
545+ ac_status=$?
546+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
547+ test $ac_status = 0; }
548+ if test "$ac_status" -eq 0; then
549+ # Ensure the archiver fails upon bogus file names.
550+ rm -f conftest.$ac_objext libconftest.a
551+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
552+ (eval $lt_ar_try) 2>&5
553+ ac_status=$?
554+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
555+ test $ac_status = 0; }
556+ if test "$ac_status" -ne 0; then
557+ lt_cv_ar_at_file=@
558+ fi
559+ fi
560+ rm -f conftest.* libconftest.a
561+
562+fi
563+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
564+
565+fi
566+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
567+$as_echo "$lt_cv_ar_at_file" >&6; }
568+
569+if test "x$lt_cv_ar_at_file" = xno; then
570+ archiver_list_spec=
571+else
572+ archiver_list_spec=$lt_cv_ar_at_file
573+fi
574+
575+
576+
577+
578+
579+
580
581 if test -n "$ac_tool_prefix"; then
582 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
583@@ -6675,8 +6989,8 @@ esac
584 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
585
586 # Transform an extracted symbol line into symbol name and symbol address
587-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
588-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'"
589+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
590+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'"
591
592 # Handle CRLF in mingw tool chain
593 opt_cr=
594@@ -6712,6 +7026,7 @@ for ac_symprfx in "" "_"; do
595 else
596 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
597 fi
598+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
599
600 # Check to see that the pipe works correctly.
601 pipe_works=no
602@@ -6753,6 +7068,18 @@ _LT_EOF
603 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
604 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
605 cat <<_LT_EOF > conftest.$ac_ext
606+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
607+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
608+/* DATA imports from DLLs on WIN32 con't be const, because runtime
609+ relocations are performed -- see ld's documentation on pseudo-relocs. */
610+# define LT_DLSYM_CONST
611+#elif defined(__osf__)
612+/* This system does not cope well with relocations in const data. */
613+# define LT_DLSYM_CONST
614+#else
615+# define LT_DLSYM_CONST const
616+#endif
617+
618 #ifdef __cplusplus
619 extern "C" {
620 #endif
621@@ -6764,7 +7091,7 @@ _LT_EOF
622 cat <<_LT_EOF >> conftest.$ac_ext
623
624 /* The mapping between symbol names and symbols. */
625-const struct {
626+LT_DLSYM_CONST struct {
627 const char *name;
628 void *address;
629 }
630@@ -6790,8 +7117,8 @@ static const void *lt_preloaded_setup() {
631 _LT_EOF
632 # Now try linking the two files.
633 mv conftest.$ac_objext conftstm.$ac_objext
634- lt_save_LIBS="$LIBS"
635- lt_save_CFLAGS="$CFLAGS"
636+ lt_globsym_save_LIBS=$LIBS
637+ lt_globsym_save_CFLAGS=$CFLAGS
638 LIBS="conftstm.$ac_objext"
639 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
640 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
641@@ -6801,8 +7128,8 @@ _LT_EOF
642 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
643 pipe_works=yes
644 fi
645- LIBS="$lt_save_LIBS"
646- CFLAGS="$lt_save_CFLAGS"
647+ LIBS=$lt_globsym_save_LIBS
648+ CFLAGS=$lt_globsym_save_CFLAGS
649 else
650 echo "cannot find nm_test_func in $nlist" >&5
651 fi
652@@ -6839,6 +7166,14 @@ else
653 $as_echo "ok" >&6; }
654 fi
655
656+# Response file support.
657+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
658+ nm_file_list_spec='@'
659+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
660+ nm_file_list_spec='@'
661+fi
662+
663+
664
665
666
667@@ -6857,6 +7192,47 @@ fi
668
669
670
671+
672+
673+
674+
675+
676+
677+
678+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
679+$as_echo_n "checking for sysroot... " >&6; }
680+
681+# Check whether --with-libtool-sysroot was given.
682+if test "${with_libtool_sysroot+set}" = set; then :
683+ withval=$with_libtool_sysroot;
684+else
685+ with_libtool_sysroot=no
686+fi
687+
688+
689+lt_sysroot=
690+case ${with_libtool_sysroot} in #(
691+ yes)
692+ if test "$GCC" = yes; then
693+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
694+ fi
695+ ;; #(
696+ /*)
697+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
698+ ;; #(
699+ no|'')
700+ ;; #(
701+ *)
702+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
703+$as_echo "${with_libtool_sysroot}" >&6; }
704+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
705+ ;;
706+esac
707+
708+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
709+$as_echo "${lt_sysroot:-no}" >&6; }
710+
711+
712
713
714
715@@ -7066,6 +7442,123 @@ esac
716
717 need_locks="$enable_libtool_lock"
718
719+if test -n "$ac_tool_prefix"; then
720+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
721+set dummy ${ac_tool_prefix}mt; ac_word=$2
722+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
723+$as_echo_n "checking for $ac_word... " >&6; }
724+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
725+ $as_echo_n "(cached) " >&6
726+else
727+ if test -n "$MANIFEST_TOOL"; then
728+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
729+else
730+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
731+for as_dir in $PATH
732+do
733+ IFS=$as_save_IFS
734+ test -z "$as_dir" && as_dir=.
735+ for ac_exec_ext in '' $ac_executable_extensions; do
736+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
737+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
738+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
739+ break 2
740+ fi
741+done
742+ done
743+IFS=$as_save_IFS
744+
745+fi
746+fi
747+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
748+if test -n "$MANIFEST_TOOL"; then
749+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
750+$as_echo "$MANIFEST_TOOL" >&6; }
751+else
752+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
753+$as_echo "no" >&6; }
754+fi
755+
756+
757+fi
758+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
759+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
760+ # Extract the first word of "mt", so it can be a program name with args.
761+set dummy mt; ac_word=$2
762+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
763+$as_echo_n "checking for $ac_word... " >&6; }
764+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
765+ $as_echo_n "(cached) " >&6
766+else
767+ if test -n "$ac_ct_MANIFEST_TOOL"; then
768+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
769+else
770+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
771+for as_dir in $PATH
772+do
773+ IFS=$as_save_IFS
774+ test -z "$as_dir" && as_dir=.
775+ for ac_exec_ext in '' $ac_executable_extensions; do
776+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
777+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
778+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
779+ break 2
780+ fi
781+done
782+ done
783+IFS=$as_save_IFS
784+
785+fi
786+fi
787+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
788+if test -n "$ac_ct_MANIFEST_TOOL"; then
789+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
790+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
791+else
792+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
793+$as_echo "no" >&6; }
794+fi
795+
796+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
797+ MANIFEST_TOOL=":"
798+ else
799+ case $cross_compiling:$ac_tool_warned in
800+yes:)
801+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
802+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
803+ac_tool_warned=yes ;;
804+esac
805+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
806+ fi
807+else
808+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
809+fi
810+
811+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
812+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
813+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
814+if ${lt_cv_path_mainfest_tool+:} false; then :
815+ $as_echo_n "(cached) " >&6
816+else
817+ lt_cv_path_mainfest_tool=no
818+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
819+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
820+ cat conftest.err >&5
821+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
822+ lt_cv_path_mainfest_tool=yes
823+ fi
824+ rm -f conftest*
825+fi
826+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
827+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
828+if test "x$lt_cv_path_mainfest_tool" != xyes; then
829+ MANIFEST_TOOL=:
830+fi
831+
832+
833+
834+
835+
836
837 case $host_os in
838 rhapsody* | darwin*)
839@@ -7629,6 +8122,8 @@ _LT_EOF
840 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
841 echo "$AR cru libconftest.a conftest.o" >&5
842 $AR cru libconftest.a conftest.o 2>&5
843+ echo "$RANLIB libconftest.a" >&5
844+ $RANLIB libconftest.a 2>&5
845 cat > conftest.c << _LT_EOF
846 int main() { return 0;}
847 _LT_EOF
848@@ -8182,8 +8677,6 @@ fi
849 lt_prog_compiler_pic=
850 lt_prog_compiler_static=
851
852-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
853-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
854
855 if test "$GCC" = yes; then
856 lt_prog_compiler_wl='-Wl,'
857@@ -8349,6 +8842,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
858 lt_prog_compiler_pic='--shared'
859 lt_prog_compiler_static='--static'
860 ;;
861+ nagfor*)
862+ # NAG Fortran compiler
863+ lt_prog_compiler_wl='-Wl,-Wl,,'
864+ lt_prog_compiler_pic='-PIC'
865+ lt_prog_compiler_static='-Bstatic'
866+ ;;
867 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
868 # Portland Group compilers (*not* the Pentium gcc compiler,
869 # which looks to be a dead project)
870@@ -8411,7 +8910,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
871 lt_prog_compiler_pic='-KPIC'
872 lt_prog_compiler_static='-Bstatic'
873 case $cc_basename in
874- f77* | f90* | f95*)
875+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
876 lt_prog_compiler_wl='-Qoption ld ';;
877 *)
878 lt_prog_compiler_wl='-Wl,';;
879@@ -8468,13 +8967,17 @@ case $host_os in
880 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
881 ;;
882 esac
883-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
884-$as_echo "$lt_prog_compiler_pic" >&6; }
885-
886-
887-
888-
889
890+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
891+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
892+if ${lt_cv_prog_compiler_pic+:} false; then :
893+ $as_echo_n "(cached) " >&6
894+else
895+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
896+fi
897+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
898+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
899+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
900
901 #
902 # Check to make sure the PIC flag actually works.
903@@ -8535,6 +9038,11 @@ fi
904
905
906
907+
908+
909+
910+
911+
912 #
913 # Check to make sure the static flag actually works.
914 #
915@@ -8885,7 +9393,8 @@ _LT_EOF
916 allow_undefined_flag=unsupported
917 always_export_symbols=no
918 enable_shared_with_static_runtimes=yes
919- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
920+ 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'
921+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
922
923 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
924 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
925@@ -8984,12 +9493,12 @@ _LT_EOF
926 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
927 hardcode_libdir_flag_spec=
928 hardcode_libdir_flag_spec_ld='-rpath $libdir'
929- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
930+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
931 if test "x$supports_anon_versioning" = xyes; then
932 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
933 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
934 echo "local: *; };" >> $output_objdir/$libname.ver~
935- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
936+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
937 fi
938 ;;
939 esac
940@@ -9003,8 +9512,8 @@ _LT_EOF
941 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
942 wlarc=
943 else
944- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
945- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
946+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
947+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
948 fi
949 ;;
950
951@@ -9022,8 +9531,8 @@ _LT_EOF
952
953 _LT_EOF
954 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
955- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
956- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
957+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
958+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
959 else
960 ld_shlibs=no
961 fi
962@@ -9069,8 +9578,8 @@ _LT_EOF
963
964 *)
965 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
966- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
967- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
968+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
969+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
970 else
971 ld_shlibs=no
972 fi
973@@ -9200,7 +9709,13 @@ _LT_EOF
974 allow_undefined_flag='-berok'
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 ${lt_cv_aix_libpath_+:} false; 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@@ -9213,22 +9728,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 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"
1031@@ -9240,7 +9762,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 else
1033 # Determine the default libpath from the value encoded in an
1034 # empty executable.
1035- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1036+ if test "${lt_cv_aix_libpath+set}" = set; then
1037+ aix_libpath=$lt_cv_aix_libpath
1038+else
1039+ if ${lt_cv_aix_libpath_+:} false; then :
1040+ $as_echo_n "(cached) " >&6
1041+else
1042+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1043 /* end confdefs.h. */
1044
1045 int
1046@@ -9253,22 +9781,29 @@ main ()
1047 _ACEOF
1048 if ac_fn_c_try_link "$LINENO"; then :
1049
1050-lt_aix_libpath_sed='
1051- /Import File Strings/,/^$/ {
1052- /^0/ {
1053- s/^0 *\(.*\)$/\1/
1054- p
1055- }
1056- }'
1057-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1058-# Check for a 64-bit object if we didn't find anything.
1059-if test -z "$aix_libpath"; then
1060- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1061-fi
1062+ lt_aix_libpath_sed='
1063+ /Import File Strings/,/^$/ {
1064+ /^0/ {
1065+ s/^0 *\([^ ]*\) *$/\1/
1066+ p
1067+ }
1068+ }'
1069+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1070+ # Check for a 64-bit object if we didn't find anything.
1071+ if test -z "$lt_cv_aix_libpath_"; then
1072+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1073+ fi
1074 fi
1075 rm -f core conftest.err conftest.$ac_objext \
1076 conftest$ac_exeext conftest.$ac_ext
1077-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1078+ if test -z "$lt_cv_aix_libpath_"; then
1079+ lt_cv_aix_libpath_="/usr/lib:/lib"
1080+ fi
1081+
1082+fi
1083+
1084+ aix_libpath=$lt_cv_aix_libpath_
1085+fi
1086
1087 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1088 # Warning - without using the other run time loading flags,
1089@@ -9313,20 +9848,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1090 # Microsoft Visual C++.
1091 # hardcode_libdir_flag_spec is actually meaningless, as there is
1092 # no search path for DLLs.
1093- hardcode_libdir_flag_spec=' '
1094- allow_undefined_flag=unsupported
1095- # Tell ltmain to make .lib files, not .a files.
1096- libext=lib
1097- # Tell ltmain to make .dll files, not .so files.
1098- shrext_cmds=".dll"
1099- # FIXME: Setting linknames here is a bad hack.
1100- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1101- # The linker will automatically build a .lib file if we build a DLL.
1102- old_archive_from_new_cmds='true'
1103- # FIXME: Should let the user specify the lib program.
1104- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1105- fix_srcfile_path='`cygpath -w "$srcfile"`'
1106- enable_shared_with_static_runtimes=yes
1107+ case $cc_basename in
1108+ cl*)
1109+ # Native MSVC
1110+ hardcode_libdir_flag_spec=' '
1111+ allow_undefined_flag=unsupported
1112+ always_export_symbols=yes
1113+ file_list_spec='@'
1114+ # Tell ltmain to make .lib files, not .a files.
1115+ libext=lib
1116+ # Tell ltmain to make .dll files, not .so files.
1117+ shrext_cmds=".dll"
1118+ # FIXME: Setting linknames here is a bad hack.
1119+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1120+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1121+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1122+ else
1123+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1124+ fi~
1125+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1126+ linknames='
1127+ # The linker will not automatically build a static lib if we build a DLL.
1128+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1129+ enable_shared_with_static_runtimes=yes
1130+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1131+ # Don't use ranlib
1132+ old_postinstall_cmds='chmod 644 $oldlib'
1133+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1134+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1135+ case $lt_outputfile in
1136+ *.exe|*.EXE) ;;
1137+ *)
1138+ lt_outputfile="$lt_outputfile.exe"
1139+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1140+ ;;
1141+ esac~
1142+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1143+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1144+ $RM "$lt_outputfile.manifest";
1145+ fi'
1146+ ;;
1147+ *)
1148+ # Assume MSVC wrapper
1149+ hardcode_libdir_flag_spec=' '
1150+ allow_undefined_flag=unsupported
1151+ # Tell ltmain to make .lib files, not .a files.
1152+ libext=lib
1153+ # Tell ltmain to make .dll files, not .so files.
1154+ shrext_cmds=".dll"
1155+ # FIXME: Setting linknames here is a bad hack.
1156+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1157+ # The linker will automatically build a .lib file if we build a DLL.
1158+ old_archive_from_new_cmds='true'
1159+ # FIXME: Should let the user specify the lib program.
1160+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1161+ enable_shared_with_static_runtimes=yes
1162+ ;;
1163+ esac
1164 ;;
1165
1166 darwin* | rhapsody*)
1167@@ -9387,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1168
1169 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1170 freebsd* | dragonfly*)
1171- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1172+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1173 hardcode_libdir_flag_spec='-R$libdir'
1174 hardcode_direct=yes
1175 hardcode_shlibpath_var=no
1176@@ -9395,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1177
1178 hpux9*)
1179 if test "$GCC" = yes; then
1180- 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'
1181+ 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'
1182 else
1183 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'
1184 fi
1185@@ -9411,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1186
1187 hpux10*)
1188 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1189- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1190+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1191 else
1192 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1193 fi
1194@@ -9435,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1195 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1196 ;;
1197 ia64*)
1198- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1199+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1200 ;;
1201 *)
1202- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1203+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1204 ;;
1205 esac
1206 else
1207@@ -9517,23 +10095,36 @@ fi
1208
1209 irix5* | irix6* | nonstopux*)
1210 if test "$GCC" = yes; then
1211- 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'
1212+ 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'
1213 # Try to use the -exported_symbol ld option, if it does not
1214 # work, assume that -exports_file does not work either and
1215 # implicitly export all symbols.
1216- save_LDFLAGS="$LDFLAGS"
1217- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1218- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1219+ # This should be the same for all languages, so no per-tag cache variable.
1220+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1221+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1222+if ${lt_cv_irix_exported_symbol+:} false; then :
1223+ $as_echo_n "(cached) " >&6
1224+else
1225+ save_LDFLAGS="$LDFLAGS"
1226+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1227+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1228 /* end confdefs.h. */
1229-int foo(void) {}
1230+int foo (void) { return 0; }
1231 _ACEOF
1232 if ac_fn_c_try_link "$LINENO"; then :
1233- 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'
1234-
1235+ lt_cv_irix_exported_symbol=yes
1236+else
1237+ lt_cv_irix_exported_symbol=no
1238 fi
1239 rm -f core conftest.err conftest.$ac_objext \
1240 conftest$ac_exeext conftest.$ac_ext
1241- LDFLAGS="$save_LDFLAGS"
1242+ LDFLAGS="$save_LDFLAGS"
1243+fi
1244+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1245+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1246+ if test "$lt_cv_irix_exported_symbol" = yes; then
1247+ 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'
1248+ fi
1249 else
1250 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'
1251 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'
1252@@ -9618,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_objext \
1253 osf4* | osf5*) # as osf3* with the addition of -msym flag
1254 if test "$GCC" = yes; then
1255 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1256- 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'
1257+ 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'
1258 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1259 else
1260 allow_undefined_flag=' -expect_unresolved \*'
1261@@ -9637,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_objext \
1262 no_undefined_flag=' -z defs'
1263 if test "$GCC" = yes; then
1264 wlarc='${wl}'
1265- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1266+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1267 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1268- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1269+ $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'
1270 else
1271 case `$CC -V 2>&1` in
1272 *"Compilers 5.0"*)
1273@@ -10215,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1274 need_version=no
1275 need_lib_prefix=no
1276
1277- case $GCC,$host_os in
1278- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1279+ case $GCC,$cc_basename in
1280+ yes,*)
1281+ # gcc
1282 library_names_spec='$libname.dll.a'
1283 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1284 postinstall_cmds='base_file=`basename \${file}`~
1285@@ -10249,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1286 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1287 ;;
1288 esac
1289+ dynamic_linker='Win32 ld.exe'
1290+ ;;
1291+
1292+ *,cl*)
1293+ # Native MSVC
1294+ libname_spec='$name'
1295+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1296+ library_names_spec='${libname}.dll.lib'
1297+
1298+ case $build_os in
1299+ mingw*)
1300+ sys_lib_search_path_spec=
1301+ lt_save_ifs=$IFS
1302+ IFS=';'
1303+ for lt_path in $LIB
1304+ do
1305+ IFS=$lt_save_ifs
1306+ # Let DOS variable expansion print the short 8.3 style file name.
1307+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1308+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1309+ done
1310+ IFS=$lt_save_ifs
1311+ # Convert to MSYS style.
1312+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1313+ ;;
1314+ cygwin*)
1315+ # Convert to unix form, then to dos form, then back to unix form
1316+ # but this time dos style (no spaces!) so that the unix form looks
1317+ # like /cygdrive/c/PROGRA~1:/cygdr...
1318+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1319+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1320+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1321+ ;;
1322+ *)
1323+ sys_lib_search_path_spec="$LIB"
1324+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1325+ # It is most probably a Windows format PATH.
1326+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1327+ else
1328+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1329+ fi
1330+ # FIXME: find the short name or the path components, as spaces are
1331+ # common. (e.g. "Program Files" -> "PROGRA~1")
1332+ ;;
1333+ esac
1334+
1335+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1336+ postinstall_cmds='base_file=`basename \${file}`~
1337+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1338+ dldir=$destdir/`dirname \$dlpath`~
1339+ test -d \$dldir || mkdir -p \$dldir~
1340+ $install_prog $dir/$dlname \$dldir/$dlname'
1341+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1342+ dlpath=$dir/\$dldll~
1343+ $RM \$dlpath'
1344+ shlibpath_overrides_runpath=yes
1345+ dynamic_linker='Win32 link.exe'
1346 ;;
1347
1348 *)
1349+ # Assume MSVC wrapper
1350 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1351+ dynamic_linker='Win32 ld.exe'
1352 ;;
1353 esac
1354- dynamic_linker='Win32 ld.exe'
1355 # FIXME: first we should search . and the directory the executable is in
1356 shlibpath_var=PATH
1357 ;;
1358@@ -11157,7 +11807,7 @@ else
1359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1360 lt_status=$lt_dlunknown
1361 cat > conftest.$ac_ext <<_LT_EOF
1362-#line 11160 "configure"
1363+#line $LINENO "configure"
1364 #include "confdefs.h"
1365
1366 #if HAVE_DLFCN_H
1367@@ -11201,10 +11851,10 @@ else
1368 /* When -fvisbility=hidden is used, assume the code has been annotated
1369 correspondingly for the symbols needed. */
1370 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1371-void fnord () __attribute__((visibility("default")));
1372+int fnord () __attribute__((visibility("default")));
1373 #endif
1374
1375-void fnord () { int i=42; }
1376+int fnord () { return 42; }
1377 int main ()
1378 {
1379 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1380@@ -11263,7 +11913,7 @@ else
1381 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1382 lt_status=$lt_dlunknown
1383 cat > conftest.$ac_ext <<_LT_EOF
1384-#line 11266 "configure"
1385+#line $LINENO "configure"
1386 #include "confdefs.h"
1387
1388 #if HAVE_DLFCN_H
1389@@ -11307,10 +11957,10 @@ else
1390 /* When -fvisbility=hidden is used, assume the code has been annotated
1391 correspondingly for the symbols needed. */
1392 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1393-void fnord () __attribute__((visibility("default")));
1394+int fnord () __attribute__((visibility("default")));
1395 #endif
1396
1397-void fnord () { int i=42; }
1398+int fnord () { return 42; }
1399 int main ()
1400 {
1401 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1402@@ -15691,7 +16341,7 @@ SHARED_LDFLAGS=
1403 if test "$enable_shared" = "yes"; then
1404 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1405 if test -n "$x"; then
1406- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1407+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1408 fi
1409 fi
1410
1411@@ -18313,13 +18963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1412 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1413 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1414 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1415+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1416+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1417 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1418 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1419 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1420 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1421 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1422+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1423+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1424+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1425+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1426 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1427 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1428+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1429 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1430 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1431 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1432@@ -18334,14 +18991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1433 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1434 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1435 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"`'
1436+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1437+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1438 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1439 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1440 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1441-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1442 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1443+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1444 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1445 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1446 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1447+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1448 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1449 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1450 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1451@@ -18374,12 +19034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1452 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1453 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1454 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1455-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1456 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1457 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1458 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1459 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1460 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1461+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1462 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1463 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1464 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1465@@ -18434,8 +19094,13 @@ reload_flag \
1466 OBJDUMP \
1467 deplibs_check_method \
1468 file_magic_cmd \
1469+file_magic_glob \
1470+want_nocaseglob \
1471+DLLTOOL \
1472+sharedlib_from_linklib_cmd \
1473 AR \
1474 AR_FLAGS \
1475+archiver_list_spec \
1476 STRIP \
1477 RANLIB \
1478 CC \
1479@@ -18445,12 +19110,14 @@ lt_cv_sys_global_symbol_pipe \
1480 lt_cv_sys_global_symbol_to_cdecl \
1481 lt_cv_sys_global_symbol_to_c_name_address \
1482 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1483+nm_file_list_spec \
1484 lt_prog_compiler_no_builtin_flag \
1485-lt_prog_compiler_wl \
1486 lt_prog_compiler_pic \
1487+lt_prog_compiler_wl \
1488 lt_prog_compiler_static \
1489 lt_cv_prog_compiler_c_o \
1490 need_locks \
1491+MANIFEST_TOOL \
1492 DSYMUTIL \
1493 NMEDIT \
1494 LIPO \
1495@@ -18466,7 +19133,6 @@ no_undefined_flag \
1496 hardcode_libdir_flag_spec \
1497 hardcode_libdir_flag_spec_ld \
1498 hardcode_libdir_separator \
1499-fix_srcfile_path \
1500 exclude_expsyms \
1501 include_expsyms \
1502 file_list_spec \
1503@@ -18502,6 +19168,7 @@ module_cmds \
1504 module_expsym_cmds \
1505 export_symbols_cmds \
1506 prelink_cmds \
1507+postlink_cmds \
1508 postinstall_cmds \
1509 postuninstall_cmds \
1510 finish_cmds \
1511@@ -19278,7 +19945,8 @@ $as_echo X"$file" |
1512 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1513 #
1514 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1515-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1516+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1517+# Inc.
1518 # Written by Gordon Matzigkeit, 1996
1519 #
1520 # This file is part of GNU Libtool.
1521@@ -19381,19 +20049,42 @@ SP2NL=$lt_lt_SP2NL
1522 # turn newlines into spaces.
1523 NL2SP=$lt_lt_NL2SP
1524
1525+# convert \$build file names to \$host format.
1526+to_host_file_cmd=$lt_cv_to_host_file_cmd
1527+
1528+# convert \$build files to toolchain format.
1529+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1530+
1531 # An object symbol dumper.
1532 OBJDUMP=$lt_OBJDUMP
1533
1534 # Method to check whether dependent libraries are shared objects.
1535 deplibs_check_method=$lt_deplibs_check_method
1536
1537-# Command to use when deplibs_check_method == "file_magic".
1538+# Command to use when deplibs_check_method = "file_magic".
1539 file_magic_cmd=$lt_file_magic_cmd
1540
1541+# How to find potential files when deplibs_check_method = "file_magic".
1542+file_magic_glob=$lt_file_magic_glob
1543+
1544+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1545+want_nocaseglob=$lt_want_nocaseglob
1546+
1547+# DLL creation program.
1548+DLLTOOL=$lt_DLLTOOL
1549+
1550+# Command to associate shared and link libraries.
1551+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1552+
1553 # The archiver.
1554 AR=$lt_AR
1555+
1556+# Flags to create an archive.
1557 AR_FLAGS=$lt_AR_FLAGS
1558
1559+# How to feed a file listing to the archiver.
1560+archiver_list_spec=$lt_archiver_list_spec
1561+
1562 # A symbol stripping program.
1563 STRIP=$lt_STRIP
1564
1565@@ -19423,6 +20114,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1566 # Transform the output of nm in a C name address pair when lib prefix is needed.
1567 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1568
1569+# Specify filename containing input files for \$NM.
1570+nm_file_list_spec=$lt_nm_file_list_spec
1571+
1572+# The root where to search for dependent libraries,and in which our libraries should be installed.
1573+lt_sysroot=$lt_sysroot
1574+
1575 # The name of the directory that contains temporary libtool files.
1576 objdir=$objdir
1577
1578@@ -19432,6 +20129,9 @@ MAGIC_CMD=$MAGIC_CMD
1579 # Must we lock files when doing compilation?
1580 need_locks=$lt_need_locks
1581
1582+# Manifest tool.
1583+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1584+
1585 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1586 DSYMUTIL=$lt_DSYMUTIL
1587
1588@@ -19546,12 +20246,12 @@ with_gcc=$GCC
1589 # Compiler flag to turn off builtin functions.
1590 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1591
1592-# How to pass a linker flag through the compiler.
1593-wl=$lt_lt_prog_compiler_wl
1594-
1595 # Additional compiler flags for building library objects.
1596 pic_flag=$lt_lt_prog_compiler_pic
1597
1598+# How to pass a linker flag through the compiler.
1599+wl=$lt_lt_prog_compiler_wl
1600+
1601 # Compiler flag to prevent dynamic linking.
1602 link_static_flag=$lt_lt_prog_compiler_static
1603
1604@@ -19638,9 +20338,6 @@ inherit_rpath=$inherit_rpath
1605 # Whether libtool must link a program against all its dependency libraries.
1606 link_all_deplibs=$link_all_deplibs
1607
1608-# Fix the shell variable \$srcfile for the compiler.
1609-fix_srcfile_path=$lt_fix_srcfile_path
1610-
1611 # Set to "yes" if exported symbols are required.
1612 always_export_symbols=$always_export_symbols
1613
1614@@ -19656,6 +20353,9 @@ include_expsyms=$lt_include_expsyms
1615 # Commands necessary for linking programs (against libraries) with templates.
1616 prelink_cmds=$lt_prelink_cmds
1617
1618+# Commands necessary for finishing linking programs.
1619+postlink_cmds=$lt_postlink_cmds
1620+
1621 # Specify filename containing input files.
1622 file_list_spec=$lt_file_list_spec
1623
1624@@ -19688,210 +20388,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1625 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1626 # text mode, it properly converts lines to CR/LF. This bash problem
1627 # is reportedly fixed, but why not run on old versions too?
1628- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1629- || (rm -f "$cfgfile"; exit 1)
1630-
1631- case $xsi_shell in
1632- yes)
1633- cat << \_LT_EOF >> "$cfgfile"
1634-
1635-# func_dirname file append nondir_replacement
1636-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1637-# otherwise set result to NONDIR_REPLACEMENT.
1638-func_dirname ()
1639-{
1640- case ${1} in
1641- */*) func_dirname_result="${1%/*}${2}" ;;
1642- * ) func_dirname_result="${3}" ;;
1643- esac
1644-}
1645-
1646-# func_basename file
1647-func_basename ()
1648-{
1649- func_basename_result="${1##*/}"
1650-}
1651-
1652-# func_dirname_and_basename file append nondir_replacement
1653-# perform func_basename and func_dirname in a single function
1654-# call:
1655-# dirname: Compute the dirname of FILE. If nonempty,
1656-# add APPEND to the result, otherwise set result
1657-# to NONDIR_REPLACEMENT.
1658-# value returned in "$func_dirname_result"
1659-# basename: Compute filename of FILE.
1660-# value retuned in "$func_basename_result"
1661-# Implementation must be kept synchronized with func_dirname
1662-# and func_basename. For efficiency, we do not delegate to
1663-# those functions but instead duplicate the functionality here.
1664-func_dirname_and_basename ()
1665-{
1666- case ${1} in
1667- */*) func_dirname_result="${1%/*}${2}" ;;
1668- * ) func_dirname_result="${3}" ;;
1669- esac
1670- func_basename_result="${1##*/}"
1671-}
1672-
1673-# func_stripname prefix suffix name
1674-# strip PREFIX and SUFFIX off of NAME.
1675-# PREFIX and SUFFIX must not contain globbing or regex special
1676-# characters, hashes, percent signs, but SUFFIX may contain a leading
1677-# dot (in which case that matches only a dot).
1678-func_stripname ()
1679-{
1680- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1681- # positional parameters, so assign one to ordinary parameter first.
1682- func_stripname_result=${3}
1683- func_stripname_result=${func_stripname_result#"${1}"}
1684- func_stripname_result=${func_stripname_result%"${2}"}
1685-}
1686-
1687-# func_opt_split
1688-func_opt_split ()
1689-{
1690- func_opt_split_opt=${1%%=*}
1691- func_opt_split_arg=${1#*=}
1692-}
1693-
1694-# func_lo2o object
1695-func_lo2o ()
1696-{
1697- case ${1} in
1698- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1699- *) func_lo2o_result=${1} ;;
1700- esac
1701-}
1702-
1703-# func_xform libobj-or-source
1704-func_xform ()
1705-{
1706- func_xform_result=${1%.*}.lo
1707-}
1708-
1709-# func_arith arithmetic-term...
1710-func_arith ()
1711-{
1712- func_arith_result=$(( $* ))
1713-}
1714-
1715-# func_len string
1716-# STRING may not start with a hyphen.
1717-func_len ()
1718-{
1719- func_len_result=${#1}
1720-}
1721-
1722-_LT_EOF
1723- ;;
1724- *) # Bourne compatible functions.
1725- cat << \_LT_EOF >> "$cfgfile"
1726-
1727-# func_dirname file append nondir_replacement
1728-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1729-# otherwise set result to NONDIR_REPLACEMENT.
1730-func_dirname ()
1731-{
1732- # Extract subdirectory from the argument.
1733- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1734- if test "X$func_dirname_result" = "X${1}"; then
1735- func_dirname_result="${3}"
1736- else
1737- func_dirname_result="$func_dirname_result${2}"
1738- fi
1739-}
1740-
1741-# func_basename file
1742-func_basename ()
1743-{
1744- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1745-}
1746-
1747-
1748-# func_stripname prefix suffix name
1749-# strip PREFIX and SUFFIX off of NAME.
1750-# PREFIX and SUFFIX must not contain globbing or regex special
1751-# characters, hashes, percent signs, but SUFFIX may contain a leading
1752-# dot (in which case that matches only a dot).
1753-# func_strip_suffix prefix name
1754-func_stripname ()
1755-{
1756- case ${2} in
1757- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1758- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1759- esac
1760-}
1761-
1762-# sed scripts:
1763-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1764-my_sed_long_arg='1s/^-[^=]*=//'
1765-
1766-# func_opt_split
1767-func_opt_split ()
1768-{
1769- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1770- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1771-}
1772-
1773-# func_lo2o object
1774-func_lo2o ()
1775-{
1776- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1777-}
1778-
1779-# func_xform libobj-or-source
1780-func_xform ()
1781-{
1782- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1783-}
1784-
1785-# func_arith arithmetic-term...
1786-func_arith ()
1787-{
1788- func_arith_result=`expr "$@"`
1789-}
1790-
1791-# func_len string
1792-# STRING may not start with a hyphen.
1793-func_len ()
1794-{
1795- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1796-}
1797-
1798-_LT_EOF
1799-esac
1800-
1801-case $lt_shell_append in
1802- yes)
1803- cat << \_LT_EOF >> "$cfgfile"
1804-
1805-# func_append var value
1806-# Append VALUE to the end of shell variable VAR.
1807-func_append ()
1808-{
1809- eval "$1+=\$2"
1810-}
1811-_LT_EOF
1812- ;;
1813- *)
1814- cat << \_LT_EOF >> "$cfgfile"
1815-
1816-# func_append var value
1817-# Append VALUE to the end of shell variable VAR.
1818-func_append ()
1819-{
1820- eval "$1=\$$1\$2"
1821-}
1822-
1823-_LT_EOF
1824- ;;
1825- esac
1826-
1827-
1828- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1829- || (rm -f "$cfgfile"; exit 1)
1830-
1831- mv -f "$cfgfile" "$ofile" ||
1832+ sed '$q' "$ltmain" >> "$cfgfile" \
1833+ || (rm -f "$cfgfile"; exit 1)
1834+
1835+ if test x"$xsi_shell" = xyes; then
1836+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1837+func_dirname ()\
1838+{\
1839+\ case ${1} in\
1840+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1841+\ * ) func_dirname_result="${3}" ;;\
1842+\ esac\
1843+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1844+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1845+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1846+test 0 -eq $? || _lt_function_replace_fail=:
1847+
1848+
1849+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1850+func_basename ()\
1851+{\
1852+\ func_basename_result="${1##*/}"\
1853+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1854+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1855+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1856+test 0 -eq $? || _lt_function_replace_fail=:
1857+
1858+
1859+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1860+func_dirname_and_basename ()\
1861+{\
1862+\ case ${1} in\
1863+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1864+\ * ) func_dirname_result="${3}" ;;\
1865+\ esac\
1866+\ func_basename_result="${1##*/}"\
1867+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1868+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1869+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1870+test 0 -eq $? || _lt_function_replace_fail=:
1871+
1872+
1873+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1874+func_stripname ()\
1875+{\
1876+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1877+\ # positional parameters, so assign one to ordinary parameter first.\
1878+\ func_stripname_result=${3}\
1879+\ func_stripname_result=${func_stripname_result#"${1}"}\
1880+\ func_stripname_result=${func_stripname_result%"${2}"}\
1881+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1882+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1883+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1884+test 0 -eq $? || _lt_function_replace_fail=:
1885+
1886+
1887+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1888+func_split_long_opt ()\
1889+{\
1890+\ func_split_long_opt_name=${1%%=*}\
1891+\ func_split_long_opt_arg=${1#*=}\
1892+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1893+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1894+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1895+test 0 -eq $? || _lt_function_replace_fail=:
1896+
1897+
1898+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1899+func_split_short_opt ()\
1900+{\
1901+\ func_split_short_opt_arg=${1#??}\
1902+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1903+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1904+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1905+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1906+test 0 -eq $? || _lt_function_replace_fail=:
1907+
1908+
1909+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1910+func_lo2o ()\
1911+{\
1912+\ case ${1} in\
1913+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1914+\ *) func_lo2o_result=${1} ;;\
1915+\ esac\
1916+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1917+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1918+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1919+test 0 -eq $? || _lt_function_replace_fail=:
1920+
1921+
1922+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1923+func_xform ()\
1924+{\
1925+ func_xform_result=${1%.*}.lo\
1926+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1927+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1928+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1929+test 0 -eq $? || _lt_function_replace_fail=:
1930+
1931+
1932+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1933+func_arith ()\
1934+{\
1935+ func_arith_result=$(( $* ))\
1936+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1937+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1938+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1939+test 0 -eq $? || _lt_function_replace_fail=:
1940+
1941+
1942+ sed -e '/^func_len ()$/,/^} # func_len /c\
1943+func_len ()\
1944+{\
1945+ func_len_result=${#1}\
1946+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1947+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1948+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1949+test 0 -eq $? || _lt_function_replace_fail=:
1950+
1951+fi
1952+
1953+if test x"$lt_shell_append" = xyes; then
1954+ sed -e '/^func_append ()$/,/^} # func_append /c\
1955+func_append ()\
1956+{\
1957+ eval "${1}+=\\${2}"\
1958+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1959+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1960+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1961+test 0 -eq $? || _lt_function_replace_fail=:
1962+
1963+
1964+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1965+func_append_quoted ()\
1966+{\
1967+\ func_quote_for_eval "${2}"\
1968+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1969+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1970+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1971+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1972+test 0 -eq $? || _lt_function_replace_fail=:
1973+
1974+
1975+ # Save a `func_append' function call where possible by direct use of '+='
1976+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1977+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1978+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1979+ test 0 -eq $? || _lt_function_replace_fail=:
1980+else
1981+ # Save a `func_append' function call even when '+=' is not available
1982+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1983+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1984+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1985+ test 0 -eq $? || _lt_function_replace_fail=:
1986+fi
1987+
1988+if test x"$_lt_function_replace_fail" = x":"; then
1989+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1990+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1991+fi
1992+
1993+
1994+ mv -f "$cfgfile" "$ofile" ||
1995 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1996 chmod +x "$ofile"
1997
1998diff --git a/bfd/configure.ac b/bfd/configure.ac
1999index 7fcc5d4a947..f7191d3f30f 100644
2000--- a/bfd/configure.ac
2001+++ b/bfd/configure.ac
2002@@ -276,7 +276,7 @@ changequote(,)dnl
2003 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
2004 changequote([,])dnl
2005 if test -n "$x"; then
2006- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
2007+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
2008 fi
2009 fi
2010
2011diff --git a/binutils/Makefile.in b/binutils/Makefile.in
2012index 842a6d99b54..037cccde038 100644
2013--- a/binutils/Makefile.in
2014+++ b/binutils/Makefile.in
2015@@ -495,6 +495,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@
2016 DEFS = @DEFS@
2017 DEMANGLER_NAME = @DEMANGLER_NAME@
2018 DEPDIR = @DEPDIR@
2019+DLLTOOL = @DLLTOOL@
2020 DLLTOOL_DEFS = @DLLTOOL_DEFS@
2021 DSYMUTIL = @DSYMUTIL@
2022 DUMPBIN = @DUMPBIN@
2023@@ -539,6 +540,7 @@ LTLIBINTL = @LTLIBINTL@
2024 LTLIBOBJS = @LTLIBOBJS@
2025 MAINT = @MAINT@
2026 MAKEINFO = @MAKEINFO@
2027+MANIFEST_TOOL = @MANIFEST_TOOL@
2028 MKDIR_P = @MKDIR_P@
2029 MKINSTALLDIRS = @MKINSTALLDIRS@
2030 MSGFMT = @MSGFMT@
2031@@ -587,6 +589,7 @@ abs_builddir = @abs_builddir@
2032 abs_srcdir = @abs_srcdir@
2033 abs_top_builddir = @abs_top_builddir@
2034 abs_top_srcdir = @abs_top_srcdir@
2035+ac_ct_AR = @ac_ct_AR@
2036 ac_ct_CC = @ac_ct_CC@
2037 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
2038 am__include = @am__include@
2039diff --git a/binutils/configure b/binutils/configure
2040index a1092735311..f3bdee98f3f 100755
2041--- a/binutils/configure
2042+++ b/binutils/configure
2043@@ -704,8 +704,11 @@ OTOOL
2044 LIPO
2045 NMEDIT
2046 DSYMUTIL
2047+MANIFEST_TOOL
2048 RANLIB
2049+ac_ct_AR
2050 AR
2051+DLLTOOL
2052 OBJDUMP
2053 LN_S
2054 NM
2055@@ -822,6 +825,7 @@ enable_static
2056 with_pic
2057 enable_fast_install
2058 with_gnu_ld
2059+with_libtool_sysroot
2060 enable_libtool_lock
2061 enable_plugins
2062 enable_largefile
2063@@ -1529,6 +1533,8 @@ Optional Packages:
2064 --with-pic try to use only PIC/non-PIC objects [default=use
2065 both]
2066 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
2067+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
2068+ (or the compiler's sysroot if not specified).
2069 --with-debuginfod Enable debuginfo lookups with debuginfod
2070 (auto/yes/no)
2071 --with-gnu-ld assume the C compiler uses GNU ld default=no
2072@@ -4958,8 +4964,8 @@ esac
2073
2074
2075
2076-macro_version='2.2.7a'
2077-macro_revision='1.3134'
2078+macro_version='2.4'
2079+macro_revision='1.3293'
2080
2081
2082
2083@@ -4999,7 +5005,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2085 $as_echo_n "checking how to print strings... " >&6; }
2086 # Test print first, because it will be a builtin if present.
2087-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2088+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
2089 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2090 ECHO='print -r --'
2091 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2092@@ -5692,8 +5698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2093 # Try some XSI features
2094 xsi_shell=no
2095 ( _lt_dummy="a/b/c"
2096- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2097- = c,a/b,, \
2098+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2099+ = c,a/b,b/c, \
2100 && eval 'test $(( 1 + 1 )) -eq 2 \
2101 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2102 && xsi_shell=yes
2103@@ -5742,6 +5748,80 @@ esac
2104
2105
2106
2107+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2108+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2109+if ${lt_cv_to_host_file_cmd+:} false; then :
2110+ $as_echo_n "(cached) " >&6
2111+else
2112+ case $host in
2113+ *-*-mingw* )
2114+ case $build in
2115+ *-*-mingw* ) # actually msys
2116+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2117+ ;;
2118+ *-*-cygwin* )
2119+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2120+ ;;
2121+ * ) # otherwise, assume *nix
2122+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2123+ ;;
2124+ esac
2125+ ;;
2126+ *-*-cygwin* )
2127+ case $build in
2128+ *-*-mingw* ) # actually msys
2129+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2130+ ;;
2131+ *-*-cygwin* )
2132+ lt_cv_to_host_file_cmd=func_convert_file_noop
2133+ ;;
2134+ * ) # otherwise, assume *nix
2135+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2136+ ;;
2137+ esac
2138+ ;;
2139+ * ) # unhandled hosts (and "normal" native builds)
2140+ lt_cv_to_host_file_cmd=func_convert_file_noop
2141+ ;;
2142+esac
2143+
2144+fi
2145+
2146+to_host_file_cmd=$lt_cv_to_host_file_cmd
2147+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2148+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2149+
2150+
2151+
2152+
2153+
2154+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2155+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2156+if ${lt_cv_to_tool_file_cmd+:} false; then :
2157+ $as_echo_n "(cached) " >&6
2158+else
2159+ #assume ordinary cross tools, or native build.
2160+lt_cv_to_tool_file_cmd=func_convert_file_noop
2161+case $host in
2162+ *-*-mingw* )
2163+ case $build in
2164+ *-*-mingw* ) # actually msys
2165+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2166+ ;;
2167+ esac
2168+ ;;
2169+esac
2170+
2171+fi
2172+
2173+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2174+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2175+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2176+
2177+
2178+
2179+
2180+
2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2182 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2183 if ${lt_cv_ld_reload_flag+:} false; then :
2184@@ -5758,6 +5838,11 @@ case $reload_flag in
2185 esac
2186 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2187 case $host_os in
2188+ cygwin* | mingw* | pw32* | cegcc*)
2189+ if test "$GCC" != yes; then
2190+ reload_cmds=false
2191+ fi
2192+ ;;
2193 darwin*)
2194 if test "$GCC" = yes; then
2195 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2196@@ -5926,7 +6011,8 @@ mingw* | pw32*)
2197 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2198 lt_cv_file_magic_cmd='func_win32_libid'
2199 else
2200- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2201+ # Keep this pattern in sync with the one in func_win32_libid.
2202+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2203 lt_cv_file_magic_cmd='$OBJDUMP -f'
2204 fi
2205 ;;
2206@@ -6085,6 +6171,21 @@ esac
2207 fi
2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2209 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2210+
2211+file_magic_glob=
2212+want_nocaseglob=no
2213+if test "$build" = "$host"; then
2214+ case $host_os in
2215+ mingw* | pw32*)
2216+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2217+ want_nocaseglob=yes
2218+ else
2219+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2220+ fi
2221+ ;;
2222+ esac
2223+fi
2224+
2225 file_magic_cmd=$lt_cv_file_magic_cmd
2226 deplibs_check_method=$lt_cv_deplibs_check_method
2227 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2228@@ -6100,6 +6201,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2229
2230
2231
2232+
2233+
2234+
2235+
2236+
2237+
2238+
2239+
2240+
2241+
2242+if test -n "$ac_tool_prefix"; then
2243+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2244+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2245+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2246+$as_echo_n "checking for $ac_word... " >&6; }
2247+if ${ac_cv_prog_DLLTOOL+:} false; then :
2248+ $as_echo_n "(cached) " >&6
2249+else
2250+ if test -n "$DLLTOOL"; then
2251+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2252+else
2253+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2254+for as_dir in $PATH
2255+do
2256+ IFS=$as_save_IFS
2257+ test -z "$as_dir" && as_dir=.
2258+ for ac_exec_ext in '' $ac_executable_extensions; do
2259+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2260+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2261+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2262+ break 2
2263+ fi
2264+done
2265+ done
2266+IFS=$as_save_IFS
2267+
2268+fi
2269+fi
2270+DLLTOOL=$ac_cv_prog_DLLTOOL
2271+if test -n "$DLLTOOL"; then
2272+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2273+$as_echo "$DLLTOOL" >&6; }
2274+else
2275+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2276+$as_echo "no" >&6; }
2277+fi
2278+
2279+
2280+fi
2281+if test -z "$ac_cv_prog_DLLTOOL"; then
2282+ ac_ct_DLLTOOL=$DLLTOOL
2283+ # Extract the first word of "dlltool", so it can be a program name with args.
2284+set dummy dlltool; ac_word=$2
2285+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2286+$as_echo_n "checking for $ac_word... " >&6; }
2287+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
2288+ $as_echo_n "(cached) " >&6
2289+else
2290+ if test -n "$ac_ct_DLLTOOL"; then
2291+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2292+else
2293+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2294+for as_dir in $PATH
2295+do
2296+ IFS=$as_save_IFS
2297+ test -z "$as_dir" && as_dir=.
2298+ for ac_exec_ext in '' $ac_executable_extensions; do
2299+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2300+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2301+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2302+ break 2
2303+ fi
2304+done
2305+ done
2306+IFS=$as_save_IFS
2307+
2308+fi
2309+fi
2310+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2311+if test -n "$ac_ct_DLLTOOL"; then
2312+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2313+$as_echo "$ac_ct_DLLTOOL" >&6; }
2314+else
2315+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2316+$as_echo "no" >&6; }
2317+fi
2318+
2319+ if test "x$ac_ct_DLLTOOL" = x; then
2320+ DLLTOOL="false"
2321+ else
2322+ case $cross_compiling:$ac_tool_warned in
2323+yes:)
2324+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2325+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2326+ac_tool_warned=yes ;;
2327+esac
2328+ DLLTOOL=$ac_ct_DLLTOOL
2329+ fi
2330+else
2331+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2332+fi
2333+
2334+test -z "$DLLTOOL" && DLLTOOL=dlltool
2335+
2336+
2337+
2338+
2339+
2340+
2341+
2342+
2343+
2344+
2345+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2346+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2347+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
2348+ $as_echo_n "(cached) " >&6
2349+else
2350+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2351+
2352+case $host_os in
2353+cygwin* | mingw* | pw32* | cegcc*)
2354+ # two different shell functions defined in ltmain.sh
2355+ # decide which to use based on capabilities of $DLLTOOL
2356+ case `$DLLTOOL --help 2>&1` in
2357+ *--identify-strict*)
2358+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2359+ ;;
2360+ *)
2361+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2362+ ;;
2363+ esac
2364+ ;;
2365+*)
2366+ # fallback: assume linklib IS sharedlib
2367+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2368+ ;;
2369+esac
2370+
2371+fi
2372+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2373+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2374+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2375+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2376+
2377+
2378+
2379+
2380+
2381+
2382+
2383 plugin_option=
2384 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2385 for plugin in $plugin_names; do
2386@@ -6114,8 +6366,10 @@ for plugin in $plugin_names; do
2387 done
2388
2389 if test -n "$ac_tool_prefix"; then
2390- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2391-set dummy ${ac_tool_prefix}ar; ac_word=$2
2392+ for ac_prog in ar
2393+ do
2394+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2395+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2397 $as_echo_n "checking for $ac_word... " >&6; }
2398 if ${ac_cv_prog_AR+:} false; then :
2399@@ -6131,7 +6385,7 @@ do
2400 test -z "$as_dir" && as_dir=.
2401 for ac_exec_ext in '' $ac_executable_extensions; do
2402 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2403- ac_cv_prog_AR="${ac_tool_prefix}ar"
2404+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2406 break 2
2407 fi
2408@@ -6151,11 +6405,15 @@ $as_echo "no" >&6; }
2409 fi
2410
2411
2412+ test -n "$AR" && break
2413+ done
2414 fi
2415-if test -z "$ac_cv_prog_AR"; then
2416+if test -z "$AR"; then
2417 ac_ct_AR=$AR
2418- # Extract the first word of "ar", so it can be a program name with args.
2419-set dummy ar; ac_word=$2
2420+ for ac_prog in ar
2421+do
2422+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2423+set dummy $ac_prog; ac_word=$2
2424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2425 $as_echo_n "checking for $ac_word... " >&6; }
2426 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2427@@ -6171,7 +6429,7 @@ do
2428 test -z "$as_dir" && as_dir=.
2429 for ac_exec_ext in '' $ac_executable_extensions; do
2430 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2431- ac_cv_prog_ac_ct_AR="ar"
2432+ ac_cv_prog_ac_ct_AR="$ac_prog"
2433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2434 break 2
2435 fi
2436@@ -6190,6 +6448,10 @@ else
2437 $as_echo "no" >&6; }
2438 fi
2439
2440+
2441+ test -n "$ac_ct_AR" && break
2442+done
2443+
2444 if test "x$ac_ct_AR" = x; then
2445 AR="false"
2446 else
2447@@ -6201,25 +6463,19 @@ ac_tool_warned=yes ;;
2448 esac
2449 AR=$ac_ct_AR
2450 fi
2451-else
2452- AR="$ac_cv_prog_AR"
2453 fi
2454
2455-test -z "$AR" && AR=ar
2456-if test -n "$plugin_option"; then
2457- if $AR --help 2>&1 | grep -q "\--plugin"; then
2458- touch conftest.c
2459- $AR $plugin_option rc conftest.a conftest.c
2460- if test "$?" != 0; then
2461- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
2462+ touch conftest.c
2463+ $AR $plugin_option rc conftest.a conftest.c
2464+ if test "$?" != 0; then
2465+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
2466 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
2467- else
2468- AR="$AR $plugin_option"
2469- fi
2470- rm -f conftest.*
2471+ else
2472+ AR="$AR $plugin_option"
2473 fi
2474-fi
2475-test -z "$AR_FLAGS" && AR_FLAGS=cru
2476+ rm -f conftest.*
2477+: ${AR=ar}
2478+: ${AR_FLAGS=cru}
2479
2480
2481
2482@@ -6231,6 +6487,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2483
2484
2485
2486+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2487+$as_echo_n "checking for archiver @FILE support... " >&6; }
2488+if ${lt_cv_ar_at_file+:} false; then :
2489+ $as_echo_n "(cached) " >&6
2490+else
2491+ lt_cv_ar_at_file=no
2492+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2493+/* end confdefs.h. */
2494+
2495+int
2496+main ()
2497+{
2498+
2499+ ;
2500+ return 0;
2501+}
2502+_ACEOF
2503+if ac_fn_c_try_compile "$LINENO"; then :
2504+ echo conftest.$ac_objext > conftest.lst
2505+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2506+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2507+ (eval $lt_ar_try) 2>&5
2508+ ac_status=$?
2509+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2510+ test $ac_status = 0; }
2511+ if test "$ac_status" -eq 0; then
2512+ # Ensure the archiver fails upon bogus file names.
2513+ rm -f conftest.$ac_objext libconftest.a
2514+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2515+ (eval $lt_ar_try) 2>&5
2516+ ac_status=$?
2517+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2518+ test $ac_status = 0; }
2519+ if test "$ac_status" -ne 0; then
2520+ lt_cv_ar_at_file=@
2521+ fi
2522+ fi
2523+ rm -f conftest.* libconftest.a
2524+
2525+fi
2526+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2527+
2528+fi
2529+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2530+$as_echo "$lt_cv_ar_at_file" >&6; }
2531+
2532+if test "x$lt_cv_ar_at_file" = xno; then
2533+ archiver_list_spec=
2534+else
2535+ archiver_list_spec=$lt_cv_ar_at_file
2536+fi
2537+
2538+
2539+
2540+
2541+
2542+
2543+
2544 if test -n "$ac_tool_prefix"; then
2545 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2546 set dummy ${ac_tool_prefix}strip; ac_word=$2
2547@@ -6570,8 +6884,8 @@ esac
2548 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2549
2550 # Transform an extracted symbol line into symbol name and symbol address
2551-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2552-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'"
2553+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2554+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'"
2555
2556 # Handle CRLF in mingw tool chain
2557 opt_cr=
2558@@ -6607,6 +6921,7 @@ for ac_symprfx in "" "_"; do
2559 else
2560 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2561 fi
2562+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2563
2564 # Check to see that the pipe works correctly.
2565 pipe_works=no
2566@@ -6648,6 +6963,18 @@ _LT_EOF
2567 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2568 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2569 cat <<_LT_EOF > conftest.$ac_ext
2570+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2571+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2572+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2573+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2574+# define LT_DLSYM_CONST
2575+#elif defined(__osf__)
2576+/* This system does not cope well with relocations in const data. */
2577+# define LT_DLSYM_CONST
2578+#else
2579+# define LT_DLSYM_CONST const
2580+#endif
2581+
2582 #ifdef __cplusplus
2583 extern "C" {
2584 #endif
2585@@ -6659,7 +6986,7 @@ _LT_EOF
2586 cat <<_LT_EOF >> conftest.$ac_ext
2587
2588 /* The mapping between symbol names and symbols. */
2589-const struct {
2590+LT_DLSYM_CONST struct {
2591 const char *name;
2592 void *address;
2593 }
2594@@ -6685,8 +7012,8 @@ static const void *lt_preloaded_setup() {
2595 _LT_EOF
2596 # Now try linking the two files.
2597 mv conftest.$ac_objext conftstm.$ac_objext
2598- lt_save_LIBS="$LIBS"
2599- lt_save_CFLAGS="$CFLAGS"
2600+ lt_globsym_save_LIBS=$LIBS
2601+ lt_globsym_save_CFLAGS=$CFLAGS
2602 LIBS="conftstm.$ac_objext"
2603 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2604 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2605@@ -6696,8 +7023,8 @@ _LT_EOF
2606 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2607 pipe_works=yes
2608 fi
2609- LIBS="$lt_save_LIBS"
2610- CFLAGS="$lt_save_CFLAGS"
2611+ LIBS=$lt_globsym_save_LIBS
2612+ CFLAGS=$lt_globsym_save_CFLAGS
2613 else
2614 echo "cannot find nm_test_func in $nlist" >&5
2615 fi
2616@@ -6734,6 +7061,18 @@ else
2617 $as_echo "ok" >&6; }
2618 fi
2619
2620+# Response file support.
2621+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2622+ nm_file_list_spec='@'
2623+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2624+ nm_file_list_spec='@'
2625+fi
2626+
2627+
2628+
2629+
2630+
2631+
2632
2633
2634
2635@@ -6750,6 +7089,43 @@ fi
2636
2637
2638
2639+
2640+
2641+
2642+
2643+
2644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2645+$as_echo_n "checking for sysroot... " >&6; }
2646+
2647+# Check whether --with-libtool-sysroot was given.
2648+if test "${with_libtool_sysroot+set}" = set; then :
2649+ withval=$with_libtool_sysroot;
2650+else
2651+ with_libtool_sysroot=no
2652+fi
2653+
2654+
2655+lt_sysroot=
2656+case ${with_libtool_sysroot} in #(
2657+ yes)
2658+ if test "$GCC" = yes; then
2659+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2660+ fi
2661+ ;; #(
2662+ /*)
2663+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2664+ ;; #(
2665+ no|'')
2666+ ;; #(
2667+ *)
2668+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2669+$as_echo "${with_libtool_sysroot}" >&6; }
2670+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
2671+ ;;
2672+esac
2673+
2674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2675+$as_echo "${lt_sysroot:-no}" >&6; }
2676
2677
2678
2679@@ -6961,6 +7337,123 @@ esac
2680
2681 need_locks="$enable_libtool_lock"
2682
2683+if test -n "$ac_tool_prefix"; then
2684+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2685+set dummy ${ac_tool_prefix}mt; ac_word=$2
2686+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2687+$as_echo_n "checking for $ac_word... " >&6; }
2688+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
2689+ $as_echo_n "(cached) " >&6
2690+else
2691+ if test -n "$MANIFEST_TOOL"; then
2692+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2693+else
2694+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2695+for as_dir in $PATH
2696+do
2697+ IFS=$as_save_IFS
2698+ test -z "$as_dir" && as_dir=.
2699+ for ac_exec_ext in '' $ac_executable_extensions; do
2700+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2701+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2702+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2703+ break 2
2704+ fi
2705+done
2706+ done
2707+IFS=$as_save_IFS
2708+
2709+fi
2710+fi
2711+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2712+if test -n "$MANIFEST_TOOL"; then
2713+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2714+$as_echo "$MANIFEST_TOOL" >&6; }
2715+else
2716+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2717+$as_echo "no" >&6; }
2718+fi
2719+
2720+
2721+fi
2722+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2723+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2724+ # Extract the first word of "mt", so it can be a program name with args.
2725+set dummy mt; ac_word=$2
2726+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2727+$as_echo_n "checking for $ac_word... " >&6; }
2728+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
2729+ $as_echo_n "(cached) " >&6
2730+else
2731+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2732+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2733+else
2734+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2735+for as_dir in $PATH
2736+do
2737+ IFS=$as_save_IFS
2738+ test -z "$as_dir" && as_dir=.
2739+ for ac_exec_ext in '' $ac_executable_extensions; do
2740+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2741+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2742+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2743+ break 2
2744+ fi
2745+done
2746+ done
2747+IFS=$as_save_IFS
2748+
2749+fi
2750+fi
2751+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2752+if test -n "$ac_ct_MANIFEST_TOOL"; then
2753+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2754+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2755+else
2756+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2757+$as_echo "no" >&6; }
2758+fi
2759+
2760+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2761+ MANIFEST_TOOL=":"
2762+ else
2763+ case $cross_compiling:$ac_tool_warned in
2764+yes:)
2765+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2766+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2767+ac_tool_warned=yes ;;
2768+esac
2769+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2770+ fi
2771+else
2772+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2773+fi
2774+
2775+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2776+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2777+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2778+if ${lt_cv_path_mainfest_tool+:} false; then :
2779+ $as_echo_n "(cached) " >&6
2780+else
2781+ lt_cv_path_mainfest_tool=no
2782+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2783+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2784+ cat conftest.err >&5
2785+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2786+ lt_cv_path_mainfest_tool=yes
2787+ fi
2788+ rm -f conftest*
2789+fi
2790+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2791+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2792+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2793+ MANIFEST_TOOL=:
2794+fi
2795+
2796+
2797+
2798+
2799+
2800
2801 case $host_os in
2802 rhapsody* | darwin*)
2803@@ -7524,6 +8017,8 @@ _LT_EOF
2804 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2805 echo "$AR cru libconftest.a conftest.o" >&5
2806 $AR cru libconftest.a conftest.o 2>&5
2807+ echo "$RANLIB libconftest.a" >&5
2808+ $RANLIB libconftest.a 2>&5
2809 cat > conftest.c << _LT_EOF
2810 int main() { return 0;}
2811 _LT_EOF
2812@@ -8108,8 +8603,6 @@ fi
2813 lt_prog_compiler_pic=
2814 lt_prog_compiler_static=
2815
2816-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2817-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2818
2819 if test "$GCC" = yes; then
2820 lt_prog_compiler_wl='-Wl,'
2821@@ -8275,6 +8768,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2822 lt_prog_compiler_pic='--shared'
2823 lt_prog_compiler_static='--static'
2824 ;;
2825+ nagfor*)
2826+ # NAG Fortran compiler
2827+ lt_prog_compiler_wl='-Wl,-Wl,,'
2828+ lt_prog_compiler_pic='-PIC'
2829+ lt_prog_compiler_static='-Bstatic'
2830+ ;;
2831 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2832 # Portland Group compilers (*not* the Pentium gcc compiler,
2833 # which looks to be a dead project)
2834@@ -8337,7 +8836,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2835 lt_prog_compiler_pic='-KPIC'
2836 lt_prog_compiler_static='-Bstatic'
2837 case $cc_basename in
2838- f77* | f90* | f95*)
2839+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2840 lt_prog_compiler_wl='-Qoption ld ';;
2841 *)
2842 lt_prog_compiler_wl='-Wl,';;
2843@@ -8394,13 +8893,17 @@ case $host_os in
2844 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2845 ;;
2846 esac
2847-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2848-$as_echo "$lt_prog_compiler_pic" >&6; }
2849-
2850-
2851-
2852-
2853
2854+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2855+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2856+if ${lt_cv_prog_compiler_pic+:} false; then :
2857+ $as_echo_n "(cached) " >&6
2858+else
2859+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2860+fi
2861+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2862+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2863+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2864
2865 #
2866 # Check to make sure the PIC flag actually works.
2867@@ -8461,6 +8964,11 @@ fi
2868
2869
2870
2871+
2872+
2873+
2874+
2875+
2876 #
2877 # Check to make sure the static flag actually works.
2878 #
2879@@ -8811,7 +9319,8 @@ _LT_EOF
2880 allow_undefined_flag=unsupported
2881 always_export_symbols=no
2882 enable_shared_with_static_runtimes=yes
2883- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2884+ 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'
2885+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2886
2887 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2888 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2889@@ -8910,12 +9419,12 @@ _LT_EOF
2890 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2891 hardcode_libdir_flag_spec=
2892 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2893- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2894+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2895 if test "x$supports_anon_versioning" = xyes; then
2896 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2897 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2898 echo "local: *; };" >> $output_objdir/$libname.ver~
2899- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2900+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2901 fi
2902 ;;
2903 esac
2904@@ -8929,8 +9438,8 @@ _LT_EOF
2905 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2906 wlarc=
2907 else
2908- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2909- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2910+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2911+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2912 fi
2913 ;;
2914
2915@@ -8948,8 +9457,8 @@ _LT_EOF
2916
2917 _LT_EOF
2918 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2919- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2920- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2921+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2922+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2923 else
2924 ld_shlibs=no
2925 fi
2926@@ -8995,8 +9504,8 @@ _LT_EOF
2927
2928 *)
2929 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2930- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2931- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2932+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2933+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2934 else
2935 ld_shlibs=no
2936 fi
2937@@ -9126,7 +9635,13 @@ _LT_EOF
2938 allow_undefined_flag='-berok'
2939 # Determine the default libpath from the value encoded in an
2940 # empty executable.
2941- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2942+ if test "${lt_cv_aix_libpath+set}" = set; then
2943+ aix_libpath=$lt_cv_aix_libpath
2944+else
2945+ if ${lt_cv_aix_libpath_+:} false; then :
2946+ $as_echo_n "(cached) " >&6
2947+else
2948+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2949 /* end confdefs.h. */
2950
2951 int
2952@@ -9139,22 +9654,29 @@ main ()
2953 _ACEOF
2954 if ac_fn_c_try_link "$LINENO"; then :
2955
2956-lt_aix_libpath_sed='
2957- /Import File Strings/,/^$/ {
2958- /^0/ {
2959- s/^0 *\(.*\)$/\1/
2960- p
2961- }
2962- }'
2963-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2964-# Check for a 64-bit object if we didn't find anything.
2965-if test -z "$aix_libpath"; then
2966- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2967-fi
2968+ lt_aix_libpath_sed='
2969+ /Import File Strings/,/^$/ {
2970+ /^0/ {
2971+ s/^0 *\([^ ]*\) *$/\1/
2972+ p
2973+ }
2974+ }'
2975+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2976+ # Check for a 64-bit object if we didn't find anything.
2977+ if test -z "$lt_cv_aix_libpath_"; then
2978+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2979+ fi
2980 fi
2981 rm -f core conftest.err conftest.$ac_objext \
2982 conftest$ac_exeext conftest.$ac_ext
2983-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2984+ if test -z "$lt_cv_aix_libpath_"; then
2985+ lt_cv_aix_libpath_="/usr/lib:/lib"
2986+ fi
2987+
2988+fi
2989+
2990+ aix_libpath=$lt_cv_aix_libpath_
2991+fi
2992
2993 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2994 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"
2995@@ -9166,7 +9688,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2996 else
2997 # Determine the default libpath from the value encoded in an
2998 # empty executable.
2999- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3000+ if test "${lt_cv_aix_libpath+set}" = set; then
3001+ aix_libpath=$lt_cv_aix_libpath
3002+else
3003+ if ${lt_cv_aix_libpath_+:} false; then :
3004+ $as_echo_n "(cached) " >&6
3005+else
3006+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3007 /* end confdefs.h. */
3008
3009 int
3010@@ -9179,22 +9707,29 @@ main ()
3011 _ACEOF
3012 if ac_fn_c_try_link "$LINENO"; then :
3013
3014-lt_aix_libpath_sed='
3015- /Import File Strings/,/^$/ {
3016- /^0/ {
3017- s/^0 *\(.*\)$/\1/
3018- p
3019- }
3020- }'
3021-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3022-# Check for a 64-bit object if we didn't find anything.
3023-if test -z "$aix_libpath"; then
3024- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3025-fi
3026+ lt_aix_libpath_sed='
3027+ /Import File Strings/,/^$/ {
3028+ /^0/ {
3029+ s/^0 *\([^ ]*\) *$/\1/
3030+ p
3031+ }
3032+ }'
3033+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3034+ # Check for a 64-bit object if we didn't find anything.
3035+ if test -z "$lt_cv_aix_libpath_"; then
3036+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3037+ fi
3038 fi
3039 rm -f core conftest.err conftest.$ac_objext \
3040 conftest$ac_exeext conftest.$ac_ext
3041-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3042+ if test -z "$lt_cv_aix_libpath_"; then
3043+ lt_cv_aix_libpath_="/usr/lib:/lib"
3044+ fi
3045+
3046+fi
3047+
3048+ aix_libpath=$lt_cv_aix_libpath_
3049+fi
3050
3051 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
3052 # Warning - without using the other run time loading flags,
3053@@ -9239,20 +9774,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3054 # Microsoft Visual C++.
3055 # hardcode_libdir_flag_spec is actually meaningless, as there is
3056 # no search path for DLLs.
3057- hardcode_libdir_flag_spec=' '
3058- allow_undefined_flag=unsupported
3059- # Tell ltmain to make .lib files, not .a files.
3060- libext=lib
3061- # Tell ltmain to make .dll files, not .so files.
3062- shrext_cmds=".dll"
3063- # FIXME: Setting linknames here is a bad hack.
3064- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3065- # The linker will automatically build a .lib file if we build a DLL.
3066- old_archive_from_new_cmds='true'
3067- # FIXME: Should let the user specify the lib program.
3068- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3069- fix_srcfile_path='`cygpath -w "$srcfile"`'
3070- enable_shared_with_static_runtimes=yes
3071+ case $cc_basename in
3072+ cl*)
3073+ # Native MSVC
3074+ hardcode_libdir_flag_spec=' '
3075+ allow_undefined_flag=unsupported
3076+ always_export_symbols=yes
3077+ file_list_spec='@'
3078+ # Tell ltmain to make .lib files, not .a files.
3079+ libext=lib
3080+ # Tell ltmain to make .dll files, not .so files.
3081+ shrext_cmds=".dll"
3082+ # FIXME: Setting linknames here is a bad hack.
3083+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
3084+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
3085+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
3086+ else
3087+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
3088+ fi~
3089+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
3090+ linknames='
3091+ # The linker will not automatically build a static lib if we build a DLL.
3092+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
3093+ enable_shared_with_static_runtimes=yes
3094+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
3095+ # Don't use ranlib
3096+ old_postinstall_cmds='chmod 644 $oldlib'
3097+ postlink_cmds='lt_outputfile="@OUTPUT@"~
3098+ lt_tool_outputfile="@TOOL_OUTPUT@"~
3099+ case $lt_outputfile in
3100+ *.exe|*.EXE) ;;
3101+ *)
3102+ lt_outputfile="$lt_outputfile.exe"
3103+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3104+ ;;
3105+ esac~
3106+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3107+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3108+ $RM "$lt_outputfile.manifest";
3109+ fi'
3110+ ;;
3111+ *)
3112+ # Assume MSVC wrapper
3113+ hardcode_libdir_flag_spec=' '
3114+ allow_undefined_flag=unsupported
3115+ # Tell ltmain to make .lib files, not .a files.
3116+ libext=lib
3117+ # Tell ltmain to make .dll files, not .so files.
3118+ shrext_cmds=".dll"
3119+ # FIXME: Setting linknames here is a bad hack.
3120+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3121+ # The linker will automatically build a .lib file if we build a DLL.
3122+ old_archive_from_new_cmds='true'
3123+ # FIXME: Should let the user specify the lib program.
3124+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3125+ enable_shared_with_static_runtimes=yes
3126+ ;;
3127+ esac
3128 ;;
3129
3130 darwin* | rhapsody*)
3131@@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3132
3133 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3134 freebsd* | dragonfly*)
3135- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3136+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3137 hardcode_libdir_flag_spec='-R$libdir'
3138 hardcode_direct=yes
3139 hardcode_shlibpath_var=no
3140@@ -9321,7 +9899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3141
3142 hpux9*)
3143 if test "$GCC" = yes; then
3144- 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'
3145+ 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'
3146 else
3147 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'
3148 fi
3149@@ -9337,7 +9915,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3150
3151 hpux10*)
3152 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3153- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3154+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3155 else
3156 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3157 fi
3158@@ -9361,10 +9939,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3159 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3160 ;;
3161 ia64*)
3162- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3163+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3164 ;;
3165 *)
3166- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3167+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3168 ;;
3169 esac
3170 else
3171@@ -9443,23 +10021,36 @@ fi
3172
3173 irix5* | irix6* | nonstopux*)
3174 if test "$GCC" = yes; then
3175- 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'
3176+ 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'
3177 # Try to use the -exported_symbol ld option, if it does not
3178 # work, assume that -exports_file does not work either and
3179 # implicitly export all symbols.
3180- save_LDFLAGS="$LDFLAGS"
3181- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3182- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3183+ # This should be the same for all languages, so no per-tag cache variable.
3184+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3185+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3186+if ${lt_cv_irix_exported_symbol+:} false; then :
3187+ $as_echo_n "(cached) " >&6
3188+else
3189+ save_LDFLAGS="$LDFLAGS"
3190+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3191+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3192 /* end confdefs.h. */
3193-int foo(void) {}
3194+int foo (void) { return 0; }
3195 _ACEOF
3196 if ac_fn_c_try_link "$LINENO"; then :
3197- 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'
3198-
3199+ lt_cv_irix_exported_symbol=yes
3200+else
3201+ lt_cv_irix_exported_symbol=no
3202 fi
3203 rm -f core conftest.err conftest.$ac_objext \
3204 conftest$ac_exeext conftest.$ac_ext
3205- LDFLAGS="$save_LDFLAGS"
3206+ LDFLAGS="$save_LDFLAGS"
3207+fi
3208+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3209+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3210+ if test "$lt_cv_irix_exported_symbol" = yes; then
3211+ 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'
3212+ fi
3213 else
3214 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'
3215 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'
3216@@ -9544,7 +10135,7 @@ rm -f core conftest.err conftest.$ac_objext \
3217 osf4* | osf5*) # as osf3* with the addition of -msym flag
3218 if test "$GCC" = yes; then
3219 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3220- 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'
3221+ 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'
3222 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3223 else
3224 allow_undefined_flag=' -expect_unresolved \*'
3225@@ -9563,9 +10154,9 @@ rm -f core conftest.err conftest.$ac_objext \
3226 no_undefined_flag=' -z defs'
3227 if test "$GCC" = yes; then
3228 wlarc='${wl}'
3229- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3230+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3231 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3232- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3233+ $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'
3234 else
3235 case `$CC -V 2>&1` in
3236 *"Compilers 5.0"*)
3237@@ -10141,8 +10732,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3238 need_version=no
3239 need_lib_prefix=no
3240
3241- case $GCC,$host_os in
3242- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3243+ case $GCC,$cc_basename in
3244+ yes,*)
3245+ # gcc
3246 library_names_spec='$libname.dll.a'
3247 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3248 postinstall_cmds='base_file=`basename \${file}`~
3249@@ -10175,13 +10767,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3250 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3251 ;;
3252 esac
3253+ dynamic_linker='Win32 ld.exe'
3254+ ;;
3255+
3256+ *,cl*)
3257+ # Native MSVC
3258+ libname_spec='$name'
3259+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3260+ library_names_spec='${libname}.dll.lib'
3261+
3262+ case $build_os in
3263+ mingw*)
3264+ sys_lib_search_path_spec=
3265+ lt_save_ifs=$IFS
3266+ IFS=';'
3267+ for lt_path in $LIB
3268+ do
3269+ IFS=$lt_save_ifs
3270+ # Let DOS variable expansion print the short 8.3 style file name.
3271+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3272+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3273+ done
3274+ IFS=$lt_save_ifs
3275+ # Convert to MSYS style.
3276+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3277+ ;;
3278+ cygwin*)
3279+ # Convert to unix form, then to dos form, then back to unix form
3280+ # but this time dos style (no spaces!) so that the unix form looks
3281+ # like /cygdrive/c/PROGRA~1:/cygdr...
3282+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3283+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3284+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3285+ ;;
3286+ *)
3287+ sys_lib_search_path_spec="$LIB"
3288+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3289+ # It is most probably a Windows format PATH.
3290+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3291+ else
3292+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3293+ fi
3294+ # FIXME: find the short name or the path components, as spaces are
3295+ # common. (e.g. "Program Files" -> "PROGRA~1")
3296+ ;;
3297+ esac
3298+
3299+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3300+ postinstall_cmds='base_file=`basename \${file}`~
3301+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3302+ dldir=$destdir/`dirname \$dlpath`~
3303+ test -d \$dldir || mkdir -p \$dldir~
3304+ $install_prog $dir/$dlname \$dldir/$dlname'
3305+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3306+ dlpath=$dir/\$dldll~
3307+ $RM \$dlpath'
3308+ shlibpath_overrides_runpath=yes
3309+ dynamic_linker='Win32 link.exe'
3310 ;;
3311
3312 *)
3313+ # Assume MSVC wrapper
3314 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3315+ dynamic_linker='Win32 ld.exe'
3316 ;;
3317 esac
3318- dynamic_linker='Win32 ld.exe'
3319 # FIXME: first we should search . and the directory the executable is in
3320 shlibpath_var=PATH
3321 ;;
3322@@ -11083,7 +11733,7 @@ else
3323 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3324 lt_status=$lt_dlunknown
3325 cat > conftest.$ac_ext <<_LT_EOF
3326-#line 11086 "configure"
3327+#line $LINENO "configure"
3328 #include "confdefs.h"
3329
3330 #if HAVE_DLFCN_H
3331@@ -11127,10 +11777,10 @@ else
3332 /* When -fvisbility=hidden is used, assume the code has been annotated
3333 correspondingly for the symbols needed. */
3334 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3335-void fnord () __attribute__((visibility("default")));
3336+int fnord () __attribute__((visibility("default")));
3337 #endif
3338
3339-void fnord () { int i=42; }
3340+int fnord () { return 42; }
3341 int main ()
3342 {
3343 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3344@@ -11189,7 +11839,7 @@ else
3345 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3346 lt_status=$lt_dlunknown
3347 cat > conftest.$ac_ext <<_LT_EOF
3348-#line 11192 "configure"
3349+#line $LINENO "configure"
3350 #include "confdefs.h"
3351
3352 #if HAVE_DLFCN_H
3353@@ -11233,10 +11883,10 @@ else
3354 /* When -fvisbility=hidden is used, assume the code has been annotated
3355 correspondingly for the symbols needed. */
3356 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3357-void fnord () __attribute__((visibility("default")));
3358+int fnord () __attribute__((visibility("default")));
3359 #endif
3360
3361-void fnord () { int i=42; }
3362+int fnord () { return 42; }
3363 int main ()
3364 {
3365 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3366@@ -17390,13 +18040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3367 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3368 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3369 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3370+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3371+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3372 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3373 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3374 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3375 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3376 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3377+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3378+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3379+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3380+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3381 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3382 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3383+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3384 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3385 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3386 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3387@@ -17411,14 +18068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3388 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3389 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3390 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"`'
3391+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3392+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3393 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3394 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3395 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3396-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3397 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3398+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3399 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3400 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3401 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3402+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3403 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3404 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3405 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3406@@ -17451,12 +18111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3407 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3408 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3409 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3410-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3411 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3412 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3413 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3414 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3415 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3416+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3417 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3418 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3419 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3420@@ -17511,8 +18171,13 @@ reload_flag \
3421 OBJDUMP \
3422 deplibs_check_method \
3423 file_magic_cmd \
3424+file_magic_glob \
3425+want_nocaseglob \
3426+DLLTOOL \
3427+sharedlib_from_linklib_cmd \
3428 AR \
3429 AR_FLAGS \
3430+archiver_list_spec \
3431 STRIP \
3432 RANLIB \
3433 CC \
3434@@ -17522,12 +18187,14 @@ lt_cv_sys_global_symbol_pipe \
3435 lt_cv_sys_global_symbol_to_cdecl \
3436 lt_cv_sys_global_symbol_to_c_name_address \
3437 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3438+nm_file_list_spec \
3439 lt_prog_compiler_no_builtin_flag \
3440-lt_prog_compiler_wl \
3441 lt_prog_compiler_pic \
3442+lt_prog_compiler_wl \
3443 lt_prog_compiler_static \
3444 lt_cv_prog_compiler_c_o \
3445 need_locks \
3446+MANIFEST_TOOL \
3447 DSYMUTIL \
3448 NMEDIT \
3449 LIPO \
3450@@ -17543,7 +18210,6 @@ no_undefined_flag \
3451 hardcode_libdir_flag_spec \
3452 hardcode_libdir_flag_spec_ld \
3453 hardcode_libdir_separator \
3454-fix_srcfile_path \
3455 exclude_expsyms \
3456 include_expsyms \
3457 file_list_spec \
3458@@ -17579,6 +18245,7 @@ module_cmds \
3459 module_expsym_cmds \
3460 export_symbols_cmds \
3461 prelink_cmds \
3462+postlink_cmds \
3463 postinstall_cmds \
3464 postuninstall_cmds \
3465 finish_cmds \
3466@@ -18352,7 +19019,8 @@ $as_echo X"$file" |
3467 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3468 #
3469 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3470-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3471+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3472+# Inc.
3473 # Written by Gordon Matzigkeit, 1996
3474 #
3475 # This file is part of GNU Libtool.
3476@@ -18455,19 +19123,42 @@ SP2NL=$lt_lt_SP2NL
3477 # turn newlines into spaces.
3478 NL2SP=$lt_lt_NL2SP
3479
3480+# convert \$build file names to \$host format.
3481+to_host_file_cmd=$lt_cv_to_host_file_cmd
3482+
3483+# convert \$build files to toolchain format.
3484+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3485+
3486 # An object symbol dumper.
3487 OBJDUMP=$lt_OBJDUMP
3488
3489 # Method to check whether dependent libraries are shared objects.
3490 deplibs_check_method=$lt_deplibs_check_method
3491
3492-# Command to use when deplibs_check_method == "file_magic".
3493+# Command to use when deplibs_check_method = "file_magic".
3494 file_magic_cmd=$lt_file_magic_cmd
3495
3496+# How to find potential files when deplibs_check_method = "file_magic".
3497+file_magic_glob=$lt_file_magic_glob
3498+
3499+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3500+want_nocaseglob=$lt_want_nocaseglob
3501+
3502+# DLL creation program.
3503+DLLTOOL=$lt_DLLTOOL
3504+
3505+# Command to associate shared and link libraries.
3506+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3507+
3508 # The archiver.
3509 AR=$lt_AR
3510+
3511+# Flags to create an archive.
3512 AR_FLAGS=$lt_AR_FLAGS
3513
3514+# How to feed a file listing to the archiver.
3515+archiver_list_spec=$lt_archiver_list_spec
3516+
3517 # A symbol stripping program.
3518 STRIP=$lt_STRIP
3519
3520@@ -18497,6 +19188,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3521 # Transform the output of nm in a C name address pair when lib prefix is needed.
3522 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3523
3524+# Specify filename containing input files for \$NM.
3525+nm_file_list_spec=$lt_nm_file_list_spec
3526+
3527+# The root where to search for dependent libraries,and in which our libraries should be installed.
3528+lt_sysroot=$lt_sysroot
3529+
3530 # The name of the directory that contains temporary libtool files.
3531 objdir=$objdir
3532
3533@@ -18506,6 +19203,9 @@ MAGIC_CMD=$MAGIC_CMD
3534 # Must we lock files when doing compilation?
3535 need_locks=$lt_need_locks
3536
3537+# Manifest tool.
3538+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3539+
3540 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3541 DSYMUTIL=$lt_DSYMUTIL
3542
3543@@ -18620,12 +19320,12 @@ with_gcc=$GCC
3544 # Compiler flag to turn off builtin functions.
3545 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3546
3547-# How to pass a linker flag through the compiler.
3548-wl=$lt_lt_prog_compiler_wl
3549-
3550 # Additional compiler flags for building library objects.
3551 pic_flag=$lt_lt_prog_compiler_pic
3552
3553+# How to pass a linker flag through the compiler.
3554+wl=$lt_lt_prog_compiler_wl
3555+
3556 # Compiler flag to prevent dynamic linking.
3557 link_static_flag=$lt_lt_prog_compiler_static
3558
3559@@ -18712,9 +19412,6 @@ inherit_rpath=$inherit_rpath
3560 # Whether libtool must link a program against all its dependency libraries.
3561 link_all_deplibs=$link_all_deplibs
3562
3563-# Fix the shell variable \$srcfile for the compiler.
3564-fix_srcfile_path=$lt_fix_srcfile_path
3565-
3566 # Set to "yes" if exported symbols are required.
3567 always_export_symbols=$always_export_symbols
3568
3569@@ -18730,6 +19427,9 @@ include_expsyms=$lt_include_expsyms
3570 # Commands necessary for linking programs (against libraries) with templates.
3571 prelink_cmds=$lt_prelink_cmds
3572
3573+# Commands necessary for finishing linking programs.
3574+postlink_cmds=$lt_postlink_cmds
3575+
3576 # Specify filename containing input files.
3577 file_list_spec=$lt_file_list_spec
3578
3579@@ -18762,210 +19462,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3580 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3581 # text mode, it properly converts lines to CR/LF. This bash problem
3582 # is reportedly fixed, but why not run on old versions too?
3583- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3584- || (rm -f "$cfgfile"; exit 1)
3585-
3586- case $xsi_shell in
3587- yes)
3588- cat << \_LT_EOF >> "$cfgfile"
3589-
3590-# func_dirname file append nondir_replacement
3591-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3592-# otherwise set result to NONDIR_REPLACEMENT.
3593-func_dirname ()
3594-{
3595- case ${1} in
3596- */*) func_dirname_result="${1%/*}${2}" ;;
3597- * ) func_dirname_result="${3}" ;;
3598- esac
3599-}
3600-
3601-# func_basename file
3602-func_basename ()
3603-{
3604- func_basename_result="${1##*/}"
3605-}
3606-
3607-# func_dirname_and_basename file append nondir_replacement
3608-# perform func_basename and func_dirname in a single function
3609-# call:
3610-# dirname: Compute the dirname of FILE. If nonempty,
3611-# add APPEND to the result, otherwise set result
3612-# to NONDIR_REPLACEMENT.
3613-# value returned in "$func_dirname_result"
3614-# basename: Compute filename of FILE.
3615-# value retuned in "$func_basename_result"
3616-# Implementation must be kept synchronized with func_dirname
3617-# and func_basename. For efficiency, we do not delegate to
3618-# those functions but instead duplicate the functionality here.
3619-func_dirname_and_basename ()
3620-{
3621- case ${1} in
3622- */*) func_dirname_result="${1%/*}${2}" ;;
3623- * ) func_dirname_result="${3}" ;;
3624- esac
3625- func_basename_result="${1##*/}"
3626-}
3627-
3628-# func_stripname prefix suffix name
3629-# strip PREFIX and SUFFIX off of NAME.
3630-# PREFIX and SUFFIX must not contain globbing or regex special
3631-# characters, hashes, percent signs, but SUFFIX may contain a leading
3632-# dot (in which case that matches only a dot).
3633-func_stripname ()
3634-{
3635- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3636- # positional parameters, so assign one to ordinary parameter first.
3637- func_stripname_result=${3}
3638- func_stripname_result=${func_stripname_result#"${1}"}
3639- func_stripname_result=${func_stripname_result%"${2}"}
3640-}
3641-
3642-# func_opt_split
3643-func_opt_split ()
3644-{
3645- func_opt_split_opt=${1%%=*}
3646- func_opt_split_arg=${1#*=}
3647-}
3648-
3649-# func_lo2o object
3650-func_lo2o ()
3651-{
3652- case ${1} in
3653- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3654- *) func_lo2o_result=${1} ;;
3655- esac
3656-}
3657-
3658-# func_xform libobj-or-source
3659-func_xform ()
3660-{
3661- func_xform_result=${1%.*}.lo
3662-}
3663-
3664-# func_arith arithmetic-term...
3665-func_arith ()
3666-{
3667- func_arith_result=$(( $* ))
3668-}
3669-
3670-# func_len string
3671-# STRING may not start with a hyphen.
3672-func_len ()
3673-{
3674- func_len_result=${#1}
3675-}
3676-
3677-_LT_EOF
3678- ;;
3679- *) # Bourne compatible functions.
3680- cat << \_LT_EOF >> "$cfgfile"
3681-
3682-# func_dirname file append nondir_replacement
3683-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3684-# otherwise set result to NONDIR_REPLACEMENT.
3685-func_dirname ()
3686-{
3687- # Extract subdirectory from the argument.
3688- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3689- if test "X$func_dirname_result" = "X${1}"; then
3690- func_dirname_result="${3}"
3691- else
3692- func_dirname_result="$func_dirname_result${2}"
3693- fi
3694-}
3695-
3696-# func_basename file
3697-func_basename ()
3698-{
3699- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3700-}
3701-
3702-
3703-# func_stripname prefix suffix name
3704-# strip PREFIX and SUFFIX off of NAME.
3705-# PREFIX and SUFFIX must not contain globbing or regex special
3706-# characters, hashes, percent signs, but SUFFIX may contain a leading
3707-# dot (in which case that matches only a dot).
3708-# func_strip_suffix prefix name
3709-func_stripname ()
3710-{
3711- case ${2} in
3712- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3713- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3714- esac
3715-}
3716-
3717-# sed scripts:
3718-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3719-my_sed_long_arg='1s/^-[^=]*=//'
3720-
3721-# func_opt_split
3722-func_opt_split ()
3723-{
3724- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3725- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3726-}
3727-
3728-# func_lo2o object
3729-func_lo2o ()
3730-{
3731- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3732-}
3733-
3734-# func_xform libobj-or-source
3735-func_xform ()
3736-{
3737- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3738-}
3739-
3740-# func_arith arithmetic-term...
3741-func_arith ()
3742-{
3743- func_arith_result=`expr "$@"`
3744-}
3745-
3746-# func_len string
3747-# STRING may not start with a hyphen.
3748-func_len ()
3749-{
3750- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3751-}
3752-
3753-_LT_EOF
3754-esac
3755-
3756-case $lt_shell_append in
3757- yes)
3758- cat << \_LT_EOF >> "$cfgfile"
3759-
3760-# func_append var value
3761-# Append VALUE to the end of shell variable VAR.
3762-func_append ()
3763-{
3764- eval "$1+=\$2"
3765-}
3766-_LT_EOF
3767- ;;
3768- *)
3769- cat << \_LT_EOF >> "$cfgfile"
3770-
3771-# func_append var value
3772-# Append VALUE to the end of shell variable VAR.
3773-func_append ()
3774-{
3775- eval "$1=\$$1\$2"
3776-}
3777-
3778-_LT_EOF
3779- ;;
3780- esac
3781-
3782-
3783- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3784- || (rm -f "$cfgfile"; exit 1)
3785-
3786- mv -f "$cfgfile" "$ofile" ||
3787+ sed '$q' "$ltmain" >> "$cfgfile" \
3788+ || (rm -f "$cfgfile"; exit 1)
3789+
3790+ if test x"$xsi_shell" = xyes; then
3791+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3792+func_dirname ()\
3793+{\
3794+\ case ${1} in\
3795+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3796+\ * ) func_dirname_result="${3}" ;;\
3797+\ esac\
3798+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3799+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3800+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3801+test 0 -eq $? || _lt_function_replace_fail=:
3802+
3803+
3804+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3805+func_basename ()\
3806+{\
3807+\ func_basename_result="${1##*/}"\
3808+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3809+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3810+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3811+test 0 -eq $? || _lt_function_replace_fail=:
3812+
3813+
3814+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3815+func_dirname_and_basename ()\
3816+{\
3817+\ case ${1} in\
3818+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3819+\ * ) func_dirname_result="${3}" ;;\
3820+\ esac\
3821+\ func_basename_result="${1##*/}"\
3822+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3823+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3825+test 0 -eq $? || _lt_function_replace_fail=:
3826+
3827+
3828+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3829+func_stripname ()\
3830+{\
3831+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3832+\ # positional parameters, so assign one to ordinary parameter first.\
3833+\ func_stripname_result=${3}\
3834+\ func_stripname_result=${func_stripname_result#"${1}"}\
3835+\ func_stripname_result=${func_stripname_result%"${2}"}\
3836+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3837+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3838+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3839+test 0 -eq $? || _lt_function_replace_fail=:
3840+
3841+
3842+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3843+func_split_long_opt ()\
3844+{\
3845+\ func_split_long_opt_name=${1%%=*}\
3846+\ func_split_long_opt_arg=${1#*=}\
3847+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3848+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3849+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3850+test 0 -eq $? || _lt_function_replace_fail=:
3851+
3852+
3853+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3854+func_split_short_opt ()\
3855+{\
3856+\ func_split_short_opt_arg=${1#??}\
3857+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3858+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3859+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3860+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3861+test 0 -eq $? || _lt_function_replace_fail=:
3862+
3863+
3864+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3865+func_lo2o ()\
3866+{\
3867+\ case ${1} in\
3868+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3869+\ *) func_lo2o_result=${1} ;;\
3870+\ esac\
3871+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3872+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3873+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3874+test 0 -eq $? || _lt_function_replace_fail=:
3875+
3876+
3877+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3878+func_xform ()\
3879+{\
3880+ func_xform_result=${1%.*}.lo\
3881+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3882+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3883+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3884+test 0 -eq $? || _lt_function_replace_fail=:
3885+
3886+
3887+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3888+func_arith ()\
3889+{\
3890+ func_arith_result=$(( $* ))\
3891+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3892+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3893+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3894+test 0 -eq $? || _lt_function_replace_fail=:
3895+
3896+
3897+ sed -e '/^func_len ()$/,/^} # func_len /c\
3898+func_len ()\
3899+{\
3900+ func_len_result=${#1}\
3901+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3902+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3903+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3904+test 0 -eq $? || _lt_function_replace_fail=:
3905+
3906+fi
3907+
3908+if test x"$lt_shell_append" = xyes; then
3909+ sed -e '/^func_append ()$/,/^} # func_append /c\
3910+func_append ()\
3911+{\
3912+ eval "${1}+=\\${2}"\
3913+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3914+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3915+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3916+test 0 -eq $? || _lt_function_replace_fail=:
3917+
3918+
3919+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3920+func_append_quoted ()\
3921+{\
3922+\ func_quote_for_eval "${2}"\
3923+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3924+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3925+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3926+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3927+test 0 -eq $? || _lt_function_replace_fail=:
3928+
3929+
3930+ # Save a `func_append' function call where possible by direct use of '+='
3931+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3932+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3933+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3934+ test 0 -eq $? || _lt_function_replace_fail=:
3935+else
3936+ # Save a `func_append' function call even when '+=' is not available
3937+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3938+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3939+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3940+ test 0 -eq $? || _lt_function_replace_fail=:
3941+fi
3942+
3943+if test x"$_lt_function_replace_fail" = x":"; then
3944+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3945+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3946+fi
3947+
3948+
3949+ mv -f "$cfgfile" "$ofile" ||
3950 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3951 chmod +x "$ofile"
3952
3953diff --git a/gas/Makefile.in b/gas/Makefile.in
3954index bc25765cb5b..c481d96a05a 100644
3955--- a/gas/Makefile.in
3956+++ b/gas/Makefile.in
3957@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@
3958 DATADIRNAME = @DATADIRNAME@
3959 DEFS = @DEFS@
3960 DEPDIR = @DEPDIR@
3961+DLLTOOL = @DLLTOOL@
3962 DSYMUTIL = @DSYMUTIL@
3963 DUMPBIN = @DUMPBIN@
3964 ECHO_C = @ECHO_C@
3965@@ -425,6 +426,7 @@ LTLIBINTL = @LTLIBINTL@
3966 LTLIBOBJS = @LTLIBOBJS@
3967 MAINT = @MAINT@
3968 MAKEINFO = @MAKEINFO@
3969+MANIFEST_TOOL = @MANIFEST_TOOL@
3970 MKDIR_P = @MKDIR_P@
3971 MKINSTALLDIRS = @MKINSTALLDIRS@
3972 MSGFMT = @MSGFMT@
3973@@ -468,6 +470,7 @@ abs_builddir = @abs_builddir@
3974 abs_srcdir = @abs_srcdir@
3975 abs_top_builddir = @abs_top_builddir@
3976 abs_top_srcdir = @abs_top_srcdir@
3977+ac_ct_AR = @ac_ct_AR@
3978 ac_ct_CC = @ac_ct_CC@
3979 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
3980 am__include = @am__include@
3981diff --git a/gas/configure b/gas/configure
3982index 5f8c8493589..998727b6108 100755
3983--- a/gas/configure
3984+++ b/gas/configure
3985@@ -692,8 +692,11 @@ OTOOL
3986 LIPO
3987 NMEDIT
3988 DSYMUTIL
3989+MANIFEST_TOOL
3990 RANLIB
3991+ac_ct_AR
3992 AR
3993+DLLTOOL
3994 OBJDUMP
3995 LN_S
3996 NM
3997@@ -810,6 +813,7 @@ enable_static
3998 with_pic
3999 enable_fast_install
4000 with_gnu_ld
4001+with_libtool_sysroot
4002 enable_libtool_lock
4003 enable_plugins
4004 enable_largefile
4005@@ -1517,6 +1521,8 @@ Optional Packages:
4006 --with-pic try to use only PIC/non-PIC objects [default=use
4007 both]
4008 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
4009+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
4010+ (or the compiler's sysroot if not specified).
4011 --with-cpu=CPU default cpu variant is CPU (currently only supported
4012 on ARC)
4013 --with-gnu-ld assume the C compiler uses GNU ld default=no
4014@@ -4652,8 +4658,8 @@ esac
4015
4016
4017
4018-macro_version='2.2.7a'
4019-macro_revision='1.3134'
4020+macro_version='2.4'
4021+macro_revision='1.3293'
4022
4023
4024
4025@@ -4693,7 +4699,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
4026 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
4027 $as_echo_n "checking how to print strings... " >&6; }
4028 # Test print first, because it will be a builtin if present.
4029-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
4030+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
4031 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
4032 ECHO='print -r --'
4033 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
4034@@ -5386,8 +5392,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
4035 # Try some XSI features
4036 xsi_shell=no
4037 ( _lt_dummy="a/b/c"
4038- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
4039- = c,a/b,, \
4040+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
4041+ = c,a/b,b/c, \
4042 && eval 'test $(( 1 + 1 )) -eq 2 \
4043 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
4044 && xsi_shell=yes
4045@@ -5436,6 +5442,80 @@ esac
4046
4047
4048
4049+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
4050+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
4051+if ${lt_cv_to_host_file_cmd+:} false; then :
4052+ $as_echo_n "(cached) " >&6
4053+else
4054+ case $host in
4055+ *-*-mingw* )
4056+ case $build in
4057+ *-*-mingw* ) # actually msys
4058+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
4059+ ;;
4060+ *-*-cygwin* )
4061+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
4062+ ;;
4063+ * ) # otherwise, assume *nix
4064+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
4065+ ;;
4066+ esac
4067+ ;;
4068+ *-*-cygwin* )
4069+ case $build in
4070+ *-*-mingw* ) # actually msys
4071+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
4072+ ;;
4073+ *-*-cygwin* )
4074+ lt_cv_to_host_file_cmd=func_convert_file_noop
4075+ ;;
4076+ * ) # otherwise, assume *nix
4077+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
4078+ ;;
4079+ esac
4080+ ;;
4081+ * ) # unhandled hosts (and "normal" native builds)
4082+ lt_cv_to_host_file_cmd=func_convert_file_noop
4083+ ;;
4084+esac
4085+
4086+fi
4087+
4088+to_host_file_cmd=$lt_cv_to_host_file_cmd
4089+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
4090+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
4091+
4092+
4093+
4094+
4095+
4096+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
4097+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
4098+if ${lt_cv_to_tool_file_cmd+:} false; then :
4099+ $as_echo_n "(cached) " >&6
4100+else
4101+ #assume ordinary cross tools, or native build.
4102+lt_cv_to_tool_file_cmd=func_convert_file_noop
4103+case $host in
4104+ *-*-mingw* )
4105+ case $build in
4106+ *-*-mingw* ) # actually msys
4107+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
4108+ ;;
4109+ esac
4110+ ;;
4111+esac
4112+
4113+fi
4114+
4115+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
4116+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
4117+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
4118+
4119+
4120+
4121+
4122+
4123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4124 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4125 if ${lt_cv_ld_reload_flag+:} false; then :
4126@@ -5452,6 +5532,11 @@ case $reload_flag in
4127 esac
4128 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4129 case $host_os in
4130+ cygwin* | mingw* | pw32* | cegcc*)
4131+ if test "$GCC" != yes; then
4132+ reload_cmds=false
4133+ fi
4134+ ;;
4135 darwin*)
4136 if test "$GCC" = yes; then
4137 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4138@@ -5620,7 +5705,8 @@ mingw* | pw32*)
4139 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4140 lt_cv_file_magic_cmd='func_win32_libid'
4141 else
4142- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4143+ # Keep this pattern in sync with the one in func_win32_libid.
4144+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4145 lt_cv_file_magic_cmd='$OBJDUMP -f'
4146 fi
4147 ;;
4148@@ -5779,6 +5865,21 @@ esac
4149 fi
4150 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4151 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4152+
4153+file_magic_glob=
4154+want_nocaseglob=no
4155+if test "$build" = "$host"; then
4156+ case $host_os in
4157+ mingw* | pw32*)
4158+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4159+ want_nocaseglob=yes
4160+ else
4161+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4162+ fi
4163+ ;;
4164+ esac
4165+fi
4166+
4167 file_magic_cmd=$lt_cv_file_magic_cmd
4168 deplibs_check_method=$lt_cv_deplibs_check_method
4169 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4170@@ -5794,6 +5895,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4171
4172
4173
4174+
4175+
4176+
4177+
4178+
4179+
4180+
4181+
4182+
4183+
4184+if test -n "$ac_tool_prefix"; then
4185+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4186+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4187+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4188+$as_echo_n "checking for $ac_word... " >&6; }
4189+if ${ac_cv_prog_DLLTOOL+:} false; then :
4190+ $as_echo_n "(cached) " >&6
4191+else
4192+ if test -n "$DLLTOOL"; then
4193+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4194+else
4195+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4196+for as_dir in $PATH
4197+do
4198+ IFS=$as_save_IFS
4199+ test -z "$as_dir" && as_dir=.
4200+ for ac_exec_ext in '' $ac_executable_extensions; do
4201+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4202+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4203+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4204+ break 2
4205+ fi
4206+done
4207+ done
4208+IFS=$as_save_IFS
4209+
4210+fi
4211+fi
4212+DLLTOOL=$ac_cv_prog_DLLTOOL
4213+if test -n "$DLLTOOL"; then
4214+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4215+$as_echo "$DLLTOOL" >&6; }
4216+else
4217+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4218+$as_echo "no" >&6; }
4219+fi
4220+
4221+
4222+fi
4223+if test -z "$ac_cv_prog_DLLTOOL"; then
4224+ ac_ct_DLLTOOL=$DLLTOOL
4225+ # Extract the first word of "dlltool", so it can be a program name with args.
4226+set dummy dlltool; ac_word=$2
4227+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4228+$as_echo_n "checking for $ac_word... " >&6; }
4229+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
4230+ $as_echo_n "(cached) " >&6
4231+else
4232+ if test -n "$ac_ct_DLLTOOL"; then
4233+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4234+else
4235+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4236+for as_dir in $PATH
4237+do
4238+ IFS=$as_save_IFS
4239+ test -z "$as_dir" && as_dir=.
4240+ for ac_exec_ext in '' $ac_executable_extensions; do
4241+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4242+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4243+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4244+ break 2
4245+ fi
4246+done
4247+ done
4248+IFS=$as_save_IFS
4249+
4250+fi
4251+fi
4252+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4253+if test -n "$ac_ct_DLLTOOL"; then
4254+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4255+$as_echo "$ac_ct_DLLTOOL" >&6; }
4256+else
4257+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4258+$as_echo "no" >&6; }
4259+fi
4260+
4261+ if test "x$ac_ct_DLLTOOL" = x; then
4262+ DLLTOOL="false"
4263+ else
4264+ case $cross_compiling:$ac_tool_warned in
4265+yes:)
4266+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4267+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4268+ac_tool_warned=yes ;;
4269+esac
4270+ DLLTOOL=$ac_ct_DLLTOOL
4271+ fi
4272+else
4273+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4274+fi
4275+
4276+test -z "$DLLTOOL" && DLLTOOL=dlltool
4277+
4278+
4279+
4280+
4281+
4282+
4283+
4284+
4285+
4286+
4287+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4288+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4289+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
4290+ $as_echo_n "(cached) " >&6
4291+else
4292+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4293+
4294+case $host_os in
4295+cygwin* | mingw* | pw32* | cegcc*)
4296+ # two different shell functions defined in ltmain.sh
4297+ # decide which to use based on capabilities of $DLLTOOL
4298+ case `$DLLTOOL --help 2>&1` in
4299+ *--identify-strict*)
4300+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4301+ ;;
4302+ *)
4303+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4304+ ;;
4305+ esac
4306+ ;;
4307+*)
4308+ # fallback: assume linklib IS sharedlib
4309+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4310+ ;;
4311+esac
4312+
4313+fi
4314+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4315+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4316+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4317+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4318+
4319+
4320+
4321+
4322+
4323+
4324+
4325 plugin_option=
4326 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
4327 for plugin in $plugin_names; do
4328@@ -5808,8 +6060,10 @@ for plugin in $plugin_names; do
4329 done
4330
4331 if test -n "$ac_tool_prefix"; then
4332- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4333-set dummy ${ac_tool_prefix}ar; ac_word=$2
4334+ for ac_prog in ar
4335+ do
4336+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4337+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4339 $as_echo_n "checking for $ac_word... " >&6; }
4340 if ${ac_cv_prog_AR+:} false; then :
4341@@ -5825,7 +6079,7 @@ do
4342 test -z "$as_dir" && as_dir=.
4343 for ac_exec_ext in '' $ac_executable_extensions; do
4344 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4345- ac_cv_prog_AR="${ac_tool_prefix}ar"
4346+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4347 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4348 break 2
4349 fi
4350@@ -5845,11 +6099,15 @@ $as_echo "no" >&6; }
4351 fi
4352
4353
4354+ test -n "$AR" && break
4355+ done
4356 fi
4357-if test -z "$ac_cv_prog_AR"; then
4358+if test -z "$AR"; then
4359 ac_ct_AR=$AR
4360- # Extract the first word of "ar", so it can be a program name with args.
4361-set dummy ar; ac_word=$2
4362+ for ac_prog in ar
4363+do
4364+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4365+set dummy $ac_prog; ac_word=$2
4366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4367 $as_echo_n "checking for $ac_word... " >&6; }
4368 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4369@@ -5865,7 +6123,7 @@ do
4370 test -z "$as_dir" && as_dir=.
4371 for ac_exec_ext in '' $ac_executable_extensions; do
4372 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4373- ac_cv_prog_ac_ct_AR="ar"
4374+ ac_cv_prog_ac_ct_AR="$ac_prog"
4375 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4376 break 2
4377 fi
4378@@ -5884,6 +6142,10 @@ else
4379 $as_echo "no" >&6; }
4380 fi
4381
4382+
4383+ test -n "$ac_ct_AR" && break
4384+done
4385+
4386 if test "x$ac_ct_AR" = x; then
4387 AR="false"
4388 else
4389@@ -5895,29 +6157,81 @@ ac_tool_warned=yes ;;
4390 esac
4391 AR=$ac_ct_AR
4392 fi
4393-else
4394- AR="$ac_cv_prog_AR"
4395 fi
4396
4397-test -z "$AR" && AR=ar
4398-if test -n "$plugin_option"; then
4399- if $AR --help 2>&1 | grep -q "\--plugin"; then
4400- touch conftest.c
4401- $AR $plugin_option rc conftest.a conftest.c
4402- if test "$?" != 0; then
4403- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
4404+ touch conftest.c
4405+ $AR $plugin_option rc conftest.a conftest.c
4406+ if test "$?" != 0; then
4407+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
4408 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
4409- else
4410- AR="$AR $plugin_option"
4411- fi
4412- rm -f conftest.*
4413+ else
4414+ AR="$AR $plugin_option"
4415 fi
4416-fi
4417-test -z "$AR_FLAGS" && AR_FLAGS=cru
4418+ rm -f conftest.*
4419+: ${AR=ar}
4420+: ${AR_FLAGS=cru}
4421+
4422+
4423+
4424+
4425+
4426+
4427+
4428+
4429+
4430+
4431+
4432+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4433+$as_echo_n "checking for archiver @FILE support... " >&6; }
4434+if ${lt_cv_ar_at_file+:} false; then :
4435+ $as_echo_n "(cached) " >&6
4436+else
4437+ lt_cv_ar_at_file=no
4438+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4439+/* end confdefs.h. */
4440+
4441+int
4442+main ()
4443+{
4444
4445+ ;
4446+ return 0;
4447+}
4448+_ACEOF
4449+if ac_fn_c_try_compile "$LINENO"; then :
4450+ echo conftest.$ac_objext > conftest.lst
4451+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4452+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4453+ (eval $lt_ar_try) 2>&5
4454+ ac_status=$?
4455+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4456+ test $ac_status = 0; }
4457+ if test "$ac_status" -eq 0; then
4458+ # Ensure the archiver fails upon bogus file names.
4459+ rm -f conftest.$ac_objext libconftest.a
4460+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4461+ (eval $lt_ar_try) 2>&5
4462+ ac_status=$?
4463+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4464+ test $ac_status = 0; }
4465+ if test "$ac_status" -ne 0; then
4466+ lt_cv_ar_at_file=@
4467+ fi
4468+ fi
4469+ rm -f conftest.* libconftest.a
4470
4471+fi
4472+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4473
4474+fi
4475+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4476+$as_echo "$lt_cv_ar_at_file" >&6; }
4477
4478+if test "x$lt_cv_ar_at_file" = xno; then
4479+ archiver_list_spec=
4480+else
4481+ archiver_list_spec=$lt_cv_ar_at_file
4482+fi
4483
4484
4485
4486@@ -6264,8 +6578,8 @@ esac
4487 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4488
4489 # Transform an extracted symbol line into symbol name and symbol address
4490-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4491-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'"
4492+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4493+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'"
4494
4495 # Handle CRLF in mingw tool chain
4496 opt_cr=
4497@@ -6301,6 +6615,7 @@ for ac_symprfx in "" "_"; do
4498 else
4499 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4500 fi
4501+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4502
4503 # Check to see that the pipe works correctly.
4504 pipe_works=no
4505@@ -6342,6 +6657,18 @@ _LT_EOF
4506 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4507 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4508 cat <<_LT_EOF > conftest.$ac_ext
4509+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4510+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4511+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4512+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4513+# define LT_DLSYM_CONST
4514+#elif defined(__osf__)
4515+/* This system does not cope well with relocations in const data. */
4516+# define LT_DLSYM_CONST
4517+#else
4518+# define LT_DLSYM_CONST const
4519+#endif
4520+
4521 #ifdef __cplusplus
4522 extern "C" {
4523 #endif
4524@@ -6353,7 +6680,7 @@ _LT_EOF
4525 cat <<_LT_EOF >> conftest.$ac_ext
4526
4527 /* The mapping between symbol names and symbols. */
4528-const struct {
4529+LT_DLSYM_CONST struct {
4530 const char *name;
4531 void *address;
4532 }
4533@@ -6379,8 +6706,8 @@ static const void *lt_preloaded_setup() {
4534 _LT_EOF
4535 # Now try linking the two files.
4536 mv conftest.$ac_objext conftstm.$ac_objext
4537- lt_save_LIBS="$LIBS"
4538- lt_save_CFLAGS="$CFLAGS"
4539+ lt_globsym_save_LIBS=$LIBS
4540+ lt_globsym_save_CFLAGS=$CFLAGS
4541 LIBS="conftstm.$ac_objext"
4542 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4543 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4544@@ -6390,8 +6717,8 @@ _LT_EOF
4545 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4546 pipe_works=yes
4547 fi
4548- LIBS="$lt_save_LIBS"
4549- CFLAGS="$lt_save_CFLAGS"
4550+ LIBS=$lt_globsym_save_LIBS
4551+ CFLAGS=$lt_globsym_save_CFLAGS
4552 else
4553 echo "cannot find nm_test_func in $nlist" >&5
4554 fi
4555@@ -6428,6 +6755,19 @@ else
4556 $as_echo "ok" >&6; }
4557 fi
4558
4559+# Response file support.
4560+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4561+ nm_file_list_spec='@'
4562+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4563+ nm_file_list_spec='@'
4564+fi
4565+
4566+
4567+
4568+
4569+
4570+
4571+
4572
4573
4574
4575@@ -6444,6 +6784,42 @@ fi
4576
4577
4578
4579+
4580+
4581+
4582+
4583+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4584+$as_echo_n "checking for sysroot... " >&6; }
4585+
4586+# Check whether --with-libtool-sysroot was given.
4587+if test "${with_libtool_sysroot+set}" = set; then :
4588+ withval=$with_libtool_sysroot;
4589+else
4590+ with_libtool_sysroot=no
4591+fi
4592+
4593+
4594+lt_sysroot=
4595+case ${with_libtool_sysroot} in #(
4596+ yes)
4597+ if test "$GCC" = yes; then
4598+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4599+ fi
4600+ ;; #(
4601+ /*)
4602+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4603+ ;; #(
4604+ no|'')
4605+ ;; #(
4606+ *)
4607+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4608+$as_echo "${with_libtool_sysroot}" >&6; }
4609+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
4610+ ;;
4611+esac
4612+
4613+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4614+$as_echo "${lt_sysroot:-no}" >&6; }
4615
4616
4617
4618@@ -6655,6 +7031,123 @@ esac
4619
4620 need_locks="$enable_libtool_lock"
4621
4622+if test -n "$ac_tool_prefix"; then
4623+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4624+set dummy ${ac_tool_prefix}mt; ac_word=$2
4625+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4626+$as_echo_n "checking for $ac_word... " >&6; }
4627+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
4628+ $as_echo_n "(cached) " >&6
4629+else
4630+ if test -n "$MANIFEST_TOOL"; then
4631+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4632+else
4633+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4634+for as_dir in $PATH
4635+do
4636+ IFS=$as_save_IFS
4637+ test -z "$as_dir" && as_dir=.
4638+ for ac_exec_ext in '' $ac_executable_extensions; do
4639+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4640+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4641+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4642+ break 2
4643+ fi
4644+done
4645+ done
4646+IFS=$as_save_IFS
4647+
4648+fi
4649+fi
4650+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4651+if test -n "$MANIFEST_TOOL"; then
4652+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4653+$as_echo "$MANIFEST_TOOL" >&6; }
4654+else
4655+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4656+$as_echo "no" >&6; }
4657+fi
4658+
4659+
4660+fi
4661+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4662+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4663+ # Extract the first word of "mt", so it can be a program name with args.
4664+set dummy mt; ac_word=$2
4665+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4666+$as_echo_n "checking for $ac_word... " >&6; }
4667+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
4668+ $as_echo_n "(cached) " >&6
4669+else
4670+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4671+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4672+else
4673+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4674+for as_dir in $PATH
4675+do
4676+ IFS=$as_save_IFS
4677+ test -z "$as_dir" && as_dir=.
4678+ for ac_exec_ext in '' $ac_executable_extensions; do
4679+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4680+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4681+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4682+ break 2
4683+ fi
4684+done
4685+ done
4686+IFS=$as_save_IFS
4687+
4688+fi
4689+fi
4690+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4691+if test -n "$ac_ct_MANIFEST_TOOL"; then
4692+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4693+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4694+else
4695+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4696+$as_echo "no" >&6; }
4697+fi
4698+
4699+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4700+ MANIFEST_TOOL=":"
4701+ else
4702+ case $cross_compiling:$ac_tool_warned in
4703+yes:)
4704+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4705+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4706+ac_tool_warned=yes ;;
4707+esac
4708+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4709+ fi
4710+else
4711+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4712+fi
4713+
4714+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4715+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4716+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4717+if ${lt_cv_path_mainfest_tool+:} false; then :
4718+ $as_echo_n "(cached) " >&6
4719+else
4720+ lt_cv_path_mainfest_tool=no
4721+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4722+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4723+ cat conftest.err >&5
4724+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4725+ lt_cv_path_mainfest_tool=yes
4726+ fi
4727+ rm -f conftest*
4728+fi
4729+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4730+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4731+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4732+ MANIFEST_TOOL=:
4733+fi
4734+
4735+
4736+
4737+
4738+
4739
4740 case $host_os in
4741 rhapsody* | darwin*)
4742@@ -7218,6 +7711,8 @@ _LT_EOF
4743 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4744 echo "$AR cru libconftest.a conftest.o" >&5
4745 $AR cru libconftest.a conftest.o 2>&5
4746+ echo "$RANLIB libconftest.a" >&5
4747+ $RANLIB libconftest.a 2>&5
4748 cat > conftest.c << _LT_EOF
4749 int main() { return 0;}
4750 _LT_EOF
4751@@ -7802,8 +8297,6 @@ fi
4752 lt_prog_compiler_pic=
4753 lt_prog_compiler_static=
4754
4755-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4756-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4757
4758 if test "$GCC" = yes; then
4759 lt_prog_compiler_wl='-Wl,'
4760@@ -7969,6 +8462,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4761 lt_prog_compiler_pic='--shared'
4762 lt_prog_compiler_static='--static'
4763 ;;
4764+ nagfor*)
4765+ # NAG Fortran compiler
4766+ lt_prog_compiler_wl='-Wl,-Wl,,'
4767+ lt_prog_compiler_pic='-PIC'
4768+ lt_prog_compiler_static='-Bstatic'
4769+ ;;
4770 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4771 # Portland Group compilers (*not* the Pentium gcc compiler,
4772 # which looks to be a dead project)
4773@@ -8031,7 +8530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4774 lt_prog_compiler_pic='-KPIC'
4775 lt_prog_compiler_static='-Bstatic'
4776 case $cc_basename in
4777- f77* | f90* | f95*)
4778+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4779 lt_prog_compiler_wl='-Qoption ld ';;
4780 *)
4781 lt_prog_compiler_wl='-Wl,';;
4782@@ -8088,13 +8587,17 @@ case $host_os in
4783 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4784 ;;
4785 esac
4786-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4787-$as_echo "$lt_prog_compiler_pic" >&6; }
4788-
4789-
4790-
4791-
4792
4793+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4794+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4795+if ${lt_cv_prog_compiler_pic+:} false; then :
4796+ $as_echo_n "(cached) " >&6
4797+else
4798+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4799+fi
4800+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4801+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4802+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4803
4804 #
4805 # Check to make sure the PIC flag actually works.
4806@@ -8155,6 +8658,11 @@ fi
4807
4808
4809
4810+
4811+
4812+
4813+
4814+
4815 #
4816 # Check to make sure the static flag actually works.
4817 #
4818@@ -8505,7 +9013,8 @@ _LT_EOF
4819 allow_undefined_flag=unsupported
4820 always_export_symbols=no
4821 enable_shared_with_static_runtimes=yes
4822- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4823+ 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'
4824+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4825
4826 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4827 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4828@@ -8604,12 +9113,12 @@ _LT_EOF
4829 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4830 hardcode_libdir_flag_spec=
4831 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4832- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4833+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4834 if test "x$supports_anon_versioning" = xyes; then
4835 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4836 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4837 echo "local: *; };" >> $output_objdir/$libname.ver~
4838- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4839+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4840 fi
4841 ;;
4842 esac
4843@@ -8623,8 +9132,8 @@ _LT_EOF
4844 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4845 wlarc=
4846 else
4847- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4848- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4849+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4850+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4851 fi
4852 ;;
4853
4854@@ -8642,8 +9151,8 @@ _LT_EOF
4855
4856 _LT_EOF
4857 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4858- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4859- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4860+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4861+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4862 else
4863 ld_shlibs=no
4864 fi
4865@@ -8689,8 +9198,8 @@ _LT_EOF
4866
4867 *)
4868 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4869- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4870- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4871+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4872+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4873 else
4874 ld_shlibs=no
4875 fi
4876@@ -8820,7 +9329,13 @@ _LT_EOF
4877 allow_undefined_flag='-berok'
4878 # Determine the default libpath from the value encoded in an
4879 # empty executable.
4880- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4881+ if test "${lt_cv_aix_libpath+set}" = set; then
4882+ aix_libpath=$lt_cv_aix_libpath
4883+else
4884+ if ${lt_cv_aix_libpath_+:} false; then :
4885+ $as_echo_n "(cached) " >&6
4886+else
4887+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4888 /* end confdefs.h. */
4889
4890 int
4891@@ -8833,22 +9348,29 @@ main ()
4892 _ACEOF
4893 if ac_fn_c_try_link "$LINENO"; then :
4894
4895-lt_aix_libpath_sed='
4896- /Import File Strings/,/^$/ {
4897- /^0/ {
4898- s/^0 *\(.*\)$/\1/
4899- p
4900- }
4901- }'
4902-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4903-# Check for a 64-bit object if we didn't find anything.
4904-if test -z "$aix_libpath"; then
4905- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4906-fi
4907+ lt_aix_libpath_sed='
4908+ /Import File Strings/,/^$/ {
4909+ /^0/ {
4910+ s/^0 *\([^ ]*\) *$/\1/
4911+ p
4912+ }
4913+ }'
4914+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4915+ # Check for a 64-bit object if we didn't find anything.
4916+ if test -z "$lt_cv_aix_libpath_"; then
4917+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4918+ fi
4919 fi
4920 rm -f core conftest.err conftest.$ac_objext \
4921 conftest$ac_exeext conftest.$ac_ext
4922-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4923+ if test -z "$lt_cv_aix_libpath_"; then
4924+ lt_cv_aix_libpath_="/usr/lib:/lib"
4925+ fi
4926+
4927+fi
4928+
4929+ aix_libpath=$lt_cv_aix_libpath_
4930+fi
4931
4932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4933 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"
4934@@ -8860,7 +9382,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4935 else
4936 # Determine the default libpath from the value encoded in an
4937 # empty executable.
4938- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4939+ if test "${lt_cv_aix_libpath+set}" = set; then
4940+ aix_libpath=$lt_cv_aix_libpath
4941+else
4942+ if ${lt_cv_aix_libpath_+:} false; then :
4943+ $as_echo_n "(cached) " >&6
4944+else
4945+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4946 /* end confdefs.h. */
4947
4948 int
4949@@ -8873,22 +9401,29 @@ main ()
4950 _ACEOF
4951 if ac_fn_c_try_link "$LINENO"; then :
4952
4953-lt_aix_libpath_sed='
4954- /Import File Strings/,/^$/ {
4955- /^0/ {
4956- s/^0 *\(.*\)$/\1/
4957- p
4958- }
4959- }'
4960-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4961-# Check for a 64-bit object if we didn't find anything.
4962-if test -z "$aix_libpath"; then
4963- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4964-fi
4965+ lt_aix_libpath_sed='
4966+ /Import File Strings/,/^$/ {
4967+ /^0/ {
4968+ s/^0 *\([^ ]*\) *$/\1/
4969+ p
4970+ }
4971+ }'
4972+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4973+ # Check for a 64-bit object if we didn't find anything.
4974+ if test -z "$lt_cv_aix_libpath_"; then
4975+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4976+ fi
4977 fi
4978 rm -f core conftest.err conftest.$ac_objext \
4979 conftest$ac_exeext conftest.$ac_ext
4980-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4981+ if test -z "$lt_cv_aix_libpath_"; then
4982+ lt_cv_aix_libpath_="/usr/lib:/lib"
4983+ fi
4984+
4985+fi
4986+
4987+ aix_libpath=$lt_cv_aix_libpath_
4988+fi
4989
4990 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4991 # Warning - without using the other run time loading flags,
4992@@ -8933,20 +9468,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4993 # Microsoft Visual C++.
4994 # hardcode_libdir_flag_spec is actually meaningless, as there is
4995 # no search path for DLLs.
4996- hardcode_libdir_flag_spec=' '
4997- allow_undefined_flag=unsupported
4998- # Tell ltmain to make .lib files, not .a files.
4999- libext=lib
5000- # Tell ltmain to make .dll files, not .so files.
5001- shrext_cmds=".dll"
5002- # FIXME: Setting linknames here is a bad hack.
5003- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
5004- # The linker will automatically build a .lib file if we build a DLL.
5005- old_archive_from_new_cmds='true'
5006- # FIXME: Should let the user specify the lib program.
5007- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
5008- fix_srcfile_path='`cygpath -w "$srcfile"`'
5009- enable_shared_with_static_runtimes=yes
5010+ case $cc_basename in
5011+ cl*)
5012+ # Native MSVC
5013+ hardcode_libdir_flag_spec=' '
5014+ allow_undefined_flag=unsupported
5015+ always_export_symbols=yes
5016+ file_list_spec='@'
5017+ # Tell ltmain to make .lib files, not .a files.
5018+ libext=lib
5019+ # Tell ltmain to make .dll files, not .so files.
5020+ shrext_cmds=".dll"
5021+ # FIXME: Setting linknames here is a bad hack.
5022+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
5023+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
5024+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
5025+ else
5026+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
5027+ fi~
5028+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
5029+ linknames='
5030+ # The linker will not automatically build a static lib if we build a DLL.
5031+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
5032+ enable_shared_with_static_runtimes=yes
5033+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
5034+ # Don't use ranlib
5035+ old_postinstall_cmds='chmod 644 $oldlib'
5036+ postlink_cmds='lt_outputfile="@OUTPUT@"~
5037+ lt_tool_outputfile="@TOOL_OUTPUT@"~
5038+ case $lt_outputfile in
5039+ *.exe|*.EXE) ;;
5040+ *)
5041+ lt_outputfile="$lt_outputfile.exe"
5042+ lt_tool_outputfile="$lt_tool_outputfile.exe"
5043+ ;;
5044+ esac~
5045+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
5046+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
5047+ $RM "$lt_outputfile.manifest";
5048+ fi'
5049+ ;;
5050+ *)
5051+ # Assume MSVC wrapper
5052+ hardcode_libdir_flag_spec=' '
5053+ allow_undefined_flag=unsupported
5054+ # Tell ltmain to make .lib files, not .a files.
5055+ libext=lib
5056+ # Tell ltmain to make .dll files, not .so files.
5057+ shrext_cmds=".dll"
5058+ # FIXME: Setting linknames here is a bad hack.
5059+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
5060+ # The linker will automatically build a .lib file if we build a DLL.
5061+ old_archive_from_new_cmds='true'
5062+ # FIXME: Should let the user specify the lib program.
5063+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
5064+ enable_shared_with_static_runtimes=yes
5065+ ;;
5066+ esac
5067 ;;
5068
5069 darwin* | rhapsody*)
5070@@ -9007,7 +9585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5071
5072 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5073 freebsd* | dragonfly*)
5074- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
5075+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
5076 hardcode_libdir_flag_spec='-R$libdir'
5077 hardcode_direct=yes
5078 hardcode_shlibpath_var=no
5079@@ -9015,7 +9593,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5080
5081 hpux9*)
5082 if test "$GCC" = yes; then
5083- 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'
5084+ 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'
5085 else
5086 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'
5087 fi
5088@@ -9031,7 +9609,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5089
5090 hpux10*)
5091 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
5092- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5093+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5094 else
5095 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5096 fi
5097@@ -9055,10 +9633,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5098 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5099 ;;
5100 ia64*)
5101- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5102+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5103 ;;
5104 *)
5105- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5106+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5107 ;;
5108 esac
5109 else
5110@@ -9137,23 +9715,36 @@ fi
5111
5112 irix5* | irix6* | nonstopux*)
5113 if test "$GCC" = yes; then
5114- 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'
5115+ 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'
5116 # Try to use the -exported_symbol ld option, if it does not
5117 # work, assume that -exports_file does not work either and
5118 # implicitly export all symbols.
5119- save_LDFLAGS="$LDFLAGS"
5120- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5121- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5122+ # This should be the same for all languages, so no per-tag cache variable.
5123+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
5124+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
5125+if ${lt_cv_irix_exported_symbol+:} false; then :
5126+ $as_echo_n "(cached) " >&6
5127+else
5128+ save_LDFLAGS="$LDFLAGS"
5129+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5130+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5131 /* end confdefs.h. */
5132-int foo(void) {}
5133+int foo (void) { return 0; }
5134 _ACEOF
5135 if ac_fn_c_try_link "$LINENO"; then :
5136- 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'
5137-
5138+ lt_cv_irix_exported_symbol=yes
5139+else
5140+ lt_cv_irix_exported_symbol=no
5141 fi
5142 rm -f core conftest.err conftest.$ac_objext \
5143 conftest$ac_exeext conftest.$ac_ext
5144- LDFLAGS="$save_LDFLAGS"
5145+ LDFLAGS="$save_LDFLAGS"
5146+fi
5147+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5148+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5149+ if test "$lt_cv_irix_exported_symbol" = yes; then
5150+ 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'
5151+ fi
5152 else
5153 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'
5154 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'
5155@@ -9238,7 +9829,7 @@ rm -f core conftest.err conftest.$ac_objext \
5156 osf4* | osf5*) # as osf3* with the addition of -msym flag
5157 if test "$GCC" = yes; then
5158 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5159- 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'
5160+ 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'
5161 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5162 else
5163 allow_undefined_flag=' -expect_unresolved \*'
5164@@ -9257,9 +9848,9 @@ rm -f core conftest.err conftest.$ac_objext \
5165 no_undefined_flag=' -z defs'
5166 if test "$GCC" = yes; then
5167 wlarc='${wl}'
5168- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5169+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5170 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5171- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5172+ $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'
5173 else
5174 case `$CC -V 2>&1` in
5175 *"Compilers 5.0"*)
5176@@ -9835,8 +10426,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5177 need_version=no
5178 need_lib_prefix=no
5179
5180- case $GCC,$host_os in
5181- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5182+ case $GCC,$cc_basename in
5183+ yes,*)
5184+ # gcc
5185 library_names_spec='$libname.dll.a'
5186 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5187 postinstall_cmds='base_file=`basename \${file}`~
5188@@ -9869,13 +10461,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5189 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5190 ;;
5191 esac
5192+ dynamic_linker='Win32 ld.exe'
5193+ ;;
5194+
5195+ *,cl*)
5196+ # Native MSVC
5197+ libname_spec='$name'
5198+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5199+ library_names_spec='${libname}.dll.lib'
5200+
5201+ case $build_os in
5202+ mingw*)
5203+ sys_lib_search_path_spec=
5204+ lt_save_ifs=$IFS
5205+ IFS=';'
5206+ for lt_path in $LIB
5207+ do
5208+ IFS=$lt_save_ifs
5209+ # Let DOS variable expansion print the short 8.3 style file name.
5210+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5211+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5212+ done
5213+ IFS=$lt_save_ifs
5214+ # Convert to MSYS style.
5215+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5216+ ;;
5217+ cygwin*)
5218+ # Convert to unix form, then to dos form, then back to unix form
5219+ # but this time dos style (no spaces!) so that the unix form looks
5220+ # like /cygdrive/c/PROGRA~1:/cygdr...
5221+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5222+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5223+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5224+ ;;
5225+ *)
5226+ sys_lib_search_path_spec="$LIB"
5227+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5228+ # It is most probably a Windows format PATH.
5229+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5230+ else
5231+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5232+ fi
5233+ # FIXME: find the short name or the path components, as spaces are
5234+ # common. (e.g. "Program Files" -> "PROGRA~1")
5235+ ;;
5236+ esac
5237+
5238+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5239+ postinstall_cmds='base_file=`basename \${file}`~
5240+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5241+ dldir=$destdir/`dirname \$dlpath`~
5242+ test -d \$dldir || mkdir -p \$dldir~
5243+ $install_prog $dir/$dlname \$dldir/$dlname'
5244+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5245+ dlpath=$dir/\$dldll~
5246+ $RM \$dlpath'
5247+ shlibpath_overrides_runpath=yes
5248+ dynamic_linker='Win32 link.exe'
5249 ;;
5250
5251 *)
5252+ # Assume MSVC wrapper
5253 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5254+ dynamic_linker='Win32 ld.exe'
5255 ;;
5256 esac
5257- dynamic_linker='Win32 ld.exe'
5258 # FIXME: first we should search . and the directory the executable is in
5259 shlibpath_var=PATH
5260 ;;
5261@@ -10777,7 +11427,7 @@ else
5262 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5263 lt_status=$lt_dlunknown
5264 cat > conftest.$ac_ext <<_LT_EOF
5265-#line 10780 "configure"
5266+#line $LINENO "configure"
5267 #include "confdefs.h"
5268
5269 #if HAVE_DLFCN_H
5270@@ -10821,10 +11471,10 @@ else
5271 /* When -fvisbility=hidden is used, assume the code has been annotated
5272 correspondingly for the symbols needed. */
5273 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5274-void fnord () __attribute__((visibility("default")));
5275+int fnord () __attribute__((visibility("default")));
5276 #endif
5277
5278-void fnord () { int i=42; }
5279+int fnord () { return 42; }
5280 int main ()
5281 {
5282 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5283@@ -10883,7 +11533,7 @@ else
5284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5285 lt_status=$lt_dlunknown
5286 cat > conftest.$ac_ext <<_LT_EOF
5287-#line 10886 "configure"
5288+#line $LINENO "configure"
5289 #include "confdefs.h"
5290
5291 #if HAVE_DLFCN_H
5292@@ -10927,10 +11577,10 @@ else
5293 /* When -fvisbility=hidden is used, assume the code has been annotated
5294 correspondingly for the symbols needed. */
5295 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5296-void fnord () __attribute__((visibility("default")));
5297+int fnord () __attribute__((visibility("default")));
5298 #endif
5299
5300-void fnord () { int i=42; }
5301+int fnord () { return 42; }
5302 int main ()
5303 {
5304 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5305@@ -17080,13 +17730,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5306 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5307 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5308 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5309+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5310+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5311 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5312 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5313 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5314 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5315 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5316+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5317+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5318+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5319+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5320 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5321 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5322+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5323 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5324 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5325 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5326@@ -17101,14 +17758,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5327 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5328 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5329 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"`'
5330+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5331+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5332 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5333 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5334 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5335-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5336 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5337+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5338 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5339 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5340 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5341+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5342 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5343 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5344 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5345@@ -17141,12 +17801,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5346 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5347 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5348 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5349-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5350 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5351 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5352 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5353 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5354 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5355+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5356 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5357 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5358 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5359@@ -17201,8 +17861,13 @@ reload_flag \
5360 OBJDUMP \
5361 deplibs_check_method \
5362 file_magic_cmd \
5363+file_magic_glob \
5364+want_nocaseglob \
5365+DLLTOOL \
5366+sharedlib_from_linklib_cmd \
5367 AR \
5368 AR_FLAGS \
5369+archiver_list_spec \
5370 STRIP \
5371 RANLIB \
5372 CC \
5373@@ -17212,12 +17877,14 @@ lt_cv_sys_global_symbol_pipe \
5374 lt_cv_sys_global_symbol_to_cdecl \
5375 lt_cv_sys_global_symbol_to_c_name_address \
5376 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5377+nm_file_list_spec \
5378 lt_prog_compiler_no_builtin_flag \
5379-lt_prog_compiler_wl \
5380 lt_prog_compiler_pic \
5381+lt_prog_compiler_wl \
5382 lt_prog_compiler_static \
5383 lt_cv_prog_compiler_c_o \
5384 need_locks \
5385+MANIFEST_TOOL \
5386 DSYMUTIL \
5387 NMEDIT \
5388 LIPO \
5389@@ -17233,7 +17900,6 @@ no_undefined_flag \
5390 hardcode_libdir_flag_spec \
5391 hardcode_libdir_flag_spec_ld \
5392 hardcode_libdir_separator \
5393-fix_srcfile_path \
5394 exclude_expsyms \
5395 include_expsyms \
5396 file_list_spec \
5397@@ -17269,6 +17935,7 @@ module_cmds \
5398 module_expsym_cmds \
5399 export_symbols_cmds \
5400 prelink_cmds \
5401+postlink_cmds \
5402 postinstall_cmds \
5403 postuninstall_cmds \
5404 finish_cmds \
5405@@ -18049,7 +18716,8 @@ $as_echo X"$file" |
5406 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5407 #
5408 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5409-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5410+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5411+# Inc.
5412 # Written by Gordon Matzigkeit, 1996
5413 #
5414 # This file is part of GNU Libtool.
5415@@ -18152,19 +18820,42 @@ SP2NL=$lt_lt_SP2NL
5416 # turn newlines into spaces.
5417 NL2SP=$lt_lt_NL2SP
5418
5419+# convert \$build file names to \$host format.
5420+to_host_file_cmd=$lt_cv_to_host_file_cmd
5421+
5422+# convert \$build files to toolchain format.
5423+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5424+
5425 # An object symbol dumper.
5426 OBJDUMP=$lt_OBJDUMP
5427
5428 # Method to check whether dependent libraries are shared objects.
5429 deplibs_check_method=$lt_deplibs_check_method
5430
5431-# Command to use when deplibs_check_method == "file_magic".
5432+# Command to use when deplibs_check_method = "file_magic".
5433 file_magic_cmd=$lt_file_magic_cmd
5434
5435+# How to find potential files when deplibs_check_method = "file_magic".
5436+file_magic_glob=$lt_file_magic_glob
5437+
5438+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5439+want_nocaseglob=$lt_want_nocaseglob
5440+
5441+# DLL creation program.
5442+DLLTOOL=$lt_DLLTOOL
5443+
5444+# Command to associate shared and link libraries.
5445+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5446+
5447 # The archiver.
5448 AR=$lt_AR
5449+
5450+# Flags to create an archive.
5451 AR_FLAGS=$lt_AR_FLAGS
5452
5453+# How to feed a file listing to the archiver.
5454+archiver_list_spec=$lt_archiver_list_spec
5455+
5456 # A symbol stripping program.
5457 STRIP=$lt_STRIP
5458
5459@@ -18194,6 +18885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5460 # Transform the output of nm in a C name address pair when lib prefix is needed.
5461 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5462
5463+# Specify filename containing input files for \$NM.
5464+nm_file_list_spec=$lt_nm_file_list_spec
5465+
5466+# The root where to search for dependent libraries,and in which our libraries should be installed.
5467+lt_sysroot=$lt_sysroot
5468+
5469 # The name of the directory that contains temporary libtool files.
5470 objdir=$objdir
5471
5472@@ -18203,6 +18900,9 @@ MAGIC_CMD=$MAGIC_CMD
5473 # Must we lock files when doing compilation?
5474 need_locks=$lt_need_locks
5475
5476+# Manifest tool.
5477+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5478+
5479 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5480 DSYMUTIL=$lt_DSYMUTIL
5481
5482@@ -18317,12 +19017,12 @@ with_gcc=$GCC
5483 # Compiler flag to turn off builtin functions.
5484 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5485
5486-# How to pass a linker flag through the compiler.
5487-wl=$lt_lt_prog_compiler_wl
5488-
5489 # Additional compiler flags for building library objects.
5490 pic_flag=$lt_lt_prog_compiler_pic
5491
5492+# How to pass a linker flag through the compiler.
5493+wl=$lt_lt_prog_compiler_wl
5494+
5495 # Compiler flag to prevent dynamic linking.
5496 link_static_flag=$lt_lt_prog_compiler_static
5497
5498@@ -18409,9 +19109,6 @@ inherit_rpath=$inherit_rpath
5499 # Whether libtool must link a program against all its dependency libraries.
5500 link_all_deplibs=$link_all_deplibs
5501
5502-# Fix the shell variable \$srcfile for the compiler.
5503-fix_srcfile_path=$lt_fix_srcfile_path
5504-
5505 # Set to "yes" if exported symbols are required.
5506 always_export_symbols=$always_export_symbols
5507
5508@@ -18427,6 +19124,9 @@ include_expsyms=$lt_include_expsyms
5509 # Commands necessary for linking programs (against libraries) with templates.
5510 prelink_cmds=$lt_prelink_cmds
5511
5512+# Commands necessary for finishing linking programs.
5513+postlink_cmds=$lt_postlink_cmds
5514+
5515 # Specify filename containing input files.
5516 file_list_spec=$lt_file_list_spec
5517
5518@@ -18459,210 +19159,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5519 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5520 # text mode, it properly converts lines to CR/LF. This bash problem
5521 # is reportedly fixed, but why not run on old versions too?
5522- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5523- || (rm -f "$cfgfile"; exit 1)
5524-
5525- case $xsi_shell in
5526- yes)
5527- cat << \_LT_EOF >> "$cfgfile"
5528-
5529-# func_dirname file append nondir_replacement
5530-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5531-# otherwise set result to NONDIR_REPLACEMENT.
5532-func_dirname ()
5533-{
5534- case ${1} in
5535- */*) func_dirname_result="${1%/*}${2}" ;;
5536- * ) func_dirname_result="${3}" ;;
5537- esac
5538-}
5539-
5540-# func_basename file
5541-func_basename ()
5542-{
5543- func_basename_result="${1##*/}"
5544-}
5545-
5546-# func_dirname_and_basename file append nondir_replacement
5547-# perform func_basename and func_dirname in a single function
5548-# call:
5549-# dirname: Compute the dirname of FILE. If nonempty,
5550-# add APPEND to the result, otherwise set result
5551-# to NONDIR_REPLACEMENT.
5552-# value returned in "$func_dirname_result"
5553-# basename: Compute filename of FILE.
5554-# value retuned in "$func_basename_result"
5555-# Implementation must be kept synchronized with func_dirname
5556-# and func_basename. For efficiency, we do not delegate to
5557-# those functions but instead duplicate the functionality here.
5558-func_dirname_and_basename ()
5559-{
5560- case ${1} in
5561- */*) func_dirname_result="${1%/*}${2}" ;;
5562- * ) func_dirname_result="${3}" ;;
5563- esac
5564- func_basename_result="${1##*/}"
5565-}
5566-
5567-# func_stripname prefix suffix name
5568-# strip PREFIX and SUFFIX off of NAME.
5569-# PREFIX and SUFFIX must not contain globbing or regex special
5570-# characters, hashes, percent signs, but SUFFIX may contain a leading
5571-# dot (in which case that matches only a dot).
5572-func_stripname ()
5573-{
5574- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5575- # positional parameters, so assign one to ordinary parameter first.
5576- func_stripname_result=${3}
5577- func_stripname_result=${func_stripname_result#"${1}"}
5578- func_stripname_result=${func_stripname_result%"${2}"}
5579-}
5580-
5581-# func_opt_split
5582-func_opt_split ()
5583-{
5584- func_opt_split_opt=${1%%=*}
5585- func_opt_split_arg=${1#*=}
5586-}
5587-
5588-# func_lo2o object
5589-func_lo2o ()
5590-{
5591- case ${1} in
5592- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5593- *) func_lo2o_result=${1} ;;
5594- esac
5595-}
5596-
5597-# func_xform libobj-or-source
5598-func_xform ()
5599-{
5600- func_xform_result=${1%.*}.lo
5601-}
5602-
5603-# func_arith arithmetic-term...
5604-func_arith ()
5605-{
5606- func_arith_result=$(( $* ))
5607-}
5608-
5609-# func_len string
5610-# STRING may not start with a hyphen.
5611-func_len ()
5612-{
5613- func_len_result=${#1}
5614-}
5615-
5616-_LT_EOF
5617- ;;
5618- *) # Bourne compatible functions.
5619- cat << \_LT_EOF >> "$cfgfile"
5620-
5621-# func_dirname file append nondir_replacement
5622-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5623-# otherwise set result to NONDIR_REPLACEMENT.
5624-func_dirname ()
5625-{
5626- # Extract subdirectory from the argument.
5627- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5628- if test "X$func_dirname_result" = "X${1}"; then
5629- func_dirname_result="${3}"
5630- else
5631- func_dirname_result="$func_dirname_result${2}"
5632- fi
5633-}
5634-
5635-# func_basename file
5636-func_basename ()
5637-{
5638- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5639-}
5640-
5641-
5642-# func_stripname prefix suffix name
5643-# strip PREFIX and SUFFIX off of NAME.
5644-# PREFIX and SUFFIX must not contain globbing or regex special
5645-# characters, hashes, percent signs, but SUFFIX may contain a leading
5646-# dot (in which case that matches only a dot).
5647-# func_strip_suffix prefix name
5648-func_stripname ()
5649-{
5650- case ${2} in
5651- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5652- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5653- esac
5654-}
5655-
5656-# sed scripts:
5657-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5658-my_sed_long_arg='1s/^-[^=]*=//'
5659-
5660-# func_opt_split
5661-func_opt_split ()
5662-{
5663- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5664- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5665-}
5666-
5667-# func_lo2o object
5668-func_lo2o ()
5669-{
5670- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5671-}
5672-
5673-# func_xform libobj-or-source
5674-func_xform ()
5675-{
5676- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5677-}
5678-
5679-# func_arith arithmetic-term...
5680-func_arith ()
5681-{
5682- func_arith_result=`expr "$@"`
5683-}
5684-
5685-# func_len string
5686-# STRING may not start with a hyphen.
5687-func_len ()
5688-{
5689- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5690-}
5691-
5692-_LT_EOF
5693-esac
5694-
5695-case $lt_shell_append in
5696- yes)
5697- cat << \_LT_EOF >> "$cfgfile"
5698-
5699-# func_append var value
5700-# Append VALUE to the end of shell variable VAR.
5701-func_append ()
5702-{
5703- eval "$1+=\$2"
5704-}
5705-_LT_EOF
5706- ;;
5707- *)
5708- cat << \_LT_EOF >> "$cfgfile"
5709-
5710-# func_append var value
5711-# Append VALUE to the end of shell variable VAR.
5712-func_append ()
5713-{
5714- eval "$1=\$$1\$2"
5715-}
5716-
5717-_LT_EOF
5718- ;;
5719- esac
5720-
5721-
5722- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5723- || (rm -f "$cfgfile"; exit 1)
5724-
5725- mv -f "$cfgfile" "$ofile" ||
5726+ sed '$q' "$ltmain" >> "$cfgfile" \
5727+ || (rm -f "$cfgfile"; exit 1)
5728+
5729+ if test x"$xsi_shell" = xyes; then
5730+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5731+func_dirname ()\
5732+{\
5733+\ case ${1} in\
5734+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5735+\ * ) func_dirname_result="${3}" ;;\
5736+\ esac\
5737+} # Extended-shell func_dirname implementation' "$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+
5742+
5743+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5744+func_basename ()\
5745+{\
5746+\ func_basename_result="${1##*/}"\
5747+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5748+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5749+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5750+test 0 -eq $? || _lt_function_replace_fail=:
5751+
5752+
5753+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5754+func_dirname_and_basename ()\
5755+{\
5756+\ case ${1} in\
5757+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5758+\ * ) func_dirname_result="${3}" ;;\
5759+\ esac\
5760+\ func_basename_result="${1##*/}"\
5761+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5762+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5764+test 0 -eq $? || _lt_function_replace_fail=:
5765+
5766+
5767+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5768+func_stripname ()\
5769+{\
5770+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5771+\ # positional parameters, so assign one to ordinary parameter first.\
5772+\ func_stripname_result=${3}\
5773+\ func_stripname_result=${func_stripname_result#"${1}"}\
5774+\ func_stripname_result=${func_stripname_result%"${2}"}\
5775+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5776+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5777+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5778+test 0 -eq $? || _lt_function_replace_fail=:
5779+
5780+
5781+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5782+func_split_long_opt ()\
5783+{\
5784+\ func_split_long_opt_name=${1%%=*}\
5785+\ func_split_long_opt_arg=${1#*=}\
5786+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5787+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5788+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5789+test 0 -eq $? || _lt_function_replace_fail=:
5790+
5791+
5792+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5793+func_split_short_opt ()\
5794+{\
5795+\ func_split_short_opt_arg=${1#??}\
5796+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5797+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5798+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5799+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5800+test 0 -eq $? || _lt_function_replace_fail=:
5801+
5802+
5803+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5804+func_lo2o ()\
5805+{\
5806+\ case ${1} in\
5807+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5808+\ *) func_lo2o_result=${1} ;;\
5809+\ esac\
5810+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5811+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5812+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5813+test 0 -eq $? || _lt_function_replace_fail=:
5814+
5815+
5816+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5817+func_xform ()\
5818+{\
5819+ func_xform_result=${1%.*}.lo\
5820+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5821+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5822+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5823+test 0 -eq $? || _lt_function_replace_fail=:
5824+
5825+
5826+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5827+func_arith ()\
5828+{\
5829+ func_arith_result=$(( $* ))\
5830+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5831+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5832+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5833+test 0 -eq $? || _lt_function_replace_fail=:
5834+
5835+
5836+ sed -e '/^func_len ()$/,/^} # func_len /c\
5837+func_len ()\
5838+{\
5839+ func_len_result=${#1}\
5840+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5841+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5842+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5843+test 0 -eq $? || _lt_function_replace_fail=:
5844+
5845+fi
5846+
5847+if test x"$lt_shell_append" = xyes; then
5848+ sed -e '/^func_append ()$/,/^} # func_append /c\
5849+func_append ()\
5850+{\
5851+ eval "${1}+=\\${2}"\
5852+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5853+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5854+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5855+test 0 -eq $? || _lt_function_replace_fail=:
5856+
5857+
5858+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5859+func_append_quoted ()\
5860+{\
5861+\ func_quote_for_eval "${2}"\
5862+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5863+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5864+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5865+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5866+test 0 -eq $? || _lt_function_replace_fail=:
5867+
5868+
5869+ # Save a `func_append' function call where possible by direct use of '+='
5870+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5871+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5872+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5873+ test 0 -eq $? || _lt_function_replace_fail=:
5874+else
5875+ # Save a `func_append' function call even when '+=' is not available
5876+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5877+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5878+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5879+ test 0 -eq $? || _lt_function_replace_fail=:
5880+fi
5881+
5882+if test x"$_lt_function_replace_fail" = x":"; then
5883+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5884+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5885+fi
5886+
5887+
5888+ mv -f "$cfgfile" "$ofile" ||
5889 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5890 chmod +x "$ofile"
5891
5892diff --git a/gprof/Makefile.in b/gprof/Makefile.in
5893index a7398231030..fc7a3d78db0 100644
5894--- a/gprof/Makefile.in
5895+++ b/gprof/Makefile.in
5896@@ -327,6 +327,7 @@ CYGPATH_W = @CYGPATH_W@
5897 DATADIRNAME = @DATADIRNAME@
5898 DEFS = @DEFS@
5899 DEPDIR = @DEPDIR@
5900+DLLTOOL = @DLLTOOL@
5901 DSYMUTIL = @DSYMUTIL@
5902 DUMPBIN = @DUMPBIN@
5903 ECHO_C = @ECHO_C@
5904@@ -363,6 +364,7 @@ LTLIBINTL = @LTLIBINTL@
5905 LTLIBOBJS = @LTLIBOBJS@
5906 MAINT = @MAINT@
5907 MAKEINFO = @MAKEINFO@
5908+MANIFEST_TOOL = @MANIFEST_TOOL@
5909 MKDIR_P = @MKDIR_P@
5910 MKINSTALLDIRS = @MKINSTALLDIRS@
5911 MSGFMT = @MSGFMT@
5912@@ -398,6 +400,7 @@ abs_builddir = @abs_builddir@
5913 abs_srcdir = @abs_srcdir@
5914 abs_top_builddir = @abs_top_builddir@
5915 abs_top_srcdir = @abs_top_srcdir@
5916+ac_ct_AR = @ac_ct_AR@
5917 ac_ct_CC = @ac_ct_CC@
5918 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
5919 am__include = @am__include@
5920diff --git a/gprof/configure b/gprof/configure
5921index 2d62b6fbb07..0cafee249eb 100755
5922--- a/gprof/configure
5923+++ b/gprof/configure
5924@@ -669,8 +669,11 @@ OTOOL
5925 LIPO
5926 NMEDIT
5927 DSYMUTIL
5928+MANIFEST_TOOL
5929 RANLIB
5930+ac_ct_AR
5931 AR
5932+DLLTOOL
5933 OBJDUMP
5934 LN_S
5935 NM
5936@@ -787,6 +790,7 @@ enable_static
5937 with_pic
5938 enable_fast_install
5939 with_gnu_ld
5940+with_libtool_sysroot
5941 enable_libtool_lock
5942 enable_plugins
5943 enable_largefile
5944@@ -1462,6 +1466,8 @@ Optional Packages:
5945 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
5946 --without-libintl-prefix don't search for libintl in includedir and libdir
5947 --with-libintl-type=TYPE type of library to search for (auto/static/shared)
5948+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5949+ (or the compiler's sysroot if not specified).
5950
5951 Some influential environment variables:
5952 CC C compiler command
5953@@ -4530,8 +4536,8 @@ esac
5954
5955
5956
5957-macro_version='2.2.7a'
5958-macro_revision='1.3134'
5959+macro_version='2.4'
5960+macro_revision='1.3293'
5961
5962
5963
5964@@ -4571,7 +4577,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5966 $as_echo_n "checking how to print strings... " >&6; }
5967 # Test print first, because it will be a builtin if present.
5968-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5969+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5970 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5971 ECHO='print -r --'
5972 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5973@@ -5264,8 +5270,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5974 # Try some XSI features
5975 xsi_shell=no
5976 ( _lt_dummy="a/b/c"
5977- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5978- = c,a/b,, \
5979+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5980+ = c,a/b,b/c, \
5981 && eval 'test $(( 1 + 1 )) -eq 2 \
5982 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5983 && xsi_shell=yes
5984@@ -5314,6 +5320,80 @@ esac
5985
5986
5987
5988+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5989+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5990+if ${lt_cv_to_host_file_cmd+:} false; then :
5991+ $as_echo_n "(cached) " >&6
5992+else
5993+ case $host in
5994+ *-*-mingw* )
5995+ case $build in
5996+ *-*-mingw* ) # actually msys
5997+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5998+ ;;
5999+ *-*-cygwin* )
6000+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
6001+ ;;
6002+ * ) # otherwise, assume *nix
6003+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
6004+ ;;
6005+ esac
6006+ ;;
6007+ *-*-cygwin* )
6008+ case $build in
6009+ *-*-mingw* ) # actually msys
6010+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
6011+ ;;
6012+ *-*-cygwin* )
6013+ lt_cv_to_host_file_cmd=func_convert_file_noop
6014+ ;;
6015+ * ) # otherwise, assume *nix
6016+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
6017+ ;;
6018+ esac
6019+ ;;
6020+ * ) # unhandled hosts (and "normal" native builds)
6021+ lt_cv_to_host_file_cmd=func_convert_file_noop
6022+ ;;
6023+esac
6024+
6025+fi
6026+
6027+to_host_file_cmd=$lt_cv_to_host_file_cmd
6028+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
6029+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
6030+
6031+
6032+
6033+
6034+
6035+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
6036+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
6037+if ${lt_cv_to_tool_file_cmd+:} false; then :
6038+ $as_echo_n "(cached) " >&6
6039+else
6040+ #assume ordinary cross tools, or native build.
6041+lt_cv_to_tool_file_cmd=func_convert_file_noop
6042+case $host in
6043+ *-*-mingw* )
6044+ case $build in
6045+ *-*-mingw* ) # actually msys
6046+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
6047+ ;;
6048+ esac
6049+ ;;
6050+esac
6051+
6052+fi
6053+
6054+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
6055+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
6056+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
6057+
6058+
6059+
6060+
6061+
6062 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
6063 $as_echo_n "checking for $LD option to reload object files... " >&6; }
6064 if ${lt_cv_ld_reload_flag+:} false; then :
6065@@ -5330,6 +5410,11 @@ case $reload_flag in
6066 esac
6067 reload_cmds='$LD$reload_flag -o $output$reload_objs'
6068 case $host_os in
6069+ cygwin* | mingw* | pw32* | cegcc*)
6070+ if test "$GCC" != yes; then
6071+ reload_cmds=false
6072+ fi
6073+ ;;
6074 darwin*)
6075 if test "$GCC" = yes; then
6076 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6077@@ -5498,7 +5583,8 @@ mingw* | pw32*)
6078 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
6079 lt_cv_file_magic_cmd='func_win32_libid'
6080 else
6081- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
6082+ # Keep this pattern in sync with the one in func_win32_libid.
6083+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
6084 lt_cv_file_magic_cmd='$OBJDUMP -f'
6085 fi
6086 ;;
6087@@ -5657,6 +5743,21 @@ esac
6088 fi
6089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
6090 $as_echo "$lt_cv_deplibs_check_method" >&6; }
6091+
6092+file_magic_glob=
6093+want_nocaseglob=no
6094+if test "$build" = "$host"; then
6095+ case $host_os in
6096+ mingw* | pw32*)
6097+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
6098+ want_nocaseglob=yes
6099+ else
6100+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
6101+ fi
6102+ ;;
6103+ esac
6104+fi
6105+
6106 file_magic_cmd=$lt_cv_file_magic_cmd
6107 deplibs_check_method=$lt_cv_deplibs_check_method
6108 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6109@@ -5672,6 +5773,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
6110
6111
6112
6113+
6114+
6115+
6116+
6117+
6118+
6119+
6120+
6121+
6122+
6123+if test -n "$ac_tool_prefix"; then
6124+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
6125+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
6126+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6127+$as_echo_n "checking for $ac_word... " >&6; }
6128+if ${ac_cv_prog_DLLTOOL+:} false; then :
6129+ $as_echo_n "(cached) " >&6
6130+else
6131+ if test -n "$DLLTOOL"; then
6132+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
6133+else
6134+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6135+for as_dir in $PATH
6136+do
6137+ IFS=$as_save_IFS
6138+ test -z "$as_dir" && as_dir=.
6139+ for ac_exec_ext in '' $ac_executable_extensions; do
6140+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6141+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6142+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6143+ break 2
6144+ fi
6145+done
6146+ done
6147+IFS=$as_save_IFS
6148+
6149+fi
6150+fi
6151+DLLTOOL=$ac_cv_prog_DLLTOOL
6152+if test -n "$DLLTOOL"; then
6153+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
6154+$as_echo "$DLLTOOL" >&6; }
6155+else
6156+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6157+$as_echo "no" >&6; }
6158+fi
6159+
6160+
6161+fi
6162+if test -z "$ac_cv_prog_DLLTOOL"; then
6163+ ac_ct_DLLTOOL=$DLLTOOL
6164+ # Extract the first word of "dlltool", so it can be a program name with args.
6165+set dummy dlltool; ac_word=$2
6166+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6167+$as_echo_n "checking for $ac_word... " >&6; }
6168+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
6169+ $as_echo_n "(cached) " >&6
6170+else
6171+ if test -n "$ac_ct_DLLTOOL"; then
6172+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6173+else
6174+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6175+for as_dir in $PATH
6176+do
6177+ IFS=$as_save_IFS
6178+ test -z "$as_dir" && as_dir=.
6179+ for ac_exec_ext in '' $ac_executable_extensions; do
6180+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6181+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6182+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6183+ break 2
6184+ fi
6185+done
6186+ done
6187+IFS=$as_save_IFS
6188+
6189+fi
6190+fi
6191+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6192+if test -n "$ac_ct_DLLTOOL"; then
6193+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6194+$as_echo "$ac_ct_DLLTOOL" >&6; }
6195+else
6196+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6197+$as_echo "no" >&6; }
6198+fi
6199+
6200+ if test "x$ac_ct_DLLTOOL" = x; then
6201+ DLLTOOL="false"
6202+ else
6203+ case $cross_compiling:$ac_tool_warned in
6204+yes:)
6205+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6206+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6207+ac_tool_warned=yes ;;
6208+esac
6209+ DLLTOOL=$ac_ct_DLLTOOL
6210+ fi
6211+else
6212+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6213+fi
6214+
6215+test -z "$DLLTOOL" && DLLTOOL=dlltool
6216+
6217+
6218+
6219+
6220+
6221+
6222+
6223+
6224+
6225+
6226+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6227+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6228+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
6229+ $as_echo_n "(cached) " >&6
6230+else
6231+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6232+
6233+case $host_os in
6234+cygwin* | mingw* | pw32* | cegcc*)
6235+ # two different shell functions defined in ltmain.sh
6236+ # decide which to use based on capabilities of $DLLTOOL
6237+ case `$DLLTOOL --help 2>&1` in
6238+ *--identify-strict*)
6239+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6240+ ;;
6241+ *)
6242+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6243+ ;;
6244+ esac
6245+ ;;
6246+*)
6247+ # fallback: assume linklib IS sharedlib
6248+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6249+ ;;
6250+esac
6251+
6252+fi
6253+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6254+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6255+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6256+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6257+
6258+
6259+
6260+
6261+
6262+
6263+
6264 plugin_option=
6265 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6266 for plugin in $plugin_names; do
6267@@ -5686,8 +5938,10 @@ for plugin in $plugin_names; do
6268 done
6269
6270 if test -n "$ac_tool_prefix"; then
6271- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6272-set dummy ${ac_tool_prefix}ar; ac_word=$2
6273+ for ac_prog in ar
6274+ do
6275+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6276+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6278 $as_echo_n "checking for $ac_word... " >&6; }
6279 if ${ac_cv_prog_AR+:} false; then :
6280@@ -5703,7 +5957,7 @@ do
6281 test -z "$as_dir" && as_dir=.
6282 for ac_exec_ext in '' $ac_executable_extensions; do
6283 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6284- ac_cv_prog_AR="${ac_tool_prefix}ar"
6285+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6286 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6287 break 2
6288 fi
6289@@ -5723,11 +5977,15 @@ $as_echo "no" >&6; }
6290 fi
6291
6292
6293+ test -n "$AR" && break
6294+ done
6295 fi
6296-if test -z "$ac_cv_prog_AR"; then
6297+if test -z "$AR"; then
6298 ac_ct_AR=$AR
6299- # Extract the first word of "ar", so it can be a program name with args.
6300-set dummy ar; ac_word=$2
6301+ for ac_prog in ar
6302+do
6303+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6304+set dummy $ac_prog; ac_word=$2
6305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6306 $as_echo_n "checking for $ac_word... " >&6; }
6307 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6308@@ -5743,7 +6001,7 @@ do
6309 test -z "$as_dir" && as_dir=.
6310 for ac_exec_ext in '' $ac_executable_extensions; do
6311 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6312- ac_cv_prog_ac_ct_AR="ar"
6313+ ac_cv_prog_ac_ct_AR="$ac_prog"
6314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6315 break 2
6316 fi
6317@@ -5762,6 +6020,10 @@ else
6318 $as_echo "no" >&6; }
6319 fi
6320
6321+
6322+ test -n "$ac_ct_AR" && break
6323+done
6324+
6325 if test "x$ac_ct_AR" = x; then
6326 AR="false"
6327 else
6328@@ -5773,25 +6035,19 @@ ac_tool_warned=yes ;;
6329 esac
6330 AR=$ac_ct_AR
6331 fi
6332-else
6333- AR="$ac_cv_prog_AR"
6334 fi
6335
6336-test -z "$AR" && AR=ar
6337-if test -n "$plugin_option"; then
6338- if $AR --help 2>&1 | grep -q "\--plugin"; then
6339- touch conftest.c
6340- $AR $plugin_option rc conftest.a conftest.c
6341- if test "$?" != 0; then
6342- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
6343+ touch conftest.c
6344+ $AR $plugin_option rc conftest.a conftest.c
6345+ if test "$?" != 0; then
6346+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
6347 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
6348- else
6349- AR="$AR $plugin_option"
6350- fi
6351- rm -f conftest.*
6352+ else
6353+ AR="$AR $plugin_option"
6354 fi
6355-fi
6356-test -z "$AR_FLAGS" && AR_FLAGS=cru
6357+ rm -f conftest.*
6358+: ${AR=ar}
6359+: ${AR_FLAGS=cru}
6360
6361
6362
6363@@ -5803,6 +6059,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6364
6365
6366
6367+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6368+$as_echo_n "checking for archiver @FILE support... " >&6; }
6369+if ${lt_cv_ar_at_file+:} false; then :
6370+ $as_echo_n "(cached) " >&6
6371+else
6372+ lt_cv_ar_at_file=no
6373+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6374+/* end confdefs.h. */
6375+
6376+int
6377+main ()
6378+{
6379+
6380+ ;
6381+ return 0;
6382+}
6383+_ACEOF
6384+if ac_fn_c_try_compile "$LINENO"; then :
6385+ echo conftest.$ac_objext > conftest.lst
6386+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6387+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6388+ (eval $lt_ar_try) 2>&5
6389+ ac_status=$?
6390+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6391+ test $ac_status = 0; }
6392+ if test "$ac_status" -eq 0; then
6393+ # Ensure the archiver fails upon bogus file names.
6394+ rm -f conftest.$ac_objext libconftest.a
6395+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6396+ (eval $lt_ar_try) 2>&5
6397+ ac_status=$?
6398+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6399+ test $ac_status = 0; }
6400+ if test "$ac_status" -ne 0; then
6401+ lt_cv_ar_at_file=@
6402+ fi
6403+ fi
6404+ rm -f conftest.* libconftest.a
6405+
6406+fi
6407+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6408+
6409+fi
6410+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6411+$as_echo "$lt_cv_ar_at_file" >&6; }
6412+
6413+if test "x$lt_cv_ar_at_file" = xno; then
6414+ archiver_list_spec=
6415+else
6416+ archiver_list_spec=$lt_cv_ar_at_file
6417+fi
6418+
6419+
6420+
6421+
6422+
6423+
6424+
6425 if test -n "$ac_tool_prefix"; then
6426 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6427 set dummy ${ac_tool_prefix}strip; ac_word=$2
6428@@ -6142,8 +6456,8 @@ esac
6429 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6430
6431 # Transform an extracted symbol line into symbol name and symbol address
6432-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6433-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'"
6434+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6435+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'"
6436
6437 # Handle CRLF in mingw tool chain
6438 opt_cr=
6439@@ -6179,6 +6493,7 @@ for ac_symprfx in "" "_"; do
6440 else
6441 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6442 fi
6443+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6444
6445 # Check to see that the pipe works correctly.
6446 pipe_works=no
6447@@ -6220,6 +6535,18 @@ _LT_EOF
6448 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6449 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6450 cat <<_LT_EOF > conftest.$ac_ext
6451+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6452+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6453+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6454+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6455+# define LT_DLSYM_CONST
6456+#elif defined(__osf__)
6457+/* This system does not cope well with relocations in const data. */
6458+# define LT_DLSYM_CONST
6459+#else
6460+# define LT_DLSYM_CONST const
6461+#endif
6462+
6463 #ifdef __cplusplus
6464 extern "C" {
6465 #endif
6466@@ -6231,7 +6558,7 @@ _LT_EOF
6467 cat <<_LT_EOF >> conftest.$ac_ext
6468
6469 /* The mapping between symbol names and symbols. */
6470-const struct {
6471+LT_DLSYM_CONST struct {
6472 const char *name;
6473 void *address;
6474 }
6475@@ -6257,8 +6584,8 @@ static const void *lt_preloaded_setup() {
6476 _LT_EOF
6477 # Now try linking the two files.
6478 mv conftest.$ac_objext conftstm.$ac_objext
6479- lt_save_LIBS="$LIBS"
6480- lt_save_CFLAGS="$CFLAGS"
6481+ lt_globsym_save_LIBS=$LIBS
6482+ lt_globsym_save_CFLAGS=$CFLAGS
6483 LIBS="conftstm.$ac_objext"
6484 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6485 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6486@@ -6268,8 +6595,8 @@ _LT_EOF
6487 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6488 pipe_works=yes
6489 fi
6490- LIBS="$lt_save_LIBS"
6491- CFLAGS="$lt_save_CFLAGS"
6492+ LIBS=$lt_globsym_save_LIBS
6493+ CFLAGS=$lt_globsym_save_CFLAGS
6494 else
6495 echo "cannot find nm_test_func in $nlist" >&5
6496 fi
6497@@ -6306,6 +6633,18 @@ else
6498 $as_echo "ok" >&6; }
6499 fi
6500
6501+# Response file support.
6502+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6503+ nm_file_list_spec='@'
6504+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6505+ nm_file_list_spec='@'
6506+fi
6507+
6508+
6509+
6510+
6511+
6512+
6513
6514
6515
6516@@ -6322,6 +6661,43 @@ fi
6517
6518
6519
6520+
6521+
6522+
6523+
6524+
6525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6526+$as_echo_n "checking for sysroot... " >&6; }
6527+
6528+# Check whether --with-libtool-sysroot was given.
6529+if test "${with_libtool_sysroot+set}" = set; then :
6530+ withval=$with_libtool_sysroot;
6531+else
6532+ with_libtool_sysroot=no
6533+fi
6534+
6535+
6536+lt_sysroot=
6537+case ${with_libtool_sysroot} in #(
6538+ yes)
6539+ if test "$GCC" = yes; then
6540+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6541+ fi
6542+ ;; #(
6543+ /*)
6544+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6545+ ;; #(
6546+ no|'')
6547+ ;; #(
6548+ *)
6549+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6550+$as_echo "${with_libtool_sysroot}" >&6; }
6551+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
6552+ ;;
6553+esac
6554+
6555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6556+$as_echo "${lt_sysroot:-no}" >&6; }
6557
6558
6559
6560@@ -6533,6 +6909,123 @@ esac
6561
6562 need_locks="$enable_libtool_lock"
6563
6564+if test -n "$ac_tool_prefix"; then
6565+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6566+set dummy ${ac_tool_prefix}mt; ac_word=$2
6567+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6568+$as_echo_n "checking for $ac_word... " >&6; }
6569+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
6570+ $as_echo_n "(cached) " >&6
6571+else
6572+ if test -n "$MANIFEST_TOOL"; then
6573+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6574+else
6575+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6576+for as_dir in $PATH
6577+do
6578+ IFS=$as_save_IFS
6579+ test -z "$as_dir" && as_dir=.
6580+ for ac_exec_ext in '' $ac_executable_extensions; do
6581+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6582+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6583+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6584+ break 2
6585+ fi
6586+done
6587+ done
6588+IFS=$as_save_IFS
6589+
6590+fi
6591+fi
6592+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6593+if test -n "$MANIFEST_TOOL"; then
6594+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6595+$as_echo "$MANIFEST_TOOL" >&6; }
6596+else
6597+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6598+$as_echo "no" >&6; }
6599+fi
6600+
6601+
6602+fi
6603+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6604+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6605+ # Extract the first word of "mt", so it can be a program name with args.
6606+set dummy mt; ac_word=$2
6607+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6608+$as_echo_n "checking for $ac_word... " >&6; }
6609+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
6610+ $as_echo_n "(cached) " >&6
6611+else
6612+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6613+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6614+else
6615+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6616+for as_dir in $PATH
6617+do
6618+ IFS=$as_save_IFS
6619+ test -z "$as_dir" && as_dir=.
6620+ for ac_exec_ext in '' $ac_executable_extensions; do
6621+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6622+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6623+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6624+ break 2
6625+ fi
6626+done
6627+ done
6628+IFS=$as_save_IFS
6629+
6630+fi
6631+fi
6632+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6633+if test -n "$ac_ct_MANIFEST_TOOL"; then
6634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6635+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6636+else
6637+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6638+$as_echo "no" >&6; }
6639+fi
6640+
6641+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6642+ MANIFEST_TOOL=":"
6643+ else
6644+ case $cross_compiling:$ac_tool_warned in
6645+yes:)
6646+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6647+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6648+ac_tool_warned=yes ;;
6649+esac
6650+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6651+ fi
6652+else
6653+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6654+fi
6655+
6656+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6657+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6658+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6659+if ${lt_cv_path_mainfest_tool+:} false; then :
6660+ $as_echo_n "(cached) " >&6
6661+else
6662+ lt_cv_path_mainfest_tool=no
6663+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6664+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6665+ cat conftest.err >&5
6666+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6667+ lt_cv_path_mainfest_tool=yes
6668+ fi
6669+ rm -f conftest*
6670+fi
6671+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6672+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6673+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6674+ MANIFEST_TOOL=:
6675+fi
6676+
6677+
6678+
6679+
6680+
6681
6682 case $host_os in
6683 rhapsody* | darwin*)
6684@@ -7096,6 +7589,8 @@ _LT_EOF
6685 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6686 echo "$AR cru libconftest.a conftest.o" >&5
6687 $AR cru libconftest.a conftest.o 2>&5
6688+ echo "$RANLIB libconftest.a" >&5
6689+ $RANLIB libconftest.a 2>&5
6690 cat > conftest.c << _LT_EOF
6691 int main() { return 0;}
6692 _LT_EOF
6693@@ -7680,8 +8175,6 @@ fi
6694 lt_prog_compiler_pic=
6695 lt_prog_compiler_static=
6696
6697-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6698-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6699
6700 if test "$GCC" = yes; then
6701 lt_prog_compiler_wl='-Wl,'
6702@@ -7847,6 +8340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6703 lt_prog_compiler_pic='--shared'
6704 lt_prog_compiler_static='--static'
6705 ;;
6706+ nagfor*)
6707+ # NAG Fortran compiler
6708+ lt_prog_compiler_wl='-Wl,-Wl,,'
6709+ lt_prog_compiler_pic='-PIC'
6710+ lt_prog_compiler_static='-Bstatic'
6711+ ;;
6712 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6713 # Portland Group compilers (*not* the Pentium gcc compiler,
6714 # which looks to be a dead project)
6715@@ -7909,7 +8408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6716 lt_prog_compiler_pic='-KPIC'
6717 lt_prog_compiler_static='-Bstatic'
6718 case $cc_basename in
6719- f77* | f90* | f95*)
6720+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6721 lt_prog_compiler_wl='-Qoption ld ';;
6722 *)
6723 lt_prog_compiler_wl='-Wl,';;
6724@@ -7966,13 +8465,17 @@ case $host_os in
6725 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6726 ;;
6727 esac
6728-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6729-$as_echo "$lt_prog_compiler_pic" >&6; }
6730-
6731-
6732-
6733-
6734
6735+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6736+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6737+if ${lt_cv_prog_compiler_pic+:} false; then :
6738+ $as_echo_n "(cached) " >&6
6739+else
6740+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6741+fi
6742+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6743+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6744+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6745
6746 #
6747 # Check to make sure the PIC flag actually works.
6748@@ -8033,6 +8536,11 @@ fi
6749
6750
6751
6752+
6753+
6754+
6755+
6756+
6757 #
6758 # Check to make sure the static flag actually works.
6759 #
6760@@ -8383,7 +8891,8 @@ _LT_EOF
6761 allow_undefined_flag=unsupported
6762 always_export_symbols=no
6763 enable_shared_with_static_runtimes=yes
6764- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6765+ 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'
6766+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6767
6768 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6769 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6770@@ -8482,12 +8991,12 @@ _LT_EOF
6771 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6772 hardcode_libdir_flag_spec=
6773 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6774- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6775+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6776 if test "x$supports_anon_versioning" = xyes; then
6777 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6778 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6779 echo "local: *; };" >> $output_objdir/$libname.ver~
6780- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6781+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6782 fi
6783 ;;
6784 esac
6785@@ -8501,8 +9010,8 @@ _LT_EOF
6786 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6787 wlarc=
6788 else
6789- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6790- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6791+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6792+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6793 fi
6794 ;;
6795
6796@@ -8520,8 +9029,8 @@ _LT_EOF
6797
6798 _LT_EOF
6799 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6800- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6801- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6802+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6803+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6804 else
6805 ld_shlibs=no
6806 fi
6807@@ -8567,8 +9076,8 @@ _LT_EOF
6808
6809 *)
6810 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6811- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6812- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6813+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6814+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6815 else
6816 ld_shlibs=no
6817 fi
6818@@ -8698,7 +9207,13 @@ _LT_EOF
6819 allow_undefined_flag='-berok'
6820 # Determine the default libpath from the value encoded in an
6821 # empty executable.
6822- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6823+ if test "${lt_cv_aix_libpath+set}" = set; then
6824+ aix_libpath=$lt_cv_aix_libpath
6825+else
6826+ if ${lt_cv_aix_libpath_+:} false; then :
6827+ $as_echo_n "(cached) " >&6
6828+else
6829+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6830 /* end confdefs.h. */
6831
6832 int
6833@@ -8711,22 +9226,29 @@ main ()
6834 _ACEOF
6835 if ac_fn_c_try_link "$LINENO"; then :
6836
6837-lt_aix_libpath_sed='
6838- /Import File Strings/,/^$/ {
6839- /^0/ {
6840- s/^0 *\(.*\)$/\1/
6841- p
6842- }
6843- }'
6844-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6845-# Check for a 64-bit object if we didn't find anything.
6846-if test -z "$aix_libpath"; then
6847- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6848-fi
6849+ lt_aix_libpath_sed='
6850+ /Import File Strings/,/^$/ {
6851+ /^0/ {
6852+ s/^0 *\([^ ]*\) *$/\1/
6853+ p
6854+ }
6855+ }'
6856+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6857+ # Check for a 64-bit object if we didn't find anything.
6858+ if test -z "$lt_cv_aix_libpath_"; then
6859+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6860+ fi
6861 fi
6862 rm -f core conftest.err conftest.$ac_objext \
6863 conftest$ac_exeext conftest.$ac_ext
6864-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6865+ if test -z "$lt_cv_aix_libpath_"; then
6866+ lt_cv_aix_libpath_="/usr/lib:/lib"
6867+ fi
6868+
6869+fi
6870+
6871+ aix_libpath=$lt_cv_aix_libpath_
6872+fi
6873
6874 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6875 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"
6876@@ -8738,7 +9260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6877 else
6878 # Determine the default libpath from the value encoded in an
6879 # empty executable.
6880- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6881+ if test "${lt_cv_aix_libpath+set}" = set; then
6882+ aix_libpath=$lt_cv_aix_libpath
6883+else
6884+ if ${lt_cv_aix_libpath_+:} false; then :
6885+ $as_echo_n "(cached) " >&6
6886+else
6887+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6888 /* end confdefs.h. */
6889
6890 int
6891@@ -8751,22 +9279,29 @@ main ()
6892 _ACEOF
6893 if ac_fn_c_try_link "$LINENO"; then :
6894
6895-lt_aix_libpath_sed='
6896- /Import File Strings/,/^$/ {
6897- /^0/ {
6898- s/^0 *\(.*\)$/\1/
6899- p
6900- }
6901- }'
6902-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6903-# Check for a 64-bit object if we didn't find anything.
6904-if test -z "$aix_libpath"; then
6905- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6906-fi
6907+ lt_aix_libpath_sed='
6908+ /Import File Strings/,/^$/ {
6909+ /^0/ {
6910+ s/^0 *\([^ ]*\) *$/\1/
6911+ p
6912+ }
6913+ }'
6914+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6915+ # Check for a 64-bit object if we didn't find anything.
6916+ if test -z "$lt_cv_aix_libpath_"; then
6917+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6918+ fi
6919 fi
6920 rm -f core conftest.err conftest.$ac_objext \
6921 conftest$ac_exeext conftest.$ac_ext
6922-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6923+ if test -z "$lt_cv_aix_libpath_"; then
6924+ lt_cv_aix_libpath_="/usr/lib:/lib"
6925+ fi
6926+
6927+fi
6928+
6929+ aix_libpath=$lt_cv_aix_libpath_
6930+fi
6931
6932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6933 # Warning - without using the other run time loading flags,
6934@@ -8811,20 +9346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6935 # Microsoft Visual C++.
6936 # hardcode_libdir_flag_spec is actually meaningless, as there is
6937 # no search path for DLLs.
6938- hardcode_libdir_flag_spec=' '
6939- allow_undefined_flag=unsupported
6940- # Tell ltmain to make .lib files, not .a files.
6941- libext=lib
6942- # Tell ltmain to make .dll files, not .so files.
6943- shrext_cmds=".dll"
6944- # FIXME: Setting linknames here is a bad hack.
6945- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6946- # The linker will automatically build a .lib file if we build a DLL.
6947- old_archive_from_new_cmds='true'
6948- # FIXME: Should let the user specify the lib program.
6949- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6950- fix_srcfile_path='`cygpath -w "$srcfile"`'
6951- enable_shared_with_static_runtimes=yes
6952+ case $cc_basename in
6953+ cl*)
6954+ # Native MSVC
6955+ hardcode_libdir_flag_spec=' '
6956+ allow_undefined_flag=unsupported
6957+ always_export_symbols=yes
6958+ file_list_spec='@'
6959+ # Tell ltmain to make .lib files, not .a files.
6960+ libext=lib
6961+ # Tell ltmain to make .dll files, not .so files.
6962+ shrext_cmds=".dll"
6963+ # FIXME: Setting linknames here is a bad hack.
6964+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6965+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6966+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6967+ else
6968+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6969+ fi~
6970+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6971+ linknames='
6972+ # The linker will not automatically build a static lib if we build a DLL.
6973+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6974+ enable_shared_with_static_runtimes=yes
6975+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6976+ # Don't use ranlib
6977+ old_postinstall_cmds='chmod 644 $oldlib'
6978+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6979+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6980+ case $lt_outputfile in
6981+ *.exe|*.EXE) ;;
6982+ *)
6983+ lt_outputfile="$lt_outputfile.exe"
6984+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6985+ ;;
6986+ esac~
6987+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6988+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6989+ $RM "$lt_outputfile.manifest";
6990+ fi'
6991+ ;;
6992+ *)
6993+ # Assume MSVC wrapper
6994+ hardcode_libdir_flag_spec=' '
6995+ allow_undefined_flag=unsupported
6996+ # Tell ltmain to make .lib files, not .a files.
6997+ libext=lib
6998+ # Tell ltmain to make .dll files, not .so files.
6999+ shrext_cmds=".dll"
7000+ # FIXME: Setting linknames here is a bad hack.
7001+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
7002+ # The linker will automatically build a .lib file if we build a DLL.
7003+ old_archive_from_new_cmds='true'
7004+ # FIXME: Should let the user specify the lib program.
7005+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
7006+ enable_shared_with_static_runtimes=yes
7007+ ;;
7008+ esac
7009 ;;
7010
7011 darwin* | rhapsody*)
7012@@ -8885,7 +9463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7013
7014 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7015 freebsd* | dragonfly*)
7016- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
7017+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
7018 hardcode_libdir_flag_spec='-R$libdir'
7019 hardcode_direct=yes
7020 hardcode_shlibpath_var=no
7021@@ -8893,7 +9471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7022
7023 hpux9*)
7024 if test "$GCC" = yes; then
7025- 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'
7026+ 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'
7027 else
7028 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'
7029 fi
7030@@ -8909,7 +9487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7031
7032 hpux10*)
7033 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
7034- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7035+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7036 else
7037 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
7038 fi
7039@@ -8933,10 +9511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7040 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7041 ;;
7042 ia64*)
7043- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7044+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7045 ;;
7046 *)
7047- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7048+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7049 ;;
7050 esac
7051 else
7052@@ -9015,23 +9593,36 @@ fi
7053
7054 irix5* | irix6* | nonstopux*)
7055 if test "$GCC" = yes; then
7056- 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'
7057+ 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'
7058 # Try to use the -exported_symbol ld option, if it does not
7059 # work, assume that -exports_file does not work either and
7060 # implicitly export all symbols.
7061- save_LDFLAGS="$LDFLAGS"
7062- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
7063- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7064+ # This should be the same for all languages, so no per-tag cache variable.
7065+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
7066+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
7067+if ${lt_cv_irix_exported_symbol+:} false; then :
7068+ $as_echo_n "(cached) " >&6
7069+else
7070+ save_LDFLAGS="$LDFLAGS"
7071+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
7072+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7073 /* end confdefs.h. */
7074-int foo(void) {}
7075+int foo (void) { return 0; }
7076 _ACEOF
7077 if ac_fn_c_try_link "$LINENO"; then :
7078- 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'
7079-
7080+ lt_cv_irix_exported_symbol=yes
7081+else
7082+ lt_cv_irix_exported_symbol=no
7083 fi
7084 rm -f core conftest.err conftest.$ac_objext \
7085 conftest$ac_exeext conftest.$ac_ext
7086- LDFLAGS="$save_LDFLAGS"
7087+ LDFLAGS="$save_LDFLAGS"
7088+fi
7089+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
7090+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
7091+ if test "$lt_cv_irix_exported_symbol" = yes; then
7092+ 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'
7093+ fi
7094 else
7095 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'
7096 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'
7097@@ -9116,7 +9707,7 @@ rm -f core conftest.err conftest.$ac_objext \
7098 osf4* | osf5*) # as osf3* with the addition of -msym flag
7099 if test "$GCC" = yes; then
7100 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
7101- 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'
7102+ 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'
7103 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
7104 else
7105 allow_undefined_flag=' -expect_unresolved \*'
7106@@ -9135,9 +9726,9 @@ rm -f core conftest.err conftest.$ac_objext \
7107 no_undefined_flag=' -z defs'
7108 if test "$GCC" = yes; then
7109 wlarc='${wl}'
7110- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7111+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7112 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
7113- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
7114+ $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'
7115 else
7116 case `$CC -V 2>&1` in
7117 *"Compilers 5.0"*)
7118@@ -9713,8 +10304,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7119 need_version=no
7120 need_lib_prefix=no
7121
7122- case $GCC,$host_os in
7123- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
7124+ case $GCC,$cc_basename in
7125+ yes,*)
7126+ # gcc
7127 library_names_spec='$libname.dll.a'
7128 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7129 postinstall_cmds='base_file=`basename \${file}`~
7130@@ -9747,13 +10339,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7131 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7132 ;;
7133 esac
7134+ dynamic_linker='Win32 ld.exe'
7135+ ;;
7136+
7137+ *,cl*)
7138+ # Native MSVC
7139+ libname_spec='$name'
7140+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7141+ library_names_spec='${libname}.dll.lib'
7142+
7143+ case $build_os in
7144+ mingw*)
7145+ sys_lib_search_path_spec=
7146+ lt_save_ifs=$IFS
7147+ IFS=';'
7148+ for lt_path in $LIB
7149+ do
7150+ IFS=$lt_save_ifs
7151+ # Let DOS variable expansion print the short 8.3 style file name.
7152+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
7153+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
7154+ done
7155+ IFS=$lt_save_ifs
7156+ # Convert to MSYS style.
7157+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
7158+ ;;
7159+ cygwin*)
7160+ # Convert to unix form, then to dos form, then back to unix form
7161+ # but this time dos style (no spaces!) so that the unix form looks
7162+ # like /cygdrive/c/PROGRA~1:/cygdr...
7163+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7164+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7165+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7166+ ;;
7167+ *)
7168+ sys_lib_search_path_spec="$LIB"
7169+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7170+ # It is most probably a Windows format PATH.
7171+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7172+ else
7173+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7174+ fi
7175+ # FIXME: find the short name or the path components, as spaces are
7176+ # common. (e.g. "Program Files" -> "PROGRA~1")
7177+ ;;
7178+ esac
7179+
7180+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7181+ postinstall_cmds='base_file=`basename \${file}`~
7182+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7183+ dldir=$destdir/`dirname \$dlpath`~
7184+ test -d \$dldir || mkdir -p \$dldir~
7185+ $install_prog $dir/$dlname \$dldir/$dlname'
7186+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7187+ dlpath=$dir/\$dldll~
7188+ $RM \$dlpath'
7189+ shlibpath_overrides_runpath=yes
7190+ dynamic_linker='Win32 link.exe'
7191 ;;
7192
7193 *)
7194+ # Assume MSVC wrapper
7195 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7196+ dynamic_linker='Win32 ld.exe'
7197 ;;
7198 esac
7199- dynamic_linker='Win32 ld.exe'
7200 # FIXME: first we should search . and the directory the executable is in
7201 shlibpath_var=PATH
7202 ;;
7203@@ -10655,7 +11305,7 @@ else
7204 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7205 lt_status=$lt_dlunknown
7206 cat > conftest.$ac_ext <<_LT_EOF
7207-#line 10658 "configure"
7208+#line $LINENO "configure"
7209 #include "confdefs.h"
7210
7211 #if HAVE_DLFCN_H
7212@@ -10699,10 +11349,10 @@ else
7213 /* When -fvisbility=hidden is used, assume the code has been annotated
7214 correspondingly for the symbols needed. */
7215 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7216-void fnord () __attribute__((visibility("default")));
7217+int fnord () __attribute__((visibility("default")));
7218 #endif
7219
7220-void fnord () { int i=42; }
7221+int fnord () { return 42; }
7222 int main ()
7223 {
7224 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7225@@ -10761,7 +11411,7 @@ else
7226 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7227 lt_status=$lt_dlunknown
7228 cat > conftest.$ac_ext <<_LT_EOF
7229-#line 10764 "configure"
7230+#line $LINENO "configure"
7231 #include "confdefs.h"
7232
7233 #if HAVE_DLFCN_H
7234@@ -10805,10 +11455,10 @@ else
7235 /* When -fvisbility=hidden is used, assume the code has been annotated
7236 correspondingly for the symbols needed. */
7237 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7238-void fnord () __attribute__((visibility("default")));
7239+int fnord () __attribute__((visibility("default")));
7240 #endif
7241
7242-void fnord () { int i=42; }
7243+int fnord () { return 42; }
7244 int main ()
7245 {
7246 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7247@@ -14728,13 +15378,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7248 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7249 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7250 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7251+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7252+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7253 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7254 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7255 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7256 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7257 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7258+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7259+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7260+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7261+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7262 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7263 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7264+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7265 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7266 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7267 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7268@@ -14749,14 +15406,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7269 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7270 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7271 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"`'
7272+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7273+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7274 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7275 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7276 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7277-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7278 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7279+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7280 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7281 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7282 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7283+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7284 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7285 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7286 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7287@@ -14789,12 +15449,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7288 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7289 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7290 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7291-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7292 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7293 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7294 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7295 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7296 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7297+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7298 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7299 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7300 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7301@@ -14849,8 +15509,13 @@ reload_flag \
7302 OBJDUMP \
7303 deplibs_check_method \
7304 file_magic_cmd \
7305+file_magic_glob \
7306+want_nocaseglob \
7307+DLLTOOL \
7308+sharedlib_from_linklib_cmd \
7309 AR \
7310 AR_FLAGS \
7311+archiver_list_spec \
7312 STRIP \
7313 RANLIB \
7314 CC \
7315@@ -14860,12 +15525,14 @@ lt_cv_sys_global_symbol_pipe \
7316 lt_cv_sys_global_symbol_to_cdecl \
7317 lt_cv_sys_global_symbol_to_c_name_address \
7318 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7319+nm_file_list_spec \
7320 lt_prog_compiler_no_builtin_flag \
7321-lt_prog_compiler_wl \
7322 lt_prog_compiler_pic \
7323+lt_prog_compiler_wl \
7324 lt_prog_compiler_static \
7325 lt_cv_prog_compiler_c_o \
7326 need_locks \
7327+MANIFEST_TOOL \
7328 DSYMUTIL \
7329 NMEDIT \
7330 LIPO \
7331@@ -14881,7 +15548,6 @@ no_undefined_flag \
7332 hardcode_libdir_flag_spec \
7333 hardcode_libdir_flag_spec_ld \
7334 hardcode_libdir_separator \
7335-fix_srcfile_path \
7336 exclude_expsyms \
7337 include_expsyms \
7338 file_list_spec \
7339@@ -14917,6 +15583,7 @@ module_cmds \
7340 module_expsym_cmds \
7341 export_symbols_cmds \
7342 prelink_cmds \
7343+postlink_cmds \
7344 postinstall_cmds \
7345 postuninstall_cmds \
7346 finish_cmds \
7347@@ -15690,7 +16357,8 @@ $as_echo X"$file" |
7348 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7349 #
7350 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7351-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7352+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7353+# Inc.
7354 # Written by Gordon Matzigkeit, 1996
7355 #
7356 # This file is part of GNU Libtool.
7357@@ -15793,19 +16461,42 @@ SP2NL=$lt_lt_SP2NL
7358 # turn newlines into spaces.
7359 NL2SP=$lt_lt_NL2SP
7360
7361+# convert \$build file names to \$host format.
7362+to_host_file_cmd=$lt_cv_to_host_file_cmd
7363+
7364+# convert \$build files to toolchain format.
7365+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7366+
7367 # An object symbol dumper.
7368 OBJDUMP=$lt_OBJDUMP
7369
7370 # Method to check whether dependent libraries are shared objects.
7371 deplibs_check_method=$lt_deplibs_check_method
7372
7373-# Command to use when deplibs_check_method == "file_magic".
7374+# Command to use when deplibs_check_method = "file_magic".
7375 file_magic_cmd=$lt_file_magic_cmd
7376
7377+# How to find potential files when deplibs_check_method = "file_magic".
7378+file_magic_glob=$lt_file_magic_glob
7379+
7380+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7381+want_nocaseglob=$lt_want_nocaseglob
7382+
7383+# DLL creation program.
7384+DLLTOOL=$lt_DLLTOOL
7385+
7386+# Command to associate shared and link libraries.
7387+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7388+
7389 # The archiver.
7390 AR=$lt_AR
7391+
7392+# Flags to create an archive.
7393 AR_FLAGS=$lt_AR_FLAGS
7394
7395+# How to feed a file listing to the archiver.
7396+archiver_list_spec=$lt_archiver_list_spec
7397+
7398 # A symbol stripping program.
7399 STRIP=$lt_STRIP
7400
7401@@ -15835,6 +16526,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7402 # Transform the output of nm in a C name address pair when lib prefix is needed.
7403 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7404
7405+# Specify filename containing input files for \$NM.
7406+nm_file_list_spec=$lt_nm_file_list_spec
7407+
7408+# The root where to search for dependent libraries,and in which our libraries should be installed.
7409+lt_sysroot=$lt_sysroot
7410+
7411 # The name of the directory that contains temporary libtool files.
7412 objdir=$objdir
7413
7414@@ -15844,6 +16541,9 @@ MAGIC_CMD=$MAGIC_CMD
7415 # Must we lock files when doing compilation?
7416 need_locks=$lt_need_locks
7417
7418+# Manifest tool.
7419+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7420+
7421 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7422 DSYMUTIL=$lt_DSYMUTIL
7423
7424@@ -15958,12 +16658,12 @@ with_gcc=$GCC
7425 # Compiler flag to turn off builtin functions.
7426 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7427
7428-# How to pass a linker flag through the compiler.
7429-wl=$lt_lt_prog_compiler_wl
7430-
7431 # Additional compiler flags for building library objects.
7432 pic_flag=$lt_lt_prog_compiler_pic
7433
7434+# How to pass a linker flag through the compiler.
7435+wl=$lt_lt_prog_compiler_wl
7436+
7437 # Compiler flag to prevent dynamic linking.
7438 link_static_flag=$lt_lt_prog_compiler_static
7439
7440@@ -16050,9 +16750,6 @@ inherit_rpath=$inherit_rpath
7441 # Whether libtool must link a program against all its dependency libraries.
7442 link_all_deplibs=$link_all_deplibs
7443
7444-# Fix the shell variable \$srcfile for the compiler.
7445-fix_srcfile_path=$lt_fix_srcfile_path
7446-
7447 # Set to "yes" if exported symbols are required.
7448 always_export_symbols=$always_export_symbols
7449
7450@@ -16068,6 +16765,9 @@ include_expsyms=$lt_include_expsyms
7451 # Commands necessary for linking programs (against libraries) with templates.
7452 prelink_cmds=$lt_prelink_cmds
7453
7454+# Commands necessary for finishing linking programs.
7455+postlink_cmds=$lt_postlink_cmds
7456+
7457 # Specify filename containing input files.
7458 file_list_spec=$lt_file_list_spec
7459
7460@@ -16100,210 +16800,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7461 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7462 # text mode, it properly converts lines to CR/LF. This bash problem
7463 # is reportedly fixed, but why not run on old versions too?
7464- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7465- || (rm -f "$cfgfile"; exit 1)
7466-
7467- case $xsi_shell in
7468- yes)
7469- cat << \_LT_EOF >> "$cfgfile"
7470-
7471-# func_dirname file append nondir_replacement
7472-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7473-# otherwise set result to NONDIR_REPLACEMENT.
7474-func_dirname ()
7475-{
7476- case ${1} in
7477- */*) func_dirname_result="${1%/*}${2}" ;;
7478- * ) func_dirname_result="${3}" ;;
7479- esac
7480-}
7481-
7482-# func_basename file
7483-func_basename ()
7484-{
7485- func_basename_result="${1##*/}"
7486-}
7487-
7488-# func_dirname_and_basename file append nondir_replacement
7489-# perform func_basename and func_dirname in a single function
7490-# call:
7491-# dirname: Compute the dirname of FILE. If nonempty,
7492-# add APPEND to the result, otherwise set result
7493-# to NONDIR_REPLACEMENT.
7494-# value returned in "$func_dirname_result"
7495-# basename: Compute filename of FILE.
7496-# value retuned in "$func_basename_result"
7497-# Implementation must be kept synchronized with func_dirname
7498-# and func_basename. For efficiency, we do not delegate to
7499-# those functions but instead duplicate the functionality here.
7500-func_dirname_and_basename ()
7501-{
7502- case ${1} in
7503- */*) func_dirname_result="${1%/*}${2}" ;;
7504- * ) func_dirname_result="${3}" ;;
7505- esac
7506- func_basename_result="${1##*/}"
7507-}
7508-
7509-# func_stripname prefix suffix name
7510-# strip PREFIX and SUFFIX off of NAME.
7511-# PREFIX and SUFFIX must not contain globbing or regex special
7512-# characters, hashes, percent signs, but SUFFIX may contain a leading
7513-# dot (in which case that matches only a dot).
7514-func_stripname ()
7515-{
7516- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7517- # positional parameters, so assign one to ordinary parameter first.
7518- func_stripname_result=${3}
7519- func_stripname_result=${func_stripname_result#"${1}"}
7520- func_stripname_result=${func_stripname_result%"${2}"}
7521-}
7522-
7523-# func_opt_split
7524-func_opt_split ()
7525-{
7526- func_opt_split_opt=${1%%=*}
7527- func_opt_split_arg=${1#*=}
7528-}
7529-
7530-# func_lo2o object
7531-func_lo2o ()
7532-{
7533- case ${1} in
7534- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7535- *) func_lo2o_result=${1} ;;
7536- esac
7537-}
7538-
7539-# func_xform libobj-or-source
7540-func_xform ()
7541-{
7542- func_xform_result=${1%.*}.lo
7543-}
7544-
7545-# func_arith arithmetic-term...
7546-func_arith ()
7547-{
7548- func_arith_result=$(( $* ))
7549-}
7550-
7551-# func_len string
7552-# STRING may not start with a hyphen.
7553-func_len ()
7554-{
7555- func_len_result=${#1}
7556-}
7557-
7558-_LT_EOF
7559- ;;
7560- *) # Bourne compatible functions.
7561- cat << \_LT_EOF >> "$cfgfile"
7562-
7563-# func_dirname file append nondir_replacement
7564-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7565-# otherwise set result to NONDIR_REPLACEMENT.
7566-func_dirname ()
7567-{
7568- # Extract subdirectory from the argument.
7569- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7570- if test "X$func_dirname_result" = "X${1}"; then
7571- func_dirname_result="${3}"
7572- else
7573- func_dirname_result="$func_dirname_result${2}"
7574- fi
7575-}
7576-
7577-# func_basename file
7578-func_basename ()
7579-{
7580- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7581-}
7582-
7583-
7584-# func_stripname prefix suffix name
7585-# strip PREFIX and SUFFIX off of NAME.
7586-# PREFIX and SUFFIX must not contain globbing or regex special
7587-# characters, hashes, percent signs, but SUFFIX may contain a leading
7588-# dot (in which case that matches only a dot).
7589-# func_strip_suffix prefix name
7590-func_stripname ()
7591-{
7592- case ${2} in
7593- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7594- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7595- esac
7596-}
7597-
7598-# sed scripts:
7599-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7600-my_sed_long_arg='1s/^-[^=]*=//'
7601-
7602-# func_opt_split
7603-func_opt_split ()
7604-{
7605- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7606- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7607-}
7608-
7609-# func_lo2o object
7610-func_lo2o ()
7611-{
7612- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7613-}
7614-
7615-# func_xform libobj-or-source
7616-func_xform ()
7617-{
7618- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7619-}
7620-
7621-# func_arith arithmetic-term...
7622-func_arith ()
7623-{
7624- func_arith_result=`expr "$@"`
7625-}
7626-
7627-# func_len string
7628-# STRING may not start with a hyphen.
7629-func_len ()
7630-{
7631- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7632-}
7633-
7634-_LT_EOF
7635-esac
7636-
7637-case $lt_shell_append in
7638- yes)
7639- cat << \_LT_EOF >> "$cfgfile"
7640-
7641-# func_append var value
7642-# Append VALUE to the end of shell variable VAR.
7643-func_append ()
7644-{
7645- eval "$1+=\$2"
7646-}
7647-_LT_EOF
7648- ;;
7649- *)
7650- cat << \_LT_EOF >> "$cfgfile"
7651-
7652-# func_append var value
7653-# Append VALUE to the end of shell variable VAR.
7654-func_append ()
7655-{
7656- eval "$1=\$$1\$2"
7657-}
7658-
7659-_LT_EOF
7660- ;;
7661- esac
7662-
7663-
7664- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7665- || (rm -f "$cfgfile"; exit 1)
7666-
7667- mv -f "$cfgfile" "$ofile" ||
7668+ sed '$q' "$ltmain" >> "$cfgfile" \
7669+ || (rm -f "$cfgfile"; exit 1)
7670+
7671+ if test x"$xsi_shell" = xyes; then
7672+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7673+func_dirname ()\
7674+{\
7675+\ case ${1} in\
7676+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7677+\ * ) func_dirname_result="${3}" ;;\
7678+\ esac\
7679+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7680+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7681+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7682+test 0 -eq $? || _lt_function_replace_fail=:
7683+
7684+
7685+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7686+func_basename ()\
7687+{\
7688+\ func_basename_result="${1##*/}"\
7689+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7690+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7691+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7692+test 0 -eq $? || _lt_function_replace_fail=:
7693+
7694+
7695+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7696+func_dirname_and_basename ()\
7697+{\
7698+\ case ${1} in\
7699+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7700+\ * ) func_dirname_result="${3}" ;;\
7701+\ esac\
7702+\ func_basename_result="${1##*/}"\
7703+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7704+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7705+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7706+test 0 -eq $? || _lt_function_replace_fail=:
7707+
7708+
7709+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7710+func_stripname ()\
7711+{\
7712+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7713+\ # positional parameters, so assign one to ordinary parameter first.\
7714+\ func_stripname_result=${3}\
7715+\ func_stripname_result=${func_stripname_result#"${1}"}\
7716+\ func_stripname_result=${func_stripname_result%"${2}"}\
7717+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7718+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7719+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7720+test 0 -eq $? || _lt_function_replace_fail=:
7721+
7722+
7723+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7724+func_split_long_opt ()\
7725+{\
7726+\ func_split_long_opt_name=${1%%=*}\
7727+\ func_split_long_opt_arg=${1#*=}\
7728+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7729+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7730+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7731+test 0 -eq $? || _lt_function_replace_fail=:
7732+
7733+
7734+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7735+func_split_short_opt ()\
7736+{\
7737+\ func_split_short_opt_arg=${1#??}\
7738+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7739+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7740+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7741+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7742+test 0 -eq $? || _lt_function_replace_fail=:
7743+
7744+
7745+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7746+func_lo2o ()\
7747+{\
7748+\ case ${1} in\
7749+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7750+\ *) func_lo2o_result=${1} ;;\
7751+\ esac\
7752+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7753+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7754+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7755+test 0 -eq $? || _lt_function_replace_fail=:
7756+
7757+
7758+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7759+func_xform ()\
7760+{\
7761+ func_xform_result=${1%.*}.lo\
7762+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7763+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7764+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7765+test 0 -eq $? || _lt_function_replace_fail=:
7766+
7767+
7768+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7769+func_arith ()\
7770+{\
7771+ func_arith_result=$(( $* ))\
7772+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7773+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7774+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7775+test 0 -eq $? || _lt_function_replace_fail=:
7776+
7777+
7778+ sed -e '/^func_len ()$/,/^} # func_len /c\
7779+func_len ()\
7780+{\
7781+ func_len_result=${#1}\
7782+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7783+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7784+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7785+test 0 -eq $? || _lt_function_replace_fail=:
7786+
7787+fi
7788+
7789+if test x"$lt_shell_append" = xyes; then
7790+ sed -e '/^func_append ()$/,/^} # func_append /c\
7791+func_append ()\
7792+{\
7793+ eval "${1}+=\\${2}"\
7794+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7795+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7796+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7797+test 0 -eq $? || _lt_function_replace_fail=:
7798+
7799+
7800+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7801+func_append_quoted ()\
7802+{\
7803+\ func_quote_for_eval "${2}"\
7804+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7805+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7806+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7807+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7808+test 0 -eq $? || _lt_function_replace_fail=:
7809+
7810+
7811+ # Save a `func_append' function call where possible by direct use of '+='
7812+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7813+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7814+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7815+ test 0 -eq $? || _lt_function_replace_fail=:
7816+else
7817+ # Save a `func_append' function call even when '+=' is not available
7818+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7819+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7820+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7821+ test 0 -eq $? || _lt_function_replace_fail=:
7822+fi
7823+
7824+if test x"$_lt_function_replace_fail" = x":"; then
7825+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7826+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7827+fi
7828+
7829+
7830+ mv -f "$cfgfile" "$ofile" ||
7831 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7832 chmod +x "$ofile"
7833
7834diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
7835index dbc868191b7..1ca6dd01f58 100644
7836--- a/gprofng/Makefile.in
7837+++ b/gprofng/Makefile.in
7838@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@
7839 CYGPATH_W = @CYGPATH_W@
7840 DEFS = @DEFS@
7841 DEPDIR = @DEPDIR@
7842+DLLTOOL = @DLLTOOL@
7843 DSYMUTIL = @DSYMUTIL@
7844 DUMPBIN = @DUMPBIN@
7845 ECHO_C = @ECHO_C@
7846@@ -289,6 +290,7 @@ LN_S = @LN_S@
7847 LTLIBOBJS = @LTLIBOBJS@
7848 MAINT = @MAINT@
7849 MAKEINFO = @MAKEINFO@
7850+MANIFEST_TOOL = @MANIFEST_TOOL@
7851 MKDIR_P = @MKDIR_P@
7852 NM = @NM@
7853 NMEDIT = @NMEDIT@
7854diff --git a/gprofng/configure b/gprofng/configure
7855index bdfa2281f2c..b6376eb3f77 100755
7856--- a/gprofng/configure
7857+++ b/gprofng/configure
7858@@ -671,6 +671,8 @@ OTOOL
7859 LIPO
7860 NMEDIT
7861 DSYMUTIL
7862+MANIFEST_TOOL
7863+DLLTOOL
7864 OBJDUMP
7865 LN_S
7866 NM
7867@@ -801,6 +803,7 @@ enable_static
7868 with_pic
7869 enable_fast_install
7870 with_gnu_ld
7871+with_libtool_sysroot
7872 enable_libtool_lock
7873 enable_werror_always
7874 enable_gprofng_tools
7875@@ -1464,6 +1467,8 @@ Optional Packages:
7876 --with-pic try to use only PIC/non-PIC objects [default=use
7877 both]
7878 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7879+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7880+ (or the compiler's sysroot if not specified).
7881 --with-jdk=PATH specify prefix directory for installed JDK.
7882 --with-system-zlib use installed libz
7883
7884@@ -6152,8 +6157,8 @@ esac
7885
7886
7887
7888-macro_version='2.2.7a'
7889-macro_revision='1.3134'
7890+macro_version='2.4'
7891+macro_revision='1.3293'
7892
7893
7894
7895@@ -6193,7 +6198,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7897 $as_echo_n "checking how to print strings... " >&6; }
7898 # Test print first, because it will be a builtin if present.
7899-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7900+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7901 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7902 ECHO='print -r --'
7903 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7904@@ -6886,8 +6891,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7905 # Try some XSI features
7906 xsi_shell=no
7907 ( _lt_dummy="a/b/c"
7908- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7909- = c,a/b,, \
7910+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7911+ = c,a/b,b/c, \
7912 && eval 'test $(( 1 + 1 )) -eq 2 \
7913 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7914 && xsi_shell=yes
7915@@ -6936,6 +6941,80 @@ esac
7916
7917
7918
7919+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7920+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7921+if ${lt_cv_to_host_file_cmd+:} false; then :
7922+ $as_echo_n "(cached) " >&6
7923+else
7924+ case $host in
7925+ *-*-mingw* )
7926+ case $build in
7927+ *-*-mingw* ) # actually msys
7928+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7929+ ;;
7930+ *-*-cygwin* )
7931+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7932+ ;;
7933+ * ) # otherwise, assume *nix
7934+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7935+ ;;
7936+ esac
7937+ ;;
7938+ *-*-cygwin* )
7939+ case $build in
7940+ *-*-mingw* ) # actually msys
7941+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7942+ ;;
7943+ *-*-cygwin* )
7944+ lt_cv_to_host_file_cmd=func_convert_file_noop
7945+ ;;
7946+ * ) # otherwise, assume *nix
7947+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7948+ ;;
7949+ esac
7950+ ;;
7951+ * ) # unhandled hosts (and "normal" native builds)
7952+ lt_cv_to_host_file_cmd=func_convert_file_noop
7953+ ;;
7954+esac
7955+
7956+fi
7957+
7958+to_host_file_cmd=$lt_cv_to_host_file_cmd
7959+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7960+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7961+
7962+
7963+
7964+
7965+
7966+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7967+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7968+if ${lt_cv_to_tool_file_cmd+:} false; then :
7969+ $as_echo_n "(cached) " >&6
7970+else
7971+ #assume ordinary cross tools, or native build.
7972+lt_cv_to_tool_file_cmd=func_convert_file_noop
7973+case $host in
7974+ *-*-mingw* )
7975+ case $build in
7976+ *-*-mingw* ) # actually msys
7977+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7978+ ;;
7979+ esac
7980+ ;;
7981+esac
7982+
7983+fi
7984+
7985+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7986+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7987+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7988+
7989+
7990+
7991+
7992+
7993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7994 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7995 if ${lt_cv_ld_reload_flag+:} false; then :
7996@@ -6952,6 +7031,11 @@ case $reload_flag in
7997 esac
7998 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7999 case $host_os in
8000+ cygwin* | mingw* | pw32* | cegcc*)
8001+ if test "$GCC" != yes; then
8002+ reload_cmds=false
8003+ fi
8004+ ;;
8005 darwin*)
8006 if test "$GCC" = yes; then
8007 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
8008@@ -7120,7 +7204,8 @@ mingw* | pw32*)
8009 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
8010 lt_cv_file_magic_cmd='func_win32_libid'
8011 else
8012- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
8013+ # Keep this pattern in sync with the one in func_win32_libid.
8014+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
8015 lt_cv_file_magic_cmd='$OBJDUMP -f'
8016 fi
8017 ;;
8018@@ -7279,6 +7364,21 @@ esac
8019 fi
8020 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
8021 $as_echo "$lt_cv_deplibs_check_method" >&6; }
8022+
8023+file_magic_glob=
8024+want_nocaseglob=no
8025+if test "$build" = "$host"; then
8026+ case $host_os in
8027+ mingw* | pw32*)
8028+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
8029+ want_nocaseglob=yes
8030+ else
8031+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
8032+ fi
8033+ ;;
8034+ esac
8035+fi
8036+
8037 file_magic_cmd=$lt_cv_file_magic_cmd
8038 deplibs_check_method=$lt_cv_deplibs_check_method
8039 test -z "$deplibs_check_method" && deplibs_check_method=unknown
8040@@ -7294,6 +7394,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
8041
8042
8043
8044+
8045+
8046+
8047+
8048+
8049+
8050+
8051+
8052+
8053+
8054+if test -n "$ac_tool_prefix"; then
8055+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
8056+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
8057+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8058+$as_echo_n "checking for $ac_word... " >&6; }
8059+if ${ac_cv_prog_DLLTOOL+:} false; then :
8060+ $as_echo_n "(cached) " >&6
8061+else
8062+ if test -n "$DLLTOOL"; then
8063+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
8064+else
8065+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8066+for as_dir in $PATH
8067+do
8068+ IFS=$as_save_IFS
8069+ test -z "$as_dir" && as_dir=.
8070+ for ac_exec_ext in '' $ac_executable_extensions; do
8071+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8072+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
8073+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8074+ break 2
8075+ fi
8076+done
8077+ done
8078+IFS=$as_save_IFS
8079+
8080+fi
8081+fi
8082+DLLTOOL=$ac_cv_prog_DLLTOOL
8083+if test -n "$DLLTOOL"; then
8084+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
8085+$as_echo "$DLLTOOL" >&6; }
8086+else
8087+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8088+$as_echo "no" >&6; }
8089+fi
8090+
8091+
8092+fi
8093+if test -z "$ac_cv_prog_DLLTOOL"; then
8094+ ac_ct_DLLTOOL=$DLLTOOL
8095+ # Extract the first word of "dlltool", so it can be a program name with args.
8096+set dummy dlltool; ac_word=$2
8097+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8098+$as_echo_n "checking for $ac_word... " >&6; }
8099+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
8100+ $as_echo_n "(cached) " >&6
8101+else
8102+ if test -n "$ac_ct_DLLTOOL"; then
8103+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
8104+else
8105+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8106+for as_dir in $PATH
8107+do
8108+ IFS=$as_save_IFS
8109+ test -z "$as_dir" && as_dir=.
8110+ for ac_exec_ext in '' $ac_executable_extensions; do
8111+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8112+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
8113+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8114+ break 2
8115+ fi
8116+done
8117+ done
8118+IFS=$as_save_IFS
8119+
8120+fi
8121+fi
8122+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
8123+if test -n "$ac_ct_DLLTOOL"; then
8124+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
8125+$as_echo "$ac_ct_DLLTOOL" >&6; }
8126+else
8127+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8128+$as_echo "no" >&6; }
8129+fi
8130+
8131+ if test "x$ac_ct_DLLTOOL" = x; then
8132+ DLLTOOL="false"
8133+ else
8134+ case $cross_compiling:$ac_tool_warned in
8135+yes:)
8136+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8137+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8138+ac_tool_warned=yes ;;
8139+esac
8140+ DLLTOOL=$ac_ct_DLLTOOL
8141+ fi
8142+else
8143+ DLLTOOL="$ac_cv_prog_DLLTOOL"
8144+fi
8145+
8146+test -z "$DLLTOOL" && DLLTOOL=dlltool
8147+
8148+
8149+
8150+
8151+
8152+
8153+
8154+
8155+
8156+
8157+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
8158+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
8159+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
8160+ $as_echo_n "(cached) " >&6
8161+else
8162+ lt_cv_sharedlib_from_linklib_cmd='unknown'
8163+
8164+case $host_os in
8165+cygwin* | mingw* | pw32* | cegcc*)
8166+ # two different shell functions defined in ltmain.sh
8167+ # decide which to use based on capabilities of $DLLTOOL
8168+ case `$DLLTOOL --help 2>&1` in
8169+ *--identify-strict*)
8170+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
8171+ ;;
8172+ *)
8173+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
8174+ ;;
8175+ esac
8176+ ;;
8177+*)
8178+ # fallback: assume linklib IS sharedlib
8179+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
8180+ ;;
8181+esac
8182+
8183+fi
8184+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
8185+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
8186+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
8187+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8188+
8189+
8190+
8191+
8192+
8193+
8194+
8195 plugin_option=
8196 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8197 for plugin in $plugin_names; do
8198@@ -7308,8 +7559,10 @@ for plugin in $plugin_names; do
8199 done
8200
8201 if test -n "$ac_tool_prefix"; then
8202- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8203-set dummy ${ac_tool_prefix}ar; ac_word=$2
8204+ for ac_prog in ar
8205+ do
8206+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8207+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8209 $as_echo_n "checking for $ac_word... " >&6; }
8210 if ${ac_cv_prog_AR+:} false; then :
8211@@ -7325,7 +7578,7 @@ do
8212 test -z "$as_dir" && as_dir=.
8213 for ac_exec_ext in '' $ac_executable_extensions; do
8214 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8215- ac_cv_prog_AR="${ac_tool_prefix}ar"
8216+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8217 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8218 break 2
8219 fi
8220@@ -7345,11 +7598,15 @@ $as_echo "no" >&6; }
8221 fi
8222
8223
8224+ test -n "$AR" && break
8225+ done
8226 fi
8227-if test -z "$ac_cv_prog_AR"; then
8228+if test -z "$AR"; then
8229 ac_ct_AR=$AR
8230- # Extract the first word of "ar", so it can be a program name with args.
8231-set dummy ar; ac_word=$2
8232+ for ac_prog in ar
8233+do
8234+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8235+set dummy $ac_prog; ac_word=$2
8236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8237 $as_echo_n "checking for $ac_word... " >&6; }
8238 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8239@@ -7365,7 +7622,7 @@ do
8240 test -z "$as_dir" && as_dir=.
8241 for ac_exec_ext in '' $ac_executable_extensions; do
8242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8243- ac_cv_prog_ac_ct_AR="ar"
8244+ ac_cv_prog_ac_ct_AR="$ac_prog"
8245 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8246 break 2
8247 fi
8248@@ -7384,6 +7641,10 @@ else
8249 $as_echo "no" >&6; }
8250 fi
8251
8252+
8253+ test -n "$ac_ct_AR" && break
8254+done
8255+
8256 if test "x$ac_ct_AR" = x; then
8257 AR="false"
8258 else
8259@@ -7395,25 +7656,19 @@ ac_tool_warned=yes ;;
8260 esac
8261 AR=$ac_ct_AR
8262 fi
8263-else
8264- AR="$ac_cv_prog_AR"
8265 fi
8266
8267-test -z "$AR" && AR=ar
8268-if test -n "$plugin_option"; then
8269- if $AR --help 2>&1 | grep -q "\--plugin"; then
8270- touch conftest.c
8271- $AR $plugin_option rc conftest.a conftest.c
8272- if test "$?" != 0; then
8273- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8274+ touch conftest.c
8275+ $AR $plugin_option rc conftest.a conftest.c
8276+ if test "$?" != 0; then
8277+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8278 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
8279- else
8280- AR="$AR $plugin_option"
8281- fi
8282- rm -f conftest.*
8283+ else
8284+ AR="$AR $plugin_option"
8285 fi
8286-fi
8287-test -z "$AR_FLAGS" && AR_FLAGS=cru
8288+ rm -f conftest.*
8289+: ${AR=ar}
8290+: ${AR_FLAGS=cru}
8291
8292
8293
8294@@ -7425,6 +7680,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8295
8296
8297
8298+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8299+$as_echo_n "checking for archiver @FILE support... " >&6; }
8300+if ${lt_cv_ar_at_file+:} false; then :
8301+ $as_echo_n "(cached) " >&6
8302+else
8303+ lt_cv_ar_at_file=no
8304+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8305+/* end confdefs.h. */
8306+
8307+int
8308+main ()
8309+{
8310+
8311+ ;
8312+ return 0;
8313+}
8314+_ACEOF
8315+if ac_fn_c_try_compile "$LINENO"; then :
8316+ echo conftest.$ac_objext > conftest.lst
8317+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8318+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8319+ (eval $lt_ar_try) 2>&5
8320+ ac_status=$?
8321+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8322+ test $ac_status = 0; }
8323+ if test "$ac_status" -eq 0; then
8324+ # Ensure the archiver fails upon bogus file names.
8325+ rm -f conftest.$ac_objext libconftest.a
8326+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8327+ (eval $lt_ar_try) 2>&5
8328+ ac_status=$?
8329+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8330+ test $ac_status = 0; }
8331+ if test "$ac_status" -ne 0; then
8332+ lt_cv_ar_at_file=@
8333+ fi
8334+ fi
8335+ rm -f conftest.* libconftest.a
8336+
8337+fi
8338+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8339+
8340+fi
8341+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8342+$as_echo "$lt_cv_ar_at_file" >&6; }
8343+
8344+if test "x$lt_cv_ar_at_file" = xno; then
8345+ archiver_list_spec=
8346+else
8347+ archiver_list_spec=$lt_cv_ar_at_file
8348+fi
8349+
8350+
8351+
8352+
8353+
8354+
8355+
8356 if test -n "$ac_tool_prefix"; then
8357 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8358 set dummy ${ac_tool_prefix}strip; ac_word=$2
8359@@ -7764,8 +8077,8 @@ esac
8360 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8361
8362 # Transform an extracted symbol line into symbol name and symbol address
8363-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8364-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'"
8365+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8366+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'"
8367
8368 # Handle CRLF in mingw tool chain
8369 opt_cr=
8370@@ -7801,6 +8114,7 @@ for ac_symprfx in "" "_"; do
8371 else
8372 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8373 fi
8374+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8375
8376 # Check to see that the pipe works correctly.
8377 pipe_works=no
8378@@ -7842,6 +8156,18 @@ _LT_EOF
8379 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8380 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8381 cat <<_LT_EOF > conftest.$ac_ext
8382+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8383+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8384+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8385+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8386+# define LT_DLSYM_CONST
8387+#elif defined(__osf__)
8388+/* This system does not cope well with relocations in const data. */
8389+# define LT_DLSYM_CONST
8390+#else
8391+# define LT_DLSYM_CONST const
8392+#endif
8393+
8394 #ifdef __cplusplus
8395 extern "C" {
8396 #endif
8397@@ -7853,7 +8179,7 @@ _LT_EOF
8398 cat <<_LT_EOF >> conftest.$ac_ext
8399
8400 /* The mapping between symbol names and symbols. */
8401-const struct {
8402+LT_DLSYM_CONST struct {
8403 const char *name;
8404 void *address;
8405 }
8406@@ -7879,8 +8205,8 @@ static const void *lt_preloaded_setup() {
8407 _LT_EOF
8408 # Now try linking the two files.
8409 mv conftest.$ac_objext conftstm.$ac_objext
8410- lt_save_LIBS="$LIBS"
8411- lt_save_CFLAGS="$CFLAGS"
8412+ lt_globsym_save_LIBS=$LIBS
8413+ lt_globsym_save_CFLAGS=$CFLAGS
8414 LIBS="conftstm.$ac_objext"
8415 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8416 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8417@@ -7890,8 +8216,8 @@ _LT_EOF
8418 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8419 pipe_works=yes
8420 fi
8421- LIBS="$lt_save_LIBS"
8422- CFLAGS="$lt_save_CFLAGS"
8423+ LIBS=$lt_globsym_save_LIBS
8424+ CFLAGS=$lt_globsym_save_CFLAGS
8425 else
8426 echo "cannot find nm_test_func in $nlist" >&5
8427 fi
8428@@ -7928,6 +8254,14 @@ else
8429 $as_echo "ok" >&6; }
8430 fi
8431
8432+# Response file support.
8433+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8434+ nm_file_list_spec='@'
8435+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8436+ nm_file_list_spec='@'
8437+fi
8438+
8439+
8440
8441
8442
8443@@ -7946,6 +8280,47 @@ fi
8444
8445
8446
8447+
8448+
8449+
8450+
8451+
8452+
8453+
8454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8455+$as_echo_n "checking for sysroot... " >&6; }
8456+
8457+# Check whether --with-libtool-sysroot was given.
8458+if test "${with_libtool_sysroot+set}" = set; then :
8459+ withval=$with_libtool_sysroot;
8460+else
8461+ with_libtool_sysroot=no
8462+fi
8463+
8464+
8465+lt_sysroot=
8466+case ${with_libtool_sysroot} in #(
8467+ yes)
8468+ if test "$GCC" = yes; then
8469+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8470+ fi
8471+ ;; #(
8472+ /*)
8473+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8474+ ;; #(
8475+ no|'')
8476+ ;; #(
8477+ *)
8478+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8479+$as_echo "${with_libtool_sysroot}" >&6; }
8480+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
8481+ ;;
8482+esac
8483+
8484+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8485+$as_echo "${lt_sysroot:-no}" >&6; }
8486+
8487+
8488
8489
8490
8491@@ -8155,6 +8530,123 @@ esac
8492
8493 need_locks="$enable_libtool_lock"
8494
8495+if test -n "$ac_tool_prefix"; then
8496+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8497+set dummy ${ac_tool_prefix}mt; ac_word=$2
8498+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8499+$as_echo_n "checking for $ac_word... " >&6; }
8500+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
8501+ $as_echo_n "(cached) " >&6
8502+else
8503+ if test -n "$MANIFEST_TOOL"; then
8504+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8505+else
8506+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8507+for as_dir in $PATH
8508+do
8509+ IFS=$as_save_IFS
8510+ test -z "$as_dir" && as_dir=.
8511+ for ac_exec_ext in '' $ac_executable_extensions; do
8512+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8513+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8514+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8515+ break 2
8516+ fi
8517+done
8518+ done
8519+IFS=$as_save_IFS
8520+
8521+fi
8522+fi
8523+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8524+if test -n "$MANIFEST_TOOL"; then
8525+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8526+$as_echo "$MANIFEST_TOOL" >&6; }
8527+else
8528+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8529+$as_echo "no" >&6; }
8530+fi
8531+
8532+
8533+fi
8534+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8535+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8536+ # Extract the first word of "mt", so it can be a program name with args.
8537+set dummy mt; ac_word=$2
8538+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8539+$as_echo_n "checking for $ac_word... " >&6; }
8540+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
8541+ $as_echo_n "(cached) " >&6
8542+else
8543+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8544+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8545+else
8546+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8547+for as_dir in $PATH
8548+do
8549+ IFS=$as_save_IFS
8550+ test -z "$as_dir" && as_dir=.
8551+ for ac_exec_ext in '' $ac_executable_extensions; do
8552+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8553+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8554+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8555+ break 2
8556+ fi
8557+done
8558+ done
8559+IFS=$as_save_IFS
8560+
8561+fi
8562+fi
8563+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8564+if test -n "$ac_ct_MANIFEST_TOOL"; then
8565+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8566+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8567+else
8568+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8569+$as_echo "no" >&6; }
8570+fi
8571+
8572+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8573+ MANIFEST_TOOL=":"
8574+ else
8575+ case $cross_compiling:$ac_tool_warned in
8576+yes:)
8577+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8578+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8579+ac_tool_warned=yes ;;
8580+esac
8581+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8582+ fi
8583+else
8584+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8585+fi
8586+
8587+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8588+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8589+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8590+if ${lt_cv_path_mainfest_tool+:} false; then :
8591+ $as_echo_n "(cached) " >&6
8592+else
8593+ lt_cv_path_mainfest_tool=no
8594+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8595+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8596+ cat conftest.err >&5
8597+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8598+ lt_cv_path_mainfest_tool=yes
8599+ fi
8600+ rm -f conftest*
8601+fi
8602+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8603+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8604+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8605+ MANIFEST_TOOL=:
8606+fi
8607+
8608+
8609+
8610+
8611+
8612
8613 case $host_os in
8614 rhapsody* | darwin*)
8615@@ -8718,6 +9210,8 @@ _LT_EOF
8616 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8617 echo "$AR cru libconftest.a conftest.o" >&5
8618 $AR cru libconftest.a conftest.o 2>&5
8619+ echo "$RANLIB libconftest.a" >&5
8620+ $RANLIB libconftest.a 2>&5
8621 cat > conftest.c << _LT_EOF
8622 int main() { return 0;}
8623 _LT_EOF
8624@@ -8788,6 +9282,16 @@ done
8625
8626
8627
8628+func_stripname_cnf ()
8629+{
8630+ case ${2} in
8631+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8632+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8633+ esac
8634+} # func_stripname_cnf
8635+
8636+
8637+
8638
8639
8640 # Set options
8641@@ -9273,8 +9777,6 @@ fi
8642 lt_prog_compiler_pic=
8643 lt_prog_compiler_static=
8644
8645-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8646-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8647
8648 if test "$GCC" = yes; then
8649 lt_prog_compiler_wl='-Wl,'
8650@@ -9440,6 +9942,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8651 lt_prog_compiler_pic='--shared'
8652 lt_prog_compiler_static='--static'
8653 ;;
8654+ nagfor*)
8655+ # NAG Fortran compiler
8656+ lt_prog_compiler_wl='-Wl,-Wl,,'
8657+ lt_prog_compiler_pic='-PIC'
8658+ lt_prog_compiler_static='-Bstatic'
8659+ ;;
8660 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8661 # Portland Group compilers (*not* the Pentium gcc compiler,
8662 # which looks to be a dead project)
8663@@ -9502,7 +10010,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8664 lt_prog_compiler_pic='-KPIC'
8665 lt_prog_compiler_static='-Bstatic'
8666 case $cc_basename in
8667- f77* | f90* | f95*)
8668+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8669 lt_prog_compiler_wl='-Qoption ld ';;
8670 *)
8671 lt_prog_compiler_wl='-Wl,';;
8672@@ -9559,13 +10067,17 @@ case $host_os in
8673 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8674 ;;
8675 esac
8676-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8677-$as_echo "$lt_prog_compiler_pic" >&6; }
8678-
8679-
8680-
8681-
8682
8683+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8684+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8685+if ${lt_cv_prog_compiler_pic+:} false; then :
8686+ $as_echo_n "(cached) " >&6
8687+else
8688+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8689+fi
8690+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8691+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8692+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8693
8694 #
8695 # Check to make sure the PIC flag actually works.
8696@@ -9626,6 +10138,11 @@ fi
8697
8698
8699
8700+
8701+
8702+
8703+
8704+
8705 #
8706 # Check to make sure the static flag actually works.
8707 #
8708@@ -9976,7 +10493,8 @@ _LT_EOF
8709 allow_undefined_flag=unsupported
8710 always_export_symbols=no
8711 enable_shared_with_static_runtimes=yes
8712- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8713+ 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'
8714+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8715
8716 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8717 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8718@@ -10075,12 +10593,12 @@ _LT_EOF
8719 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8720 hardcode_libdir_flag_spec=
8721 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8722- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8723+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8724 if test "x$supports_anon_versioning" = xyes; then
8725 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8726 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8727 echo "local: *; };" >> $output_objdir/$libname.ver~
8728- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8729+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8730 fi
8731 ;;
8732 esac
8733@@ -10094,8 +10612,8 @@ _LT_EOF
8734 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8735 wlarc=
8736 else
8737- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8738- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8739+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8740+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8741 fi
8742 ;;
8743
8744@@ -10113,8 +10631,8 @@ _LT_EOF
8745
8746 _LT_EOF
8747 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8748- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8749- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8750+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8751+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8752 else
8753 ld_shlibs=no
8754 fi
8755@@ -10160,8 +10678,8 @@ _LT_EOF
8756
8757 *)
8758 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8759- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8760- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8761+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8762+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8763 else
8764 ld_shlibs=no
8765 fi
8766@@ -10291,7 +10809,13 @@ _LT_EOF
8767 allow_undefined_flag='-berok'
8768 # Determine the default libpath from the value encoded in an
8769 # empty executable.
8770- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8771+ if test "${lt_cv_aix_libpath+set}" = set; then
8772+ aix_libpath=$lt_cv_aix_libpath
8773+else
8774+ if ${lt_cv_aix_libpath_+:} false; then :
8775+ $as_echo_n "(cached) " >&6
8776+else
8777+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8778 /* end confdefs.h. */
8779
8780 int
8781@@ -10304,22 +10828,29 @@ main ()
8782 _ACEOF
8783 if ac_fn_c_try_link "$LINENO"; then :
8784
8785-lt_aix_libpath_sed='
8786- /Import File Strings/,/^$/ {
8787- /^0/ {
8788- s/^0 *\(.*\)$/\1/
8789- p
8790- }
8791- }'
8792-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8793-# Check for a 64-bit object if we didn't find anything.
8794-if test -z "$aix_libpath"; then
8795- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8796-fi
8797+ lt_aix_libpath_sed='
8798+ /Import File Strings/,/^$/ {
8799+ /^0/ {
8800+ s/^0 *\([^ ]*\) *$/\1/
8801+ p
8802+ }
8803+ }'
8804+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8805+ # Check for a 64-bit object if we didn't find anything.
8806+ if test -z "$lt_cv_aix_libpath_"; then
8807+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8808+ fi
8809 fi
8810 rm -f core conftest.err conftest.$ac_objext \
8811 conftest$ac_exeext conftest.$ac_ext
8812-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8813+ if test -z "$lt_cv_aix_libpath_"; then
8814+ lt_cv_aix_libpath_="/usr/lib:/lib"
8815+ fi
8816+
8817+fi
8818+
8819+ aix_libpath=$lt_cv_aix_libpath_
8820+fi
8821
8822 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8823 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"
8824@@ -10331,7 +10862,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8825 else
8826 # Determine the default libpath from the value encoded in an
8827 # empty executable.
8828- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8829+ if test "${lt_cv_aix_libpath+set}" = set; then
8830+ aix_libpath=$lt_cv_aix_libpath
8831+else
8832+ if ${lt_cv_aix_libpath_+:} false; then :
8833+ $as_echo_n "(cached) " >&6
8834+else
8835+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8836 /* end confdefs.h. */
8837
8838 int
8839@@ -10344,22 +10881,29 @@ main ()
8840 _ACEOF
8841 if ac_fn_c_try_link "$LINENO"; then :
8842
8843-lt_aix_libpath_sed='
8844- /Import File Strings/,/^$/ {
8845- /^0/ {
8846- s/^0 *\(.*\)$/\1/
8847- p
8848- }
8849- }'
8850-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8851-# Check for a 64-bit object if we didn't find anything.
8852-if test -z "$aix_libpath"; then
8853- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8854-fi
8855+ lt_aix_libpath_sed='
8856+ /Import File Strings/,/^$/ {
8857+ /^0/ {
8858+ s/^0 *\([^ ]*\) *$/\1/
8859+ p
8860+ }
8861+ }'
8862+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8863+ # Check for a 64-bit object if we didn't find anything.
8864+ if test -z "$lt_cv_aix_libpath_"; then
8865+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8866+ fi
8867 fi
8868 rm -f core conftest.err conftest.$ac_objext \
8869 conftest$ac_exeext conftest.$ac_ext
8870-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8871+ if test -z "$lt_cv_aix_libpath_"; then
8872+ lt_cv_aix_libpath_="/usr/lib:/lib"
8873+ fi
8874+
8875+fi
8876+
8877+ aix_libpath=$lt_cv_aix_libpath_
8878+fi
8879
8880 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8881 # Warning - without using the other run time loading flags,
8882@@ -10404,20 +10948,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8883 # Microsoft Visual C++.
8884 # hardcode_libdir_flag_spec is actually meaningless, as there is
8885 # no search path for DLLs.
8886- hardcode_libdir_flag_spec=' '
8887- allow_undefined_flag=unsupported
8888- # Tell ltmain to make .lib files, not .a files.
8889- libext=lib
8890- # Tell ltmain to make .dll files, not .so files.
8891- shrext_cmds=".dll"
8892- # FIXME: Setting linknames here is a bad hack.
8893- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8894- # The linker will automatically build a .lib file if we build a DLL.
8895- old_archive_from_new_cmds='true'
8896- # FIXME: Should let the user specify the lib program.
8897- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8898- fix_srcfile_path='`cygpath -w "$srcfile"`'
8899- enable_shared_with_static_runtimes=yes
8900+ case $cc_basename in
8901+ cl*)
8902+ # Native MSVC
8903+ hardcode_libdir_flag_spec=' '
8904+ allow_undefined_flag=unsupported
8905+ always_export_symbols=yes
8906+ file_list_spec='@'
8907+ # Tell ltmain to make .lib files, not .a files.
8908+ libext=lib
8909+ # Tell ltmain to make .dll files, not .so files.
8910+ shrext_cmds=".dll"
8911+ # FIXME: Setting linknames here is a bad hack.
8912+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8913+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8914+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8915+ else
8916+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8917+ fi~
8918+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8919+ linknames='
8920+ # The linker will not automatically build a static lib if we build a DLL.
8921+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8922+ enable_shared_with_static_runtimes=yes
8923+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8924+ # Don't use ranlib
8925+ old_postinstall_cmds='chmod 644 $oldlib'
8926+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8927+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8928+ case $lt_outputfile in
8929+ *.exe|*.EXE) ;;
8930+ *)
8931+ lt_outputfile="$lt_outputfile.exe"
8932+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8933+ ;;
8934+ esac~
8935+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8936+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8937+ $RM "$lt_outputfile.manifest";
8938+ fi'
8939+ ;;
8940+ *)
8941+ # Assume MSVC wrapper
8942+ hardcode_libdir_flag_spec=' '
8943+ allow_undefined_flag=unsupported
8944+ # Tell ltmain to make .lib files, not .a files.
8945+ libext=lib
8946+ # Tell ltmain to make .dll files, not .so files.
8947+ shrext_cmds=".dll"
8948+ # FIXME: Setting linknames here is a bad hack.
8949+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8950+ # The linker will automatically build a .lib file if we build a DLL.
8951+ old_archive_from_new_cmds='true'
8952+ # FIXME: Should let the user specify the lib program.
8953+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8954+ enable_shared_with_static_runtimes=yes
8955+ ;;
8956+ esac
8957 ;;
8958
8959 darwin* | rhapsody*)
8960@@ -10478,7 +11065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8961
8962 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8963 freebsd* | dragonfly*)
8964- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8965+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8966 hardcode_libdir_flag_spec='-R$libdir'
8967 hardcode_direct=yes
8968 hardcode_shlibpath_var=no
8969@@ -10486,7 +11073,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8970
8971 hpux9*)
8972 if test "$GCC" = yes; then
8973- 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'
8974+ 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'
8975 else
8976 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'
8977 fi
8978@@ -10502,7 +11089,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8979
8980 hpux10*)
8981 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8982- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8983+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8984 else
8985 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8986 fi
8987@@ -10526,10 +11113,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8988 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8989 ;;
8990 ia64*)
8991- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8992+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8993 ;;
8994 *)
8995- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8996+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8997 ;;
8998 esac
8999 else
9000@@ -10608,23 +11195,36 @@ fi
9001
9002 irix5* | irix6* | nonstopux*)
9003 if test "$GCC" = yes; then
9004- 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'
9005+ 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'
9006 # Try to use the -exported_symbol ld option, if it does not
9007 # work, assume that -exports_file does not work either and
9008 # implicitly export all symbols.
9009- save_LDFLAGS="$LDFLAGS"
9010- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
9011- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9012+ # This should be the same for all languages, so no per-tag cache variable.
9013+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
9014+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
9015+if ${lt_cv_irix_exported_symbol+:} false; then :
9016+ $as_echo_n "(cached) " >&6
9017+else
9018+ save_LDFLAGS="$LDFLAGS"
9019+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
9020+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9021 /* end confdefs.h. */
9022-int foo(void) {}
9023+int foo (void) { return 0; }
9024 _ACEOF
9025 if ac_fn_c_try_link "$LINENO"; then :
9026- 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'
9027-
9028+ lt_cv_irix_exported_symbol=yes
9029+else
9030+ lt_cv_irix_exported_symbol=no
9031 fi
9032 rm -f core conftest.err conftest.$ac_objext \
9033 conftest$ac_exeext conftest.$ac_ext
9034- LDFLAGS="$save_LDFLAGS"
9035+ LDFLAGS="$save_LDFLAGS"
9036+fi
9037+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
9038+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
9039+ if test "$lt_cv_irix_exported_symbol" = yes; then
9040+ 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'
9041+ fi
9042 else
9043 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'
9044 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'
9045@@ -10709,7 +11309,7 @@ rm -f core conftest.err conftest.$ac_objext \
9046 osf4* | osf5*) # as osf3* with the addition of -msym flag
9047 if test "$GCC" = yes; then
9048 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
9049- 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'
9050+ 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'
9051 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9052 else
9053 allow_undefined_flag=' -expect_unresolved \*'
9054@@ -10728,9 +11328,9 @@ rm -f core conftest.err conftest.$ac_objext \
9055 no_undefined_flag=' -z defs'
9056 if test "$GCC" = yes; then
9057 wlarc='${wl}'
9058- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
9059+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
9060 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9061- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
9062+ $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'
9063 else
9064 case `$CC -V 2>&1` in
9065 *"Compilers 5.0"*)
9066@@ -11306,8 +11906,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9067 need_version=no
9068 need_lib_prefix=no
9069
9070- case $GCC,$host_os in
9071- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9072+ case $GCC,$cc_basename in
9073+ yes,*)
9074+ # gcc
9075 library_names_spec='$libname.dll.a'
9076 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9077 postinstall_cmds='base_file=`basename \${file}`~
9078@@ -11340,13 +11941,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9079 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9080 ;;
9081 esac
9082+ dynamic_linker='Win32 ld.exe'
9083+ ;;
9084+
9085+ *,cl*)
9086+ # Native MSVC
9087+ libname_spec='$name'
9088+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9089+ library_names_spec='${libname}.dll.lib'
9090+
9091+ case $build_os in
9092+ mingw*)
9093+ sys_lib_search_path_spec=
9094+ lt_save_ifs=$IFS
9095+ IFS=';'
9096+ for lt_path in $LIB
9097+ do
9098+ IFS=$lt_save_ifs
9099+ # Let DOS variable expansion print the short 8.3 style file name.
9100+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9101+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9102+ done
9103+ IFS=$lt_save_ifs
9104+ # Convert to MSYS style.
9105+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9106+ ;;
9107+ cygwin*)
9108+ # Convert to unix form, then to dos form, then back to unix form
9109+ # but this time dos style (no spaces!) so that the unix form looks
9110+ # like /cygdrive/c/PROGRA~1:/cygdr...
9111+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9112+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9113+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9114+ ;;
9115+ *)
9116+ sys_lib_search_path_spec="$LIB"
9117+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9118+ # It is most probably a Windows format PATH.
9119+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9120+ else
9121+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9122+ fi
9123+ # FIXME: find the short name or the path components, as spaces are
9124+ # common. (e.g. "Program Files" -> "PROGRA~1")
9125+ ;;
9126+ esac
9127+
9128+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9129+ postinstall_cmds='base_file=`basename \${file}`~
9130+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9131+ dldir=$destdir/`dirname \$dlpath`~
9132+ test -d \$dldir || mkdir -p \$dldir~
9133+ $install_prog $dir/$dlname \$dldir/$dlname'
9134+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9135+ dlpath=$dir/\$dldll~
9136+ $RM \$dlpath'
9137+ shlibpath_overrides_runpath=yes
9138+ dynamic_linker='Win32 link.exe'
9139 ;;
9140
9141 *)
9142+ # Assume MSVC wrapper
9143 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9144+ dynamic_linker='Win32 ld.exe'
9145 ;;
9146 esac
9147- dynamic_linker='Win32 ld.exe'
9148 # FIXME: first we should search . and the directory the executable is in
9149 shlibpath_var=PATH
9150 ;;
9151@@ -12248,7 +12907,7 @@ else
9152 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9153 lt_status=$lt_dlunknown
9154 cat > conftest.$ac_ext <<_LT_EOF
9155-#line 12251 "configure"
9156+#line $LINENO "configure"
9157 #include "confdefs.h"
9158
9159 #if HAVE_DLFCN_H
9160@@ -12292,10 +12951,10 @@ else
9161 /* When -fvisbility=hidden is used, assume the code has been annotated
9162 correspondingly for the symbols needed. */
9163 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9164-void fnord () __attribute__((visibility("default")));
9165+int fnord () __attribute__((visibility("default")));
9166 #endif
9167
9168-void fnord () { int i=42; }
9169+int fnord () { return 42; }
9170 int main ()
9171 {
9172 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9173@@ -12354,7 +13013,7 @@ else
9174 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9175 lt_status=$lt_dlunknown
9176 cat > conftest.$ac_ext <<_LT_EOF
9177-#line 12357 "configure"
9178+#line $LINENO "configure"
9179 #include "confdefs.h"
9180
9181 #if HAVE_DLFCN_H
9182@@ -12398,10 +13057,10 @@ else
9183 /* When -fvisbility=hidden is used, assume the code has been annotated
9184 correspondingly for the symbols needed. */
9185 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9186-void fnord () __attribute__((visibility("default")));
9187+int fnord () __attribute__((visibility("default")));
9188 #endif
9189
9190-void fnord () { int i=42; }
9191+int fnord () { return 42; }
9192 int main ()
9193 {
9194 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9195@@ -12793,6 +13452,7 @@ $RM -r conftest*
9196
9197 # Allow CC to be a program name with arguments.
9198 lt_save_CC=$CC
9199+ lt_save_CFLAGS=$CFLAGS
9200 lt_save_LD=$LD
9201 lt_save_GCC=$GCC
9202 GCC=$GXX
9203@@ -12810,6 +13470,7 @@ $RM -r conftest*
9204 fi
9205 test -z "${LDCXX+set}" || LD=$LDCXX
9206 CC=${CXX-"c++"}
9207+ CFLAGS=$CXXFLAGS
9208 compiler=$CC
9209 compiler_CXX=$CC
9210 for cc_temp in $compiler""; do
9211@@ -13092,7 +13753,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9212 allow_undefined_flag_CXX='-berok'
9213 # Determine the default libpath from the value encoded in an empty
9214 # executable.
9215- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9216+ if test "${lt_cv_aix_libpath+set}" = set; then
9217+ aix_libpath=$lt_cv_aix_libpath
9218+else
9219+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9220+ $as_echo_n "(cached) " >&6
9221+else
9222+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9223 /* end confdefs.h. */
9224
9225 int
9226@@ -13105,22 +13772,29 @@ main ()
9227 _ACEOF
9228 if ac_fn_cxx_try_link "$LINENO"; then :
9229
9230-lt_aix_libpath_sed='
9231- /Import File Strings/,/^$/ {
9232- /^0/ {
9233- s/^0 *\(.*\)$/\1/
9234- p
9235- }
9236- }'
9237-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9238-# Check for a 64-bit object if we didn't find anything.
9239-if test -z "$aix_libpath"; then
9240- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9241-fi
9242+ lt_aix_libpath_sed='
9243+ /Import File Strings/,/^$/ {
9244+ /^0/ {
9245+ s/^0 *\([^ ]*\) *$/\1/
9246+ p
9247+ }
9248+ }'
9249+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9250+ # Check for a 64-bit object if we didn't find anything.
9251+ if test -z "$lt_cv_aix_libpath__CXX"; then
9252+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9253+ fi
9254 fi
9255 rm -f core conftest.err conftest.$ac_objext \
9256 conftest$ac_exeext conftest.$ac_ext
9257-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9258+ if test -z "$lt_cv_aix_libpath__CXX"; then
9259+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9260+ fi
9261+
9262+fi
9263+
9264+ aix_libpath=$lt_cv_aix_libpath__CXX
9265+fi
9266
9267 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9268
9269@@ -13133,7 +13807,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9270 else
9271 # Determine the default libpath from the value encoded in an
9272 # empty executable.
9273- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9274+ if test "${lt_cv_aix_libpath+set}" = set; then
9275+ aix_libpath=$lt_cv_aix_libpath
9276+else
9277+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9278+ $as_echo_n "(cached) " >&6
9279+else
9280+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9281 /* end confdefs.h. */
9282
9283 int
9284@@ -13146,22 +13826,29 @@ main ()
9285 _ACEOF
9286 if ac_fn_cxx_try_link "$LINENO"; then :
9287
9288-lt_aix_libpath_sed='
9289- /Import File Strings/,/^$/ {
9290- /^0/ {
9291- s/^0 *\(.*\)$/\1/
9292- p
9293- }
9294- }'
9295-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9296-# Check for a 64-bit object if we didn't find anything.
9297-if test -z "$aix_libpath"; then
9298- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9299-fi
9300+ lt_aix_libpath_sed='
9301+ /Import File Strings/,/^$/ {
9302+ /^0/ {
9303+ s/^0 *\([^ ]*\) *$/\1/
9304+ p
9305+ }
9306+ }'
9307+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9308+ # Check for a 64-bit object if we didn't find anything.
9309+ if test -z "$lt_cv_aix_libpath__CXX"; then
9310+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9311+ fi
9312 fi
9313 rm -f core conftest.err conftest.$ac_objext \
9314 conftest$ac_exeext conftest.$ac_ext
9315-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9316+ if test -z "$lt_cv_aix_libpath__CXX"; then
9317+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9318+ fi
9319+
9320+fi
9321+
9322+ aix_libpath=$lt_cv_aix_libpath__CXX
9323+fi
9324
9325 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9326 # Warning - without using the other run time loading flags,
9327@@ -13204,29 +13891,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9328 ;;
9329
9330 cygwin* | mingw* | pw32* | cegcc*)
9331- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9332- # as there is no search path for DLLs.
9333- hardcode_libdir_flag_spec_CXX='-L$libdir'
9334- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9335- allow_undefined_flag_CXX=unsupported
9336- always_export_symbols_CXX=no
9337- enable_shared_with_static_runtimes_CXX=yes
9338-
9339- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9340- 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'
9341- # If the export-symbols file already is a .def file (1st line
9342- # is EXPORTS), use it as is; otherwise, prepend...
9343- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9344- cp $export_symbols $output_objdir/$soname.def;
9345- else
9346- echo EXPORTS > $output_objdir/$soname.def;
9347- cat $export_symbols >> $output_objdir/$soname.def;
9348- fi~
9349- $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'
9350- else
9351- ld_shlibs_CXX=no
9352- fi
9353- ;;
9354+ case $GXX,$cc_basename in
9355+ ,cl* | no,cl*)
9356+ # Native MSVC
9357+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9358+ # no search path for DLLs.
9359+ hardcode_libdir_flag_spec_CXX=' '
9360+ allow_undefined_flag_CXX=unsupported
9361+ always_export_symbols_CXX=yes
9362+ file_list_spec_CXX='@'
9363+ # Tell ltmain to make .lib files, not .a files.
9364+ libext=lib
9365+ # Tell ltmain to make .dll files, not .so files.
9366+ shrext_cmds=".dll"
9367+ # FIXME: Setting linknames here is a bad hack.
9368+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9369+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9370+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9371+ else
9372+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9373+ fi~
9374+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9375+ linknames='
9376+ # The linker will not automatically build a static lib if we build a DLL.
9377+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9378+ enable_shared_with_static_runtimes_CXX=yes
9379+ # Don't use ranlib
9380+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9381+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9382+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9383+ case $lt_outputfile in
9384+ *.exe|*.EXE) ;;
9385+ *)
9386+ lt_outputfile="$lt_outputfile.exe"
9387+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9388+ ;;
9389+ esac~
9390+ func_to_tool_file "$lt_outputfile"~
9391+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9392+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9393+ $RM "$lt_outputfile.manifest";
9394+ fi'
9395+ ;;
9396+ *)
9397+ # g++
9398+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9399+ # as there is no search path for DLLs.
9400+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9401+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9402+ allow_undefined_flag_CXX=unsupported
9403+ always_export_symbols_CXX=no
9404+ enable_shared_with_static_runtimes_CXX=yes
9405+
9406+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9407+ 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'
9408+ # If the export-symbols file already is a .def file (1st line
9409+ # is EXPORTS), use it as is; otherwise, prepend...
9410+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9411+ cp $export_symbols $output_objdir/$soname.def;
9412+ else
9413+ echo EXPORTS > $output_objdir/$soname.def;
9414+ cat $export_symbols >> $output_objdir/$soname.def;
9415+ fi~
9416+ $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'
9417+ else
9418+ ld_shlibs_CXX=no
9419+ fi
9420+ ;;
9421+ esac
9422+ ;;
9423 darwin* | rhapsody*)
9424
9425
9426@@ -13332,7 +14065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9427 ;;
9428 *)
9429 if test "$GXX" = yes; then
9430- 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'
9431+ 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'
9432 else
9433 # FIXME: insert proper C++ library support
9434 ld_shlibs_CXX=no
9435@@ -13403,10 +14136,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9436 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9437 ;;
9438 ia64*)
9439- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9440+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9441 ;;
9442 *)
9443- 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'
9444+ 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'
9445 ;;
9446 esac
9447 fi
9448@@ -13447,9 +14180,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9449 *)
9450 if test "$GXX" = yes; then
9451 if test "$with_gnu_ld" = no; then
9452- 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'
9453+ 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'
9454 else
9455- 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'
9456+ 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'
9457 fi
9458 fi
9459 link_all_deplibs_CXX=yes
9460@@ -13727,7 +14460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9461 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'
9462 ;;
9463 *)
9464- 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'
9465+ 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'
9466 ;;
9467 esac
9468
9469@@ -13773,7 +14506,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9470
9471 solaris*)
9472 case $cc_basename in
9473- CC*)
9474+ CC* | sunCC*)
9475 # Sun C++ 4.2, 5.x and Centerline C++
9476 archive_cmds_need_lc_CXX=yes
9477 no_undefined_flag_CXX=' -zdefs'
9478@@ -13814,9 +14547,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9479 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9480 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9481 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9482- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9483+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9484 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9485- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9486+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9487
9488 # Commands to make compiler produce verbose output that lists
9489 # what "hidden" libraries, object files and flags are used when
9490@@ -13952,6 +14685,13 @@ private:
9491 };
9492 _LT_EOF
9493
9494+
9495+_lt_libdeps_save_CFLAGS=$CFLAGS
9496+case "$CC $CFLAGS " in #(
9497+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9498+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9499+esac
9500+
9501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9502 (eval $ac_compile) 2>&5
9503 ac_status=$?
9504@@ -13965,7 +14705,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9505 pre_test_object_deps_done=no
9506
9507 for p in `eval "$output_verbose_link_cmd"`; do
9508- case $p in
9509+ case ${prev}${p} in
9510
9511 -L* | -R* | -l*)
9512 # Some compilers place space between "-{L,R}" and the path.
9513@@ -13974,13 +14714,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9514 test $p = "-R"; then
9515 prev=$p
9516 continue
9517- else
9518- prev=
9519 fi
9520
9521+ # Expand the sysroot to ease extracting the directories later.
9522+ if test -z "$prev"; then
9523+ case $p in
9524+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9525+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9526+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9527+ esac
9528+ fi
9529+ case $p in
9530+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9531+ esac
9532 if test "$pre_test_object_deps_done" = no; then
9533- case $p in
9534- -L* | -R*)
9535+ case ${prev} in
9536+ -L | -R)
9537 # Internal compiler library paths should come after those
9538 # provided the user. The postdeps already come after the
9539 # user supplied libs so there is no need to process them.
9540@@ -14000,8 +14749,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9541 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9542 fi
9543 fi
9544+ prev=
9545 ;;
9546
9547+ *.lto.$objext) ;; # Ignore GCC LTO objects
9548 *.$objext)
9549 # This assumes that the test object file only shows up
9550 # once in the compiler output.
9551@@ -14037,6 +14788,7 @@ else
9552 fi
9553
9554 $RM -f confest.$objext
9555+CFLAGS=$_lt_libdeps_save_CFLAGS
9556
9557 # PORTME: override above test on systems where it is broken
9558 case $host_os in
9559@@ -14072,7 +14824,7 @@ linux*)
9560
9561 solaris*)
9562 case $cc_basename in
9563- CC*)
9564+ CC* | sunCC*)
9565 # The more standards-conforming stlport4 library is
9566 # incompatible with the Cstd library. Avoid specifying
9567 # it if it's in CXXFLAGS. Ignore libCrun as
9568@@ -14137,8 +14889,6 @@ fi
9569 lt_prog_compiler_pic_CXX=
9570 lt_prog_compiler_static_CXX=
9571
9572-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9573-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9574
9575 # C++ specific cases for pic, static, wl, etc.
9576 if test "$GXX" = yes; then
9577@@ -14243,6 +14993,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9578 ;;
9579 esac
9580 ;;
9581+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9582+ # This hack is so that the source file can tell whether it is being
9583+ # built for inclusion in a dll (and should export symbols for example).
9584+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9585+ ;;
9586 dgux*)
9587 case $cc_basename in
9588 ec++*)
9589@@ -14395,7 +15150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9590 ;;
9591 solaris*)
9592 case $cc_basename in
9593- CC*)
9594+ CC* | sunCC*)
9595 # Sun C++ 4.2, 5.x and Centerline C++
9596 lt_prog_compiler_pic_CXX='-KPIC'
9597 lt_prog_compiler_static_CXX='-Bstatic'
9598@@ -14460,10 +15215,17 @@ case $host_os in
9599 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9600 ;;
9601 esac
9602-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9603-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9604-
9605
9606+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9607+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9608+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
9609+ $as_echo_n "(cached) " >&6
9610+else
9611+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9612+fi
9613+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9614+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9615+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9616
9617 #
9618 # Check to make sure the PIC flag actually works.
9619@@ -14521,6 +15283,8 @@ fi
9620
9621
9622
9623+
9624+
9625 #
9626 # Check to make sure the static flag actually works.
9627 #
9628@@ -14698,6 +15462,7 @@ fi
9629 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9630
9631 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9632+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9633 case $host_os in
9634 aix[4-9]*)
9635 # If we're using GNU nm, then we don't want the "-C" option.
9636@@ -14712,15 +15477,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9637 ;;
9638 pw32*)
9639 export_symbols_cmds_CXX="$ltdll_cmds"
9640- ;;
9641+ ;;
9642 cygwin* | mingw* | cegcc*)
9643- 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'
9644- ;;
9645+ case $cc_basename in
9646+ cl*) ;;
9647+ *)
9648+ 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'
9649+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9650+ ;;
9651+ esac
9652+ ;;
9653 *)
9654 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9655- ;;
9656+ ;;
9657 esac
9658- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9659
9660 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9661 $as_echo "$ld_shlibs_CXX" >&6; }
9662@@ -14983,8 +15753,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9663 need_version=no
9664 need_lib_prefix=no
9665
9666- case $GCC,$host_os in
9667- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9668+ case $GCC,$cc_basename in
9669+ yes,*)
9670+ # gcc
9671 library_names_spec='$libname.dll.a'
9672 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9673 postinstall_cmds='base_file=`basename \${file}`~
9674@@ -15016,13 +15787,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9675 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9676 ;;
9677 esac
9678+ dynamic_linker='Win32 ld.exe'
9679+ ;;
9680+
9681+ *,cl*)
9682+ # Native MSVC
9683+ libname_spec='$name'
9684+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9685+ library_names_spec='${libname}.dll.lib'
9686+
9687+ case $build_os in
9688+ mingw*)
9689+ sys_lib_search_path_spec=
9690+ lt_save_ifs=$IFS
9691+ IFS=';'
9692+ for lt_path in $LIB
9693+ do
9694+ IFS=$lt_save_ifs
9695+ # Let DOS variable expansion print the short 8.3 style file name.
9696+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9697+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9698+ done
9699+ IFS=$lt_save_ifs
9700+ # Convert to MSYS style.
9701+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9702+ ;;
9703+ cygwin*)
9704+ # Convert to unix form, then to dos form, then back to unix form
9705+ # but this time dos style (no spaces!) so that the unix form looks
9706+ # like /cygdrive/c/PROGRA~1:/cygdr...
9707+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9708+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9709+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9710+ ;;
9711+ *)
9712+ sys_lib_search_path_spec="$LIB"
9713+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9714+ # It is most probably a Windows format PATH.
9715+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9716+ else
9717+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9718+ fi
9719+ # FIXME: find the short name or the path components, as spaces are
9720+ # common. (e.g. "Program Files" -> "PROGRA~1")
9721+ ;;
9722+ esac
9723+
9724+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9725+ postinstall_cmds='base_file=`basename \${file}`~
9726+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9727+ dldir=$destdir/`dirname \$dlpath`~
9728+ test -d \$dldir || mkdir -p \$dldir~
9729+ $install_prog $dir/$dlname \$dldir/$dlname'
9730+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9731+ dlpath=$dir/\$dldll~
9732+ $RM \$dlpath'
9733+ shlibpath_overrides_runpath=yes
9734+ dynamic_linker='Win32 link.exe'
9735 ;;
9736
9737 *)
9738+ # Assume MSVC wrapper
9739 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9740+ dynamic_linker='Win32 ld.exe'
9741 ;;
9742 esac
9743- dynamic_linker='Win32 ld.exe'
9744 # FIXME: first we should search . and the directory the executable is in
9745 shlibpath_var=PATH
9746 ;;
9747@@ -15586,6 +16415,7 @@ fi
9748 fi # test -n "$compiler"
9749
9750 CC=$lt_save_CC
9751+ CFLAGS=$lt_save_CFLAGS
9752 LDCXX=$LD
9753 LD=$lt_save_LD
9754 GCC=$lt_save_GCC
9755@@ -17738,13 +18568,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9756 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9757 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9758 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9759+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9760+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9761 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9762 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9763 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9764 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9765 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9766+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9767+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9768+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9769+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9770 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9771 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9772+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9773 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9774 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9775 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9776@@ -17759,14 +18596,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9777 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9778 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9779 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"`'
9780+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9781+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9782 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9783 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9784 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9785-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9786 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9787+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9788 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9789 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9790 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9791+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9792 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9793 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9794 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9795@@ -17799,12 +18639,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9796 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9797 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9798 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9799-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9800 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9801 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9802 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9803 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9804 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9805+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9806 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9807 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9808 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9809@@ -17843,8 +18683,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9810 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9811 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9812 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9813-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9814 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9815+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9816 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9817 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9818 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9819@@ -17871,12 +18711,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9820 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9821 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9822 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9823-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9824 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9825 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9826 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9827 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9828 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9829+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9830 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9831 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9832 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9833@@ -17914,8 +18754,13 @@ reload_flag \
9834 OBJDUMP \
9835 deplibs_check_method \
9836 file_magic_cmd \
9837+file_magic_glob \
9838+want_nocaseglob \
9839+DLLTOOL \
9840+sharedlib_from_linklib_cmd \
9841 AR \
9842 AR_FLAGS \
9843+archiver_list_spec \
9844 STRIP \
9845 RANLIB \
9846 CC \
9847@@ -17925,12 +18770,14 @@ lt_cv_sys_global_symbol_pipe \
9848 lt_cv_sys_global_symbol_to_cdecl \
9849 lt_cv_sys_global_symbol_to_c_name_address \
9850 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9851+nm_file_list_spec \
9852 lt_prog_compiler_no_builtin_flag \
9853-lt_prog_compiler_wl \
9854 lt_prog_compiler_pic \
9855+lt_prog_compiler_wl \
9856 lt_prog_compiler_static \
9857 lt_cv_prog_compiler_c_o \
9858 need_locks \
9859+MANIFEST_TOOL \
9860 DSYMUTIL \
9861 NMEDIT \
9862 LIPO \
9863@@ -17946,7 +18793,6 @@ no_undefined_flag \
9864 hardcode_libdir_flag_spec \
9865 hardcode_libdir_flag_spec_ld \
9866 hardcode_libdir_separator \
9867-fix_srcfile_path \
9868 exclude_expsyms \
9869 include_expsyms \
9870 file_list_spec \
9871@@ -17968,8 +18814,8 @@ LD_CXX \
9872 reload_flag_CXX \
9873 compiler_CXX \
9874 lt_prog_compiler_no_builtin_flag_CXX \
9875-lt_prog_compiler_wl_CXX \
9876 lt_prog_compiler_pic_CXX \
9877+lt_prog_compiler_wl_CXX \
9878 lt_prog_compiler_static_CXX \
9879 lt_cv_prog_compiler_c_o_CXX \
9880 export_dynamic_flag_spec_CXX \
9881@@ -17981,7 +18827,6 @@ no_undefined_flag_CXX \
9882 hardcode_libdir_flag_spec_CXX \
9883 hardcode_libdir_flag_spec_ld_CXX \
9884 hardcode_libdir_separator_CXX \
9885-fix_srcfile_path_CXX \
9886 exclude_expsyms_CXX \
9887 include_expsyms_CXX \
9888 file_list_spec_CXX \
9889@@ -18015,6 +18860,7 @@ module_cmds \
9890 module_expsym_cmds \
9891 export_symbols_cmds \
9892 prelink_cmds \
9893+postlink_cmds \
9894 postinstall_cmds \
9895 postuninstall_cmds \
9896 finish_cmds \
9897@@ -18029,7 +18875,8 @@ archive_expsym_cmds_CXX \
9898 module_cmds_CXX \
9899 module_expsym_cmds_CXX \
9900 export_symbols_cmds_CXX \
9901-prelink_cmds_CXX; do
9902+prelink_cmds_CXX \
9903+postlink_cmds_CXX; do
9904 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9905 *[\\\\\\\`\\"\\\$]*)
9906 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9907@@ -18786,7 +19633,8 @@ $as_echo X"$file" |
9908 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9909 #
9910 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9911-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9912+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9913+# Inc.
9914 # Written by Gordon Matzigkeit, 1996
9915 #
9916 # This file is part of GNU Libtool.
9917@@ -18889,19 +19737,42 @@ SP2NL=$lt_lt_SP2NL
9918 # turn newlines into spaces.
9919 NL2SP=$lt_lt_NL2SP
9920
9921+# convert \$build file names to \$host format.
9922+to_host_file_cmd=$lt_cv_to_host_file_cmd
9923+
9924+# convert \$build files to toolchain format.
9925+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9926+
9927 # An object symbol dumper.
9928 OBJDUMP=$lt_OBJDUMP
9929
9930 # Method to check whether dependent libraries are shared objects.
9931 deplibs_check_method=$lt_deplibs_check_method
9932
9933-# Command to use when deplibs_check_method == "file_magic".
9934+# Command to use when deplibs_check_method = "file_magic".
9935 file_magic_cmd=$lt_file_magic_cmd
9936
9937+# How to find potential files when deplibs_check_method = "file_magic".
9938+file_magic_glob=$lt_file_magic_glob
9939+
9940+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9941+want_nocaseglob=$lt_want_nocaseglob
9942+
9943+# DLL creation program.
9944+DLLTOOL=$lt_DLLTOOL
9945+
9946+# Command to associate shared and link libraries.
9947+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9948+
9949 # The archiver.
9950 AR=$lt_AR
9951+
9952+# Flags to create an archive.
9953 AR_FLAGS=$lt_AR_FLAGS
9954
9955+# How to feed a file listing to the archiver.
9956+archiver_list_spec=$lt_archiver_list_spec
9957+
9958 # A symbol stripping program.
9959 STRIP=$lt_STRIP
9960
9961@@ -18931,6 +19802,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9962 # Transform the output of nm in a C name address pair when lib prefix is needed.
9963 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9964
9965+# Specify filename containing input files for \$NM.
9966+nm_file_list_spec=$lt_nm_file_list_spec
9967+
9968+# The root where to search for dependent libraries,and in which our libraries should be installed.
9969+lt_sysroot=$lt_sysroot
9970+
9971 # The name of the directory that contains temporary libtool files.
9972 objdir=$objdir
9973
9974@@ -18940,6 +19817,9 @@ MAGIC_CMD=$MAGIC_CMD
9975 # Must we lock files when doing compilation?
9976 need_locks=$lt_need_locks
9977
9978+# Manifest tool.
9979+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9980+
9981 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9982 DSYMUTIL=$lt_DSYMUTIL
9983
9984@@ -19054,12 +19934,12 @@ with_gcc=$GCC
9985 # Compiler flag to turn off builtin functions.
9986 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9987
9988-# How to pass a linker flag through the compiler.
9989-wl=$lt_lt_prog_compiler_wl
9990-
9991 # Additional compiler flags for building library objects.
9992 pic_flag=$lt_lt_prog_compiler_pic
9993
9994+# How to pass a linker flag through the compiler.
9995+wl=$lt_lt_prog_compiler_wl
9996+
9997 # Compiler flag to prevent dynamic linking.
9998 link_static_flag=$lt_lt_prog_compiler_static
9999
10000@@ -19146,9 +20026,6 @@ inherit_rpath=$inherit_rpath
10001 # Whether libtool must link a program against all its dependency libraries.
10002 link_all_deplibs=$link_all_deplibs
10003
10004-# Fix the shell variable \$srcfile for the compiler.
10005-fix_srcfile_path=$lt_fix_srcfile_path
10006-
10007 # Set to "yes" if exported symbols are required.
10008 always_export_symbols=$always_export_symbols
10009
10010@@ -19164,6 +20041,9 @@ include_expsyms=$lt_include_expsyms
10011 # Commands necessary for linking programs (against libraries) with templates.
10012 prelink_cmds=$lt_prelink_cmds
10013
10014+# Commands necessary for finishing linking programs.
10015+postlink_cmds=$lt_postlink_cmds
10016+
10017 # Specify filename containing input files.
10018 file_list_spec=$lt_file_list_spec
10019
10020@@ -19210,210 +20090,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10021 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10022 # text mode, it properly converts lines to CR/LF. This bash problem
10023 # is reportedly fixed, but why not run on old versions too?
10024- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10025- || (rm -f "$cfgfile"; exit 1)
10026-
10027- case $xsi_shell in
10028- yes)
10029- cat << \_LT_EOF >> "$cfgfile"
10030-
10031-# func_dirname file append nondir_replacement
10032-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10033-# otherwise set result to NONDIR_REPLACEMENT.
10034-func_dirname ()
10035-{
10036- case ${1} in
10037- */*) func_dirname_result="${1%/*}${2}" ;;
10038- * ) func_dirname_result="${3}" ;;
10039- esac
10040-}
10041-
10042-# func_basename file
10043-func_basename ()
10044-{
10045- func_basename_result="${1##*/}"
10046-}
10047-
10048-# func_dirname_and_basename file append nondir_replacement
10049-# perform func_basename and func_dirname in a single function
10050-# call:
10051-# dirname: Compute the dirname of FILE. If nonempty,
10052-# add APPEND to the result, otherwise set result
10053-# to NONDIR_REPLACEMENT.
10054-# value returned in "$func_dirname_result"
10055-# basename: Compute filename of FILE.
10056-# value retuned in "$func_basename_result"
10057-# Implementation must be kept synchronized with func_dirname
10058-# and func_basename. For efficiency, we do not delegate to
10059-# those functions but instead duplicate the functionality here.
10060-func_dirname_and_basename ()
10061-{
10062- case ${1} in
10063- */*) func_dirname_result="${1%/*}${2}" ;;
10064- * ) func_dirname_result="${3}" ;;
10065- esac
10066- func_basename_result="${1##*/}"
10067-}
10068-
10069-# func_stripname prefix suffix name
10070-# strip PREFIX and SUFFIX off of NAME.
10071-# PREFIX and SUFFIX must not contain globbing or regex special
10072-# characters, hashes, percent signs, but SUFFIX may contain a leading
10073-# dot (in which case that matches only a dot).
10074-func_stripname ()
10075-{
10076- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
10077- # positional parameters, so assign one to ordinary parameter first.
10078- func_stripname_result=${3}
10079- func_stripname_result=${func_stripname_result#"${1}"}
10080- func_stripname_result=${func_stripname_result%"${2}"}
10081-}
10082-
10083-# func_opt_split
10084-func_opt_split ()
10085-{
10086- func_opt_split_opt=${1%%=*}
10087- func_opt_split_arg=${1#*=}
10088-}
10089-
10090-# func_lo2o object
10091-func_lo2o ()
10092-{
10093- case ${1} in
10094- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
10095- *) func_lo2o_result=${1} ;;
10096- esac
10097-}
10098-
10099-# func_xform libobj-or-source
10100-func_xform ()
10101-{
10102- func_xform_result=${1%.*}.lo
10103-}
10104-
10105-# func_arith arithmetic-term...
10106-func_arith ()
10107-{
10108- func_arith_result=$(( $* ))
10109-}
10110-
10111-# func_len string
10112-# STRING may not start with a hyphen.
10113-func_len ()
10114-{
10115- func_len_result=${#1}
10116-}
10117-
10118-_LT_EOF
10119- ;;
10120- *) # Bourne compatible functions.
10121- cat << \_LT_EOF >> "$cfgfile"
10122-
10123-# func_dirname file append nondir_replacement
10124-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10125-# otherwise set result to NONDIR_REPLACEMENT.
10126-func_dirname ()
10127-{
10128- # Extract subdirectory from the argument.
10129- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10130- if test "X$func_dirname_result" = "X${1}"; then
10131- func_dirname_result="${3}"
10132- else
10133- func_dirname_result="$func_dirname_result${2}"
10134- fi
10135-}
10136-
10137-# func_basename file
10138-func_basename ()
10139-{
10140- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10141-}
10142-
10143-
10144-# func_stripname prefix suffix name
10145-# strip PREFIX and SUFFIX off of NAME.
10146-# PREFIX and SUFFIX must not contain globbing or regex special
10147-# characters, hashes, percent signs, but SUFFIX may contain a leading
10148-# dot (in which case that matches only a dot).
10149-# func_strip_suffix prefix name
10150-func_stripname ()
10151-{
10152- case ${2} in
10153- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10154- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10155- esac
10156-}
10157-
10158-# sed scripts:
10159-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10160-my_sed_long_arg='1s/^-[^=]*=//'
10161-
10162-# func_opt_split
10163-func_opt_split ()
10164-{
10165- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10166- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10167-}
10168-
10169-# func_lo2o object
10170-func_lo2o ()
10171-{
10172- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10173-}
10174-
10175-# func_xform libobj-or-source
10176-func_xform ()
10177-{
10178- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10179-}
10180-
10181-# func_arith arithmetic-term...
10182-func_arith ()
10183-{
10184- func_arith_result=`expr "$@"`
10185-}
10186-
10187-# func_len string
10188-# STRING may not start with a hyphen.
10189-func_len ()
10190-{
10191- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10192-}
10193-
10194-_LT_EOF
10195-esac
10196-
10197-case $lt_shell_append in
10198- yes)
10199- cat << \_LT_EOF >> "$cfgfile"
10200-
10201-# func_append var value
10202-# Append VALUE to the end of shell variable VAR.
10203-func_append ()
10204-{
10205- eval "$1+=\$2"
10206-}
10207-_LT_EOF
10208- ;;
10209- *)
10210- cat << \_LT_EOF >> "$cfgfile"
10211-
10212-# func_append var value
10213-# Append VALUE to the end of shell variable VAR.
10214-func_append ()
10215-{
10216- eval "$1=\$$1\$2"
10217-}
10218-
10219-_LT_EOF
10220- ;;
10221- esac
10222-
10223-
10224- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10225- || (rm -f "$cfgfile"; exit 1)
10226-
10227- mv -f "$cfgfile" "$ofile" ||
10228+ sed '$q' "$ltmain" >> "$cfgfile" \
10229+ || (rm -f "$cfgfile"; exit 1)
10230+
10231+ if test x"$xsi_shell" = xyes; then
10232+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10233+func_dirname ()\
10234+{\
10235+\ case ${1} in\
10236+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10237+\ * ) func_dirname_result="${3}" ;;\
10238+\ esac\
10239+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10240+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10241+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10242+test 0 -eq $? || _lt_function_replace_fail=:
10243+
10244+
10245+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10246+func_basename ()\
10247+{\
10248+\ func_basename_result="${1##*/}"\
10249+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10250+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10251+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10252+test 0 -eq $? || _lt_function_replace_fail=:
10253+
10254+
10255+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10256+func_dirname_and_basename ()\
10257+{\
10258+\ case ${1} in\
10259+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10260+\ * ) func_dirname_result="${3}" ;;\
10261+\ esac\
10262+\ func_basename_result="${1##*/}"\
10263+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10264+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10265+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10266+test 0 -eq $? || _lt_function_replace_fail=:
10267+
10268+
10269+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10270+func_stripname ()\
10271+{\
10272+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10273+\ # positional parameters, so assign one to ordinary parameter first.\
10274+\ func_stripname_result=${3}\
10275+\ func_stripname_result=${func_stripname_result#"${1}"}\
10276+\ func_stripname_result=${func_stripname_result%"${2}"}\
10277+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10278+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10279+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10280+test 0 -eq $? || _lt_function_replace_fail=:
10281+
10282+
10283+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10284+func_split_long_opt ()\
10285+{\
10286+\ func_split_long_opt_name=${1%%=*}\
10287+\ func_split_long_opt_arg=${1#*=}\
10288+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10289+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10290+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10291+test 0 -eq $? || _lt_function_replace_fail=:
10292+
10293+
10294+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10295+func_split_short_opt ()\
10296+{\
10297+\ func_split_short_opt_arg=${1#??}\
10298+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10299+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10300+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10301+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10302+test 0 -eq $? || _lt_function_replace_fail=:
10303+
10304+
10305+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10306+func_lo2o ()\
10307+{\
10308+\ case ${1} in\
10309+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10310+\ *) func_lo2o_result=${1} ;;\
10311+\ esac\
10312+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10313+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10314+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10315+test 0 -eq $? || _lt_function_replace_fail=:
10316+
10317+
10318+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10319+func_xform ()\
10320+{\
10321+ func_xform_result=${1%.*}.lo\
10322+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10323+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10324+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10325+test 0 -eq $? || _lt_function_replace_fail=:
10326+
10327+
10328+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10329+func_arith ()\
10330+{\
10331+ func_arith_result=$(( $* ))\
10332+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10333+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10334+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10335+test 0 -eq $? || _lt_function_replace_fail=:
10336+
10337+
10338+ sed -e '/^func_len ()$/,/^} # func_len /c\
10339+func_len ()\
10340+{\
10341+ func_len_result=${#1}\
10342+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10343+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10344+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10345+test 0 -eq $? || _lt_function_replace_fail=:
10346+
10347+fi
10348+
10349+if test x"$lt_shell_append" = xyes; then
10350+ sed -e '/^func_append ()$/,/^} # func_append /c\
10351+func_append ()\
10352+{\
10353+ eval "${1}+=\\${2}"\
10354+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10355+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10356+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10357+test 0 -eq $? || _lt_function_replace_fail=:
10358+
10359+
10360+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10361+func_append_quoted ()\
10362+{\
10363+\ func_quote_for_eval "${2}"\
10364+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10365+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10366+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10367+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10368+test 0 -eq $? || _lt_function_replace_fail=:
10369+
10370+
10371+ # Save a `func_append' function call where possible by direct use of '+='
10372+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10373+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10374+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10375+ test 0 -eq $? || _lt_function_replace_fail=:
10376+else
10377+ # Save a `func_append' function call even when '+=' is not available
10378+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10379+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10380+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10381+ test 0 -eq $? || _lt_function_replace_fail=:
10382+fi
10383+
10384+if test x"$_lt_function_replace_fail" = x":"; then
10385+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10386+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10387+fi
10388+
10389+
10390+ mv -f "$cfgfile" "$ofile" ||
10391 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10392 chmod +x "$ofile"
10393
10394@@ -19441,12 +20280,12 @@ with_gcc=$GCC_CXX
10395 # Compiler flag to turn off builtin functions.
10396 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10397
10398-# How to pass a linker flag through the compiler.
10399-wl=$lt_lt_prog_compiler_wl_CXX
10400-
10401 # Additional compiler flags for building library objects.
10402 pic_flag=$lt_lt_prog_compiler_pic_CXX
10403
10404+# How to pass a linker flag through the compiler.
10405+wl=$lt_lt_prog_compiler_wl_CXX
10406+
10407 # Compiler flag to prevent dynamic linking.
10408 link_static_flag=$lt_lt_prog_compiler_static_CXX
10409
10410@@ -19533,9 +20372,6 @@ inherit_rpath=$inherit_rpath_CXX
10411 # Whether libtool must link a program against all its dependency libraries.
10412 link_all_deplibs=$link_all_deplibs_CXX
10413
10414-# Fix the shell variable \$srcfile for the compiler.
10415-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10416-
10417 # Set to "yes" if exported symbols are required.
10418 always_export_symbols=$always_export_symbols_CXX
10419
10420@@ -19551,6 +20387,9 @@ include_expsyms=$lt_include_expsyms_CXX
10421 # Commands necessary for linking programs (against libraries) with templates.
10422 prelink_cmds=$lt_prelink_cmds_CXX
10423
10424+# Commands necessary for finishing linking programs.
10425+postlink_cmds=$lt_postlink_cmds_CXX
10426+
10427 # Specify filename containing input files.
10428 file_list_spec=$lt_file_list_spec_CXX
10429
10430diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
10431index 3306c51b31c..6ab3d9636c8 100644
10432--- a/gprofng/doc/Makefile.in
10433+++ b/gprofng/doc/Makefile.in
10434@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@
10435 CYGPATH_W = @CYGPATH_W@
10436 DEFS = @DEFS@
10437 DEPDIR = @DEPDIR@
10438+DLLTOOL = @DLLTOOL@
10439 DSYMUTIL = @DSYMUTIL@
10440 DUMPBIN = @DUMPBIN@
10441 ECHO_C = @ECHO_C@
10442@@ -272,6 +273,7 @@ LN_S = @LN_S@
10443 LTLIBOBJS = @LTLIBOBJS@
10444 MAINT = @MAINT@
10445 MAKEINFO = @MAKEINFO@
10446+MANIFEST_TOOL = @MANIFEST_TOOL@
10447 MKDIR_P = @MKDIR_P@
10448 NM = @NM@
10449 NMEDIT = @NMEDIT@
10450diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in
10451index 61c00cd6e46..edce3cb94c5 100644
10452--- a/gprofng/gp-display-html/Makefile.in
10453+++ b/gprofng/gp-display-html/Makefile.in
10454@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@
10455 CYGPATH_W = @CYGPATH_W@
10456 DEFS = @DEFS@
10457 DEPDIR = @DEPDIR@
10458+DLLTOOL = @DLLTOOL@
10459 DSYMUTIL = @DSYMUTIL@
10460 DUMPBIN = @DUMPBIN@
10461 ECHO_C = @ECHO_C@
10462@@ -231,6 +232,7 @@ LN_S = @LN_S@
10463 LTLIBOBJS = @LTLIBOBJS@
10464 MAINT = @MAINT@
10465 MAKEINFO = @MAKEINFO@
10466+MANIFEST_TOOL = @MANIFEST_TOOL@
10467 MKDIR_P = @MKDIR_P@
10468 NM = @NM@
10469 NMEDIT = @NMEDIT@
10470diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
10471index ce8755c80c9..91e29c29ab8 100644
10472--- a/gprofng/libcollector/Makefile.in
10473+++ b/gprofng/libcollector/Makefile.in
10474@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@
10475 CYGPATH_W = @CYGPATH_W@
10476 DEFS = @DEFS@
10477 DEPDIR = @DEPDIR@
10478+DLLTOOL = @DLLTOOL@
10479 DSYMUTIL = @DSYMUTIL@
10480 DUMPBIN = @DUMPBIN@
10481 ECHO_C = @ECHO_C@
10482@@ -341,6 +342,7 @@ LN_S = @LN_S@
10483 LTLIBOBJS = @LTLIBOBJS@
10484 MAINT = @MAINT@
10485 MAKEINFO = @MAKEINFO@
10486+MANIFEST_TOOL = @MANIFEST_TOOL@
10487 MKDIR_P = @MKDIR_P@
10488 NM = @NM@
10489 NMEDIT = @NMEDIT@
10490diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
10491index 8b0092433fe..a363ab1047c 100755
10492--- a/gprofng/libcollector/configure
10493+++ b/gprofng/libcollector/configure
10494@@ -640,6 +640,8 @@ OTOOL
10495 LIPO
10496 NMEDIT
10497 DSYMUTIL
10498+MANIFEST_TOOL
10499+DLLTOOL
10500 OBJDUMP
10501 LN_S
10502 NM
10503@@ -769,6 +771,7 @@ enable_static
10504 with_pic
10505 enable_fast_install
10506 with_gnu_ld
10507+with_libtool_sysroot
10508 enable_libtool_lock
10509 '
10510 ac_precious_vars='build_alias
10511@@ -1424,6 +1427,8 @@ Optional Packages:
10512 --with-pic try to use only PIC/non-PIC objects [default=use
10513 both]
10514 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
10515+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
10516+ (or the compiler's sysroot if not specified).
10517
10518 Some influential environment variables:
10519 CC C compiler command
10520@@ -5968,8 +5973,8 @@ esac
10521
10522
10523
10524-macro_version='2.2.7a'
10525-macro_revision='1.3134'
10526+macro_version='2.4'
10527+macro_revision='1.3293'
10528
10529
10530
10531@@ -6009,7 +6014,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10532 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10533 $as_echo_n "checking how to print strings... " >&6; }
10534 # Test print first, because it will be a builtin if present.
10535-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10536+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10537 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10538 ECHO='print -r --'
10539 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10540@@ -6702,8 +6707,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10541 # Try some XSI features
10542 xsi_shell=no
10543 ( _lt_dummy="a/b/c"
10544- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
10545- = c,a/b,, \
10546+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
10547+ = c,a/b,b/c, \
10548 && eval 'test $(( 1 + 1 )) -eq 2 \
10549 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10550 && xsi_shell=yes
10551@@ -6752,6 +6757,80 @@ esac
10552
10553
10554
10555+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
10556+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
10557+if ${lt_cv_to_host_file_cmd+:} false; then :
10558+ $as_echo_n "(cached) " >&6
10559+else
10560+ case $host in
10561+ *-*-mingw* )
10562+ case $build in
10563+ *-*-mingw* ) # actually msys
10564+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
10565+ ;;
10566+ *-*-cygwin* )
10567+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
10568+ ;;
10569+ * ) # otherwise, assume *nix
10570+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
10571+ ;;
10572+ esac
10573+ ;;
10574+ *-*-cygwin* )
10575+ case $build in
10576+ *-*-mingw* ) # actually msys
10577+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
10578+ ;;
10579+ *-*-cygwin* )
10580+ lt_cv_to_host_file_cmd=func_convert_file_noop
10581+ ;;
10582+ * ) # otherwise, assume *nix
10583+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
10584+ ;;
10585+ esac
10586+ ;;
10587+ * ) # unhandled hosts (and "normal" native builds)
10588+ lt_cv_to_host_file_cmd=func_convert_file_noop
10589+ ;;
10590+esac
10591+
10592+fi
10593+
10594+to_host_file_cmd=$lt_cv_to_host_file_cmd
10595+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
10596+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
10597+
10598+
10599+
10600+
10601+
10602+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
10603+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
10604+if ${lt_cv_to_tool_file_cmd+:} false; then :
10605+ $as_echo_n "(cached) " >&6
10606+else
10607+ #assume ordinary cross tools, or native build.
10608+lt_cv_to_tool_file_cmd=func_convert_file_noop
10609+case $host in
10610+ *-*-mingw* )
10611+ case $build in
10612+ *-*-mingw* ) # actually msys
10613+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
10614+ ;;
10615+ esac
10616+ ;;
10617+esac
10618+
10619+fi
10620+
10621+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10622+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
10623+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
10624+
10625+
10626+
10627+
10628+
10629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10630 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10631 if ${lt_cv_ld_reload_flag+:} false; then :
10632@@ -6768,6 +6847,11 @@ case $reload_flag in
10633 esac
10634 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10635 case $host_os in
10636+ cygwin* | mingw* | pw32* | cegcc*)
10637+ if test "$GCC" != yes; then
10638+ reload_cmds=false
10639+ fi
10640+ ;;
10641 darwin*)
10642 if test "$GCC" = yes; then
10643 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10644@@ -6936,7 +7020,8 @@ mingw* | pw32*)
10645 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10646 lt_cv_file_magic_cmd='func_win32_libid'
10647 else
10648- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10649+ # Keep this pattern in sync with the one in func_win32_libid.
10650+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10651 lt_cv_file_magic_cmd='$OBJDUMP -f'
10652 fi
10653 ;;
10654@@ -7095,6 +7180,21 @@ esac
10655 fi
10656 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10657 $as_echo "$lt_cv_deplibs_check_method" >&6; }
10658+
10659+file_magic_glob=
10660+want_nocaseglob=no
10661+if test "$build" = "$host"; then
10662+ case $host_os in
10663+ mingw* | pw32*)
10664+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10665+ want_nocaseglob=yes
10666+ else
10667+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
10668+ fi
10669+ ;;
10670+ esac
10671+fi
10672+
10673 file_magic_cmd=$lt_cv_file_magic_cmd
10674 deplibs_check_method=$lt_cv_deplibs_check_method
10675 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10676@@ -7110,6 +7210,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10677
10678
10679
10680+
10681+
10682+
10683+
10684+
10685+
10686+
10687+
10688+
10689+
10690+if test -n "$ac_tool_prefix"; then
10691+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
10692+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
10693+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10694+$as_echo_n "checking for $ac_word... " >&6; }
10695+if ${ac_cv_prog_DLLTOOL+:} false; then :
10696+ $as_echo_n "(cached) " >&6
10697+else
10698+ if test -n "$DLLTOOL"; then
10699+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
10700+else
10701+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10702+for as_dir in $PATH
10703+do
10704+ IFS=$as_save_IFS
10705+ test -z "$as_dir" && as_dir=.
10706+ for ac_exec_ext in '' $ac_executable_extensions; do
10707+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10708+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
10709+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10710+ break 2
10711+ fi
10712+done
10713+ done
10714+IFS=$as_save_IFS
10715+
10716+fi
10717+fi
10718+DLLTOOL=$ac_cv_prog_DLLTOOL
10719+if test -n "$DLLTOOL"; then
10720+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
10721+$as_echo "$DLLTOOL" >&6; }
10722+else
10723+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10724+$as_echo "no" >&6; }
10725+fi
10726+
10727+
10728+fi
10729+if test -z "$ac_cv_prog_DLLTOOL"; then
10730+ ac_ct_DLLTOOL=$DLLTOOL
10731+ # Extract the first word of "dlltool", so it can be a program name with args.
10732+set dummy dlltool; ac_word=$2
10733+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10734+$as_echo_n "checking for $ac_word... " >&6; }
10735+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
10736+ $as_echo_n "(cached) " >&6
10737+else
10738+ if test -n "$ac_ct_DLLTOOL"; then
10739+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
10740+else
10741+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10742+for as_dir in $PATH
10743+do
10744+ IFS=$as_save_IFS
10745+ test -z "$as_dir" && as_dir=.
10746+ for ac_exec_ext in '' $ac_executable_extensions; do
10747+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10748+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
10749+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10750+ break 2
10751+ fi
10752+done
10753+ done
10754+IFS=$as_save_IFS
10755+
10756+fi
10757+fi
10758+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
10759+if test -n "$ac_ct_DLLTOOL"; then
10760+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
10761+$as_echo "$ac_ct_DLLTOOL" >&6; }
10762+else
10763+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10764+$as_echo "no" >&6; }
10765+fi
10766+
10767+ if test "x$ac_ct_DLLTOOL" = x; then
10768+ DLLTOOL="false"
10769+ else
10770+ case $cross_compiling:$ac_tool_warned in
10771+yes:)
10772+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10773+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10774+ac_tool_warned=yes ;;
10775+esac
10776+ DLLTOOL=$ac_ct_DLLTOOL
10777+ fi
10778+else
10779+ DLLTOOL="$ac_cv_prog_DLLTOOL"
10780+fi
10781+
10782+test -z "$DLLTOOL" && DLLTOOL=dlltool
10783+
10784+
10785+
10786+
10787+
10788+
10789+
10790+
10791+
10792+
10793+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
10794+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
10795+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
10796+ $as_echo_n "(cached) " >&6
10797+else
10798+ lt_cv_sharedlib_from_linklib_cmd='unknown'
10799+
10800+case $host_os in
10801+cygwin* | mingw* | pw32* | cegcc*)
10802+ # two different shell functions defined in ltmain.sh
10803+ # decide which to use based on capabilities of $DLLTOOL
10804+ case `$DLLTOOL --help 2>&1` in
10805+ *--identify-strict*)
10806+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10807+ ;;
10808+ *)
10809+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10810+ ;;
10811+ esac
10812+ ;;
10813+*)
10814+ # fallback: assume linklib IS sharedlib
10815+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10816+ ;;
10817+esac
10818+
10819+fi
10820+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
10821+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
10822+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10823+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10824+
10825+
10826+
10827+
10828+
10829+
10830+
10831 plugin_option=
10832 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10833 for plugin in $plugin_names; do
10834@@ -7124,8 +7375,10 @@ for plugin in $plugin_names; do
10835 done
10836
10837 if test -n "$ac_tool_prefix"; then
10838- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10839-set dummy ${ac_tool_prefix}ar; ac_word=$2
10840+ for ac_prog in ar
10841+ do
10842+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10843+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10845 $as_echo_n "checking for $ac_word... " >&6; }
10846 if ${ac_cv_prog_AR+:} false; then :
10847@@ -7141,7 +7394,7 @@ do
10848 test -z "$as_dir" && as_dir=.
10849 for ac_exec_ext in '' $ac_executable_extensions; do
10850 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10851- ac_cv_prog_AR="${ac_tool_prefix}ar"
10852+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
10853 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10854 break 2
10855 fi
10856@@ -7161,11 +7414,15 @@ $as_echo "no" >&6; }
10857 fi
10858
10859
10860+ test -n "$AR" && break
10861+ done
10862 fi
10863-if test -z "$ac_cv_prog_AR"; then
10864+if test -z "$AR"; then
10865 ac_ct_AR=$AR
10866- # Extract the first word of "ar", so it can be a program name with args.
10867-set dummy ar; ac_word=$2
10868+ for ac_prog in ar
10869+do
10870+ # Extract the first word of "$ac_prog", so it can be a program name with args.
10871+set dummy $ac_prog; ac_word=$2
10872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10873 $as_echo_n "checking for $ac_word... " >&6; }
10874 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10875@@ -7181,7 +7438,7 @@ do
10876 test -z "$as_dir" && as_dir=.
10877 for ac_exec_ext in '' $ac_executable_extensions; do
10878 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10879- ac_cv_prog_ac_ct_AR="ar"
10880+ ac_cv_prog_ac_ct_AR="$ac_prog"
10881 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10882 break 2
10883 fi
10884@@ -7200,6 +7457,10 @@ else
10885 $as_echo "no" >&6; }
10886 fi
10887
10888+
10889+ test -n "$ac_ct_AR" && break
10890+done
10891+
10892 if test "x$ac_ct_AR" = x; then
10893 AR="false"
10894 else
10895@@ -7211,25 +7472,19 @@ ac_tool_warned=yes ;;
10896 esac
10897 AR=$ac_ct_AR
10898 fi
10899-else
10900- AR="$ac_cv_prog_AR"
10901 fi
10902
10903-test -z "$AR" && AR=ar
10904-if test -n "$plugin_option"; then
10905- if $AR --help 2>&1 | grep -q "\--plugin"; then
10906- touch conftest.c
10907- $AR $plugin_option rc conftest.a conftest.c
10908- if test "$?" != 0; then
10909- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10910+ touch conftest.c
10911+ $AR $plugin_option rc conftest.a conftest.c
10912+ if test "$?" != 0; then
10913+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10914 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
10915- else
10916- AR="$AR $plugin_option"
10917- fi
10918- rm -f conftest.*
10919+ else
10920+ AR="$AR $plugin_option"
10921 fi
10922-fi
10923-test -z "$AR_FLAGS" && AR_FLAGS=cru
10924+ rm -f conftest.*
10925+: ${AR=ar}
10926+: ${AR_FLAGS=cru}
10927
10928
10929
10930@@ -7241,6 +7496,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10931
10932
10933
10934+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10935+$as_echo_n "checking for archiver @FILE support... " >&6; }
10936+if ${lt_cv_ar_at_file+:} false; then :
10937+ $as_echo_n "(cached) " >&6
10938+else
10939+ lt_cv_ar_at_file=no
10940+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10941+/* end confdefs.h. */
10942+
10943+int
10944+main ()
10945+{
10946+
10947+ ;
10948+ return 0;
10949+}
10950+_ACEOF
10951+if ac_fn_c_try_compile "$LINENO"; then :
10952+ echo conftest.$ac_objext > conftest.lst
10953+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
10954+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10955+ (eval $lt_ar_try) 2>&5
10956+ ac_status=$?
10957+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10958+ test $ac_status = 0; }
10959+ if test "$ac_status" -eq 0; then
10960+ # Ensure the archiver fails upon bogus file names.
10961+ rm -f conftest.$ac_objext libconftest.a
10962+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10963+ (eval $lt_ar_try) 2>&5
10964+ ac_status=$?
10965+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10966+ test $ac_status = 0; }
10967+ if test "$ac_status" -ne 0; then
10968+ lt_cv_ar_at_file=@
10969+ fi
10970+ fi
10971+ rm -f conftest.* libconftest.a
10972+
10973+fi
10974+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10975+
10976+fi
10977+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
10978+$as_echo "$lt_cv_ar_at_file" >&6; }
10979+
10980+if test "x$lt_cv_ar_at_file" = xno; then
10981+ archiver_list_spec=
10982+else
10983+ archiver_list_spec=$lt_cv_ar_at_file
10984+fi
10985+
10986+
10987+
10988+
10989+
10990+
10991+
10992 if test -n "$ac_tool_prefix"; then
10993 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10994 set dummy ${ac_tool_prefix}strip; ac_word=$2
10995@@ -7580,8 +7893,8 @@ esac
10996 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10997
10998 # Transform an extracted symbol line into symbol name and symbol address
10999-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11000-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'"
11001+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11002+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'"
11003
11004 # Handle CRLF in mingw tool chain
11005 opt_cr=
11006@@ -7617,6 +7930,7 @@ for ac_symprfx in "" "_"; do
11007 else
11008 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11009 fi
11010+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
11011
11012 # Check to see that the pipe works correctly.
11013 pipe_works=no
11014@@ -7658,6 +7972,18 @@ _LT_EOF
11015 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11016 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11017 cat <<_LT_EOF > conftest.$ac_ext
11018+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
11019+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
11020+/* DATA imports from DLLs on WIN32 con't be const, because runtime
11021+ relocations are performed -- see ld's documentation on pseudo-relocs. */
11022+# define LT_DLSYM_CONST
11023+#elif defined(__osf__)
11024+/* This system does not cope well with relocations in const data. */
11025+# define LT_DLSYM_CONST
11026+#else
11027+# define LT_DLSYM_CONST const
11028+#endif
11029+
11030 #ifdef __cplusplus
11031 extern "C" {
11032 #endif
11033@@ -7669,7 +7995,7 @@ _LT_EOF
11034 cat <<_LT_EOF >> conftest.$ac_ext
11035
11036 /* The mapping between symbol names and symbols. */
11037-const struct {
11038+LT_DLSYM_CONST struct {
11039 const char *name;
11040 void *address;
11041 }
11042@@ -7695,8 +8021,8 @@ static const void *lt_preloaded_setup() {
11043 _LT_EOF
11044 # Now try linking the two files.
11045 mv conftest.$ac_objext conftstm.$ac_objext
11046- lt_save_LIBS="$LIBS"
11047- lt_save_CFLAGS="$CFLAGS"
11048+ lt_globsym_save_LIBS=$LIBS
11049+ lt_globsym_save_CFLAGS=$CFLAGS
11050 LIBS="conftstm.$ac_objext"
11051 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11052 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11053@@ -7706,8 +8032,8 @@ _LT_EOF
11054 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11055 pipe_works=yes
11056 fi
11057- LIBS="$lt_save_LIBS"
11058- CFLAGS="$lt_save_CFLAGS"
11059+ LIBS=$lt_globsym_save_LIBS
11060+ CFLAGS=$lt_globsym_save_CFLAGS
11061 else
11062 echo "cannot find nm_test_func in $nlist" >&5
11063 fi
11064@@ -7744,6 +8070,13 @@ else
11065 $as_echo "ok" >&6; }
11066 fi
11067
11068+# Response file support.
11069+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11070+ nm_file_list_spec='@'
11071+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11072+ nm_file_list_spec='@'
11073+fi
11074+
11075
11076
11077
11078@@ -7763,6 +8096,48 @@ fi
11079
11080
11081
11082+
11083+
11084+
11085+
11086+
11087+
11088+
11089+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11090+$as_echo_n "checking for sysroot... " >&6; }
11091+
11092+# Check whether --with-libtool-sysroot was given.
11093+if test "${with_libtool_sysroot+set}" = set; then :
11094+ withval=$with_libtool_sysroot;
11095+else
11096+ with_libtool_sysroot=no
11097+fi
11098+
11099+
11100+lt_sysroot=
11101+case ${with_libtool_sysroot} in #(
11102+ yes)
11103+ if test "$GCC" = yes; then
11104+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11105+ fi
11106+ ;; #(
11107+ /*)
11108+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11109+ ;; #(
11110+ no|'')
11111+ ;; #(
11112+ *)
11113+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11114+$as_echo "${with_libtool_sysroot}" >&6; }
11115+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
11116+ ;;
11117+esac
11118+
11119+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11120+$as_echo "${lt_sysroot:-no}" >&6; }
11121+
11122+
11123+
11124
11125
11126 # Check whether --enable-libtool-lock was given.
11127@@ -7971,6 +8346,123 @@ esac
11128
11129 need_locks="$enable_libtool_lock"
11130
11131+if test -n "$ac_tool_prefix"; then
11132+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11133+set dummy ${ac_tool_prefix}mt; ac_word=$2
11134+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11135+$as_echo_n "checking for $ac_word... " >&6; }
11136+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
11137+ $as_echo_n "(cached) " >&6
11138+else
11139+ if test -n "$MANIFEST_TOOL"; then
11140+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11141+else
11142+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11143+for as_dir in $PATH
11144+do
11145+ IFS=$as_save_IFS
11146+ test -z "$as_dir" && as_dir=.
11147+ for ac_exec_ext in '' $ac_executable_extensions; do
11148+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11149+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11150+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11151+ break 2
11152+ fi
11153+done
11154+ done
11155+IFS=$as_save_IFS
11156+
11157+fi
11158+fi
11159+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11160+if test -n "$MANIFEST_TOOL"; then
11161+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11162+$as_echo "$MANIFEST_TOOL" >&6; }
11163+else
11164+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11165+$as_echo "no" >&6; }
11166+fi
11167+
11168+
11169+fi
11170+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11171+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11172+ # Extract the first word of "mt", so it can be a program name with args.
11173+set dummy mt; ac_word=$2
11174+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11175+$as_echo_n "checking for $ac_word... " >&6; }
11176+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
11177+ $as_echo_n "(cached) " >&6
11178+else
11179+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11180+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11181+else
11182+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11183+for as_dir in $PATH
11184+do
11185+ IFS=$as_save_IFS
11186+ test -z "$as_dir" && as_dir=.
11187+ for ac_exec_ext in '' $ac_executable_extensions; do
11188+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11189+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11190+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11191+ break 2
11192+ fi
11193+done
11194+ done
11195+IFS=$as_save_IFS
11196+
11197+fi
11198+fi
11199+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11200+if test -n "$ac_ct_MANIFEST_TOOL"; then
11201+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11202+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11203+else
11204+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11205+$as_echo "no" >&6; }
11206+fi
11207+
11208+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11209+ MANIFEST_TOOL=":"
11210+ else
11211+ case $cross_compiling:$ac_tool_warned in
11212+yes:)
11213+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11214+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11215+ac_tool_warned=yes ;;
11216+esac
11217+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11218+ fi
11219+else
11220+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11221+fi
11222+
11223+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11224+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11225+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11226+if ${lt_cv_path_mainfest_tool+:} false; then :
11227+ $as_echo_n "(cached) " >&6
11228+else
11229+ lt_cv_path_mainfest_tool=no
11230+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11231+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11232+ cat conftest.err >&5
11233+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11234+ lt_cv_path_mainfest_tool=yes
11235+ fi
11236+ rm -f conftest*
11237+fi
11238+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11239+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11240+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11241+ MANIFEST_TOOL=:
11242+fi
11243+
11244+
11245+
11246+
11247+
11248
11249 case $host_os in
11250 rhapsody* | darwin*)
11251@@ -8534,6 +9026,8 @@ _LT_EOF
11252 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11253 echo "$AR cru libconftest.a conftest.o" >&5
11254 $AR cru libconftest.a conftest.o 2>&5
11255+ echo "$RANLIB libconftest.a" >&5
11256+ $RANLIB libconftest.a 2>&5
11257 cat > conftest.c << _LT_EOF
11258 int main() { return 0;}
11259 _LT_EOF
11260@@ -8604,6 +9098,16 @@ done
11261
11262
11263
11264+func_stripname_cnf ()
11265+{
11266+ case ${2} in
11267+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11268+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11269+ esac
11270+} # func_stripname_cnf
11271+
11272+
11273+
11274
11275
11276 # Set options
11277@@ -9119,8 +9623,6 @@ fi
11278 lt_prog_compiler_pic=
11279 lt_prog_compiler_static=
11280
11281-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11282-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11283
11284 if test "$GCC" = yes; then
11285 lt_prog_compiler_wl='-Wl,'
11286@@ -9286,6 +9788,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11287 lt_prog_compiler_pic='--shared'
11288 lt_prog_compiler_static='--static'
11289 ;;
11290+ nagfor*)
11291+ # NAG Fortran compiler
11292+ lt_prog_compiler_wl='-Wl,-Wl,,'
11293+ lt_prog_compiler_pic='-PIC'
11294+ lt_prog_compiler_static='-Bstatic'
11295+ ;;
11296 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11297 # Portland Group compilers (*not* the Pentium gcc compiler,
11298 # which looks to be a dead project)
11299@@ -9348,7 +9856,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11300 lt_prog_compiler_pic='-KPIC'
11301 lt_prog_compiler_static='-Bstatic'
11302 case $cc_basename in
11303- f77* | f90* | f95*)
11304+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11305 lt_prog_compiler_wl='-Qoption ld ';;
11306 *)
11307 lt_prog_compiler_wl='-Wl,';;
11308@@ -9405,13 +9913,17 @@ case $host_os in
11309 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11310 ;;
11311 esac
11312-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11313-$as_echo "$lt_prog_compiler_pic" >&6; }
11314-
11315-
11316-
11317-
11318
11319+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11320+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11321+if ${lt_cv_prog_compiler_pic+:} false; then :
11322+ $as_echo_n "(cached) " >&6
11323+else
11324+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11325+fi
11326+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11327+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11328+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11329
11330 #
11331 # Check to make sure the PIC flag actually works.
11332@@ -9472,6 +9984,11 @@ fi
11333
11334
11335
11336+
11337+
11338+
11339+
11340+
11341 #
11342 # Check to make sure the static flag actually works.
11343 #
11344@@ -9822,7 +10339,8 @@ _LT_EOF
11345 allow_undefined_flag=unsupported
11346 always_export_symbols=no
11347 enable_shared_with_static_runtimes=yes
11348- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11349+ 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'
11350+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11351
11352 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11353 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11354@@ -9921,12 +10439,12 @@ _LT_EOF
11355 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11356 hardcode_libdir_flag_spec=
11357 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11358- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11359+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11360 if test "x$supports_anon_versioning" = xyes; then
11361 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11362 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11363 echo "local: *; };" >> $output_objdir/$libname.ver~
11364- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11365+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11366 fi
11367 ;;
11368 esac
11369@@ -9940,8 +10458,8 @@ _LT_EOF
11370 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11371 wlarc=
11372 else
11373- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11374- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11375+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11376+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11377 fi
11378 ;;
11379
11380@@ -9959,8 +10477,8 @@ _LT_EOF
11381
11382 _LT_EOF
11383 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11384- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11385- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11386+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11387+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11388 else
11389 ld_shlibs=no
11390 fi
11391@@ -10006,8 +10524,8 @@ _LT_EOF
11392
11393 *)
11394 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11395- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11396- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11397+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11398+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11399 else
11400 ld_shlibs=no
11401 fi
11402@@ -10137,7 +10655,13 @@ _LT_EOF
11403 allow_undefined_flag='-berok'
11404 # Determine the default libpath from the value encoded in an
11405 # empty executable.
11406- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11407+ if test "${lt_cv_aix_libpath+set}" = set; then
11408+ aix_libpath=$lt_cv_aix_libpath
11409+else
11410+ if ${lt_cv_aix_libpath_+:} false; then :
11411+ $as_echo_n "(cached) " >&6
11412+else
11413+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11414 /* end confdefs.h. */
11415
11416 int
11417@@ -10150,22 +10674,29 @@ main ()
11418 _ACEOF
11419 if ac_fn_c_try_link "$LINENO"; then :
11420
11421-lt_aix_libpath_sed='
11422- /Import File Strings/,/^$/ {
11423- /^0/ {
11424- s/^0 *\(.*\)$/\1/
11425- p
11426- }
11427- }'
11428-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11429-# Check for a 64-bit object if we didn't find anything.
11430-if test -z "$aix_libpath"; then
11431- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11432-fi
11433+ lt_aix_libpath_sed='
11434+ /Import File Strings/,/^$/ {
11435+ /^0/ {
11436+ s/^0 *\([^ ]*\) *$/\1/
11437+ p
11438+ }
11439+ }'
11440+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11441+ # Check for a 64-bit object if we didn't find anything.
11442+ if test -z "$lt_cv_aix_libpath_"; then
11443+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11444+ fi
11445 fi
11446 rm -f core conftest.err conftest.$ac_objext \
11447 conftest$ac_exeext conftest.$ac_ext
11448-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11449+ if test -z "$lt_cv_aix_libpath_"; then
11450+ lt_cv_aix_libpath_="/usr/lib:/lib"
11451+ fi
11452+
11453+fi
11454+
11455+ aix_libpath=$lt_cv_aix_libpath_
11456+fi
11457
11458 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11459 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"
11460@@ -10177,7 +10708,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11461 else
11462 # Determine the default libpath from the value encoded in an
11463 # empty executable.
11464- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11465+ if test "${lt_cv_aix_libpath+set}" = set; then
11466+ aix_libpath=$lt_cv_aix_libpath
11467+else
11468+ if ${lt_cv_aix_libpath_+:} false; then :
11469+ $as_echo_n "(cached) " >&6
11470+else
11471+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11472 /* end confdefs.h. */
11473
11474 int
11475@@ -10190,22 +10727,29 @@ main ()
11476 _ACEOF
11477 if ac_fn_c_try_link "$LINENO"; then :
11478
11479-lt_aix_libpath_sed='
11480- /Import File Strings/,/^$/ {
11481- /^0/ {
11482- s/^0 *\(.*\)$/\1/
11483- p
11484- }
11485- }'
11486-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11487-# Check for a 64-bit object if we didn't find anything.
11488-if test -z "$aix_libpath"; then
11489- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11490-fi
11491+ lt_aix_libpath_sed='
11492+ /Import File Strings/,/^$/ {
11493+ /^0/ {
11494+ s/^0 *\([^ ]*\) *$/\1/
11495+ p
11496+ }
11497+ }'
11498+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11499+ # Check for a 64-bit object if we didn't find anything.
11500+ if test -z "$lt_cv_aix_libpath_"; then
11501+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11502+ fi
11503 fi
11504 rm -f core conftest.err conftest.$ac_objext \
11505 conftest$ac_exeext conftest.$ac_ext
11506-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11507+ if test -z "$lt_cv_aix_libpath_"; then
11508+ lt_cv_aix_libpath_="/usr/lib:/lib"
11509+ fi
11510+
11511+fi
11512+
11513+ aix_libpath=$lt_cv_aix_libpath_
11514+fi
11515
11516 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11517 # Warning - without using the other run time loading flags,
11518@@ -10250,20 +10794,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11519 # Microsoft Visual C++.
11520 # hardcode_libdir_flag_spec is actually meaningless, as there is
11521 # no search path for DLLs.
11522- hardcode_libdir_flag_spec=' '
11523- allow_undefined_flag=unsupported
11524- # Tell ltmain to make .lib files, not .a files.
11525- libext=lib
11526- # Tell ltmain to make .dll files, not .so files.
11527- shrext_cmds=".dll"
11528- # FIXME: Setting linknames here is a bad hack.
11529- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11530- # The linker will automatically build a .lib file if we build a DLL.
11531- old_archive_from_new_cmds='true'
11532- # FIXME: Should let the user specify the lib program.
11533- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11534- fix_srcfile_path='`cygpath -w "$srcfile"`'
11535- enable_shared_with_static_runtimes=yes
11536+ case $cc_basename in
11537+ cl*)
11538+ # Native MSVC
11539+ hardcode_libdir_flag_spec=' '
11540+ allow_undefined_flag=unsupported
11541+ always_export_symbols=yes
11542+ file_list_spec='@'
11543+ # Tell ltmain to make .lib files, not .a files.
11544+ libext=lib
11545+ # Tell ltmain to make .dll files, not .so files.
11546+ shrext_cmds=".dll"
11547+ # FIXME: Setting linknames here is a bad hack.
11548+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11549+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11550+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11551+ else
11552+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11553+ fi~
11554+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11555+ linknames='
11556+ # The linker will not automatically build a static lib if we build a DLL.
11557+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
11558+ enable_shared_with_static_runtimes=yes
11559+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11560+ # Don't use ranlib
11561+ old_postinstall_cmds='chmod 644 $oldlib'
11562+ postlink_cmds='lt_outputfile="@OUTPUT@"~
11563+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11564+ case $lt_outputfile in
11565+ *.exe|*.EXE) ;;
11566+ *)
11567+ lt_outputfile="$lt_outputfile.exe"
11568+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11569+ ;;
11570+ esac~
11571+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11572+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11573+ $RM "$lt_outputfile.manifest";
11574+ fi'
11575+ ;;
11576+ *)
11577+ # Assume MSVC wrapper
11578+ hardcode_libdir_flag_spec=' '
11579+ allow_undefined_flag=unsupported
11580+ # Tell ltmain to make .lib files, not .a files.
11581+ libext=lib
11582+ # Tell ltmain to make .dll files, not .so files.
11583+ shrext_cmds=".dll"
11584+ # FIXME: Setting linknames here is a bad hack.
11585+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11586+ # The linker will automatically build a .lib file if we build a DLL.
11587+ old_archive_from_new_cmds='true'
11588+ # FIXME: Should let the user specify the lib program.
11589+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11590+ enable_shared_with_static_runtimes=yes
11591+ ;;
11592+ esac
11593 ;;
11594
11595 darwin* | rhapsody*)
11596@@ -10324,7 +10911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11597
11598 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11599 freebsd* | dragonfly*)
11600- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11601+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11602 hardcode_libdir_flag_spec='-R$libdir'
11603 hardcode_direct=yes
11604 hardcode_shlibpath_var=no
11605@@ -10332,7 +10919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11606
11607 hpux9*)
11608 if test "$GCC" = yes; then
11609- 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'
11610+ 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'
11611 else
11612 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'
11613 fi
11614@@ -10348,7 +10935,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11615
11616 hpux10*)
11617 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11618- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11619+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11620 else
11621 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11622 fi
11623@@ -10372,10 +10959,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11624 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11625 ;;
11626 ia64*)
11627- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11628+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11629 ;;
11630 *)
11631- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11632+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11633 ;;
11634 esac
11635 else
11636@@ -10454,23 +11041,36 @@ fi
11637
11638 irix5* | irix6* | nonstopux*)
11639 if test "$GCC" = yes; then
11640- 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'
11641+ 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'
11642 # Try to use the -exported_symbol ld option, if it does not
11643 # work, assume that -exports_file does not work either and
11644 # implicitly export all symbols.
11645- save_LDFLAGS="$LDFLAGS"
11646- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11647- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11648+ # This should be the same for all languages, so no per-tag cache variable.
11649+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
11650+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
11651+if ${lt_cv_irix_exported_symbol+:} false; then :
11652+ $as_echo_n "(cached) " >&6
11653+else
11654+ save_LDFLAGS="$LDFLAGS"
11655+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11656+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11657 /* end confdefs.h. */
11658-int foo(void) {}
11659+int foo (void) { return 0; }
11660 _ACEOF
11661 if ac_fn_c_try_link "$LINENO"; then :
11662- 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'
11663-
11664+ lt_cv_irix_exported_symbol=yes
11665+else
11666+ lt_cv_irix_exported_symbol=no
11667 fi
11668 rm -f core conftest.err conftest.$ac_objext \
11669 conftest$ac_exeext conftest.$ac_ext
11670- LDFLAGS="$save_LDFLAGS"
11671+ LDFLAGS="$save_LDFLAGS"
11672+fi
11673+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
11674+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
11675+ if test "$lt_cv_irix_exported_symbol" = yes; then
11676+ 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'
11677+ fi
11678 else
11679 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'
11680 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'
11681@@ -10555,7 +11155,7 @@ rm -f core conftest.err conftest.$ac_objext \
11682 osf4* | osf5*) # as osf3* with the addition of -msym flag
11683 if test "$GCC" = yes; then
11684 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
11685- 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'
11686+ 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'
11687 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11688 else
11689 allow_undefined_flag=' -expect_unresolved \*'
11690@@ -10574,9 +11174,9 @@ rm -f core conftest.err conftest.$ac_objext \
11691 no_undefined_flag=' -z defs'
11692 if test "$GCC" = yes; then
11693 wlarc='${wl}'
11694- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11695+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11696 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11697- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11698+ $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'
11699 else
11700 case `$CC -V 2>&1` in
11701 *"Compilers 5.0"*)
11702@@ -11152,8 +11752,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11703 need_version=no
11704 need_lib_prefix=no
11705
11706- case $GCC,$host_os in
11707- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
11708+ case $GCC,$cc_basename in
11709+ yes,*)
11710+ # gcc
11711 library_names_spec='$libname.dll.a'
11712 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11713 postinstall_cmds='base_file=`basename \${file}`~
11714@@ -11186,13 +11787,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11715 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11716 ;;
11717 esac
11718+ dynamic_linker='Win32 ld.exe'
11719+ ;;
11720+
11721+ *,cl*)
11722+ # Native MSVC
11723+ libname_spec='$name'
11724+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11725+ library_names_spec='${libname}.dll.lib'
11726+
11727+ case $build_os in
11728+ mingw*)
11729+ sys_lib_search_path_spec=
11730+ lt_save_ifs=$IFS
11731+ IFS=';'
11732+ for lt_path in $LIB
11733+ do
11734+ IFS=$lt_save_ifs
11735+ # Let DOS variable expansion print the short 8.3 style file name.
11736+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
11737+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
11738+ done
11739+ IFS=$lt_save_ifs
11740+ # Convert to MSYS style.
11741+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
11742+ ;;
11743+ cygwin*)
11744+ # Convert to unix form, then to dos form, then back to unix form
11745+ # but this time dos style (no spaces!) so that the unix form looks
11746+ # like /cygdrive/c/PROGRA~1:/cygdr...
11747+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
11748+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
11749+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11750+ ;;
11751+ *)
11752+ sys_lib_search_path_spec="$LIB"
11753+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
11754+ # It is most probably a Windows format PATH.
11755+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
11756+ else
11757+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11758+ fi
11759+ # FIXME: find the short name or the path components, as spaces are
11760+ # common. (e.g. "Program Files" -> "PROGRA~1")
11761+ ;;
11762+ esac
11763+
11764+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
11765+ postinstall_cmds='base_file=`basename \${file}`~
11766+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
11767+ dldir=$destdir/`dirname \$dlpath`~
11768+ test -d \$dldir || mkdir -p \$dldir~
11769+ $install_prog $dir/$dlname \$dldir/$dlname'
11770+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
11771+ dlpath=$dir/\$dldll~
11772+ $RM \$dlpath'
11773+ shlibpath_overrides_runpath=yes
11774+ dynamic_linker='Win32 link.exe'
11775 ;;
11776
11777 *)
11778+ # Assume MSVC wrapper
11779 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
11780+ dynamic_linker='Win32 ld.exe'
11781 ;;
11782 esac
11783- dynamic_linker='Win32 ld.exe'
11784 # FIXME: first we should search . and the directory the executable is in
11785 shlibpath_var=PATH
11786 ;;
11787@@ -12094,7 +12753,7 @@ else
11788 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11789 lt_status=$lt_dlunknown
11790 cat > conftest.$ac_ext <<_LT_EOF
11791-#line 12097 "configure"
11792+#line $LINENO "configure"
11793 #include "confdefs.h"
11794
11795 #if HAVE_DLFCN_H
11796@@ -12138,10 +12797,10 @@ else
11797 /* When -fvisbility=hidden is used, assume the code has been annotated
11798 correspondingly for the symbols needed. */
11799 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11800-void fnord () __attribute__((visibility("default")));
11801+int fnord () __attribute__((visibility("default")));
11802 #endif
11803
11804-void fnord () { int i=42; }
11805+int fnord () { return 42; }
11806 int main ()
11807 {
11808 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11809@@ -12200,7 +12859,7 @@ else
11810 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11811 lt_status=$lt_dlunknown
11812 cat > conftest.$ac_ext <<_LT_EOF
11813-#line 12203 "configure"
11814+#line $LINENO "configure"
11815 #include "confdefs.h"
11816
11817 #if HAVE_DLFCN_H
11818@@ -12244,10 +12903,10 @@ else
11819 /* When -fvisbility=hidden is used, assume the code has been annotated
11820 correspondingly for the symbols needed. */
11821 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11822-void fnord () __attribute__((visibility("default")));
11823+int fnord () __attribute__((visibility("default")));
11824 #endif
11825
11826-void fnord () { int i=42; }
11827+int fnord () { return 42; }
11828 int main ()
11829 {
11830 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11831@@ -12639,6 +13298,7 @@ $RM -r conftest*
11832
11833 # Allow CC to be a program name with arguments.
11834 lt_save_CC=$CC
11835+ lt_save_CFLAGS=$CFLAGS
11836 lt_save_LD=$LD
11837 lt_save_GCC=$GCC
11838 GCC=$GXX
11839@@ -12656,6 +13316,7 @@ $RM -r conftest*
11840 fi
11841 test -z "${LDCXX+set}" || LD=$LDCXX
11842 CC=${CXX-"c++"}
11843+ CFLAGS=$CXXFLAGS
11844 compiler=$CC
11845 compiler_CXX=$CC
11846 for cc_temp in $compiler""; do
11847@@ -12938,7 +13599,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
11848 allow_undefined_flag_CXX='-berok'
11849 # Determine the default libpath from the value encoded in an empty
11850 # executable.
11851- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11852+ if test "${lt_cv_aix_libpath+set}" = set; then
11853+ aix_libpath=$lt_cv_aix_libpath
11854+else
11855+ if ${lt_cv_aix_libpath__CXX+:} false; then :
11856+ $as_echo_n "(cached) " >&6
11857+else
11858+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11859 /* end confdefs.h. */
11860
11861 int
11862@@ -12951,22 +13618,29 @@ main ()
11863 _ACEOF
11864 if ac_fn_cxx_try_link "$LINENO"; then :
11865
11866-lt_aix_libpath_sed='
11867- /Import File Strings/,/^$/ {
11868- /^0/ {
11869- s/^0 *\(.*\)$/\1/
11870- p
11871- }
11872- }'
11873-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11874-# Check for a 64-bit object if we didn't find anything.
11875-if test -z "$aix_libpath"; then
11876- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11877-fi
11878+ lt_aix_libpath_sed='
11879+ /Import File Strings/,/^$/ {
11880+ /^0/ {
11881+ s/^0 *\([^ ]*\) *$/\1/
11882+ p
11883+ }
11884+ }'
11885+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11886+ # Check for a 64-bit object if we didn't find anything.
11887+ if test -z "$lt_cv_aix_libpath__CXX"; then
11888+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11889+ fi
11890 fi
11891 rm -f core conftest.err conftest.$ac_objext \
11892 conftest$ac_exeext conftest.$ac_ext
11893-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11894+ if test -z "$lt_cv_aix_libpath__CXX"; then
11895+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
11896+ fi
11897+
11898+fi
11899+
11900+ aix_libpath=$lt_cv_aix_libpath__CXX
11901+fi
11902
11903 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11904
11905@@ -12979,7 +13653,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11906 else
11907 # Determine the default libpath from the value encoded in an
11908 # empty executable.
11909- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11910+ if test "${lt_cv_aix_libpath+set}" = set; then
11911+ aix_libpath=$lt_cv_aix_libpath
11912+else
11913+ if ${lt_cv_aix_libpath__CXX+:} false; then :
11914+ $as_echo_n "(cached) " >&6
11915+else
11916+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11917 /* end confdefs.h. */
11918
11919 int
11920@@ -12992,22 +13672,29 @@ main ()
11921 _ACEOF
11922 if ac_fn_cxx_try_link "$LINENO"; then :
11923
11924-lt_aix_libpath_sed='
11925- /Import File Strings/,/^$/ {
11926- /^0/ {
11927- s/^0 *\(.*\)$/\1/
11928- p
11929- }
11930- }'
11931-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11932-# Check for a 64-bit object if we didn't find anything.
11933-if test -z "$aix_libpath"; then
11934- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11935-fi
11936+ lt_aix_libpath_sed='
11937+ /Import File Strings/,/^$/ {
11938+ /^0/ {
11939+ s/^0 *\([^ ]*\) *$/\1/
11940+ p
11941+ }
11942+ }'
11943+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11944+ # Check for a 64-bit object if we didn't find anything.
11945+ if test -z "$lt_cv_aix_libpath__CXX"; then
11946+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11947+ fi
11948 fi
11949 rm -f core conftest.err conftest.$ac_objext \
11950 conftest$ac_exeext conftest.$ac_ext
11951-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11952+ if test -z "$lt_cv_aix_libpath__CXX"; then
11953+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
11954+ fi
11955+
11956+fi
11957+
11958+ aix_libpath=$lt_cv_aix_libpath__CXX
11959+fi
11960
11961 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11962 # Warning - without using the other run time loading flags,
11963@@ -13050,29 +13737,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11964 ;;
11965
11966 cygwin* | mingw* | pw32* | cegcc*)
11967- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
11968- # as there is no search path for DLLs.
11969- hardcode_libdir_flag_spec_CXX='-L$libdir'
11970- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
11971- allow_undefined_flag_CXX=unsupported
11972- always_export_symbols_CXX=no
11973- enable_shared_with_static_runtimes_CXX=yes
11974-
11975- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11976- 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'
11977- # If the export-symbols file already is a .def file (1st line
11978- # is EXPORTS), use it as is; otherwise, prepend...
11979- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11980- cp $export_symbols $output_objdir/$soname.def;
11981- else
11982- echo EXPORTS > $output_objdir/$soname.def;
11983- cat $export_symbols >> $output_objdir/$soname.def;
11984- fi~
11985- $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'
11986- else
11987- ld_shlibs_CXX=no
11988- fi
11989- ;;
11990+ case $GXX,$cc_basename in
11991+ ,cl* | no,cl*)
11992+ # Native MSVC
11993+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11994+ # no search path for DLLs.
11995+ hardcode_libdir_flag_spec_CXX=' '
11996+ allow_undefined_flag_CXX=unsupported
11997+ always_export_symbols_CXX=yes
11998+ file_list_spec_CXX='@'
11999+ # Tell ltmain to make .lib files, not .a files.
12000+ libext=lib
12001+ # Tell ltmain to make .dll files, not .so files.
12002+ shrext_cmds=".dll"
12003+ # FIXME: Setting linknames here is a bad hack.
12004+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12005+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12006+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12007+ else
12008+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12009+ fi~
12010+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12011+ linknames='
12012+ # The linker will not automatically build a static lib if we build a DLL.
12013+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
12014+ enable_shared_with_static_runtimes_CXX=yes
12015+ # Don't use ranlib
12016+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
12017+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
12018+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12019+ case $lt_outputfile in
12020+ *.exe|*.EXE) ;;
12021+ *)
12022+ lt_outputfile="$lt_outputfile.exe"
12023+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12024+ ;;
12025+ esac~
12026+ func_to_tool_file "$lt_outputfile"~
12027+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12028+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12029+ $RM "$lt_outputfile.manifest";
12030+ fi'
12031+ ;;
12032+ *)
12033+ # g++
12034+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
12035+ # as there is no search path for DLLs.
12036+ hardcode_libdir_flag_spec_CXX='-L$libdir'
12037+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
12038+ allow_undefined_flag_CXX=unsupported
12039+ always_export_symbols_CXX=no
12040+ enable_shared_with_static_runtimes_CXX=yes
12041+
12042+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
12043+ 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'
12044+ # If the export-symbols file already is a .def file (1st line
12045+ # is EXPORTS), use it as is; otherwise, prepend...
12046+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12047+ cp $export_symbols $output_objdir/$soname.def;
12048+ else
12049+ echo EXPORTS > $output_objdir/$soname.def;
12050+ cat $export_symbols >> $output_objdir/$soname.def;
12051+ fi~
12052+ $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'
12053+ else
12054+ ld_shlibs_CXX=no
12055+ fi
12056+ ;;
12057+ esac
12058+ ;;
12059 darwin* | rhapsody*)
12060
12061
12062@@ -13178,7 +13911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12063 ;;
12064 *)
12065 if test "$GXX" = yes; then
12066- 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'
12067+ 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'
12068 else
12069 # FIXME: insert proper C++ library support
12070 ld_shlibs_CXX=no
12071@@ -13249,10 +13982,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12072 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12073 ;;
12074 ia64*)
12075- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12076+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12077 ;;
12078 *)
12079- 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'
12080+ 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'
12081 ;;
12082 esac
12083 fi
12084@@ -13293,9 +14026,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12085 *)
12086 if test "$GXX" = yes; then
12087 if test "$with_gnu_ld" = no; then
12088- 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'
12089+ 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'
12090 else
12091- 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'
12092+ 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'
12093 fi
12094 fi
12095 link_all_deplibs_CXX=yes
12096@@ -13573,7 +14306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12097 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'
12098 ;;
12099 *)
12100- 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'
12101+ 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'
12102 ;;
12103 esac
12104
12105@@ -13619,7 +14352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12106
12107 solaris*)
12108 case $cc_basename in
12109- CC*)
12110+ CC* | sunCC*)
12111 # Sun C++ 4.2, 5.x and Centerline C++
12112 archive_cmds_need_lc_CXX=yes
12113 no_undefined_flag_CXX=' -zdefs'
12114@@ -13660,9 +14393,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12115 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
12116 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
12117 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
12118- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
12119+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
12120 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12121- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
12122+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
12123
12124 # Commands to make compiler produce verbose output that lists
12125 # what "hidden" libraries, object files and flags are used when
12126@@ -13798,6 +14531,13 @@ private:
12127 };
12128 _LT_EOF
12129
12130+
12131+_lt_libdeps_save_CFLAGS=$CFLAGS
12132+case "$CC $CFLAGS " in #(
12133+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
12134+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
12135+esac
12136+
12137 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12138 (eval $ac_compile) 2>&5
12139 ac_status=$?
12140@@ -13811,7 +14551,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12141 pre_test_object_deps_done=no
12142
12143 for p in `eval "$output_verbose_link_cmd"`; do
12144- case $p in
12145+ case ${prev}${p} in
12146
12147 -L* | -R* | -l*)
12148 # Some compilers place space between "-{L,R}" and the path.
12149@@ -13820,13 +14560,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12150 test $p = "-R"; then
12151 prev=$p
12152 continue
12153- else
12154- prev=
12155 fi
12156
12157+ # Expand the sysroot to ease extracting the directories later.
12158+ if test -z "$prev"; then
12159+ case $p in
12160+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
12161+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
12162+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
12163+ esac
12164+ fi
12165+ case $p in
12166+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
12167+ esac
12168 if test "$pre_test_object_deps_done" = no; then
12169- case $p in
12170- -L* | -R*)
12171+ case ${prev} in
12172+ -L | -R)
12173 # Internal compiler library paths should come after those
12174 # provided the user. The postdeps already come after the
12175 # user supplied libs so there is no need to process them.
12176@@ -13846,8 +14595,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12177 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
12178 fi
12179 fi
12180+ prev=
12181 ;;
12182
12183+ *.lto.$objext) ;; # Ignore GCC LTO objects
12184 *.$objext)
12185 # This assumes that the test object file only shows up
12186 # once in the compiler output.
12187@@ -13883,6 +14634,7 @@ else
12188 fi
12189
12190 $RM -f confest.$objext
12191+CFLAGS=$_lt_libdeps_save_CFLAGS
12192
12193 # PORTME: override above test on systems where it is broken
12194 case $host_os in
12195@@ -13918,7 +14670,7 @@ linux*)
12196
12197 solaris*)
12198 case $cc_basename in
12199- CC*)
12200+ CC* | sunCC*)
12201 # The more standards-conforming stlport4 library is
12202 # incompatible with the Cstd library. Avoid specifying
12203 # it if it's in CXXFLAGS. Ignore libCrun as
12204@@ -13983,8 +14735,6 @@ fi
12205 lt_prog_compiler_pic_CXX=
12206 lt_prog_compiler_static_CXX=
12207
12208-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
12209-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12210
12211 # C++ specific cases for pic, static, wl, etc.
12212 if test "$GXX" = yes; then
12213@@ -14089,6 +14839,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12214 ;;
12215 esac
12216 ;;
12217+ mingw* | cygwin* | os2* | pw32* | cegcc*)
12218+ # This hack is so that the source file can tell whether it is being
12219+ # built for inclusion in a dll (and should export symbols for example).
12220+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
12221+ ;;
12222 dgux*)
12223 case $cc_basename in
12224 ec++*)
12225@@ -14241,7 +14996,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12226 ;;
12227 solaris*)
12228 case $cc_basename in
12229- CC*)
12230+ CC* | sunCC*)
12231 # Sun C++ 4.2, 5.x and Centerline C++
12232 lt_prog_compiler_pic_CXX='-KPIC'
12233 lt_prog_compiler_static_CXX='-Bstatic'
12234@@ -14306,10 +15061,17 @@ case $host_os in
12235 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
12236 ;;
12237 esac
12238-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
12239-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
12240-
12241
12242+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
12243+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12244+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
12245+ $as_echo_n "(cached) " >&6
12246+else
12247+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
12248+fi
12249+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
12250+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
12251+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
12252
12253 #
12254 # Check to make sure the PIC flag actually works.
12255@@ -14367,6 +15129,8 @@ fi
12256
12257
12258
12259+
12260+
12261 #
12262 # Check to make sure the static flag actually works.
12263 #
12264@@ -14544,6 +15308,7 @@ fi
12265 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
12266
12267 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
12268+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
12269 case $host_os in
12270 aix[4-9]*)
12271 # If we're using GNU nm, then we don't want the "-C" option.
12272@@ -14558,15 +15323,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
12273 ;;
12274 pw32*)
12275 export_symbols_cmds_CXX="$ltdll_cmds"
12276- ;;
12277+ ;;
12278 cygwin* | mingw* | cegcc*)
12279- 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'
12280- ;;
12281+ case $cc_basename in
12282+ cl*) ;;
12283+ *)
12284+ 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'
12285+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
12286+ ;;
12287+ esac
12288+ ;;
12289 *)
12290 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
12291- ;;
12292+ ;;
12293 esac
12294- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
12295
12296 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
12297 $as_echo "$ld_shlibs_CXX" >&6; }
12298@@ -14829,8 +15599,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12299 need_version=no
12300 need_lib_prefix=no
12301
12302- case $GCC,$host_os in
12303- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12304+ case $GCC,$cc_basename in
12305+ yes,*)
12306+ # gcc
12307 library_names_spec='$libname.dll.a'
12308 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12309 postinstall_cmds='base_file=`basename \${file}`~
12310@@ -14862,13 +15633,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12311 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12312 ;;
12313 esac
12314+ dynamic_linker='Win32 ld.exe'
12315+ ;;
12316+
12317+ *,cl*)
12318+ # Native MSVC
12319+ libname_spec='$name'
12320+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12321+ library_names_spec='${libname}.dll.lib'
12322+
12323+ case $build_os in
12324+ mingw*)
12325+ sys_lib_search_path_spec=
12326+ lt_save_ifs=$IFS
12327+ IFS=';'
12328+ for lt_path in $LIB
12329+ do
12330+ IFS=$lt_save_ifs
12331+ # Let DOS variable expansion print the short 8.3 style file name.
12332+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12333+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12334+ done
12335+ IFS=$lt_save_ifs
12336+ # Convert to MSYS style.
12337+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12338+ ;;
12339+ cygwin*)
12340+ # Convert to unix form, then to dos form, then back to unix form
12341+ # but this time dos style (no spaces!) so that the unix form looks
12342+ # like /cygdrive/c/PROGRA~1:/cygdr...
12343+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12344+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12345+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12346+ ;;
12347+ *)
12348+ sys_lib_search_path_spec="$LIB"
12349+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12350+ # It is most probably a Windows format PATH.
12351+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12352+ else
12353+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12354+ fi
12355+ # FIXME: find the short name or the path components, as spaces are
12356+ # common. (e.g. "Program Files" -> "PROGRA~1")
12357+ ;;
12358+ esac
12359+
12360+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12361+ postinstall_cmds='base_file=`basename \${file}`~
12362+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12363+ dldir=$destdir/`dirname \$dlpath`~
12364+ test -d \$dldir || mkdir -p \$dldir~
12365+ $install_prog $dir/$dlname \$dldir/$dlname'
12366+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12367+ dlpath=$dir/\$dldll~
12368+ $RM \$dlpath'
12369+ shlibpath_overrides_runpath=yes
12370+ dynamic_linker='Win32 link.exe'
12371 ;;
12372
12373 *)
12374+ # Assume MSVC wrapper
12375 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12376+ dynamic_linker='Win32 ld.exe'
12377 ;;
12378 esac
12379- dynamic_linker='Win32 ld.exe'
12380 # FIXME: first we should search . and the directory the executable is in
12381 shlibpath_var=PATH
12382 ;;
12383@@ -15432,6 +16261,7 @@ fi
12384 fi # test -n "$compiler"
12385
12386 CC=$lt_save_CC
12387+ CFLAGS=$lt_save_CFLAGS
12388 LDCXX=$LD
12389 LD=$lt_save_LD
12390 GCC=$lt_save_GCC
12391@@ -16359,13 +17189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
12392 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12393 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12394 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
12395+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
12396+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
12397 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
12398 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
12399 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
12400 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
12401 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
12402+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
12403+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
12404+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
12405+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
12406 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
12407 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
12408+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
12409 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12410 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12411 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12412@@ -16380,14 +17217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
12413 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12414 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12415 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"`'
12416+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
12417+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
12418 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
12419 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
12420 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
12421-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12422 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
12423+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12424 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
12425 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
12426 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
12427+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
12428 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12429 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12430 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12431@@ -16420,12 +17260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
12432 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12433 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12434 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
12435-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
12436 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
12437 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
12438 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
12439 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
12440 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
12441+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
12442 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12443 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12444 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12445@@ -16464,8 +17304,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
12446 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
12447 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
12448 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
12449-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
12450 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
12451+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
12452 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
12453 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
12454 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
12455@@ -16492,12 +17332,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
12456 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
12457 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
12458 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
12459-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
12460 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
12461 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12462 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12463 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12464 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12465+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12466 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
12467 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
12468 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
12469@@ -16535,8 +17375,13 @@ reload_flag \
12470 OBJDUMP \
12471 deplibs_check_method \
12472 file_magic_cmd \
12473+file_magic_glob \
12474+want_nocaseglob \
12475+DLLTOOL \
12476+sharedlib_from_linklib_cmd \
12477 AR \
12478 AR_FLAGS \
12479+archiver_list_spec \
12480 STRIP \
12481 RANLIB \
12482 CC \
12483@@ -16546,12 +17391,14 @@ lt_cv_sys_global_symbol_pipe \
12484 lt_cv_sys_global_symbol_to_cdecl \
12485 lt_cv_sys_global_symbol_to_c_name_address \
12486 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
12487+nm_file_list_spec \
12488 lt_prog_compiler_no_builtin_flag \
12489-lt_prog_compiler_wl \
12490 lt_prog_compiler_pic \
12491+lt_prog_compiler_wl \
12492 lt_prog_compiler_static \
12493 lt_cv_prog_compiler_c_o \
12494 need_locks \
12495+MANIFEST_TOOL \
12496 DSYMUTIL \
12497 NMEDIT \
12498 LIPO \
12499@@ -16567,7 +17414,6 @@ no_undefined_flag \
12500 hardcode_libdir_flag_spec \
12501 hardcode_libdir_flag_spec_ld \
12502 hardcode_libdir_separator \
12503-fix_srcfile_path \
12504 exclude_expsyms \
12505 include_expsyms \
12506 file_list_spec \
12507@@ -16589,8 +17435,8 @@ LD_CXX \
12508 reload_flag_CXX \
12509 compiler_CXX \
12510 lt_prog_compiler_no_builtin_flag_CXX \
12511-lt_prog_compiler_wl_CXX \
12512 lt_prog_compiler_pic_CXX \
12513+lt_prog_compiler_wl_CXX \
12514 lt_prog_compiler_static_CXX \
12515 lt_cv_prog_compiler_c_o_CXX \
12516 export_dynamic_flag_spec_CXX \
12517@@ -16602,7 +17448,6 @@ no_undefined_flag_CXX \
12518 hardcode_libdir_flag_spec_CXX \
12519 hardcode_libdir_flag_spec_ld_CXX \
12520 hardcode_libdir_separator_CXX \
12521-fix_srcfile_path_CXX \
12522 exclude_expsyms_CXX \
12523 include_expsyms_CXX \
12524 file_list_spec_CXX \
12525@@ -16636,6 +17481,7 @@ module_cmds \
12526 module_expsym_cmds \
12527 export_symbols_cmds \
12528 prelink_cmds \
12529+postlink_cmds \
12530 postinstall_cmds \
12531 postuninstall_cmds \
12532 finish_cmds \
12533@@ -16650,7 +17496,8 @@ archive_expsym_cmds_CXX \
12534 module_cmds_CXX \
12535 module_expsym_cmds_CXX \
12536 export_symbols_cmds_CXX \
12537-prelink_cmds_CXX; do
12538+prelink_cmds_CXX \
12539+postlink_cmds_CXX; do
12540 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
12541 *[\\\\\\\`\\"\\\$]*)
12542 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
12543@@ -17404,7 +18251,8 @@ $as_echo X"$file" |
12544 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12545 #
12546 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12547-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12548+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12549+# Inc.
12550 # Written by Gordon Matzigkeit, 1996
12551 #
12552 # This file is part of GNU Libtool.
12553@@ -17507,19 +18355,42 @@ SP2NL=$lt_lt_SP2NL
12554 # turn newlines into spaces.
12555 NL2SP=$lt_lt_NL2SP
12556
12557+# convert \$build file names to \$host format.
12558+to_host_file_cmd=$lt_cv_to_host_file_cmd
12559+
12560+# convert \$build files to toolchain format.
12561+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12562+
12563 # An object symbol dumper.
12564 OBJDUMP=$lt_OBJDUMP
12565
12566 # Method to check whether dependent libraries are shared objects.
12567 deplibs_check_method=$lt_deplibs_check_method
12568
12569-# Command to use when deplibs_check_method == "file_magic".
12570+# Command to use when deplibs_check_method = "file_magic".
12571 file_magic_cmd=$lt_file_magic_cmd
12572
12573+# How to find potential files when deplibs_check_method = "file_magic".
12574+file_magic_glob=$lt_file_magic_glob
12575+
12576+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
12577+want_nocaseglob=$lt_want_nocaseglob
12578+
12579+# DLL creation program.
12580+DLLTOOL=$lt_DLLTOOL
12581+
12582+# Command to associate shared and link libraries.
12583+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
12584+
12585 # The archiver.
12586 AR=$lt_AR
12587+
12588+# Flags to create an archive.
12589 AR_FLAGS=$lt_AR_FLAGS
12590
12591+# How to feed a file listing to the archiver.
12592+archiver_list_spec=$lt_archiver_list_spec
12593+
12594 # A symbol stripping program.
12595 STRIP=$lt_STRIP
12596
12597@@ -17549,6 +18420,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
12598 # Transform the output of nm in a C name address pair when lib prefix is needed.
12599 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12600
12601+# Specify filename containing input files for \$NM.
12602+nm_file_list_spec=$lt_nm_file_list_spec
12603+
12604+# The root where to search for dependent libraries,and in which our libraries should be installed.
12605+lt_sysroot=$lt_sysroot
12606+
12607 # The name of the directory that contains temporary libtool files.
12608 objdir=$objdir
12609
12610@@ -17558,6 +18435,9 @@ MAGIC_CMD=$MAGIC_CMD
12611 # Must we lock files when doing compilation?
12612 need_locks=$lt_need_locks
12613
12614+# Manifest tool.
12615+MANIFEST_TOOL=$lt_MANIFEST_TOOL
12616+
12617 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12618 DSYMUTIL=$lt_DSYMUTIL
12619
12620@@ -17672,12 +18552,12 @@ with_gcc=$GCC
12621 # Compiler flag to turn off builtin functions.
12622 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12623
12624-# How to pass a linker flag through the compiler.
12625-wl=$lt_lt_prog_compiler_wl
12626-
12627 # Additional compiler flags for building library objects.
12628 pic_flag=$lt_lt_prog_compiler_pic
12629
12630+# How to pass a linker flag through the compiler.
12631+wl=$lt_lt_prog_compiler_wl
12632+
12633 # Compiler flag to prevent dynamic linking.
12634 link_static_flag=$lt_lt_prog_compiler_static
12635
12636@@ -17764,9 +18644,6 @@ inherit_rpath=$inherit_rpath
12637 # Whether libtool must link a program against all its dependency libraries.
12638 link_all_deplibs=$link_all_deplibs
12639
12640-# Fix the shell variable \$srcfile for the compiler.
12641-fix_srcfile_path=$lt_fix_srcfile_path
12642-
12643 # Set to "yes" if exported symbols are required.
12644 always_export_symbols=$always_export_symbols
12645
12646@@ -17782,6 +18659,9 @@ include_expsyms=$lt_include_expsyms
12647 # Commands necessary for linking programs (against libraries) with templates.
12648 prelink_cmds=$lt_prelink_cmds
12649
12650+# Commands necessary for finishing linking programs.
12651+postlink_cmds=$lt_postlink_cmds
12652+
12653 # Specify filename containing input files.
12654 file_list_spec=$lt_file_list_spec
12655
12656@@ -17828,210 +18708,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12657 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12658 # text mode, it properly converts lines to CR/LF. This bash problem
12659 # is reportedly fixed, but why not run on old versions too?
12660- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
12661- || (rm -f "$cfgfile"; exit 1)
12662-
12663- case $xsi_shell in
12664- yes)
12665- cat << \_LT_EOF >> "$cfgfile"
12666-
12667-# func_dirname file append nondir_replacement
12668-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12669-# otherwise set result to NONDIR_REPLACEMENT.
12670-func_dirname ()
12671-{
12672- case ${1} in
12673- */*) func_dirname_result="${1%/*}${2}" ;;
12674- * ) func_dirname_result="${3}" ;;
12675- esac
12676-}
12677-
12678-# func_basename file
12679-func_basename ()
12680-{
12681- func_basename_result="${1##*/}"
12682-}
12683-
12684-# func_dirname_and_basename file append nondir_replacement
12685-# perform func_basename and func_dirname in a single function
12686-# call:
12687-# dirname: Compute the dirname of FILE. If nonempty,
12688-# add APPEND to the result, otherwise set result
12689-# to NONDIR_REPLACEMENT.
12690-# value returned in "$func_dirname_result"
12691-# basename: Compute filename of FILE.
12692-# value retuned in "$func_basename_result"
12693-# Implementation must be kept synchronized with func_dirname
12694-# and func_basename. For efficiency, we do not delegate to
12695-# those functions but instead duplicate the functionality here.
12696-func_dirname_and_basename ()
12697-{
12698- case ${1} in
12699- */*) func_dirname_result="${1%/*}${2}" ;;
12700- * ) func_dirname_result="${3}" ;;
12701- esac
12702- func_basename_result="${1##*/}"
12703-}
12704-
12705-# func_stripname prefix suffix name
12706-# strip PREFIX and SUFFIX off of NAME.
12707-# PREFIX and SUFFIX must not contain globbing or regex special
12708-# characters, hashes, percent signs, but SUFFIX may contain a leading
12709-# dot (in which case that matches only a dot).
12710-func_stripname ()
12711-{
12712- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
12713- # positional parameters, so assign one to ordinary parameter first.
12714- func_stripname_result=${3}
12715- func_stripname_result=${func_stripname_result#"${1}"}
12716- func_stripname_result=${func_stripname_result%"${2}"}
12717-}
12718-
12719-# func_opt_split
12720-func_opt_split ()
12721-{
12722- func_opt_split_opt=${1%%=*}
12723- func_opt_split_arg=${1#*=}
12724-}
12725-
12726-# func_lo2o object
12727-func_lo2o ()
12728-{
12729- case ${1} in
12730- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
12731- *) func_lo2o_result=${1} ;;
12732- esac
12733-}
12734-
12735-# func_xform libobj-or-source
12736-func_xform ()
12737-{
12738- func_xform_result=${1%.*}.lo
12739-}
12740-
12741-# func_arith arithmetic-term...
12742-func_arith ()
12743-{
12744- func_arith_result=$(( $* ))
12745-}
12746-
12747-# func_len string
12748-# STRING may not start with a hyphen.
12749-func_len ()
12750-{
12751- func_len_result=${#1}
12752-}
12753-
12754-_LT_EOF
12755- ;;
12756- *) # Bourne compatible functions.
12757- cat << \_LT_EOF >> "$cfgfile"
12758-
12759-# func_dirname file append nondir_replacement
12760-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12761-# otherwise set result to NONDIR_REPLACEMENT.
12762-func_dirname ()
12763-{
12764- # Extract subdirectory from the argument.
12765- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12766- if test "X$func_dirname_result" = "X${1}"; then
12767- func_dirname_result="${3}"
12768- else
12769- func_dirname_result="$func_dirname_result${2}"
12770- fi
12771-}
12772-
12773-# func_basename file
12774-func_basename ()
12775-{
12776- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12777-}
12778-
12779-
12780-# func_stripname prefix suffix name
12781-# strip PREFIX and SUFFIX off of NAME.
12782-# PREFIX and SUFFIX must not contain globbing or regex special
12783-# characters, hashes, percent signs, but SUFFIX may contain a leading
12784-# dot (in which case that matches only a dot).
12785-# func_strip_suffix prefix name
12786-func_stripname ()
12787-{
12788- case ${2} in
12789- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12790- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12791- esac
12792-}
12793-
12794-# sed scripts:
12795-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12796-my_sed_long_arg='1s/^-[^=]*=//'
12797-
12798-# func_opt_split
12799-func_opt_split ()
12800-{
12801- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12802- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12803-}
12804-
12805-# func_lo2o object
12806-func_lo2o ()
12807-{
12808- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12809-}
12810-
12811-# func_xform libobj-or-source
12812-func_xform ()
12813-{
12814- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12815-}
12816-
12817-# func_arith arithmetic-term...
12818-func_arith ()
12819-{
12820- func_arith_result=`expr "$@"`
12821-}
12822-
12823-# func_len string
12824-# STRING may not start with a hyphen.
12825-func_len ()
12826-{
12827- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12828-}
12829-
12830-_LT_EOF
12831-esac
12832-
12833-case $lt_shell_append in
12834- yes)
12835- cat << \_LT_EOF >> "$cfgfile"
12836-
12837-# func_append var value
12838-# Append VALUE to the end of shell variable VAR.
12839-func_append ()
12840-{
12841- eval "$1+=\$2"
12842-}
12843-_LT_EOF
12844- ;;
12845- *)
12846- cat << \_LT_EOF >> "$cfgfile"
12847-
12848-# func_append var value
12849-# Append VALUE to the end of shell variable VAR.
12850-func_append ()
12851-{
12852- eval "$1=\$$1\$2"
12853-}
12854-
12855-_LT_EOF
12856- ;;
12857- esac
12858-
12859-
12860- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12861- || (rm -f "$cfgfile"; exit 1)
12862-
12863- mv -f "$cfgfile" "$ofile" ||
12864+ sed '$q' "$ltmain" >> "$cfgfile" \
12865+ || (rm -f "$cfgfile"; exit 1)
12866+
12867+ if test x"$xsi_shell" = xyes; then
12868+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12869+func_dirname ()\
12870+{\
12871+\ case ${1} in\
12872+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12873+\ * ) func_dirname_result="${3}" ;;\
12874+\ esac\
12875+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12876+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12877+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12878+test 0 -eq $? || _lt_function_replace_fail=:
12879+
12880+
12881+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12882+func_basename ()\
12883+{\
12884+\ func_basename_result="${1##*/}"\
12885+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12886+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12887+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12888+test 0 -eq $? || _lt_function_replace_fail=:
12889+
12890+
12891+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12892+func_dirname_and_basename ()\
12893+{\
12894+\ case ${1} in\
12895+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12896+\ * ) func_dirname_result="${3}" ;;\
12897+\ esac\
12898+\ func_basename_result="${1##*/}"\
12899+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12900+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12901+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12902+test 0 -eq $? || _lt_function_replace_fail=:
12903+
12904+
12905+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12906+func_stripname ()\
12907+{\
12908+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12909+\ # positional parameters, so assign one to ordinary parameter first.\
12910+\ func_stripname_result=${3}\
12911+\ func_stripname_result=${func_stripname_result#"${1}"}\
12912+\ func_stripname_result=${func_stripname_result%"${2}"}\
12913+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12914+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12915+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12916+test 0 -eq $? || _lt_function_replace_fail=:
12917+
12918+
12919+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12920+func_split_long_opt ()\
12921+{\
12922+\ func_split_long_opt_name=${1%%=*}\
12923+\ func_split_long_opt_arg=${1#*=}\
12924+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12925+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12926+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12927+test 0 -eq $? || _lt_function_replace_fail=:
12928+
12929+
12930+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12931+func_split_short_opt ()\
12932+{\
12933+\ func_split_short_opt_arg=${1#??}\
12934+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12935+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12936+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12937+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12938+test 0 -eq $? || _lt_function_replace_fail=:
12939+
12940+
12941+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12942+func_lo2o ()\
12943+{\
12944+\ case ${1} in\
12945+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12946+\ *) func_lo2o_result=${1} ;;\
12947+\ esac\
12948+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
12949+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12950+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12951+test 0 -eq $? || _lt_function_replace_fail=:
12952+
12953+
12954+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
12955+func_xform ()\
12956+{\
12957+ func_xform_result=${1%.*}.lo\
12958+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
12959+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12960+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12961+test 0 -eq $? || _lt_function_replace_fail=:
12962+
12963+
12964+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12965+func_arith ()\
12966+{\
12967+ func_arith_result=$(( $* ))\
12968+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12969+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12970+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12971+test 0 -eq $? || _lt_function_replace_fail=:
12972+
12973+
12974+ sed -e '/^func_len ()$/,/^} # func_len /c\
12975+func_len ()\
12976+{\
12977+ func_len_result=${#1}\
12978+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12979+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12980+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12981+test 0 -eq $? || _lt_function_replace_fail=:
12982+
12983+fi
12984+
12985+if test x"$lt_shell_append" = xyes; then
12986+ sed -e '/^func_append ()$/,/^} # func_append /c\
12987+func_append ()\
12988+{\
12989+ eval "${1}+=\\${2}"\
12990+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12991+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12992+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12993+test 0 -eq $? || _lt_function_replace_fail=:
12994+
12995+
12996+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12997+func_append_quoted ()\
12998+{\
12999+\ func_quote_for_eval "${2}"\
13000+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
13001+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
13002+ && mv -f "$cfgfile.tmp" "$cfgfile" \
13003+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
13004+test 0 -eq $? || _lt_function_replace_fail=:
13005+
13006+
13007+ # Save a `func_append' function call where possible by direct use of '+='
13008+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
13009+ && mv -f "$cfgfile.tmp" "$cfgfile" \
13010+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
13011+ test 0 -eq $? || _lt_function_replace_fail=:
13012+else
13013+ # Save a `func_append' function call even when '+=' is not available
13014+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
13015+ && mv -f "$cfgfile.tmp" "$cfgfile" \
13016+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
13017+ test 0 -eq $? || _lt_function_replace_fail=:
13018+fi
13019+
13020+if test x"$_lt_function_replace_fail" = x":"; then
13021+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
13022+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
13023+fi
13024+
13025+
13026+ mv -f "$cfgfile" "$ofile" ||
13027 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
13028 chmod +x "$ofile"
13029
13030@@ -18059,12 +18898,12 @@ with_gcc=$GCC_CXX
13031 # Compiler flag to turn off builtin functions.
13032 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
13033
13034-# How to pass a linker flag through the compiler.
13035-wl=$lt_lt_prog_compiler_wl_CXX
13036-
13037 # Additional compiler flags for building library objects.
13038 pic_flag=$lt_lt_prog_compiler_pic_CXX
13039
13040+# How to pass a linker flag through the compiler.
13041+wl=$lt_lt_prog_compiler_wl_CXX
13042+
13043 # Compiler flag to prevent dynamic linking.
13044 link_static_flag=$lt_lt_prog_compiler_static_CXX
13045
13046@@ -18151,9 +18990,6 @@ inherit_rpath=$inherit_rpath_CXX
13047 # Whether libtool must link a program against all its dependency libraries.
13048 link_all_deplibs=$link_all_deplibs_CXX
13049
13050-# Fix the shell variable \$srcfile for the compiler.
13051-fix_srcfile_path=$lt_fix_srcfile_path_CXX
13052-
13053 # Set to "yes" if exported symbols are required.
13054 always_export_symbols=$always_export_symbols_CXX
13055
13056@@ -18169,6 +19005,9 @@ include_expsyms=$lt_include_expsyms_CXX
13057 # Commands necessary for linking programs (against libraries) with templates.
13058 prelink_cmds=$lt_prelink_cmds_CXX
13059
13060+# Commands necessary for finishing linking programs.
13061+postlink_cmds=$lt_postlink_cmds_CXX
13062+
13063 # Specify filename containing input files.
13064 file_list_spec=$lt_file_list_spec_CXX
13065
13066diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
13067index db763ef71b2..726dc69bf85 100644
13068--- a/gprofng/src/Makefile.in
13069+++ b/gprofng/src/Makefile.in
13070@@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@
13071 CYGPATH_W = @CYGPATH_W@
13072 DEFS = @DEFS@
13073 DEPDIR = @DEPDIR@
13074+DLLTOOL = @DLLTOOL@
13075 DSYMUTIL = @DSYMUTIL@
13076 DUMPBIN = @DUMPBIN@
13077 ECHO_C = @ECHO_C@
13078@@ -355,6 +356,7 @@ LN_S = @LN_S@
13079 LTLIBOBJS = @LTLIBOBJS@
13080 MAINT = @MAINT@
13081 MAKEINFO = @MAKEINFO@
13082+MANIFEST_TOOL = @MANIFEST_TOOL@
13083 MKDIR_P = @MKDIR_P@
13084 NM = @NM@
13085 NMEDIT = @NMEDIT@
13086diff --git a/ld/Makefile.in b/ld/Makefile.in
13087index 15311048855..71b39ee9311 100644
13088--- a/ld/Makefile.in
13089+++ b/ld/Makefile.in
13090@@ -390,6 +390,7 @@ CYGPATH_W = @CYGPATH_W@
13091 DATADIRNAME = @DATADIRNAME@
13092 DEFS = @DEFS@
13093 DEPDIR = @DEPDIR@
13094+DLLTOOL = @DLLTOOL@
13095 DSYMUTIL = @DSYMUTIL@
13096 DUMPBIN = @DUMPBIN@
13097 ECHO_C = @ECHO_C@
13098@@ -445,6 +446,7 @@ LTLIBINTL = @LTLIBINTL@
13099 LTLIBOBJS = @LTLIBOBJS@
13100 MAINT = @MAINT@
13101 MAKEINFO = @MAKEINFO@
13102+MANIFEST_TOOL = @MANIFEST_TOOL@
13103 MKDIR_P = @MKDIR_P@
13104 MKINSTALLDIRS = @MKINSTALLDIRS@
13105 MSGFMT = @MSGFMT@
13106@@ -495,6 +497,7 @@ abs_builddir = @abs_builddir@
13107 abs_srcdir = @abs_srcdir@
13108 abs_top_builddir = @abs_top_builddir@
13109 abs_top_srcdir = @abs_top_srcdir@
13110+ac_ct_AR = @ac_ct_AR@
13111 ac_ct_CC = @ac_ct_CC@
13112 ac_ct_CXX = @ac_ct_CXX@
13113 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
13114diff --git a/ld/configure b/ld/configure
13115index 98a76d6da7f..a4266996c44 100755
13116--- a/ld/configure
13117+++ b/ld/configure
13118@@ -705,8 +705,11 @@ OTOOL
13119 LIPO
13120 NMEDIT
13121 DSYMUTIL
13122+MANIFEST_TOOL
13123 RANLIB
13124+ac_ct_AR
13125 AR
13126+DLLTOOL
13127 OBJDUMP
13128 LN_S
13129 NM
13130@@ -836,6 +839,7 @@ enable_static
13131 with_pic
13132 enable_fast_install
13133 with_gnu_ld
13134+with_libtool_sysroot
13135 enable_libtool_lock
13136 enable_plugins
13137 enable_largefile
13138@@ -1581,6 +1585,8 @@ Optional Packages:
13139 --with-pic try to use only PIC/non-PIC objects [default=use
13140 both]
13141 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
13142+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
13143+ (or the compiler's sysroot if not specified).
13144 --with-lib-path=dir1:dir2... set default LIB_PATH
13145 --with-sysroot=DIR Search for usr/lib et al within DIR.
13146 --with-gnu-ld assume the C compiler uses GNU ld default=no
13147@@ -5560,8 +5566,8 @@ esac
13148
13149
13150
13151-macro_version='2.2.7a'
13152-macro_revision='1.3134'
13153+macro_version='2.4'
13154+macro_revision='1.3293'
13155
13156
13157
13158@@ -5601,7 +5607,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
13159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
13160 $as_echo_n "checking how to print strings... " >&6; }
13161 # Test print first, because it will be a builtin if present.
13162-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
13163+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
13164 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
13165 ECHO='print -r --'
13166 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
13167@@ -6294,8 +6300,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
13168 # Try some XSI features
13169 xsi_shell=no
13170 ( _lt_dummy="a/b/c"
13171- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
13172- = c,a/b,, \
13173+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
13174+ = c,a/b,b/c, \
13175 && eval 'test $(( 1 + 1 )) -eq 2 \
13176 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13177 && xsi_shell=yes
13178@@ -6344,6 +6350,80 @@ esac
13179
13180
13181
13182+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
13183+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
13184+if ${lt_cv_to_host_file_cmd+:} false; then :
13185+ $as_echo_n "(cached) " >&6
13186+else
13187+ case $host in
13188+ *-*-mingw* )
13189+ case $build in
13190+ *-*-mingw* ) # actually msys
13191+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
13192+ ;;
13193+ *-*-cygwin* )
13194+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
13195+ ;;
13196+ * ) # otherwise, assume *nix
13197+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
13198+ ;;
13199+ esac
13200+ ;;
13201+ *-*-cygwin* )
13202+ case $build in
13203+ *-*-mingw* ) # actually msys
13204+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
13205+ ;;
13206+ *-*-cygwin* )
13207+ lt_cv_to_host_file_cmd=func_convert_file_noop
13208+ ;;
13209+ * ) # otherwise, assume *nix
13210+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
13211+ ;;
13212+ esac
13213+ ;;
13214+ * ) # unhandled hosts (and "normal" native builds)
13215+ lt_cv_to_host_file_cmd=func_convert_file_noop
13216+ ;;
13217+esac
13218+
13219+fi
13220+
13221+to_host_file_cmd=$lt_cv_to_host_file_cmd
13222+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
13223+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
13224+
13225+
13226+
13227+
13228+
13229+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
13230+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
13231+if ${lt_cv_to_tool_file_cmd+:} false; then :
13232+ $as_echo_n "(cached) " >&6
13233+else
13234+ #assume ordinary cross tools, or native build.
13235+lt_cv_to_tool_file_cmd=func_convert_file_noop
13236+case $host in
13237+ *-*-mingw* )
13238+ case $build in
13239+ *-*-mingw* ) # actually msys
13240+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
13241+ ;;
13242+ esac
13243+ ;;
13244+esac
13245+
13246+fi
13247+
13248+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
13249+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
13250+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
13251+
13252+
13253+
13254+
13255+
13256 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13257 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13258 if ${lt_cv_ld_reload_flag+:} false; then :
13259@@ -6360,6 +6440,11 @@ case $reload_flag in
13260 esac
13261 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13262 case $host_os in
13263+ cygwin* | mingw* | pw32* | cegcc*)
13264+ if test "$GCC" != yes; then
13265+ reload_cmds=false
13266+ fi
13267+ ;;
13268 darwin*)
13269 if test "$GCC" = yes; then
13270 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13271@@ -6528,7 +6613,8 @@ mingw* | pw32*)
13272 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13273 lt_cv_file_magic_cmd='func_win32_libid'
13274 else
13275- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
13276+ # Keep this pattern in sync with the one in func_win32_libid.
13277+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
13278 lt_cv_file_magic_cmd='$OBJDUMP -f'
13279 fi
13280 ;;
13281@@ -6687,6 +6773,21 @@ esac
13282 fi
13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13284 $as_echo "$lt_cv_deplibs_check_method" >&6; }
13285+
13286+file_magic_glob=
13287+want_nocaseglob=no
13288+if test "$build" = "$host"; then
13289+ case $host_os in
13290+ mingw* | pw32*)
13291+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
13292+ want_nocaseglob=yes
13293+ else
13294+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
13295+ fi
13296+ ;;
13297+ esac
13298+fi
13299+
13300 file_magic_cmd=$lt_cv_file_magic_cmd
13301 deplibs_check_method=$lt_cv_deplibs_check_method
13302 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13303@@ -6702,6 +6803,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
13304
13305
13306
13307+
13308+
13309+
13310+
13311+
13312+
13313+
13314+
13315+
13316+
13317+if test -n "$ac_tool_prefix"; then
13318+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
13319+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
13320+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13321+$as_echo_n "checking for $ac_word... " >&6; }
13322+if ${ac_cv_prog_DLLTOOL+:} false; then :
13323+ $as_echo_n "(cached) " >&6
13324+else
13325+ if test -n "$DLLTOOL"; then
13326+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
13327+else
13328+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13329+for as_dir in $PATH
13330+do
13331+ IFS=$as_save_IFS
13332+ test -z "$as_dir" && as_dir=.
13333+ for ac_exec_ext in '' $ac_executable_extensions; do
13334+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13335+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
13336+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13337+ break 2
13338+ fi
13339+done
13340+ done
13341+IFS=$as_save_IFS
13342+
13343+fi
13344+fi
13345+DLLTOOL=$ac_cv_prog_DLLTOOL
13346+if test -n "$DLLTOOL"; then
13347+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
13348+$as_echo "$DLLTOOL" >&6; }
13349+else
13350+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13351+$as_echo "no" >&6; }
13352+fi
13353+
13354+
13355+fi
13356+if test -z "$ac_cv_prog_DLLTOOL"; then
13357+ ac_ct_DLLTOOL=$DLLTOOL
13358+ # Extract the first word of "dlltool", so it can be a program name with args.
13359+set dummy dlltool; ac_word=$2
13360+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13361+$as_echo_n "checking for $ac_word... " >&6; }
13362+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
13363+ $as_echo_n "(cached) " >&6
13364+else
13365+ if test -n "$ac_ct_DLLTOOL"; then
13366+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
13367+else
13368+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13369+for as_dir in $PATH
13370+do
13371+ IFS=$as_save_IFS
13372+ test -z "$as_dir" && as_dir=.
13373+ for ac_exec_ext in '' $ac_executable_extensions; do
13374+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13375+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
13376+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13377+ break 2
13378+ fi
13379+done
13380+ done
13381+IFS=$as_save_IFS
13382+
13383+fi
13384+fi
13385+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
13386+if test -n "$ac_ct_DLLTOOL"; then
13387+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
13388+$as_echo "$ac_ct_DLLTOOL" >&6; }
13389+else
13390+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13391+$as_echo "no" >&6; }
13392+fi
13393+
13394+ if test "x$ac_ct_DLLTOOL" = x; then
13395+ DLLTOOL="false"
13396+ else
13397+ case $cross_compiling:$ac_tool_warned in
13398+yes:)
13399+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13400+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13401+ac_tool_warned=yes ;;
13402+esac
13403+ DLLTOOL=$ac_ct_DLLTOOL
13404+ fi
13405+else
13406+ DLLTOOL="$ac_cv_prog_DLLTOOL"
13407+fi
13408+
13409+test -z "$DLLTOOL" && DLLTOOL=dlltool
13410+
13411+
13412+
13413+
13414+
13415+
13416+
13417+
13418+
13419+
13420+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
13421+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
13422+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
13423+ $as_echo_n "(cached) " >&6
13424+else
13425+ lt_cv_sharedlib_from_linklib_cmd='unknown'
13426+
13427+case $host_os in
13428+cygwin* | mingw* | pw32* | cegcc*)
13429+ # two different shell functions defined in ltmain.sh
13430+ # decide which to use based on capabilities of $DLLTOOL
13431+ case `$DLLTOOL --help 2>&1` in
13432+ *--identify-strict*)
13433+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
13434+ ;;
13435+ *)
13436+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
13437+ ;;
13438+ esac
13439+ ;;
13440+*)
13441+ # fallback: assume linklib IS sharedlib
13442+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
13443+ ;;
13444+esac
13445+
13446+fi
13447+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
13448+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
13449+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
13450+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
13451+
13452+
13453+
13454+
13455+
13456+
13457+
13458 plugin_option=
13459 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
13460 for plugin in $plugin_names; do
13461@@ -6716,8 +6968,10 @@ for plugin in $plugin_names; do
13462 done
13463
13464 if test -n "$ac_tool_prefix"; then
13465- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
13466-set dummy ${ac_tool_prefix}ar; ac_word=$2
13467+ for ac_prog in ar
13468+ do
13469+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
13470+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
13471 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13472 $as_echo_n "checking for $ac_word... " >&6; }
13473 if ${ac_cv_prog_AR+:} false; then :
13474@@ -6733,7 +6987,7 @@ do
13475 test -z "$as_dir" && as_dir=.
13476 for ac_exec_ext in '' $ac_executable_extensions; do
13477 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13478- ac_cv_prog_AR="${ac_tool_prefix}ar"
13479+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
13480 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13481 break 2
13482 fi
13483@@ -6753,11 +7007,15 @@ $as_echo "no" >&6; }
13484 fi
13485
13486
13487+ test -n "$AR" && break
13488+ done
13489 fi
13490-if test -z "$ac_cv_prog_AR"; then
13491+if test -z "$AR"; then
13492 ac_ct_AR=$AR
13493- # Extract the first word of "ar", so it can be a program name with args.
13494-set dummy ar; ac_word=$2
13495+ for ac_prog in ar
13496+do
13497+ # Extract the first word of "$ac_prog", so it can be a program name with args.
13498+set dummy $ac_prog; ac_word=$2
13499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13500 $as_echo_n "checking for $ac_word... " >&6; }
13501 if ${ac_cv_prog_ac_ct_AR+:} false; then :
13502@@ -6773,7 +7031,7 @@ do
13503 test -z "$as_dir" && as_dir=.
13504 for ac_exec_ext in '' $ac_executable_extensions; do
13505 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13506- ac_cv_prog_ac_ct_AR="ar"
13507+ ac_cv_prog_ac_ct_AR="$ac_prog"
13508 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13509 break 2
13510 fi
13511@@ -6792,6 +7050,10 @@ else
13512 $as_echo "no" >&6; }
13513 fi
13514
13515+
13516+ test -n "$ac_ct_AR" && break
13517+done
13518+
13519 if test "x$ac_ct_AR" = x; then
13520 AR="false"
13521 else
13522@@ -6803,29 +7065,81 @@ ac_tool_warned=yes ;;
13523 esac
13524 AR=$ac_ct_AR
13525 fi
13526-else
13527- AR="$ac_cv_prog_AR"
13528 fi
13529
13530-test -z "$AR" && AR=ar
13531-if test -n "$plugin_option"; then
13532- if $AR --help 2>&1 | grep -q "\--plugin"; then
13533- touch conftest.c
13534- $AR $plugin_option rc conftest.a conftest.c
13535- if test "$?" != 0; then
13536- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
13537+ touch conftest.c
13538+ $AR $plugin_option rc conftest.a conftest.c
13539+ if test "$?" != 0; then
13540+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
13541 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
13542- else
13543- AR="$AR $plugin_option"
13544- fi
13545- rm -f conftest.*
13546+ else
13547+ AR="$AR $plugin_option"
13548 fi
13549-fi
13550-test -z "$AR_FLAGS" && AR_FLAGS=cru
13551+ rm -f conftest.*
13552+: ${AR=ar}
13553+: ${AR_FLAGS=cru}
13554+
13555+
13556+
13557+
13558+
13559+
13560+
13561+
13562+
13563+
13564
13565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13566+$as_echo_n "checking for archiver @FILE support... " >&6; }
13567+if ${lt_cv_ar_at_file+:} false; then :
13568+ $as_echo_n "(cached) " >&6
13569+else
13570+ lt_cv_ar_at_file=no
13571+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13572+/* end confdefs.h. */
13573+
13574+int
13575+main ()
13576+{
13577
13578+ ;
13579+ return 0;
13580+}
13581+_ACEOF
13582+if ac_fn_c_try_compile "$LINENO"; then :
13583+ echo conftest.$ac_objext > conftest.lst
13584+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
13585+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13586+ (eval $lt_ar_try) 2>&5
13587+ ac_status=$?
13588+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13589+ test $ac_status = 0; }
13590+ if test "$ac_status" -eq 0; then
13591+ # Ensure the archiver fails upon bogus file names.
13592+ rm -f conftest.$ac_objext libconftest.a
13593+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13594+ (eval $lt_ar_try) 2>&5
13595+ ac_status=$?
13596+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13597+ test $ac_status = 0; }
13598+ if test "$ac_status" -ne 0; then
13599+ lt_cv_ar_at_file=@
13600+ fi
13601+ fi
13602+ rm -f conftest.* libconftest.a
13603+
13604+fi
13605+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13606
13607+fi
13608+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13609+$as_echo "$lt_cv_ar_at_file" >&6; }
13610
13611+if test "x$lt_cv_ar_at_file" = xno; then
13612+ archiver_list_spec=
13613+else
13614+ archiver_list_spec=$lt_cv_ar_at_file
13615+fi
13616
13617
13618
13619@@ -7172,8 +7486,8 @@ esac
13620 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13621
13622 # Transform an extracted symbol line into symbol name and symbol address
13623-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13624-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'"
13625+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13626+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'"
13627
13628 # Handle CRLF in mingw tool chain
13629 opt_cr=
13630@@ -7209,6 +7523,7 @@ for ac_symprfx in "" "_"; do
13631 else
13632 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13633 fi
13634+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
13635
13636 # Check to see that the pipe works correctly.
13637 pipe_works=no
13638@@ -7250,6 +7565,18 @@ _LT_EOF
13639 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13640 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13641 cat <<_LT_EOF > conftest.$ac_ext
13642+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13643+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13644+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13645+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13646+# define LT_DLSYM_CONST
13647+#elif defined(__osf__)
13648+/* This system does not cope well with relocations in const data. */
13649+# define LT_DLSYM_CONST
13650+#else
13651+# define LT_DLSYM_CONST const
13652+#endif
13653+
13654 #ifdef __cplusplus
13655 extern "C" {
13656 #endif
13657@@ -7261,7 +7588,7 @@ _LT_EOF
13658 cat <<_LT_EOF >> conftest.$ac_ext
13659
13660 /* The mapping between symbol names and symbols. */
13661-const struct {
13662+LT_DLSYM_CONST struct {
13663 const char *name;
13664 void *address;
13665 }
13666@@ -7287,8 +7614,8 @@ static const void *lt_preloaded_setup() {
13667 _LT_EOF
13668 # Now try linking the two files.
13669 mv conftest.$ac_objext conftstm.$ac_objext
13670- lt_save_LIBS="$LIBS"
13671- lt_save_CFLAGS="$CFLAGS"
13672+ lt_globsym_save_LIBS=$LIBS
13673+ lt_globsym_save_CFLAGS=$CFLAGS
13674 LIBS="conftstm.$ac_objext"
13675 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13676 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13677@@ -7298,8 +7625,8 @@ _LT_EOF
13678 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13679 pipe_works=yes
13680 fi
13681- LIBS="$lt_save_LIBS"
13682- CFLAGS="$lt_save_CFLAGS"
13683+ LIBS=$lt_globsym_save_LIBS
13684+ CFLAGS=$lt_globsym_save_CFLAGS
13685 else
13686 echo "cannot find nm_test_func in $nlist" >&5
13687 fi
13688@@ -7336,6 +7663,27 @@ else
13689 $as_echo "ok" >&6; }
13690 fi
13691
13692+# Response file support.
13693+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
13694+ nm_file_list_spec='@'
13695+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
13696+ nm_file_list_spec='@'
13697+fi
13698+
13699+
13700+
13701+
13702+
13703+
13704+
13705+
13706+
13707+
13708+
13709+
13710+
13711+
13712+
13713
13714
13715
13716@@ -7348,10 +7696,38 @@ fi
13717
13718
13719
13720+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
13721+$as_echo_n "checking for sysroot... " >&6; }
13722
13723+# Check whether --with-libtool-sysroot was given.
13724+if test "${with_libtool_sysroot+set}" = set; then :
13725+ withval=$with_libtool_sysroot;
13726+else
13727+ with_libtool_sysroot=no
13728+fi
13729
13730
13731+lt_sysroot=
13732+case ${with_libtool_sysroot} in #(
13733+ yes)
13734+ if test "$GCC" = yes; then
13735+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
13736+ fi
13737+ ;; #(
13738+ /*)
13739+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
13740+ ;; #(
13741+ no|'')
13742+ ;; #(
13743+ *)
13744+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
13745+$as_echo "${with_libtool_sysroot}" >&6; }
13746+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
13747+ ;;
13748+esac
13749
13750+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
13751+$as_echo "${lt_sysroot:-no}" >&6; }
13752
13753
13754
13755@@ -7563,6 +7939,123 @@ esac
13756
13757 need_locks="$enable_libtool_lock"
13758
13759+if test -n "$ac_tool_prefix"; then
13760+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
13761+set dummy ${ac_tool_prefix}mt; ac_word=$2
13762+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13763+$as_echo_n "checking for $ac_word... " >&6; }
13764+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
13765+ $as_echo_n "(cached) " >&6
13766+else
13767+ if test -n "$MANIFEST_TOOL"; then
13768+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
13769+else
13770+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13771+for as_dir in $PATH
13772+do
13773+ IFS=$as_save_IFS
13774+ test -z "$as_dir" && as_dir=.
13775+ for ac_exec_ext in '' $ac_executable_extensions; do
13776+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13777+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
13778+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13779+ break 2
13780+ fi
13781+done
13782+ done
13783+IFS=$as_save_IFS
13784+
13785+fi
13786+fi
13787+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
13788+if test -n "$MANIFEST_TOOL"; then
13789+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
13790+$as_echo "$MANIFEST_TOOL" >&6; }
13791+else
13792+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13793+$as_echo "no" >&6; }
13794+fi
13795+
13796+
13797+fi
13798+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
13799+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
13800+ # Extract the first word of "mt", so it can be a program name with args.
13801+set dummy mt; ac_word=$2
13802+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13803+$as_echo_n "checking for $ac_word... " >&6; }
13804+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
13805+ $as_echo_n "(cached) " >&6
13806+else
13807+ if test -n "$ac_ct_MANIFEST_TOOL"; then
13808+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
13809+else
13810+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13811+for as_dir in $PATH
13812+do
13813+ IFS=$as_save_IFS
13814+ test -z "$as_dir" && as_dir=.
13815+ for ac_exec_ext in '' $ac_executable_extensions; do
13816+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13817+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
13818+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13819+ break 2
13820+ fi
13821+done
13822+ done
13823+IFS=$as_save_IFS
13824+
13825+fi
13826+fi
13827+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
13828+if test -n "$ac_ct_MANIFEST_TOOL"; then
13829+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
13830+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
13831+else
13832+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13833+$as_echo "no" >&6; }
13834+fi
13835+
13836+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
13837+ MANIFEST_TOOL=":"
13838+ else
13839+ case $cross_compiling:$ac_tool_warned in
13840+yes:)
13841+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13842+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13843+ac_tool_warned=yes ;;
13844+esac
13845+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
13846+ fi
13847+else
13848+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
13849+fi
13850+
13851+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
13852+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
13853+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
13854+if ${lt_cv_path_mainfest_tool+:} false; then :
13855+ $as_echo_n "(cached) " >&6
13856+else
13857+ lt_cv_path_mainfest_tool=no
13858+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
13859+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
13860+ cat conftest.err >&5
13861+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
13862+ lt_cv_path_mainfest_tool=yes
13863+ fi
13864+ rm -f conftest*
13865+fi
13866+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
13867+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
13868+if test "x$lt_cv_path_mainfest_tool" != xyes; then
13869+ MANIFEST_TOOL=:
13870+fi
13871+
13872+
13873+
13874+
13875+
13876
13877 case $host_os in
13878 rhapsody* | darwin*)
13879@@ -8126,6 +8619,8 @@ _LT_EOF
13880 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13881 echo "$AR cru libconftest.a conftest.o" >&5
13882 $AR cru libconftest.a conftest.o 2>&5
13883+ echo "$RANLIB libconftest.a" >&5
13884+ $RANLIB libconftest.a 2>&5
13885 cat > conftest.c << _LT_EOF
13886 int main() { return 0;}
13887 _LT_EOF
13888@@ -8196,6 +8691,16 @@ done
13889
13890
13891
13892+func_stripname_cnf ()
13893+{
13894+ case ${2} in
13895+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
13896+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
13897+ esac
13898+} # func_stripname_cnf
13899+
13900+
13901+
13902
13903
13904 # Set options
13905@@ -8711,8 +9216,6 @@ fi
13906 lt_prog_compiler_pic=
13907 lt_prog_compiler_static=
13908
13909-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13910-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13911
13912 if test "$GCC" = yes; then
13913 lt_prog_compiler_wl='-Wl,'
13914@@ -8878,6 +9381,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13915 lt_prog_compiler_pic='--shared'
13916 lt_prog_compiler_static='--static'
13917 ;;
13918+ nagfor*)
13919+ # NAG Fortran compiler
13920+ lt_prog_compiler_wl='-Wl,-Wl,,'
13921+ lt_prog_compiler_pic='-PIC'
13922+ lt_prog_compiler_static='-Bstatic'
13923+ ;;
13924 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13925 # Portland Group compilers (*not* the Pentium gcc compiler,
13926 # which looks to be a dead project)
13927@@ -8940,7 +9449,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13928 lt_prog_compiler_pic='-KPIC'
13929 lt_prog_compiler_static='-Bstatic'
13930 case $cc_basename in
13931- f77* | f90* | f95*)
13932+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
13933 lt_prog_compiler_wl='-Qoption ld ';;
13934 *)
13935 lt_prog_compiler_wl='-Wl,';;
13936@@ -8997,13 +9506,17 @@ case $host_os in
13937 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13938 ;;
13939 esac
13940-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
13941-$as_echo "$lt_prog_compiler_pic" >&6; }
13942-
13943-
13944-
13945-
13946
13947+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13948+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13949+if ${lt_cv_prog_compiler_pic+:} false; then :
13950+ $as_echo_n "(cached) " >&6
13951+else
13952+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
13953+fi
13954+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
13955+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
13956+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
13957
13958 #
13959 # Check to make sure the PIC flag actually works.
13960@@ -9064,6 +9577,11 @@ fi
13961
13962
13963
13964+
13965+
13966+
13967+
13968+
13969 #
13970 # Check to make sure the static flag actually works.
13971 #
13972@@ -9414,7 +9932,8 @@ _LT_EOF
13973 allow_undefined_flag=unsupported
13974 always_export_symbols=no
13975 enable_shared_with_static_runtimes=yes
13976- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13977+ 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'
13978+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
13979
13980 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13981 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13982@@ -9513,12 +10032,12 @@ _LT_EOF
13983 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13984 hardcode_libdir_flag_spec=
13985 hardcode_libdir_flag_spec_ld='-rpath $libdir'
13986- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
13987+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
13988 if test "x$supports_anon_versioning" = xyes; then
13989 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
13990 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
13991 echo "local: *; };" >> $output_objdir/$libname.ver~
13992- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13993+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13994 fi
13995 ;;
13996 esac
13997@@ -9532,8 +10051,8 @@ _LT_EOF
13998 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13999 wlarc=
14000 else
14001- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14002- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14003+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14004+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14005 fi
14006 ;;
14007
14008@@ -9551,8 +10070,8 @@ _LT_EOF
14009
14010 _LT_EOF
14011 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
14012- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14013- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14014+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14015+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14016 else
14017 ld_shlibs=no
14018 fi
14019@@ -9598,8 +10117,8 @@ _LT_EOF
14020
14021 *)
14022 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
14023- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14024- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14025+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14026+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14027 else
14028 ld_shlibs=no
14029 fi
14030@@ -9729,7 +10248,13 @@ _LT_EOF
14031 allow_undefined_flag='-berok'
14032 # Determine the default libpath from the value encoded in an
14033 # empty executable.
14034- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14035+ if test "${lt_cv_aix_libpath+set}" = set; then
14036+ aix_libpath=$lt_cv_aix_libpath
14037+else
14038+ if ${lt_cv_aix_libpath_+:} false; then :
14039+ $as_echo_n "(cached) " >&6
14040+else
14041+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14042 /* end confdefs.h. */
14043
14044 int
14045@@ -9742,22 +10267,29 @@ main ()
14046 _ACEOF
14047 if ac_fn_c_try_link "$LINENO"; then :
14048
14049-lt_aix_libpath_sed='
14050- /Import File Strings/,/^$/ {
14051- /^0/ {
14052- s/^0 *\(.*\)$/\1/
14053- p
14054- }
14055- }'
14056-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14057-# Check for a 64-bit object if we didn't find anything.
14058-if test -z "$aix_libpath"; then
14059- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14060-fi
14061+ lt_aix_libpath_sed='
14062+ /Import File Strings/,/^$/ {
14063+ /^0/ {
14064+ s/^0 *\([^ ]*\) *$/\1/
14065+ p
14066+ }
14067+ }'
14068+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14069+ # Check for a 64-bit object if we didn't find anything.
14070+ if test -z "$lt_cv_aix_libpath_"; then
14071+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14072+ fi
14073 fi
14074 rm -f core conftest.err conftest.$ac_objext \
14075 conftest$ac_exeext conftest.$ac_ext
14076-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14077+ if test -z "$lt_cv_aix_libpath_"; then
14078+ lt_cv_aix_libpath_="/usr/lib:/lib"
14079+ fi
14080+
14081+fi
14082+
14083+ aix_libpath=$lt_cv_aix_libpath_
14084+fi
14085
14086 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14087 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"
14088@@ -9769,7 +10301,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14089 else
14090 # Determine the default libpath from the value encoded in an
14091 # empty executable.
14092- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14093+ if test "${lt_cv_aix_libpath+set}" = set; then
14094+ aix_libpath=$lt_cv_aix_libpath
14095+else
14096+ if ${lt_cv_aix_libpath_+:} false; then :
14097+ $as_echo_n "(cached) " >&6
14098+else
14099+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14100 /* end confdefs.h. */
14101
14102 int
14103@@ -9782,22 +10320,29 @@ main ()
14104 _ACEOF
14105 if ac_fn_c_try_link "$LINENO"; then :
14106
14107-lt_aix_libpath_sed='
14108- /Import File Strings/,/^$/ {
14109- /^0/ {
14110- s/^0 *\(.*\)$/\1/
14111- p
14112- }
14113- }'
14114-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14115-# Check for a 64-bit object if we didn't find anything.
14116-if test -z "$aix_libpath"; then
14117- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14118-fi
14119+ lt_aix_libpath_sed='
14120+ /Import File Strings/,/^$/ {
14121+ /^0/ {
14122+ s/^0 *\([^ ]*\) *$/\1/
14123+ p
14124+ }
14125+ }'
14126+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14127+ # Check for a 64-bit object if we didn't find anything.
14128+ if test -z "$lt_cv_aix_libpath_"; then
14129+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14130+ fi
14131 fi
14132 rm -f core conftest.err conftest.$ac_objext \
14133 conftest$ac_exeext conftest.$ac_ext
14134-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14135+ if test -z "$lt_cv_aix_libpath_"; then
14136+ lt_cv_aix_libpath_="/usr/lib:/lib"
14137+ fi
14138+
14139+fi
14140+
14141+ aix_libpath=$lt_cv_aix_libpath_
14142+fi
14143
14144 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14145 # Warning - without using the other run time loading flags,
14146@@ -9842,20 +10387,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14147 # Microsoft Visual C++.
14148 # hardcode_libdir_flag_spec is actually meaningless, as there is
14149 # no search path for DLLs.
14150- hardcode_libdir_flag_spec=' '
14151- allow_undefined_flag=unsupported
14152- # Tell ltmain to make .lib files, not .a files.
14153- libext=lib
14154- # Tell ltmain to make .dll files, not .so files.
14155- shrext_cmds=".dll"
14156- # FIXME: Setting linknames here is a bad hack.
14157- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
14158- # The linker will automatically build a .lib file if we build a DLL.
14159- old_archive_from_new_cmds='true'
14160- # FIXME: Should let the user specify the lib program.
14161- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
14162- fix_srcfile_path='`cygpath -w "$srcfile"`'
14163- enable_shared_with_static_runtimes=yes
14164+ case $cc_basename in
14165+ cl*)
14166+ # Native MSVC
14167+ hardcode_libdir_flag_spec=' '
14168+ allow_undefined_flag=unsupported
14169+ always_export_symbols=yes
14170+ file_list_spec='@'
14171+ # Tell ltmain to make .lib files, not .a files.
14172+ libext=lib
14173+ # Tell ltmain to make .dll files, not .so files.
14174+ shrext_cmds=".dll"
14175+ # FIXME: Setting linknames here is a bad hack.
14176+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
14177+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
14178+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
14179+ else
14180+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
14181+ fi~
14182+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
14183+ linknames='
14184+ # The linker will not automatically build a static lib if we build a DLL.
14185+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
14186+ enable_shared_with_static_runtimes=yes
14187+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
14188+ # Don't use ranlib
14189+ old_postinstall_cmds='chmod 644 $oldlib'
14190+ postlink_cmds='lt_outputfile="@OUTPUT@"~
14191+ lt_tool_outputfile="@TOOL_OUTPUT@"~
14192+ case $lt_outputfile in
14193+ *.exe|*.EXE) ;;
14194+ *)
14195+ lt_outputfile="$lt_outputfile.exe"
14196+ lt_tool_outputfile="$lt_tool_outputfile.exe"
14197+ ;;
14198+ esac~
14199+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
14200+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
14201+ $RM "$lt_outputfile.manifest";
14202+ fi'
14203+ ;;
14204+ *)
14205+ # Assume MSVC wrapper
14206+ hardcode_libdir_flag_spec=' '
14207+ allow_undefined_flag=unsupported
14208+ # Tell ltmain to make .lib files, not .a files.
14209+ libext=lib
14210+ # Tell ltmain to make .dll files, not .so files.
14211+ shrext_cmds=".dll"
14212+ # FIXME: Setting linknames here is a bad hack.
14213+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
14214+ # The linker will automatically build a .lib file if we build a DLL.
14215+ old_archive_from_new_cmds='true'
14216+ # FIXME: Should let the user specify the lib program.
14217+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
14218+ enable_shared_with_static_runtimes=yes
14219+ ;;
14220+ esac
14221 ;;
14222
14223 darwin* | rhapsody*)
14224@@ -9916,7 +10504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14225
14226 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14227 freebsd* | dragonfly*)
14228- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14229+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14230 hardcode_libdir_flag_spec='-R$libdir'
14231 hardcode_direct=yes
14232 hardcode_shlibpath_var=no
14233@@ -9924,7 +10512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14234
14235 hpux9*)
14236 if test "$GCC" = yes; then
14237- 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'
14238+ 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'
14239 else
14240 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'
14241 fi
14242@@ -9940,7 +10528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14243
14244 hpux10*)
14245 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
14246- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14247+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14248 else
14249 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14250 fi
14251@@ -9964,10 +10552,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14252 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14253 ;;
14254 ia64*)
14255- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14256+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14257 ;;
14258 *)
14259- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14260+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14261 ;;
14262 esac
14263 else
14264@@ -10046,23 +10634,36 @@ fi
14265
14266 irix5* | irix6* | nonstopux*)
14267 if test "$GCC" = yes; then
14268- 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'
14269+ 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'
14270 # Try to use the -exported_symbol ld option, if it does not
14271 # work, assume that -exports_file does not work either and
14272 # implicitly export all symbols.
14273- save_LDFLAGS="$LDFLAGS"
14274- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14275- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14276+ # This should be the same for all languages, so no per-tag cache variable.
14277+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
14278+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
14279+if ${lt_cv_irix_exported_symbol+:} false; then :
14280+ $as_echo_n "(cached) " >&6
14281+else
14282+ save_LDFLAGS="$LDFLAGS"
14283+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14284+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14285 /* end confdefs.h. */
14286-int foo(void) {}
14287+int foo (void) { return 0; }
14288 _ACEOF
14289 if ac_fn_c_try_link "$LINENO"; then :
14290- 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'
14291-
14292+ lt_cv_irix_exported_symbol=yes
14293+else
14294+ lt_cv_irix_exported_symbol=no
14295 fi
14296 rm -f core conftest.err conftest.$ac_objext \
14297 conftest$ac_exeext conftest.$ac_ext
14298- LDFLAGS="$save_LDFLAGS"
14299+ LDFLAGS="$save_LDFLAGS"
14300+fi
14301+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
14302+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
14303+ if test "$lt_cv_irix_exported_symbol" = yes; then
14304+ 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'
14305+ fi
14306 else
14307 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'
14308 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'
14309@@ -10147,7 +10748,7 @@ rm -f core conftest.err conftest.$ac_objext \
14310 osf4* | osf5*) # as osf3* with the addition of -msym flag
14311 if test "$GCC" = yes; then
14312 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
14313- 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'
14314+ 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'
14315 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14316 else
14317 allow_undefined_flag=' -expect_unresolved \*'
14318@@ -10166,9 +10767,9 @@ rm -f core conftest.err conftest.$ac_objext \
14319 no_undefined_flag=' -z defs'
14320 if test "$GCC" = yes; then
14321 wlarc='${wl}'
14322- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14323+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14324 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
14325- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
14326+ $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'
14327 else
14328 case `$CC -V 2>&1` in
14329 *"Compilers 5.0"*)
14330@@ -10744,8 +11345,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14331 need_version=no
14332 need_lib_prefix=no
14333
14334- case $GCC,$host_os in
14335- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
14336+ case $GCC,$cc_basename in
14337+ yes,*)
14338+ # gcc
14339 library_names_spec='$libname.dll.a'
14340 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14341 postinstall_cmds='base_file=`basename \${file}`~
14342@@ -10778,13 +11380,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14343 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14344 ;;
14345 esac
14346+ dynamic_linker='Win32 ld.exe'
14347+ ;;
14348+
14349+ *,cl*)
14350+ # Native MSVC
14351+ libname_spec='$name'
14352+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14353+ library_names_spec='${libname}.dll.lib'
14354+
14355+ case $build_os in
14356+ mingw*)
14357+ sys_lib_search_path_spec=
14358+ lt_save_ifs=$IFS
14359+ IFS=';'
14360+ for lt_path in $LIB
14361+ do
14362+ IFS=$lt_save_ifs
14363+ # Let DOS variable expansion print the short 8.3 style file name.
14364+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
14365+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
14366+ done
14367+ IFS=$lt_save_ifs
14368+ # Convert to MSYS style.
14369+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
14370+ ;;
14371+ cygwin*)
14372+ # Convert to unix form, then to dos form, then back to unix form
14373+ # but this time dos style (no spaces!) so that the unix form looks
14374+ # like /cygdrive/c/PROGRA~1:/cygdr...
14375+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
14376+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
14377+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14378+ ;;
14379+ *)
14380+ sys_lib_search_path_spec="$LIB"
14381+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
14382+ # It is most probably a Windows format PATH.
14383+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
14384+ else
14385+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14386+ fi
14387+ # FIXME: find the short name or the path components, as spaces are
14388+ # common. (e.g. "Program Files" -> "PROGRA~1")
14389+ ;;
14390+ esac
14391+
14392+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
14393+ postinstall_cmds='base_file=`basename \${file}`~
14394+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
14395+ dldir=$destdir/`dirname \$dlpath`~
14396+ test -d \$dldir || mkdir -p \$dldir~
14397+ $install_prog $dir/$dlname \$dldir/$dlname'
14398+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14399+ dlpath=$dir/\$dldll~
14400+ $RM \$dlpath'
14401+ shlibpath_overrides_runpath=yes
14402+ dynamic_linker='Win32 link.exe'
14403 ;;
14404
14405 *)
14406+ # Assume MSVC wrapper
14407 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
14408+ dynamic_linker='Win32 ld.exe'
14409 ;;
14410 esac
14411- dynamic_linker='Win32 ld.exe'
14412 # FIXME: first we should search . and the directory the executable is in
14413 shlibpath_var=PATH
14414 ;;
14415@@ -11686,7 +12346,7 @@ else
14416 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14417 lt_status=$lt_dlunknown
14418 cat > conftest.$ac_ext <<_LT_EOF
14419-#line 11686 "configure"
14420+#line $LINENO "configure"
14421 #include "confdefs.h"
14422
14423 #if HAVE_DLFCN_H
14424@@ -11730,10 +12390,10 @@ else
14425 /* When -fvisbility=hidden is used, assume the code has been annotated
14426 correspondingly for the symbols needed. */
14427 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14428-void fnord () __attribute__((visibility("default")));
14429+int fnord () __attribute__((visibility("default")));
14430 #endif
14431
14432-void fnord () { int i=42; }
14433+int fnord () { return 42; }
14434 int main ()
14435 {
14436 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14437@@ -11792,7 +12452,7 @@ else
14438 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14439 lt_status=$lt_dlunknown
14440 cat > conftest.$ac_ext <<_LT_EOF
14441-#line 11792 "configure"
14442+#line $LINENO "configure"
14443 #include "confdefs.h"
14444
14445 #if HAVE_DLFCN_H
14446@@ -11836,10 +12496,10 @@ else
14447 /* When -fvisbility=hidden is used, assume the code has been annotated
14448 correspondingly for the symbols needed. */
14449 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14450-void fnord () __attribute__((visibility("default")));
14451+int fnord () __attribute__((visibility("default")));
14452 #endif
14453
14454-void fnord () { int i=42; }
14455+int fnord () { return 42; }
14456 int main ()
14457 {
14458 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14459@@ -12231,6 +12891,7 @@ $RM -r conftest*
14460
14461 # Allow CC to be a program name with arguments.
14462 lt_save_CC=$CC
14463+ lt_save_CFLAGS=$CFLAGS
14464 lt_save_LD=$LD
14465 lt_save_GCC=$GCC
14466 GCC=$GXX
14467@@ -12248,6 +12909,7 @@ $RM -r conftest*
14468 fi
14469 test -z "${LDCXX+set}" || LD=$LDCXX
14470 CC=${CXX-"c++"}
14471+ CFLAGS=$CXXFLAGS
14472 compiler=$CC
14473 compiler_CXX=$CC
14474 for cc_temp in $compiler""; do
14475@@ -12530,7 +13192,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14476 allow_undefined_flag_CXX='-berok'
14477 # Determine the default libpath from the value encoded in an empty
14478 # executable.
14479- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14480+ if test "${lt_cv_aix_libpath+set}" = set; then
14481+ aix_libpath=$lt_cv_aix_libpath
14482+else
14483+ if ${lt_cv_aix_libpath__CXX+:} false; then :
14484+ $as_echo_n "(cached) " >&6
14485+else
14486+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14487 /* end confdefs.h. */
14488
14489 int
14490@@ -12543,22 +13211,29 @@ main ()
14491 _ACEOF
14492 if ac_fn_cxx_try_link "$LINENO"; then :
14493
14494-lt_aix_libpath_sed='
14495- /Import File Strings/,/^$/ {
14496- /^0/ {
14497- s/^0 *\(.*\)$/\1/
14498- p
14499- }
14500- }'
14501-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14502-# Check for a 64-bit object if we didn't find anything.
14503-if test -z "$aix_libpath"; then
14504- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14505-fi
14506+ lt_aix_libpath_sed='
14507+ /Import File Strings/,/^$/ {
14508+ /^0/ {
14509+ s/^0 *\([^ ]*\) *$/\1/
14510+ p
14511+ }
14512+ }'
14513+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14514+ # Check for a 64-bit object if we didn't find anything.
14515+ if test -z "$lt_cv_aix_libpath__CXX"; then
14516+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14517+ fi
14518 fi
14519 rm -f core conftest.err conftest.$ac_objext \
14520 conftest$ac_exeext conftest.$ac_ext
14521-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14522+ if test -z "$lt_cv_aix_libpath__CXX"; then
14523+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
14524+ fi
14525+
14526+fi
14527+
14528+ aix_libpath=$lt_cv_aix_libpath__CXX
14529+fi
14530
14531 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14532
14533@@ -12571,7 +13246,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14534 else
14535 # Determine the default libpath from the value encoded in an
14536 # empty executable.
14537- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14538+ if test "${lt_cv_aix_libpath+set}" = set; then
14539+ aix_libpath=$lt_cv_aix_libpath
14540+else
14541+ if ${lt_cv_aix_libpath__CXX+:} false; then :
14542+ $as_echo_n "(cached) " >&6
14543+else
14544+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14545 /* end confdefs.h. */
14546
14547 int
14548@@ -12584,22 +13265,29 @@ main ()
14549 _ACEOF
14550 if ac_fn_cxx_try_link "$LINENO"; then :
14551
14552-lt_aix_libpath_sed='
14553- /Import File Strings/,/^$/ {
14554- /^0/ {
14555- s/^0 *\(.*\)$/\1/
14556- p
14557- }
14558- }'
14559-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14560-# Check for a 64-bit object if we didn't find anything.
14561-if test -z "$aix_libpath"; then
14562- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14563-fi
14564+ lt_aix_libpath_sed='
14565+ /Import File Strings/,/^$/ {
14566+ /^0/ {
14567+ s/^0 *\([^ ]*\) *$/\1/
14568+ p
14569+ }
14570+ }'
14571+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14572+ # Check for a 64-bit object if we didn't find anything.
14573+ if test -z "$lt_cv_aix_libpath__CXX"; then
14574+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14575+ fi
14576 fi
14577 rm -f core conftest.err conftest.$ac_objext \
14578 conftest$ac_exeext conftest.$ac_ext
14579-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14580+ if test -z "$lt_cv_aix_libpath__CXX"; then
14581+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
14582+ fi
14583+
14584+fi
14585+
14586+ aix_libpath=$lt_cv_aix_libpath__CXX
14587+fi
14588
14589 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14590 # Warning - without using the other run time loading flags,
14591@@ -12642,29 +13330,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14592 ;;
14593
14594 cygwin* | mingw* | pw32* | cegcc*)
14595- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
14596- # as there is no search path for DLLs.
14597- hardcode_libdir_flag_spec_CXX='-L$libdir'
14598- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
14599- allow_undefined_flag_CXX=unsupported
14600- always_export_symbols_CXX=no
14601- enable_shared_with_static_runtimes_CXX=yes
14602-
14603- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
14604- 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'
14605- # If the export-symbols file already is a .def file (1st line
14606- # is EXPORTS), use it as is; otherwise, prepend...
14607- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
14608- cp $export_symbols $output_objdir/$soname.def;
14609- else
14610- echo EXPORTS > $output_objdir/$soname.def;
14611- cat $export_symbols >> $output_objdir/$soname.def;
14612- fi~
14613- $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'
14614- else
14615- ld_shlibs_CXX=no
14616- fi
14617- ;;
14618+ case $GXX,$cc_basename in
14619+ ,cl* | no,cl*)
14620+ # Native MSVC
14621+ # hardcode_libdir_flag_spec is actually meaningless, as there is
14622+ # no search path for DLLs.
14623+ hardcode_libdir_flag_spec_CXX=' '
14624+ allow_undefined_flag_CXX=unsupported
14625+ always_export_symbols_CXX=yes
14626+ file_list_spec_CXX='@'
14627+ # Tell ltmain to make .lib files, not .a files.
14628+ libext=lib
14629+ # Tell ltmain to make .dll files, not .so files.
14630+ shrext_cmds=".dll"
14631+ # FIXME: Setting linknames here is a bad hack.
14632+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
14633+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
14634+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
14635+ else
14636+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
14637+ fi~
14638+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
14639+ linknames='
14640+ # The linker will not automatically build a static lib if we build a DLL.
14641+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
14642+ enable_shared_with_static_runtimes_CXX=yes
14643+ # Don't use ranlib
14644+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
14645+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
14646+ lt_tool_outputfile="@TOOL_OUTPUT@"~
14647+ case $lt_outputfile in
14648+ *.exe|*.EXE) ;;
14649+ *)
14650+ lt_outputfile="$lt_outputfile.exe"
14651+ lt_tool_outputfile="$lt_tool_outputfile.exe"
14652+ ;;
14653+ esac~
14654+ func_to_tool_file "$lt_outputfile"~
14655+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
14656+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
14657+ $RM "$lt_outputfile.manifest";
14658+ fi'
14659+ ;;
14660+ *)
14661+ # g++
14662+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
14663+ # as there is no search path for DLLs.
14664+ hardcode_libdir_flag_spec_CXX='-L$libdir'
14665+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
14666+ allow_undefined_flag_CXX=unsupported
14667+ always_export_symbols_CXX=no
14668+ enable_shared_with_static_runtimes_CXX=yes
14669+
14670+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
14671+ 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'
14672+ # If the export-symbols file already is a .def file (1st line
14673+ # is EXPORTS), use it as is; otherwise, prepend...
14674+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
14675+ cp $export_symbols $output_objdir/$soname.def;
14676+ else
14677+ echo EXPORTS > $output_objdir/$soname.def;
14678+ cat $export_symbols >> $output_objdir/$soname.def;
14679+ fi~
14680+ $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'
14681+ else
14682+ ld_shlibs_CXX=no
14683+ fi
14684+ ;;
14685+ esac
14686+ ;;
14687 darwin* | rhapsody*)
14688
14689
14690@@ -12770,7 +13504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14691 ;;
14692 *)
14693 if test "$GXX" = yes; then
14694- 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'
14695+ 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'
14696 else
14697 # FIXME: insert proper C++ library support
14698 ld_shlibs_CXX=no
14699@@ -12841,10 +13575,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14700 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
14701 ;;
14702 ia64*)
14703- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
14704+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
14705 ;;
14706 *)
14707- 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'
14708+ 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'
14709 ;;
14710 esac
14711 fi
14712@@ -12885,9 +13619,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14713 *)
14714 if test "$GXX" = yes; then
14715 if test "$with_gnu_ld" = no; then
14716- 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'
14717+ 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'
14718 else
14719- 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'
14720+ 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'
14721 fi
14722 fi
14723 link_all_deplibs_CXX=yes
14724@@ -13165,7 +13899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14725 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'
14726 ;;
14727 *)
14728- 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'
14729+ 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'
14730 ;;
14731 esac
14732
14733@@ -13211,7 +13945,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14734
14735 solaris*)
14736 case $cc_basename in
14737- CC*)
14738+ CC* | sunCC*)
14739 # Sun C++ 4.2, 5.x and Centerline C++
14740 archive_cmds_need_lc_CXX=yes
14741 no_undefined_flag_CXX=' -zdefs'
14742@@ -13252,9 +13986,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14743 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
14744 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
14745 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
14746- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
14747+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
14748 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
14749- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
14750+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
14751
14752 # Commands to make compiler produce verbose output that lists
14753 # what "hidden" libraries, object files and flags are used when
14754@@ -13390,6 +14124,13 @@ private:
14755 };
14756 _LT_EOF
14757
14758+
14759+_lt_libdeps_save_CFLAGS=$CFLAGS
14760+case "$CC $CFLAGS " in #(
14761+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
14762+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
14763+esac
14764+
14765 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14766 (eval $ac_compile) 2>&5
14767 ac_status=$?
14768@@ -13403,7 +14144,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14769 pre_test_object_deps_done=no
14770
14771 for p in `eval "$output_verbose_link_cmd"`; do
14772- case $p in
14773+ case ${prev}${p} in
14774
14775 -L* | -R* | -l*)
14776 # Some compilers place space between "-{L,R}" and the path.
14777@@ -13412,13 +14153,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14778 test $p = "-R"; then
14779 prev=$p
14780 continue
14781- else
14782- prev=
14783 fi
14784
14785+ # Expand the sysroot to ease extracting the directories later.
14786+ if test -z "$prev"; then
14787+ case $p in
14788+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
14789+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
14790+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
14791+ esac
14792+ fi
14793+ case $p in
14794+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
14795+ esac
14796 if test "$pre_test_object_deps_done" = no; then
14797- case $p in
14798- -L* | -R*)
14799+ case ${prev} in
14800+ -L | -R)
14801 # Internal compiler library paths should come after those
14802 # provided the user. The postdeps already come after the
14803 # user supplied libs so there is no need to process them.
14804@@ -13438,8 +14188,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14805 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
14806 fi
14807 fi
14808+ prev=
14809 ;;
14810
14811+ *.lto.$objext) ;; # Ignore GCC LTO objects
14812 *.$objext)
14813 # This assumes that the test object file only shows up
14814 # once in the compiler output.
14815@@ -13475,6 +14227,7 @@ else
14816 fi
14817
14818 $RM -f confest.$objext
14819+CFLAGS=$_lt_libdeps_save_CFLAGS
14820
14821 # PORTME: override above test on systems where it is broken
14822 case $host_os in
14823@@ -13510,7 +14263,7 @@ linux*)
14824
14825 solaris*)
14826 case $cc_basename in
14827- CC*)
14828+ CC* | sunCC*)
14829 # The more standards-conforming stlport4 library is
14830 # incompatible with the Cstd library. Avoid specifying
14831 # it if it's in CXXFLAGS. Ignore libCrun as
14832@@ -13575,8 +14328,6 @@ fi
14833 lt_prog_compiler_pic_CXX=
14834 lt_prog_compiler_static_CXX=
14835
14836-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
14837-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14838
14839 # C++ specific cases for pic, static, wl, etc.
14840 if test "$GXX" = yes; then
14841@@ -13681,6 +14432,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14842 ;;
14843 esac
14844 ;;
14845+ mingw* | cygwin* | os2* | pw32* | cegcc*)
14846+ # This hack is so that the source file can tell whether it is being
14847+ # built for inclusion in a dll (and should export symbols for example).
14848+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
14849+ ;;
14850 dgux*)
14851 case $cc_basename in
14852 ec++*)
14853@@ -13833,7 +14589,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14854 ;;
14855 solaris*)
14856 case $cc_basename in
14857- CC*)
14858+ CC* | sunCC*)
14859 # Sun C++ 4.2, 5.x and Centerline C++
14860 lt_prog_compiler_pic_CXX='-KPIC'
14861 lt_prog_compiler_static_CXX='-Bstatic'
14862@@ -13898,10 +14654,17 @@ case $host_os in
14863 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
14864 ;;
14865 esac
14866-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
14867-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
14868-
14869
14870+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
14871+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14872+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
14873+ $as_echo_n "(cached) " >&6
14874+else
14875+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
14876+fi
14877+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
14878+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
14879+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
14880
14881 #
14882 # Check to make sure the PIC flag actually works.
14883@@ -13959,6 +14722,8 @@ fi
14884
14885
14886
14887+
14888+
14889 #
14890 # Check to make sure the static flag actually works.
14891 #
14892@@ -14136,6 +14901,7 @@ fi
14893 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
14894
14895 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
14896+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
14897 case $host_os in
14898 aix[4-9]*)
14899 # If we're using GNU nm, then we don't want the "-C" option.
14900@@ -14150,15 +14916,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14901 ;;
14902 pw32*)
14903 export_symbols_cmds_CXX="$ltdll_cmds"
14904- ;;
14905+ ;;
14906 cygwin* | mingw* | cegcc*)
14907- 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'
14908- ;;
14909+ case $cc_basename in
14910+ cl*) ;;
14911+ *)
14912+ 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'
14913+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
14914+ ;;
14915+ esac
14916+ ;;
14917 *)
14918 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
14919- ;;
14920+ ;;
14921 esac
14922- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
14923
14924 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
14925 $as_echo "$ld_shlibs_CXX" >&6; }
14926@@ -14421,8 +15192,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14927 need_version=no
14928 need_lib_prefix=no
14929
14930- case $GCC,$host_os in
14931- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
14932+ case $GCC,$cc_basename in
14933+ yes,*)
14934+ # gcc
14935 library_names_spec='$libname.dll.a'
14936 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14937 postinstall_cmds='base_file=`basename \${file}`~
14938@@ -14454,13 +15226,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14939 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14940 ;;
14941 esac
14942+ dynamic_linker='Win32 ld.exe'
14943+ ;;
14944+
14945+ *,cl*)
14946+ # Native MSVC
14947+ libname_spec='$name'
14948+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14949+ library_names_spec='${libname}.dll.lib'
14950+
14951+ case $build_os in
14952+ mingw*)
14953+ sys_lib_search_path_spec=
14954+ lt_save_ifs=$IFS
14955+ IFS=';'
14956+ for lt_path in $LIB
14957+ do
14958+ IFS=$lt_save_ifs
14959+ # Let DOS variable expansion print the short 8.3 style file name.
14960+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
14961+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
14962+ done
14963+ IFS=$lt_save_ifs
14964+ # Convert to MSYS style.
14965+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
14966+ ;;
14967+ cygwin*)
14968+ # Convert to unix form, then to dos form, then back to unix form
14969+ # but this time dos style (no spaces!) so that the unix form looks
14970+ # like /cygdrive/c/PROGRA~1:/cygdr...
14971+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
14972+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
14973+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14974+ ;;
14975+ *)
14976+ sys_lib_search_path_spec="$LIB"
14977+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
14978+ # It is most probably a Windows format PATH.
14979+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
14980+ else
14981+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14982+ fi
14983+ # FIXME: find the short name or the path components, as spaces are
14984+ # common. (e.g. "Program Files" -> "PROGRA~1")
14985+ ;;
14986+ esac
14987+
14988+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
14989+ postinstall_cmds='base_file=`basename \${file}`~
14990+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
14991+ dldir=$destdir/`dirname \$dlpath`~
14992+ test -d \$dldir || mkdir -p \$dldir~
14993+ $install_prog $dir/$dlname \$dldir/$dlname'
14994+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14995+ dlpath=$dir/\$dldll~
14996+ $RM \$dlpath'
14997+ shlibpath_overrides_runpath=yes
14998+ dynamic_linker='Win32 link.exe'
14999 ;;
15000
15001 *)
15002+ # Assume MSVC wrapper
15003 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
15004+ dynamic_linker='Win32 ld.exe'
15005 ;;
15006 esac
15007- dynamic_linker='Win32 ld.exe'
15008 # FIXME: first we should search . and the directory the executable is in
15009 shlibpath_var=PATH
15010 ;;
15011@@ -15024,6 +15854,7 @@ fi
15012 fi # test -n "$compiler"
15013
15014 CC=$lt_save_CC
15015+ CFLAGS=$lt_save_CFLAGS
15016 LDCXX=$LD
15017 LD=$lt_save_LD
15018 GCC=$lt_save_GCC
15019@@ -20310,13 +21141,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
15020 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
15021 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
15022 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
15023+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
15024+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
15025 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
15026 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
15027 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
15028 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
15029 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
15030+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
15031+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
15032+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
15033+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
15034 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
15035 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
15036+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
15037 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
15038 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
15039 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
15040@@ -20331,14 +21169,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
15041 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
15042 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
15043 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"`'
15044+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
15045+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
15046 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
15047 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
15048 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
15049-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
15050 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
15051+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
15052 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
15053 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
15054 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
15055+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
15056 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
15057 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
15058 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
15059@@ -20371,12 +21212,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
15060 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
15061 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
15062 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
15063-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
15064 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
15065 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
15066 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
15067 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
15068 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
15069+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
15070 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
15071 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
15072 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
15073@@ -20415,8 +21256,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
15074 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
15075 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
15076 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
15077-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
15078 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
15079+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
15080 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
15081 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
15082 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
15083@@ -20443,12 +21284,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
15084 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
15085 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
15086 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
15087-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
15088 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
15089 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
15090 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
15091 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
15092 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
15093+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
15094 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
15095 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
15096 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
15097@@ -20486,8 +21327,13 @@ reload_flag \
15098 OBJDUMP \
15099 deplibs_check_method \
15100 file_magic_cmd \
15101+file_magic_glob \
15102+want_nocaseglob \
15103+DLLTOOL \
15104+sharedlib_from_linklib_cmd \
15105 AR \
15106 AR_FLAGS \
15107+archiver_list_spec \
15108 STRIP \
15109 RANLIB \
15110 CC \
15111@@ -20497,12 +21343,14 @@ lt_cv_sys_global_symbol_pipe \
15112 lt_cv_sys_global_symbol_to_cdecl \
15113 lt_cv_sys_global_symbol_to_c_name_address \
15114 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
15115+nm_file_list_spec \
15116 lt_prog_compiler_no_builtin_flag \
15117-lt_prog_compiler_wl \
15118 lt_prog_compiler_pic \
15119+lt_prog_compiler_wl \
15120 lt_prog_compiler_static \
15121 lt_cv_prog_compiler_c_o \
15122 need_locks \
15123+MANIFEST_TOOL \
15124 DSYMUTIL \
15125 NMEDIT \
15126 LIPO \
15127@@ -20518,7 +21366,6 @@ no_undefined_flag \
15128 hardcode_libdir_flag_spec \
15129 hardcode_libdir_flag_spec_ld \
15130 hardcode_libdir_separator \
15131-fix_srcfile_path \
15132 exclude_expsyms \
15133 include_expsyms \
15134 file_list_spec \
15135@@ -20540,8 +21387,8 @@ LD_CXX \
15136 reload_flag_CXX \
15137 compiler_CXX \
15138 lt_prog_compiler_no_builtin_flag_CXX \
15139-lt_prog_compiler_wl_CXX \
15140 lt_prog_compiler_pic_CXX \
15141+lt_prog_compiler_wl_CXX \
15142 lt_prog_compiler_static_CXX \
15143 lt_cv_prog_compiler_c_o_CXX \
15144 export_dynamic_flag_spec_CXX \
15145@@ -20553,7 +21400,6 @@ no_undefined_flag_CXX \
15146 hardcode_libdir_flag_spec_CXX \
15147 hardcode_libdir_flag_spec_ld_CXX \
15148 hardcode_libdir_separator_CXX \
15149-fix_srcfile_path_CXX \
15150 exclude_expsyms_CXX \
15151 include_expsyms_CXX \
15152 file_list_spec_CXX \
15153@@ -20587,6 +21433,7 @@ module_cmds \
15154 module_expsym_cmds \
15155 export_symbols_cmds \
15156 prelink_cmds \
15157+postlink_cmds \
15158 postinstall_cmds \
15159 postuninstall_cmds \
15160 finish_cmds \
15161@@ -20601,7 +21448,8 @@ archive_expsym_cmds_CXX \
15162 module_cmds_CXX \
15163 module_expsym_cmds_CXX \
15164 export_symbols_cmds_CXX \
15165-prelink_cmds_CXX; do
15166+prelink_cmds_CXX \
15167+postlink_cmds_CXX; do
15168 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
15169 *[\\\\\\\`\\"\\\$]*)
15170 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
15171@@ -21374,7 +22222,8 @@ $as_echo X"$file" |
15172 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
15173 #
15174 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
15175-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
15176+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
15177+# Inc.
15178 # Written by Gordon Matzigkeit, 1996
15179 #
15180 # This file is part of GNU Libtool.
15181@@ -21477,19 +22326,42 @@ SP2NL=$lt_lt_SP2NL
15182 # turn newlines into spaces.
15183 NL2SP=$lt_lt_NL2SP
15184
15185+# convert \$build file names to \$host format.
15186+to_host_file_cmd=$lt_cv_to_host_file_cmd
15187+
15188+# convert \$build files to toolchain format.
15189+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
15190+
15191 # An object symbol dumper.
15192 OBJDUMP=$lt_OBJDUMP
15193
15194 # Method to check whether dependent libraries are shared objects.
15195 deplibs_check_method=$lt_deplibs_check_method
15196
15197-# Command to use when deplibs_check_method == "file_magic".
15198+# Command to use when deplibs_check_method = "file_magic".
15199 file_magic_cmd=$lt_file_magic_cmd
15200
15201+# How to find potential files when deplibs_check_method = "file_magic".
15202+file_magic_glob=$lt_file_magic_glob
15203+
15204+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
15205+want_nocaseglob=$lt_want_nocaseglob
15206+
15207+# DLL creation program.
15208+DLLTOOL=$lt_DLLTOOL
15209+
15210+# Command to associate shared and link libraries.
15211+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
15212+
15213 # The archiver.
15214 AR=$lt_AR
15215+
15216+# Flags to create an archive.
15217 AR_FLAGS=$lt_AR_FLAGS
15218
15219+# How to feed a file listing to the archiver.
15220+archiver_list_spec=$lt_archiver_list_spec
15221+
15222 # A symbol stripping program.
15223 STRIP=$lt_STRIP
15224
15225@@ -21519,6 +22391,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
15226 # Transform the output of nm in a C name address pair when lib prefix is needed.
15227 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
15228
15229+# Specify filename containing input files for \$NM.
15230+nm_file_list_spec=$lt_nm_file_list_spec
15231+
15232+# The root where to search for dependent libraries,and in which our libraries should be installed.
15233+lt_sysroot=$lt_sysroot
15234+
15235 # The name of the directory that contains temporary libtool files.
15236 objdir=$objdir
15237
15238@@ -21528,6 +22406,9 @@ MAGIC_CMD=$MAGIC_CMD
15239 # Must we lock files when doing compilation?
15240 need_locks=$lt_need_locks
15241
15242+# Manifest tool.
15243+MANIFEST_TOOL=$lt_MANIFEST_TOOL
15244+
15245 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
15246 DSYMUTIL=$lt_DSYMUTIL
15247
15248@@ -21642,12 +22523,12 @@ with_gcc=$GCC
15249 # Compiler flag to turn off builtin functions.
15250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
15251
15252-# How to pass a linker flag through the compiler.
15253-wl=$lt_lt_prog_compiler_wl
15254-
15255 # Additional compiler flags for building library objects.
15256 pic_flag=$lt_lt_prog_compiler_pic
15257
15258+# How to pass a linker flag through the compiler.
15259+wl=$lt_lt_prog_compiler_wl
15260+
15261 # Compiler flag to prevent dynamic linking.
15262 link_static_flag=$lt_lt_prog_compiler_static
15263
15264@@ -21734,9 +22615,6 @@ inherit_rpath=$inherit_rpath
15265 # Whether libtool must link a program against all its dependency libraries.
15266 link_all_deplibs=$link_all_deplibs
15267
15268-# Fix the shell variable \$srcfile for the compiler.
15269-fix_srcfile_path=$lt_fix_srcfile_path
15270-
15271 # Set to "yes" if exported symbols are required.
15272 always_export_symbols=$always_export_symbols
15273
15274@@ -21752,6 +22630,9 @@ include_expsyms=$lt_include_expsyms
15275 # Commands necessary for linking programs (against libraries) with templates.
15276 prelink_cmds=$lt_prelink_cmds
15277
15278+# Commands necessary for finishing linking programs.
15279+postlink_cmds=$lt_postlink_cmds
15280+
15281 # Specify filename containing input files.
15282 file_list_spec=$lt_file_list_spec
15283
15284@@ -21798,210 +22679,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
15285 # if finds mixed CR/LF and LF-only lines. Since sed operates in
15286 # text mode, it properly converts lines to CR/LF. This bash problem
15287 # is reportedly fixed, but why not run on old versions too?
15288- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
15289- || (rm -f "$cfgfile"; exit 1)
15290-
15291- case $xsi_shell in
15292- yes)
15293- cat << \_LT_EOF >> "$cfgfile"
15294-
15295-# func_dirname file append nondir_replacement
15296-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
15297-# otherwise set result to NONDIR_REPLACEMENT.
15298-func_dirname ()
15299-{
15300- case ${1} in
15301- */*) func_dirname_result="${1%/*}${2}" ;;
15302- * ) func_dirname_result="${3}" ;;
15303- esac
15304-}
15305-
15306-# func_basename file
15307-func_basename ()
15308-{
15309- func_basename_result="${1##*/}"
15310-}
15311-
15312-# func_dirname_and_basename file append nondir_replacement
15313-# perform func_basename and func_dirname in a single function
15314-# call:
15315-# dirname: Compute the dirname of FILE. If nonempty,
15316-# add APPEND to the result, otherwise set result
15317-# to NONDIR_REPLACEMENT.
15318-# value returned in "$func_dirname_result"
15319-# basename: Compute filename of FILE.
15320-# value retuned in "$func_basename_result"
15321-# Implementation must be kept synchronized with func_dirname
15322-# and func_basename. For efficiency, we do not delegate to
15323-# those functions but instead duplicate the functionality here.
15324-func_dirname_and_basename ()
15325-{
15326- case ${1} in
15327- */*) func_dirname_result="${1%/*}${2}" ;;
15328- * ) func_dirname_result="${3}" ;;
15329- esac
15330- func_basename_result="${1##*/}"
15331-}
15332-
15333-# func_stripname prefix suffix name
15334-# strip PREFIX and SUFFIX off of NAME.
15335-# PREFIX and SUFFIX must not contain globbing or regex special
15336-# characters, hashes, percent signs, but SUFFIX may contain a leading
15337-# dot (in which case that matches only a dot).
15338-func_stripname ()
15339-{
15340- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
15341- # positional parameters, so assign one to ordinary parameter first.
15342- func_stripname_result=${3}
15343- func_stripname_result=${func_stripname_result#"${1}"}
15344- func_stripname_result=${func_stripname_result%"${2}"}
15345-}
15346-
15347-# func_opt_split
15348-func_opt_split ()
15349-{
15350- func_opt_split_opt=${1%%=*}
15351- func_opt_split_arg=${1#*=}
15352-}
15353-
15354-# func_lo2o object
15355-func_lo2o ()
15356-{
15357- case ${1} in
15358- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
15359- *) func_lo2o_result=${1} ;;
15360- esac
15361-}
15362-
15363-# func_xform libobj-or-source
15364-func_xform ()
15365-{
15366- func_xform_result=${1%.*}.lo
15367-}
15368-
15369-# func_arith arithmetic-term...
15370-func_arith ()
15371-{
15372- func_arith_result=$(( $* ))
15373-}
15374-
15375-# func_len string
15376-# STRING may not start with a hyphen.
15377-func_len ()
15378-{
15379- func_len_result=${#1}
15380-}
15381-
15382-_LT_EOF
15383- ;;
15384- *) # Bourne compatible functions.
15385- cat << \_LT_EOF >> "$cfgfile"
15386-
15387-# func_dirname file append nondir_replacement
15388-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
15389-# otherwise set result to NONDIR_REPLACEMENT.
15390-func_dirname ()
15391-{
15392- # Extract subdirectory from the argument.
15393- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
15394- if test "X$func_dirname_result" = "X${1}"; then
15395- func_dirname_result="${3}"
15396- else
15397- func_dirname_result="$func_dirname_result${2}"
15398- fi
15399-}
15400-
15401-# func_basename file
15402-func_basename ()
15403-{
15404- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
15405-}
15406-
15407-
15408-# func_stripname prefix suffix name
15409-# strip PREFIX and SUFFIX off of NAME.
15410-# PREFIX and SUFFIX must not contain globbing or regex special
15411-# characters, hashes, percent signs, but SUFFIX may contain a leading
15412-# dot (in which case that matches only a dot).
15413-# func_strip_suffix prefix name
15414-func_stripname ()
15415-{
15416- case ${2} in
15417- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
15418- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
15419- esac
15420-}
15421-
15422-# sed scripts:
15423-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
15424-my_sed_long_arg='1s/^-[^=]*=//'
15425-
15426-# func_opt_split
15427-func_opt_split ()
15428-{
15429- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
15430- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
15431-}
15432-
15433-# func_lo2o object
15434-func_lo2o ()
15435-{
15436- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
15437-}
15438-
15439-# func_xform libobj-or-source
15440-func_xform ()
15441-{
15442- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
15443-}
15444-
15445-# func_arith arithmetic-term...
15446-func_arith ()
15447-{
15448- func_arith_result=`expr "$@"`
15449-}
15450-
15451-# func_len string
15452-# STRING may not start with a hyphen.
15453-func_len ()
15454-{
15455- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
15456-}
15457-
15458-_LT_EOF
15459-esac
15460-
15461-case $lt_shell_append in
15462- yes)
15463- cat << \_LT_EOF >> "$cfgfile"
15464-
15465-# func_append var value
15466-# Append VALUE to the end of shell variable VAR.
15467-func_append ()
15468-{
15469- eval "$1+=\$2"
15470-}
15471-_LT_EOF
15472- ;;
15473- *)
15474- cat << \_LT_EOF >> "$cfgfile"
15475-
15476-# func_append var value
15477-# Append VALUE to the end of shell variable VAR.
15478-func_append ()
15479-{
15480- eval "$1=\$$1\$2"
15481-}
15482-
15483-_LT_EOF
15484- ;;
15485- esac
15486-
15487-
15488- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
15489- || (rm -f "$cfgfile"; exit 1)
15490-
15491- mv -f "$cfgfile" "$ofile" ||
15492+ sed '$q' "$ltmain" >> "$cfgfile" \
15493+ || (rm -f "$cfgfile"; exit 1)
15494+
15495+ if test x"$xsi_shell" = xyes; then
15496+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
15497+func_dirname ()\
15498+{\
15499+\ case ${1} in\
15500+\ */*) func_dirname_result="${1%/*}${2}" ;;\
15501+\ * ) func_dirname_result="${3}" ;;\
15502+\ esac\
15503+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
15504+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15505+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15506+test 0 -eq $? || _lt_function_replace_fail=:
15507+
15508+
15509+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
15510+func_basename ()\
15511+{\
15512+\ func_basename_result="${1##*/}"\
15513+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
15514+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15515+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15516+test 0 -eq $? || _lt_function_replace_fail=:
15517+
15518+
15519+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
15520+func_dirname_and_basename ()\
15521+{\
15522+\ case ${1} in\
15523+\ */*) func_dirname_result="${1%/*}${2}" ;;\
15524+\ * ) func_dirname_result="${3}" ;;\
15525+\ esac\
15526+\ func_basename_result="${1##*/}"\
15527+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
15528+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15529+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15530+test 0 -eq $? || _lt_function_replace_fail=:
15531+
15532+
15533+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
15534+func_stripname ()\
15535+{\
15536+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
15537+\ # positional parameters, so assign one to ordinary parameter first.\
15538+\ func_stripname_result=${3}\
15539+\ func_stripname_result=${func_stripname_result#"${1}"}\
15540+\ func_stripname_result=${func_stripname_result%"${2}"}\
15541+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
15542+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15543+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15544+test 0 -eq $? || _lt_function_replace_fail=:
15545+
15546+
15547+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
15548+func_split_long_opt ()\
15549+{\
15550+\ func_split_long_opt_name=${1%%=*}\
15551+\ func_split_long_opt_arg=${1#*=}\
15552+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
15553+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15554+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15555+test 0 -eq $? || _lt_function_replace_fail=:
15556+
15557+
15558+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
15559+func_split_short_opt ()\
15560+{\
15561+\ func_split_short_opt_arg=${1#??}\
15562+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
15563+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
15564+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15565+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15566+test 0 -eq $? || _lt_function_replace_fail=:
15567+
15568+
15569+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
15570+func_lo2o ()\
15571+{\
15572+\ case ${1} in\
15573+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
15574+\ *) func_lo2o_result=${1} ;;\
15575+\ esac\
15576+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
15577+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15578+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15579+test 0 -eq $? || _lt_function_replace_fail=:
15580+
15581+
15582+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
15583+func_xform ()\
15584+{\
15585+ func_xform_result=${1%.*}.lo\
15586+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
15587+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15588+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15589+test 0 -eq $? || _lt_function_replace_fail=:
15590+
15591+
15592+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
15593+func_arith ()\
15594+{\
15595+ func_arith_result=$(( $* ))\
15596+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
15597+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15598+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15599+test 0 -eq $? || _lt_function_replace_fail=:
15600+
15601+
15602+ sed -e '/^func_len ()$/,/^} # func_len /c\
15603+func_len ()\
15604+{\
15605+ func_len_result=${#1}\
15606+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
15607+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15608+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15609+test 0 -eq $? || _lt_function_replace_fail=:
15610+
15611+fi
15612+
15613+if test x"$lt_shell_append" = xyes; then
15614+ sed -e '/^func_append ()$/,/^} # func_append /c\
15615+func_append ()\
15616+{\
15617+ eval "${1}+=\\${2}"\
15618+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
15619+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15620+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15621+test 0 -eq $? || _lt_function_replace_fail=:
15622+
15623+
15624+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
15625+func_append_quoted ()\
15626+{\
15627+\ func_quote_for_eval "${2}"\
15628+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
15629+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
15630+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15631+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15632+test 0 -eq $? || _lt_function_replace_fail=:
15633+
15634+
15635+ # Save a `func_append' function call where possible by direct use of '+='
15636+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
15637+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15638+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15639+ test 0 -eq $? || _lt_function_replace_fail=:
15640+else
15641+ # Save a `func_append' function call even when '+=' is not available
15642+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
15643+ && mv -f "$cfgfile.tmp" "$cfgfile" \
15644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
15645+ test 0 -eq $? || _lt_function_replace_fail=:
15646+fi
15647+
15648+if test x"$_lt_function_replace_fail" = x":"; then
15649+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
15650+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
15651+fi
15652+
15653+
15654+ mv -f "$cfgfile" "$ofile" ||
15655 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
15656 chmod +x "$ofile"
15657
15658@@ -22029,12 +22869,12 @@ with_gcc=$GCC_CXX
15659 # Compiler flag to turn off builtin functions.
15660 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
15661
15662-# How to pass a linker flag through the compiler.
15663-wl=$lt_lt_prog_compiler_wl_CXX
15664-
15665 # Additional compiler flags for building library objects.
15666 pic_flag=$lt_lt_prog_compiler_pic_CXX
15667
15668+# How to pass a linker flag through the compiler.
15669+wl=$lt_lt_prog_compiler_wl_CXX
15670+
15671 # Compiler flag to prevent dynamic linking.
15672 link_static_flag=$lt_lt_prog_compiler_static_CXX
15673
15674@@ -22121,9 +22961,6 @@ inherit_rpath=$inherit_rpath_CXX
15675 # Whether libtool must link a program against all its dependency libraries.
15676 link_all_deplibs=$link_all_deplibs_CXX
15677
15678-# Fix the shell variable \$srcfile for the compiler.
15679-fix_srcfile_path=$lt_fix_srcfile_path_CXX
15680-
15681 # Set to "yes" if exported symbols are required.
15682 always_export_symbols=$always_export_symbols_CXX
15683
15684@@ -22139,6 +22976,9 @@ include_expsyms=$lt_include_expsyms_CXX
15685 # Commands necessary for linking programs (against libraries) with templates.
15686 prelink_cmds=$lt_prelink_cmds_CXX
15687
15688+# Commands necessary for finishing linking programs.
15689+postlink_cmds=$lt_postlink_cmds_CXX
15690+
15691 # Specify filename containing input files.
15692 file_list_spec=$lt_file_list_spec_CXX
15693
15694diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
15695index 0a61880ba67..500756cd023 100644
15696--- a/libbacktrace/Makefile.in
15697+++ b/libbacktrace/Makefile.in
15698@@ -1,7 +1,7 @@
15699-# Makefile.in generated by automake 1.15.1 from Makefile.am.
15700+# Makefile.in generated by automake 1.16.5 from Makefile.am.
15701 # @configure_input@
15702
15703-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
15704+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
15705
15706 # This Makefile.in is free software; the Free Software Foundation
15707 # gives unlimited permission to copy and/or distribute it,
15708@@ -189,6 +189,35 @@ CONFIG_HEADER = config.h
15709 CONFIG_CLEAN_FILES = backtrace-supported.h \
15710 install-debuginfo-for-buildid.sh
15711 CONFIG_CLEAN_VPATH_FILES =
15712+@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
15713+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
15714+@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
15715+@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
15716+@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \
15717+@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \
15718+@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \
15719+@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT)
15720+@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
15721+@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
15722+@NATIVE_TRUE@ stest_alloc$(EXEEXT)
15723+@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
15724+@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT)
15725+@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
15726+@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
15727+@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT)
15728+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \
15729+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \
15730+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \
15731+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \
15732+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT)
15733+@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
15734+@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT)
15735+@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT)
15736+@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT)
15737+am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
15738+ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
15739+ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
15740+ $(am__EXEEXT_13)
15741 LTLIBRARIES = $(noinst_LTLIBRARIES)
15742 am__DEPENDENCIES_1 =
15743 am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
15744@@ -220,35 +249,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS = \
15745 libbacktrace_noformat_la_OBJECTS = \
15746 $(am_libbacktrace_noformat_la_OBJECTS)
15747 @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath =
15748-@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
15749-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
15750-@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
15751-@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
15752-@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \
15753-@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \
15754-@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \
15755-@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT)
15756-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
15757-@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
15758-@NATIVE_TRUE@ stest_alloc$(EXEEXT)
15759-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
15760-@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT)
15761-@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
15762-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
15763-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT)
15764-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \
15765-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \
15766-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \
15767-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \
15768-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT)
15769-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
15770-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT)
15771-@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT)
15772-@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT)
15773-am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
15774- $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
15775- $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
15776- $(am__EXEEXT_13)
15777 @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \
15778 @NATIVE_TRUE@ allocfail-testlib.$(OBJEXT)
15779 allocfail_OBJECTS = $(am_allocfail_OBJECTS)
15780@@ -536,7 +536,7 @@ am__v_at_0 = @
15781 am__v_at_1 =
15782 DEFAULT_INCLUDES = -I.@am__isrc@
15783 depcomp =
15784-am__depfiles_maybe =
15785+am__maybe_remake_depfiles =
15786 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
15787 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
15788 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15789@@ -579,8 +579,8 @@ am__can_run_installinfo = \
15790 n|no|NO) false;; \
15791 *) (install-info --version) >/dev/null 2>&1;; \
15792 esac
15793-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
15794- $(LISP)config.h.in
15795+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
15796+ config.h.in
15797 # Read a list of newline-separated strings from the standard input,
15798 # and print each of them once, without duplicates. Input order is
15799 # *not* preserved.
15800@@ -597,9 +597,6 @@ am__define_uniq_tagged_files = \
15801 unique=`for i in $$list; do \
15802 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15803 done | $(am__uniquify_input)`
15804-ETAGS = etags
15805-CTAGS = ctags
15806-CSCOPE = cscope
15807 AM_RECURSIVE_TARGETS = cscope check recheck
15808 am__tty_colors_dummy = \
15809 mgn= red= grn= lgn= blu= brg= std=; \
15810@@ -783,6 +780,7 @@ am__set_TESTS_bases = \
15811 bases='$(TEST_LOGS)'; \
15812 bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
15813 bases=`echo $$bases`
15814+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
15815 RECHECK_LOGS = $(TEST_LOGS)
15816 TEST_SUITE_LOG = test-suite.log
15817 TEST_EXTENSIONS = @EXEEXT@ .test
15818@@ -825,8 +823,11 @@ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@
15819 COMM = @COMM@
15820 CPP = @CPP@
15821 CPPFLAGS = @CPPFLAGS@
15822+CSCOPE = @CSCOPE@
15823+CTAGS = @CTAGS@
15824 CYGPATH_W = @CYGPATH_W@
15825 DEFS = @DEFS@
15826+DLLTOOL = @DLLTOOL@
15827 DSYMUTIL = @DSYMUTIL@
15828 DUMPBIN = @DUMPBIN@
15829 DWZ = @DWZ@
15830@@ -834,6 +835,7 @@ ECHO_C = @ECHO_C@
15831 ECHO_N = @ECHO_N@
15832 ECHO_T = @ECHO_T@
15833 EGREP = @EGREP@
15834+ETAGS = @ETAGS@
15835 EXEEXT = @EXEEXT@
15836 EXTRA_FLAGS = @EXTRA_FLAGS@
15837 FGREP = @FGREP@
15838@@ -854,6 +856,7 @@ LN_S = @LN_S@
15839 LTLIBOBJS = @LTLIBOBJS@
15840 MAINT = @MAINT@
15841 MAKEINFO = @MAKEINFO@
15842+MANIFEST_TOOL = @MANIFEST_TOOL@
15843 MKDIR_P = @MKDIR_P@
15844 NM = @NM@
15845 NMEDIT = @NMEDIT@
15846@@ -886,6 +889,7 @@ abs_builddir = @abs_builddir@
15847 abs_srcdir = @abs_srcdir@
15848 abs_top_builddir = @abs_top_builddir@
15849 abs_top_srcdir = @abs_top_srcdir@
15850+ac_ct_AR = @ac_ct_AR@
15851 ac_ct_CC = @ac_ct_CC@
15852 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
15853 am__leading_dot = @am__leading_dot@
15854@@ -1178,8 +1182,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15855 echo ' $(SHELL) ./config.status'; \
15856 $(SHELL) ./config.status;; \
15857 *) \
15858- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
15859- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
15860+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
15861+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
15862 esac;
15863 $(top_srcdir)/../multilib.am $(am__empty):
15864
15865@@ -1211,6 +1215,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support
15866 install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in
15867 cd $(top_builddir) && $(SHELL) ./config.status $@
15868
15869+clean-checkPROGRAMS:
15870+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
15871+ echo " rm -f" $$list; \
15872+ rm -f $$list || exit $$?; \
15873+ test -n "$(EXEEXT)" || exit 0; \
15874+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
15875+ echo " rm -f" $$list; \
15876+ rm -f $$list
15877+
15878 clean-checkLTLIBRARIES:
15879 -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
15880 @list='$(check_LTLIBRARIES)'; \
15881@@ -1248,15 +1261,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS
15882 libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES)
15883 $(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS)
15884
15885-clean-checkPROGRAMS:
15886- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
15887- echo " rm -f" $$list; \
15888- rm -f $$list || exit $$?; \
15889- test -n "$(EXEEXT)" || exit 0; \
15890- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
15891- echo " rm -f" $$list; \
15892- rm -f $$list
15893-
15894 allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES)
15895 @rm -f allocfail$(EXEEXT)
15896 $(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS)
15897@@ -1959,7 +1963,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
15898 test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
15899 fi; \
15900 echo "$${col}$$br$${std}"; \
15901- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
15902+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
15903 echo "$${col}$$br$${std}"; \
15904 create_testsuite_report --maybe-color; \
15905 echo "$$col$$br$$std"; \
15906@@ -1972,7 +1976,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
15907 fi; \
15908 $$success || exit 1
15909
15910-check-TESTS:
15911+check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA)
15912 @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
15913 @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
15914 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
15915@@ -1982,7 +1986,7 @@ check-TESTS:
15916 log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
15917 $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
15918 exit $$?;
15919-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_DATA)
15920+recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA)
15921 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
15922 @set +e; $(am__set_TESTS_bases); \
15923 bases=`for i in $$bases; do echo $$i; done \
15924@@ -2260,7 +2264,7 @@ xztest_alloc.log: xztest_alloc$(EXEEXT)
15925 @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
15926 @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
15927 check-am: all-am
15928- $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \
15929+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \
15930 $(check_DATA)
15931 $(MAKE) $(AM_MAKEFLAGS) check-TESTS
15932 check: check-am
15933diff --git a/libbacktrace/aclocal.m4 b/libbacktrace/aclocal.m4
15934index 528e6173930..d88a5ec84f2 100644
15935--- a/libbacktrace/aclocal.m4
15936+++ b/libbacktrace/aclocal.m4
15937@@ -1,6 +1,6 @@
15938-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
15939+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
15940
15941-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
15942+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
15943
15944 # This file is free software; the Free Software Foundation
15945 # gives unlimited permission to copy and/or distribute it,
15946@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
15947 If you have problems, you may need to regenerate the build system entirely.
15948 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
15949
15950-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
15951+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
15952 #
15953 # This file is free software; the Free Software Foundation
15954 # gives unlimited permission to copy and/or distribute it,
15955@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
15956 # generated from the m4 files accompanying Automake X.Y.
15957 # (This private macro should not be called outside this file.)
15958 AC_DEFUN([AM_AUTOMAKE_VERSION],
15959-[am__api_version='1.15'
15960+[am__api_version='1.16'
15961 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
15962 dnl require some minimum version. Point them to the right macro.
15963-m4_if([$1], [1.15.1], [],
15964+m4_if([$1], [1.16.5], [],
15965 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
15966 ])
15967
15968@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
15969 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
15970 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
15971 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
15972-[AM_AUTOMAKE_VERSION([1.15.1])dnl
15973+[AM_AUTOMAKE_VERSION([1.16.5])dnl
15974 m4_ifndef([AC_AUTOCONF_VERSION],
15975 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
15976 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
15977
15978 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
15979
15980-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
15981+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
15982 #
15983 # This file is free software; the Free Software Foundation
15984 # gives unlimited permission to copy and/or distribute it,
15985@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
15986
15987 # AM_CONDITIONAL -*- Autoconf -*-
15988
15989-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
15990+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
15991 #
15992 # This file is free software; the Free Software Foundation
15993 # gives unlimited permission to copy and/or distribute it,
15994@@ -143,7 +143,7 @@ fi])])
15995
15996 # Do all the work for Automake. -*- Autoconf -*-
15997
15998-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
15999+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
16000 #
16001 # This file is free software; the Free Software Foundation
16002 # gives unlimited permission to copy and/or distribute it,
16003@@ -171,6 +171,10 @@ m4_defn([AC_PROG_CC])
16004 # release and drop the old call support.
16005 AC_DEFUN([AM_INIT_AUTOMAKE],
16006 [AC_PREREQ([2.65])dnl
16007+m4_ifdef([_$0_ALREADY_INIT],
16008+ [m4_fatal([$0 expanded multiple times
16009+]m4_defn([_$0_ALREADY_INIT]))],
16010+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
16011 dnl Autoconf wants to disallow AM_ names. We explicitly allow
16012 dnl the ones we care about.
16013 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
16014@@ -207,7 +211,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
16015 [_AM_SET_OPTIONS([$1])dnl
16016 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
16017 m4_if(
16018- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
16019+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
16020 [ok:ok],,
16021 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
16022 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
16023@@ -230,8 +234,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
16024 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
16025 # For better backward compatibility. To be removed once Automake 1.9.x
16026 # dies out for good. For more background, see:
16027-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
16028-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
16029+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
16030+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
16031 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
16032 # We need awk for the "check" target (and possibly the TAP driver). The
16033 # system "awk" is bad on some platforms.
16034@@ -259,6 +263,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
16035 [m4_define([AC_PROG_OBJCXX],
16036 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
16037 ])
16038+# Variables for tags utilities; see am/tags.am
16039+if test -z "$CTAGS"; then
16040+ CTAGS=ctags
16041+fi
16042+AC_SUBST([CTAGS])
16043+if test -z "$ETAGS"; then
16044+ ETAGS=etags
16045+fi
16046+AC_SUBST([ETAGS])
16047+if test -z "$CSCOPE"; then
16048+ CSCOPE=cscope
16049+fi
16050+AC_SUBST([CSCOPE])
16051+
16052 AC_REQUIRE([AM_SILENT_RULES])dnl
16053 dnl The testsuite driver may need to know about EXEEXT, so add the
16054 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
16055@@ -298,7 +316,7 @@ END
16056 Aborting the configuration process, to ensure you take notice of the issue.
16057
16058 You can download and install GNU coreutils to get an 'rm' implementation
16059-that behaves properly: <http://www.gnu.org/software/coreutils/>.
16060+that behaves properly: <https://www.gnu.org/software/coreutils/>.
16061
16062 If you want to complete the configuration process using your problematic
16063 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
16064@@ -340,7 +358,7 @@ for _am_header in $config_headers :; do
16065 done
16066 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
16067
16068-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
16069+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
16070 #
16071 # This file is free software; the Free Software Foundation
16072 # gives unlimited permission to copy and/or distribute it,
16073@@ -364,7 +382,7 @@ AC_SUBST([install_sh])])
16074 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
16075 # From Jim Meyering
16076
16077-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
16078+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
16079 #
16080 # This file is free software; the Free Software Foundation
16081 # gives unlimited permission to copy and/or distribute it,
16082@@ -399,7 +417,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
16083
16084 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
16085
16086-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
16087+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
16088 #
16089 # This file is free software; the Free Software Foundation
16090 # gives unlimited permission to copy and/or distribute it,
16091@@ -420,12 +438,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
16092 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
16093 AC_REQUIRE_AUX_FILE([missing])dnl
16094 if test x"${MISSING+set}" != xset; then
16095- case $am_aux_dir in
16096- *\ * | *\ *)
16097- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
16098- *)
16099- MISSING="\${SHELL} $am_aux_dir/missing" ;;
16100- esac
16101+ MISSING="\${SHELL} '$am_aux_dir/missing'"
16102 fi
16103 # Use eval to expand $SHELL
16104 if eval "$MISSING --is-lightweight"; then
16105@@ -438,7 +451,7 @@ fi
16106
16107 # Helper functions for option handling. -*- Autoconf -*-
16108
16109-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
16110+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
16111 #
16112 # This file is free software; the Free Software Foundation
16113 # gives unlimited permission to copy and/or distribute it,
16114@@ -467,7 +480,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
16115 AC_DEFUN([_AM_IF_OPTION],
16116 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
16117
16118-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
16119+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
16120 #
16121 # This file is free software; the Free Software Foundation
16122 # gives unlimited permission to copy and/or distribute it,
16123@@ -514,7 +527,7 @@ AC_LANG_POP([C])])
16124 # For backward compatibility.
16125 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
16126
16127-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
16128+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
16129 #
16130 # This file is free software; the Free Software Foundation
16131 # gives unlimited permission to copy and/or distribute it,
16132@@ -533,7 +546,7 @@ AC_DEFUN([AM_RUN_LOG],
16133
16134 # Check to make sure that the build environment is sane. -*- Autoconf -*-
16135
16136-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
16137+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
16138 #
16139 # This file is free software; the Free Software Foundation
16140 # gives unlimited permission to copy and/or distribute it,
16141@@ -614,7 +627,7 @@ AC_CONFIG_COMMANDS_PRE(
16142 rm -f conftest.file
16143 ])
16144
16145-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
16146+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
16147 #
16148 # This file is free software; the Free Software Foundation
16149 # gives unlimited permission to copy and/or distribute it,
16150@@ -674,7 +687,7 @@ AC_SUBST([AM_BACKSLASH])dnl
16151 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
16152 ])
16153
16154-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
16155+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
16156 #
16157 # This file is free software; the Free Software Foundation
16158 # gives unlimited permission to copy and/or distribute it,
16159@@ -702,7 +715,7 @@ fi
16160 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
16161 AC_SUBST([INSTALL_STRIP_PROGRAM])])
16162
16163-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
16164+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
16165 #
16166 # This file is free software; the Free Software Foundation
16167 # gives unlimited permission to copy and/or distribute it,
16168@@ -721,7 +734,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
16169
16170 # Check how to create a tarball. -*- Autoconf -*-
16171
16172-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
16173+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
16174 #
16175 # This file is free software; the Free Software Foundation
16176 # gives unlimited permission to copy and/or distribute it,
16177diff --git a/libbacktrace/configure b/libbacktrace/configure
16178index e5ca8ad9379..b7c4c4be78d 100755
16179--- a/libbacktrace/configure
16180+++ b/libbacktrace/configure
16181@@ -680,7 +680,10 @@ OTOOL
16182 LIPO
16183 NMEDIT
16184 DSYMUTIL
16185+MANIFEST_TOOL
16186+ac_ct_AR
16187 AR
16188+DLLTOOL
16189 OBJDUMP
16190 LN_S
16191 NM
16192@@ -701,6 +704,9 @@ AM_BACKSLASH
16193 AM_DEFAULT_VERBOSITY
16194 AM_DEFAULT_V
16195 AM_V
16196+CSCOPE
16197+ETAGS
16198+CTAGS
16199 am__untar
16200 am__tar
16201 AMTAR
16202@@ -798,6 +804,7 @@ enable_static
16203 with_pic
16204 enable_fast_install
16205 with_gnu_ld
16206+with_libtool_sysroot
16207 enable_libtool_lock
16208 enable_largefile
16209 enable_cet
16210@@ -1458,6 +1465,8 @@ Optional Packages:
16211 --with-pic try to use only PIC/non-PIC objects [default=use
16212 both]
16213 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
16214+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
16215+ (or the compiler's sysroot if not specified).
16216 --with-system-libunwind use installed libunwind
16217
16218 Some influential environment variables:
16219@@ -4047,7 +4056,7 @@ libtool_VERSION=1:0:0
16220 # -Wall: Issue all automake warnings.
16221 # -Wno-portability: Don't warn about constructs supported by GNU make.
16222 # (because GCC requires GNU make anyhow).
16223-am__api_version='1.15'
16224+am__api_version='1.16'
16225
16226 # Find a good install program. We prefer a C program (faster),
16227 # so one script is as good as another. But avoid the broken or
16228@@ -4220,12 +4229,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
16229 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
16230
16231 if test x"${MISSING+set}" != xset; then
16232- case $am_aux_dir in
16233- *\ * | *\ *)
16234- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
16235- *)
16236- MISSING="\${SHELL} $am_aux_dir/missing" ;;
16237- esac
16238+ MISSING="\${SHELL} '$am_aux_dir/missing'"
16239 fi
16240 # Use eval to expand $SHELL
16241 if eval "$MISSING --is-lightweight"; then
16242@@ -4551,8 +4555,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
16243
16244 # For better backward compatibility. To be removed once Automake 1.9.x
16245 # dies out for good. For more background, see:
16246-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
16247-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
16248+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
16249+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
16250 mkdir_p='$(MKDIR_P)'
16251
16252 # We need awk for the "check" target (and possibly the TAP driver). The
16253@@ -4571,6 +4575,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
16254
16255
16256
16257+# Variables for tags utilities; see am/tags.am
16258+if test -z "$CTAGS"; then
16259+ CTAGS=ctags
16260+fi
16261+
16262+if test -z "$ETAGS"; then
16263+ ETAGS=etags
16264+fi
16265+
16266+if test -z "$CSCOPE"; then
16267+ CSCOPE=cscope
16268+fi
16269+
16270+
16271
16272 # POSIX will say in a future version that running "rm -f" with no argument
16273 # is OK; and we want to be able to make that assumption in our Makefile
16274@@ -4603,7 +4621,7 @@ END
16275 Aborting the configuration process, to ensure you take notice of the issue.
16276
16277 You can download and install GNU coreutils to get an 'rm' implementation
16278-that behaves properly: <http://www.gnu.org/software/coreutils/>.
16279+that behaves properly: <https://www.gnu.org/software/coreutils/>.
16280
16281 If you want to complete the configuration process using your problematic
16282 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
16283@@ -5446,8 +5464,8 @@ esac
16284
16285
16286
16287-macro_version='2.2.7a'
16288-macro_revision='1.3134'
16289+macro_version='2.4'
16290+macro_revision='1.3293'
16291
16292
16293
16294@@ -5487,7 +5505,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16296 $as_echo_n "checking how to print strings... " >&6; }
16297 # Test print first, because it will be a builtin if present.
16298-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
16299+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
16300 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16301 ECHO='print -r --'
16302 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16303@@ -6180,8 +6198,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
16304 # Try some XSI features
16305 xsi_shell=no
16306 ( _lt_dummy="a/b/c"
16307- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
16308- = c,a/b,, \
16309+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
16310+ = c,a/b,b/c, \
16311 && eval 'test $(( 1 + 1 )) -eq 2 \
16312 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16313 && xsi_shell=yes
16314@@ -6230,6 +6248,80 @@ esac
16315
16316
16317
16318+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
16319+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
16320+if ${lt_cv_to_host_file_cmd+:} false; then :
16321+ $as_echo_n "(cached) " >&6
16322+else
16323+ case $host in
16324+ *-*-mingw* )
16325+ case $build in
16326+ *-*-mingw* ) # actually msys
16327+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
16328+ ;;
16329+ *-*-cygwin* )
16330+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
16331+ ;;
16332+ * ) # otherwise, assume *nix
16333+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
16334+ ;;
16335+ esac
16336+ ;;
16337+ *-*-cygwin* )
16338+ case $build in
16339+ *-*-mingw* ) # actually msys
16340+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
16341+ ;;
16342+ *-*-cygwin* )
16343+ lt_cv_to_host_file_cmd=func_convert_file_noop
16344+ ;;
16345+ * ) # otherwise, assume *nix
16346+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
16347+ ;;
16348+ esac
16349+ ;;
16350+ * ) # unhandled hosts (and "normal" native builds)
16351+ lt_cv_to_host_file_cmd=func_convert_file_noop
16352+ ;;
16353+esac
16354+
16355+fi
16356+
16357+to_host_file_cmd=$lt_cv_to_host_file_cmd
16358+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
16359+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
16360+
16361+
16362+
16363+
16364+
16365+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
16366+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
16367+if ${lt_cv_to_tool_file_cmd+:} false; then :
16368+ $as_echo_n "(cached) " >&6
16369+else
16370+ #assume ordinary cross tools, or native build.
16371+lt_cv_to_tool_file_cmd=func_convert_file_noop
16372+case $host in
16373+ *-*-mingw* )
16374+ case $build in
16375+ *-*-mingw* ) # actually msys
16376+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
16377+ ;;
16378+ esac
16379+ ;;
16380+esac
16381+
16382+fi
16383+
16384+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16385+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
16386+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
16387+
16388+
16389+
16390+
16391+
16392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16393 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16394 if ${lt_cv_ld_reload_flag+:} false; then :
16395@@ -6246,6 +6338,11 @@ case $reload_flag in
16396 esac
16397 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16398 case $host_os in
16399+ cygwin* | mingw* | pw32* | cegcc*)
16400+ if test "$GCC" != yes; then
16401+ reload_cmds=false
16402+ fi
16403+ ;;
16404 darwin*)
16405 if test "$GCC" = yes; then
16406 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16407@@ -6414,7 +6511,8 @@ mingw* | pw32*)
16408 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16409 lt_cv_file_magic_cmd='func_win32_libid'
16410 else
16411- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
16412+ # Keep this pattern in sync with the one in func_win32_libid.
16413+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
16414 lt_cv_file_magic_cmd='$OBJDUMP -f'
16415 fi
16416 ;;
16417@@ -6573,6 +6671,21 @@ esac
16418 fi
16419 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16420 $as_echo "$lt_cv_deplibs_check_method" >&6; }
16421+
16422+file_magic_glob=
16423+want_nocaseglob=no
16424+if test "$build" = "$host"; then
16425+ case $host_os in
16426+ mingw* | pw32*)
16427+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
16428+ want_nocaseglob=yes
16429+ else
16430+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
16431+ fi
16432+ ;;
16433+ esac
16434+fi
16435+
16436 file_magic_cmd=$lt_cv_file_magic_cmd
16437 deplibs_check_method=$lt_cv_deplibs_check_method
16438 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16439@@ -6588,6 +6701,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
16440
16441
16442
16443+
16444+
16445+
16446+
16447+
16448+
16449+
16450+
16451+
16452+
16453+if test -n "$ac_tool_prefix"; then
16454+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
16455+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
16456+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16457+$as_echo_n "checking for $ac_word... " >&6; }
16458+if ${ac_cv_prog_DLLTOOL+:} false; then :
16459+ $as_echo_n "(cached) " >&6
16460+else
16461+ if test -n "$DLLTOOL"; then
16462+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
16463+else
16464+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16465+for as_dir in $PATH
16466+do
16467+ IFS=$as_save_IFS
16468+ test -z "$as_dir" && as_dir=.
16469+ for ac_exec_ext in '' $ac_executable_extensions; do
16470+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16471+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
16472+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16473+ break 2
16474+ fi
16475+done
16476+ done
16477+IFS=$as_save_IFS
16478+
16479+fi
16480+fi
16481+DLLTOOL=$ac_cv_prog_DLLTOOL
16482+if test -n "$DLLTOOL"; then
16483+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
16484+$as_echo "$DLLTOOL" >&6; }
16485+else
16486+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16487+$as_echo "no" >&6; }
16488+fi
16489+
16490+
16491+fi
16492+if test -z "$ac_cv_prog_DLLTOOL"; then
16493+ ac_ct_DLLTOOL=$DLLTOOL
16494+ # Extract the first word of "dlltool", so it can be a program name with args.
16495+set dummy dlltool; ac_word=$2
16496+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16497+$as_echo_n "checking for $ac_word... " >&6; }
16498+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
16499+ $as_echo_n "(cached) " >&6
16500+else
16501+ if test -n "$ac_ct_DLLTOOL"; then
16502+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
16503+else
16504+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16505+for as_dir in $PATH
16506+do
16507+ IFS=$as_save_IFS
16508+ test -z "$as_dir" && as_dir=.
16509+ for ac_exec_ext in '' $ac_executable_extensions; do
16510+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16511+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
16512+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16513+ break 2
16514+ fi
16515+done
16516+ done
16517+IFS=$as_save_IFS
16518+
16519+fi
16520+fi
16521+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
16522+if test -n "$ac_ct_DLLTOOL"; then
16523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
16524+$as_echo "$ac_ct_DLLTOOL" >&6; }
16525+else
16526+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16527+$as_echo "no" >&6; }
16528+fi
16529+
16530+ if test "x$ac_ct_DLLTOOL" = x; then
16531+ DLLTOOL="false"
16532+ else
16533+ case $cross_compiling:$ac_tool_warned in
16534+yes:)
16535+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
16536+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16537+ac_tool_warned=yes ;;
16538+esac
16539+ DLLTOOL=$ac_ct_DLLTOOL
16540+ fi
16541+else
16542+ DLLTOOL="$ac_cv_prog_DLLTOOL"
16543+fi
16544+
16545+test -z "$DLLTOOL" && DLLTOOL=dlltool
16546+
16547+
16548+
16549+
16550+
16551+
16552+
16553+
16554+
16555+
16556+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
16557+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
16558+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
16559+ $as_echo_n "(cached) " >&6
16560+else
16561+ lt_cv_sharedlib_from_linklib_cmd='unknown'
16562+
16563+case $host_os in
16564+cygwin* | mingw* | pw32* | cegcc*)
16565+ # two different shell functions defined in ltmain.sh
16566+ # decide which to use based on capabilities of $DLLTOOL
16567+ case `$DLLTOOL --help 2>&1` in
16568+ *--identify-strict*)
16569+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
16570+ ;;
16571+ *)
16572+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
16573+ ;;
16574+ esac
16575+ ;;
16576+*)
16577+ # fallback: assume linklib IS sharedlib
16578+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
16579+ ;;
16580+esac
16581+
16582+fi
16583+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
16584+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
16585+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
16586+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
16587+
16588+
16589+
16590+
16591+
16592+
16593+
16594 plugin_option=
16595 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
16596 for plugin in $plugin_names; do
16597@@ -6602,8 +6866,10 @@ for plugin in $plugin_names; do
16598 done
16599
16600 if test -n "$ac_tool_prefix"; then
16601- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
16602-set dummy ${ac_tool_prefix}ar; ac_word=$2
16603+ for ac_prog in ar
16604+ do
16605+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
16606+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
16607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16608 $as_echo_n "checking for $ac_word... " >&6; }
16609 if ${ac_cv_prog_AR+:} false; then :
16610@@ -6619,7 +6885,7 @@ do
16611 test -z "$as_dir" && as_dir=.
16612 for ac_exec_ext in '' $ac_executable_extensions; do
16613 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16614- ac_cv_prog_AR="${ac_tool_prefix}ar"
16615+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
16616 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16617 break 2
16618 fi
16619@@ -6639,11 +6905,15 @@ $as_echo "no" >&6; }
16620 fi
16621
16622
16623+ test -n "$AR" && break
16624+ done
16625 fi
16626-if test -z "$ac_cv_prog_AR"; then
16627+if test -z "$AR"; then
16628 ac_ct_AR=$AR
16629- # Extract the first word of "ar", so it can be a program name with args.
16630-set dummy ar; ac_word=$2
16631+ for ac_prog in ar
16632+do
16633+ # Extract the first word of "$ac_prog", so it can be a program name with args.
16634+set dummy $ac_prog; ac_word=$2
16635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16636 $as_echo_n "checking for $ac_word... " >&6; }
16637 if ${ac_cv_prog_ac_ct_AR+:} false; then :
16638@@ -6659,7 +6929,7 @@ do
16639 test -z "$as_dir" && as_dir=.
16640 for ac_exec_ext in '' $ac_executable_extensions; do
16641 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16642- ac_cv_prog_ac_ct_AR="ar"
16643+ ac_cv_prog_ac_ct_AR="$ac_prog"
16644 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16645 break 2
16646 fi
16647@@ -6678,6 +6948,10 @@ else
16648 $as_echo "no" >&6; }
16649 fi
16650
16651+
16652+ test -n "$ac_ct_AR" && break
16653+done
16654+
16655 if test "x$ac_ct_AR" = x; then
16656 AR="false"
16657 else
16658@@ -6689,31 +6963,83 @@ ac_tool_warned=yes ;;
16659 esac
16660 AR=$ac_ct_AR
16661 fi
16662-else
16663- AR="$ac_cv_prog_AR"
16664 fi
16665
16666-test -z "$AR" && AR=ar
16667-if test -n "$plugin_option"; then
16668- if $AR --help 2>&1 | grep -q "\--plugin"; then
16669- touch conftest.c
16670- $AR $plugin_option rc conftest.a conftest.c
16671- if test "$?" != 0; then
16672- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
16673+ touch conftest.c
16674+ $AR $plugin_option rc conftest.a conftest.c
16675+ if test "$?" != 0; then
16676+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
16677 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
16678- else
16679- AR="$AR $plugin_option"
16680- fi
16681- rm -f conftest.*
16682+ else
16683+ AR="$AR $plugin_option"
16684 fi
16685-fi
16686-test -z "$AR_FLAGS" && AR_FLAGS=cru
16687+ rm -f conftest.*
16688+: ${AR=ar}
16689+: ${AR_FLAGS=cru}
16690+
16691+
16692+
16693+
16694+
16695
16696
16697
16698
16699
16700
16701+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
16702+$as_echo_n "checking for archiver @FILE support... " >&6; }
16703+if ${lt_cv_ar_at_file+:} false; then :
16704+ $as_echo_n "(cached) " >&6
16705+else
16706+ lt_cv_ar_at_file=no
16707+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16708+/* end confdefs.h. */
16709+
16710+int
16711+main ()
16712+{
16713+
16714+ ;
16715+ return 0;
16716+}
16717+_ACEOF
16718+if ac_fn_c_try_compile "$LINENO"; then :
16719+ echo conftest.$ac_objext > conftest.lst
16720+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
16721+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
16722+ (eval $lt_ar_try) 2>&5
16723+ ac_status=$?
16724+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16725+ test $ac_status = 0; }
16726+ if test "$ac_status" -eq 0; then
16727+ # Ensure the archiver fails upon bogus file names.
16728+ rm -f conftest.$ac_objext libconftest.a
16729+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
16730+ (eval $lt_ar_try) 2>&5
16731+ ac_status=$?
16732+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16733+ test $ac_status = 0; }
16734+ if test "$ac_status" -ne 0; then
16735+ lt_cv_ar_at_file=@
16736+ fi
16737+ fi
16738+ rm -f conftest.* libconftest.a
16739+
16740+fi
16741+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16742+
16743+fi
16744+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
16745+$as_echo "$lt_cv_ar_at_file" >&6; }
16746+
16747+if test "x$lt_cv_ar_at_file" = xno; then
16748+ archiver_list_spec=
16749+else
16750+ archiver_list_spec=$lt_cv_ar_at_file
16751+fi
16752+
16753+
16754
16755
16756
16757@@ -7058,8 +7384,8 @@ esac
16758 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
16759
16760 # Transform an extracted symbol line into symbol name and symbol address
16761-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
16762-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'"
16763+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
16764+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'"
16765
16766 # Handle CRLF in mingw tool chain
16767 opt_cr=
16768@@ -7095,6 +7421,7 @@ for ac_symprfx in "" "_"; do
16769 else
16770 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
16771 fi
16772+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
16773
16774 # Check to see that the pipe works correctly.
16775 pipe_works=no
16776@@ -7136,6 +7463,18 @@ _LT_EOF
16777 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
16778 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
16779 cat <<_LT_EOF > conftest.$ac_ext
16780+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
16781+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
16782+/* DATA imports from DLLs on WIN32 con't be const, because runtime
16783+ relocations are performed -- see ld's documentation on pseudo-relocs. */
16784+# define LT_DLSYM_CONST
16785+#elif defined(__osf__)
16786+/* This system does not cope well with relocations in const data. */
16787+# define LT_DLSYM_CONST
16788+#else
16789+# define LT_DLSYM_CONST const
16790+#endif
16791+
16792 #ifdef __cplusplus
16793 extern "C" {
16794 #endif
16795@@ -7147,7 +7486,7 @@ _LT_EOF
16796 cat <<_LT_EOF >> conftest.$ac_ext
16797
16798 /* The mapping between symbol names and symbols. */
16799-const struct {
16800+LT_DLSYM_CONST struct {
16801 const char *name;
16802 void *address;
16803 }
16804@@ -7173,8 +7512,8 @@ static const void *lt_preloaded_setup() {
16805 _LT_EOF
16806 # Now try linking the two files.
16807 mv conftest.$ac_objext conftstm.$ac_objext
16808- lt_save_LIBS="$LIBS"
16809- lt_save_CFLAGS="$CFLAGS"
16810+ lt_globsym_save_LIBS=$LIBS
16811+ lt_globsym_save_CFLAGS=$CFLAGS
16812 LIBS="conftstm.$ac_objext"
16813 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
16814 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
16815@@ -7184,8 +7523,8 @@ _LT_EOF
16816 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
16817 pipe_works=yes
16818 fi
16819- LIBS="$lt_save_LIBS"
16820- CFLAGS="$lt_save_CFLAGS"
16821+ LIBS=$lt_globsym_save_LIBS
16822+ CFLAGS=$lt_globsym_save_CFLAGS
16823 else
16824 echo "cannot find nm_test_func in $nlist" >&5
16825 fi
16826@@ -7222,6 +7561,18 @@ else
16827 $as_echo "ok" >&6; }
16828 fi
16829
16830+# Response file support.
16831+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
16832+ nm_file_list_spec='@'
16833+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
16834+ nm_file_list_spec='@'
16835+fi
16836+
16837+
16838+
16839+
16840+
16841+
16842
16843
16844
16845@@ -7238,6 +7589,43 @@ fi
16846
16847
16848
16849+
16850+
16851+
16852+
16853+
16854+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
16855+$as_echo_n "checking for sysroot... " >&6; }
16856+
16857+# Check whether --with-libtool-sysroot was given.
16858+if test "${with_libtool_sysroot+set}" = set; then :
16859+ withval=$with_libtool_sysroot;
16860+else
16861+ with_libtool_sysroot=no
16862+fi
16863+
16864+
16865+lt_sysroot=
16866+case ${with_libtool_sysroot} in #(
16867+ yes)
16868+ if test "$GCC" = yes; then
16869+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
16870+ fi
16871+ ;; #(
16872+ /*)
16873+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
16874+ ;; #(
16875+ no|'')
16876+ ;; #(
16877+ *)
16878+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
16879+$as_echo "${with_libtool_sysroot}" >&6; }
16880+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
16881+ ;;
16882+esac
16883+
16884+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
16885+$as_echo "${lt_sysroot:-no}" >&6; }
16886
16887
16888
16889@@ -7404,50 +7792,167 @@ _ACEOF
16890 if ac_fn_c_try_link "$LINENO"; then :
16891 lt_cv_cc_needs_belf=yes
16892 else
16893- lt_cv_cc_needs_belf=no
16894+ lt_cv_cc_needs_belf=no
16895+fi
16896+rm -f core conftest.err conftest.$ac_objext \
16897+ conftest$ac_exeext conftest.$ac_ext
16898+ ac_ext=c
16899+ac_cpp='$CPP $CPPFLAGS'
16900+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
16901+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
16902+ac_compiler_gnu=$ac_cv_c_compiler_gnu
16903+
16904+fi
16905+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
16906+$as_echo "$lt_cv_cc_needs_belf" >&6; }
16907+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
16908+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
16909+ CFLAGS="$SAVE_CFLAGS"
16910+ fi
16911+ ;;
16912+sparc*-*solaris*)
16913+ # Find out which ABI we are using.
16914+ echo 'int i;' > conftest.$ac_ext
16915+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
16916+ (eval $ac_compile) 2>&5
16917+ ac_status=$?
16918+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16919+ test $ac_status = 0; }; then
16920+ case `/usr/bin/file conftest.o` in
16921+ *64-bit*)
16922+ case $lt_cv_prog_gnu_ld in
16923+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
16924+ *)
16925+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
16926+ LD="${LD-ld} -64"
16927+ fi
16928+ ;;
16929+ esac
16930+ ;;
16931+ esac
16932+ fi
16933+ rm -rf conftest*
16934+ ;;
16935+esac
16936+
16937+need_locks="$enable_libtool_lock"
16938+
16939+if test -n "$ac_tool_prefix"; then
16940+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
16941+set dummy ${ac_tool_prefix}mt; ac_word=$2
16942+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16943+$as_echo_n "checking for $ac_word... " >&6; }
16944+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
16945+ $as_echo_n "(cached) " >&6
16946+else
16947+ if test -n "$MANIFEST_TOOL"; then
16948+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
16949+else
16950+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16951+for as_dir in $PATH
16952+do
16953+ IFS=$as_save_IFS
16954+ test -z "$as_dir" && as_dir=.
16955+ for ac_exec_ext in '' $ac_executable_extensions; do
16956+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16957+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
16958+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16959+ break 2
16960+ fi
16961+done
16962+ done
16963+IFS=$as_save_IFS
16964+
16965+fi
16966+fi
16967+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
16968+if test -n "$MANIFEST_TOOL"; then
16969+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
16970+$as_echo "$MANIFEST_TOOL" >&6; }
16971+else
16972+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16973+$as_echo "no" >&6; }
16974+fi
16975+
16976+
16977+fi
16978+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
16979+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
16980+ # Extract the first word of "mt", so it can be a program name with args.
16981+set dummy mt; ac_word=$2
16982+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16983+$as_echo_n "checking for $ac_word... " >&6; }
16984+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
16985+ $as_echo_n "(cached) " >&6
16986+else
16987+ if test -n "$ac_ct_MANIFEST_TOOL"; then
16988+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
16989+else
16990+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16991+for as_dir in $PATH
16992+do
16993+ IFS=$as_save_IFS
16994+ test -z "$as_dir" && as_dir=.
16995+ for ac_exec_ext in '' $ac_executable_extensions; do
16996+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16997+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
16998+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16999+ break 2
17000+ fi
17001+done
17002+ done
17003+IFS=$as_save_IFS
17004+
17005+fi
17006+fi
17007+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
17008+if test -n "$ac_ct_MANIFEST_TOOL"; then
17009+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
17010+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
17011+else
17012+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17013+$as_echo "no" >&6; }
17014 fi
17015-rm -f core conftest.err conftest.$ac_objext \
17016- conftest$ac_exeext conftest.$ac_ext
17017- ac_ext=c
17018-ac_cpp='$CPP $CPPFLAGS'
17019-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
17020-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
17021-ac_compiler_gnu=$ac_cv_c_compiler_gnu
17022
17023-fi
17024-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
17025-$as_echo "$lt_cv_cc_needs_belf" >&6; }
17026- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
17027- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
17028- CFLAGS="$SAVE_CFLAGS"
17029+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
17030+ MANIFEST_TOOL=":"
17031+ else
17032+ case $cross_compiling:$ac_tool_warned in
17033+yes:)
17034+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17035+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17036+ac_tool_warned=yes ;;
17037+esac
17038+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
17039 fi
17040- ;;
17041-sparc*-*solaris*)
17042- # Find out which ABI we are using.
17043- echo 'int i;' > conftest.$ac_ext
17044- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
17045- (eval $ac_compile) 2>&5
17046- ac_status=$?
17047- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17048- test $ac_status = 0; }; then
17049- case `/usr/bin/file conftest.o` in
17050- *64-bit*)
17051- case $lt_cv_prog_gnu_ld in
17052- yes*) LD="${LD-ld} -m elf64_sparc" ;;
17053- *)
17054- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
17055- LD="${LD-ld} -64"
17056- fi
17057- ;;
17058- esac
17059- ;;
17060- esac
17061+else
17062+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
17063+fi
17064+
17065+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
17066+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
17067+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
17068+if ${lt_cv_path_mainfest_tool+:} false; then :
17069+ $as_echo_n "(cached) " >&6
17070+else
17071+ lt_cv_path_mainfest_tool=no
17072+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
17073+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
17074+ cat conftest.err >&5
17075+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
17076+ lt_cv_path_mainfest_tool=yes
17077 fi
17078- rm -rf conftest*
17079- ;;
17080-esac
17081+ rm -f conftest*
17082+fi
17083+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
17084+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
17085+if test "x$lt_cv_path_mainfest_tool" != xyes; then
17086+ MANIFEST_TOOL=:
17087+fi
17088+
17089+
17090+
17091
17092-need_locks="$enable_libtool_lock"
17093
17094
17095 case $host_os in
17096@@ -8012,6 +8517,8 @@ _LT_EOF
17097 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17098 echo "$AR cru libconftest.a conftest.o" >&5
17099 $AR cru libconftest.a conftest.o 2>&5
17100+ echo "$RANLIB libconftest.a" >&5
17101+ $RANLIB libconftest.a 2>&5
17102 cat > conftest.c << _LT_EOF
17103 int main() { return 0;}
17104 _LT_EOF
17105@@ -8596,8 +9103,6 @@ fi
17106 lt_prog_compiler_pic=
17107 lt_prog_compiler_static=
17108
17109-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17110-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17111
17112 if test "$GCC" = yes; then
17113 lt_prog_compiler_wl='-Wl,'
17114@@ -8763,6 +9268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17115 lt_prog_compiler_pic='--shared'
17116 lt_prog_compiler_static='--static'
17117 ;;
17118+ nagfor*)
17119+ # NAG Fortran compiler
17120+ lt_prog_compiler_wl='-Wl,-Wl,,'
17121+ lt_prog_compiler_pic='-PIC'
17122+ lt_prog_compiler_static='-Bstatic'
17123+ ;;
17124 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17125 # Portland Group compilers (*not* the Pentium gcc compiler,
17126 # which looks to be a dead project)
17127@@ -8825,7 +9336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17128 lt_prog_compiler_pic='-KPIC'
17129 lt_prog_compiler_static='-Bstatic'
17130 case $cc_basename in
17131- f77* | f90* | f95*)
17132+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
17133 lt_prog_compiler_wl='-Qoption ld ';;
17134 *)
17135 lt_prog_compiler_wl='-Wl,';;
17136@@ -8882,13 +9393,17 @@ case $host_os in
17137 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17138 ;;
17139 esac
17140-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
17141-$as_echo "$lt_prog_compiler_pic" >&6; }
17142-
17143-
17144-
17145-
17146
17147+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17148+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17149+if ${lt_cv_prog_compiler_pic+:} false; then :
17150+ $as_echo_n "(cached) " >&6
17151+else
17152+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
17153+fi
17154+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
17155+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
17156+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
17157
17158 #
17159 # Check to make sure the PIC flag actually works.
17160@@ -8949,6 +9464,11 @@ fi
17161
17162
17163
17164+
17165+
17166+
17167+
17168+
17169 #
17170 # Check to make sure the static flag actually works.
17171 #
17172@@ -9299,7 +9819,8 @@ _LT_EOF
17173 allow_undefined_flag=unsupported
17174 always_export_symbols=no
17175 enable_shared_with_static_runtimes=yes
17176- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17177+ 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'
17178+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
17179
17180 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17181 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17182@@ -9398,12 +9919,12 @@ _LT_EOF
17183 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17184 hardcode_libdir_flag_spec=
17185 hardcode_libdir_flag_spec_ld='-rpath $libdir'
17186- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
17187+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
17188 if test "x$supports_anon_versioning" = xyes; then
17189 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
17190 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
17191 echo "local: *; };" >> $output_objdir/$libname.ver~
17192- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17193+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17194 fi
17195 ;;
17196 esac
17197@@ -9417,8 +9938,8 @@ _LT_EOF
17198 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17199 wlarc=
17200 else
17201- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17202- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17203+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17204+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17205 fi
17206 ;;
17207
17208@@ -9436,8 +9957,8 @@ _LT_EOF
17209
17210 _LT_EOF
17211 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17212- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17213- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17214+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17215+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17216 else
17217 ld_shlibs=no
17218 fi
17219@@ -9483,8 +10004,8 @@ _LT_EOF
17220
17221 *)
17222 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17223- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17224- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17225+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17226+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17227 else
17228 ld_shlibs=no
17229 fi
17230@@ -9614,7 +10135,13 @@ _LT_EOF
17231 allow_undefined_flag='-berok'
17232 # Determine the default libpath from the value encoded in an
17233 # empty executable.
17234- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17235+ if test "${lt_cv_aix_libpath+set}" = set; then
17236+ aix_libpath=$lt_cv_aix_libpath
17237+else
17238+ if ${lt_cv_aix_libpath_+:} false; then :
17239+ $as_echo_n "(cached) " >&6
17240+else
17241+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17242 /* end confdefs.h. */
17243
17244 int
17245@@ -9627,22 +10154,29 @@ main ()
17246 _ACEOF
17247 if ac_fn_c_try_link "$LINENO"; then :
17248
17249-lt_aix_libpath_sed='
17250- /Import File Strings/,/^$/ {
17251- /^0/ {
17252- s/^0 *\(.*\)$/\1/
17253- p
17254- }
17255- }'
17256-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17257-# Check for a 64-bit object if we didn't find anything.
17258-if test -z "$aix_libpath"; then
17259- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17260-fi
17261+ lt_aix_libpath_sed='
17262+ /Import File Strings/,/^$/ {
17263+ /^0/ {
17264+ s/^0 *\([^ ]*\) *$/\1/
17265+ p
17266+ }
17267+ }'
17268+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17269+ # Check for a 64-bit object if we didn't find anything.
17270+ if test -z "$lt_cv_aix_libpath_"; then
17271+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17272+ fi
17273 fi
17274 rm -f core conftest.err conftest.$ac_objext \
17275 conftest$ac_exeext conftest.$ac_ext
17276-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17277+ if test -z "$lt_cv_aix_libpath_"; then
17278+ lt_cv_aix_libpath_="/usr/lib:/lib"
17279+ fi
17280+
17281+fi
17282+
17283+ aix_libpath=$lt_cv_aix_libpath_
17284+fi
17285
17286 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17287 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"
17288@@ -9654,7 +10188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17289 else
17290 # Determine the default libpath from the value encoded in an
17291 # empty executable.
17292- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17293+ if test "${lt_cv_aix_libpath+set}" = set; then
17294+ aix_libpath=$lt_cv_aix_libpath
17295+else
17296+ if ${lt_cv_aix_libpath_+:} false; then :
17297+ $as_echo_n "(cached) " >&6
17298+else
17299+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17300 /* end confdefs.h. */
17301
17302 int
17303@@ -9667,22 +10207,29 @@ main ()
17304 _ACEOF
17305 if ac_fn_c_try_link "$LINENO"; then :
17306
17307-lt_aix_libpath_sed='
17308- /Import File Strings/,/^$/ {
17309- /^0/ {
17310- s/^0 *\(.*\)$/\1/
17311- p
17312- }
17313- }'
17314-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17315-# Check for a 64-bit object if we didn't find anything.
17316-if test -z "$aix_libpath"; then
17317- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17318-fi
17319+ lt_aix_libpath_sed='
17320+ /Import File Strings/,/^$/ {
17321+ /^0/ {
17322+ s/^0 *\([^ ]*\) *$/\1/
17323+ p
17324+ }
17325+ }'
17326+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17327+ # Check for a 64-bit object if we didn't find anything.
17328+ if test -z "$lt_cv_aix_libpath_"; then
17329+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17330+ fi
17331 fi
17332 rm -f core conftest.err conftest.$ac_objext \
17333 conftest$ac_exeext conftest.$ac_ext
17334-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17335+ if test -z "$lt_cv_aix_libpath_"; then
17336+ lt_cv_aix_libpath_="/usr/lib:/lib"
17337+ fi
17338+
17339+fi
17340+
17341+ aix_libpath=$lt_cv_aix_libpath_
17342+fi
17343
17344 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17345 # Warning - without using the other run time loading flags,
17346@@ -9727,20 +10274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17347 # Microsoft Visual C++.
17348 # hardcode_libdir_flag_spec is actually meaningless, as there is
17349 # no search path for DLLs.
17350- hardcode_libdir_flag_spec=' '
17351- allow_undefined_flag=unsupported
17352- # Tell ltmain to make .lib files, not .a files.
17353- libext=lib
17354- # Tell ltmain to make .dll files, not .so files.
17355- shrext_cmds=".dll"
17356- # FIXME: Setting linknames here is a bad hack.
17357- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17358- # The linker will automatically build a .lib file if we build a DLL.
17359- old_archive_from_new_cmds='true'
17360- # FIXME: Should let the user specify the lib program.
17361- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17362- fix_srcfile_path='`cygpath -w "$srcfile"`'
17363- enable_shared_with_static_runtimes=yes
17364+ case $cc_basename in
17365+ cl*)
17366+ # Native MSVC
17367+ hardcode_libdir_flag_spec=' '
17368+ allow_undefined_flag=unsupported
17369+ always_export_symbols=yes
17370+ file_list_spec='@'
17371+ # Tell ltmain to make .lib files, not .a files.
17372+ libext=lib
17373+ # Tell ltmain to make .dll files, not .so files.
17374+ shrext_cmds=".dll"
17375+ # FIXME: Setting linknames here is a bad hack.
17376+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
17377+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
17378+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
17379+ else
17380+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
17381+ fi~
17382+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
17383+ linknames='
17384+ # The linker will not automatically build a static lib if we build a DLL.
17385+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
17386+ enable_shared_with_static_runtimes=yes
17387+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17388+ # Don't use ranlib
17389+ old_postinstall_cmds='chmod 644 $oldlib'
17390+ postlink_cmds='lt_outputfile="@OUTPUT@"~
17391+ lt_tool_outputfile="@TOOL_OUTPUT@"~
17392+ case $lt_outputfile in
17393+ *.exe|*.EXE) ;;
17394+ *)
17395+ lt_outputfile="$lt_outputfile.exe"
17396+ lt_tool_outputfile="$lt_tool_outputfile.exe"
17397+ ;;
17398+ esac~
17399+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
17400+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
17401+ $RM "$lt_outputfile.manifest";
17402+ fi'
17403+ ;;
17404+ *)
17405+ # Assume MSVC wrapper
17406+ hardcode_libdir_flag_spec=' '
17407+ allow_undefined_flag=unsupported
17408+ # Tell ltmain to make .lib files, not .a files.
17409+ libext=lib
17410+ # Tell ltmain to make .dll files, not .so files.
17411+ shrext_cmds=".dll"
17412+ # FIXME: Setting linknames here is a bad hack.
17413+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17414+ # The linker will automatically build a .lib file if we build a DLL.
17415+ old_archive_from_new_cmds='true'
17416+ # FIXME: Should let the user specify the lib program.
17417+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17418+ enable_shared_with_static_runtimes=yes
17419+ ;;
17420+ esac
17421 ;;
17422
17423 darwin* | rhapsody*)
17424@@ -9801,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17425
17426 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17427 freebsd* | dragonfly*)
17428- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
17429+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17430 hardcode_libdir_flag_spec='-R$libdir'
17431 hardcode_direct=yes
17432 hardcode_shlibpath_var=no
17433@@ -9809,7 +10399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17434
17435 hpux9*)
17436 if test "$GCC" = yes; then
17437- 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'
17438+ 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'
17439 else
17440 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'
17441 fi
17442@@ -9825,7 +10415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17443
17444 hpux10*)
17445 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
17446- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17447+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17448 else
17449 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17450 fi
17451@@ -9849,10 +10439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17452 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17453 ;;
17454 ia64*)
17455- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17456+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17457 ;;
17458 *)
17459- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17460+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17461 ;;
17462 esac
17463 else
17464@@ -9931,23 +10521,36 @@ fi
17465
17466 irix5* | irix6* | nonstopux*)
17467 if test "$GCC" = yes; then
17468- 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'
17469+ 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'
17470 # Try to use the -exported_symbol ld option, if it does not
17471 # work, assume that -exports_file does not work either and
17472 # implicitly export all symbols.
17473- save_LDFLAGS="$LDFLAGS"
17474- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17475- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17476+ # This should be the same for all languages, so no per-tag cache variable.
17477+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
17478+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
17479+if ${lt_cv_irix_exported_symbol+:} false; then :
17480+ $as_echo_n "(cached) " >&6
17481+else
17482+ save_LDFLAGS="$LDFLAGS"
17483+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17484+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17485 /* end confdefs.h. */
17486-int foo(void) {}
17487+int foo (void) { return 0; }
17488 _ACEOF
17489 if ac_fn_c_try_link "$LINENO"; then :
17490- 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'
17491-
17492+ lt_cv_irix_exported_symbol=yes
17493+else
17494+ lt_cv_irix_exported_symbol=no
17495 fi
17496 rm -f core conftest.err conftest.$ac_objext \
17497 conftest$ac_exeext conftest.$ac_ext
17498- LDFLAGS="$save_LDFLAGS"
17499+ LDFLAGS="$save_LDFLAGS"
17500+fi
17501+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
17502+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
17503+ if test "$lt_cv_irix_exported_symbol" = yes; then
17504+ 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'
17505+ fi
17506 else
17507 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'
17508 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'
17509@@ -10032,7 +10635,7 @@ rm -f core conftest.err conftest.$ac_objext \
17510 osf4* | osf5*) # as osf3* with the addition of -msym flag
17511 if test "$GCC" = yes; then
17512 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
17513- 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'
17514+ 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'
17515 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17516 else
17517 allow_undefined_flag=' -expect_unresolved \*'
17518@@ -10051,9 +10654,9 @@ rm -f core conftest.err conftest.$ac_objext \
17519 no_undefined_flag=' -z defs'
17520 if test "$GCC" = yes; then
17521 wlarc='${wl}'
17522- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17523+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17524 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
17525- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
17526+ $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'
17527 else
17528 case `$CC -V 2>&1` in
17529 *"Compilers 5.0"*)
17530@@ -10629,8 +11232,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17531 need_version=no
17532 need_lib_prefix=no
17533
17534- case $GCC,$host_os in
17535- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
17536+ case $GCC,$cc_basename in
17537+ yes,*)
17538+ # gcc
17539 library_names_spec='$libname.dll.a'
17540 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17541 postinstall_cmds='base_file=`basename \${file}`~
17542@@ -10663,13 +11267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17543 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17544 ;;
17545 esac
17546+ dynamic_linker='Win32 ld.exe'
17547+ ;;
17548+
17549+ *,cl*)
17550+ # Native MSVC
17551+ libname_spec='$name'
17552+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17553+ library_names_spec='${libname}.dll.lib'
17554+
17555+ case $build_os in
17556+ mingw*)
17557+ sys_lib_search_path_spec=
17558+ lt_save_ifs=$IFS
17559+ IFS=';'
17560+ for lt_path in $LIB
17561+ do
17562+ IFS=$lt_save_ifs
17563+ # Let DOS variable expansion print the short 8.3 style file name.
17564+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
17565+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
17566+ done
17567+ IFS=$lt_save_ifs
17568+ # Convert to MSYS style.
17569+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
17570+ ;;
17571+ cygwin*)
17572+ # Convert to unix form, then to dos form, then back to unix form
17573+ # but this time dos style (no spaces!) so that the unix form looks
17574+ # like /cygdrive/c/PROGRA~1:/cygdr...
17575+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
17576+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
17577+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
17578+ ;;
17579+ *)
17580+ sys_lib_search_path_spec="$LIB"
17581+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
17582+ # It is most probably a Windows format PATH.
17583+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
17584+ else
17585+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
17586+ fi
17587+ # FIXME: find the short name or the path components, as spaces are
17588+ # common. (e.g. "Program Files" -> "PROGRA~1")
17589+ ;;
17590+ esac
17591+
17592+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
17593+ postinstall_cmds='base_file=`basename \${file}`~
17594+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
17595+ dldir=$destdir/`dirname \$dlpath`~
17596+ test -d \$dldir || mkdir -p \$dldir~
17597+ $install_prog $dir/$dlname \$dldir/$dlname'
17598+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
17599+ dlpath=$dir/\$dldll~
17600+ $RM \$dlpath'
17601+ shlibpath_overrides_runpath=yes
17602+ dynamic_linker='Win32 link.exe'
17603 ;;
17604
17605 *)
17606+ # Assume MSVC wrapper
17607 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
17608+ dynamic_linker='Win32 ld.exe'
17609 ;;
17610 esac
17611- dynamic_linker='Win32 ld.exe'
17612 # FIXME: first we should search . and the directory the executable is in
17613 shlibpath_var=PATH
17614 ;;
17615@@ -11571,7 +12233,7 @@ else
17616 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17617 lt_status=$lt_dlunknown
17618 cat > conftest.$ac_ext <<_LT_EOF
17619-#line 11574 "configure"
17620+#line $LINENO "configure"
17621 #include "confdefs.h"
17622
17623 #if HAVE_DLFCN_H
17624@@ -11615,10 +12277,10 @@ else
17625 /* When -fvisbility=hidden is used, assume the code has been annotated
17626 correspondingly for the symbols needed. */
17627 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
17628-void fnord () __attribute__((visibility("default")));
17629+int fnord () __attribute__((visibility("default")));
17630 #endif
17631
17632-void fnord () { int i=42; }
17633+int fnord () { return 42; }
17634 int main ()
17635 {
17636 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17637@@ -11677,7 +12339,7 @@ else
17638 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17639 lt_status=$lt_dlunknown
17640 cat > conftest.$ac_ext <<_LT_EOF
17641-#line 11680 "configure"
17642+#line $LINENO "configure"
17643 #include "confdefs.h"
17644
17645 #if HAVE_DLFCN_H
17646@@ -11721,10 +12383,10 @@ else
17647 /* When -fvisbility=hidden is used, assume the code has been annotated
17648 correspondingly for the symbols needed. */
17649 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
17650-void fnord () __attribute__((visibility("default")));
17651+int fnord () __attribute__((visibility("default")));
17652 #endif
17653
17654-void fnord () { int i=42; }
17655+int fnord () { return 42; }
17656 int main ()
17657 {
17658 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17659@@ -15010,13 +15672,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
17660 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
17661 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
17662 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
17663+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
17664+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
17665 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
17666 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
17667 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
17668 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
17669 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
17670+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
17671+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
17672+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
17673+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
17674 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
17675 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
17676+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
17677 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
17678 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
17679 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
17680@@ -15031,14 +15700,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
17681 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
17682 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
17683 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"`'
17684+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
17685+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
17686 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
17687 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
17688 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
17689-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
17690 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
17691+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
17692 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
17693 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
17694 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
17695+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
17696 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
17697 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
17698 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
17699@@ -15071,12 +15743,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
17700 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
17701 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
17702 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
17703-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
17704 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
17705 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
17706 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
17707 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
17708 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
17709+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
17710 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
17711 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
17712 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
17713@@ -15131,8 +15803,13 @@ reload_flag \
17714 OBJDUMP \
17715 deplibs_check_method \
17716 file_magic_cmd \
17717+file_magic_glob \
17718+want_nocaseglob \
17719+DLLTOOL \
17720+sharedlib_from_linklib_cmd \
17721 AR \
17722 AR_FLAGS \
17723+archiver_list_spec \
17724 STRIP \
17725 RANLIB \
17726 CC \
17727@@ -15142,12 +15819,14 @@ lt_cv_sys_global_symbol_pipe \
17728 lt_cv_sys_global_symbol_to_cdecl \
17729 lt_cv_sys_global_symbol_to_c_name_address \
17730 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
17731+nm_file_list_spec \
17732 lt_prog_compiler_no_builtin_flag \
17733-lt_prog_compiler_wl \
17734 lt_prog_compiler_pic \
17735+lt_prog_compiler_wl \
17736 lt_prog_compiler_static \
17737 lt_cv_prog_compiler_c_o \
17738 need_locks \
17739+MANIFEST_TOOL \
17740 DSYMUTIL \
17741 NMEDIT \
17742 LIPO \
17743@@ -15163,7 +15842,6 @@ no_undefined_flag \
17744 hardcode_libdir_flag_spec \
17745 hardcode_libdir_flag_spec_ld \
17746 hardcode_libdir_separator \
17747-fix_srcfile_path \
17748 exclude_expsyms \
17749 include_expsyms \
17750 file_list_spec \
17751@@ -15199,6 +15877,7 @@ module_cmds \
17752 module_expsym_cmds \
17753 export_symbols_cmds \
17754 prelink_cmds \
17755+postlink_cmds \
17756 postinstall_cmds \
17757 postuninstall_cmds \
17758 finish_cmds \
17759@@ -15897,7 +16576,8 @@ esac ;;
17760 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
17761 #
17762 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
17763-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
17764+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
17765+# Inc.
17766 # Written by Gordon Matzigkeit, 1996
17767 #
17768 # This file is part of GNU Libtool.
17769@@ -16000,19 +16680,42 @@ SP2NL=$lt_lt_SP2NL
17770 # turn newlines into spaces.
17771 NL2SP=$lt_lt_NL2SP
17772
17773+# convert \$build file names to \$host format.
17774+to_host_file_cmd=$lt_cv_to_host_file_cmd
17775+
17776+# convert \$build files to toolchain format.
17777+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17778+
17779 # An object symbol dumper.
17780 OBJDUMP=$lt_OBJDUMP
17781
17782 # Method to check whether dependent libraries are shared objects.
17783 deplibs_check_method=$lt_deplibs_check_method
17784
17785-# Command to use when deplibs_check_method == "file_magic".
17786+# Command to use when deplibs_check_method = "file_magic".
17787 file_magic_cmd=$lt_file_magic_cmd
17788
17789+# How to find potential files when deplibs_check_method = "file_magic".
17790+file_magic_glob=$lt_file_magic_glob
17791+
17792+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
17793+want_nocaseglob=$lt_want_nocaseglob
17794+
17795+# DLL creation program.
17796+DLLTOOL=$lt_DLLTOOL
17797+
17798+# Command to associate shared and link libraries.
17799+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
17800+
17801 # The archiver.
17802 AR=$lt_AR
17803+
17804+# Flags to create an archive.
17805 AR_FLAGS=$lt_AR_FLAGS
17806
17807+# How to feed a file listing to the archiver.
17808+archiver_list_spec=$lt_archiver_list_spec
17809+
17810 # A symbol stripping program.
17811 STRIP=$lt_STRIP
17812
17813@@ -16042,6 +16745,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
17814 # Transform the output of nm in a C name address pair when lib prefix is needed.
17815 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
17816
17817+# Specify filename containing input files for \$NM.
17818+nm_file_list_spec=$lt_nm_file_list_spec
17819+
17820+# The root where to search for dependent libraries,and in which our libraries should be installed.
17821+lt_sysroot=$lt_sysroot
17822+
17823 # The name of the directory that contains temporary libtool files.
17824 objdir=$objdir
17825
17826@@ -16051,6 +16760,9 @@ MAGIC_CMD=$MAGIC_CMD
17827 # Must we lock files when doing compilation?
17828 need_locks=$lt_need_locks
17829
17830+# Manifest tool.
17831+MANIFEST_TOOL=$lt_MANIFEST_TOOL
17832+
17833 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
17834 DSYMUTIL=$lt_DSYMUTIL
17835
17836@@ -16165,12 +16877,12 @@ with_gcc=$GCC
17837 # Compiler flag to turn off builtin functions.
17838 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
17839
17840-# How to pass a linker flag through the compiler.
17841-wl=$lt_lt_prog_compiler_wl
17842-
17843 # Additional compiler flags for building library objects.
17844 pic_flag=$lt_lt_prog_compiler_pic
17845
17846+# How to pass a linker flag through the compiler.
17847+wl=$lt_lt_prog_compiler_wl
17848+
17849 # Compiler flag to prevent dynamic linking.
17850 link_static_flag=$lt_lt_prog_compiler_static
17851
17852@@ -16257,9 +16969,6 @@ inherit_rpath=$inherit_rpath
17853 # Whether libtool must link a program against all its dependency libraries.
17854 link_all_deplibs=$link_all_deplibs
17855
17856-# Fix the shell variable \$srcfile for the compiler.
17857-fix_srcfile_path=$lt_fix_srcfile_path
17858-
17859 # Set to "yes" if exported symbols are required.
17860 always_export_symbols=$always_export_symbols
17861
17862@@ -16275,6 +16984,9 @@ include_expsyms=$lt_include_expsyms
17863 # Commands necessary for linking programs (against libraries) with templates.
17864 prelink_cmds=$lt_prelink_cmds
17865
17866+# Commands necessary for finishing linking programs.
17867+postlink_cmds=$lt_postlink_cmds
17868+
17869 # Specify filename containing input files.
17870 file_list_spec=$lt_file_list_spec
17871
17872@@ -16307,210 +17019,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
17873 # if finds mixed CR/LF and LF-only lines. Since sed operates in
17874 # text mode, it properly converts lines to CR/LF. This bash problem
17875 # is reportedly fixed, but why not run on old versions too?
17876- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
17877- || (rm -f "$cfgfile"; exit 1)
17878-
17879- case $xsi_shell in
17880- yes)
17881- cat << \_LT_EOF >> "$cfgfile"
17882-
17883-# func_dirname file append nondir_replacement
17884-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
17885-# otherwise set result to NONDIR_REPLACEMENT.
17886-func_dirname ()
17887-{
17888- case ${1} in
17889- */*) func_dirname_result="${1%/*}${2}" ;;
17890- * ) func_dirname_result="${3}" ;;
17891- esac
17892-}
17893-
17894-# func_basename file
17895-func_basename ()
17896-{
17897- func_basename_result="${1##*/}"
17898-}
17899-
17900-# func_dirname_and_basename file append nondir_replacement
17901-# perform func_basename and func_dirname in a single function
17902-# call:
17903-# dirname: Compute the dirname of FILE. If nonempty,
17904-# add APPEND to the result, otherwise set result
17905-# to NONDIR_REPLACEMENT.
17906-# value returned in "$func_dirname_result"
17907-# basename: Compute filename of FILE.
17908-# value retuned in "$func_basename_result"
17909-# Implementation must be kept synchronized with func_dirname
17910-# and func_basename. For efficiency, we do not delegate to
17911-# those functions but instead duplicate the functionality here.
17912-func_dirname_and_basename ()
17913-{
17914- case ${1} in
17915- */*) func_dirname_result="${1%/*}${2}" ;;
17916- * ) func_dirname_result="${3}" ;;
17917- esac
17918- func_basename_result="${1##*/}"
17919-}
17920-
17921-# func_stripname prefix suffix name
17922-# strip PREFIX and SUFFIX off of NAME.
17923-# PREFIX and SUFFIX must not contain globbing or regex special
17924-# characters, hashes, percent signs, but SUFFIX may contain a leading
17925-# dot (in which case that matches only a dot).
17926-func_stripname ()
17927-{
17928- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
17929- # positional parameters, so assign one to ordinary parameter first.
17930- func_stripname_result=${3}
17931- func_stripname_result=${func_stripname_result#"${1}"}
17932- func_stripname_result=${func_stripname_result%"${2}"}
17933-}
17934-
17935-# func_opt_split
17936-func_opt_split ()
17937-{
17938- func_opt_split_opt=${1%%=*}
17939- func_opt_split_arg=${1#*=}
17940-}
17941-
17942-# func_lo2o object
17943-func_lo2o ()
17944-{
17945- case ${1} in
17946- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
17947- *) func_lo2o_result=${1} ;;
17948- esac
17949-}
17950-
17951-# func_xform libobj-or-source
17952-func_xform ()
17953-{
17954- func_xform_result=${1%.*}.lo
17955-}
17956-
17957-# func_arith arithmetic-term...
17958-func_arith ()
17959-{
17960- func_arith_result=$(( $* ))
17961-}
17962-
17963-# func_len string
17964-# STRING may not start with a hyphen.
17965-func_len ()
17966-{
17967- func_len_result=${#1}
17968-}
17969-
17970-_LT_EOF
17971- ;;
17972- *) # Bourne compatible functions.
17973- cat << \_LT_EOF >> "$cfgfile"
17974-
17975-# func_dirname file append nondir_replacement
17976-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
17977-# otherwise set result to NONDIR_REPLACEMENT.
17978-func_dirname ()
17979-{
17980- # Extract subdirectory from the argument.
17981- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
17982- if test "X$func_dirname_result" = "X${1}"; then
17983- func_dirname_result="${3}"
17984- else
17985- func_dirname_result="$func_dirname_result${2}"
17986- fi
17987-}
17988-
17989-# func_basename file
17990-func_basename ()
17991-{
17992- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
17993-}
17994-
17995-
17996-# func_stripname prefix suffix name
17997-# strip PREFIX and SUFFIX off of NAME.
17998-# PREFIX and SUFFIX must not contain globbing or regex special
17999-# characters, hashes, percent signs, but SUFFIX may contain a leading
18000-# dot (in which case that matches only a dot).
18001-# func_strip_suffix prefix name
18002-func_stripname ()
18003-{
18004- case ${2} in
18005- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18006- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18007- esac
18008-}
18009-
18010-# sed scripts:
18011-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18012-my_sed_long_arg='1s/^-[^=]*=//'
18013-
18014-# func_opt_split
18015-func_opt_split ()
18016-{
18017- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18018- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18019-}
18020-
18021-# func_lo2o object
18022-func_lo2o ()
18023-{
18024- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18025-}
18026-
18027-# func_xform libobj-or-source
18028-func_xform ()
18029-{
18030- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18031-}
18032-
18033-# func_arith arithmetic-term...
18034-func_arith ()
18035-{
18036- func_arith_result=`expr "$@"`
18037-}
18038-
18039-# func_len string
18040-# STRING may not start with a hyphen.
18041-func_len ()
18042-{
18043- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
18044-}
18045-
18046-_LT_EOF
18047-esac
18048-
18049-case $lt_shell_append in
18050- yes)
18051- cat << \_LT_EOF >> "$cfgfile"
18052-
18053-# func_append var value
18054-# Append VALUE to the end of shell variable VAR.
18055-func_append ()
18056-{
18057- eval "$1+=\$2"
18058-}
18059-_LT_EOF
18060- ;;
18061- *)
18062- cat << \_LT_EOF >> "$cfgfile"
18063-
18064-# func_append var value
18065-# Append VALUE to the end of shell variable VAR.
18066-func_append ()
18067-{
18068- eval "$1=\$$1\$2"
18069-}
18070-
18071-_LT_EOF
18072- ;;
18073- esac
18074-
18075-
18076- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
18077- || (rm -f "$cfgfile"; exit 1)
18078-
18079- mv -f "$cfgfile" "$ofile" ||
18080+ sed '$q' "$ltmain" >> "$cfgfile" \
18081+ || (rm -f "$cfgfile"; exit 1)
18082+
18083+ if test x"$xsi_shell" = xyes; then
18084+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
18085+func_dirname ()\
18086+{\
18087+\ case ${1} in\
18088+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18089+\ * ) func_dirname_result="${3}" ;;\
18090+\ esac\
18091+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
18092+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18093+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18094+test 0 -eq $? || _lt_function_replace_fail=:
18095+
18096+
18097+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
18098+func_basename ()\
18099+{\
18100+\ func_basename_result="${1##*/}"\
18101+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
18102+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18103+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18104+test 0 -eq $? || _lt_function_replace_fail=:
18105+
18106+
18107+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
18108+func_dirname_and_basename ()\
18109+{\
18110+\ case ${1} in\
18111+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18112+\ * ) func_dirname_result="${3}" ;;\
18113+\ esac\
18114+\ func_basename_result="${1##*/}"\
18115+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
18116+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18117+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18118+test 0 -eq $? || _lt_function_replace_fail=:
18119+
18120+
18121+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
18122+func_stripname ()\
18123+{\
18124+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
18125+\ # positional parameters, so assign one to ordinary parameter first.\
18126+\ func_stripname_result=${3}\
18127+\ func_stripname_result=${func_stripname_result#"${1}"}\
18128+\ func_stripname_result=${func_stripname_result%"${2}"}\
18129+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
18130+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18131+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18132+test 0 -eq $? || _lt_function_replace_fail=:
18133+
18134+
18135+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
18136+func_split_long_opt ()\
18137+{\
18138+\ func_split_long_opt_name=${1%%=*}\
18139+\ func_split_long_opt_arg=${1#*=}\
18140+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
18141+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18142+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18143+test 0 -eq $? || _lt_function_replace_fail=:
18144+
18145+
18146+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
18147+func_split_short_opt ()\
18148+{\
18149+\ func_split_short_opt_arg=${1#??}\
18150+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
18151+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
18152+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18153+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18154+test 0 -eq $? || _lt_function_replace_fail=:
18155+
18156+
18157+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
18158+func_lo2o ()\
18159+{\
18160+\ case ${1} in\
18161+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
18162+\ *) func_lo2o_result=${1} ;;\
18163+\ esac\
18164+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
18165+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18166+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18167+test 0 -eq $? || _lt_function_replace_fail=:
18168+
18169+
18170+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
18171+func_xform ()\
18172+{\
18173+ func_xform_result=${1%.*}.lo\
18174+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
18175+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18176+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18177+test 0 -eq $? || _lt_function_replace_fail=:
18178+
18179+
18180+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
18181+func_arith ()\
18182+{\
18183+ func_arith_result=$(( $* ))\
18184+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
18185+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18186+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18187+test 0 -eq $? || _lt_function_replace_fail=:
18188+
18189+
18190+ sed -e '/^func_len ()$/,/^} # func_len /c\
18191+func_len ()\
18192+{\
18193+ func_len_result=${#1}\
18194+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
18195+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18196+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18197+test 0 -eq $? || _lt_function_replace_fail=:
18198+
18199+fi
18200+
18201+if test x"$lt_shell_append" = xyes; then
18202+ sed -e '/^func_append ()$/,/^} # func_append /c\
18203+func_append ()\
18204+{\
18205+ eval "${1}+=\\${2}"\
18206+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
18207+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18208+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18209+test 0 -eq $? || _lt_function_replace_fail=:
18210+
18211+
18212+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
18213+func_append_quoted ()\
18214+{\
18215+\ func_quote_for_eval "${2}"\
18216+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
18217+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
18218+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18219+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18220+test 0 -eq $? || _lt_function_replace_fail=:
18221+
18222+
18223+ # Save a `func_append' function call where possible by direct use of '+='
18224+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
18225+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18226+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18227+ test 0 -eq $? || _lt_function_replace_fail=:
18228+else
18229+ # Save a `func_append' function call even when '+=' is not available
18230+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
18231+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18232+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18233+ test 0 -eq $? || _lt_function_replace_fail=:
18234+fi
18235+
18236+if test x"$_lt_function_replace_fail" = x":"; then
18237+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
18238+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
18239+fi
18240+
18241+
18242+ mv -f "$cfgfile" "$ofile" ||
18243 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
18244 chmod +x "$ofile"
18245
18246diff --git a/libctf/Makefile.in b/libctf/Makefile.in
18247index 1cdf105a323..b69d6472e86 100644
18248--- a/libctf/Makefile.in
18249+++ b/libctf/Makefile.in
18250@@ -442,6 +442,7 @@ CYGPATH_W = @CYGPATH_W@
18251 DATADIRNAME = @DATADIRNAME@
18252 DEFS = @DEFS@
18253 DEPDIR = @DEPDIR@
18254+DLLTOOL = @DLLTOOL@
18255 DSYMUTIL = @DSYMUTIL@
18256 DUMPBIN = @DUMPBIN@
18257 ECHO_C = @ECHO_C@
18258@@ -481,6 +482,7 @@ LTLIBINTL = @LTLIBINTL@
18259 LTLIBOBJS = @LTLIBOBJS@
18260 MAINT = @MAINT@
18261 MAKEINFO = @MAKEINFO@
18262+MANIFEST_TOOL = @MANIFEST_TOOL@
18263 MKDIR_P = @MKDIR_P@
18264 MKINSTALLDIRS = @MKINSTALLDIRS@
18265 MSGFMT = @MSGFMT@
18266diff --git a/libctf/configure b/libctf/configure
18267index 3701bd8e796..9e36ae7c51c 100755
18268--- a/libctf/configure
18269+++ b/libctf/configure
18270@@ -669,6 +669,8 @@ OTOOL
18271 LIPO
18272 NMEDIT
18273 DSYMUTIL
18274+MANIFEST_TOOL
18275+DLLTOOL
18276 OBJDUMP
18277 LN_S
18278 NM
18279@@ -814,6 +816,7 @@ enable_shared
18280 enable_static
18281 with_pic
18282 enable_fast_install
18283+with_libtool_sysroot
18284 enable_libtool_lock
18285 enable_largefile
18286 enable_werror_always
18287@@ -1486,6 +1489,8 @@ Optional Packages:
18288 --with-pic try to use only PIC/non-PIC objects [default=use
18289 both]
18290 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
18291+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
18292+ (or the compiler's sysroot if not specified).
18293 --with-system-zlib use installed libz
18294
18295 Some influential environment variables:
18296@@ -7501,8 +7506,8 @@ esac
18297
18298
18299
18300-macro_version='2.2.7a'
18301-macro_revision='1.3134'
18302+macro_version='2.4'
18303+macro_revision='1.3293'
18304
18305
18306
18307@@ -7542,7 +7547,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
18308 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
18309 $as_echo_n "checking how to print strings... " >&6; }
18310 # Test print first, because it will be a builtin if present.
18311-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
18312+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
18313 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
18314 ECHO='print -r --'
18315 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
18316@@ -8235,8 +8240,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
18317 # Try some XSI features
18318 xsi_shell=no
18319 ( _lt_dummy="a/b/c"
18320- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
18321- = c,a/b,, \
18322+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
18323+ = c,a/b,b/c, \
18324 && eval 'test $(( 1 + 1 )) -eq 2 \
18325 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
18326 && xsi_shell=yes
18327@@ -8285,6 +8290,80 @@ esac
18328
18329
18330
18331+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
18332+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
18333+if ${lt_cv_to_host_file_cmd+:} false; then :
18334+ $as_echo_n "(cached) " >&6
18335+else
18336+ case $host in
18337+ *-*-mingw* )
18338+ case $build in
18339+ *-*-mingw* ) # actually msys
18340+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
18341+ ;;
18342+ *-*-cygwin* )
18343+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
18344+ ;;
18345+ * ) # otherwise, assume *nix
18346+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
18347+ ;;
18348+ esac
18349+ ;;
18350+ *-*-cygwin* )
18351+ case $build in
18352+ *-*-mingw* ) # actually msys
18353+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
18354+ ;;
18355+ *-*-cygwin* )
18356+ lt_cv_to_host_file_cmd=func_convert_file_noop
18357+ ;;
18358+ * ) # otherwise, assume *nix
18359+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
18360+ ;;
18361+ esac
18362+ ;;
18363+ * ) # unhandled hosts (and "normal" native builds)
18364+ lt_cv_to_host_file_cmd=func_convert_file_noop
18365+ ;;
18366+esac
18367+
18368+fi
18369+
18370+to_host_file_cmd=$lt_cv_to_host_file_cmd
18371+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
18372+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
18373+
18374+
18375+
18376+
18377+
18378+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
18379+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
18380+if ${lt_cv_to_tool_file_cmd+:} false; then :
18381+ $as_echo_n "(cached) " >&6
18382+else
18383+ #assume ordinary cross tools, or native build.
18384+lt_cv_to_tool_file_cmd=func_convert_file_noop
18385+case $host in
18386+ *-*-mingw* )
18387+ case $build in
18388+ *-*-mingw* ) # actually msys
18389+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
18390+ ;;
18391+ esac
18392+ ;;
18393+esac
18394+
18395+fi
18396+
18397+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18398+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
18399+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
18400+
18401+
18402+
18403+
18404+
18405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
18406 $as_echo_n "checking for $LD option to reload object files... " >&6; }
18407 if ${lt_cv_ld_reload_flag+:} false; then :
18408@@ -8301,6 +8380,11 @@ case $reload_flag in
18409 esac
18410 reload_cmds='$LD$reload_flag -o $output$reload_objs'
18411 case $host_os in
18412+ cygwin* | mingw* | pw32* | cegcc*)
18413+ if test "$GCC" != yes; then
18414+ reload_cmds=false
18415+ fi
18416+ ;;
18417 darwin*)
18418 if test "$GCC" = yes; then
18419 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
18420@@ -8469,7 +8553,8 @@ mingw* | pw32*)
18421 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
18422 lt_cv_file_magic_cmd='func_win32_libid'
18423 else
18424- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
18425+ # Keep this pattern in sync with the one in func_win32_libid.
18426+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
18427 lt_cv_file_magic_cmd='$OBJDUMP -f'
18428 fi
18429 ;;
18430@@ -8628,6 +8713,21 @@ esac
18431 fi
18432 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
18433 $as_echo "$lt_cv_deplibs_check_method" >&6; }
18434+
18435+file_magic_glob=
18436+want_nocaseglob=no
18437+if test "$build" = "$host"; then
18438+ case $host_os in
18439+ mingw* | pw32*)
18440+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
18441+ want_nocaseglob=yes
18442+ else
18443+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
18444+ fi
18445+ ;;
18446+ esac
18447+fi
18448+
18449 file_magic_cmd=$lt_cv_file_magic_cmd
18450 deplibs_check_method=$lt_cv_deplibs_check_method
18451 test -z "$deplibs_check_method" && deplibs_check_method=unknown
18452@@ -8643,6 +8743,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
18453
18454
18455
18456+
18457+
18458+
18459+
18460+
18461+
18462+
18463+
18464+
18465+
18466+if test -n "$ac_tool_prefix"; then
18467+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
18468+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
18469+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18470+$as_echo_n "checking for $ac_word... " >&6; }
18471+if ${ac_cv_prog_DLLTOOL+:} false; then :
18472+ $as_echo_n "(cached) " >&6
18473+else
18474+ if test -n "$DLLTOOL"; then
18475+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
18476+else
18477+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18478+for as_dir in $PATH
18479+do
18480+ IFS=$as_save_IFS
18481+ test -z "$as_dir" && as_dir=.
18482+ for ac_exec_ext in '' $ac_executable_extensions; do
18483+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18484+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
18485+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18486+ break 2
18487+ fi
18488+done
18489+ done
18490+IFS=$as_save_IFS
18491+
18492+fi
18493+fi
18494+DLLTOOL=$ac_cv_prog_DLLTOOL
18495+if test -n "$DLLTOOL"; then
18496+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
18497+$as_echo "$DLLTOOL" >&6; }
18498+else
18499+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18500+$as_echo "no" >&6; }
18501+fi
18502+
18503+
18504+fi
18505+if test -z "$ac_cv_prog_DLLTOOL"; then
18506+ ac_ct_DLLTOOL=$DLLTOOL
18507+ # Extract the first word of "dlltool", so it can be a program name with args.
18508+set dummy dlltool; ac_word=$2
18509+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18510+$as_echo_n "checking for $ac_word... " >&6; }
18511+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
18512+ $as_echo_n "(cached) " >&6
18513+else
18514+ if test -n "$ac_ct_DLLTOOL"; then
18515+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
18516+else
18517+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18518+for as_dir in $PATH
18519+do
18520+ IFS=$as_save_IFS
18521+ test -z "$as_dir" && as_dir=.
18522+ for ac_exec_ext in '' $ac_executable_extensions; do
18523+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18524+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
18525+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18526+ break 2
18527+ fi
18528+done
18529+ done
18530+IFS=$as_save_IFS
18531+
18532+fi
18533+fi
18534+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
18535+if test -n "$ac_ct_DLLTOOL"; then
18536+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
18537+$as_echo "$ac_ct_DLLTOOL" >&6; }
18538+else
18539+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18540+$as_echo "no" >&6; }
18541+fi
18542+
18543+ if test "x$ac_ct_DLLTOOL" = x; then
18544+ DLLTOOL="false"
18545+ else
18546+ case $cross_compiling:$ac_tool_warned in
18547+yes:)
18548+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18549+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18550+ac_tool_warned=yes ;;
18551+esac
18552+ DLLTOOL=$ac_ct_DLLTOOL
18553+ fi
18554+else
18555+ DLLTOOL="$ac_cv_prog_DLLTOOL"
18556+fi
18557+
18558+test -z "$DLLTOOL" && DLLTOOL=dlltool
18559+
18560+
18561+
18562+
18563+
18564+
18565+
18566+
18567+
18568+
18569+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
18570+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
18571+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
18572+ $as_echo_n "(cached) " >&6
18573+else
18574+ lt_cv_sharedlib_from_linklib_cmd='unknown'
18575+
18576+case $host_os in
18577+cygwin* | mingw* | pw32* | cegcc*)
18578+ # two different shell functions defined in ltmain.sh
18579+ # decide which to use based on capabilities of $DLLTOOL
18580+ case `$DLLTOOL --help 2>&1` in
18581+ *--identify-strict*)
18582+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
18583+ ;;
18584+ *)
18585+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
18586+ ;;
18587+ esac
18588+ ;;
18589+*)
18590+ # fallback: assume linklib IS sharedlib
18591+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
18592+ ;;
18593+esac
18594+
18595+fi
18596+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
18597+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
18598+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
18599+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
18600+
18601+
18602+
18603+
18604+
18605+
18606+
18607 plugin_option=
18608 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
18609 for plugin in $plugin_names; do
18610@@ -8657,8 +8908,10 @@ for plugin in $plugin_names; do
18611 done
18612
18613 if test -n "$ac_tool_prefix"; then
18614- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
18615-set dummy ${ac_tool_prefix}ar; ac_word=$2
18616+ for ac_prog in ar
18617+ do
18618+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
18619+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
18620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18621 $as_echo_n "checking for $ac_word... " >&6; }
18622 if ${ac_cv_prog_AR+:} false; then :
18623@@ -8674,7 +8927,7 @@ do
18624 test -z "$as_dir" && as_dir=.
18625 for ac_exec_ext in '' $ac_executable_extensions; do
18626 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18627- ac_cv_prog_AR="${ac_tool_prefix}ar"
18628+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
18629 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18630 break 2
18631 fi
18632@@ -8694,11 +8947,15 @@ $as_echo "no" >&6; }
18633 fi
18634
18635
18636+ test -n "$AR" && break
18637+ done
18638 fi
18639-if test -z "$ac_cv_prog_AR"; then
18640+if test -z "$AR"; then
18641 ac_ct_AR=$AR
18642- # Extract the first word of "ar", so it can be a program name with args.
18643-set dummy ar; ac_word=$2
18644+ for ac_prog in ar
18645+do
18646+ # Extract the first word of "$ac_prog", so it can be a program name with args.
18647+set dummy $ac_prog; ac_word=$2
18648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18649 $as_echo_n "checking for $ac_word... " >&6; }
18650 if ${ac_cv_prog_ac_ct_AR+:} false; then :
18651@@ -8714,7 +8971,7 @@ do
18652 test -z "$as_dir" && as_dir=.
18653 for ac_exec_ext in '' $ac_executable_extensions; do
18654 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18655- ac_cv_prog_ac_ct_AR="ar"
18656+ ac_cv_prog_ac_ct_AR="$ac_prog"
18657 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18658 break 2
18659 fi
18660@@ -8733,6 +8990,10 @@ else
18661 $as_echo "no" >&6; }
18662 fi
18663
18664+
18665+ test -n "$ac_ct_AR" && break
18666+done
18667+
18668 if test "x$ac_ct_AR" = x; then
18669 AR="false"
18670 else
18671@@ -8744,25 +9005,19 @@ ac_tool_warned=yes ;;
18672 esac
18673 AR=$ac_ct_AR
18674 fi
18675-else
18676- AR="$ac_cv_prog_AR"
18677 fi
18678
18679-test -z "$AR" && AR=ar
18680-if test -n "$plugin_option"; then
18681- if $AR --help 2>&1 | grep -q "\--plugin"; then
18682- touch conftest.c
18683- $AR $plugin_option rc conftest.a conftest.c
18684- if test "$?" != 0; then
18685- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
18686+ touch conftest.c
18687+ $AR $plugin_option rc conftest.a conftest.c
18688+ if test "$?" != 0; then
18689+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
18690 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
18691- else
18692- AR="$AR $plugin_option"
18693- fi
18694- rm -f conftest.*
18695+ else
18696+ AR="$AR $plugin_option"
18697 fi
18698-fi
18699-test -z "$AR_FLAGS" && AR_FLAGS=cru
18700+ rm -f conftest.*
18701+: ${AR=ar}
18702+: ${AR_FLAGS=cru}
18703
18704
18705
18706@@ -8774,6 +9029,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
18707
18708
18709
18710+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
18711+$as_echo_n "checking for archiver @FILE support... " >&6; }
18712+if ${lt_cv_ar_at_file+:} false; then :
18713+ $as_echo_n "(cached) " >&6
18714+else
18715+ lt_cv_ar_at_file=no
18716+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18717+/* end confdefs.h. */
18718+
18719+int
18720+main ()
18721+{
18722+
18723+ ;
18724+ return 0;
18725+}
18726+_ACEOF
18727+if ac_fn_c_try_compile "$LINENO"; then :
18728+ echo conftest.$ac_objext > conftest.lst
18729+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
18730+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
18731+ (eval $lt_ar_try) 2>&5
18732+ ac_status=$?
18733+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
18734+ test $ac_status = 0; }
18735+ if test "$ac_status" -eq 0; then
18736+ # Ensure the archiver fails upon bogus file names.
18737+ rm -f conftest.$ac_objext libconftest.a
18738+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
18739+ (eval $lt_ar_try) 2>&5
18740+ ac_status=$?
18741+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
18742+ test $ac_status = 0; }
18743+ if test "$ac_status" -ne 0; then
18744+ lt_cv_ar_at_file=@
18745+ fi
18746+ fi
18747+ rm -f conftest.* libconftest.a
18748+
18749+fi
18750+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18751+
18752+fi
18753+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
18754+$as_echo "$lt_cv_ar_at_file" >&6; }
18755+
18756+if test "x$lt_cv_ar_at_file" = xno; then
18757+ archiver_list_spec=
18758+else
18759+ archiver_list_spec=$lt_cv_ar_at_file
18760+fi
18761+
18762+
18763+
18764+
18765+
18766+
18767+
18768 if test -n "$ac_tool_prefix"; then
18769 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
18770 set dummy ${ac_tool_prefix}strip; ac_word=$2
18771@@ -9113,8 +9426,8 @@ esac
18772 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
18773
18774 # Transform an extracted symbol line into symbol name and symbol address
18775-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
18776-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'"
18777+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
18778+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'"
18779
18780 # Handle CRLF in mingw tool chain
18781 opt_cr=
18782@@ -9150,6 +9463,7 @@ for ac_symprfx in "" "_"; do
18783 else
18784 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
18785 fi
18786+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
18787
18788 # Check to see that the pipe works correctly.
18789 pipe_works=no
18790@@ -9191,6 +9505,18 @@ _LT_EOF
18791 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
18792 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
18793 cat <<_LT_EOF > conftest.$ac_ext
18794+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
18795+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
18796+/* DATA imports from DLLs on WIN32 con't be const, because runtime
18797+ relocations are performed -- see ld's documentation on pseudo-relocs. */
18798+# define LT_DLSYM_CONST
18799+#elif defined(__osf__)
18800+/* This system does not cope well with relocations in const data. */
18801+# define LT_DLSYM_CONST
18802+#else
18803+# define LT_DLSYM_CONST const
18804+#endif
18805+
18806 #ifdef __cplusplus
18807 extern "C" {
18808 #endif
18809@@ -9202,7 +9528,7 @@ _LT_EOF
18810 cat <<_LT_EOF >> conftest.$ac_ext
18811
18812 /* The mapping between symbol names and symbols. */
18813-const struct {
18814+LT_DLSYM_CONST struct {
18815 const char *name;
18816 void *address;
18817 }
18818@@ -9228,8 +9554,8 @@ static const void *lt_preloaded_setup() {
18819 _LT_EOF
18820 # Now try linking the two files.
18821 mv conftest.$ac_objext conftstm.$ac_objext
18822- lt_save_LIBS="$LIBS"
18823- lt_save_CFLAGS="$CFLAGS"
18824+ lt_globsym_save_LIBS=$LIBS
18825+ lt_globsym_save_CFLAGS=$CFLAGS
18826 LIBS="conftstm.$ac_objext"
18827 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
18828 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
18829@@ -9239,8 +9565,8 @@ _LT_EOF
18830 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
18831 pipe_works=yes
18832 fi
18833- LIBS="$lt_save_LIBS"
18834- CFLAGS="$lt_save_CFLAGS"
18835+ LIBS=$lt_globsym_save_LIBS
18836+ CFLAGS=$lt_globsym_save_CFLAGS
18837 else
18838 echo "cannot find nm_test_func in $nlist" >&5
18839 fi
18840@@ -9277,6 +9603,17 @@ else
18841 $as_echo "ok" >&6; }
18842 fi
18843
18844+# Response file support.
18845+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
18846+ nm_file_list_spec='@'
18847+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
18848+ nm_file_list_spec='@'
18849+fi
18850+
18851+
18852+
18853+
18854+
18855
18856
18857
18858@@ -9293,6 +9630,44 @@ fi
18859
18860
18861
18862+
18863+
18864+
18865+
18866+
18867+
18868+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
18869+$as_echo_n "checking for sysroot... " >&6; }
18870+
18871+# Check whether --with-libtool-sysroot was given.
18872+if test "${with_libtool_sysroot+set}" = set; then :
18873+ withval=$with_libtool_sysroot;
18874+else
18875+ with_libtool_sysroot=no
18876+fi
18877+
18878+
18879+lt_sysroot=
18880+case ${with_libtool_sysroot} in #(
18881+ yes)
18882+ if test "$GCC" = yes; then
18883+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
18884+ fi
18885+ ;; #(
18886+ /*)
18887+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
18888+ ;; #(
18889+ no|'')
18890+ ;; #(
18891+ *)
18892+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
18893+$as_echo "${with_libtool_sysroot}" >&6; }
18894+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
18895+ ;;
18896+esac
18897+
18898+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
18899+$as_echo "${lt_sysroot:-no}" >&6; }
18900
18901
18902
18903@@ -9504,6 +9879,123 @@ esac
18904
18905 need_locks="$enable_libtool_lock"
18906
18907+if test -n "$ac_tool_prefix"; then
18908+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
18909+set dummy ${ac_tool_prefix}mt; ac_word=$2
18910+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18911+$as_echo_n "checking for $ac_word... " >&6; }
18912+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
18913+ $as_echo_n "(cached) " >&6
18914+else
18915+ if test -n "$MANIFEST_TOOL"; then
18916+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
18917+else
18918+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18919+for as_dir in $PATH
18920+do
18921+ IFS=$as_save_IFS
18922+ test -z "$as_dir" && as_dir=.
18923+ for ac_exec_ext in '' $ac_executable_extensions; do
18924+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18925+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
18926+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18927+ break 2
18928+ fi
18929+done
18930+ done
18931+IFS=$as_save_IFS
18932+
18933+fi
18934+fi
18935+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
18936+if test -n "$MANIFEST_TOOL"; then
18937+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
18938+$as_echo "$MANIFEST_TOOL" >&6; }
18939+else
18940+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18941+$as_echo "no" >&6; }
18942+fi
18943+
18944+
18945+fi
18946+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
18947+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
18948+ # Extract the first word of "mt", so it can be a program name with args.
18949+set dummy mt; ac_word=$2
18950+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18951+$as_echo_n "checking for $ac_word... " >&6; }
18952+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
18953+ $as_echo_n "(cached) " >&6
18954+else
18955+ if test -n "$ac_ct_MANIFEST_TOOL"; then
18956+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
18957+else
18958+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18959+for as_dir in $PATH
18960+do
18961+ IFS=$as_save_IFS
18962+ test -z "$as_dir" && as_dir=.
18963+ for ac_exec_ext in '' $ac_executable_extensions; do
18964+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18965+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
18966+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18967+ break 2
18968+ fi
18969+done
18970+ done
18971+IFS=$as_save_IFS
18972+
18973+fi
18974+fi
18975+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18976+if test -n "$ac_ct_MANIFEST_TOOL"; then
18977+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18978+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18979+else
18980+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18981+$as_echo "no" >&6; }
18982+fi
18983+
18984+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18985+ MANIFEST_TOOL=":"
18986+ else
18987+ case $cross_compiling:$ac_tool_warned in
18988+yes:)
18989+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18990+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18991+ac_tool_warned=yes ;;
18992+esac
18993+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18994+ fi
18995+else
18996+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18997+fi
18998+
18999+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19000+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19001+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19002+if ${lt_cv_path_mainfest_tool+:} false; then :
19003+ $as_echo_n "(cached) " >&6
19004+else
19005+ lt_cv_path_mainfest_tool=no
19006+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
19007+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
19008+ cat conftest.err >&5
19009+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
19010+ lt_cv_path_mainfest_tool=yes
19011+ fi
19012+ rm -f conftest*
19013+fi
19014+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
19015+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
19016+if test "x$lt_cv_path_mainfest_tool" != xyes; then
19017+ MANIFEST_TOOL=:
19018+fi
19019+
19020+
19021+
19022+
19023+
19024
19025 case $host_os in
19026 rhapsody* | darwin*)
19027@@ -10067,6 +10559,8 @@ _LT_EOF
19028 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19029 echo "$AR cru libconftest.a conftest.o" >&5
19030 $AR cru libconftest.a conftest.o 2>&5
19031+ echo "$RANLIB libconftest.a" >&5
19032+ $RANLIB libconftest.a 2>&5
19033 cat > conftest.c << _LT_EOF
19034 int main() { return 0;}
19035 _LT_EOF
19036@@ -10621,8 +11115,6 @@ fi
19037 lt_prog_compiler_pic=
19038 lt_prog_compiler_static=
19039
19040-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
19041-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19042
19043 if test "$GCC" = yes; then
19044 lt_prog_compiler_wl='-Wl,'
19045@@ -10788,6 +11280,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19046 lt_prog_compiler_pic='--shared'
19047 lt_prog_compiler_static='--static'
19048 ;;
19049+ nagfor*)
19050+ # NAG Fortran compiler
19051+ lt_prog_compiler_wl='-Wl,-Wl,,'
19052+ lt_prog_compiler_pic='-PIC'
19053+ lt_prog_compiler_static='-Bstatic'
19054+ ;;
19055 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
19056 # Portland Group compilers (*not* the Pentium gcc compiler,
19057 # which looks to be a dead project)
19058@@ -10850,7 +11348,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19059 lt_prog_compiler_pic='-KPIC'
19060 lt_prog_compiler_static='-Bstatic'
19061 case $cc_basename in
19062- f77* | f90* | f95*)
19063+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
19064 lt_prog_compiler_wl='-Qoption ld ';;
19065 *)
19066 lt_prog_compiler_wl='-Wl,';;
19067@@ -10907,13 +11405,17 @@ case $host_os in
19068 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
19069 ;;
19070 esac
19071-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
19072-$as_echo "$lt_prog_compiler_pic" >&6; }
19073-
19074-
19075-
19076-
19077
19078+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
19079+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19080+if ${lt_cv_prog_compiler_pic+:} false; then :
19081+ $as_echo_n "(cached) " >&6
19082+else
19083+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
19084+fi
19085+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
19086+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
19087+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
19088
19089 #
19090 # Check to make sure the PIC flag actually works.
19091@@ -10974,6 +11476,11 @@ fi
19092
19093
19094
19095+
19096+
19097+
19098+
19099+
19100 #
19101 # Check to make sure the static flag actually works.
19102 #
19103@@ -11324,7 +11831,8 @@ _LT_EOF
19104 allow_undefined_flag=unsupported
19105 always_export_symbols=no
19106 enable_shared_with_static_runtimes=yes
19107- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
19108+ 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'
19109+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
19110
19111 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
19112 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
19113@@ -11423,12 +11931,12 @@ _LT_EOF
19114 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
19115 hardcode_libdir_flag_spec=
19116 hardcode_libdir_flag_spec_ld='-rpath $libdir'
19117- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
19118+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
19119 if test "x$supports_anon_versioning" = xyes; then
19120 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
19121 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
19122 echo "local: *; };" >> $output_objdir/$libname.ver~
19123- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
19124+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
19125 fi
19126 ;;
19127 esac
19128@@ -11442,8 +11950,8 @@ _LT_EOF
19129 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
19130 wlarc=
19131 else
19132- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19133- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19134+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19135+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19136 fi
19137 ;;
19138
19139@@ -11461,8 +11969,8 @@ _LT_EOF
19140
19141 _LT_EOF
19142 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
19143- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19144- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19145+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19146+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19147 else
19148 ld_shlibs=no
19149 fi
19150@@ -11508,8 +12016,8 @@ _LT_EOF
19151
19152 *)
19153 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
19154- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19155- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19156+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
19157+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
19158 else
19159 ld_shlibs=no
19160 fi
19161@@ -11639,7 +12147,13 @@ _LT_EOF
19162 allow_undefined_flag='-berok'
19163 # Determine the default libpath from the value encoded in an
19164 # empty executable.
19165- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19166+ if test "${lt_cv_aix_libpath+set}" = set; then
19167+ aix_libpath=$lt_cv_aix_libpath
19168+else
19169+ if ${lt_cv_aix_libpath_+:} false; then :
19170+ $as_echo_n "(cached) " >&6
19171+else
19172+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19173 /* end confdefs.h. */
19174
19175 int
19176@@ -11652,22 +12166,29 @@ main ()
19177 _ACEOF
19178 if ac_fn_c_try_link "$LINENO"; then :
19179
19180-lt_aix_libpath_sed='
19181- /Import File Strings/,/^$/ {
19182- /^0/ {
19183- s/^0 *\(.*\)$/\1/
19184- p
19185- }
19186- }'
19187-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19188-# Check for a 64-bit object if we didn't find anything.
19189-if test -z "$aix_libpath"; then
19190- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19191-fi
19192+ lt_aix_libpath_sed='
19193+ /Import File Strings/,/^$/ {
19194+ /^0/ {
19195+ s/^0 *\([^ ]*\) *$/\1/
19196+ p
19197+ }
19198+ }'
19199+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19200+ # Check for a 64-bit object if we didn't find anything.
19201+ if test -z "$lt_cv_aix_libpath_"; then
19202+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19203+ fi
19204 fi
19205 rm -f core conftest.err conftest.$ac_objext \
19206 conftest$ac_exeext conftest.$ac_ext
19207-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19208+ if test -z "$lt_cv_aix_libpath_"; then
19209+ lt_cv_aix_libpath_="/usr/lib:/lib"
19210+ fi
19211+
19212+fi
19213+
19214+ aix_libpath=$lt_cv_aix_libpath_
19215+fi
19216
19217 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
19218 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"
19219@@ -11679,7 +12200,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19220 else
19221 # Determine the default libpath from the value encoded in an
19222 # empty executable.
19223- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19224+ if test "${lt_cv_aix_libpath+set}" = set; then
19225+ aix_libpath=$lt_cv_aix_libpath
19226+else
19227+ if ${lt_cv_aix_libpath_+:} false; then :
19228+ $as_echo_n "(cached) " >&6
19229+else
19230+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19231 /* end confdefs.h. */
19232
19233 int
19234@@ -11692,22 +12219,29 @@ main ()
19235 _ACEOF
19236 if ac_fn_c_try_link "$LINENO"; then :
19237
19238-lt_aix_libpath_sed='
19239- /Import File Strings/,/^$/ {
19240- /^0/ {
19241- s/^0 *\(.*\)$/\1/
19242- p
19243- }
19244- }'
19245-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19246-# Check for a 64-bit object if we didn't find anything.
19247-if test -z "$aix_libpath"; then
19248- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19249-fi
19250+ lt_aix_libpath_sed='
19251+ /Import File Strings/,/^$/ {
19252+ /^0/ {
19253+ s/^0 *\([^ ]*\) *$/\1/
19254+ p
19255+ }
19256+ }'
19257+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19258+ # Check for a 64-bit object if we didn't find anything.
19259+ if test -z "$lt_cv_aix_libpath_"; then
19260+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
19261+ fi
19262 fi
19263 rm -f core conftest.err conftest.$ac_objext \
19264 conftest$ac_exeext conftest.$ac_ext
19265-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19266+ if test -z "$lt_cv_aix_libpath_"; then
19267+ lt_cv_aix_libpath_="/usr/lib:/lib"
19268+ fi
19269+
19270+fi
19271+
19272+ aix_libpath=$lt_cv_aix_libpath_
19273+fi
19274
19275 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
19276 # Warning - without using the other run time loading flags,
19277@@ -11752,20 +12286,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19278 # Microsoft Visual C++.
19279 # hardcode_libdir_flag_spec is actually meaningless, as there is
19280 # no search path for DLLs.
19281- hardcode_libdir_flag_spec=' '
19282- allow_undefined_flag=unsupported
19283- # Tell ltmain to make .lib files, not .a files.
19284- libext=lib
19285- # Tell ltmain to make .dll files, not .so files.
19286- shrext_cmds=".dll"
19287- # FIXME: Setting linknames here is a bad hack.
19288- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
19289- # The linker will automatically build a .lib file if we build a DLL.
19290- old_archive_from_new_cmds='true'
19291- # FIXME: Should let the user specify the lib program.
19292- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
19293- fix_srcfile_path='`cygpath -w "$srcfile"`'
19294- enable_shared_with_static_runtimes=yes
19295+ case $cc_basename in
19296+ cl*)
19297+ # Native MSVC
19298+ hardcode_libdir_flag_spec=' '
19299+ allow_undefined_flag=unsupported
19300+ always_export_symbols=yes
19301+ file_list_spec='@'
19302+ # Tell ltmain to make .lib files, not .a files.
19303+ libext=lib
19304+ # Tell ltmain to make .dll files, not .so files.
19305+ shrext_cmds=".dll"
19306+ # FIXME: Setting linknames here is a bad hack.
19307+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
19308+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
19309+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
19310+ else
19311+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
19312+ fi~
19313+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
19314+ linknames='
19315+ # The linker will not automatically build a static lib if we build a DLL.
19316+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
19317+ enable_shared_with_static_runtimes=yes
19318+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
19319+ # Don't use ranlib
19320+ old_postinstall_cmds='chmod 644 $oldlib'
19321+ postlink_cmds='lt_outputfile="@OUTPUT@"~
19322+ lt_tool_outputfile="@TOOL_OUTPUT@"~
19323+ case $lt_outputfile in
19324+ *.exe|*.EXE) ;;
19325+ *)
19326+ lt_outputfile="$lt_outputfile.exe"
19327+ lt_tool_outputfile="$lt_tool_outputfile.exe"
19328+ ;;
19329+ esac~
19330+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
19331+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
19332+ $RM "$lt_outputfile.manifest";
19333+ fi'
19334+ ;;
19335+ *)
19336+ # Assume MSVC wrapper
19337+ hardcode_libdir_flag_spec=' '
19338+ allow_undefined_flag=unsupported
19339+ # Tell ltmain to make .lib files, not .a files.
19340+ libext=lib
19341+ # Tell ltmain to make .dll files, not .so files.
19342+ shrext_cmds=".dll"
19343+ # FIXME: Setting linknames here is a bad hack.
19344+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
19345+ # The linker will automatically build a .lib file if we build a DLL.
19346+ old_archive_from_new_cmds='true'
19347+ # FIXME: Should let the user specify the lib program.
19348+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
19349+ enable_shared_with_static_runtimes=yes
19350+ ;;
19351+ esac
19352 ;;
19353
19354 darwin* | rhapsody*)
19355@@ -11826,7 +12403,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19356
19357 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
19358 freebsd* | dragonfly*)
19359- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
19360+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
19361 hardcode_libdir_flag_spec='-R$libdir'
19362 hardcode_direct=yes
19363 hardcode_shlibpath_var=no
19364@@ -11834,7 +12411,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19365
19366 hpux9*)
19367 if test "$GCC" = yes; then
19368- 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'
19369+ 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'
19370 else
19371 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'
19372 fi
19373@@ -11850,7 +12427,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19374
19375 hpux10*)
19376 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
19377- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
19378+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
19379 else
19380 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
19381 fi
19382@@ -11874,10 +12451,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19383 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
19384 ;;
19385 ia64*)
19386- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
19387+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
19388 ;;
19389 *)
19390- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
19391+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
19392 ;;
19393 esac
19394 else
19395@@ -11956,23 +12533,36 @@ fi
19396
19397 irix5* | irix6* | nonstopux*)
19398 if test "$GCC" = yes; then
19399- 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'
19400+ 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'
19401 # Try to use the -exported_symbol ld option, if it does not
19402 # work, assume that -exports_file does not work either and
19403 # implicitly export all symbols.
19404- save_LDFLAGS="$LDFLAGS"
19405- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
19406- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19407+ # This should be the same for all languages, so no per-tag cache variable.
19408+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
19409+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
19410+if ${lt_cv_irix_exported_symbol+:} false; then :
19411+ $as_echo_n "(cached) " >&6
19412+else
19413+ save_LDFLAGS="$LDFLAGS"
19414+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
19415+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19416 /* end confdefs.h. */
19417-int foo(void) {}
19418+int foo (void) { return 0; }
19419 _ACEOF
19420 if ac_fn_c_try_link "$LINENO"; then :
19421- 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'
19422-
19423+ lt_cv_irix_exported_symbol=yes
19424+else
19425+ lt_cv_irix_exported_symbol=no
19426 fi
19427 rm -f core conftest.err conftest.$ac_objext \
19428 conftest$ac_exeext conftest.$ac_ext
19429- LDFLAGS="$save_LDFLAGS"
19430+ LDFLAGS="$save_LDFLAGS"
19431+fi
19432+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
19433+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
19434+ if test "$lt_cv_irix_exported_symbol" = yes; then
19435+ 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'
19436+ fi
19437 else
19438 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'
19439 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'
19440@@ -12057,7 +12647,7 @@ rm -f core conftest.err conftest.$ac_objext \
19441 osf4* | osf5*) # as osf3* with the addition of -msym flag
19442 if test "$GCC" = yes; then
19443 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
19444- 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'
19445+ 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'
19446 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
19447 else
19448 allow_undefined_flag=' -expect_unresolved \*'
19449@@ -12076,9 +12666,9 @@ rm -f core conftest.err conftest.$ac_objext \
19450 no_undefined_flag=' -z defs'
19451 if test "$GCC" = yes; then
19452 wlarc='${wl}'
19453- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
19454+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
19455 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
19456- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
19457+ $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'
19458 else
19459 case `$CC -V 2>&1` in
19460 *"Compilers 5.0"*)
19461@@ -12654,8 +13244,9 @@ cygwin* | mingw* | pw32* | cegcc*)
19462 need_version=no
19463 need_lib_prefix=no
19464
19465- case $GCC,$host_os in
19466- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
19467+ case $GCC,$cc_basename in
19468+ yes,*)
19469+ # gcc
19470 library_names_spec='$libname.dll.a'
19471 # DLL is installed to $(libdir)/../bin by postinstall_cmds
19472 postinstall_cmds='base_file=`basename \${file}`~
19473@@ -12688,13 +13279,71 @@ cygwin* | mingw* | pw32* | cegcc*)
19474 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
19475 ;;
19476 esac
19477+ dynamic_linker='Win32 ld.exe'
19478+ ;;
19479+
19480+ *,cl*)
19481+ # Native MSVC
19482+ libname_spec='$name'
19483+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
19484+ library_names_spec='${libname}.dll.lib'
19485+
19486+ case $build_os in
19487+ mingw*)
19488+ sys_lib_search_path_spec=
19489+ lt_save_ifs=$IFS
19490+ IFS=';'
19491+ for lt_path in $LIB
19492+ do
19493+ IFS=$lt_save_ifs
19494+ # Let DOS variable expansion print the short 8.3 style file name.
19495+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
19496+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
19497+ done
19498+ IFS=$lt_save_ifs
19499+ # Convert to MSYS style.
19500+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
19501+ ;;
19502+ cygwin*)
19503+ # Convert to unix form, then to dos form, then back to unix form
19504+ # but this time dos style (no spaces!) so that the unix form looks
19505+ # like /cygdrive/c/PROGRA~1:/cygdr...
19506+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
19507+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
19508+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
19509+ ;;
19510+ *)
19511+ sys_lib_search_path_spec="$LIB"
19512+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
19513+ # It is most probably a Windows format PATH.
19514+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
19515+ else
19516+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
19517+ fi
19518+ # FIXME: find the short name or the path components, as spaces are
19519+ # common. (e.g. "Program Files" -> "PROGRA~1")
19520+ ;;
19521+ esac
19522+
19523+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
19524+ postinstall_cmds='base_file=`basename \${file}`~
19525+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
19526+ dldir=$destdir/`dirname \$dlpath`~
19527+ test -d \$dldir || mkdir -p \$dldir~
19528+ $install_prog $dir/$dlname \$dldir/$dlname'
19529+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
19530+ dlpath=$dir/\$dldll~
19531+ $RM \$dlpath'
19532+ shlibpath_overrides_runpath=yes
19533+ dynamic_linker='Win32 link.exe'
19534 ;;
19535
19536 *)
19537+ # Assume MSVC wrapper
19538 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
19539+ dynamic_linker='Win32 ld.exe'
19540 ;;
19541 esac
19542- dynamic_linker='Win32 ld.exe'
19543 # FIXME: first we should search . and the directory the executable is in
19544 shlibpath_var=PATH
19545 ;;
19546@@ -13640,10 +14293,10 @@ else
19547 /* When -fvisbility=hidden is used, assume the code has been annotated
19548 correspondingly for the symbols needed. */
19549 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
19550-void fnord () __attribute__((visibility("default")));
19551+int fnord () __attribute__((visibility("default")));
19552 #endif
19553
19554-void fnord () { int i=42; }
19555+int fnord () { return 42; }
19556 int main ()
19557 {
19558 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19559@@ -13746,10 +14403,10 @@ else
19560 /* When -fvisbility=hidden is used, assume the code has been annotated
19561 correspondingly for the symbols needed. */
19562 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
19563-void fnord () __attribute__((visibility("default")));
19564+int fnord () __attribute__((visibility("default")));
19565 #endif
19566
19567-void fnord () { int i=42; }
19568+int fnord () { return 42; }
19569 int main ()
19570 {
19571 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19572@@ -17797,13 +18454,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
19573 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
19574 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
19575 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
19576+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
19577+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
19578 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
19579 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
19580 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
19581 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
19582 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
19583+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
19584+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
19585+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
19586+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
19587 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
19588 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
19589+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
19590 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
19591 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
19592 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
19593@@ -17818,14 +18482,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
19594 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
19595 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
19596 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"`'
19597+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
19598+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
19599 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
19600 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
19601 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
19602-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
19603 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
19604+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
19605 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
19606 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
19607 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
19608+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
19609 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
19610 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
19611 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
19612@@ -17858,12 +18525,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
19613 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
19614 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
19615 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
19616-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
19617 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
19618 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
19619 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
19620 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
19621 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
19622+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
19623 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
19624 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
19625 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
19626@@ -17918,8 +18585,13 @@ reload_flag \
19627 OBJDUMP \
19628 deplibs_check_method \
19629 file_magic_cmd \
19630+file_magic_glob \
19631+want_nocaseglob \
19632+DLLTOOL \
19633+sharedlib_from_linklib_cmd \
19634 AR \
19635 AR_FLAGS \
19636+archiver_list_spec \
19637 STRIP \
19638 RANLIB \
19639 CC \
19640@@ -17929,12 +18601,14 @@ lt_cv_sys_global_symbol_pipe \
19641 lt_cv_sys_global_symbol_to_cdecl \
19642 lt_cv_sys_global_symbol_to_c_name_address \
19643 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
19644+nm_file_list_spec \
19645 lt_prog_compiler_no_builtin_flag \
19646-lt_prog_compiler_wl \
19647 lt_prog_compiler_pic \
19648+lt_prog_compiler_wl \
19649 lt_prog_compiler_static \
19650 lt_cv_prog_compiler_c_o \
19651 need_locks \
19652+MANIFEST_TOOL \
19653 DSYMUTIL \
19654 NMEDIT \
19655 LIPO \
19656@@ -17950,7 +18624,6 @@ no_undefined_flag \
19657 hardcode_libdir_flag_spec \
19658 hardcode_libdir_flag_spec_ld \
19659 hardcode_libdir_separator \
19660-fix_srcfile_path \
19661 exclude_expsyms \
19662 include_expsyms \
19663 file_list_spec \
19664@@ -17986,6 +18659,7 @@ module_cmds \
19665 module_expsym_cmds \
19666 export_symbols_cmds \
19667 prelink_cmds \
19668+postlink_cmds \
19669 postinstall_cmds \
19670 postuninstall_cmds \
19671 finish_cmds \
19672@@ -18845,7 +19519,8 @@ $as_echo X"$file" |
19673 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
19674 #
19675 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
19676-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
19677+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
19678+# Inc.
19679 # Written by Gordon Matzigkeit, 1996
19680 #
19681 # This file is part of GNU Libtool.
19682@@ -18948,19 +19623,42 @@ SP2NL=$lt_lt_SP2NL
19683 # turn newlines into spaces.
19684 NL2SP=$lt_lt_NL2SP
19685
19686+# convert \$build file names to \$host format.
19687+to_host_file_cmd=$lt_cv_to_host_file_cmd
19688+
19689+# convert \$build files to toolchain format.
19690+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19691+
19692 # An object symbol dumper.
19693 OBJDUMP=$lt_OBJDUMP
19694
19695 # Method to check whether dependent libraries are shared objects.
19696 deplibs_check_method=$lt_deplibs_check_method
19697
19698-# Command to use when deplibs_check_method == "file_magic".
19699+# Command to use when deplibs_check_method = "file_magic".
19700 file_magic_cmd=$lt_file_magic_cmd
19701
19702+# How to find potential files when deplibs_check_method = "file_magic".
19703+file_magic_glob=$lt_file_magic_glob
19704+
19705+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
19706+want_nocaseglob=$lt_want_nocaseglob
19707+
19708+# DLL creation program.
19709+DLLTOOL=$lt_DLLTOOL
19710+
19711+# Command to associate shared and link libraries.
19712+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
19713+
19714 # The archiver.
19715 AR=$lt_AR
19716+
19717+# Flags to create an archive.
19718 AR_FLAGS=$lt_AR_FLAGS
19719
19720+# How to feed a file listing to the archiver.
19721+archiver_list_spec=$lt_archiver_list_spec
19722+
19723 # A symbol stripping program.
19724 STRIP=$lt_STRIP
19725
19726@@ -18990,6 +19688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
19727 # Transform the output of nm in a C name address pair when lib prefix is needed.
19728 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
19729
19730+# Specify filename containing input files for \$NM.
19731+nm_file_list_spec=$lt_nm_file_list_spec
19732+
19733+# The root where to search for dependent libraries,and in which our libraries should be installed.
19734+lt_sysroot=$lt_sysroot
19735+
19736 # The name of the directory that contains temporary libtool files.
19737 objdir=$objdir
19738
19739@@ -18999,6 +19703,9 @@ MAGIC_CMD=$MAGIC_CMD
19740 # Must we lock files when doing compilation?
19741 need_locks=$lt_need_locks
19742
19743+# Manifest tool.
19744+MANIFEST_TOOL=$lt_MANIFEST_TOOL
19745+
19746 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
19747 DSYMUTIL=$lt_DSYMUTIL
19748
19749@@ -19113,12 +19820,12 @@ with_gcc=$GCC
19750 # Compiler flag to turn off builtin functions.
19751 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
19752
19753-# How to pass a linker flag through the compiler.
19754-wl=$lt_lt_prog_compiler_wl
19755-
19756 # Additional compiler flags for building library objects.
19757 pic_flag=$lt_lt_prog_compiler_pic
19758
19759+# How to pass a linker flag through the compiler.
19760+wl=$lt_lt_prog_compiler_wl
19761+
19762 # Compiler flag to prevent dynamic linking.
19763 link_static_flag=$lt_lt_prog_compiler_static
19764
19765@@ -19205,9 +19912,6 @@ inherit_rpath=$inherit_rpath
19766 # Whether libtool must link a program against all its dependency libraries.
19767 link_all_deplibs=$link_all_deplibs
19768
19769-# Fix the shell variable \$srcfile for the compiler.
19770-fix_srcfile_path=$lt_fix_srcfile_path
19771-
19772 # Set to "yes" if exported symbols are required.
19773 always_export_symbols=$always_export_symbols
19774
19775@@ -19223,6 +19927,9 @@ include_expsyms=$lt_include_expsyms
19776 # Commands necessary for linking programs (against libraries) with templates.
19777 prelink_cmds=$lt_prelink_cmds
19778
19779+# Commands necessary for finishing linking programs.
19780+postlink_cmds=$lt_postlink_cmds
19781+
19782 # Specify filename containing input files.
19783 file_list_spec=$lt_file_list_spec
19784
19785@@ -19255,210 +19962,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
19786 # if finds mixed CR/LF and LF-only lines. Since sed operates in
19787 # text mode, it properly converts lines to CR/LF. This bash problem
19788 # is reportedly fixed, but why not run on old versions too?
19789- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
19790- || (rm -f "$cfgfile"; exit 1)
19791-
19792- case $xsi_shell in
19793- yes)
19794- cat << \_LT_EOF >> "$cfgfile"
19795-
19796-# func_dirname file append nondir_replacement
19797-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
19798-# otherwise set result to NONDIR_REPLACEMENT.
19799-func_dirname ()
19800-{
19801- case ${1} in
19802- */*) func_dirname_result="${1%/*}${2}" ;;
19803- * ) func_dirname_result="${3}" ;;
19804- esac
19805-}
19806-
19807-# func_basename file
19808-func_basename ()
19809-{
19810- func_basename_result="${1##*/}"
19811-}
19812-
19813-# func_dirname_and_basename file append nondir_replacement
19814-# perform func_basename and func_dirname in a single function
19815-# call:
19816-# dirname: Compute the dirname of FILE. If nonempty,
19817-# add APPEND to the result, otherwise set result
19818-# to NONDIR_REPLACEMENT.
19819-# value returned in "$func_dirname_result"
19820-# basename: Compute filename of FILE.
19821-# value retuned in "$func_basename_result"
19822-# Implementation must be kept synchronized with func_dirname
19823-# and func_basename. For efficiency, we do not delegate to
19824-# those functions but instead duplicate the functionality here.
19825-func_dirname_and_basename ()
19826-{
19827- case ${1} in
19828- */*) func_dirname_result="${1%/*}${2}" ;;
19829- * ) func_dirname_result="${3}" ;;
19830- esac
19831- func_basename_result="${1##*/}"
19832-}
19833-
19834-# func_stripname prefix suffix name
19835-# strip PREFIX and SUFFIX off of NAME.
19836-# PREFIX and SUFFIX must not contain globbing or regex special
19837-# characters, hashes, percent signs, but SUFFIX may contain a leading
19838-# dot (in which case that matches only a dot).
19839-func_stripname ()
19840-{
19841- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
19842- # positional parameters, so assign one to ordinary parameter first.
19843- func_stripname_result=${3}
19844- func_stripname_result=${func_stripname_result#"${1}"}
19845- func_stripname_result=${func_stripname_result%"${2}"}
19846-}
19847-
19848-# func_opt_split
19849-func_opt_split ()
19850-{
19851- func_opt_split_opt=${1%%=*}
19852- func_opt_split_arg=${1#*=}
19853-}
19854-
19855-# func_lo2o object
19856-func_lo2o ()
19857-{
19858- case ${1} in
19859- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
19860- *) func_lo2o_result=${1} ;;
19861- esac
19862-}
19863-
19864-# func_xform libobj-or-source
19865-func_xform ()
19866-{
19867- func_xform_result=${1%.*}.lo
19868-}
19869-
19870-# func_arith arithmetic-term...
19871-func_arith ()
19872-{
19873- func_arith_result=$(( $* ))
19874-}
19875-
19876-# func_len string
19877-# STRING may not start with a hyphen.
19878-func_len ()
19879-{
19880- func_len_result=${#1}
19881-}
19882-
19883-_LT_EOF
19884- ;;
19885- *) # Bourne compatible functions.
19886- cat << \_LT_EOF >> "$cfgfile"
19887-
19888-# func_dirname file append nondir_replacement
19889-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
19890-# otherwise set result to NONDIR_REPLACEMENT.
19891-func_dirname ()
19892-{
19893- # Extract subdirectory from the argument.
19894- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
19895- if test "X$func_dirname_result" = "X${1}"; then
19896- func_dirname_result="${3}"
19897- else
19898- func_dirname_result="$func_dirname_result${2}"
19899- fi
19900-}
19901-
19902-# func_basename file
19903-func_basename ()
19904-{
19905- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
19906-}
19907-
19908-
19909-# func_stripname prefix suffix name
19910-# strip PREFIX and SUFFIX off of NAME.
19911-# PREFIX and SUFFIX must not contain globbing or regex special
19912-# characters, hashes, percent signs, but SUFFIX may contain a leading
19913-# dot (in which case that matches only a dot).
19914-# func_strip_suffix prefix name
19915-func_stripname ()
19916-{
19917- case ${2} in
19918- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
19919- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
19920- esac
19921-}
19922-
19923-# sed scripts:
19924-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
19925-my_sed_long_arg='1s/^-[^=]*=//'
19926-
19927-# func_opt_split
19928-func_opt_split ()
19929-{
19930- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
19931- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
19932-}
19933-
19934-# func_lo2o object
19935-func_lo2o ()
19936-{
19937- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19938-}
19939-
19940-# func_xform libobj-or-source
19941-func_xform ()
19942-{
19943- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19944-}
19945-
19946-# func_arith arithmetic-term...
19947-func_arith ()
19948-{
19949- func_arith_result=`expr "$@"`
19950-}
19951-
19952-# func_len string
19953-# STRING may not start with a hyphen.
19954-func_len ()
19955-{
19956- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19957-}
19958-
19959-_LT_EOF
19960-esac
19961-
19962-case $lt_shell_append in
19963- yes)
19964- cat << \_LT_EOF >> "$cfgfile"
19965-
19966-# func_append var value
19967-# Append VALUE to the end of shell variable VAR.
19968-func_append ()
19969-{
19970- eval "$1+=\$2"
19971-}
19972-_LT_EOF
19973- ;;
19974- *)
19975- cat << \_LT_EOF >> "$cfgfile"
19976-
19977-# func_append var value
19978-# Append VALUE to the end of shell variable VAR.
19979-func_append ()
19980-{
19981- eval "$1=\$$1\$2"
19982-}
19983-
19984-_LT_EOF
19985- ;;
19986- esac
19987-
19988-
19989- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19990- || (rm -f "$cfgfile"; exit 1)
19991-
19992- mv -f "$cfgfile" "$ofile" ||
19993+ sed '$q' "$ltmain" >> "$cfgfile" \
19994+ || (rm -f "$cfgfile"; exit 1)
19995+
19996+ if test x"$xsi_shell" = xyes; then
19997+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19998+func_dirname ()\
19999+{\
20000+\ case ${1} in\
20001+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20002+\ * ) func_dirname_result="${3}" ;;\
20003+\ esac\
20004+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
20005+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20006+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20007+test 0 -eq $? || _lt_function_replace_fail=:
20008+
20009+
20010+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
20011+func_basename ()\
20012+{\
20013+\ func_basename_result="${1##*/}"\
20014+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
20015+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20016+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20017+test 0 -eq $? || _lt_function_replace_fail=:
20018+
20019+
20020+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
20021+func_dirname_and_basename ()\
20022+{\
20023+\ case ${1} in\
20024+\ */*) func_dirname_result="${1%/*}${2}" ;;\
20025+\ * ) func_dirname_result="${3}" ;;\
20026+\ esac\
20027+\ func_basename_result="${1##*/}"\
20028+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
20029+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20030+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20031+test 0 -eq $? || _lt_function_replace_fail=:
20032+
20033+
20034+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
20035+func_stripname ()\
20036+{\
20037+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
20038+\ # positional parameters, so assign one to ordinary parameter first.\
20039+\ func_stripname_result=${3}\
20040+\ func_stripname_result=${func_stripname_result#"${1}"}\
20041+\ func_stripname_result=${func_stripname_result%"${2}"}\
20042+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
20043+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20044+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20045+test 0 -eq $? || _lt_function_replace_fail=:
20046+
20047+
20048+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
20049+func_split_long_opt ()\
20050+{\
20051+\ func_split_long_opt_name=${1%%=*}\
20052+\ func_split_long_opt_arg=${1#*=}\
20053+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
20054+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20055+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20056+test 0 -eq $? || _lt_function_replace_fail=:
20057+
20058+
20059+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
20060+func_split_short_opt ()\
20061+{\
20062+\ func_split_short_opt_arg=${1#??}\
20063+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
20064+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
20065+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20066+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20067+test 0 -eq $? || _lt_function_replace_fail=:
20068+
20069+
20070+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
20071+func_lo2o ()\
20072+{\
20073+\ case ${1} in\
20074+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
20075+\ *) func_lo2o_result=${1} ;;\
20076+\ esac\
20077+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
20078+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20079+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20080+test 0 -eq $? || _lt_function_replace_fail=:
20081+
20082+
20083+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
20084+func_xform ()\
20085+{\
20086+ func_xform_result=${1%.*}.lo\
20087+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
20088+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20089+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20090+test 0 -eq $? || _lt_function_replace_fail=:
20091+
20092+
20093+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
20094+func_arith ()\
20095+{\
20096+ func_arith_result=$(( $* ))\
20097+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
20098+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20099+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20100+test 0 -eq $? || _lt_function_replace_fail=:
20101+
20102+
20103+ sed -e '/^func_len ()$/,/^} # func_len /c\
20104+func_len ()\
20105+{\
20106+ func_len_result=${#1}\
20107+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
20108+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20109+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20110+test 0 -eq $? || _lt_function_replace_fail=:
20111+
20112+fi
20113+
20114+if test x"$lt_shell_append" = xyes; then
20115+ sed -e '/^func_append ()$/,/^} # func_append /c\
20116+func_append ()\
20117+{\
20118+ eval "${1}+=\\${2}"\
20119+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
20120+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20121+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20122+test 0 -eq $? || _lt_function_replace_fail=:
20123+
20124+
20125+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
20126+func_append_quoted ()\
20127+{\
20128+\ func_quote_for_eval "${2}"\
20129+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
20130+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
20131+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20132+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20133+test 0 -eq $? || _lt_function_replace_fail=:
20134+
20135+
20136+ # Save a `func_append' function call where possible by direct use of '+='
20137+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
20138+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20139+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20140+ test 0 -eq $? || _lt_function_replace_fail=:
20141+else
20142+ # Save a `func_append' function call even when '+=' is not available
20143+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
20144+ && mv -f "$cfgfile.tmp" "$cfgfile" \
20145+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
20146+ test 0 -eq $? || _lt_function_replace_fail=:
20147+fi
20148+
20149+if test x"$_lt_function_replace_fail" = x":"; then
20150+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
20151+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
20152+fi
20153+
20154+
20155+ mv -f "$cfgfile" "$ofile" ||
20156 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
20157 chmod +x "$ofile"
20158
20159diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in
20160index 9e3d268902b..c22ed33460a 100644
20161--- a/libsframe/Makefile.in
20162+++ b/libsframe/Makefile.in
20163@@ -1,7 +1,7 @@
20164-# Makefile.in generated by automake 1.15.1 from Makefile.am.
20165+# Makefile.in generated by automake 1.16.5 from Makefile.am.
20166 # @configure_input@
20167
20168-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
20169+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
20170
20171 # This Makefile.in is free software; the Free Software Foundation
20172 # gives unlimited permission to copy and/or distribute it,
20173@@ -142,6 +142,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
20174 CONFIG_HEADER = config.h
20175 CONFIG_CLEAN_FILES =
20176 CONFIG_CLEAN_VPATH_FILES =
20177+@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \
20178+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \
20179+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \
20180+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \
20181+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \
20182+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \
20183+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT)
20184 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
20185 am__vpath_adj = case $$p in \
20186 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
20187@@ -185,45 +192,44 @@ libsframe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
20188 $(libsframe_la_LDFLAGS) $(LDFLAGS) -o $@
20189 @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath =
20190 @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir)
20191-@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \
20192-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \
20193-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \
20194-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \
20195-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \
20196-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \
20197-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT)
20198 am__dirstamp = $(am__leading_dot)dirstamp
20199-am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT)
20200+am_testsuite_libsframe_decode_be_flipping_OBJECTS = \
20201+ testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT)
20202 testsuite_libsframe_decode_be_flipping_OBJECTS = \
20203 $(am_testsuite_libsframe_decode_be_flipping_OBJECTS)
20204 testsuite_libsframe_decode_be_flipping_DEPENDENCIES = \
20205 ${top_builddir}/libsframe.la
20206-am_testsuite_libsframe_decode_frecnt_1_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT)
20207+am_testsuite_libsframe_decode_frecnt_1_OBJECTS = \
20208+ testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT)
20209 testsuite_libsframe_decode_frecnt_1_OBJECTS = \
20210 $(am_testsuite_libsframe_decode_frecnt_1_OBJECTS)
20211 testsuite_libsframe_decode_frecnt_1_DEPENDENCIES = \
20212 ${top_builddir}/libsframe.la
20213-am_testsuite_libsframe_decode_frecnt_2_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT)
20214+am_testsuite_libsframe_decode_frecnt_2_OBJECTS = \
20215+ testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT)
20216 testsuite_libsframe_decode_frecnt_2_OBJECTS = \
20217 $(am_testsuite_libsframe_decode_frecnt_2_OBJECTS)
20218 testsuite_libsframe_decode_frecnt_2_DEPENDENCIES = \
20219 ${top_builddir}/libsframe.la
20220-am_testsuite_libsframe_encode_encode_1_OBJECTS = testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT)
20221+am_testsuite_libsframe_encode_encode_1_OBJECTS = \
20222+ testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT)
20223 testsuite_libsframe_encode_encode_1_OBJECTS = \
20224 $(am_testsuite_libsframe_encode_encode_1_OBJECTS)
20225 testsuite_libsframe_encode_encode_1_DEPENDENCIES = \
20226 ${top_builddir}/libsframe.la
20227-am_testsuite_libsframe_find_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT)
20228+am_testsuite_libsframe_find_findfre_1_OBJECTS = \
20229+ testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT)
20230 testsuite_libsframe_find_findfre_1_OBJECTS = \
20231 $(am_testsuite_libsframe_find_findfre_1_OBJECTS)
20232 testsuite_libsframe_find_findfre_1_DEPENDENCIES = \
20233 ${top_builddir}/libsframe.la
20234-am_testsuite_libsframe_find_findfunc_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT)
20235+am_testsuite_libsframe_find_findfunc_1_OBJECTS = \
20236+ testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT)
20237 testsuite_libsframe_find_findfunc_1_OBJECTS = \
20238 $(am_testsuite_libsframe_find_findfunc_1_OBJECTS)
20239 testsuite_libsframe_find_findfunc_1_DEPENDENCIES = \
20240 ${top_builddir}/libsframe.la
20241-am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT)
20242+am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT)
20243 testsuite_libsframe_find_plt_findfre_1_OBJECTS = \
20244 $(am_testsuite_libsframe_find_plt_findfre_1_OBJECTS)
20245 testsuite_libsframe_find_plt_findfre_1_DEPENDENCIES = \
20246@@ -242,7 +248,17 @@ am__v_at_0 = @
20247 am__v_at_1 =
20248 DEFAULT_INCLUDES = -I.@am__isrc@
20249 depcomp = $(SHELL) $(top_srcdir)/../depcomp
20250-am__depfiles_maybe = depfiles
20251+am__maybe_remake_depfiles = depfiles
20252+am__depfiles_remade = ./$(DEPDIR)/libsframe_la-sframe-dump.Plo \
20253+ ./$(DEPDIR)/libsframe_la-sframe-error.Plo \
20254+ ./$(DEPDIR)/libsframe_la-sframe.Plo \
20255+ testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \
20256+ testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \
20257+ testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \
20258+ testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po \
20259+ testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po \
20260+ testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po \
20261+ testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po
20262 am__mv = mv -f
20263 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
20264 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
20265@@ -325,8 +341,8 @@ am__can_run_installinfo = \
20266 esac
20267 am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h
20268 HEADERS = $(include_HEADERS)
20269-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
20270- $(LISP)config.h.in
20271+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
20272+ config.h.in
20273 # Read a list of newline-separated strings from the standard input,
20274 # and print each of them once, without duplicates. Input order is
20275 # *not* preserved.
20276@@ -343,9 +359,6 @@ am__define_uniq_tagged_files = \
20277 unique=`for i in $$list; do \
20278 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20279 done | $(am__uniquify_input)`
20280-ETAGS = etags
20281-CTAGS = ctags
20282-CSCOPE = cscope
20283 AM_RECURSIVE_TARGETS = cscope
20284 DEJATOOL = $(PACKAGE)
20285 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
20286@@ -372,6 +385,8 @@ am__post_remove_distdir = $(am__remove_distdir)
20287 DIST_ARCHIVES = $(distdir).tar.gz
20288 GZIP_ENV = --best
20289 DIST_TARGETS = dist-gzip
20290+# Exists only to be overridden by the user if desired.
20291+AM_DISTCHECK_DVI_TARGET = dvi
20292 distuninstallcheck_listfiles = find . -type f -print
20293 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
20294 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
20295@@ -390,15 +405,19 @@ CFLAGS = @CFLAGS@
20296 COMPAT_DEJAGNU = @COMPAT_DEJAGNU@
20297 CPP = @CPP@
20298 CPPFLAGS = @CPPFLAGS@
20299+CSCOPE = @CSCOPE@
20300+CTAGS = @CTAGS@
20301 CYGPATH_W = @CYGPATH_W@
20302 DEFS = @DEFS@
20303 DEPDIR = @DEPDIR@
20304+DLLTOOL = @DLLTOOL@
20305 DSYMUTIL = @DSYMUTIL@
20306 DUMPBIN = @DUMPBIN@
20307 ECHO_C = @ECHO_C@
20308 ECHO_N = @ECHO_N@
20309 ECHO_T = @ECHO_T@
20310 EGREP = @EGREP@
20311+ETAGS = @ETAGS@
20312 EXEEXT = @EXEEXT@
20313 FGREP = @FGREP@
20314 GREP = @GREP@
20315@@ -417,6 +436,7 @@ LN_S = @LN_S@
20316 LTLIBOBJS = @LTLIBOBJS@
20317 MAINT = @MAINT@
20318 MAKEINFO = @MAKEINFO@
20319+MANIFEST_TOOL = @MANIFEST_TOOL@
20320 MKDIR_P = @MKDIR_P@
20321 NM = @NM@
20322 NMEDIT = @NMEDIT@
20323@@ -589,8 +609,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
20324 echo ' $(SHELL) ./config.status'; \
20325 $(SHELL) ./config.status;; \
20326 *) \
20327- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
20328- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
20329+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
20330+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
20331 esac;
20332 $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(srcdir)/testsuite/libsframe.find/local.mk $(am__empty):
20333
20334@@ -618,6 +638,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
20335 distclean-hdr:
20336 -rm -f config.h stamp-h1
20337
20338+clean-checkPROGRAMS:
20339+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
20340+ echo " rm -f" $$list; \
20341+ rm -f $$list || exit $$?; \
20342+ test -n "$(EXEEXT)" || exit 0; \
20343+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
20344+ echo " rm -f" $$list; \
20345+ rm -f $$list
20346+
20347 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
20348 @$(NORMAL_INSTALL)
20349 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
20350@@ -666,36 +695,27 @@ clean-noinstLTLIBRARIES:
20351
20352 libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES)
20353 $(AM_V_CCLD)$(libsframe_la_LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS)
20354-
20355-clean-checkPROGRAMS:
20356- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
20357- echo " rm -f" $$list; \
20358- rm -f $$list || exit $$?; \
20359- test -n "$(EXEEXT)" || exit 0; \
20360- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
20361- echo " rm -f" $$list; \
20362- rm -f $$list
20363 testsuite/libsframe.decode/$(am__dirstamp):
20364 @$(MKDIR_P) testsuite/libsframe.decode
20365 @: > testsuite/libsframe.decode/$(am__dirstamp)
20366 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp):
20367 @$(MKDIR_P) testsuite/libsframe.decode/$(DEPDIR)
20368 @: > testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp)
20369-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT): \
20370+testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT): \
20371 testsuite/libsframe.decode/$(am__dirstamp) \
20372 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp)
20373
20374 testsuite/libsframe.decode/be-flipping$(EXEEXT): $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_be_flipping_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp)
20375 @rm -f testsuite/libsframe.decode/be-flipping$(EXEEXT)
20376 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_LDADD) $(LIBS)
20377-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT): \
20378+testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT): \
20379 testsuite/libsframe.decode/$(am__dirstamp) \
20380 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp)
20381
20382 testsuite/libsframe.decode/frecnt-1$(EXEEXT): $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp)
20383 @rm -f testsuite/libsframe.decode/frecnt-1$(EXEEXT)
20384 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_LDADD) $(LIBS)
20385-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT): \
20386+testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT): \
20387 testsuite/libsframe.decode/$(am__dirstamp) \
20388 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp)
20389
20390@@ -708,7 +728,7 @@ testsuite/libsframe.encode/$(am__dirstamp):
20391 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp):
20392 @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR)
20393 @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp)
20394-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT): \
20395+testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT): \
20396 testsuite/libsframe.encode/$(am__dirstamp) \
20397 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp)
20398
20399@@ -721,21 +741,21 @@ testsuite/libsframe.find/$(am__dirstamp):
20400 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp):
20401 @$(MKDIR_P) testsuite/libsframe.find/$(DEPDIR)
20402 @: > testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
20403-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT): \
20404+testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT): \
20405 testsuite/libsframe.find/$(am__dirstamp) \
20406 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
20407
20408 testsuite/libsframe.find/findfre-1$(EXEEXT): $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfre_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp)
20409 @rm -f testsuite/libsframe.find/findfre-1$(EXEEXT)
20410 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_LDADD) $(LIBS)
20411-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT): \
20412+testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT): \
20413 testsuite/libsframe.find/$(am__dirstamp) \
20414 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
20415
20416 testsuite/libsframe.find/findfunc-1$(EXEEXT): $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfunc_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp)
20417 @rm -f testsuite/libsframe.find/findfunc-1$(EXEEXT)
20418 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_LDADD) $(LIBS)
20419-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT): \
20420+testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT): \
20421 testsuite/libsframe.find/$(am__dirstamp) \
20422 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
20423
20424@@ -752,16 +772,22 @@ mostlyclean-compile:
20425 distclean-compile:
20426 -rm -f *.tab.c
20427
20428-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@
20429-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@
20430-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@
20431-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po@am__quote@
20432-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@
20433-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@
20434-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@
20435-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po@am__quote@
20436-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po@am__quote@
20437-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po@am__quote@
20438+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker
20439+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker
20440+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker
20441+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po@am__quote@ # am--include-marker
20442+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker
20443+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker
20444+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker
20445+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po@am__quote@ # am--include-marker
20446+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po@am__quote@ # am--include-marker
20447+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po@am__quote@ # am--include-marker
20448+
20449+$(am__depfiles_remade):
20450+ @$(MKDIR_P) $(@D)
20451+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
20452+
20453+am--depfiles: $(am__depfiles_remade)
20454
20455 .c.o:
20456 @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
20457@@ -808,103 +834,103 @@ libsframe_la-sframe-error.lo: sframe-error.c
20458 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20459 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c
20460
20461-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c
20462-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c
20463-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po
20464-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@
20465+testsuite/libsframe.decode/be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c
20466+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c
20467+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po
20468+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@
20469 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20470-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c
20471+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c
20472
20473-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c
20474-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi`
20475-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po
20476-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@
20477+testsuite/libsframe.decode/be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c
20478+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi`
20479+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po
20480+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@
20481 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20482-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi`
20483+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi`
20484
20485-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c
20486-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c
20487-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po
20488-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@
20489+testsuite/libsframe.decode/frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c
20490+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c
20491+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po
20492+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@
20493 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20494-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c
20495+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c
20496
20497-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c
20498-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi`
20499-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po
20500-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@
20501+testsuite/libsframe.decode/frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c
20502+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi`
20503+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po
20504+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@
20505 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20506-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi`
20507+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi`
20508
20509-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c
20510-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c
20511-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po
20512-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@
20513+testsuite/libsframe.decode/frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c
20514+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c
20515+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po
20516+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@
20517 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20518-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c
20519+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c
20520
20521-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c
20522-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi`
20523-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po
20524-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@
20525+testsuite/libsframe.decode/frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c
20526+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi`
20527+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po
20528+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@
20529 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20530-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi`
20531+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi`
20532
20533-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c
20534-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c
20535-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po
20536-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@
20537+testsuite/libsframe.encode/encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c
20538+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c
20539+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po
20540+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@
20541 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20542-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c
20543+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c
20544
20545-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c
20546-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi`
20547-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po
20548-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@
20549+testsuite/libsframe.encode/encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c
20550+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi`
20551+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po
20552+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@
20553 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20554-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi`
20555+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi`
20556
20557-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c
20558-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c
20559-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po
20560-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@
20561+testsuite/libsframe.find/findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c
20562+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c
20563+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po
20564+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@
20565 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20566-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c
20567+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c
20568
20569-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c
20570-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi`
20571-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po
20572-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@
20573+testsuite/libsframe.find/findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c
20574+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi`
20575+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po
20576+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@
20577 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20578-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi`
20579+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi`
20580
20581-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c
20582-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c
20583-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po
20584-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@
20585+testsuite/libsframe.find/findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c
20586+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c
20587+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po
20588+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@
20589 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20590-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c
20591+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c
20592
20593-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c
20594-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi`
20595-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po
20596-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@
20597+testsuite/libsframe.find/findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c
20598+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi`
20599+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po
20600+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@
20601 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20602-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi`
20603+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi`
20604
20605-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c
20606-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c
20607-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po
20608-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@
20609+testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c
20610+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c
20611+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po
20612+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@
20613 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20614-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c
20615+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c
20616
20617-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c
20618-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi`
20619-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po
20620-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@
20621+testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c
20622+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi`
20623+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po
20624+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@
20625 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20626-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi`
20627+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi`
20628
20629 mostlyclean-libtool:
20630 -rm -f *.lo
20631@@ -1142,7 +1168,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
20632 @echo '# Do not edit here. If you wish to override these values' >>site.tmp
20633 @echo '# edit the last section' >>site.tmp
20634 @echo 'set srcdir "$(srcdir)"' >>site.tmp
20635- @echo "set objdir `pwd`" >>site.tmp
20636+ @echo "set objdir \"`pwd`\"" >>site.tmp
20637 @echo 'set build_alias "$(build_alias)"' >>site.tmp
20638 @echo 'set build_triplet $(build_triplet)' >>site.tmp
20639 @echo 'set host_alias "$(host_alias)"' >>site.tmp
20640@@ -1166,8 +1192,10 @@ distclean-DEJAGNU:
20641 -l='$(DEJATOOL)'; for tool in $$l; do \
20642 rm -f $$tool.sum $$tool.log; \
20643 done
20644+distdir: $(BUILT_SOURCES)
20645+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
20646
20647-distdir: $(DISTFILES)
20648+distdir-am: $(DISTFILES)
20649 $(am__remove_distdir)
20650 test -d "$(distdir)" || mkdir "$(distdir)"
20651 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20652@@ -1225,6 +1253,10 @@ dist-xz: distdir
20653 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
20654 $(am__post_remove_distdir)
20655
20656+dist-zstd: distdir
20657+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
20658+ $(am__post_remove_distdir)
20659+
20660 dist-tarZ: distdir
20661 @echo WARNING: "Support for distribution archives compressed with" \
20662 "legacy program 'compress' is deprecated." >&2
20663@@ -1267,6 +1299,8 @@ distcheck: dist
20664 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
20665 *.zip*) \
20666 unzip $(distdir).zip ;;\
20667+ *.tar.zst*) \
20668+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
20669 esac
20670 chmod -R a-w $(distdir)
20671 chmod u+w $(distdir)
20672@@ -1282,7 +1316,7 @@ distcheck: dist
20673 $(DISTCHECK_CONFIGURE_FLAGS) \
20674 --srcdir=../.. --prefix="$$dc_install_base" \
20675 && $(MAKE) $(AM_MAKEFLAGS) \
20676- && $(MAKE) $(AM_MAKEFLAGS) dvi \
20677+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
20678 && $(MAKE) $(AM_MAKEFLAGS) check \
20679 && $(MAKE) $(AM_MAKEFLAGS) install \
20680 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
20681@@ -1338,6 +1372,8 @@ check-am: all-am
20682 $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
20683 check: check-am
20684 all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
20685+install-checkPROGRAMS: install-libLTLIBRARIES
20686+
20687 installdirs:
20688 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \
20689 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
20690@@ -1390,7 +1426,16 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \
20691
20692 distclean: distclean-am
20693 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
20694- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR)
20695+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo
20696+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo
20697+ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo
20698+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po
20699+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po
20700+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po
20701+ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po
20702+ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po
20703+ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po
20704+ -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po
20705 -rm -f Makefile
20706 distclean-am: clean-am distclean-DEJAGNU distclean-compile \
20707 distclean-generic distclean-hdr distclean-libtool \
20708@@ -1530,7 +1575,16 @@ installcheck-am:
20709 maintainer-clean: maintainer-clean-am
20710 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
20711 -rm -rf $(top_srcdir)/autom4te.cache
20712- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR)
20713+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo
20714+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo
20715+ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo
20716+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po
20717+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po
20718+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po
20719+ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po
20720+ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po
20721+ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po
20722+ -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po
20723 -rm -f Makefile
20724 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
20725 maintainer-clean-generic
20726@@ -1554,28 +1608,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \
20727
20728 .MAKE: all check-am install-am install-strip
20729
20730-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-DEJAGNU \
20731- check-am clean clean-aminfo clean-checkPROGRAMS clean-cscope \
20732- clean-generic clean-libLTLIBRARIES clean-libtool \
20733+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
20734+ check-DEJAGNU check-am clean clean-aminfo clean-checkPROGRAMS \
20735+ clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
20736 clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
20737 dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \
20738- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
20739- distclean-DEJAGNU distclean-compile distclean-generic \
20740- distclean-hdr distclean-libtool distclean-tags distcleancheck \
20741- distdir distuninstallcheck dvi dvi-am html html-am html-local \
20742- info info-am install install-am install-data install-data-am \
20743- install-dvi install-dvi-am install-exec install-exec-am \
20744- install-html install-html-am install-includeHEADERS \
20745- install-info install-info-am install-libLTLIBRARIES \
20746- install-man install-pdf install-pdf-am install-ps \
20747- install-ps-am install-strip installcheck installcheck-am \
20748- installdirs maintainer-clean maintainer-clean-aminfo \
20749- maintainer-clean-generic mostlyclean mostlyclean-aminfo \
20750- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
20751- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
20752- uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \
20753- uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \
20754- uninstall-ps-am
20755+ dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \
20756+ distclean distclean-DEJAGNU distclean-compile \
20757+ distclean-generic distclean-hdr distclean-libtool \
20758+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
20759+ dvi-am html html-am html-local info info-am install install-am \
20760+ install-data install-data-am install-dvi install-dvi-am \
20761+ install-exec install-exec-am install-html install-html-am \
20762+ install-includeHEADERS install-info install-info-am \
20763+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
20764+ install-ps install-ps-am install-strip installcheck \
20765+ installcheck-am installdirs maintainer-clean \
20766+ maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
20767+ mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
20768+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
20769+ uninstall-am uninstall-dvi-am uninstall-html-am \
20770+ uninstall-includeHEADERS uninstall-info-am \
20771+ uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am
20772
20773 .PRECIOUS: Makefile
20774
20775diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4
20776index b0cdd6b184d..c83d4f62ece 100644
20777--- a/libsframe/aclocal.m4
20778+++ b/libsframe/aclocal.m4
20779@@ -1,6 +1,6 @@
20780-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
20781+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
20782
20783-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
20784+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
20785
20786 # This file is free software; the Free Software Foundation
20787 # gives unlimited permission to copy and/or distribute it,
20788@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
20789 If you have problems, you may need to regenerate the build system entirely.
20790 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20791
20792-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
20793+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
20794 #
20795 # This file is free software; the Free Software Foundation
20796 # gives unlimited permission to copy and/or distribute it,
20797@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
20798 # generated from the m4 files accompanying Automake X.Y.
20799 # (This private macro should not be called outside this file.)
20800 AC_DEFUN([AM_AUTOMAKE_VERSION],
20801-[am__api_version='1.15'
20802+[am__api_version='1.16'
20803 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
20804 dnl require some minimum version. Point them to the right macro.
20805-m4_if([$1], [1.15.1], [],
20806+m4_if([$1], [1.16.5], [],
20807 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
20808 ])
20809
20810@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
20811 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
20812 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
20813 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
20814-[AM_AUTOMAKE_VERSION([1.15.1])dnl
20815+[AM_AUTOMAKE_VERSION([1.16.5])dnl
20816 m4_ifndef([AC_AUTOCONF_VERSION],
20817 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
20818 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
20819
20820-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
20821+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
20822 #
20823 # This file is free software; the Free Software Foundation
20824 # gives unlimited permission to copy and/or distribute it,
20825@@ -118,7 +118,7 @@ AC_SUBST([AR])dnl
20826
20827 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
20828
20829-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
20830+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
20831 #
20832 # This file is free software; the Free Software Foundation
20833 # gives unlimited permission to copy and/or distribute it,
20834@@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
20835
20836 # AM_CONDITIONAL -*- Autoconf -*-
20837
20838-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
20839+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
20840 #
20841 # This file is free software; the Free Software Foundation
20842 # gives unlimited permission to copy and/or distribute it,
20843@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE(
20844 Usually this means the macro was only invoked conditionally.]])
20845 fi])])
20846
20847-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
20848+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
20849 #
20850 # This file is free software; the Free Software Foundation
20851 # gives unlimited permission to copy and/or distribute it,
20852@@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
20853
20854 # Generate code to set up dependency tracking. -*- Autoconf -*-
20855
20856-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
20857+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
20858 #
20859 # This file is free software; the Free Software Foundation
20860 # gives unlimited permission to copy and/or distribute it,
20861 # with or without modifications, as long as this notice is preserved.
20862
20863-
20864 # _AM_OUTPUT_DEPENDENCY_COMMANDS
20865 # ------------------------------
20866 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
20867@@ -406,49 +405,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
20868 # Older Autoconf quotes --file arguments for eval, but not when files
20869 # are listed without --file. Let's play safe and only enable the eval
20870 # if we detect the quoting.
20871- case $CONFIG_FILES in
20872- *\'*) eval set x "$CONFIG_FILES" ;;
20873- *) set x $CONFIG_FILES ;;
20874- esac
20875+ # TODO: see whether this extra hack can be removed once we start
20876+ # requiring Autoconf 2.70 or later.
20877+ AS_CASE([$CONFIG_FILES],
20878+ [*\'*], [eval set x "$CONFIG_FILES"],
20879+ [*], [set x $CONFIG_FILES])
20880 shift
20881- for mf
20882+ # Used to flag and report bootstrapping failures.
20883+ am_rc=0
20884+ for am_mf
20885 do
20886 # Strip MF so we end up with the name of the file.
20887- mf=`echo "$mf" | sed -e 's/:.*$//'`
20888- # Check whether this is an Automake generated Makefile or not.
20889- # We used to match only the files named 'Makefile.in', but
20890- # some people rename them; so instead we look at the file content.
20891- # Grep'ing the first line is not enough: some people post-process
20892- # each Makefile.in and add a new line on top of each file to say so.
20893- # Grep'ing the whole file is not good either: AIX grep has a line
20894+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
20895+ # Check whether this is an Automake generated Makefile which includes
20896+ # dependency-tracking related rules and includes.
20897+ # Grep'ing the whole file directly is not great: AIX grep has a line
20898 # limit of 2048, but all sed's we know have understand at least 4000.
20899- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
20900- dirpart=`AS_DIRNAME("$mf")`
20901- else
20902- continue
20903- fi
20904- # Extract the definition of DEPDIR, am__include, and am__quote
20905- # from the Makefile without running 'make'.
20906- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
20907- test -z "$DEPDIR" && continue
20908- am__include=`sed -n 's/^am__include = //p' < "$mf"`
20909- test -z "$am__include" && continue
20910- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
20911- # Find all dependency output files, they are included files with
20912- # $(DEPDIR) in their names. We invoke sed twice because it is the
20913- # simplest approach to changing $(DEPDIR) to its actual value in the
20914- # expansion.
20915- for file in `sed -n "
20916- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
20917- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
20918- # Make sure the directory exists.
20919- test -f "$dirpart/$file" && continue
20920- fdir=`AS_DIRNAME(["$file"])`
20921- AS_MKDIR_P([$dirpart/$fdir])
20922- # echo "creating $dirpart/$file"
20923- echo '# dummy' > "$dirpart/$file"
20924- done
20925+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
20926+ || continue
20927+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
20928+ am_filepart=`AS_BASENAME(["$am_mf"])`
20929+ AM_RUN_LOG([cd "$am_dirpart" \
20930+ && sed -e '/# am--include-marker/d' "$am_filepart" \
20931+ | $MAKE -f - am--depfiles]) || am_rc=$?
20932 done
20933+ if test $am_rc -ne 0; then
20934+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
20935+ for automatic dependency tracking. If GNU make was not used, consider
20936+ re-running the configure script with MAKE="gmake" (or whatever is
20937+ necessary). You can also try re-running configure with the
20938+ '--disable-dependency-tracking' option to at least be able to build
20939+ the package (albeit without support for automatic dependency tracking).])
20940+ fi
20941+ AS_UNSET([am_dirpart])
20942+ AS_UNSET([am_filepart])
20943+ AS_UNSET([am_mf])
20944+ AS_UNSET([am_rc])
20945+ rm -f conftest-deps.mk
20946 }
20947 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
20948
20949@@ -457,18 +450,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
20950 # -----------------------------
20951 # This macro should only be invoked once -- use via AC_REQUIRE.
20952 #
20953-# This code is only required when automatic dependency tracking
20954-# is enabled. FIXME. This creates each '.P' file that we will
20955-# need in order to bootstrap the dependency handling code.
20956+# This code is only required when automatic dependency tracking is enabled.
20957+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
20958+# order to bootstrap the dependency handling code.
20959 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
20960 [AC_CONFIG_COMMANDS([depfiles],
20961 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
20962- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
20963-])
20964+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
20965
20966 # Do all the work for Automake. -*- Autoconf -*-
20967
20968-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
20969+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
20970 #
20971 # This file is free software; the Free Software Foundation
20972 # gives unlimited permission to copy and/or distribute it,
20973@@ -496,6 +488,10 @@ m4_defn([AC_PROG_CC])
20974 # release and drop the old call support.
20975 AC_DEFUN([AM_INIT_AUTOMAKE],
20976 [AC_PREREQ([2.65])dnl
20977+m4_ifdef([_$0_ALREADY_INIT],
20978+ [m4_fatal([$0 expanded multiple times
20979+]m4_defn([_$0_ALREADY_INIT]))],
20980+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
20981 dnl Autoconf wants to disallow AM_ names. We explicitly allow
20982 dnl the ones we care about.
20983 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
20984@@ -532,7 +528,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
20985 [_AM_SET_OPTIONS([$1])dnl
20986 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
20987 m4_if(
20988- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
20989+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
20990 [ok:ok],,
20991 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
20992 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
20993@@ -555,8 +551,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
20994 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
20995 # For better backward compatibility. To be removed once Automake 1.9.x
20996 # dies out for good. For more background, see:
20997-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
20998-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
20999+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
21000+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
21001 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
21002 # We need awk for the "check" target (and possibly the TAP driver). The
21003 # system "awk" is bad on some platforms.
21004@@ -584,6 +580,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
21005 [m4_define([AC_PROG_OBJCXX],
21006 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
21007 ])
21008+# Variables for tags utilities; see am/tags.am
21009+if test -z "$CTAGS"; then
21010+ CTAGS=ctags
21011+fi
21012+AC_SUBST([CTAGS])
21013+if test -z "$ETAGS"; then
21014+ ETAGS=etags
21015+fi
21016+AC_SUBST([ETAGS])
21017+if test -z "$CSCOPE"; then
21018+ CSCOPE=cscope
21019+fi
21020+AC_SUBST([CSCOPE])
21021+
21022 AC_REQUIRE([AM_SILENT_RULES])dnl
21023 dnl The testsuite driver may need to know about EXEEXT, so add the
21024 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
21025@@ -623,7 +633,7 @@ END
21026 Aborting the configuration process, to ensure you take notice of the issue.
21027
21028 You can download and install GNU coreutils to get an 'rm' implementation
21029-that behaves properly: <http://www.gnu.org/software/coreutils/>.
21030+that behaves properly: <https://www.gnu.org/software/coreutils/>.
21031
21032 If you want to complete the configuration process using your problematic
21033 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
21034@@ -665,7 +675,7 @@ for _am_header in $config_headers :; do
21035 done
21036 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
21037
21038-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
21039+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
21040 #
21041 # This file is free software; the Free Software Foundation
21042 # gives unlimited permission to copy and/or distribute it,
21043@@ -689,7 +699,7 @@ AC_SUBST([install_sh])])
21044 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
21045 # From Jim Meyering
21046
21047-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
21048+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
21049 #
21050 # This file is free software; the Free Software Foundation
21051 # gives unlimited permission to copy and/or distribute it,
21052@@ -724,7 +734,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
21053
21054 # Check to see how 'make' treats includes. -*- Autoconf -*-
21055
21056-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
21057+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
21058 #
21059 # This file is free software; the Free Software Foundation
21060 # gives unlimited permission to copy and/or distribute it,
21061@@ -732,49 +742,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
21062
21063 # AM_MAKE_INCLUDE()
21064 # -----------------
21065-# Check to see how make treats includes.
21066+# Check whether make has an 'include' directive that can support all
21067+# the idioms we need for our automatic dependency tracking code.
21068 AC_DEFUN([AM_MAKE_INCLUDE],
21069-[am_make=${MAKE-make}
21070-cat > confinc << 'END'
21071+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
21072+cat > confinc.mk << 'END'
21073 am__doit:
21074- @echo this is the am__doit target
21075+ @echo this is the am__doit target >confinc.out
21076 .PHONY: am__doit
21077 END
21078-# If we don't find an include directive, just comment out the code.
21079-AC_MSG_CHECKING([for style of include used by $am_make])
21080 am__include="#"
21081 am__quote=
21082-_am_result=none
21083-# First try GNU make style include.
21084-echo "include confinc" > confmf
21085-# Ignore all kinds of additional output from 'make'.
21086-case `$am_make -s -f confmf 2> /dev/null` in #(
21087-*the\ am__doit\ target*)
21088- am__include=include
21089- am__quote=
21090- _am_result=GNU
21091- ;;
21092-esac
21093-# Now try BSD make style include.
21094-if test "$am__include" = "#"; then
21095- echo '.include "confinc"' > confmf
21096- case `$am_make -s -f confmf 2> /dev/null` in #(
21097- *the\ am__doit\ target*)
21098- am__include=.include
21099- am__quote="\""
21100- _am_result=BSD
21101- ;;
21102- esac
21103-fi
21104-AC_SUBST([am__include])
21105-AC_SUBST([am__quote])
21106-AC_MSG_RESULT([$_am_result])
21107-rm -f confinc confmf
21108-])
21109+# BSD make does it like this.
21110+echo '.include "confinc.mk" # ignored' > confmf.BSD
21111+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
21112+echo 'include confinc.mk # ignored' > confmf.GNU
21113+_am_result=no
21114+for s in GNU BSD; do
21115+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
21116+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
21117+ ['0:this is the am__doit target'],
21118+ [AS_CASE([$s],
21119+ [BSD], [am__include='.include' am__quote='"'],
21120+ [am__include='include' am__quote=''])])
21121+ if test "$am__include" != "#"; then
21122+ _am_result="yes ($s style)"
21123+ break
21124+ fi
21125+done
21126+rm -f confinc.* confmf.*
21127+AC_MSG_RESULT([${_am_result}])
21128+AC_SUBST([am__include])])
21129+AC_SUBST([am__quote])])
21130
21131 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
21132
21133-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
21134+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
21135 #
21136 # This file is free software; the Free Software Foundation
21137 # gives unlimited permission to copy and/or distribute it,
21138@@ -795,12 +798,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
21139 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
21140 AC_REQUIRE_AUX_FILE([missing])dnl
21141 if test x"${MISSING+set}" != xset; then
21142- case $am_aux_dir in
21143- *\ * | *\ *)
21144- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
21145- *)
21146- MISSING="\${SHELL} $am_aux_dir/missing" ;;
21147- esac
21148+ MISSING="\${SHELL} '$am_aux_dir/missing'"
21149 fi
21150 # Use eval to expand $SHELL
21151 if eval "$MISSING --is-lightweight"; then
21152@@ -813,7 +811,7 @@ fi
21153
21154 # Helper functions for option handling. -*- Autoconf -*-
21155
21156-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
21157+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
21158 #
21159 # This file is free software; the Free Software Foundation
21160 # gives unlimited permission to copy and/or distribute it,
21161@@ -842,7 +840,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
21162 AC_DEFUN([_AM_IF_OPTION],
21163 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
21164
21165-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
21166+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
21167 #
21168 # This file is free software; the Free Software Foundation
21169 # gives unlimited permission to copy and/or distribute it,
21170@@ -889,7 +887,7 @@ AC_LANG_POP([C])])
21171 # For backward compatibility.
21172 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
21173
21174-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
21175+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
21176 #
21177 # This file is free software; the Free Software Foundation
21178 # gives unlimited permission to copy and/or distribute it,
21179@@ -908,7 +906,7 @@ AC_DEFUN([AM_RUN_LOG],
21180
21181 # Check to make sure that the build environment is sane. -*- Autoconf -*-
21182
21183-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
21184+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
21185 #
21186 # This file is free software; the Free Software Foundation
21187 # gives unlimited permission to copy and/or distribute it,
21188@@ -989,7 +987,7 @@ AC_CONFIG_COMMANDS_PRE(
21189 rm -f conftest.file
21190 ])
21191
21192-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
21193+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
21194 #
21195 # This file is free software; the Free Software Foundation
21196 # gives unlimited permission to copy and/or distribute it,
21197@@ -1049,7 +1047,7 @@ AC_SUBST([AM_BACKSLASH])dnl
21198 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
21199 ])
21200
21201-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
21202+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
21203 #
21204 # This file is free software; the Free Software Foundation
21205 # gives unlimited permission to copy and/or distribute it,
21206@@ -1077,7 +1075,7 @@ fi
21207 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
21208 AC_SUBST([INSTALL_STRIP_PROGRAM])])
21209
21210-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
21211+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
21212 #
21213 # This file is free software; the Free Software Foundation
21214 # gives unlimited permission to copy and/or distribute it,
21215@@ -1096,7 +1094,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
21216
21217 # Check how to create a tarball. -*- Autoconf -*-
21218
21219-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
21220+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
21221 #
21222 # This file is free software; the Free Software Foundation
21223 # gives unlimited permission to copy and/or distribute it,
21224diff --git a/libsframe/configure b/libsframe/configure
21225index 1d9e5e10695..a234c4815b1 100755
21226--- a/libsframe/configure
21227+++ b/libsframe/configure
21228@@ -658,6 +658,8 @@ OTOOL
21229 LIPO
21230 NMEDIT
21231 DSYMUTIL
21232+MANIFEST_TOOL
21233+DLLTOOL
21234 OBJDUMP
21235 LN_S
21236 NM
21237@@ -682,6 +684,9 @@ AM_BACKSLASH
21238 AM_DEFAULT_VERBOSITY
21239 AM_DEFAULT_V
21240 AM_V
21241+CSCOPE
21242+ETAGS
21243+CTAGS
21244 am__fastdepCC_FALSE
21245 am__fastdepCC_TRUE
21246 CCDEPMODE
21247@@ -689,7 +694,6 @@ am__nodep
21248 AMDEPBACKSLASH
21249 AMDEP_FALSE
21250 AMDEP_TRUE
21251-am__quote
21252 am__include
21253 DEPDIR
21254 am__untar
21255@@ -762,7 +766,8 @@ PACKAGE_VERSION
21256 PACKAGE_TARNAME
21257 PACKAGE_NAME
21258 PATH_SEPARATOR
21259-SHELL'
21260+SHELL
21261+am__quote'
21262 ac_subst_files=''
21263 ac_user_opts='
21264 enable_option_checking
21265@@ -773,6 +778,7 @@ enable_static
21266 with_pic
21267 enable_fast_install
21268 with_gnu_ld
21269+with_libtool_sysroot
21270 enable_libtool_lock
21271 enable_largefile
21272 enable_maintainer_mode
21273@@ -1428,6 +1434,8 @@ Optional Packages:
21274 --with-pic try to use only PIC/non-PIC objects [default=use
21275 both]
21276 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
21277+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
21278+ (or the compiler's sysroot if not specified).
21279
21280 Some influential environment variables:
21281 CC C compiler command
21282@@ -3610,7 +3618,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
21283 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
21284
21285
21286-am__api_version='1.15'
21287+am__api_version='1.16'
21288
21289 # Find a good install program. We prefer a C program (faster),
21290 # so one script is as good as another. But avoid the broken or
21291@@ -3783,12 +3791,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
21292 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
21293
21294 if test x"${MISSING+set}" != xset; then
21295- case $am_aux_dir in
21296- *\ * | *\ *)
21297- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
21298- *)
21299- MISSING="\${SHELL} $am_aux_dir/missing" ;;
21300- esac
21301+ MISSING="\${SHELL} '$am_aux_dir/missing'"
21302 fi
21303 # Use eval to expand $SHELL
21304 if eval "$MISSING --is-lightweight"; then
21305@@ -4036,45 +4039,45 @@ DEPDIR="${am__leading_dot}deps"
21306
21307 ac_config_commands="$ac_config_commands depfiles"
21308
21309-
21310-am_make=${MAKE-make}
21311-cat > confinc << 'END'
21312+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
21313+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
21314+cat > confinc.mk << 'END'
21315 am__doit:
21316- @echo this is the am__doit target
21317+ @echo this is the am__doit target >confinc.out
21318 .PHONY: am__doit
21319 END
21320-# If we don't find an include directive, just comment out the code.
21321-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
21322-$as_echo_n "checking for style of include used by $am_make... " >&6; }
21323 am__include="#"
21324 am__quote=
21325-_am_result=none
21326-# First try GNU make style include.
21327-echo "include confinc" > confmf
21328-# Ignore all kinds of additional output from 'make'.
21329-case `$am_make -s -f confmf 2> /dev/null` in #(
21330-*the\ am__doit\ target*)
21331- am__include=include
21332- am__quote=
21333- _am_result=GNU
21334- ;;
21335-esac
21336-# Now try BSD make style include.
21337-if test "$am__include" = "#"; then
21338- echo '.include "confinc"' > confmf
21339- case `$am_make -s -f confmf 2> /dev/null` in #(
21340- *the\ am__doit\ target*)
21341- am__include=.include
21342- am__quote="\""
21343- _am_result=BSD
21344+# BSD make does it like this.
21345+echo '.include "confinc.mk" # ignored' > confmf.BSD
21346+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
21347+echo 'include confinc.mk # ignored' > confmf.GNU
21348+_am_result=no
21349+for s in GNU BSD; do
21350+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
21351+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
21352+ ac_status=$?
21353+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
21354+ (exit $ac_status); }
21355+ case $?:`cat confinc.out 2>/dev/null` in #(
21356+ '0:this is the am__doit target') :
21357+ case $s in #(
21358+ BSD) :
21359+ am__include='.include' am__quote='"' ;; #(
21360+ *) :
21361+ am__include='include' am__quote='' ;;
21362+esac ;; #(
21363+ *) :
21364 ;;
21365- esac
21366-fi
21367-
21368-
21369-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
21370-$as_echo "$_am_result" >&6; }
21371-rm -f confinc confmf
21372+esac
21373+ if test "$am__include" != "#"; then
21374+ _am_result="yes ($s style)"
21375+ break
21376+ fi
21377+done
21378+rm -f confinc.* confmf.*
21379+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
21380+$as_echo "${_am_result}" >&6; }
21381
21382 # Check whether --enable-dependency-tracking was given.
21383 if test "${enable_dependency_tracking+set}" = set; then :
21384@@ -4186,8 +4189,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
21385
21386 # For better backward compatibility. To be removed once Automake 1.9.x
21387 # dies out for good. For more background, see:
21388-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
21389-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
21390+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
21391+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
21392 mkdir_p='$(MKDIR_P)'
21393
21394 # We need awk for the "check" target (and possibly the TAP driver). The
21395@@ -4334,6 +4337,20 @@ else
21396 fi
21397
21398
21399+# Variables for tags utilities; see am/tags.am
21400+if test -z "$CTAGS"; then
21401+ CTAGS=ctags
21402+fi
21403+
21404+if test -z "$ETAGS"; then
21405+ ETAGS=etags
21406+fi
21407+
21408+if test -z "$CSCOPE"; then
21409+ CSCOPE=cscope
21410+fi
21411+
21412+
21413
21414 # POSIX will say in a future version that running "rm -f" with no argument
21415 # is OK; and we want to be able to make that assumption in our Makefile
21416@@ -4366,7 +4383,7 @@ END
21417 Aborting the configuration process, to ensure you take notice of the issue.
21418
21419 You can download and install GNU coreutils to get an 'rm' implementation
21420-that behaves properly: <http://www.gnu.org/software/coreutils/>.
21421+that behaves properly: <https://www.gnu.org/software/coreutils/>.
21422
21423 If you want to complete the configuration process using your problematic
21424 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
21425@@ -5351,8 +5368,8 @@ esac
21426
21427
21428
21429-macro_version='2.2.7a'
21430-macro_revision='1.3134'
21431+macro_version='2.4'
21432+macro_revision='1.3293'
21433
21434
21435
21436@@ -5463,7 +5480,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
21437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
21438 $as_echo_n "checking how to print strings... " >&6; }
21439 # Test print first, because it will be a builtin if present.
21440-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
21441+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
21442 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
21443 ECHO='print -r --'
21444 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
21445@@ -6156,8 +6173,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
21446 # Try some XSI features
21447 xsi_shell=no
21448 ( _lt_dummy="a/b/c"
21449- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
21450- = c,a/b,, \
21451+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
21452+ = c,a/b,b/c, \
21453 && eval 'test $(( 1 + 1 )) -eq 2 \
21454 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
21455 && xsi_shell=yes
21456@@ -6206,6 +6223,80 @@ esac
21457
21458
21459
21460+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
21461+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
21462+if ${lt_cv_to_host_file_cmd+:} false; then :
21463+ $as_echo_n "(cached) " >&6
21464+else
21465+ case $host in
21466+ *-*-mingw* )
21467+ case $build in
21468+ *-*-mingw* ) # actually msys
21469+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
21470+ ;;
21471+ *-*-cygwin* )
21472+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
21473+ ;;
21474+ * ) # otherwise, assume *nix
21475+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
21476+ ;;
21477+ esac
21478+ ;;
21479+ *-*-cygwin* )
21480+ case $build in
21481+ *-*-mingw* ) # actually msys
21482+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
21483+ ;;
21484+ *-*-cygwin* )
21485+ lt_cv_to_host_file_cmd=func_convert_file_noop
21486+ ;;
21487+ * ) # otherwise, assume *nix
21488+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
21489+ ;;
21490+ esac
21491+ ;;
21492+ * ) # unhandled hosts (and "normal" native builds)
21493+ lt_cv_to_host_file_cmd=func_convert_file_noop
21494+ ;;
21495+esac
21496+
21497+fi
21498+
21499+to_host_file_cmd=$lt_cv_to_host_file_cmd
21500+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
21501+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
21502+
21503+
21504+
21505+
21506+
21507+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
21508+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
21509+if ${lt_cv_to_tool_file_cmd+:} false; then :
21510+ $as_echo_n "(cached) " >&6
21511+else
21512+ #assume ordinary cross tools, or native build.
21513+lt_cv_to_tool_file_cmd=func_convert_file_noop
21514+case $host in
21515+ *-*-mingw* )
21516+ case $build in
21517+ *-*-mingw* ) # actually msys
21518+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
21519+ ;;
21520+ esac
21521+ ;;
21522+esac
21523+
21524+fi
21525+
21526+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
21527+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
21528+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
21529+
21530+
21531+
21532+
21533+
21534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
21535 $as_echo_n "checking for $LD option to reload object files... " >&6; }
21536 if ${lt_cv_ld_reload_flag+:} false; then :
21537@@ -6222,6 +6313,11 @@ case $reload_flag in
21538 esac
21539 reload_cmds='$LD$reload_flag -o $output$reload_objs'
21540 case $host_os in
21541+ cygwin* | mingw* | pw32* | cegcc*)
21542+ if test "$GCC" != yes; then
21543+ reload_cmds=false
21544+ fi
21545+ ;;
21546 darwin*)
21547 if test "$GCC" = yes; then
21548 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
21549@@ -6390,7 +6486,8 @@ mingw* | pw32*)
21550 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
21551 lt_cv_file_magic_cmd='func_win32_libid'
21552 else
21553- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
21554+ # Keep this pattern in sync with the one in func_win32_libid.
21555+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
21556 lt_cv_file_magic_cmd='$OBJDUMP -f'
21557 fi
21558 ;;
21559@@ -6549,6 +6646,21 @@ esac
21560 fi
21561 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
21562 $as_echo "$lt_cv_deplibs_check_method" >&6; }
21563+
21564+file_magic_glob=
21565+want_nocaseglob=no
21566+if test "$build" = "$host"; then
21567+ case $host_os in
21568+ mingw* | pw32*)
21569+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
21570+ want_nocaseglob=yes
21571+ else
21572+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
21573+ fi
21574+ ;;
21575+ esac
21576+fi
21577+
21578 file_magic_cmd=$lt_cv_file_magic_cmd
21579 deplibs_check_method=$lt_cv_deplibs_check_method
21580 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21581@@ -6564,6 +6676,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21582
21583
21584
21585+
21586+
21587+
21588+
21589+
21590+
21591+
21592+
21593+
21594+
21595+if test -n "$ac_tool_prefix"; then
21596+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
21597+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
21598+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21599+$as_echo_n "checking for $ac_word... " >&6; }
21600+if ${ac_cv_prog_DLLTOOL+:} false; then :
21601+ $as_echo_n "(cached) " >&6
21602+else
21603+ if test -n "$DLLTOOL"; then
21604+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
21605+else
21606+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21607+for as_dir in $PATH
21608+do
21609+ IFS=$as_save_IFS
21610+ test -z "$as_dir" && as_dir=.
21611+ for ac_exec_ext in '' $ac_executable_extensions; do
21612+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21613+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
21614+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21615+ break 2
21616+ fi
21617+done
21618+ done
21619+IFS=$as_save_IFS
21620+
21621+fi
21622+fi
21623+DLLTOOL=$ac_cv_prog_DLLTOOL
21624+if test -n "$DLLTOOL"; then
21625+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
21626+$as_echo "$DLLTOOL" >&6; }
21627+else
21628+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21629+$as_echo "no" >&6; }
21630+fi
21631+
21632+
21633+fi
21634+if test -z "$ac_cv_prog_DLLTOOL"; then
21635+ ac_ct_DLLTOOL=$DLLTOOL
21636+ # Extract the first word of "dlltool", so it can be a program name with args.
21637+set dummy dlltool; ac_word=$2
21638+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21639+$as_echo_n "checking for $ac_word... " >&6; }
21640+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
21641+ $as_echo_n "(cached) " >&6
21642+else
21643+ if test -n "$ac_ct_DLLTOOL"; then
21644+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
21645+else
21646+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21647+for as_dir in $PATH
21648+do
21649+ IFS=$as_save_IFS
21650+ test -z "$as_dir" && as_dir=.
21651+ for ac_exec_ext in '' $ac_executable_extensions; do
21652+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21653+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
21654+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21655+ break 2
21656+ fi
21657+done
21658+ done
21659+IFS=$as_save_IFS
21660+
21661+fi
21662+fi
21663+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
21664+if test -n "$ac_ct_DLLTOOL"; then
21665+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
21666+$as_echo "$ac_ct_DLLTOOL" >&6; }
21667+else
21668+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21669+$as_echo "no" >&6; }
21670+fi
21671+
21672+ if test "x$ac_ct_DLLTOOL" = x; then
21673+ DLLTOOL="false"
21674+ else
21675+ case $cross_compiling:$ac_tool_warned in
21676+yes:)
21677+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
21678+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
21679+ac_tool_warned=yes ;;
21680+esac
21681+ DLLTOOL=$ac_ct_DLLTOOL
21682+ fi
21683+else
21684+ DLLTOOL="$ac_cv_prog_DLLTOOL"
21685+fi
21686+
21687+test -z "$DLLTOOL" && DLLTOOL=dlltool
21688+
21689+
21690+
21691+
21692+
21693+
21694+
21695+
21696+
21697+
21698+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
21699+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
21700+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
21701+ $as_echo_n "(cached) " >&6
21702+else
21703+ lt_cv_sharedlib_from_linklib_cmd='unknown'
21704+
21705+case $host_os in
21706+cygwin* | mingw* | pw32* | cegcc*)
21707+ # two different shell functions defined in ltmain.sh
21708+ # decide which to use based on capabilities of $DLLTOOL
21709+ case `$DLLTOOL --help 2>&1` in
21710+ *--identify-strict*)
21711+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
21712+ ;;
21713+ *)
21714+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
21715+ ;;
21716+ esac
21717+ ;;
21718+*)
21719+ # fallback: assume linklib IS sharedlib
21720+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
21721+ ;;
21722+esac
21723+
21724+fi
21725+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
21726+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
21727+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
21728+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
21729+
21730+
21731+
21732+
21733+
21734+
21735+
21736 plugin_option=
21737 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21738 for plugin in $plugin_names; do
21739@@ -6578,8 +6841,10 @@ for plugin in $plugin_names; do
21740 done
21741
21742 if test -n "$ac_tool_prefix"; then
21743- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
21744-set dummy ${ac_tool_prefix}ar; ac_word=$2
21745+ for ac_prog in ar
21746+ do
21747+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
21748+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
21749 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21750 $as_echo_n "checking for $ac_word... " >&6; }
21751 if ${ac_cv_prog_AR+:} false; then :
21752@@ -6595,7 +6860,7 @@ do
21753 test -z "$as_dir" && as_dir=.
21754 for ac_exec_ext in '' $ac_executable_extensions; do
21755 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21756- ac_cv_prog_AR="${ac_tool_prefix}ar"
21757+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
21758 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21759 break 2
21760 fi
21761@@ -6615,11 +6880,15 @@ $as_echo "no" >&6; }
21762 fi
21763
21764
21765+ test -n "$AR" && break
21766+ done
21767 fi
21768-if test -z "$ac_cv_prog_AR"; then
21769+if test -z "$AR"; then
21770 ac_ct_AR=$AR
21771- # Extract the first word of "ar", so it can be a program name with args.
21772-set dummy ar; ac_word=$2
21773+ for ac_prog in ar
21774+do
21775+ # Extract the first word of "$ac_prog", so it can be a program name with args.
21776+set dummy $ac_prog; ac_word=$2
21777 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21778 $as_echo_n "checking for $ac_word... " >&6; }
21779 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21780@@ -6635,7 +6904,7 @@ do
21781 test -z "$as_dir" && as_dir=.
21782 for ac_exec_ext in '' $ac_executable_extensions; do
21783 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21784- ac_cv_prog_ac_ct_AR="ar"
21785+ ac_cv_prog_ac_ct_AR="$ac_prog"
21786 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21787 break 2
21788 fi
21789@@ -6654,6 +6923,10 @@ else
21790 $as_echo "no" >&6; }
21791 fi
21792
21793+
21794+ test -n "$ac_ct_AR" && break
21795+done
21796+
21797 if test "x$ac_ct_AR" = x; then
21798 AR="false"
21799 else
21800@@ -6665,29 +6938,81 @@ ac_tool_warned=yes ;;
21801 esac
21802 AR=$ac_ct_AR
21803 fi
21804-else
21805- AR="$ac_cv_prog_AR"
21806 fi
21807
21808-test -z "$AR" && AR=ar
21809-if test -n "$plugin_option"; then
21810- if $AR --help 2>&1 | grep -q "\--plugin"; then
21811- touch conftest.c
21812- $AR $plugin_option rc conftest.a conftest.c
21813- if test "$?" != 0; then
21814- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
21815+ touch conftest.c
21816+ $AR $plugin_option rc conftest.a conftest.c
21817+ if test "$?" != 0; then
21818+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
21819 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
21820- else
21821- AR="$AR $plugin_option"
21822- fi
21823- rm -f conftest.*
21824+ else
21825+ AR="$AR $plugin_option"
21826 fi
21827-fi
21828-test -z "$AR_FLAGS" && AR_FLAGS=cru
21829+ rm -f conftest.*
21830+: ${AR=ar}
21831+: ${AR_FLAGS=cru}
21832+
21833+
21834+
21835+
21836+
21837+
21838+
21839
21840
21841
21842
21843+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
21844+$as_echo_n "checking for archiver @FILE support... " >&6; }
21845+if ${lt_cv_ar_at_file+:} false; then :
21846+ $as_echo_n "(cached) " >&6
21847+else
21848+ lt_cv_ar_at_file=no
21849+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21850+/* end confdefs.h. */
21851+
21852+int
21853+main ()
21854+{
21855+
21856+ ;
21857+ return 0;
21858+}
21859+_ACEOF
21860+if ac_fn_c_try_compile "$LINENO"; then :
21861+ echo conftest.$ac_objext > conftest.lst
21862+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
21863+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
21864+ (eval $lt_ar_try) 2>&5
21865+ ac_status=$?
21866+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
21867+ test $ac_status = 0; }
21868+ if test "$ac_status" -eq 0; then
21869+ # Ensure the archiver fails upon bogus file names.
21870+ rm -f conftest.$ac_objext libconftest.a
21871+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
21872+ (eval $lt_ar_try) 2>&5
21873+ ac_status=$?
21874+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
21875+ test $ac_status = 0; }
21876+ if test "$ac_status" -ne 0; then
21877+ lt_cv_ar_at_file=@
21878+ fi
21879+ fi
21880+ rm -f conftest.* libconftest.a
21881+
21882+fi
21883+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21884+
21885+fi
21886+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
21887+$as_echo "$lt_cv_ar_at_file" >&6; }
21888+
21889+if test "x$lt_cv_ar_at_file" = xno; then
21890+ archiver_list_spec=
21891+else
21892+ archiver_list_spec=$lt_cv_ar_at_file
21893+fi
21894
21895
21896
21897@@ -7034,8 +7359,8 @@ esac
21898 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21899
21900 # Transform an extracted symbol line into symbol name and symbol address
21901-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
21902-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'"
21903+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
21904+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'"
21905
21906 # Handle CRLF in mingw tool chain
21907 opt_cr=
21908@@ -7071,6 +7396,7 @@ for ac_symprfx in "" "_"; do
21909 else
21910 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21911 fi
21912+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
21913
21914 # Check to see that the pipe works correctly.
21915 pipe_works=no
21916@@ -7112,6 +7438,18 @@ _LT_EOF
21917 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
21918 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
21919 cat <<_LT_EOF > conftest.$ac_ext
21920+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
21921+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
21922+/* DATA imports from DLLs on WIN32 con't be const, because runtime
21923+ relocations are performed -- see ld's documentation on pseudo-relocs. */
21924+# define LT_DLSYM_CONST
21925+#elif defined(__osf__)
21926+/* This system does not cope well with relocations in const data. */
21927+# define LT_DLSYM_CONST
21928+#else
21929+# define LT_DLSYM_CONST const
21930+#endif
21931+
21932 #ifdef __cplusplus
21933 extern "C" {
21934 #endif
21935@@ -7123,7 +7461,7 @@ _LT_EOF
21936 cat <<_LT_EOF >> conftest.$ac_ext
21937
21938 /* The mapping between symbol names and symbols. */
21939-const struct {
21940+LT_DLSYM_CONST struct {
21941 const char *name;
21942 void *address;
21943 }
21944@@ -7149,8 +7487,8 @@ static const void *lt_preloaded_setup() {
21945 _LT_EOF
21946 # Now try linking the two files.
21947 mv conftest.$ac_objext conftstm.$ac_objext
21948- lt_save_LIBS="$LIBS"
21949- lt_save_CFLAGS="$CFLAGS"
21950+ lt_globsym_save_LIBS=$LIBS
21951+ lt_globsym_save_CFLAGS=$CFLAGS
21952 LIBS="conftstm.$ac_objext"
21953 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
21954 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
21955@@ -7160,8 +7498,8 @@ _LT_EOF
21956 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
21957 pipe_works=yes
21958 fi
21959- LIBS="$lt_save_LIBS"
21960- CFLAGS="$lt_save_CFLAGS"
21961+ LIBS=$lt_globsym_save_LIBS
21962+ CFLAGS=$lt_globsym_save_CFLAGS
21963 else
21964 echo "cannot find nm_test_func in $nlist" >&5
21965 fi
21966@@ -7198,6 +7536,16 @@ else
21967 $as_echo "ok" >&6; }
21968 fi
21969
21970+# Response file support.
21971+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
21972+ nm_file_list_spec='@'
21973+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
21974+ nm_file_list_spec='@'
21975+fi
21976+
21977+
21978+
21979+
21980
21981
21982
21983@@ -7214,6 +7562,45 @@ fi
21984
21985
21986
21987+
21988+
21989+
21990+
21991+
21992+
21993+
21994+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
21995+$as_echo_n "checking for sysroot... " >&6; }
21996+
21997+# Check whether --with-libtool-sysroot was given.
21998+if test "${with_libtool_sysroot+set}" = set; then :
21999+ withval=$with_libtool_sysroot;
22000+else
22001+ with_libtool_sysroot=no
22002+fi
22003+
22004+
22005+lt_sysroot=
22006+case ${with_libtool_sysroot} in #(
22007+ yes)
22008+ if test "$GCC" = yes; then
22009+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
22010+ fi
22011+ ;; #(
22012+ /*)
22013+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
22014+ ;; #(
22015+ no|'')
22016+ ;; #(
22017+ *)
22018+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
22019+$as_echo "${with_libtool_sysroot}" >&6; }
22020+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
22021+ ;;
22022+esac
22023+
22024+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
22025+$as_echo "${lt_sysroot:-no}" >&6; }
22026
22027
22028
22029@@ -7419,11 +7806,128 @@ sparc*-*solaris*)
22030 ;;
22031 esac
22032 fi
22033- rm -rf conftest*
22034- ;;
22035+ rm -rf conftest*
22036+ ;;
22037+esac
22038+
22039+need_locks="$enable_libtool_lock"
22040+
22041+if test -n "$ac_tool_prefix"; then
22042+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
22043+set dummy ${ac_tool_prefix}mt; ac_word=$2
22044+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22045+$as_echo_n "checking for $ac_word... " >&6; }
22046+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
22047+ $as_echo_n "(cached) " >&6
22048+else
22049+ if test -n "$MANIFEST_TOOL"; then
22050+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
22051+else
22052+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22053+for as_dir in $PATH
22054+do
22055+ IFS=$as_save_IFS
22056+ test -z "$as_dir" && as_dir=.
22057+ for ac_exec_ext in '' $ac_executable_extensions; do
22058+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22059+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
22060+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22061+ break 2
22062+ fi
22063+done
22064+ done
22065+IFS=$as_save_IFS
22066+
22067+fi
22068+fi
22069+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
22070+if test -n "$MANIFEST_TOOL"; then
22071+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
22072+$as_echo "$MANIFEST_TOOL" >&6; }
22073+else
22074+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22075+$as_echo "no" >&6; }
22076+fi
22077+
22078+
22079+fi
22080+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
22081+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
22082+ # Extract the first word of "mt", so it can be a program name with args.
22083+set dummy mt; ac_word=$2
22084+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22085+$as_echo_n "checking for $ac_word... " >&6; }
22086+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
22087+ $as_echo_n "(cached) " >&6
22088+else
22089+ if test -n "$ac_ct_MANIFEST_TOOL"; then
22090+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
22091+else
22092+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22093+for as_dir in $PATH
22094+do
22095+ IFS=$as_save_IFS
22096+ test -z "$as_dir" && as_dir=.
22097+ for ac_exec_ext in '' $ac_executable_extensions; do
22098+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22099+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
22100+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22101+ break 2
22102+ fi
22103+done
22104+ done
22105+IFS=$as_save_IFS
22106+
22107+fi
22108+fi
22109+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
22110+if test -n "$ac_ct_MANIFEST_TOOL"; then
22111+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
22112+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
22113+else
22114+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22115+$as_echo "no" >&6; }
22116+fi
22117+
22118+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
22119+ MANIFEST_TOOL=":"
22120+ else
22121+ case $cross_compiling:$ac_tool_warned in
22122+yes:)
22123+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
22124+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
22125+ac_tool_warned=yes ;;
22126 esac
22127+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
22128+ fi
22129+else
22130+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
22131+fi
22132+
22133+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
22134+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
22135+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
22136+if ${lt_cv_path_mainfest_tool+:} false; then :
22137+ $as_echo_n "(cached) " >&6
22138+else
22139+ lt_cv_path_mainfest_tool=no
22140+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
22141+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
22142+ cat conftest.err >&5
22143+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
22144+ lt_cv_path_mainfest_tool=yes
22145+ fi
22146+ rm -f conftest*
22147+fi
22148+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
22149+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
22150+if test "x$lt_cv_path_mainfest_tool" != xyes; then
22151+ MANIFEST_TOOL=:
22152+fi
22153+
22154+
22155+
22156
22157-need_locks="$enable_libtool_lock"
22158
22159
22160 case $host_os in
22161@@ -7988,6 +8492,8 @@ _LT_EOF
22162 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
22163 echo "$AR cru libconftest.a conftest.o" >&5
22164 $AR cru libconftest.a conftest.o 2>&5
22165+ echo "$RANLIB libconftest.a" >&5
22166+ $RANLIB libconftest.a 2>&5
22167 cat > conftest.c << _LT_EOF
22168 int main() { return 0;}
22169 _LT_EOF
22170@@ -8542,8 +9048,6 @@ fi
22171 lt_prog_compiler_pic=
22172 lt_prog_compiler_static=
22173
22174-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
22175-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22176
22177 if test "$GCC" = yes; then
22178 lt_prog_compiler_wl='-Wl,'
22179@@ -8709,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22180 lt_prog_compiler_pic='--shared'
22181 lt_prog_compiler_static='--static'
22182 ;;
22183+ nagfor*)
22184+ # NAG Fortran compiler
22185+ lt_prog_compiler_wl='-Wl,-Wl,,'
22186+ lt_prog_compiler_pic='-PIC'
22187+ lt_prog_compiler_static='-Bstatic'
22188+ ;;
22189 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22190 # Portland Group compilers (*not* the Pentium gcc compiler,
22191 # which looks to be a dead project)
22192@@ -8771,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22193 lt_prog_compiler_pic='-KPIC'
22194 lt_prog_compiler_static='-Bstatic'
22195 case $cc_basename in
22196- f77* | f90* | f95*)
22197+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
22198 lt_prog_compiler_wl='-Qoption ld ';;
22199 *)
22200 lt_prog_compiler_wl='-Wl,';;
22201@@ -8828,13 +9338,17 @@ case $host_os in
22202 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22203 ;;
22204 esac
22205-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
22206-$as_echo "$lt_prog_compiler_pic" >&6; }
22207-
22208-
22209-
22210-
22211
22212+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
22213+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22214+if ${lt_cv_prog_compiler_pic+:} false; then :
22215+ $as_echo_n "(cached) " >&6
22216+else
22217+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
22218+fi
22219+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
22220+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
22221+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
22222
22223 #
22224 # Check to make sure the PIC flag actually works.
22225@@ -8895,6 +9409,11 @@ fi
22226
22227
22228
22229+
22230+
22231+
22232+
22233+
22234 #
22235 # Check to make sure the static flag actually works.
22236 #
22237@@ -9245,7 +9764,8 @@ _LT_EOF
22238 allow_undefined_flag=unsupported
22239 always_export_symbols=no
22240 enable_shared_with_static_runtimes=yes
22241- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
22242+ 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'
22243+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
22244
22245 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22246 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22247@@ -9344,12 +9864,12 @@ _LT_EOF
22248 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22249 hardcode_libdir_flag_spec=
22250 hardcode_libdir_flag_spec_ld='-rpath $libdir'
22251- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
22252+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
22253 if test "x$supports_anon_versioning" = xyes; then
22254 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
22255 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
22256 echo "local: *; };" >> $output_objdir/$libname.ver~
22257- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
22258+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
22259 fi
22260 ;;
22261 esac
22262@@ -9363,8 +9883,8 @@ _LT_EOF
22263 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22264 wlarc=
22265 else
22266- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22267- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22268+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22269+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22270 fi
22271 ;;
22272
22273@@ -9382,8 +9902,8 @@ _LT_EOF
22274
22275 _LT_EOF
22276 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
22277- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22278- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22279+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22280+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22281 else
22282 ld_shlibs=no
22283 fi
22284@@ -9429,8 +9949,8 @@ _LT_EOF
22285
22286 *)
22287 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
22288- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22289- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22290+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
22291+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
22292 else
22293 ld_shlibs=no
22294 fi
22295@@ -9560,7 +10080,13 @@ _LT_EOF
22296 allow_undefined_flag='-berok'
22297 # Determine the default libpath from the value encoded in an
22298 # empty executable.
22299- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22300+ if test "${lt_cv_aix_libpath+set}" = set; then
22301+ aix_libpath=$lt_cv_aix_libpath
22302+else
22303+ if ${lt_cv_aix_libpath_+:} false; then :
22304+ $as_echo_n "(cached) " >&6
22305+else
22306+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22307 /* end confdefs.h. */
22308
22309 int
22310@@ -9573,22 +10099,29 @@ main ()
22311 _ACEOF
22312 if ac_fn_c_try_link "$LINENO"; then :
22313
22314-lt_aix_libpath_sed='
22315- /Import File Strings/,/^$/ {
22316- /^0/ {
22317- s/^0 *\(.*\)$/\1/
22318- p
22319- }
22320- }'
22321-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22322-# Check for a 64-bit object if we didn't find anything.
22323-if test -z "$aix_libpath"; then
22324- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22325-fi
22326+ lt_aix_libpath_sed='
22327+ /Import File Strings/,/^$/ {
22328+ /^0/ {
22329+ s/^0 *\([^ ]*\) *$/\1/
22330+ p
22331+ }
22332+ }'
22333+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22334+ # Check for a 64-bit object if we didn't find anything.
22335+ if test -z "$lt_cv_aix_libpath_"; then
22336+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22337+ fi
22338 fi
22339 rm -f core conftest.err conftest.$ac_objext \
22340 conftest$ac_exeext conftest.$ac_ext
22341-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22342+ if test -z "$lt_cv_aix_libpath_"; then
22343+ lt_cv_aix_libpath_="/usr/lib:/lib"
22344+ fi
22345+
22346+fi
22347+
22348+ aix_libpath=$lt_cv_aix_libpath_
22349+fi
22350
22351 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22352 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"
22353@@ -9600,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22354 else
22355 # Determine the default libpath from the value encoded in an
22356 # empty executable.
22357- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22358+ if test "${lt_cv_aix_libpath+set}" = set; then
22359+ aix_libpath=$lt_cv_aix_libpath
22360+else
22361+ if ${lt_cv_aix_libpath_+:} false; then :
22362+ $as_echo_n "(cached) " >&6
22363+else
22364+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22365 /* end confdefs.h. */
22366
22367 int
22368@@ -9613,22 +10152,29 @@ main ()
22369 _ACEOF
22370 if ac_fn_c_try_link "$LINENO"; then :
22371
22372-lt_aix_libpath_sed='
22373- /Import File Strings/,/^$/ {
22374- /^0/ {
22375- s/^0 *\(.*\)$/\1/
22376- p
22377- }
22378- }'
22379-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22380-# Check for a 64-bit object if we didn't find anything.
22381-if test -z "$aix_libpath"; then
22382- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22383-fi
22384+ lt_aix_libpath_sed='
22385+ /Import File Strings/,/^$/ {
22386+ /^0/ {
22387+ s/^0 *\([^ ]*\) *$/\1/
22388+ p
22389+ }
22390+ }'
22391+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22392+ # Check for a 64-bit object if we didn't find anything.
22393+ if test -z "$lt_cv_aix_libpath_"; then
22394+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22395+ fi
22396 fi
22397 rm -f core conftest.err conftest.$ac_objext \
22398 conftest$ac_exeext conftest.$ac_ext
22399-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22400+ if test -z "$lt_cv_aix_libpath_"; then
22401+ lt_cv_aix_libpath_="/usr/lib:/lib"
22402+ fi
22403+
22404+fi
22405+
22406+ aix_libpath=$lt_cv_aix_libpath_
22407+fi
22408
22409 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22410 # Warning - without using the other run time loading flags,
22411@@ -9673,20 +10219,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22412 # Microsoft Visual C++.
22413 # hardcode_libdir_flag_spec is actually meaningless, as there is
22414 # no search path for DLLs.
22415- hardcode_libdir_flag_spec=' '
22416- allow_undefined_flag=unsupported
22417- # Tell ltmain to make .lib files, not .a files.
22418- libext=lib
22419- # Tell ltmain to make .dll files, not .so files.
22420- shrext_cmds=".dll"
22421- # FIXME: Setting linknames here is a bad hack.
22422- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
22423- # The linker will automatically build a .lib file if we build a DLL.
22424- old_archive_from_new_cmds='true'
22425- # FIXME: Should let the user specify the lib program.
22426- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
22427- fix_srcfile_path='`cygpath -w "$srcfile"`'
22428- enable_shared_with_static_runtimes=yes
22429+ case $cc_basename in
22430+ cl*)
22431+ # Native MSVC
22432+ hardcode_libdir_flag_spec=' '
22433+ allow_undefined_flag=unsupported
22434+ always_export_symbols=yes
22435+ file_list_spec='@'
22436+ # Tell ltmain to make .lib files, not .a files.
22437+ libext=lib
22438+ # Tell ltmain to make .dll files, not .so files.
22439+ shrext_cmds=".dll"
22440+ # FIXME: Setting linknames here is a bad hack.
22441+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
22442+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
22443+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
22444+ else
22445+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
22446+ fi~
22447+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
22448+ linknames='
22449+ # The linker will not automatically build a static lib if we build a DLL.
22450+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
22451+ enable_shared_with_static_runtimes=yes
22452+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
22453+ # Don't use ranlib
22454+ old_postinstall_cmds='chmod 644 $oldlib'
22455+ postlink_cmds='lt_outputfile="@OUTPUT@"~
22456+ lt_tool_outputfile="@TOOL_OUTPUT@"~
22457+ case $lt_outputfile in
22458+ *.exe|*.EXE) ;;
22459+ *)
22460+ lt_outputfile="$lt_outputfile.exe"
22461+ lt_tool_outputfile="$lt_tool_outputfile.exe"
22462+ ;;
22463+ esac~
22464+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
22465+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
22466+ $RM "$lt_outputfile.manifest";
22467+ fi'
22468+ ;;
22469+ *)
22470+ # Assume MSVC wrapper
22471+ hardcode_libdir_flag_spec=' '
22472+ allow_undefined_flag=unsupported
22473+ # Tell ltmain to make .lib files, not .a files.
22474+ libext=lib
22475+ # Tell ltmain to make .dll files, not .so files.
22476+ shrext_cmds=".dll"
22477+ # FIXME: Setting linknames here is a bad hack.
22478+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
22479+ # The linker will automatically build a .lib file if we build a DLL.
22480+ old_archive_from_new_cmds='true'
22481+ # FIXME: Should let the user specify the lib program.
22482+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
22483+ enable_shared_with_static_runtimes=yes
22484+ ;;
22485+ esac
22486 ;;
22487
22488 darwin* | rhapsody*)
22489@@ -9747,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22490
22491 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22492 freebsd* | dragonfly*)
22493- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
22494+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
22495 hardcode_libdir_flag_spec='-R$libdir'
22496 hardcode_direct=yes
22497 hardcode_shlibpath_var=no
22498@@ -9755,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22499
22500 hpux9*)
22501 if test "$GCC" = yes; then
22502- 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'
22503+ 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'
22504 else
22505 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'
22506 fi
22507@@ -9771,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22508
22509 hpux10*)
22510 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
22511- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22512+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22513 else
22514 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22515 fi
22516@@ -9795,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22517 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22518 ;;
22519 ia64*)
22520- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22521+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22522 ;;
22523 *)
22524- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22525+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22526 ;;
22527 esac
22528 else
22529@@ -9877,23 +10466,36 @@ fi
22530
22531 irix5* | irix6* | nonstopux*)
22532 if test "$GCC" = yes; then
22533- 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'
22534+ 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'
22535 # Try to use the -exported_symbol ld option, if it does not
22536 # work, assume that -exports_file does not work either and
22537 # implicitly export all symbols.
22538- save_LDFLAGS="$LDFLAGS"
22539- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
22540- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22541+ # This should be the same for all languages, so no per-tag cache variable.
22542+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
22543+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
22544+if ${lt_cv_irix_exported_symbol+:} false; then :
22545+ $as_echo_n "(cached) " >&6
22546+else
22547+ save_LDFLAGS="$LDFLAGS"
22548+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
22549+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22550 /* end confdefs.h. */
22551-int foo(void) {}
22552+int foo (void) { return 0; }
22553 _ACEOF
22554 if ac_fn_c_try_link "$LINENO"; then :
22555- 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'
22556-
22557+ lt_cv_irix_exported_symbol=yes
22558+else
22559+ lt_cv_irix_exported_symbol=no
22560 fi
22561 rm -f core conftest.err conftest.$ac_objext \
22562 conftest$ac_exeext conftest.$ac_ext
22563- LDFLAGS="$save_LDFLAGS"
22564+ LDFLAGS="$save_LDFLAGS"
22565+fi
22566+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
22567+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
22568+ if test "$lt_cv_irix_exported_symbol" = yes; then
22569+ 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'
22570+ fi
22571 else
22572 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'
22573 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'
22574@@ -9978,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \
22575 osf4* | osf5*) # as osf3* with the addition of -msym flag
22576 if test "$GCC" = yes; then
22577 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
22578- 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'
22579+ 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'
22580 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22581 else
22582 allow_undefined_flag=' -expect_unresolved \*'
22583@@ -9997,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \
22584 no_undefined_flag=' -z defs'
22585 if test "$GCC" = yes; then
22586 wlarc='${wl}'
22587- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22588+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22589 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
22590- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
22591+ $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'
22592 else
22593 case `$CC -V 2>&1` in
22594 *"Compilers 5.0"*)
22595@@ -10575,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22596 need_version=no
22597 need_lib_prefix=no
22598
22599- case $GCC,$host_os in
22600- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
22601+ case $GCC,$cc_basename in
22602+ yes,*)
22603+ # gcc
22604 library_names_spec='$libname.dll.a'
22605 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22606 postinstall_cmds='base_file=`basename \${file}`~
22607@@ -10609,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22608 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22609 ;;
22610 esac
22611+ dynamic_linker='Win32 ld.exe'
22612+ ;;
22613+
22614+ *,cl*)
22615+ # Native MSVC
22616+ libname_spec='$name'
22617+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22618+ library_names_spec='${libname}.dll.lib'
22619+
22620+ case $build_os in
22621+ mingw*)
22622+ sys_lib_search_path_spec=
22623+ lt_save_ifs=$IFS
22624+ IFS=';'
22625+ for lt_path in $LIB
22626+ do
22627+ IFS=$lt_save_ifs
22628+ # Let DOS variable expansion print the short 8.3 style file name.
22629+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
22630+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
22631+ done
22632+ IFS=$lt_save_ifs
22633+ # Convert to MSYS style.
22634+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
22635+ ;;
22636+ cygwin*)
22637+ # Convert to unix form, then to dos form, then back to unix form
22638+ # but this time dos style (no spaces!) so that the unix form looks
22639+ # like /cygdrive/c/PROGRA~1:/cygdr...
22640+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
22641+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
22642+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
22643+ ;;
22644+ *)
22645+ sys_lib_search_path_spec="$LIB"
22646+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
22647+ # It is most probably a Windows format PATH.
22648+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
22649+ else
22650+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
22651+ fi
22652+ # FIXME: find the short name or the path components, as spaces are
22653+ # common. (e.g. "Program Files" -> "PROGRA~1")
22654+ ;;
22655+ esac
22656+
22657+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
22658+ postinstall_cmds='base_file=`basename \${file}`~
22659+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
22660+ dldir=$destdir/`dirname \$dlpath`~
22661+ test -d \$dldir || mkdir -p \$dldir~
22662+ $install_prog $dir/$dlname \$dldir/$dlname'
22663+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
22664+ dlpath=$dir/\$dldll~
22665+ $RM \$dlpath'
22666+ shlibpath_overrides_runpath=yes
22667+ dynamic_linker='Win32 link.exe'
22668 ;;
22669
22670 *)
22671+ # Assume MSVC wrapper
22672 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
22673+ dynamic_linker='Win32 ld.exe'
22674 ;;
22675 esac
22676- dynamic_linker='Win32 ld.exe'
22677 # FIXME: first we should search . and the directory the executable is in
22678 shlibpath_var=PATH
22679 ;;
22680@@ -11517,7 +12178,7 @@ else
22681 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22682 lt_status=$lt_dlunknown
22683 cat > conftest.$ac_ext <<_LT_EOF
22684-#line 11520 "configure"
22685+#line $LINENO "configure"
22686 #include "confdefs.h"
22687
22688 #if HAVE_DLFCN_H
22689@@ -11561,10 +12222,10 @@ else
22690 /* When -fvisbility=hidden is used, assume the code has been annotated
22691 correspondingly for the symbols needed. */
22692 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
22693-void fnord () __attribute__((visibility("default")));
22694+int fnord () __attribute__((visibility("default")));
22695 #endif
22696
22697-void fnord () { int i=42; }
22698+int fnord () { return 42; }
22699 int main ()
22700 {
22701 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22702@@ -11623,7 +12284,7 @@ else
22703 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22704 lt_status=$lt_dlunknown
22705 cat > conftest.$ac_ext <<_LT_EOF
22706-#line 11626 "configure"
22707+#line $LINENO "configure"
22708 #include "confdefs.h"
22709
22710 #if HAVE_DLFCN_H
22711@@ -11667,10 +12328,10 @@ else
22712 /* When -fvisbility=hidden is used, assume the code has been annotated
22713 correspondingly for the symbols needed. */
22714 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
22715-void fnord () __attribute__((visibility("default")));
22716+int fnord () __attribute__((visibility("default")));
22717 #endif
22718
22719-void fnord () { int i=42; }
22720+int fnord () { return 42; }
22721 int main ()
22722 {
22723 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22724@@ -13490,7 +14151,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22725 #
22726 # INIT-COMMANDS
22727 #
22728-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
22729+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
22730
22731
22732 # The HP-UX ksh and POSIX shell print the target directory to stdout
22733@@ -13528,13 +14189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22734 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22735 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22736 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
22737+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
22738+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
22739 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
22740 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
22741 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
22742 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
22743 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
22744+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
22745+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
22746+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
22747+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
22748 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
22749 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
22750+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
22751 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22752 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22753 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22754@@ -13549,14 +14217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22755 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22756 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22757 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"`'
22758+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
22759+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
22760 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
22761 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
22762 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
22763-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
22764 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
22765+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
22766 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
22767 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
22768 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
22769+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
22770 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22771 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22772 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22773@@ -13589,12 +14260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22774 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22775 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22776 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
22777-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
22778 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
22779 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
22780 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
22781 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
22782 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
22783+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
22784 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22785 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22786 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22787@@ -13649,8 +14320,13 @@ reload_flag \
22788 OBJDUMP \
22789 deplibs_check_method \
22790 file_magic_cmd \
22791+file_magic_glob \
22792+want_nocaseglob \
22793+DLLTOOL \
22794+sharedlib_from_linklib_cmd \
22795 AR \
22796 AR_FLAGS \
22797+archiver_list_spec \
22798 STRIP \
22799 RANLIB \
22800 CC \
22801@@ -13660,12 +14336,14 @@ lt_cv_sys_global_symbol_pipe \
22802 lt_cv_sys_global_symbol_to_cdecl \
22803 lt_cv_sys_global_symbol_to_c_name_address \
22804 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
22805+nm_file_list_spec \
22806 lt_prog_compiler_no_builtin_flag \
22807-lt_prog_compiler_wl \
22808 lt_prog_compiler_pic \
22809+lt_prog_compiler_wl \
22810 lt_prog_compiler_static \
22811 lt_cv_prog_compiler_c_o \
22812 need_locks \
22813+MANIFEST_TOOL \
22814 DSYMUTIL \
22815 NMEDIT \
22816 LIPO \
22817@@ -13681,7 +14359,6 @@ no_undefined_flag \
22818 hardcode_libdir_flag_spec \
22819 hardcode_libdir_flag_spec_ld \
22820 hardcode_libdir_separator \
22821-fix_srcfile_path \
22822 exclude_expsyms \
22823 include_expsyms \
22824 file_list_spec \
22825@@ -13717,6 +14394,7 @@ module_cmds \
22826 module_expsym_cmds \
22827 export_symbols_cmds \
22828 prelink_cmds \
22829+postlink_cmds \
22830 postinstall_cmds \
22831 postuninstall_cmds \
22832 finish_cmds \
22833@@ -14363,29 +15041,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
22834 # Older Autoconf quotes --file arguments for eval, but not when files
22835 # are listed without --file. Let's play safe and only enable the eval
22836 # if we detect the quoting.
22837- case $CONFIG_FILES in
22838- *\'*) eval set x "$CONFIG_FILES" ;;
22839- *) set x $CONFIG_FILES ;;
22840- esac
22841+ # TODO: see whether this extra hack can be removed once we start
22842+ # requiring Autoconf 2.70 or later.
22843+ case $CONFIG_FILES in #(
22844+ *\'*) :
22845+ eval set x "$CONFIG_FILES" ;; #(
22846+ *) :
22847+ set x $CONFIG_FILES ;; #(
22848+ *) :
22849+ ;;
22850+esac
22851 shift
22852- for mf
22853+ # Used to flag and report bootstrapping failures.
22854+ am_rc=0
22855+ for am_mf
22856 do
22857 # Strip MF so we end up with the name of the file.
22858- mf=`echo "$mf" | sed -e 's/:.*$//'`
22859- # Check whether this is an Automake generated Makefile or not.
22860- # We used to match only the files named 'Makefile.in', but
22861- # some people rename them; so instead we look at the file content.
22862- # Grep'ing the first line is not enough: some people post-process
22863- # each Makefile.in and add a new line on top of each file to say so.
22864- # Grep'ing the whole file is not good either: AIX grep has a line
22865+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
22866+ # Check whether this is an Automake generated Makefile which includes
22867+ # dependency-tracking related rules and includes.
22868+ # Grep'ing the whole file directly is not great: AIX grep has a line
22869 # limit of 2048, but all sed's we know have understand at least 4000.
22870- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
22871- dirpart=`$as_dirname -- "$mf" ||
22872-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
22873- X"$mf" : 'X\(//\)[^/]' \| \
22874- X"$mf" : 'X\(//\)$' \| \
22875- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
22876-$as_echo X"$mf" |
22877+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
22878+ || continue
22879+ am_dirpart=`$as_dirname -- "$am_mf" ||
22880+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
22881+ X"$am_mf" : 'X\(//\)[^/]' \| \
22882+ X"$am_mf" : 'X\(//\)$' \| \
22883+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
22884+$as_echo X"$am_mf" |
22885 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
22886 s//\1/
22887 q
22888@@ -14403,53 +15087,50 @@ $as_echo X"$mf" |
22889 q
22890 }
22891 s/.*/./; q'`
22892- else
22893- continue
22894- fi
22895- # Extract the definition of DEPDIR, am__include, and am__quote
22896- # from the Makefile without running 'make'.
22897- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
22898- test -z "$DEPDIR" && continue
22899- am__include=`sed -n 's/^am__include = //p' < "$mf"`
22900- test -z "$am__include" && continue
22901- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
22902- # Find all dependency output files, they are included files with
22903- # $(DEPDIR) in their names. We invoke sed twice because it is the
22904- # simplest approach to changing $(DEPDIR) to its actual value in the
22905- # expansion.
22906- for file in `sed -n "
22907- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
22908- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
22909- # Make sure the directory exists.
22910- test -f "$dirpart/$file" && continue
22911- fdir=`$as_dirname -- "$file" ||
22912-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
22913- X"$file" : 'X\(//\)[^/]' \| \
22914- X"$file" : 'X\(//\)$' \| \
22915- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
22916-$as_echo X"$file" |
22917- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
22918- s//\1/
22919- q
22920- }
22921- /^X\(\/\/\)[^/].*/{
22922+ am_filepart=`$as_basename -- "$am_mf" ||
22923+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
22924+ X"$am_mf" : 'X\(//\)$' \| \
22925+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
22926+$as_echo X/"$am_mf" |
22927+ sed '/^.*\/\([^/][^/]*\)\/*$/{
22928 s//\1/
22929 q
22930 }
22931- /^X\(\/\/\)$/{
22932+ /^X\/\(\/\/\)$/{
22933 s//\1/
22934 q
22935 }
22936- /^X\(\/\).*/{
22937+ /^X\/\(\/\).*/{
22938 s//\1/
22939 q
22940 }
22941 s/.*/./; q'`
22942- as_dir=$dirpart/$fdir; as_fn_mkdir_p
22943- # echo "creating $dirpart/$file"
22944- echo '# dummy' > "$dirpart/$file"
22945- done
22946+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
22947+ && sed -e '/# am--include-marker/d' "$am_filepart" \
22948+ | $MAKE -f - am--depfiles" >&5
22949+ (cd "$am_dirpart" \
22950+ && sed -e '/# am--include-marker/d' "$am_filepart" \
22951+ | $MAKE -f - am--depfiles) >&5 2>&5
22952+ ac_status=$?
22953+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
22954+ (exit $ac_status); } || am_rc=$?
22955 done
22956+ if test $am_rc -ne 0; then
22957+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22958+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22959+as_fn_error $? "Something went wrong bootstrapping makefile fragments
22960+ for automatic dependency tracking. If GNU make was not used, consider
22961+ re-running the configure script with MAKE=\"gmake\" (or whatever is
22962+ necessary). You can also try re-running configure with the
22963+ '--disable-dependency-tracking' option to at least be able to build
22964+ the package (albeit without support for automatic dependency tracking).
22965+See \`config.log' for more details" "$LINENO" 5; }
22966+ fi
22967+ { am_dirpart=; unset am_dirpart;}
22968+ { am_filepart=; unset am_filepart;}
22969+ { am_mf=; unset am_mf;}
22970+ { am_rc=; unset am_rc;}
22971+ rm -f conftest-deps.mk
22972 }
22973 ;;
22974 "libtool":C)
22975@@ -14473,7 +15154,8 @@ $as_echo X"$file" |
22976 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22977 #
22978 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
22979-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
22980+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
22981+# Inc.
22982 # Written by Gordon Matzigkeit, 1996
22983 #
22984 # This file is part of GNU Libtool.
22985@@ -14576,19 +15258,42 @@ SP2NL=$lt_lt_SP2NL
22986 # turn newlines into spaces.
22987 NL2SP=$lt_lt_NL2SP
22988
22989+# convert \$build file names to \$host format.
22990+to_host_file_cmd=$lt_cv_to_host_file_cmd
22991+
22992+# convert \$build files to toolchain format.
22993+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
22994+
22995 # An object symbol dumper.
22996 OBJDUMP=$lt_OBJDUMP
22997
22998 # Method to check whether dependent libraries are shared objects.
22999 deplibs_check_method=$lt_deplibs_check_method
23000
23001-# Command to use when deplibs_check_method == "file_magic".
23002+# Command to use when deplibs_check_method = "file_magic".
23003 file_magic_cmd=$lt_file_magic_cmd
23004
23005+# How to find potential files when deplibs_check_method = "file_magic".
23006+file_magic_glob=$lt_file_magic_glob
23007+
23008+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
23009+want_nocaseglob=$lt_want_nocaseglob
23010+
23011+# DLL creation program.
23012+DLLTOOL=$lt_DLLTOOL
23013+
23014+# Command to associate shared and link libraries.
23015+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
23016+
23017 # The archiver.
23018 AR=$lt_AR
23019+
23020+# Flags to create an archive.
23021 AR_FLAGS=$lt_AR_FLAGS
23022
23023+# How to feed a file listing to the archiver.
23024+archiver_list_spec=$lt_archiver_list_spec
23025+
23026 # A symbol stripping program.
23027 STRIP=$lt_STRIP
23028
23029@@ -14618,6 +15323,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
23030 # Transform the output of nm in a C name address pair when lib prefix is needed.
23031 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
23032
23033+# Specify filename containing input files for \$NM.
23034+nm_file_list_spec=$lt_nm_file_list_spec
23035+
23036+# The root where to search for dependent libraries,and in which our libraries should be installed.
23037+lt_sysroot=$lt_sysroot
23038+
23039 # The name of the directory that contains temporary libtool files.
23040 objdir=$objdir
23041
23042@@ -14627,6 +15338,9 @@ MAGIC_CMD=$MAGIC_CMD
23043 # Must we lock files when doing compilation?
23044 need_locks=$lt_need_locks
23045
23046+# Manifest tool.
23047+MANIFEST_TOOL=$lt_MANIFEST_TOOL
23048+
23049 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
23050 DSYMUTIL=$lt_DSYMUTIL
23051
23052@@ -14741,12 +15455,12 @@ with_gcc=$GCC
23053 # Compiler flag to turn off builtin functions.
23054 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
23055
23056-# How to pass a linker flag through the compiler.
23057-wl=$lt_lt_prog_compiler_wl
23058-
23059 # Additional compiler flags for building library objects.
23060 pic_flag=$lt_lt_prog_compiler_pic
23061
23062+# How to pass a linker flag through the compiler.
23063+wl=$lt_lt_prog_compiler_wl
23064+
23065 # Compiler flag to prevent dynamic linking.
23066 link_static_flag=$lt_lt_prog_compiler_static
23067
23068@@ -14833,9 +15547,6 @@ inherit_rpath=$inherit_rpath
23069 # Whether libtool must link a program against all its dependency libraries.
23070 link_all_deplibs=$link_all_deplibs
23071
23072-# Fix the shell variable \$srcfile for the compiler.
23073-fix_srcfile_path=$lt_fix_srcfile_path
23074-
23075 # Set to "yes" if exported symbols are required.
23076 always_export_symbols=$always_export_symbols
23077
23078@@ -14851,6 +15562,9 @@ include_expsyms=$lt_include_expsyms
23079 # Commands necessary for linking programs (against libraries) with templates.
23080 prelink_cmds=$lt_prelink_cmds
23081
23082+# Commands necessary for finishing linking programs.
23083+postlink_cmds=$lt_postlink_cmds
23084+
23085 # Specify filename containing input files.
23086 file_list_spec=$lt_file_list_spec
23087
23088@@ -14883,210 +15597,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
23089 # if finds mixed CR/LF and LF-only lines. Since sed operates in
23090 # text mode, it properly converts lines to CR/LF. This bash problem
23091 # is reportedly fixed, but why not run on old versions too?
23092- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
23093- || (rm -f "$cfgfile"; exit 1)
23094-
23095- case $xsi_shell in
23096- yes)
23097- cat << \_LT_EOF >> "$cfgfile"
23098-
23099-# func_dirname file append nondir_replacement
23100-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
23101-# otherwise set result to NONDIR_REPLACEMENT.
23102-func_dirname ()
23103-{
23104- case ${1} in
23105- */*) func_dirname_result="${1%/*}${2}" ;;
23106- * ) func_dirname_result="${3}" ;;
23107- esac
23108-}
23109-
23110-# func_basename file
23111-func_basename ()
23112-{
23113- func_basename_result="${1##*/}"
23114-}
23115-
23116-# func_dirname_and_basename file append nondir_replacement
23117-# perform func_basename and func_dirname in a single function
23118-# call:
23119-# dirname: Compute the dirname of FILE. If nonempty,
23120-# add APPEND to the result, otherwise set result
23121-# to NONDIR_REPLACEMENT.
23122-# value returned in "$func_dirname_result"
23123-# basename: Compute filename of FILE.
23124-# value retuned in "$func_basename_result"
23125-# Implementation must be kept synchronized with func_dirname
23126-# and func_basename. For efficiency, we do not delegate to
23127-# those functions but instead duplicate the functionality here.
23128-func_dirname_and_basename ()
23129-{
23130- case ${1} in
23131- */*) func_dirname_result="${1%/*}${2}" ;;
23132- * ) func_dirname_result="${3}" ;;
23133- esac
23134- func_basename_result="${1##*/}"
23135-}
23136-
23137-# func_stripname prefix suffix name
23138-# strip PREFIX and SUFFIX off of NAME.
23139-# PREFIX and SUFFIX must not contain globbing or regex special
23140-# characters, hashes, percent signs, but SUFFIX may contain a leading
23141-# dot (in which case that matches only a dot).
23142-func_stripname ()
23143-{
23144- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
23145- # positional parameters, so assign one to ordinary parameter first.
23146- func_stripname_result=${3}
23147- func_stripname_result=${func_stripname_result#"${1}"}
23148- func_stripname_result=${func_stripname_result%"${2}"}
23149-}
23150-
23151-# func_opt_split
23152-func_opt_split ()
23153-{
23154- func_opt_split_opt=${1%%=*}
23155- func_opt_split_arg=${1#*=}
23156-}
23157-
23158-# func_lo2o object
23159-func_lo2o ()
23160-{
23161- case ${1} in
23162- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
23163- *) func_lo2o_result=${1} ;;
23164- esac
23165-}
23166-
23167-# func_xform libobj-or-source
23168-func_xform ()
23169-{
23170- func_xform_result=${1%.*}.lo
23171-}
23172-
23173-# func_arith arithmetic-term...
23174-func_arith ()
23175-{
23176- func_arith_result=$(( $* ))
23177-}
23178-
23179-# func_len string
23180-# STRING may not start with a hyphen.
23181-func_len ()
23182-{
23183- func_len_result=${#1}
23184-}
23185-
23186-_LT_EOF
23187- ;;
23188- *) # Bourne compatible functions.
23189- cat << \_LT_EOF >> "$cfgfile"
23190-
23191-# func_dirname file append nondir_replacement
23192-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
23193-# otherwise set result to NONDIR_REPLACEMENT.
23194-func_dirname ()
23195-{
23196- # Extract subdirectory from the argument.
23197- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
23198- if test "X$func_dirname_result" = "X${1}"; then
23199- func_dirname_result="${3}"
23200- else
23201- func_dirname_result="$func_dirname_result${2}"
23202- fi
23203-}
23204-
23205-# func_basename file
23206-func_basename ()
23207-{
23208- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
23209-}
23210-
23211-
23212-# func_stripname prefix suffix name
23213-# strip PREFIX and SUFFIX off of NAME.
23214-# PREFIX and SUFFIX must not contain globbing or regex special
23215-# characters, hashes, percent signs, but SUFFIX may contain a leading
23216-# dot (in which case that matches only a dot).
23217-# func_strip_suffix prefix name
23218-func_stripname ()
23219-{
23220- case ${2} in
23221- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
23222- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
23223- esac
23224-}
23225-
23226-# sed scripts:
23227-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
23228-my_sed_long_arg='1s/^-[^=]*=//'
23229-
23230-# func_opt_split
23231-func_opt_split ()
23232-{
23233- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
23234- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
23235-}
23236-
23237-# func_lo2o object
23238-func_lo2o ()
23239-{
23240- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
23241-}
23242-
23243-# func_xform libobj-or-source
23244-func_xform ()
23245-{
23246- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
23247-}
23248-
23249-# func_arith arithmetic-term...
23250-func_arith ()
23251-{
23252- func_arith_result=`expr "$@"`
23253-}
23254-
23255-# func_len string
23256-# STRING may not start with a hyphen.
23257-func_len ()
23258-{
23259- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
23260-}
23261-
23262-_LT_EOF
23263-esac
23264-
23265-case $lt_shell_append in
23266- yes)
23267- cat << \_LT_EOF >> "$cfgfile"
23268-
23269-# func_append var value
23270-# Append VALUE to the end of shell variable VAR.
23271-func_append ()
23272-{
23273- eval "$1+=\$2"
23274-}
23275-_LT_EOF
23276- ;;
23277- *)
23278- cat << \_LT_EOF >> "$cfgfile"
23279-
23280-# func_append var value
23281-# Append VALUE to the end of shell variable VAR.
23282-func_append ()
23283-{
23284- eval "$1=\$$1\$2"
23285-}
23286-
23287-_LT_EOF
23288- ;;
23289- esac
23290-
23291-
23292- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
23293- || (rm -f "$cfgfile"; exit 1)
23294-
23295- mv -f "$cfgfile" "$ofile" ||
23296+ sed '$q' "$ltmain" >> "$cfgfile" \
23297+ || (rm -f "$cfgfile"; exit 1)
23298+
23299+ if test x"$xsi_shell" = xyes; then
23300+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
23301+func_dirname ()\
23302+{\
23303+\ case ${1} in\
23304+\ */*) func_dirname_result="${1%/*}${2}" ;;\
23305+\ * ) func_dirname_result="${3}" ;;\
23306+\ esac\
23307+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
23308+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23309+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23310+test 0 -eq $? || _lt_function_replace_fail=:
23311+
23312+
23313+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
23314+func_basename ()\
23315+{\
23316+\ func_basename_result="${1##*/}"\
23317+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
23318+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23319+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23320+test 0 -eq $? || _lt_function_replace_fail=:
23321+
23322+
23323+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
23324+func_dirname_and_basename ()\
23325+{\
23326+\ case ${1} in\
23327+\ */*) func_dirname_result="${1%/*}${2}" ;;\
23328+\ * ) func_dirname_result="${3}" ;;\
23329+\ esac\
23330+\ func_basename_result="${1##*/}"\
23331+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
23332+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23333+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23334+test 0 -eq $? || _lt_function_replace_fail=:
23335+
23336+
23337+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
23338+func_stripname ()\
23339+{\
23340+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
23341+\ # positional parameters, so assign one to ordinary parameter first.\
23342+\ func_stripname_result=${3}\
23343+\ func_stripname_result=${func_stripname_result#"${1}"}\
23344+\ func_stripname_result=${func_stripname_result%"${2}"}\
23345+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
23346+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23347+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23348+test 0 -eq $? || _lt_function_replace_fail=:
23349+
23350+
23351+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
23352+func_split_long_opt ()\
23353+{\
23354+\ func_split_long_opt_name=${1%%=*}\
23355+\ func_split_long_opt_arg=${1#*=}\
23356+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
23357+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23358+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23359+test 0 -eq $? || _lt_function_replace_fail=:
23360+
23361+
23362+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
23363+func_split_short_opt ()\
23364+{\
23365+\ func_split_short_opt_arg=${1#??}\
23366+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
23367+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
23368+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23369+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23370+test 0 -eq $? || _lt_function_replace_fail=:
23371+
23372+
23373+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
23374+func_lo2o ()\
23375+{\
23376+\ case ${1} in\
23377+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
23378+\ *) func_lo2o_result=${1} ;;\
23379+\ esac\
23380+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
23381+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23382+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23383+test 0 -eq $? || _lt_function_replace_fail=:
23384+
23385+
23386+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
23387+func_xform ()\
23388+{\
23389+ func_xform_result=${1%.*}.lo\
23390+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
23391+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23392+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23393+test 0 -eq $? || _lt_function_replace_fail=:
23394+
23395+
23396+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
23397+func_arith ()\
23398+{\
23399+ func_arith_result=$(( $* ))\
23400+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
23401+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23402+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23403+test 0 -eq $? || _lt_function_replace_fail=:
23404+
23405+
23406+ sed -e '/^func_len ()$/,/^} # func_len /c\
23407+func_len ()\
23408+{\
23409+ func_len_result=${#1}\
23410+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
23411+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23412+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23413+test 0 -eq $? || _lt_function_replace_fail=:
23414+
23415+fi
23416+
23417+if test x"$lt_shell_append" = xyes; then
23418+ sed -e '/^func_append ()$/,/^} # func_append /c\
23419+func_append ()\
23420+{\
23421+ eval "${1}+=\\${2}"\
23422+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
23423+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23424+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23425+test 0 -eq $? || _lt_function_replace_fail=:
23426+
23427+
23428+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
23429+func_append_quoted ()\
23430+{\
23431+\ func_quote_for_eval "${2}"\
23432+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
23433+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
23434+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23435+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23436+test 0 -eq $? || _lt_function_replace_fail=:
23437+
23438+
23439+ # Save a `func_append' function call where possible by direct use of '+='
23440+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
23441+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23442+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23443+ test 0 -eq $? || _lt_function_replace_fail=:
23444+else
23445+ # Save a `func_append' function call even when '+=' is not available
23446+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
23447+ && mv -f "$cfgfile.tmp" "$cfgfile" \
23448+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
23449+ test 0 -eq $? || _lt_function_replace_fail=:
23450+fi
23451+
23452+if test x"$_lt_function_replace_fail" = x":"; then
23453+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
23454+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
23455+fi
23456+
23457+
23458+ mv -f "$cfgfile" "$ofile" ||
23459 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
23460 chmod +x "$ofile"
23461
23462diff --git a/libtool.m4 b/libtool.m4
23463index e36fdd3c0e2..4acf9d67956 100644
23464--- a/libtool.m4
23465+++ b/libtool.m4
23466@@ -1,7 +1,8 @@
23467 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
23468 #
23469 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
23470-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
23471+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
23472+# Inc.
23473 # Written by Gordon Matzigkeit, 1996
23474 #
23475 # This file is free software; the Free Software Foundation gives
23476@@ -10,7 +11,8 @@
23477
23478 m4_define([_LT_COPYING], [dnl
23479 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
23480-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
23481+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
23482+# Inc.
23483 # Written by Gordon Matzigkeit, 1996
23484 #
23485 # This file is part of GNU Libtool.
23486@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
23487 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23488 ])
23489
23490-# serial 56 LT_INIT
23491+# serial 57 LT_INIT
23492
23493
23494 # LT_PREREQ(VERSION)
23495@@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
23496 dnl
23497 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
23498 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
23499+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
23500 m4_require([_LT_CMD_RELOAD])dnl
23501 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
23502+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
23503 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
23504 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
23505+m4_require([_LT_WITH_SYSROOT])dnl
23506
23507 _LT_CONFIG_LIBTOOL_INIT([
23508 # See if we are running on zsh, and set the options which allow our
23509@@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
23510 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
23511 configured by $[0], generated by m4_PACKAGE_STRING.
23512
23513-Copyright (C) 2009 Free Software Foundation, Inc.
23514+Copyright (C) 2010 Free Software Foundation, Inc.
23515 This config.lt script is free software; the Free Software Foundation
23516 gives unlimited permision to copy, distribute and modify it."
23517
23518@@ -746,15 +751,12 @@ _LT_EOF
23519 # if finds mixed CR/LF and LF-only lines. Since sed operates in
23520 # text mode, it properly converts lines to CR/LF. This bash problem
23521 # is reportedly fixed, but why not run on old versions too?
23522- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
23523- || (rm -f "$cfgfile"; exit 1)
23524+ sed '$q' "$ltmain" >> "$cfgfile" \
23525+ || (rm -f "$cfgfile"; exit 1)
23526
23527- _LT_PROG_XSI_SHELLFNS
23528+ _LT_PROG_REPLACE_SHELLFNS
23529
23530- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
23531- || (rm -f "$cfgfile"; exit 1)
23532-
23533- mv -f "$cfgfile" "$ofile" ||
23534+ mv -f "$cfgfile" "$ofile" ||
23535 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
23536 chmod +x "$ofile"
23537 ],
23538@@ -980,6 +982,8 @@ _LT_EOF
23539 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
23540 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
23541 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
23542+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
23543+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
23544 cat > conftest.c << _LT_EOF
23545 int main() { return 0;}
23546 _LT_EOF
23547@@ -1071,30 +1075,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
23548 fi
23549 ])
23550
23551-# _LT_SYS_MODULE_PATH_AIX
23552-# -----------------------
23553+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
23554+# ----------------------------------
23555 # Links a minimal program and checks the executable
23556 # for the system default hardcoded library path. In most cases,
23557 # this is /usr/lib:/lib, but when the MPI compilers are used
23558 # the location of the communication and MPI libs are included too.
23559 # If we don't find anything, use the default library path according
23560 # to the aix ld manual.
23561+# Store the results from the different compilers for each TAGNAME.
23562+# Allow to override them for all tags through lt_cv_aix_libpath.
23563 m4_defun([_LT_SYS_MODULE_PATH_AIX],
23564 [m4_require([_LT_DECL_SED])dnl
23565-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
23566-lt_aix_libpath_sed='
23567- /Import File Strings/,/^$/ {
23568- /^0/ {
23569- s/^0 *\(.*\)$/\1/
23570- p
23571- }
23572- }'
23573-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
23574-# Check for a 64-bit object if we didn't find anything.
23575-if test -z "$aix_libpath"; then
23576- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
23577-fi],[])
23578-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
23579+if test "${lt_cv_aix_libpath+set}" = set; then
23580+ aix_libpath=$lt_cv_aix_libpath
23581+else
23582+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
23583+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
23584+ lt_aix_libpath_sed='[
23585+ /Import File Strings/,/^$/ {
23586+ /^0/ {
23587+ s/^0 *\([^ ]*\) *$/\1/
23588+ p
23589+ }
23590+ }]'
23591+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
23592+ # Check for a 64-bit object if we didn't find anything.
23593+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
23594+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
23595+ fi],[])
23596+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
23597+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
23598+ fi
23599+ ])
23600+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
23601+fi
23602 ])# _LT_SYS_MODULE_PATH_AIX
23603
23604
23605@@ -1119,7 +1134,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
23606
23607 AC_MSG_CHECKING([how to print strings])
23608 # Test print first, because it will be a builtin if present.
23609-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
23610+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
23611 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
23612 ECHO='print -r --'
23613 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
23614@@ -1163,6 +1178,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
23615 ])# _LT_PROG_ECHO_BACKSLASH
23616
23617
23618+# _LT_WITH_SYSROOT
23619+# ----------------
23620+AC_DEFUN([_LT_WITH_SYSROOT],
23621+[AC_MSG_CHECKING([for sysroot])
23622+AC_ARG_WITH([libtool-sysroot],
23623+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
23624+ (or the compiler's sysroot if not specified).],
23625+[], [with_libtool_sysroot=no])
23626+
23627+dnl lt_sysroot will always be passed unquoted. We quote it here
23628+dnl in case the user passed a directory name.
23629+lt_sysroot=
23630+case ${with_libtool_sysroot} in #(
23631+ yes)
23632+ if test "$GCC" = yes; then
23633+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
23634+ fi
23635+ ;; #(
23636+ /*)
23637+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
23638+ ;; #(
23639+ no|'')
23640+ ;; #(
23641+ *)
23642+ AC_MSG_RESULT([${with_libtool_sysroot}])
23643+ AC_MSG_ERROR([The sysroot must be an absolute path.])
23644+ ;;
23645+esac
23646+
23647+ AC_MSG_RESULT([${lt_sysroot:-no}])
23648+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
23649+[dependent libraries, and in which our libraries should be installed.])])
23650+
23651 # _LT_ENABLE_LOCK
23652 # ---------------
23653 m4_defun([_LT_ENABLE_LOCK],
23654@@ -1322,6 +1370,51 @@ need_locks="$enable_libtool_lock"
23655 ])# _LT_ENABLE_LOCK
23656
23657
23658+# _LT_PROG_AR
23659+# -----------
23660+m4_defun([_LT_PROG_AR],
23661+[AC_CHECK_TOOLS(AR, [ar], false)
23662+ touch conftest.c
23663+ $AR $plugin_option rc conftest.a conftest.c
23664+ if test "$?" != 0; then
23665+ AC_MSG_WARN([Failed: $AR $plugin_option rc])
23666+ else
23667+ AR="$AR $plugin_option"
23668+ fi
23669+ rm -f conftest.*
23670+: ${AR=ar}
23671+: ${AR_FLAGS=cru}
23672+_LT_DECL([], [AR], [1], [The archiver])
23673+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
23674+
23675+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
23676+ [lt_cv_ar_at_file=no
23677+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
23678+ [echo conftest.$ac_objext > conftest.lst
23679+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
23680+ AC_TRY_EVAL([lt_ar_try])
23681+ if test "$ac_status" -eq 0; then
23682+ # Ensure the archiver fails upon bogus file names.
23683+ rm -f conftest.$ac_objext libconftest.a
23684+ AC_TRY_EVAL([lt_ar_try])
23685+ if test "$ac_status" -ne 0; then
23686+ lt_cv_ar_at_file=@
23687+ fi
23688+ fi
23689+ rm -f conftest.* libconftest.a
23690+ ])
23691+ ])
23692+
23693+if test "x$lt_cv_ar_at_file" = xno; then
23694+ archiver_list_spec=
23695+else
23696+ archiver_list_spec=$lt_cv_ar_at_file
23697+fi
23698+_LT_DECL([], [archiver_list_spec], [1],
23699+ [How to feed a file listing to the archiver])
23700+])# _LT_PROG_AR
23701+
23702+
23703 # _LT_CMD_OLD_ARCHIVE
23704 # -------------------
23705 m4_defun([_LT_CMD_OLD_ARCHIVE],
23706@@ -1338,23 +1431,7 @@ for plugin in $plugin_names; do
23707 fi
23708 done
23709
23710-AC_CHECK_TOOL(AR, ar, false)
23711-test -z "$AR" && AR=ar
23712-if test -n "$plugin_option"; then
23713- if $AR --help 2>&1 | grep -q "\--plugin"; then
23714- touch conftest.c
23715- $AR $plugin_option rc conftest.a conftest.c
23716- if test "$?" != 0; then
23717- AC_MSG_WARN([Failed: $AR $plugin_option rc])
23718- else
23719- AR="$AR $plugin_option"
23720- fi
23721- rm -f conftest.*
23722- fi
23723-fi
23724-test -z "$AR_FLAGS" && AR_FLAGS=cru
23725-_LT_DECL([], [AR], [1], [The archiver])
23726-_LT_DECL([], [AR_FLAGS], [1])
23727+_LT_PROG_AR
23728
23729 AC_CHECK_TOOL(STRIP, strip, :)
23730 test -z "$STRIP" && STRIP=:
23731@@ -1655,7 +1732,7 @@ else
23732 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
23733 lt_status=$lt_dlunknown
23734 cat > conftest.$ac_ext <<_LT_EOF
23735-[#line __oline__ "configure"
23736+[#line $LINENO "configure"
23737 #include "confdefs.h"
23738
23739 #if HAVE_DLFCN_H
23740@@ -1699,10 +1776,10 @@ else
23741 /* When -fvisbility=hidden is used, assume the code has been annotated
23742 correspondingly for the symbols needed. */
23743 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
23744-void fnord () __attribute__((visibility("default")));
23745+int fnord () __attribute__((visibility("default")));
23746 #endif
23747
23748-void fnord () { int i=42; }
23749+int fnord () { return 42; }
23750 int main ()
23751 {
23752 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
23753@@ -2242,8 +2319,9 @@ cygwin* | mingw* | pw32* | cegcc*)
23754 need_version=no
23755 need_lib_prefix=no
23756
23757- case $GCC,$host_os in
23758- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
23759+ case $GCC,$cc_basename in
23760+ yes,*)
23761+ # gcc
23762 library_names_spec='$libname.dll.a'
23763 # DLL is installed to $(libdir)/../bin by postinstall_cmds
23764 postinstall_cmds='base_file=`basename \${file}`~
23765@@ -2276,13 +2354,71 @@ m4_if([$1], [],[
23766 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
23767 ;;
23768 esac
23769+ dynamic_linker='Win32 ld.exe'
23770+ ;;
23771+
23772+ *,cl*)
23773+ # Native MSVC
23774+ libname_spec='$name'
23775+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
23776+ library_names_spec='${libname}.dll.lib'
23777+
23778+ case $build_os in
23779+ mingw*)
23780+ sys_lib_search_path_spec=
23781+ lt_save_ifs=$IFS
23782+ IFS=';'
23783+ for lt_path in $LIB
23784+ do
23785+ IFS=$lt_save_ifs
23786+ # Let DOS variable expansion print the short 8.3 style file name.
23787+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
23788+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
23789+ done
23790+ IFS=$lt_save_ifs
23791+ # Convert to MSYS style.
23792+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
23793+ ;;
23794+ cygwin*)
23795+ # Convert to unix form, then to dos form, then back to unix form
23796+ # but this time dos style (no spaces!) so that the unix form looks
23797+ # like /cygdrive/c/PROGRA~1:/cygdr...
23798+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
23799+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
23800+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
23801+ ;;
23802+ *)
23803+ sys_lib_search_path_spec="$LIB"
23804+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
23805+ # It is most probably a Windows format PATH.
23806+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
23807+ else
23808+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
23809+ fi
23810+ # FIXME: find the short name or the path components, as spaces are
23811+ # common. (e.g. "Program Files" -> "PROGRA~1")
23812+ ;;
23813+ esac
23814+
23815+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
23816+ postinstall_cmds='base_file=`basename \${file}`~
23817+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
23818+ dldir=$destdir/`dirname \$dlpath`~
23819+ test -d \$dldir || mkdir -p \$dldir~
23820+ $install_prog $dir/$dlname \$dldir/$dlname'
23821+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
23822+ dlpath=$dir/\$dldll~
23823+ $RM \$dlpath'
23824+ shlibpath_overrides_runpath=yes
23825+ dynamic_linker='Win32 link.exe'
23826 ;;
23827
23828 *)
23829+ # Assume MSVC wrapper
23830 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
23831+ dynamic_linker='Win32 ld.exe'
23832 ;;
23833 esac
23834- dynamic_linker='Win32 ld.exe'
23835 # FIXME: first we should search . and the directory the executable is in
23836 shlibpath_var=PATH
23837 ;;
23838@@ -2996,6 +3132,11 @@ case $reload_flag in
23839 esac
23840 reload_cmds='$LD$reload_flag -o $output$reload_objs'
23841 case $host_os in
23842+ cygwin* | mingw* | pw32* | cegcc*)
23843+ if test "$GCC" != yes; then
23844+ reload_cmds=false
23845+ fi
23846+ ;;
23847 darwin*)
23848 if test "$GCC" = yes; then
23849 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
23850@@ -3062,7 +3203,8 @@ mingw* | pw32*)
23851 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
23852 lt_cv_file_magic_cmd='func_win32_libid'
23853 else
23854- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
23855+ # Keep this pattern in sync with the one in func_win32_libid.
23856+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
23857 lt_cv_file_magic_cmd='$OBJDUMP -f'
23858 fi
23859 ;;
23860@@ -3218,6 +3360,21 @@ vxworks*)
23861 ;;
23862 esac
23863 ])
23864+
23865+file_magic_glob=
23866+want_nocaseglob=no
23867+if test "$build" = "$host"; then
23868+ case $host_os in
23869+ mingw* | pw32*)
23870+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
23871+ want_nocaseglob=yes
23872+ else
23873+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
23874+ fi
23875+ ;;
23876+ esac
23877+fi
23878+
23879 file_magic_cmd=$lt_cv_file_magic_cmd
23880 deplibs_check_method=$lt_cv_deplibs_check_method
23881 test -z "$deplibs_check_method" && deplibs_check_method=unknown
23882@@ -3225,7 +3382,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
23883 _LT_DECL([], [deplibs_check_method], [1],
23884 [Method to check whether dependent libraries are shared objects])
23885 _LT_DECL([], [file_magic_cmd], [1],
23886- [Command to use when deplibs_check_method == "file_magic"])
23887+ [Command to use when deplibs_check_method = "file_magic"])
23888+_LT_DECL([], [file_magic_glob], [1],
23889+ [How to find potential files when deplibs_check_method = "file_magic"])
23890+_LT_DECL([], [want_nocaseglob], [1],
23891+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
23892 ])# _LT_CHECK_MAGIC_METHOD
23893
23894
23895@@ -3336,6 +3497,67 @@ dnl aclocal-1.4 backwards compatibility:
23896 dnl AC_DEFUN([AM_PROG_NM], [])
23897 dnl AC_DEFUN([AC_PROG_NM], [])
23898
23899+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
23900+# --------------------------------
23901+# how to determine the name of the shared library
23902+# associated with a specific link library.
23903+# -- PORTME fill in with the dynamic library characteristics
23904+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
23905+[m4_require([_LT_DECL_EGREP])
23906+m4_require([_LT_DECL_OBJDUMP])
23907+m4_require([_LT_DECL_DLLTOOL])
23908+AC_CACHE_CHECK([how to associate runtime and link libraries],
23909+lt_cv_sharedlib_from_linklib_cmd,
23910+[lt_cv_sharedlib_from_linklib_cmd='unknown'
23911+
23912+case $host_os in
23913+cygwin* | mingw* | pw32* | cegcc*)
23914+ # two different shell functions defined in ltmain.sh
23915+ # decide which to use based on capabilities of $DLLTOOL
23916+ case `$DLLTOOL --help 2>&1` in
23917+ *--identify-strict*)
23918+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
23919+ ;;
23920+ *)
23921+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
23922+ ;;
23923+ esac
23924+ ;;
23925+*)
23926+ # fallback: assume linklib IS sharedlib
23927+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
23928+ ;;
23929+esac
23930+])
23931+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
23932+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
23933+
23934+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
23935+ [Command to associate shared and link libraries])
23936+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
23937+
23938+
23939+# _LT_PATH_MANIFEST_TOOL
23940+# ----------------------
23941+# locate the manifest tool
23942+m4_defun([_LT_PATH_MANIFEST_TOOL],
23943+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
23944+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
23945+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
23946+ [lt_cv_path_mainfest_tool=no
23947+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
23948+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
23949+ cat conftest.err >&AS_MESSAGE_LOG_FD
23950+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
23951+ lt_cv_path_mainfest_tool=yes
23952+ fi
23953+ rm -f conftest*])
23954+if test "x$lt_cv_path_mainfest_tool" != xyes; then
23955+ MANIFEST_TOOL=:
23956+fi
23957+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
23958+])# _LT_PATH_MANIFEST_TOOL
23959+
23960
23961 # LT_LIB_M
23962 # --------
23963@@ -3462,8 +3684,8 @@ esac
23964 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
23965
23966 # Transform an extracted symbol line into symbol name and symbol address
23967-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
23968-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'"
23969+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
23970+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'"
23971
23972 # Handle CRLF in mingw tool chain
23973 opt_cr=
23974@@ -3499,6 +3721,7 @@ for ac_symprfx in "" "_"; do
23975 else
23976 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
23977 fi
23978+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
23979
23980 # Check to see that the pipe works correctly.
23981 pipe_works=no
23982@@ -3532,6 +3755,18 @@ _LT_EOF
23983 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
23984 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
23985 cat <<_LT_EOF > conftest.$ac_ext
23986+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
23987+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
23988+/* DATA imports from DLLs on WIN32 con't be const, because runtime
23989+ relocations are performed -- see ld's documentation on pseudo-relocs. */
23990+# define LT@&t@_DLSYM_CONST
23991+#elif defined(__osf__)
23992+/* This system does not cope well with relocations in const data. */
23993+# define LT@&t@_DLSYM_CONST
23994+#else
23995+# define LT@&t@_DLSYM_CONST const
23996+#endif
23997+
23998 #ifdef __cplusplus
23999 extern "C" {
24000 #endif
24001@@ -3543,7 +3778,7 @@ _LT_EOF
24002 cat <<_LT_EOF >> conftest.$ac_ext
24003
24004 /* The mapping between symbol names and symbols. */
24005-const struct {
24006+LT@&t@_DLSYM_CONST struct {
24007 const char *name;
24008 void *address;
24009 }
24010@@ -3569,15 +3804,15 @@ static const void *lt_preloaded_setup() {
24011 _LT_EOF
24012 # Now try linking the two files.
24013 mv conftest.$ac_objext conftstm.$ac_objext
24014- lt_save_LIBS="$LIBS"
24015- lt_save_CFLAGS="$CFLAGS"
24016+ lt_globsym_save_LIBS=$LIBS
24017+ lt_globsym_save_CFLAGS=$CFLAGS
24018 LIBS="conftstm.$ac_objext"
24019 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
24020 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
24021 pipe_works=yes
24022 fi
24023- LIBS="$lt_save_LIBS"
24024- CFLAGS="$lt_save_CFLAGS"
24025+ LIBS=$lt_globsym_save_LIBS
24026+ CFLAGS=$lt_globsym_save_CFLAGS
24027 else
24028 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
24029 fi
24030@@ -3610,6 +3845,13 @@ else
24031 AC_MSG_RESULT(ok)
24032 fi
24033
24034+# Response file support.
24035+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
24036+ nm_file_list_spec='@'
24037+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
24038+ nm_file_list_spec='@'
24039+fi
24040+
24041 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
24042 [Take the output of nm and produce a listing of raw symbols and C names])
24043 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
24044@@ -3620,6 +3862,8 @@ _LT_DECL([global_symbol_to_c_name_address],
24045 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
24046 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
24047 [Transform the output of nm in a C name address pair when lib prefix is needed])
24048+_LT_DECL([], [nm_file_list_spec], [1],
24049+ [Specify filename containing input files for $NM])
24050 ]) # _LT_CMD_GLOBAL_SYMBOLS
24051
24052
24053@@ -3631,7 +3875,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
24054 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
24055 _LT_TAGVAR(lt_prog_compiler_static, $1)=
24056
24057-AC_MSG_CHECKING([for $compiler option to produce PIC])
24058 m4_if([$1], [CXX], [
24059 # C++ specific cases for pic, static, wl, etc.
24060 if test "$GXX" = yes; then
24061@@ -3737,6 +3980,12 @@ m4_if([$1], [CXX], [
24062 ;;
24063 esac
24064 ;;
24065+ mingw* | cygwin* | os2* | pw32* | cegcc*)
24066+ # This hack is so that the source file can tell whether it is being
24067+ # built for inclusion in a dll (and should export symbols for example).
24068+ m4_if([$1], [GCJ], [],
24069+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
24070+ ;;
24071 dgux*)
24072 case $cc_basename in
24073 ec++*)
24074@@ -3889,7 +4138,7 @@ m4_if([$1], [CXX], [
24075 ;;
24076 solaris*)
24077 case $cc_basename in
24078- CC*)
24079+ CC* | sunCC*)
24080 # Sun C++ 4.2, 5.x and Centerline C++
24081 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
24082 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
24083@@ -4112,6 +4361,12 @@ m4_if([$1], [CXX], [
24084 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
24085 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
24086 ;;
24087+ nagfor*)
24088+ # NAG Fortran compiler
24089+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
24090+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
24091+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
24092+ ;;
24093 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
24094 # Portland Group compilers (*not* the Pentium gcc compiler,
24095 # which looks to be a dead project)
24096@@ -4174,7 +4429,7 @@ m4_if([$1], [CXX], [
24097 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
24098 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
24099 case $cc_basename in
24100- f77* | f90* | f95*)
24101+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
24102 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
24103 *)
24104 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
24105@@ -4231,9 +4486,11 @@ case $host_os in
24106 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
24107 ;;
24108 esac
24109-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
24110-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
24111- [How to pass a linker flag through the compiler])
24112+
24113+AC_CACHE_CHECK([for $compiler option to produce PIC],
24114+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
24115+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
24116+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
24117
24118 #
24119 # Check to make sure the PIC flag actually works.
24120@@ -4252,6 +4509,8 @@ fi
24121 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
24122 [Additional compiler flags for building library objects])
24123
24124+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
24125+ [How to pass a linker flag through the compiler])
24126 #
24127 # Check to make sure the static flag actually works.
24128 #
24129@@ -4272,6 +4531,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
24130 m4_defun([_LT_LINKER_SHLIBS],
24131 [AC_REQUIRE([LT_PATH_LD])dnl
24132 AC_REQUIRE([LT_PATH_NM])dnl
24133+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
24134 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
24135 m4_require([_LT_DECL_EGREP])dnl
24136 m4_require([_LT_DECL_SED])dnl
24137@@ -4280,6 +4540,7 @@ m4_require([_LT_TAG_COMPILER])dnl
24138 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
24139 m4_if([$1], [CXX], [
24140 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
24141+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
24142 case $host_os in
24143 aix[[4-9]]*)
24144 # If we're using GNU nm, then we don't want the "-C" option.
24145@@ -4294,15 +4555,20 @@ m4_if([$1], [CXX], [
24146 ;;
24147 pw32*)
24148 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
24149- ;;
24150+ ;;
24151 cygwin* | mingw* | cegcc*)
24152- _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'
24153- ;;
24154+ case $cc_basename in
24155+ cl*) ;;
24156+ *)
24157+ _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'
24158+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
24159+ ;;
24160+ esac
24161+ ;;
24162 *)
24163 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
24164- ;;
24165+ ;;
24166 esac
24167- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
24168 ], [
24169 runpath_var=
24170 _LT_TAGVAR(allow_undefined_flag, $1)=
24171@@ -4470,7 +4736,8 @@ _LT_EOF
24172 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24173 _LT_TAGVAR(always_export_symbols, $1)=no
24174 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24175- _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'
24176+ _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'
24177+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
24178
24179 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
24180 _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'
24181@@ -4569,12 +4836,12 @@ _LT_EOF
24182 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
24183 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
24184 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
24185- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
24186+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
24187 if test "x$supports_anon_versioning" = xyes; then
24188 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
24189 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
24190 echo "local: *; };" >> $output_objdir/$libname.ver~
24191- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
24192+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
24193 fi
24194 ;;
24195 esac
24196@@ -4588,8 +4855,8 @@ _LT_EOF
24197 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
24198 wlarc=
24199 else
24200- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24201- _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'
24202+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24203+ _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'
24204 fi
24205 ;;
24206
24207@@ -4607,8 +4874,8 @@ _LT_EOF
24208
24209 _LT_EOF
24210 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
24211- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24212- _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'
24213+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24214+ _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'
24215 else
24216 _LT_TAGVAR(ld_shlibs, $1)=no
24217 fi
24218@@ -4654,8 +4921,8 @@ _LT_EOF
24219
24220 *)
24221 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
24222- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24223- _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'
24224+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
24225+ _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'
24226 else
24227 _LT_TAGVAR(ld_shlibs, $1)=no
24228 fi
24229@@ -4785,7 +5052,7 @@ _LT_EOF
24230 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
24231 # Determine the default libpath from the value encoded in an
24232 # empty executable.
24233- _LT_SYS_MODULE_PATH_AIX
24234+ _LT_SYS_MODULE_PATH_AIX([$1])
24235 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24236 _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"
24237 else
24238@@ -4796,7 +5063,7 @@ _LT_EOF
24239 else
24240 # Determine the default libpath from the value encoded in an
24241 # empty executable.
24242- _LT_SYS_MODULE_PATH_AIX
24243+ _LT_SYS_MODULE_PATH_AIX([$1])
24244 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24245 # Warning - without using the other run time loading flags,
24246 # -berok will link without error, but may produce a broken library.
24247@@ -4840,20 +5107,63 @@ _LT_EOF
24248 # Microsoft Visual C++.
24249 # hardcode_libdir_flag_spec is actually meaningless, as there is
24250 # no search path for DLLs.
24251- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
24252- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24253- # Tell ltmain to make .lib files, not .a files.
24254- libext=lib
24255- # Tell ltmain to make .dll files, not .so files.
24256- shrext_cmds=".dll"
24257- # FIXME: Setting linknames here is a bad hack.
24258- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
24259- # The linker will automatically build a .lib file if we build a DLL.
24260- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
24261- # FIXME: Should let the user specify the lib program.
24262- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
24263- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
24264- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24265+ case $cc_basename in
24266+ cl*)
24267+ # Native MSVC
24268+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
24269+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24270+ _LT_TAGVAR(always_export_symbols, $1)=yes
24271+ _LT_TAGVAR(file_list_spec, $1)='@'
24272+ # Tell ltmain to make .lib files, not .a files.
24273+ libext=lib
24274+ # Tell ltmain to make .dll files, not .so files.
24275+ shrext_cmds=".dll"
24276+ # FIXME: Setting linknames here is a bad hack.
24277+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
24278+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
24279+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
24280+ else
24281+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
24282+ fi~
24283+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
24284+ linknames='
24285+ # The linker will not automatically build a static lib if we build a DLL.
24286+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
24287+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24288+ _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'
24289+ # Don't use ranlib
24290+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
24291+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
24292+ lt_tool_outputfile="@TOOL_OUTPUT@"~
24293+ case $lt_outputfile in
24294+ *.exe|*.EXE) ;;
24295+ *)
24296+ lt_outputfile="$lt_outputfile.exe"
24297+ lt_tool_outputfile="$lt_tool_outputfile.exe"
24298+ ;;
24299+ esac~
24300+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
24301+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
24302+ $RM "$lt_outputfile.manifest";
24303+ fi'
24304+ ;;
24305+ *)
24306+ # Assume MSVC wrapper
24307+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
24308+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24309+ # Tell ltmain to make .lib files, not .a files.
24310+ libext=lib
24311+ # Tell ltmain to make .dll files, not .so files.
24312+ shrext_cmds=".dll"
24313+ # FIXME: Setting linknames here is a bad hack.
24314+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
24315+ # The linker will automatically build a .lib file if we build a DLL.
24316+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
24317+ # FIXME: Should let the user specify the lib program.
24318+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
24319+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24320+ ;;
24321+ esac
24322 ;;
24323
24324 darwin* | rhapsody*)
24325@@ -4887,7 +5197,7 @@ _LT_EOF
24326
24327 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
24328 freebsd* | dragonfly*)
24329- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
24330+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
24331 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
24332 _LT_TAGVAR(hardcode_direct, $1)=yes
24333 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
24334@@ -4895,7 +5205,7 @@ _LT_EOF
24335
24336 hpux9*)
24337 if test "$GCC" = yes; then
24338- _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'
24339+ _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'
24340 else
24341 _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'
24342 fi
24343@@ -4911,7 +5221,7 @@ _LT_EOF
24344
24345 hpux10*)
24346 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
24347- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
24348+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
24349 else
24350 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
24351 fi
24352@@ -4935,10 +5245,10 @@ _LT_EOF
24353 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
24354 ;;
24355 ia64*)
24356- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
24357+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
24358 ;;
24359 *)
24360- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
24361+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
24362 ;;
24363 esac
24364 else
24365@@ -4985,16 +5295,31 @@ _LT_EOF
24366
24367 irix5* | irix6* | nonstopux*)
24368 if test "$GCC" = yes; then
24369- _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'
24370+ _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'
24371 # Try to use the -exported_symbol ld option, if it does not
24372 # work, assume that -exports_file does not work either and
24373 # implicitly export all symbols.
24374- save_LDFLAGS="$LDFLAGS"
24375- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
24376- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
24377- _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'
24378- )
24379- LDFLAGS="$save_LDFLAGS"
24380+ # This should be the same for all languages, so no per-tag cache variable.
24381+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
24382+ [lt_cv_irix_exported_symbol],
24383+ [save_LDFLAGS="$LDFLAGS"
24384+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
24385+ AC_LINK_IFELSE(
24386+ [AC_LANG_SOURCE(
24387+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
24388+ [C++], [[int foo (void) { return 0; }]],
24389+ [Fortran 77], [[
24390+ subroutine foo
24391+ end]],
24392+ [Fortran], [[
24393+ subroutine foo
24394+ end]])])],
24395+ [lt_cv_irix_exported_symbol=yes],
24396+ [lt_cv_irix_exported_symbol=no])
24397+ LDFLAGS="$save_LDFLAGS"])
24398+ if test "$lt_cv_irix_exported_symbol" = yes; then
24399+ _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'
24400+ fi
24401 else
24402 _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'
24403 _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'
24404@@ -5079,7 +5404,7 @@ _LT_EOF
24405 osf4* | osf5*) # as osf3* with the addition of -msym flag
24406 if test "$GCC" = yes; then
24407 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
24408- _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'
24409+ _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'
24410 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
24411 else
24412 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
24413@@ -5098,9 +5423,9 @@ _LT_EOF
24414 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
24415 if test "$GCC" = yes; then
24416 wlarc='${wl}'
24417- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
24418+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
24419 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
24420- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
24421+ $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'
24422 else
24423 case `$CC -V 2>&1` in
24424 *"Compilers 5.0"*)
24425@@ -5372,8 +5697,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
24426 to runtime path list])
24427 _LT_TAGDECL([], [link_all_deplibs], [0],
24428 [Whether libtool must link a program against all its dependency libraries])
24429-_LT_TAGDECL([], [fix_srcfile_path], [1],
24430- [Fix the shell variable $srcfile for the compiler])
24431 _LT_TAGDECL([], [always_export_symbols], [0],
24432 [Set to "yes" if exported symbols are required])
24433 _LT_TAGDECL([], [export_symbols_cmds], [2],
24434@@ -5384,6 +5707,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
24435 [Symbols that must always be exported])
24436 _LT_TAGDECL([], [prelink_cmds], [2],
24437 [Commands necessary for linking programs (against libraries) with templates])
24438+_LT_TAGDECL([], [postlink_cmds], [2],
24439+ [Commands necessary for finishing linking programs])
24440 _LT_TAGDECL([], [file_list_spec], [1],
24441 [Specify filename containing input files])
24442 dnl FIXME: Not yet implemented
24443@@ -5485,6 +5810,7 @@ CC="$lt_save_CC"
24444 m4_defun([_LT_LANG_CXX_CONFIG],
24445 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
24446 m4_require([_LT_DECL_EGREP])dnl
24447+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
24448 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
24449 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
24450 (test "X$CXX" != "Xg++"))) ; then
24451@@ -5546,6 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24452
24453 # Allow CC to be a program name with arguments.
24454 lt_save_CC=$CC
24455+ lt_save_CFLAGS=$CFLAGS
24456 lt_save_LD=$LD
24457 lt_save_GCC=$GCC
24458 GCC=$GXX
24459@@ -5563,6 +5890,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24460 fi
24461 test -z "${LDCXX+set}" || LD=$LDCXX
24462 CC=${CXX-"c++"}
24463+ CFLAGS=$CXXFLAGS
24464 compiler=$CC
24465 _LT_TAGVAR(compiler, $1)=$CC
24466 _LT_CC_BASENAME([$compiler])
24467@@ -5726,7 +6054,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24468 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
24469 # Determine the default libpath from the value encoded in an empty
24470 # executable.
24471- _LT_SYS_MODULE_PATH_AIX
24472+ _LT_SYS_MODULE_PATH_AIX([$1])
24473 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24474
24475 _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"
24476@@ -5738,7 +6066,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24477 else
24478 # Determine the default libpath from the value encoded in an
24479 # empty executable.
24480- _LT_SYS_MODULE_PATH_AIX
24481+ _LT_SYS_MODULE_PATH_AIX([$1])
24482 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24483 # Warning - without using the other run time loading flags,
24484 # -berok will link without error, but may produce a broken library.
24485@@ -5780,29 +6108,75 @@ if test "$_lt_caught_CXX_error" != yes; then
24486 ;;
24487
24488 cygwin* | mingw* | pw32* | cegcc*)
24489- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
24490- # as there is no search path for DLLs.
24491- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
24492- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
24493- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24494- _LT_TAGVAR(always_export_symbols, $1)=no
24495- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24496-
24497- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
24498- _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'
24499- # If the export-symbols file already is a .def file (1st line
24500- # is EXPORTS), use it as is; otherwise, prepend...
24501- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
24502- cp $export_symbols $output_objdir/$soname.def;
24503- else
24504- echo EXPORTS > $output_objdir/$soname.def;
24505- cat $export_symbols >> $output_objdir/$soname.def;
24506- fi~
24507- $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'
24508- else
24509- _LT_TAGVAR(ld_shlibs, $1)=no
24510- fi
24511- ;;
24512+ case $GXX,$cc_basename in
24513+ ,cl* | no,cl*)
24514+ # Native MSVC
24515+ # hardcode_libdir_flag_spec is actually meaningless, as there is
24516+ # no search path for DLLs.
24517+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
24518+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24519+ _LT_TAGVAR(always_export_symbols, $1)=yes
24520+ _LT_TAGVAR(file_list_spec, $1)='@'
24521+ # Tell ltmain to make .lib files, not .a files.
24522+ libext=lib
24523+ # Tell ltmain to make .dll files, not .so files.
24524+ shrext_cmds=".dll"
24525+ # FIXME: Setting linknames here is a bad hack.
24526+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
24527+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
24528+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
24529+ else
24530+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
24531+ fi~
24532+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
24533+ linknames='
24534+ # The linker will not automatically build a static lib if we build a DLL.
24535+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
24536+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24537+ # Don't use ranlib
24538+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
24539+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
24540+ lt_tool_outputfile="@TOOL_OUTPUT@"~
24541+ case $lt_outputfile in
24542+ *.exe|*.EXE) ;;
24543+ *)
24544+ lt_outputfile="$lt_outputfile.exe"
24545+ lt_tool_outputfile="$lt_tool_outputfile.exe"
24546+ ;;
24547+ esac~
24548+ func_to_tool_file "$lt_outputfile"~
24549+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
24550+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
24551+ $RM "$lt_outputfile.manifest";
24552+ fi'
24553+ ;;
24554+ *)
24555+ # g++
24556+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
24557+ # as there is no search path for DLLs.
24558+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
24559+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
24560+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24561+ _LT_TAGVAR(always_export_symbols, $1)=no
24562+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
24563+
24564+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
24565+ _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'
24566+ # If the export-symbols file already is a .def file (1st line
24567+ # is EXPORTS), use it as is; otherwise, prepend...
24568+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
24569+ cp $export_symbols $output_objdir/$soname.def;
24570+ else
24571+ echo EXPORTS > $output_objdir/$soname.def;
24572+ cat $export_symbols >> $output_objdir/$soname.def;
24573+ fi~
24574+ $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'
24575+ else
24576+ _LT_TAGVAR(ld_shlibs, $1)=no
24577+ fi
24578+ ;;
24579+ esac
24580+ ;;
24581 darwin* | rhapsody*)
24582 _LT_DARWIN_LINKER_FEATURES($1)
24583 ;;
24584@@ -5877,7 +6251,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24585 ;;
24586 *)
24587 if test "$GXX" = yes; then
24588- _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'
24589+ _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'
24590 else
24591 # FIXME: insert proper C++ library support
24592 _LT_TAGVAR(ld_shlibs, $1)=no
24593@@ -5948,10 +6322,10 @@ if test "$_lt_caught_CXX_error" != yes; then
24594 _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'
24595 ;;
24596 ia64*)
24597- _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'
24598+ _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'
24599 ;;
24600 *)
24601- _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'
24602+ _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'
24603 ;;
24604 esac
24605 fi
24606@@ -5992,9 +6366,9 @@ if test "$_lt_caught_CXX_error" != yes; then
24607 *)
24608 if test "$GXX" = yes; then
24609 if test "$with_gnu_ld" = no; then
24610- _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'
24611+ _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'
24612 else
24613- _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'
24614+ _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'
24615 fi
24616 fi
24617 _LT_TAGVAR(link_all_deplibs, $1)=yes
24618@@ -6272,7 +6646,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24619 _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'
24620 ;;
24621 *)
24622- _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'
24623+ _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'
24624 ;;
24625 esac
24626
24627@@ -6318,7 +6692,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24628
24629 solaris*)
24630 case $cc_basename in
24631- CC*)
24632+ CC* | sunCC*)
24633 # Sun C++ 4.2, 5.x and Centerline C++
24634 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
24635 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
24636@@ -6359,9 +6733,9 @@ if test "$_lt_caught_CXX_error" != yes; then
24637 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
24638 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
24639 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
24640- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
24641+ _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'
24642 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
24643- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
24644+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
24645
24646 # Commands to make compiler produce verbose output that lists
24647 # what "hidden" libraries, object files and flags are used when
24648@@ -6491,6 +6865,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24649 fi # test -n "$compiler"
24650
24651 CC=$lt_save_CC
24652+ CFLAGS=$lt_save_CFLAGS
24653 LDCXX=$LD
24654 LD=$lt_save_LD
24655 GCC=$lt_save_GCC
24656@@ -6505,6 +6880,29 @@ AC_LANG_POP
24657 ])# _LT_LANG_CXX_CONFIG
24658
24659
24660+# _LT_FUNC_STRIPNAME_CNF
24661+# ----------------------
24662+# func_stripname_cnf prefix suffix name
24663+# strip PREFIX and SUFFIX off of NAME.
24664+# PREFIX and SUFFIX must not contain globbing or regex special
24665+# characters, hashes, percent signs, but SUFFIX may contain a leading
24666+# dot (in which case that matches only a dot).
24667+#
24668+# This function is identical to the (non-XSI) version of func_stripname,
24669+# except this one can be used by m4 code that may be executed by configure,
24670+# rather than the libtool script.
24671+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
24672+AC_REQUIRE([_LT_DECL_SED])
24673+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
24674+func_stripname_cnf ()
24675+{
24676+ case ${2} in
24677+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
24678+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
24679+ esac
24680+} # func_stripname_cnf
24681+])# _LT_FUNC_STRIPNAME_CNF
24682+
24683 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
24684 # ---------------------------------
24685 # Figure out "hidden" library dependencies from verbose
24686@@ -6513,6 +6911,7 @@ AC_LANG_POP
24687 # objects, libraries and library flags.
24688 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
24689 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
24690+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
24691 # Dependencies to place before and after the object being linked:
24692 _LT_TAGVAR(predep_objects, $1)=
24693 _LT_TAGVAR(postdep_objects, $1)=
24694@@ -6563,6 +6962,13 @@ public class foo {
24695 };
24696 _LT_EOF
24697 ])
24698+
24699+_lt_libdeps_save_CFLAGS=$CFLAGS
24700+case "$CC $CFLAGS " in #(
24701+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
24702+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
24703+esac
24704+
24705 dnl Parse the compiler output and extract the necessary
24706 dnl objects, libraries and library flags.
24707 if AC_TRY_EVAL(ac_compile); then
24708@@ -6574,7 +6980,7 @@ if AC_TRY_EVAL(ac_compile); then
24709 pre_test_object_deps_done=no
24710
24711 for p in `eval "$output_verbose_link_cmd"`; do
24712- case $p in
24713+ case ${prev}${p} in
24714
24715 -L* | -R* | -l*)
24716 # Some compilers place space between "-{L,R}" and the path.
24717@@ -6583,13 +6989,22 @@ if AC_TRY_EVAL(ac_compile); then
24718 test $p = "-R"; then
24719 prev=$p
24720 continue
24721- else
24722- prev=
24723 fi
24724
24725+ # Expand the sysroot to ease extracting the directories later.
24726+ if test -z "$prev"; then
24727+ case $p in
24728+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
24729+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
24730+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
24731+ esac
24732+ fi
24733+ case $p in
24734+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
24735+ esac
24736 if test "$pre_test_object_deps_done" = no; then
24737- case $p in
24738- -L* | -R*)
24739+ case ${prev} in
24740+ -L | -R)
24741 # Internal compiler library paths should come after those
24742 # provided the user. The postdeps already come after the
24743 # user supplied libs so there is no need to process them.
24744@@ -6609,8 +7024,10 @@ if AC_TRY_EVAL(ac_compile); then
24745 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
24746 fi
24747 fi
24748+ prev=
24749 ;;
24750
24751+ *.lto.$objext) ;; # Ignore GCC LTO objects
24752 *.$objext)
24753 # This assumes that the test object file only shows up
24754 # once in the compiler output.
24755@@ -6646,6 +7063,7 @@ else
24756 fi
24757
24758 $RM -f confest.$objext
24759+CFLAGS=$_lt_libdeps_save_CFLAGS
24760
24761 # PORTME: override above test on systems where it is broken
24762 m4_if([$1], [CXX],
24763@@ -6682,7 +7100,7 @@ linux*)
24764
24765 solaris*)
24766 case $cc_basename in
24767- CC*)
24768+ CC* | sunCC*)
24769 # The more standards-conforming stlport4 library is
24770 # incompatible with the Cstd library. Avoid specifying
24771 # it if it's in CXXFLAGS. Ignore libCrun as
24772@@ -6795,7 +7213,9 @@ if test "$_lt_disable_F77" != yes; then
24773 # Allow CC to be a program name with arguments.
24774 lt_save_CC="$CC"
24775 lt_save_GCC=$GCC
24776+ lt_save_CFLAGS=$CFLAGS
24777 CC=${F77-"f77"}
24778+ CFLAGS=$FFLAGS
24779 compiler=$CC
24780 _LT_TAGVAR(compiler, $1)=$CC
24781 _LT_CC_BASENAME([$compiler])
24782@@ -6849,6 +7269,7 @@ if test "$_lt_disable_F77" != yes; then
24783
24784 GCC=$lt_save_GCC
24785 CC="$lt_save_CC"
24786+ CFLAGS="$lt_save_CFLAGS"
24787 fi # test "$_lt_disable_F77" != yes
24788
24789 AC_LANG_POP
24790@@ -6925,7 +7346,9 @@ if test "$_lt_disable_FC" != yes; then
24791 # Allow CC to be a program name with arguments.
24792 lt_save_CC="$CC"
24793 lt_save_GCC=$GCC
24794+ lt_save_CFLAGS=$CFLAGS
24795 CC=${FC-"f95"}
24796+ CFLAGS=$FCFLAGS
24797 compiler=$CC
24798 GCC=$ac_cv_fc_compiler_gnu
24799
24800@@ -6981,7 +7404,8 @@ if test "$_lt_disable_FC" != yes; then
24801 fi # test -n "$compiler"
24802
24803 GCC=$lt_save_GCC
24804- CC="$lt_save_CC"
24805+ CC=$lt_save_CC
24806+ CFLAGS=$lt_save_CFLAGS
24807 fi # test "$_lt_disable_FC" != yes
24808
24809 AC_LANG_POP
24810@@ -7018,10 +7442,12 @@ _LT_COMPILER_BOILERPLATE
24811 _LT_LINKER_BOILERPLATE
24812
24813 # Allow CC to be a program name with arguments.
24814-lt_save_CC="$CC"
24815+lt_save_CC=$CC
24816+lt_save_CFLAGS=$CFLAGS
24817 lt_save_GCC=$GCC
24818 GCC=yes
24819 CC=${GCJ-"gcj"}
24820+CFLAGS=$GCJFLAGS
24821 compiler=$CC
24822 _LT_TAGVAR(compiler, $1)=$CC
24823 _LT_TAGVAR(LD, $1)="$LD"
24824@@ -7052,7 +7478,8 @@ fi
24825 AC_LANG_RESTORE
24826
24827 GCC=$lt_save_GCC
24828-CC="$lt_save_CC"
24829+CC=$lt_save_CC
24830+CFLAGS=$lt_save_CFLAGS
24831 ])# _LT_LANG_GCJ_CONFIG
24832
24833
24834@@ -7087,9 +7514,11 @@ _LT_LINKER_BOILERPLATE
24835
24836 # Allow CC to be a program name with arguments.
24837 lt_save_CC="$CC"
24838+lt_save_CFLAGS=$CFLAGS
24839 lt_save_GCC=$GCC
24840 GCC=
24841 CC=${RC-"windres"}
24842+CFLAGS=
24843 compiler=$CC
24844 _LT_TAGVAR(compiler, $1)=$CC
24845 _LT_CC_BASENAME([$compiler])
24846@@ -7102,7 +7531,8 @@ fi
24847
24848 GCC=$lt_save_GCC
24849 AC_LANG_RESTORE
24850-CC="$lt_save_CC"
24851+CC=$lt_save_CC
24852+CFLAGS=$lt_save_CFLAGS
24853 ])# _LT_LANG_RC_CONFIG
24854
24855
24856@@ -7161,6 +7591,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
24857 AC_SUBST([OBJDUMP])
24858 ])
24859
24860+# _LT_DECL_DLLTOOL
24861+# ----------------
24862+# Ensure DLLTOOL variable is set.
24863+m4_defun([_LT_DECL_DLLTOOL],
24864+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
24865+test -z "$DLLTOOL" && DLLTOOL=dlltool
24866+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
24867+AC_SUBST([DLLTOOL])
24868+])
24869
24870 # _LT_DECL_SED
24871 # ------------
24872@@ -7254,8 +7693,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
24873 # Try some XSI features
24874 xsi_shell=no
24875 ( _lt_dummy="a/b/c"
24876- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
24877- = c,a/b,, \
24878+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
24879+ = c,a/b,b/c, \
24880 && eval 'test $(( 1 + 1 )) -eq 2 \
24881 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
24882 && xsi_shell=yes
24883@@ -7294,206 +7733,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
24884 ])# _LT_CHECK_SHELL_FEATURES
24885
24886
24887-# _LT_PROG_XSI_SHELLFNS
24888-# ---------------------
24889-# Bourne and XSI compatible variants of some useful shell functions.
24890-m4_defun([_LT_PROG_XSI_SHELLFNS],
24891-[case $xsi_shell in
24892- yes)
24893- cat << \_LT_EOF >> "$cfgfile"
24894-
24895-# func_dirname file append nondir_replacement
24896-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
24897-# otherwise set result to NONDIR_REPLACEMENT.
24898-func_dirname ()
24899-{
24900- case ${1} in
24901- */*) func_dirname_result="${1%/*}${2}" ;;
24902- * ) func_dirname_result="${3}" ;;
24903- esac
24904-}
24905-
24906-# func_basename file
24907-func_basename ()
24908-{
24909- func_basename_result="${1##*/}"
24910-}
24911-
24912-# func_dirname_and_basename file append nondir_replacement
24913-# perform func_basename and func_dirname in a single function
24914-# call:
24915-# dirname: Compute the dirname of FILE. If nonempty,
24916-# add APPEND to the result, otherwise set result
24917-# to NONDIR_REPLACEMENT.
24918-# value returned in "$func_dirname_result"
24919-# basename: Compute filename of FILE.
24920-# value retuned in "$func_basename_result"
24921-# Implementation must be kept synchronized with func_dirname
24922-# and func_basename. For efficiency, we do not delegate to
24923-# those functions but instead duplicate the functionality here.
24924-func_dirname_and_basename ()
24925-{
24926- case ${1} in
24927- */*) func_dirname_result="${1%/*}${2}" ;;
24928- * ) func_dirname_result="${3}" ;;
24929- esac
24930- func_basename_result="${1##*/}"
24931-}
24932-
24933-# func_stripname prefix suffix name
24934-# strip PREFIX and SUFFIX off of NAME.
24935-# PREFIX and SUFFIX must not contain globbing or regex special
24936-# characters, hashes, percent signs, but SUFFIX may contain a leading
24937-# dot (in which case that matches only a dot).
24938-func_stripname ()
24939-{
24940- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
24941- # positional parameters, so assign one to ordinary parameter first.
24942- func_stripname_result=${3}
24943- func_stripname_result=${func_stripname_result#"${1}"}
24944- func_stripname_result=${func_stripname_result%"${2}"}
24945-}
24946-
24947-# func_opt_split
24948-func_opt_split ()
24949-{
24950- func_opt_split_opt=${1%%=*}
24951- func_opt_split_arg=${1#*=}
24952-}
24953-
24954-# func_lo2o object
24955-func_lo2o ()
24956-{
24957- case ${1} in
24958- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
24959- *) func_lo2o_result=${1} ;;
24960- esac
24961-}
24962-
24963-# func_xform libobj-or-source
24964-func_xform ()
24965-{
24966- func_xform_result=${1%.*}.lo
24967-}
24968-
24969-# func_arith arithmetic-term...
24970-func_arith ()
24971-{
24972- func_arith_result=$(( $[*] ))
24973-}
24974-
24975-# func_len string
24976-# STRING may not start with a hyphen.
24977-func_len ()
24978-{
24979- func_len_result=${#1}
24980-}
24981+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
24982+# ------------------------------------------------------
24983+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
24984+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
24985+m4_defun([_LT_PROG_FUNCTION_REPLACE],
24986+[dnl {
24987+sed -e '/^$1 ()$/,/^} # $1 /c\
24988+$1 ()\
24989+{\
24990+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
24991+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
24992+ && mv -f "$cfgfile.tmp" "$cfgfile" \
24993+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
24994+test 0 -eq $? || _lt_function_replace_fail=:
24995+])
24996
24997-_LT_EOF
24998- ;;
24999- *) # Bourne compatible functions.
25000- cat << \_LT_EOF >> "$cfgfile"
25001
25002-# func_dirname file append nondir_replacement
25003-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
25004-# otherwise set result to NONDIR_REPLACEMENT.
25005-func_dirname ()
25006-{
25007- # Extract subdirectory from the argument.
25008- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
25009- if test "X$func_dirname_result" = "X${1}"; then
25010- func_dirname_result="${3}"
25011- else
25012- func_dirname_result="$func_dirname_result${2}"
25013- fi
25014-}
25015+# _LT_PROG_REPLACE_SHELLFNS
25016+# -------------------------
25017+# Replace existing portable implementations of several shell functions with
25018+# equivalent extended shell implementations where those features are available..
25019+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
25020+[if test x"$xsi_shell" = xyes; then
25021+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
25022+ case ${1} in
25023+ */*) func_dirname_result="${1%/*}${2}" ;;
25024+ * ) func_dirname_result="${3}" ;;
25025+ esac])
25026+
25027+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
25028+ func_basename_result="${1##*/}"])
25029+
25030+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
25031+ case ${1} in
25032+ */*) func_dirname_result="${1%/*}${2}" ;;
25033+ * ) func_dirname_result="${3}" ;;
25034+ esac
25035+ func_basename_result="${1##*/}"])
25036
25037-# func_basename file
25038-func_basename ()
25039-{
25040- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
25041-}
25042+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
25043+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
25044+ # positional parameters, so assign one to ordinary parameter first.
25045+ func_stripname_result=${3}
25046+ func_stripname_result=${func_stripname_result#"${1}"}
25047+ func_stripname_result=${func_stripname_result%"${2}"}])
25048
25049-dnl func_dirname_and_basename
25050-dnl A portable version of this function is already defined in general.m4sh
25051-dnl so there is no need for it here.
25052+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
25053+ func_split_long_opt_name=${1%%=*}
25054+ func_split_long_opt_arg=${1#*=}])
25055
25056-# func_stripname prefix suffix name
25057-# strip PREFIX and SUFFIX off of NAME.
25058-# PREFIX and SUFFIX must not contain globbing or regex special
25059-# characters, hashes, percent signs, but SUFFIX may contain a leading
25060-# dot (in which case that matches only a dot).
25061-# func_strip_suffix prefix name
25062-func_stripname ()
25063-{
25064- case ${2} in
25065- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
25066- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
25067- esac
25068-}
25069+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
25070+ func_split_short_opt_arg=${1#??}
25071+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
25072
25073-# sed scripts:
25074-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
25075-my_sed_long_arg='1s/^-[[^=]]*=//'
25076+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
25077+ case ${1} in
25078+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
25079+ *) func_lo2o_result=${1} ;;
25080+ esac])
25081
25082-# func_opt_split
25083-func_opt_split ()
25084-{
25085- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
25086- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
25087-}
25088+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
25089
25090-# func_lo2o object
25091-func_lo2o ()
25092-{
25093- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
25094-}
25095+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
25096
25097-# func_xform libobj-or-source
25098-func_xform ()
25099-{
25100- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
25101-}
25102+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
25103+fi
25104
25105-# func_arith arithmetic-term...
25106-func_arith ()
25107-{
25108- func_arith_result=`expr "$[@]"`
25109-}
25110+if test x"$lt_shell_append" = xyes; then
25111+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
25112
25113-# func_len string
25114-# STRING may not start with a hyphen.
25115-func_len ()
25116-{
25117- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
25118-}
25119+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
25120+ func_quote_for_eval "${2}"
25121+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
25122+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
25123
25124-_LT_EOF
25125-esac
25126+ # Save a `func_append' function call where possible by direct use of '+='
25127+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
25128+ && mv -f "$cfgfile.tmp" "$cfgfile" \
25129+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
25130+ test 0 -eq $? || _lt_function_replace_fail=:
25131+else
25132+ # Save a `func_append' function call even when '+=' is not available
25133+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
25134+ && mv -f "$cfgfile.tmp" "$cfgfile" \
25135+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
25136+ test 0 -eq $? || _lt_function_replace_fail=:
25137+fi
25138
25139-case $lt_shell_append in
25140- yes)
25141- cat << \_LT_EOF >> "$cfgfile"
25142+if test x"$_lt_function_replace_fail" = x":"; then
25143+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
25144+fi
25145+])
25146
25147-# func_append var value
25148-# Append VALUE to the end of shell variable VAR.
25149-func_append ()
25150-{
25151- eval "$[1]+=\$[2]"
25152-}
25153-_LT_EOF
25154+# _LT_PATH_CONVERSION_FUNCTIONS
25155+# -----------------------------
25156+# Determine which file name conversion functions should be used by
25157+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
25158+# for certain cross-compile configurations and native mingw.
25159+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
25160+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
25161+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
25162+AC_MSG_CHECKING([how to convert $build file names to $host format])
25163+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
25164+[case $host in
25165+ *-*-mingw* )
25166+ case $build in
25167+ *-*-mingw* ) # actually msys
25168+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
25169+ ;;
25170+ *-*-cygwin* )
25171+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
25172+ ;;
25173+ * ) # otherwise, assume *nix
25174+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
25175+ ;;
25176+ esac
25177 ;;
25178- *)
25179- cat << \_LT_EOF >> "$cfgfile"
25180-
25181-# func_append var value
25182-# Append VALUE to the end of shell variable VAR.
25183-func_append ()
25184-{
25185- eval "$[1]=\$$[1]\$[2]"
25186-}
25187-
25188-_LT_EOF
25189+ *-*-cygwin* )
25190+ case $build in
25191+ *-*-mingw* ) # actually msys
25192+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
25193+ ;;
25194+ *-*-cygwin* )
25195+ lt_cv_to_host_file_cmd=func_convert_file_noop
25196+ ;;
25197+ * ) # otherwise, assume *nix
25198+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
25199+ ;;
25200+ esac
25201 ;;
25202- esac
25203+ * ) # unhandled hosts (and "normal" native builds)
25204+ lt_cv_to_host_file_cmd=func_convert_file_noop
25205+ ;;
25206+esac
25207+])
25208+to_host_file_cmd=$lt_cv_to_host_file_cmd
25209+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
25210+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
25211+ [0], [convert $build file names to $host format])dnl
25212+
25213+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
25214+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
25215+[#assume ordinary cross tools, or native build.
25216+lt_cv_to_tool_file_cmd=func_convert_file_noop
25217+case $host in
25218+ *-*-mingw* )
25219+ case $build in
25220+ *-*-mingw* ) # actually msys
25221+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
25222+ ;;
25223+ esac
25224+ ;;
25225+esac
25226 ])
25227+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
25228+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
25229+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
25230+ [0], [convert $build files to toolchain format])dnl
25231+])# _LT_PATH_CONVERSION_FUNCTIONS
25232diff --git a/ltmain.sh b/ltmain.sh
25233index 70990740b6c..7f7104ffc82 100644
25234--- a/ltmain.sh
25235+++ b/ltmain.sh
25236@@ -1,10 +1,9 @@
25237-# Generated from ltmain.m4sh.
25238
25239-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
25240+# libtool (GNU libtool) 2.4
25241 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
25242
25243 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
25244-# 2007, 2008, 2009 Free Software Foundation, Inc.
25245+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
25246 # This is free software; see the source for copying conditions. There is NO
25247 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
25248
25249@@ -38,7 +37,6 @@
25250 # -n, --dry-run display commands without modifying any files
25251 # --features display basic configuration information and exit
25252 # --mode=MODE use operation mode MODE
25253-# --no-finish let install mode avoid finish commands
25254 # --preserve-dup-deps don't remove duplicate dependency libraries
25255 # --quiet, --silent don't print informational messages
25256 # --no-quiet, --no-silent
25257@@ -71,17 +69,19 @@
25258 # compiler: $LTCC
25259 # compiler flags: $LTCFLAGS
25260 # linker: $LD (gnu? $with_gnu_ld)
25261-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
25262+# $progname: (GNU libtool) 2.4
25263 # automake: $automake_version
25264 # autoconf: $autoconf_version
25265 #
25266 # Report bugs to <bug-libtool@gnu.org>.
25267+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
25268+# General help using GNU software: <http://www.gnu.org/gethelp/>.
25269
25270 PROGRAM=libtool
25271 PACKAGE=libtool
25272-VERSION=2.2.7a
25273-TIMESTAMP=" 1.3134 2009-11-29"
25274-package_revision=1.3134
25275+VERSION=2.4
25276+TIMESTAMP=""
25277+package_revision=1.3293
25278
25279 # Be Bourne compatible
25280 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
25281@@ -106,9 +106,6 @@ _LTECHO_EOF'
25282 }
25283
25284 # NLS nuisances: We save the old values to restore during execute mode.
25285-# Only set LANG and LC_ALL to C if already set.
25286-# These must not be set unconditionally because not all systems understand
25287-# e.g. LANG=C (notably SCO).
25288 lt_user_locale=
25289 lt_safe_locale=
25290 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
25291@@ -121,15 +118,13 @@ do
25292 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
25293 fi"
25294 done
25295+LC_ALL=C
25296+LANGUAGE=C
25297+export LANGUAGE LC_ALL
25298
25299 $lt_unset CDPATH
25300
25301
25302-
25303-
25304-
25305-
25306-
25307 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
25308 # is ksh but when the shell is invoked as "sh" and the current value of
25309 # the _XPG environment variable is not equal to 1 (one), the special
25310@@ -140,7 +135,7 @@ progpath="$0"
25311
25312
25313 : ${CP="cp -f"}
25314-: ${ECHO=$as_echo}
25315+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
25316 : ${EGREP="/bin/grep -E"}
25317 : ${FGREP="/bin/grep -F"}
25318 : ${GREP="/bin/grep"}
25319@@ -149,7 +144,7 @@ progpath="$0"
25320 : ${MKDIR="mkdir"}
25321 : ${MV="mv -f"}
25322 : ${RM="rm -f"}
25323-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
25324+: ${SED="/bin/sed"}
25325 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
25326 : ${Xsed="$SED -e 1s/^X//"}
25327
25328@@ -169,6 +164,27 @@ IFS=" $lt_nl"
25329 dirname="s,/[^/]*$,,"
25330 basename="s,^.*/,,"
25331
25332+# func_dirname file append nondir_replacement
25333+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
25334+# otherwise set result to NONDIR_REPLACEMENT.
25335+func_dirname ()
25336+{
25337+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
25338+ if test "X$func_dirname_result" = "X${1}"; then
25339+ func_dirname_result="${3}"
25340+ else
25341+ func_dirname_result="$func_dirname_result${2}"
25342+ fi
25343+} # func_dirname may be replaced by extended shell implementation
25344+
25345+
25346+# func_basename file
25347+func_basename ()
25348+{
25349+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
25350+} # func_basename may be replaced by extended shell implementation
25351+
25352+
25353 # func_dirname_and_basename file append nondir_replacement
25354 # perform func_basename and func_dirname in a single function
25355 # call:
25356@@ -183,17 +199,31 @@ basename="s,^.*/,,"
25357 # those functions but instead duplicate the functionality here.
25358 func_dirname_and_basename ()
25359 {
25360- # Extract subdirectory from the argument.
25361- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
25362- if test "X$func_dirname_result" = "X${1}"; then
25363- func_dirname_result="${3}"
25364- else
25365- func_dirname_result="$func_dirname_result${2}"
25366- fi
25367- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
25368-}
25369+ # Extract subdirectory from the argument.
25370+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
25371+ if test "X$func_dirname_result" = "X${1}"; then
25372+ func_dirname_result="${3}"
25373+ else
25374+ func_dirname_result="$func_dirname_result${2}"
25375+ fi
25376+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
25377+} # func_dirname_and_basename may be replaced by extended shell implementation
25378+
25379+
25380+# func_stripname prefix suffix name
25381+# strip PREFIX and SUFFIX off of NAME.
25382+# PREFIX and SUFFIX must not contain globbing or regex special
25383+# characters, hashes, percent signs, but SUFFIX may contain a leading
25384+# dot (in which case that matches only a dot).
25385+# func_strip_suffix prefix name
25386+func_stripname ()
25387+{
25388+ case ${2} in
25389+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
25390+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
25391+ esac
25392+} # func_stripname may be replaced by extended shell implementation
25393
25394-# Generated shell functions inserted here.
25395
25396 # These SED scripts presuppose an absolute path with a trailing slash.
25397 pathcar='s,^/\([^/]*\).*$,\1,'
25398@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
25399 # Same as above, but do not quote variable references.
25400 double_quote_subst='s/\(["`\\]\)/\\\1/g'
25401
25402+# Sed substitution that turns a string into a regex matching for the
25403+# string literally.
25404+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
25405+
25406+# Sed substitution that converts a w32 file name or path
25407+# which contains forward slashes, into one that contains
25408+# (escaped) backslashes. A very naive implementation.
25409+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
25410+
25411 # Re-`\' parameter expansions in output of double_quote_subst that were
25412 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
25413 # in input to double_quote_subst, that '$' was protected from expansion.
25414@@ -404,7 +443,7 @@ opt_warning=:
25415 # name if it has been set yet.
25416 func_echo ()
25417 {
25418- $ECHO "$progname${mode+: }$mode: $*"
25419+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
25420 }
25421
25422 # func_verbose arg...
25423@@ -430,14 +469,14 @@ func_echo_all ()
25424 # Echo program name prefixed message to standard error.
25425 func_error ()
25426 {
25427- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
25428+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
25429 }
25430
25431 # func_warning arg...
25432 # Echo program name prefixed warning message to standard error.
25433 func_warning ()
25434 {
25435- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
25436+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
25437
25438 # bash bug again:
25439 :
25440@@ -656,19 +695,35 @@ func_show_eval_locale ()
25441 fi
25442 }
25443
25444-
25445-
25446+# func_tr_sh
25447+# Turn $1 into a string suitable for a shell variable name.
25448+# Result is stored in $func_tr_sh_result. All characters
25449+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
25450+# if $1 begins with a digit, a '_' is prepended as well.
25451+func_tr_sh ()
25452+{
25453+ case $1 in
25454+ [0-9]* | *[!a-zA-Z0-9_]*)
25455+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
25456+ ;;
25457+ * )
25458+ func_tr_sh_result=$1
25459+ ;;
25460+ esac
25461+}
25462
25463
25464 # func_version
25465 # Echo version message to standard output and exit.
25466 func_version ()
25467 {
25468+ $opt_debug
25469+
25470 $SED -n '/(C)/!b go
25471 :more
25472 /\./!{
25473 N
25474- s/\n# //
25475+ s/\n# / /
25476 b more
25477 }
25478 :go
25479@@ -685,7 +740,9 @@ func_version ()
25480 # Echo short help message to standard output and exit.
25481 func_usage ()
25482 {
25483- $SED -n '/^# Usage:/,/^# *-h/ {
25484+ $opt_debug
25485+
25486+ $SED -n '/^# Usage:/,/^# *.*--help/ {
25487 s/^# //
25488 s/^# *$//
25489 s/\$progname/'$progname'/
25490@@ -701,7 +758,10 @@ func_usage ()
25491 # unless 'noexit' is passed as argument.
25492 func_help ()
25493 {
25494+ $opt_debug
25495+
25496 $SED -n '/^# Usage:/,/# Report bugs to/ {
25497+ :print
25498 s/^# //
25499 s/^# *$//
25500 s*\$progname*'$progname'*
25501@@ -714,7 +774,11 @@ func_help ()
25502 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
25503 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
25504 p
25505- }' < "$progpath"
25506+ d
25507+ }
25508+ /^# .* home page:/b print
25509+ /^# General help using/b print
25510+ ' < "$progpath"
25511 ret=$?
25512 if test -z "$1"; then
25513 exit $ret
25514@@ -726,12 +790,39 @@ func_help ()
25515 # exit_cmd.
25516 func_missing_arg ()
25517 {
25518- func_error "missing argument for $1"
25519+ $opt_debug
25520+
25521+ func_error "missing argument for $1."
25522 exit_cmd=exit
25523 }
25524
25525-exit_cmd=:
25526
25527+# func_split_short_opt shortopt
25528+# Set func_split_short_opt_name and func_split_short_opt_arg shell
25529+# variables after splitting SHORTOPT after the 2nd character.
25530+func_split_short_opt ()
25531+{
25532+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
25533+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
25534+
25535+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
25536+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
25537+} # func_split_short_opt may be replaced by extended shell implementation
25538+
25539+
25540+# func_split_long_opt longopt
25541+# Set func_split_long_opt_name and func_split_long_opt_arg shell
25542+# variables after splitting LONGOPT at the `=' sign.
25543+func_split_long_opt ()
25544+{
25545+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
25546+ my_sed_long_arg='1s/^--[^=]*=//'
25547+
25548+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
25549+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
25550+} # func_split_long_opt may be replaced by extended shell implementation
25551+
25552+exit_cmd=:
25553
25554
25555
25556@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
25557 magic_exe="%%%MAGIC EXE variable%%%"
25558
25559 # Global variables.
25560-# $mode is unset
25561 nonopt=
25562-execute_dlfiles=
25563 preserve_args=
25564 lo2o="s/\\.lo\$/.${objext}/"
25565 o2lo="s/\\.${objext}\$/.lo/"
25566 extracted_archives=
25567 extracted_serial=0
25568
25569-opt_dry_run=false
25570-opt_finish=:
25571-opt_duplicate_deps=false
25572-opt_silent=false
25573-opt_debug=:
25574-
25575 # If this variable is set in any of the actions, the command in it
25576 # will be execed at the end. This prevents here-documents from being
25577 # left over by shells.
25578 exec_cmd=
25579
25580+# func_append var value
25581+# Append VALUE to the end of shell variable VAR.
25582+func_append ()
25583+{
25584+ eval "${1}=\$${1}\${2}"
25585+} # func_append may be replaced by extended shell implementation
25586+
25587+# func_append_quoted var value
25588+# Quote VALUE and append to the end of shell variable VAR, separated
25589+# by a space.
25590+func_append_quoted ()
25591+{
25592+ func_quote_for_eval "${2}"
25593+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
25594+} # func_append_quoted may be replaced by extended shell implementation
25595+
25596+
25597+# func_arith arithmetic-term...
25598+func_arith ()
25599+{
25600+ func_arith_result=`expr "${@}"`
25601+} # func_arith may be replaced by extended shell implementation
25602+
25603+
25604+# func_len string
25605+# STRING may not start with a hyphen.
25606+func_len ()
25607+{
25608+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
25609+} # func_len may be replaced by extended shell implementation
25610+
25611+
25612+# func_lo2o object
25613+func_lo2o ()
25614+{
25615+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
25616+} # func_lo2o may be replaced by extended shell implementation
25617+
25618+
25619+# func_xform libobj-or-source
25620+func_xform ()
25621+{
25622+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
25623+} # func_xform may be replaced by extended shell implementation
25624+
25625+
25626 # func_fatal_configuration arg...
25627 # Echo program name prefixed message to standard error, followed by
25628 # a configuration failure hint, and exit.
25629@@ -850,130 +979,204 @@ func_enable_tag ()
25630 esac
25631 }
25632
25633-# Parse options once, thoroughly. This comes as soon as possible in
25634-# the script to make things like `libtool --version' happen quickly.
25635+# func_check_version_match
25636+# Ensure that we are using m4 macros, and libtool script from the same
25637+# release of libtool.
25638+func_check_version_match ()
25639 {
25640+ if test "$package_revision" != "$macro_revision"; then
25641+ if test "$VERSION" != "$macro_version"; then
25642+ if test -z "$macro_version"; then
25643+ cat >&2 <<_LT_EOF
25644+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
25645+$progname: definition of this LT_INIT comes from an older release.
25646+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
25647+$progname: and run autoconf again.
25648+_LT_EOF
25649+ else
25650+ cat >&2 <<_LT_EOF
25651+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
25652+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
25653+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
25654+$progname: and run autoconf again.
25655+_LT_EOF
25656+ fi
25657+ else
25658+ cat >&2 <<_LT_EOF
25659+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
25660+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
25661+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
25662+$progname: of $PACKAGE $VERSION and run autoconf again.
25663+_LT_EOF
25664+ fi
25665
25666- # Shorthand for --mode=foo, only valid as the first argument
25667- case $1 in
25668- clean|clea|cle|cl)
25669- shift; set dummy --mode clean ${1+"$@"}; shift
25670- ;;
25671- compile|compil|compi|comp|com|co|c)
25672- shift; set dummy --mode compile ${1+"$@"}; shift
25673- ;;
25674- execute|execut|execu|exec|exe|ex|e)
25675- shift; set dummy --mode execute ${1+"$@"}; shift
25676- ;;
25677- finish|finis|fini|fin|fi|f)
25678- shift; set dummy --mode finish ${1+"$@"}; shift
25679- ;;
25680- install|instal|insta|inst|ins|in|i)
25681- shift; set dummy --mode install ${1+"$@"}; shift
25682- ;;
25683- link|lin|li|l)
25684- shift; set dummy --mode link ${1+"$@"}; shift
25685- ;;
25686- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
25687- shift; set dummy --mode uninstall ${1+"$@"}; shift
25688- ;;
25689- esac
25690+ exit $EXIT_MISMATCH
25691+ fi
25692+}
25693+
25694+
25695+# Shorthand for --mode=foo, only valid as the first argument
25696+case $1 in
25697+clean|clea|cle|cl)
25698+ shift; set dummy --mode clean ${1+"$@"}; shift
25699+ ;;
25700+compile|compil|compi|comp|com|co|c)
25701+ shift; set dummy --mode compile ${1+"$@"}; shift
25702+ ;;
25703+execute|execut|execu|exec|exe|ex|e)
25704+ shift; set dummy --mode execute ${1+"$@"}; shift
25705+ ;;
25706+finish|finis|fini|fin|fi|f)
25707+ shift; set dummy --mode finish ${1+"$@"}; shift
25708+ ;;
25709+install|instal|insta|inst|ins|in|i)
25710+ shift; set dummy --mode install ${1+"$@"}; shift
25711+ ;;
25712+link|lin|li|l)
25713+ shift; set dummy --mode link ${1+"$@"}; shift
25714+ ;;
25715+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
25716+ shift; set dummy --mode uninstall ${1+"$@"}; shift
25717+ ;;
25718+esac
25719
25720- # Parse non-mode specific arguments:
25721- while test "$#" -gt 0; do
25722+
25723+
25724+# Option defaults:
25725+opt_debug=:
25726+opt_dry_run=false
25727+opt_config=false
25728+opt_preserve_dup_deps=false
25729+opt_features=false
25730+opt_finish=false
25731+opt_help=false
25732+opt_help_all=false
25733+opt_silent=:
25734+opt_verbose=:
25735+opt_silent=false
25736+opt_verbose=false
25737+
25738+
25739+# Parse options once, thoroughly. This comes as soon as possible in the
25740+# script to make things like `--version' happen as quickly as we can.
25741+{
25742+ # this just eases exit handling
25743+ while test $# -gt 0; do
25744 opt="$1"
25745 shift
25746-
25747 case $opt in
25748- --config) func_config ;;
25749-
25750- --debug) preserve_args="$preserve_args $opt"
25751+ --debug|-x) opt_debug='set -x'
25752 func_echo "enabling shell trace mode"
25753- opt_debug='set -x'
25754 $opt_debug
25755 ;;
25756-
25757- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
25758- execute_dlfiles="$execute_dlfiles $1"
25759- shift
25760+ --dry-run|--dryrun|-n)
25761+ opt_dry_run=:
25762 ;;
25763-
25764- --dry-run | -n) opt_dry_run=: ;;
25765- --features) func_features ;;
25766- --finish) mode="finish" ;;
25767- --no-finish) opt_finish=false ;;
25768-
25769- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
25770- case $1 in
25771- # Valid mode arguments:
25772- clean) ;;
25773- compile) ;;
25774- execute) ;;
25775- finish) ;;
25776- install) ;;
25777- link) ;;
25778- relink) ;;
25779- uninstall) ;;
25780-
25781- # Catch anything else as an error
25782- *) func_error "invalid argument for $opt"
25783- exit_cmd=exit
25784- break
25785- ;;
25786- esac
25787-
25788- mode="$1"
25789+ --config)
25790+ opt_config=:
25791+func_config
25792+ ;;
25793+ --dlopen|-dlopen)
25794+ optarg="$1"
25795+ opt_dlopen="${opt_dlopen+$opt_dlopen
25796+}$optarg"
25797 shift
25798 ;;
25799-
25800 --preserve-dup-deps)
25801- opt_duplicate_deps=: ;;
25802-
25803- --quiet|--silent) preserve_args="$preserve_args $opt"
25804- opt_silent=:
25805- opt_verbose=false
25806+ opt_preserve_dup_deps=:
25807 ;;
25808-
25809- --no-quiet|--no-silent)
25810- preserve_args="$preserve_args $opt"
25811- opt_silent=false
25812+ --features)
25813+ opt_features=:
25814+func_features
25815 ;;
25816-
25817- --verbose| -v) preserve_args="$preserve_args $opt"
25818+ --finish)
25819+ opt_finish=:
25820+set dummy --mode finish ${1+"$@"}; shift
25821+ ;;
25822+ --help)
25823+ opt_help=:
25824+ ;;
25825+ --help-all)
25826+ opt_help_all=:
25827+opt_help=': help-all'
25828+ ;;
25829+ --mode)
25830+ test $# = 0 && func_missing_arg $opt && break
25831+ optarg="$1"
25832+ opt_mode="$optarg"
25833+case $optarg in
25834+ # Valid mode arguments:
25835+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
25836+
25837+ # Catch anything else as an error
25838+ *) func_error "invalid argument for $opt"
25839+ exit_cmd=exit
25840+ break
25841+ ;;
25842+esac
25843+ shift
25844+ ;;
25845+ --no-silent|--no-quiet)
25846 opt_silent=false
25847- opt_verbose=:
25848+func_append preserve_args " $opt"
25849 ;;
25850-
25851- --no-verbose) preserve_args="$preserve_args $opt"
25852+ --no-verbose)
25853 opt_verbose=false
25854+func_append preserve_args " $opt"
25855 ;;
25856-
25857- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
25858- preserve_args="$preserve_args $opt $1"
25859- func_enable_tag "$1" # tagname is set here
25860+ --silent|--quiet)
25861+ opt_silent=:
25862+func_append preserve_args " $opt"
25863+ opt_verbose=false
25864+ ;;
25865+ --verbose|-v)
25866+ opt_verbose=:
25867+func_append preserve_args " $opt"
25868+opt_silent=false
25869+ ;;
25870+ --tag)
25871+ test $# = 0 && func_missing_arg $opt && break
25872+ optarg="$1"
25873+ opt_tag="$optarg"
25874+func_append preserve_args " $opt $optarg"
25875+func_enable_tag "$optarg"
25876 shift
25877 ;;
25878
25879+ -\?|-h) func_usage ;;
25880+ --help) func_help ;;
25881+ --version) func_version ;;
25882+
25883 # Separate optargs to long options:
25884- -dlopen=*|--mode=*|--tag=*)
25885- func_opt_split "$opt"
25886- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
25887+ --*=*)
25888+ func_split_long_opt "$opt"
25889+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
25890 shift
25891 ;;
25892
25893- -\?|-h) func_usage ;;
25894- --help) opt_help=: ;;
25895- --help-all) opt_help=': help-all' ;;
25896- --version) func_version ;;
25897-
25898- -*) func_fatal_help "unrecognized option \`$opt'" ;;
25899-
25900- *) nonopt="$opt"
25901- break
25902+ # Separate non-argument short options:
25903+ -\?*|-h*|-n*|-v*)
25904+ func_split_short_opt "$opt"
25905+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
25906+ shift
25907 ;;
25908+
25909+ --) break ;;
25910+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
25911+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
25912 esac
25913 done
25914
25915+ # Validate options:
25916+
25917+ # save first non-option argument
25918+ if test "$#" -gt 0; then
25919+ nonopt="$opt"
25920+ shift
25921+ fi
25922+
25923+ # preserve --debug
25924+ test "$opt_debug" = : || func_append preserve_args " --debug"
25925
25926 case $host in
25927 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
25928@@ -981,82 +1184,44 @@ func_enable_tag ()
25929 opt_duplicate_compiler_generated_deps=:
25930 ;;
25931 *)
25932- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
25933+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
25934 ;;
25935 esac
25936
25937- # Having warned about all mis-specified options, bail out if
25938- # anything was wrong.
25939- $exit_cmd $EXIT_FAILURE
25940-}
25941+ $opt_help || {
25942+ # Sanity checks first:
25943+ func_check_version_match
25944
25945-# func_check_version_match
25946-# Ensure that we are using m4 macros, and libtool script from the same
25947-# release of libtool.
25948-func_check_version_match ()
25949-{
25950- if test "$package_revision" != "$macro_revision"; then
25951- if test "$VERSION" != "$macro_version"; then
25952- if test -z "$macro_version"; then
25953- cat >&2 <<_LT_EOF
25954-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
25955-$progname: definition of this LT_INIT comes from an older release.
25956-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
25957-$progname: and run autoconf again.
25958-_LT_EOF
25959- else
25960- cat >&2 <<_LT_EOF
25961-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
25962-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
25963-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
25964-$progname: and run autoconf again.
25965-_LT_EOF
25966- fi
25967- else
25968- cat >&2 <<_LT_EOF
25969-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
25970-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
25971-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
25972-$progname: of $PACKAGE $VERSION and run autoconf again.
25973-_LT_EOF
25974+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
25975+ func_fatal_configuration "not configured to build any kind of library"
25976 fi
25977
25978- exit $EXIT_MISMATCH
25979- fi
25980-}
25981-
25982+ # Darwin sucks
25983+ eval std_shrext=\"$shrext_cmds\"
25984
25985-## ----------- ##
25986-## Main. ##
25987-## ----------- ##
25988-
25989-$opt_help || {
25990- # Sanity checks first:
25991- func_check_version_match
25992-
25993- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
25994- func_fatal_configuration "not configured to build any kind of library"
25995- fi
25996+ # Only execute mode is allowed to have -dlopen flags.
25997+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
25998+ func_error "unrecognized option \`-dlopen'"
25999+ $ECHO "$help" 1>&2
26000+ exit $EXIT_FAILURE
26001+ fi
26002
26003- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
26004+ # Change the help message to a mode-specific one.
26005+ generic_help="$help"
26006+ help="Try \`$progname --help --mode=$opt_mode' for more information."
26007+ }
26008
26009
26010- # Darwin sucks
26011- eval "std_shrext=\"$shrext_cmds\""
26012+ # Bail if the options were screwed
26013+ $exit_cmd $EXIT_FAILURE
26014+}
26015
26016
26017- # Only execute mode is allowed to have -dlopen flags.
26018- if test -n "$execute_dlfiles" && test "$mode" != execute; then
26019- func_error "unrecognized option \`-dlopen'"
26020- $ECHO "$help" 1>&2
26021- exit $EXIT_FAILURE
26022- fi
26023
26024- # Change the help message to a mode-specific one.
26025- generic_help="$help"
26026- help="Try \`$progname --help --mode=$mode' for more information."
26027-}
26028
26029+## ----------- ##
26030+## Main. ##
26031+## ----------- ##
26032
26033 # func_lalib_p file
26034 # True iff FILE is a libtool `.la' library or `.lo' object file.
26035@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
26036 # temporary ltwrapper_script.
26037 func_ltwrapper_scriptname ()
26038 {
26039- func_ltwrapper_scriptname_result=""
26040- if func_ltwrapper_executable_p "$1"; then
26041- func_dirname_and_basename "$1" "" "."
26042- func_stripname '' '.exe' "$func_basename_result"
26043- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
26044- fi
26045+ func_dirname_and_basename "$1" "" "."
26046+ func_stripname '' '.exe' "$func_basename_result"
26047+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
26048 }
26049
26050 # func_ltwrapper_p file
26051@@ -1149,7 +1311,7 @@ func_execute_cmds ()
26052 save_ifs=$IFS; IFS='~'
26053 for cmd in $1; do
26054 IFS=$save_ifs
26055- eval "cmd=\"$cmd\""
26056+ eval cmd=\"$cmd\"
26057 func_show_eval "$cmd" "${2-:}"
26058 done
26059 IFS=$save_ifs
26060@@ -1172,6 +1334,37 @@ func_source ()
26061 }
26062
26063
26064+# func_resolve_sysroot PATH
26065+# Replace a leading = in PATH with a sysroot. Store the result into
26066+# func_resolve_sysroot_result
26067+func_resolve_sysroot ()
26068+{
26069+ func_resolve_sysroot_result=$1
26070+ case $func_resolve_sysroot_result in
26071+ =*)
26072+ func_stripname '=' '' "$func_resolve_sysroot_result"
26073+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
26074+ ;;
26075+ esac
26076+}
26077+
26078+# func_replace_sysroot PATH
26079+# If PATH begins with the sysroot, replace it with = and
26080+# store the result into func_replace_sysroot_result.
26081+func_replace_sysroot ()
26082+{
26083+ case "$lt_sysroot:$1" in
26084+ ?*:"$lt_sysroot"*)
26085+ func_stripname "$lt_sysroot" '' "$1"
26086+ func_replace_sysroot_result="=$func_stripname_result"
26087+ ;;
26088+ *)
26089+ # Including no sysroot.
26090+ func_replace_sysroot_result=$1
26091+ ;;
26092+ esac
26093+}
26094+
26095 # func_infer_tag arg
26096 # Infer tagged configuration to use if any are available and
26097 # if one wasn't chosen via the "--tag" command line option.
26098@@ -1184,8 +1377,7 @@ func_infer_tag ()
26099 if test -n "$available_tags" && test -z "$tagname"; then
26100 CC_quoted=
26101 for arg in $CC; do
26102- func_quote_for_eval "$arg"
26103- CC_quoted="$CC_quoted $func_quote_for_eval_result"
26104+ func_append_quoted CC_quoted "$arg"
26105 done
26106 CC_expanded=`func_echo_all $CC`
26107 CC_quoted_expanded=`func_echo_all $CC_quoted`
26108@@ -1204,8 +1396,7 @@ func_infer_tag ()
26109 CC_quoted=
26110 for arg in $CC; do
26111 # Double-quote args containing other shell metacharacters.
26112- func_quote_for_eval "$arg"
26113- CC_quoted="$CC_quoted $func_quote_for_eval_result"
26114+ func_append_quoted CC_quoted "$arg"
26115 done
26116 CC_expanded=`func_echo_all $CC`
26117 CC_quoted_expanded=`func_echo_all $CC_quoted`
26118@@ -1274,6 +1465,486 @@ EOF
26119 }
26120 }
26121
26122+
26123+##################################################
26124+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
26125+##################################################
26126+
26127+# func_convert_core_file_wine_to_w32 ARG
26128+# Helper function used by file name conversion functions when $build is *nix,
26129+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
26130+# correctly configured wine environment available, with the winepath program
26131+# in $build's $PATH.
26132+#
26133+# ARG is the $build file name to be converted to w32 format.
26134+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
26135+# be empty on error (or when ARG is empty)
26136+func_convert_core_file_wine_to_w32 ()
26137+{
26138+ $opt_debug
26139+ func_convert_core_file_wine_to_w32_result="$1"
26140+ if test -n "$1"; then
26141+ # Unfortunately, winepath does not exit with a non-zero error code, so we
26142+ # are forced to check the contents of stdout. On the other hand, if the
26143+ # command is not found, the shell will set an exit code of 127 and print
26144+ # *an error message* to stdout. So we must check for both error code of
26145+ # zero AND non-empty stdout, which explains the odd construction:
26146+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
26147+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
26148+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
26149+ $SED -e "$lt_sed_naive_backslashify"`
26150+ else
26151+ func_convert_core_file_wine_to_w32_result=
26152+ fi
26153+ fi
26154+}
26155+# end: func_convert_core_file_wine_to_w32
26156+
26157+
26158+# func_convert_core_path_wine_to_w32 ARG
26159+# Helper function used by path conversion functions when $build is *nix, and
26160+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
26161+# configured wine environment available, with the winepath program in $build's
26162+# $PATH. Assumes ARG has no leading or trailing path separator characters.
26163+#
26164+# ARG is path to be converted from $build format to win32.
26165+# Result is available in $func_convert_core_path_wine_to_w32_result.
26166+# Unconvertible file (directory) names in ARG are skipped; if no directory names
26167+# are convertible, then the result may be empty.
26168+func_convert_core_path_wine_to_w32 ()
26169+{
26170+ $opt_debug
26171+ # unfortunately, winepath doesn't convert paths, only file names
26172+ func_convert_core_path_wine_to_w32_result=""
26173+ if test -n "$1"; then
26174+ oldIFS=$IFS
26175+ IFS=:
26176+ for func_convert_core_path_wine_to_w32_f in $1; do
26177+ IFS=$oldIFS
26178+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
26179+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
26180+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
26181+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
26182+ else
26183+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
26184+ fi
26185+ fi
26186+ done
26187+ IFS=$oldIFS
26188+ fi
26189+}
26190+# end: func_convert_core_path_wine_to_w32
26191+
26192+
26193+# func_cygpath ARGS...
26194+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
26195+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
26196+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
26197+# (2), returns the Cygwin file name or path in func_cygpath_result (input
26198+# file name or path is assumed to be in w32 format, as previously converted
26199+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
26200+# or path in func_cygpath_result (input file name or path is assumed to be in
26201+# Cygwin format). Returns an empty string on error.
26202+#
26203+# ARGS are passed to cygpath, with the last one being the file name or path to
26204+# be converted.
26205+#
26206+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
26207+# environment variable; do not put it in $PATH.
26208+func_cygpath ()
26209+{
26210+ $opt_debug
26211+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
26212+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
26213+ if test "$?" -ne 0; then
26214+ # on failure, ensure result is empty
26215+ func_cygpath_result=
26216+ fi
26217+ else
26218+ func_cygpath_result=
26219+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
26220+ fi
26221+}
26222+#end: func_cygpath
26223+
26224+
26225+# func_convert_core_msys_to_w32 ARG
26226+# Convert file name or path ARG from MSYS format to w32 format. Return
26227+# result in func_convert_core_msys_to_w32_result.
26228+func_convert_core_msys_to_w32 ()
26229+{
26230+ $opt_debug
26231+ # awkward: cmd appends spaces to result
26232+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
26233+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
26234+}
26235+#end: func_convert_core_msys_to_w32
26236+
26237+
26238+# func_convert_file_check ARG1 ARG2
26239+# Verify that ARG1 (a file name in $build format) was converted to $host
26240+# format in ARG2. Otherwise, emit an error message, but continue (resetting
26241+# func_to_host_file_result to ARG1).
26242+func_convert_file_check ()
26243+{
26244+ $opt_debug
26245+ if test -z "$2" && test -n "$1" ; then
26246+ func_error "Could not determine host file name corresponding to"
26247+ func_error " \`$1'"
26248+ func_error "Continuing, but uninstalled executables may not work."
26249+ # Fallback:
26250+ func_to_host_file_result="$1"
26251+ fi
26252+}
26253+# end func_convert_file_check
26254+
26255+
26256+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
26257+# Verify that FROM_PATH (a path in $build format) was converted to $host
26258+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
26259+# func_to_host_file_result to a simplistic fallback value (see below).
26260+func_convert_path_check ()
26261+{
26262+ $opt_debug
26263+ if test -z "$4" && test -n "$3"; then
26264+ func_error "Could not determine the host path corresponding to"
26265+ func_error " \`$3'"
26266+ func_error "Continuing, but uninstalled executables may not work."
26267+ # Fallback. This is a deliberately simplistic "conversion" and
26268+ # should not be "improved". See libtool.info.
26269+ if test "x$1" != "x$2"; then
26270+ lt_replace_pathsep_chars="s|$1|$2|g"
26271+ func_to_host_path_result=`echo "$3" |
26272+ $SED -e "$lt_replace_pathsep_chars"`
26273+ else
26274+ func_to_host_path_result="$3"
26275+ fi
26276+ fi
26277+}
26278+# end func_convert_path_check
26279+
26280+
26281+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
26282+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
26283+# and appending REPL if ORIG matches BACKPAT.
26284+func_convert_path_front_back_pathsep ()
26285+{
26286+ $opt_debug
26287+ case $4 in
26288+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
26289+ ;;
26290+ esac
26291+ case $4 in
26292+ $2 ) func_append func_to_host_path_result "$3"
26293+ ;;
26294+ esac
26295+}
26296+# end func_convert_path_front_back_pathsep
26297+
26298+
26299+##################################################
26300+# $build to $host FILE NAME CONVERSION FUNCTIONS #
26301+##################################################
26302+# invoked via `$to_host_file_cmd ARG'
26303+#
26304+# In each case, ARG is the path to be converted from $build to $host format.
26305+# Result will be available in $func_to_host_file_result.
26306+
26307+
26308+# func_to_host_file ARG
26309+# Converts the file name ARG from $build format to $host format. Return result
26310+# in func_to_host_file_result.
26311+func_to_host_file ()
26312+{
26313+ $opt_debug
26314+ $to_host_file_cmd "$1"
26315+}
26316+# end func_to_host_file
26317+
26318+
26319+# func_to_tool_file ARG LAZY
26320+# converts the file name ARG from $build format to toolchain format. Return
26321+# result in func_to_tool_file_result. If the conversion in use is listed
26322+# in (the comma separated) LAZY, no conversion takes place.
26323+func_to_tool_file ()
26324+{
26325+ $opt_debug
26326+ case ,$2, in
26327+ *,"$to_tool_file_cmd",*)
26328+ func_to_tool_file_result=$1
26329+ ;;
26330+ *)
26331+ $to_tool_file_cmd "$1"
26332+ func_to_tool_file_result=$func_to_host_file_result
26333+ ;;
26334+ esac
26335+}
26336+# end func_to_tool_file
26337+
26338+
26339+# func_convert_file_noop ARG
26340+# Copy ARG to func_to_host_file_result.
26341+func_convert_file_noop ()
26342+{
26343+ func_to_host_file_result="$1"
26344+}
26345+# end func_convert_file_noop
26346+
26347+
26348+# func_convert_file_msys_to_w32 ARG
26349+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
26350+# conversion to w32 is not available inside the cwrapper. Returns result in
26351+# func_to_host_file_result.
26352+func_convert_file_msys_to_w32 ()
26353+{
26354+ $opt_debug
26355+ func_to_host_file_result="$1"
26356+ if test -n "$1"; then
26357+ func_convert_core_msys_to_w32 "$1"
26358+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
26359+ fi
26360+ func_convert_file_check "$1" "$func_to_host_file_result"
26361+}
26362+# end func_convert_file_msys_to_w32
26363+
26364+
26365+# func_convert_file_cygwin_to_w32 ARG
26366+# Convert file name ARG from Cygwin to w32 format. Returns result in
26367+# func_to_host_file_result.
26368+func_convert_file_cygwin_to_w32 ()
26369+{
26370+ $opt_debug
26371+ func_to_host_file_result="$1"
26372+ if test -n "$1"; then
26373+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
26374+ # LT_CYGPATH in this case.
26375+ func_to_host_file_result=`cygpath -m "$1"`
26376+ fi
26377+ func_convert_file_check "$1" "$func_to_host_file_result"
26378+}
26379+# end func_convert_file_cygwin_to_w32
26380+
26381+
26382+# func_convert_file_nix_to_w32 ARG
26383+# Convert file name ARG from *nix to w32 format. Requires a wine environment
26384+# and a working winepath. Returns result in func_to_host_file_result.
26385+func_convert_file_nix_to_w32 ()
26386+{
26387+ $opt_debug
26388+ func_to_host_file_result="$1"
26389+ if test -n "$1"; then
26390+ func_convert_core_file_wine_to_w32 "$1"
26391+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
26392+ fi
26393+ func_convert_file_check "$1" "$func_to_host_file_result"
26394+}
26395+# end func_convert_file_nix_to_w32
26396+
26397+
26398+# func_convert_file_msys_to_cygwin ARG
26399+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
26400+# Returns result in func_to_host_file_result.
26401+func_convert_file_msys_to_cygwin ()
26402+{
26403+ $opt_debug
26404+ func_to_host_file_result="$1"
26405+ if test -n "$1"; then
26406+ func_convert_core_msys_to_w32 "$1"
26407+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
26408+ func_to_host_file_result="$func_cygpath_result"
26409+ fi
26410+ func_convert_file_check "$1" "$func_to_host_file_result"
26411+}
26412+# end func_convert_file_msys_to_cygwin
26413+
26414+
26415+# func_convert_file_nix_to_cygwin ARG
26416+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
26417+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
26418+# in func_to_host_file_result.
26419+func_convert_file_nix_to_cygwin ()
26420+{
26421+ $opt_debug
26422+ func_to_host_file_result="$1"
26423+ if test -n "$1"; then
26424+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
26425+ func_convert_core_file_wine_to_w32 "$1"
26426+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
26427+ func_to_host_file_result="$func_cygpath_result"
26428+ fi
26429+ func_convert_file_check "$1" "$func_to_host_file_result"
26430+}
26431+# end func_convert_file_nix_to_cygwin
26432+
26433+
26434+#############################################
26435+# $build to $host PATH CONVERSION FUNCTIONS #
26436+#############################################
26437+# invoked via `$to_host_path_cmd ARG'
26438+#
26439+# In each case, ARG is the path to be converted from $build to $host format.
26440+# The result will be available in $func_to_host_path_result.
26441+#
26442+# Path separators are also converted from $build format to $host format. If
26443+# ARG begins or ends with a path separator character, it is preserved (but
26444+# converted to $host format) on output.
26445+#
26446+# All path conversion functions are named using the following convention:
26447+# file name conversion function : func_convert_file_X_to_Y ()
26448+# path conversion function : func_convert_path_X_to_Y ()
26449+# where, for any given $build/$host combination the 'X_to_Y' value is the
26450+# same. If conversion functions are added for new $build/$host combinations,
26451+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
26452+# will break.
26453+
26454+
26455+# func_init_to_host_path_cmd
26456+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
26457+# appropriate value, based on the value of $to_host_file_cmd.
26458+to_host_path_cmd=
26459+func_init_to_host_path_cmd ()
26460+{
26461+ $opt_debug
26462+ if test -z "$to_host_path_cmd"; then
26463+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
26464+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
26465+ fi
26466+}
26467+
26468+
26469+# func_to_host_path ARG
26470+# Converts the path ARG from $build format to $host format. Return result
26471+# in func_to_host_path_result.
26472+func_to_host_path ()
26473+{
26474+ $opt_debug
26475+ func_init_to_host_path_cmd
26476+ $to_host_path_cmd "$1"
26477+}
26478+# end func_to_host_path
26479+
26480+
26481+# func_convert_path_noop ARG
26482+# Copy ARG to func_to_host_path_result.
26483+func_convert_path_noop ()
26484+{
26485+ func_to_host_path_result="$1"
26486+}
26487+# end func_convert_path_noop
26488+
26489+
26490+# func_convert_path_msys_to_w32 ARG
26491+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
26492+# conversion to w32 is not available inside the cwrapper. Returns result in
26493+# func_to_host_path_result.
26494+func_convert_path_msys_to_w32 ()
26495+{
26496+ $opt_debug
26497+ func_to_host_path_result="$1"
26498+ if test -n "$1"; then
26499+ # Remove leading and trailing path separator characters from ARG. MSYS
26500+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
26501+ # and winepath ignores them completely.
26502+ func_stripname : : "$1"
26503+ func_to_host_path_tmp1=$func_stripname_result
26504+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
26505+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
26506+ func_convert_path_check : ";" \
26507+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
26508+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
26509+ fi
26510+}
26511+# end func_convert_path_msys_to_w32
26512+
26513+
26514+# func_convert_path_cygwin_to_w32 ARG
26515+# Convert path ARG from Cygwin to w32 format. Returns result in
26516+# func_to_host_file_result.
26517+func_convert_path_cygwin_to_w32 ()
26518+{
26519+ $opt_debug
26520+ func_to_host_path_result="$1"
26521+ if test -n "$1"; then
26522+ # See func_convert_path_msys_to_w32:
26523+ func_stripname : : "$1"
26524+ func_to_host_path_tmp1=$func_stripname_result
26525+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
26526+ func_convert_path_check : ";" \
26527+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
26528+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
26529+ fi
26530+}
26531+# end func_convert_path_cygwin_to_w32
26532+
26533+
26534+# func_convert_path_nix_to_w32 ARG
26535+# Convert path ARG from *nix to w32 format. Requires a wine environment and
26536+# a working winepath. Returns result in func_to_host_file_result.
26537+func_convert_path_nix_to_w32 ()
26538+{
26539+ $opt_debug
26540+ func_to_host_path_result="$1"
26541+ if test -n "$1"; then
26542+ # See func_convert_path_msys_to_w32:
26543+ func_stripname : : "$1"
26544+ func_to_host_path_tmp1=$func_stripname_result
26545+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
26546+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
26547+ func_convert_path_check : ";" \
26548+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
26549+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
26550+ fi
26551+}
26552+# end func_convert_path_nix_to_w32
26553+
26554+
26555+# func_convert_path_msys_to_cygwin ARG
26556+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
26557+# Returns result in func_to_host_file_result.
26558+func_convert_path_msys_to_cygwin ()
26559+{
26560+ $opt_debug
26561+ func_to_host_path_result="$1"
26562+ if test -n "$1"; then
26563+ # See func_convert_path_msys_to_w32:
26564+ func_stripname : : "$1"
26565+ func_to_host_path_tmp1=$func_stripname_result
26566+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
26567+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
26568+ func_to_host_path_result="$func_cygpath_result"
26569+ func_convert_path_check : : \
26570+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
26571+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
26572+ fi
26573+}
26574+# end func_convert_path_msys_to_cygwin
26575+
26576+
26577+# func_convert_path_nix_to_cygwin ARG
26578+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
26579+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
26580+# func_to_host_file_result.
26581+func_convert_path_nix_to_cygwin ()
26582+{
26583+ $opt_debug
26584+ func_to_host_path_result="$1"
26585+ if test -n "$1"; then
26586+ # Remove leading and trailing path separator characters from
26587+ # ARG. msys behavior is inconsistent here, cygpath turns them
26588+ # into '.;' and ';.', and winepath ignores them completely.
26589+ func_stripname : : "$1"
26590+ func_to_host_path_tmp1=$func_stripname_result
26591+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
26592+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
26593+ func_to_host_path_result="$func_cygpath_result"
26594+ func_convert_path_check : : \
26595+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
26596+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
26597+ fi
26598+}
26599+# end func_convert_path_nix_to_cygwin
26600+
26601+
26602 # func_mode_compile arg...
26603 func_mode_compile ()
26604 {
26605@@ -1314,12 +1985,12 @@ func_mode_compile ()
26606 ;;
26607
26608 -pie | -fpie | -fPIE)
26609- pie_flag="$pie_flag $arg"
26610+ func_append pie_flag " $arg"
26611 continue
26612 ;;
26613
26614 -shared | -static | -prefer-pic | -prefer-non-pic)
26615- later="$later $arg"
26616+ func_append later " $arg"
26617 continue
26618 ;;
26619
26620@@ -1340,15 +2011,14 @@ func_mode_compile ()
26621 save_ifs="$IFS"; IFS=','
26622 for arg in $args; do
26623 IFS="$save_ifs"
26624- func_quote_for_eval "$arg"
26625- lastarg="$lastarg $func_quote_for_eval_result"
26626+ func_append_quoted lastarg "$arg"
26627 done
26628 IFS="$save_ifs"
26629 func_stripname ' ' '' "$lastarg"
26630 lastarg=$func_stripname_result
26631
26632 # Add the arguments to base_compile.
26633- base_compile="$base_compile $lastarg"
26634+ func_append base_compile " $lastarg"
26635 continue
26636 ;;
26637
26638@@ -1364,8 +2034,7 @@ func_mode_compile ()
26639 esac # case $arg_mode
26640
26641 # Aesthetically quote the previous argument.
26642- func_quote_for_eval "$lastarg"
26643- base_compile="$base_compile $func_quote_for_eval_result"
26644+ func_append_quoted base_compile "$lastarg"
26645 done # for arg
26646
26647 case $arg_mode in
26648@@ -1496,17 +2165,16 @@ compiler."
26649 $opt_dry_run || $RM $removelist
26650 exit $EXIT_FAILURE
26651 fi
26652- removelist="$removelist $output_obj"
26653+ func_append removelist " $output_obj"
26654 $ECHO "$srcfile" > "$lockfile"
26655 fi
26656
26657 $opt_dry_run || $RM $removelist
26658- removelist="$removelist $lockfile"
26659+ func_append removelist " $lockfile"
26660 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
26661
26662- if test -n "$fix_srcfile_path"; then
26663- eval "srcfile=\"$fix_srcfile_path\""
26664- fi
26665+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
26666+ srcfile=$func_to_tool_file_result
26667 func_quote_for_eval "$srcfile"
26668 qsrcfile=$func_quote_for_eval_result
26669
26670@@ -1526,7 +2194,7 @@ compiler."
26671
26672 if test -z "$output_obj"; then
26673 # Place PIC objects in $objdir
26674- command="$command -o $lobj"
26675+ func_append command " -o $lobj"
26676 fi
26677
26678 func_show_eval_locale "$command" \
26679@@ -1573,11 +2241,11 @@ compiler."
26680 command="$base_compile $qsrcfile $pic_flag"
26681 fi
26682 if test "$compiler_c_o" = yes; then
26683- command="$command -o $obj"
26684+ func_append command " -o $obj"
26685 fi
26686
26687 # Suppress compiler output if we already did a PIC compilation.
26688- command="$command$suppress_output"
26689+ func_append command "$suppress_output"
26690 func_show_eval_locale "$command" \
26691 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
26692
26693@@ -1622,13 +2290,13 @@ compiler."
26694 }
26695
26696 $opt_help || {
26697- test "$mode" = compile && func_mode_compile ${1+"$@"}
26698+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
26699 }
26700
26701 func_mode_help ()
26702 {
26703 # We need to display help for each of the modes.
26704- case $mode in
26705+ case $opt_mode in
26706 "")
26707 # Generic help is extracted from the usage comments
26708 # at the start of this file.
26709@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
26710
26711 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
26712 -no-suppress do not suppress compiler output for multiple passes
26713- -prefer-pic try to building PIC objects only
26714- -prefer-non-pic try to building non-PIC objects only
26715+ -prefer-pic try to build PIC objects only
26716+ -prefer-non-pic try to build non-PIC objects only
26717 -shared do not build a \`.o' file suitable for static linking
26718 -static only build a \`.o' file suitable for static linking
26719 -Wc,FLAG pass FLAG directly to the compiler
26720@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
26721 ;;
26722
26723 *)
26724- func_fatal_help "invalid operation mode \`$mode'"
26725+ func_fatal_help "invalid operation mode \`$opt_mode'"
26726 ;;
26727 esac
26728
26729@@ -1819,13 +2487,13 @@ if $opt_help; then
26730 else
26731 {
26732 func_help noexit
26733- for mode in compile link execute install finish uninstall clean; do
26734+ for opt_mode in compile link execute install finish uninstall clean; do
26735 func_mode_help
26736 done
26737 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
26738 {
26739 func_help noexit
26740- for mode in compile link execute install finish uninstall clean; do
26741+ for opt_mode in compile link execute install finish uninstall clean; do
26742 echo
26743 func_mode_help
26744 done
26745@@ -1854,13 +2522,16 @@ func_mode_execute ()
26746 func_fatal_help "you must specify a COMMAND"
26747
26748 # Handle -dlopen flags immediately.
26749- for file in $execute_dlfiles; do
26750+ for file in $opt_dlopen; do
26751 test -f "$file" \
26752 || func_fatal_help "\`$file' is not a file"
26753
26754 dir=
26755 case $file in
26756 *.la)
26757+ func_resolve_sysroot "$file"
26758+ file=$func_resolve_sysroot_result
26759+
26760 # Check to see that this really is a libtool archive.
26761 func_lalib_unsafe_p "$file" \
26762 || func_fatal_help "\`$lib' is not a valid libtool archive"
26763@@ -1882,7 +2553,7 @@ func_mode_execute ()
26764 dir="$func_dirname_result"
26765
26766 if test -f "$dir/$objdir/$dlname"; then
26767- dir="$dir/$objdir"
26768+ func_append dir "/$objdir"
26769 else
26770 if test ! -f "$dir/$dlname"; then
26771 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
26772@@ -1907,10 +2578,10 @@ func_mode_execute ()
26773 test -n "$absdir" && dir="$absdir"
26774
26775 # Now add the directory to shlibpath_var.
26776- if eval test -z \"\$$shlibpath_var\"; then
26777- eval $shlibpath_var=\$dir
26778+ if eval "test -z \"\$$shlibpath_var\""; then
26779+ eval "$shlibpath_var=\"\$dir\""
26780 else
26781- eval $shlibpath_var=\$dir:\$$shlibpath_var
26782+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
26783 fi
26784 done
26785
26786@@ -1939,8 +2610,7 @@ func_mode_execute ()
26787 ;;
26788 esac
26789 # Quote arguments (to preserve shell metacharacters).
26790- func_quote_for_eval "$file"
26791- args="$args $func_quote_for_eval_result"
26792+ func_append_quoted args "$file"
26793 done
26794
26795 if test "X$opt_dry_run" = Xfalse; then
26796@@ -1972,22 +2642,59 @@ func_mode_execute ()
26797 fi
26798 }
26799
26800-test "$mode" = execute && func_mode_execute ${1+"$@"}
26801+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
26802
26803
26804 # func_mode_finish arg...
26805 func_mode_finish ()
26806 {
26807 $opt_debug
26808- libdirs="$nonopt"
26809+ libs=
26810+ libdirs=
26811 admincmds=
26812
26813- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
26814- for dir
26815- do
26816- libdirs="$libdirs $dir"
26817- done
26818+ for opt in "$nonopt" ${1+"$@"}
26819+ do
26820+ if test -d "$opt"; then
26821+ func_append libdirs " $opt"
26822
26823+ elif test -f "$opt"; then
26824+ if func_lalib_unsafe_p "$opt"; then
26825+ func_append libs " $opt"
26826+ else
26827+ func_warning "\`$opt' is not a valid libtool archive"
26828+ fi
26829+
26830+ else
26831+ func_fatal_error "invalid argument \`$opt'"
26832+ fi
26833+ done
26834+
26835+ if test -n "$libs"; then
26836+ if test -n "$lt_sysroot"; then
26837+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
26838+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
26839+ else
26840+ sysroot_cmd=
26841+ fi
26842+
26843+ # Remove sysroot references
26844+ if $opt_dry_run; then
26845+ for lib in $libs; do
26846+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
26847+ done
26848+ else
26849+ tmpdir=`func_mktempdir`
26850+ for lib in $libs; do
26851+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
26852+ > $tmpdir/tmp-la
26853+ mv -f $tmpdir/tmp-la $lib
26854+ done
26855+ ${RM}r "$tmpdir"
26856+ fi
26857+ fi
26858+
26859+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
26860 for libdir in $libdirs; do
26861 if test -n "$finish_cmds"; then
26862 # Do each command in the finish commands.
26863@@ -1997,7 +2704,7 @@ func_mode_finish ()
26864 if test -n "$finish_eval"; then
26865 # Do the single finish_eval.
26866 eval cmds=\"$finish_eval\"
26867- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
26868+ $opt_dry_run || eval "$cmds" || func_append admincmds "
26869 $cmds"
26870 fi
26871 done
26872@@ -2006,53 +2713,55 @@ func_mode_finish ()
26873 # Exit here if they wanted silent mode.
26874 $opt_silent && exit $EXIT_SUCCESS
26875
26876- echo "----------------------------------------------------------------------"
26877- echo "Libraries have been installed in:"
26878- for libdir in $libdirs; do
26879- $ECHO " $libdir"
26880- done
26881- echo
26882- echo "If you ever happen to want to link against installed libraries"
26883- echo "in a given directory, LIBDIR, you must either use libtool, and"
26884- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
26885- echo "flag during linking and do at least one of the following:"
26886- if test -n "$shlibpath_var"; then
26887- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
26888- echo " during execution"
26889- fi
26890- if test -n "$runpath_var"; then
26891- echo " - add LIBDIR to the \`$runpath_var' environment variable"
26892- echo " during linking"
26893- fi
26894- if test -n "$hardcode_libdir_flag_spec"; then
26895- libdir=LIBDIR
26896- eval "flag=\"$hardcode_libdir_flag_spec\""
26897+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
26898+ echo "----------------------------------------------------------------------"
26899+ echo "Libraries have been installed in:"
26900+ for libdir in $libdirs; do
26901+ $ECHO " $libdir"
26902+ done
26903+ echo
26904+ echo "If you ever happen to want to link against installed libraries"
26905+ echo "in a given directory, LIBDIR, you must either use libtool, and"
26906+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
26907+ echo "flag during linking and do at least one of the following:"
26908+ if test -n "$shlibpath_var"; then
26909+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
26910+ echo " during execution"
26911+ fi
26912+ if test -n "$runpath_var"; then
26913+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
26914+ echo " during linking"
26915+ fi
26916+ if test -n "$hardcode_libdir_flag_spec"; then
26917+ libdir=LIBDIR
26918+ eval flag=\"$hardcode_libdir_flag_spec\"
26919
26920- $ECHO " - use the \`$flag' linker flag"
26921- fi
26922- if test -n "$admincmds"; then
26923- $ECHO " - have your system administrator run these commands:$admincmds"
26924- fi
26925- if test -f /etc/ld.so.conf; then
26926- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
26927- fi
26928- echo
26929+ $ECHO " - use the \`$flag' linker flag"
26930+ fi
26931+ if test -n "$admincmds"; then
26932+ $ECHO " - have your system administrator run these commands:$admincmds"
26933+ fi
26934+ if test -f /etc/ld.so.conf; then
26935+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
26936+ fi
26937+ echo
26938
26939- echo "See any operating system documentation about shared libraries for"
26940- case $host in
26941- solaris2.[6789]|solaris2.1[0-9])
26942- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
26943- echo "pages."
26944- ;;
26945- *)
26946- echo "more information, such as the ld(1) and ld.so(8) manual pages."
26947- ;;
26948- esac
26949- echo "----------------------------------------------------------------------"
26950+ echo "See any operating system documentation about shared libraries for"
26951+ case $host in
26952+ solaris2.[6789]|solaris2.1[0-9])
26953+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
26954+ echo "pages."
26955+ ;;
26956+ *)
26957+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
26958+ ;;
26959+ esac
26960+ echo "----------------------------------------------------------------------"
26961+ fi
26962 exit $EXIT_SUCCESS
26963 }
26964
26965-test "$mode" = finish && func_mode_finish ${1+"$@"}
26966+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
26967
26968
26969 # func_mode_install arg...
26970@@ -2077,7 +2786,7 @@ func_mode_install ()
26971 # The real first argument should be the name of the installation program.
26972 # Aesthetically quote it.
26973 func_quote_for_eval "$arg"
26974- install_prog="$install_prog$func_quote_for_eval_result"
26975+ func_append install_prog "$func_quote_for_eval_result"
26976 install_shared_prog=$install_prog
26977 case " $install_prog " in
26978 *[\\\ /]cp\ *) install_cp=: ;;
26979@@ -2097,7 +2806,7 @@ func_mode_install ()
26980 do
26981 arg2=
26982 if test -n "$dest"; then
26983- files="$files $dest"
26984+ func_append files " $dest"
26985 dest=$arg
26986 continue
26987 fi
26988@@ -2135,11 +2844,11 @@ func_mode_install ()
26989
26990 # Aesthetically quote the argument.
26991 func_quote_for_eval "$arg"
26992- install_prog="$install_prog $func_quote_for_eval_result"
26993+ func_append install_prog " $func_quote_for_eval_result"
26994 if test -n "$arg2"; then
26995 func_quote_for_eval "$arg2"
26996 fi
26997- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
26998+ func_append install_shared_prog " $func_quote_for_eval_result"
26999 done
27000
27001 test -z "$install_prog" && \
27002@@ -2151,7 +2860,7 @@ func_mode_install ()
27003 if test -n "$install_override_mode" && $no_mode; then
27004 if $install_cp; then :; else
27005 func_quote_for_eval "$install_override_mode"
27006- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
27007+ func_append install_shared_prog " -m $func_quote_for_eval_result"
27008 fi
27009 fi
27010
27011@@ -2209,10 +2918,13 @@ func_mode_install ()
27012 case $file in
27013 *.$libext)
27014 # Do the static libraries later.
27015- staticlibs="$staticlibs $file"
27016+ func_append staticlibs " $file"
27017 ;;
27018
27019 *.la)
27020+ func_resolve_sysroot "$file"
27021+ file=$func_resolve_sysroot_result
27022+
27023 # Check to see that this really is a libtool archive.
27024 func_lalib_unsafe_p "$file" \
27025 || func_fatal_help "\`$file' is not a valid libtool archive"
27026@@ -2226,23 +2938,30 @@ func_mode_install ()
27027 if test "X$destdir" = "X$libdir"; then
27028 case "$current_libdirs " in
27029 *" $libdir "*) ;;
27030- *) current_libdirs="$current_libdirs $libdir" ;;
27031+ *) func_append current_libdirs " $libdir" ;;
27032 esac
27033 else
27034 # Note the libdir as a future libdir.
27035 case "$future_libdirs " in
27036 *" $libdir "*) ;;
27037- *) future_libdirs="$future_libdirs $libdir" ;;
27038+ *) func_append future_libdirs " $libdir" ;;
27039 esac
27040 fi
27041
27042 func_dirname "$file" "/" ""
27043 dir="$func_dirname_result"
27044- dir="$dir$objdir"
27045+ func_append dir "$objdir"
27046
27047 if test -n "$relink_command"; then
27048+ # Strip any trailing slash from the destination.
27049+ func_stripname '' '/' "$libdir"
27050+ destlibdir=$func_stripname_result
27051+
27052+ func_stripname '' '/' "$destdir"
27053+ s_destdir=$func_stripname_result
27054+
27055 # Determine the prefix the user has applied to our future dir.
27056- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
27057+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
27058
27059 # Don't allow the user to place us outside of our expected
27060 # location b/c this prevents finding dependent libraries that
27061@@ -2315,7 +3034,7 @@ func_mode_install ()
27062 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
27063
27064 # Maybe install the static library, too.
27065- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
27066+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
27067 ;;
27068
27069 *.lo)
27070@@ -2503,7 +3222,7 @@ func_mode_install ()
27071 test -n "$future_libdirs" && \
27072 func_warning "remember to run \`$progname --finish$future_libdirs'"
27073
27074- if test -n "$current_libdirs" && $opt_finish; then
27075+ if test -n "$current_libdirs"; then
27076 # Maybe just do a dry run.
27077 $opt_dry_run && current_libdirs=" -n$current_libdirs"
27078 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
27079@@ -2512,7 +3231,7 @@ func_mode_install ()
27080 fi
27081 }
27082
27083-test "$mode" = install && func_mode_install ${1+"$@"}
27084+test "$opt_mode" = install && func_mode_install ${1+"$@"}
27085
27086
27087 # func_generate_dlsyms outputname originator pic_p
27088@@ -2559,6 +3278,18 @@ extern \"C\" {
27089 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
27090 #endif
27091
27092+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
27093+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
27094+/* DATA imports from DLLs on WIN32 con't be const, because runtime
27095+ relocations are performed -- see ld's documentation on pseudo-relocs. */
27096+# define LT_DLSYM_CONST
27097+#elif defined(__osf__)
27098+/* This system does not cope well with relocations in const data. */
27099+# define LT_DLSYM_CONST
27100+#else
27101+# define LT_DLSYM_CONST const
27102+#endif
27103+
27104 /* External symbol declarations for the compiler. */\
27105 "
27106
27107@@ -2570,21 +3301,22 @@ extern \"C\" {
27108 # Add our own program objects to the symbol list.
27109 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
27110 for progfile in $progfiles; do
27111- func_verbose "extracting global C symbols from \`$progfile'"
27112- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
27113+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
27114+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
27115+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
27116 done
27117
27118 if test -n "$exclude_expsyms"; then
27119 $opt_dry_run || {
27120- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
27121- $MV "$nlist"T "$nlist"
27122+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
27123+ eval '$MV "$nlist"T "$nlist"'
27124 }
27125 fi
27126
27127 if test -n "$export_symbols_regex"; then
27128 $opt_dry_run || {
27129- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
27130- $MV "$nlist"T "$nlist"
27131+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
27132+ eval '$MV "$nlist"T "$nlist"'
27133 }
27134 fi
27135
27136@@ -2593,23 +3325,23 @@ extern \"C\" {
27137 export_symbols="$output_objdir/$outputname.exp"
27138 $opt_dry_run || {
27139 $RM $export_symbols
27140- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
27141+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
27142 case $host in
27143 *cygwin* | *mingw* | *cegcc* )
27144- echo EXPORTS > "$output_objdir/$outputname.def"
27145- cat "$export_symbols" >> "$output_objdir/$outputname.def"
27146+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
27147+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
27148 ;;
27149 esac
27150 }
27151 else
27152 $opt_dry_run || {
27153- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
27154- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
27155- $MV "$nlist"T "$nlist"
27156+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
27157+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
27158+ eval '$MV "$nlist"T "$nlist"'
27159 case $host in
27160 *cygwin* | *mingw* | *cegcc* )
27161- echo EXPORTS > "$output_objdir/$outputname.def"
27162- cat "$nlist" >> "$output_objdir/$outputname.def"
27163+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
27164+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
27165 ;;
27166 esac
27167 }
27168@@ -2620,10 +3352,52 @@ extern \"C\" {
27169 func_verbose "extracting global C symbols from \`$dlprefile'"
27170 func_basename "$dlprefile"
27171 name="$func_basename_result"
27172- $opt_dry_run || {
27173- $ECHO ": $name " >> "$nlist"
27174- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
27175- }
27176+ case $host in
27177+ *cygwin* | *mingw* | *cegcc* )
27178+ # if an import library, we need to obtain dlname
27179+ if func_win32_import_lib_p "$dlprefile"; then
27180+ func_tr_sh "$dlprefile"
27181+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
27182+ dlprefile_dlbasename=""
27183+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
27184+ # Use subshell, to avoid clobbering current variable values
27185+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
27186+ if test -n "$dlprefile_dlname" ; then
27187+ func_basename "$dlprefile_dlname"
27188+ dlprefile_dlbasename="$func_basename_result"
27189+ else
27190+ # no lafile. user explicitly requested -dlpreopen <import library>.
27191+ $sharedlib_from_linklib_cmd "$dlprefile"
27192+ dlprefile_dlbasename=$sharedlib_from_linklib_result
27193+ fi
27194+ fi
27195+ $opt_dry_run || {
27196+ if test -n "$dlprefile_dlbasename" ; then
27197+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
27198+ else
27199+ func_warning "Could not compute DLL name from $name"
27200+ eval '$ECHO ": $name " >> "$nlist"'
27201+ fi
27202+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
27203+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
27204+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
27205+ }
27206+ else # not an import lib
27207+ $opt_dry_run || {
27208+ eval '$ECHO ": $name " >> "$nlist"'
27209+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
27210+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
27211+ }
27212+ fi
27213+ ;;
27214+ *)
27215+ $opt_dry_run || {
27216+ eval '$ECHO ": $name " >> "$nlist"'
27217+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
27218+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
27219+ }
27220+ ;;
27221+ esac
27222 done
27223
27224 $opt_dry_run || {
27225@@ -2661,26 +3435,9 @@ typedef struct {
27226 const char *name;
27227 void *address;
27228 } lt_dlsymlist;
27229-"
27230- case $host in
27231- *cygwin* | *mingw* | *cegcc* )
27232- echo >> "$output_objdir/$my_dlsyms" "\
27233-/* DATA imports from DLLs on WIN32 con't be const, because
27234- runtime relocations are performed -- see ld's documentation
27235- on pseudo-relocs. */"
27236- lt_dlsym_const= ;;
27237- *osf5*)
27238- echo >> "$output_objdir/$my_dlsyms" "\
27239-/* This system does not cope well with relocations in const data */"
27240- lt_dlsym_const= ;;
27241- *)
27242- lt_dlsym_const=const ;;
27243- esac
27244-
27245- echo >> "$output_objdir/$my_dlsyms" "\
27246-extern $lt_dlsym_const lt_dlsymlist
27247+extern LT_DLSYM_CONST lt_dlsymlist
27248 lt_${my_prefix}_LTX_preloaded_symbols[];
27249-$lt_dlsym_const lt_dlsymlist
27250+LT_DLSYM_CONST lt_dlsymlist
27251 lt_${my_prefix}_LTX_preloaded_symbols[] =
27252 {\
27253 { \"$my_originator\", (void *) 0 },"
27254@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
27255 for arg in $LTCFLAGS; do
27256 case $arg in
27257 -pie | -fpie | -fPIE) ;;
27258- *) symtab_cflags="$symtab_cflags $arg" ;;
27259+ *) func_append symtab_cflags " $arg" ;;
27260 esac
27261 done
27262
27263@@ -2796,9 +3553,11 @@ func_win32_libid ()
27264 win32_libid_type="x86 archive import"
27265 ;;
27266 *ar\ archive*) # could be an import, or static
27267- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
27268- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
27269- win32_nmres=`$NM -f posix -A "$1" |
27270+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
27271+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
27272+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
27273+ func_to_tool_file "$1" func_convert_file_msys_to_w32
27274+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
27275 $SED -n -e '
27276 1,100{
27277 / I /{
27278@@ -2827,6 +3586,131 @@ func_win32_libid ()
27279 $ECHO "$win32_libid_type"
27280 }
27281
27282+# func_cygming_dll_for_implib ARG
27283+#
27284+# Platform-specific function to extract the
27285+# name of the DLL associated with the specified
27286+# import library ARG.
27287+# Invoked by eval'ing the libtool variable
27288+# $sharedlib_from_linklib_cmd
27289+# Result is available in the variable
27290+# $sharedlib_from_linklib_result
27291+func_cygming_dll_for_implib ()
27292+{
27293+ $opt_debug
27294+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
27295+}
27296+
27297+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
27298+#
27299+# The is the core of a fallback implementation of a
27300+# platform-specific function to extract the name of the
27301+# DLL associated with the specified import library LIBNAME.
27302+#
27303+# SECTION_NAME is either .idata$6 or .idata$7, depending
27304+# on the platform and compiler that created the implib.
27305+#
27306+# Echos the name of the DLL associated with the
27307+# specified import library.
27308+func_cygming_dll_for_implib_fallback_core ()
27309+{
27310+ $opt_debug
27311+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
27312+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
27313+ $SED '/^Contents of section '"$match_literal"':/{
27314+ # Place marker at beginning of archive member dllname section
27315+ s/.*/====MARK====/
27316+ p
27317+ d
27318+ }
27319+ # These lines can sometimes be longer than 43 characters, but
27320+ # are always uninteresting
27321+ /:[ ]*file format pe[i]\{,1\}-/d
27322+ /^In archive [^:]*:/d
27323+ # Ensure marker is printed
27324+ /^====MARK====/p
27325+ # Remove all lines with less than 43 characters
27326+ /^.\{43\}/!d
27327+ # From remaining lines, remove first 43 characters
27328+ s/^.\{43\}//' |
27329+ $SED -n '
27330+ # Join marker and all lines until next marker into a single line
27331+ /^====MARK====/ b para
27332+ H
27333+ $ b para
27334+ b
27335+ :para
27336+ x
27337+ s/\n//g
27338+ # Remove the marker
27339+ s/^====MARK====//
27340+ # Remove trailing dots and whitespace
27341+ s/[\. \t]*$//
27342+ # Print
27343+ /./p' |
27344+ # we now have a list, one entry per line, of the stringified
27345+ # contents of the appropriate section of all members of the
27346+ # archive which possess that section. Heuristic: eliminate
27347+ # all those which have a first or second character that is
27348+ # a '.' (that is, objdump's representation of an unprintable
27349+ # character.) This should work for all archives with less than
27350+ # 0x302f exports -- but will fail for DLLs whose name actually
27351+ # begins with a literal '.' or a single character followed by
27352+ # a '.'.
27353+ #
27354+ # Of those that remain, print the first one.
27355+ $SED -e '/^\./d;/^.\./d;q'
27356+}
27357+
27358+# func_cygming_gnu_implib_p ARG
27359+# This predicate returns with zero status (TRUE) if
27360+# ARG is a GNU/binutils-style import library. Returns
27361+# with nonzero status (FALSE) otherwise.
27362+func_cygming_gnu_implib_p ()
27363+{
27364+ $opt_debug
27365+ func_to_tool_file "$1" func_convert_file_msys_to_w32
27366+ 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)$'`
27367+ test -n "$func_cygming_gnu_implib_tmp"
27368+}
27369+
27370+# func_cygming_ms_implib_p ARG
27371+# This predicate returns with zero status (TRUE) if
27372+# ARG is an MS-style import library. Returns
27373+# with nonzero status (FALSE) otherwise.
27374+func_cygming_ms_implib_p ()
27375+{
27376+ $opt_debug
27377+ func_to_tool_file "$1" func_convert_file_msys_to_w32
27378+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
27379+ test -n "$func_cygming_ms_implib_tmp"
27380+}
27381+
27382+# func_cygming_dll_for_implib_fallback ARG
27383+# Platform-specific function to extract the
27384+# name of the DLL associated with the specified
27385+# import library ARG.
27386+#
27387+# This fallback implementation is for use when $DLLTOOL
27388+# does not support the --identify-strict option.
27389+# Invoked by eval'ing the libtool variable
27390+# $sharedlib_from_linklib_cmd
27391+# Result is available in the variable
27392+# $sharedlib_from_linklib_result
27393+func_cygming_dll_for_implib_fallback ()
27394+{
27395+ $opt_debug
27396+ if func_cygming_gnu_implib_p "$1" ; then
27397+ # binutils import library
27398+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
27399+ elif func_cygming_ms_implib_p "$1" ; then
27400+ # ms-generated import library
27401+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
27402+ else
27403+ # unknown
27404+ sharedlib_from_linklib_result=""
27405+ fi
27406+}
27407
27408
27409 # func_extract_an_archive dir oldlib
27410@@ -3014,7 +3898,110 @@ func_fallback_echo ()
27411 _LTECHO_EOF'
27412 }
27413 ECHO=\"$qECHO\"
27414- fi\
27415+ fi
27416+
27417+# Very basic option parsing. These options are (a) specific to
27418+# the libtool wrapper, (b) are identical between the wrapper
27419+# /script/ and the wrapper /executable/ which is used only on
27420+# windows platforms, and (c) all begin with the string "--lt-"
27421+# (application programs are unlikely to have options which match
27422+# this pattern).
27423+#
27424+# There are only two supported options: --lt-debug and
27425+# --lt-dump-script. There is, deliberately, no --lt-help.
27426+#
27427+# The first argument to this parsing function should be the
27428+# script's $0 value, followed by "$@".
27429+lt_option_debug=
27430+func_parse_lt_options ()
27431+{
27432+ lt_script_arg0=\$0
27433+ shift
27434+ for lt_opt
27435+ do
27436+ case \"\$lt_opt\" in
27437+ --lt-debug) lt_option_debug=1 ;;
27438+ --lt-dump-script)
27439+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
27440+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
27441+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
27442+ cat \"\$lt_dump_D/\$lt_dump_F\"
27443+ exit 0
27444+ ;;
27445+ --lt-*)
27446+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
27447+ exit 1
27448+ ;;
27449+ esac
27450+ done
27451+
27452+ # Print the debug banner immediately:
27453+ if test -n \"\$lt_option_debug\"; then
27454+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
27455+ fi
27456+}
27457+
27458+# Used when --lt-debug. Prints its arguments to stdout
27459+# (redirection is the responsibility of the caller)
27460+func_lt_dump_args ()
27461+{
27462+ lt_dump_args_N=1;
27463+ for lt_arg
27464+ do
27465+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
27466+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
27467+ done
27468+}
27469+
27470+# Core function for launching the target application
27471+func_exec_program_core ()
27472+{
27473+"
27474+ case $host in
27475+ # Backslashes separate directories on plain windows
27476+ *-*-mingw | *-*-os2* | *-cegcc*)
27477+ $ECHO "\
27478+ if test -n \"\$lt_option_debug\"; then
27479+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
27480+ func_lt_dump_args \${1+\"\$@\"} 1>&2
27481+ fi
27482+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
27483+"
27484+ ;;
27485+
27486+ *)
27487+ $ECHO "\
27488+ if test -n \"\$lt_option_debug\"; then
27489+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
27490+ func_lt_dump_args \${1+\"\$@\"} 1>&2
27491+ fi
27492+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
27493+"
27494+ ;;
27495+ esac
27496+ $ECHO "\
27497+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
27498+ exit 1
27499+}
27500+
27501+# A function to encapsulate launching the target application
27502+# Strips options in the --lt-* namespace from \$@ and
27503+# launches target application with the remaining arguments.
27504+func_exec_program ()
27505+{
27506+ for lt_wr_arg
27507+ do
27508+ case \$lt_wr_arg in
27509+ --lt-*) ;;
27510+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
27511+ esac
27512+ shift
27513+ done
27514+ func_exec_program_core \${1+\"\$@\"}
27515+}
27516+
27517+ # Parse options
27518+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
27519
27520 # Find the directory that this script lives in.
27521 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
27522@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
27523
27524 # relink executable if necessary
27525 if test -n \"\$relink_command\"; then
27526- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
27527+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
27528 else
27529 $ECHO \"\$relink_command_output\" >&2
27530 $RM \"\$progdir/\$file\"
27531@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
27532
27533 if test -f \"\$progdir/\$program\"; then"
27534
27535+ # fixup the dll searchpath if we need to.
27536+ #
27537+ # Fix the DLL searchpath if we need to. Do this before prepending
27538+ # to shlibpath, because on Windows, both are PATH and uninstalled
27539+ # libraries must come first.
27540+ if test -n "$dllsearchpath"; then
27541+ $ECHO "\
27542+ # Add the dll search path components to the executable PATH
27543+ PATH=$dllsearchpath:\$PATH
27544+"
27545+ fi
27546+
27547 # Export our shlibpath_var if we have one.
27548 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
27549 $ECHO "\
27550@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
27551 "
27552 fi
27553
27554- # fixup the dll searchpath if we need to.
27555- if test -n "$dllsearchpath"; then
27556- $ECHO "\
27557- # Add the dll search path components to the executable PATH
27558- PATH=$dllsearchpath:\$PATH
27559-"
27560- fi
27561-
27562 $ECHO "\
27563 if test \"\$libtool_execute_magic\" != \"$magic\"; then
27564 # Run the actual program with our arguments.
27565-"
27566- case $host in
27567- # Backslashes separate directories on plain windows
27568- *-*-mingw | *-*-os2* | *-cegcc*)
27569- $ECHO "\
27570- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
27571-"
27572- ;;
27573-
27574- *)
27575- $ECHO "\
27576- exec \"\$progdir/\$program\" \${1+\"\$@\"}
27577-"
27578- ;;
27579- esac
27580- $ECHO "\
27581- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
27582- exit 1
27583+ func_exec_program \${1+\"\$@\"}
27584 fi
27585 else
27586 # The program doesn't exist.
27587@@ -3158,166 +4132,6 @@ fi\
27588 }
27589
27590
27591-# func_to_host_path arg
27592-#
27593-# Convert paths to host format when used with build tools.
27594-# Intended for use with "native" mingw (where libtool itself
27595-# is running under the msys shell), or in the following cross-
27596-# build environments:
27597-# $build $host
27598-# mingw (msys) mingw [e.g. native]
27599-# cygwin mingw
27600-# *nix + wine mingw
27601-# where wine is equipped with the `winepath' executable.
27602-# In the native mingw case, the (msys) shell automatically
27603-# converts paths for any non-msys applications it launches,
27604-# but that facility isn't available from inside the cwrapper.
27605-# Similar accommodations are necessary for $host mingw and
27606-# $build cygwin. Calling this function does no harm for other
27607-# $host/$build combinations not listed above.
27608-#
27609-# ARG is the path (on $build) that should be converted to
27610-# the proper representation for $host. The result is stored
27611-# in $func_to_host_path_result.
27612-func_to_host_path ()
27613-{
27614- func_to_host_path_result="$1"
27615- if test -n "$1"; then
27616- case $host in
27617- *mingw* )
27618- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
27619- case $build in
27620- *mingw* ) # actually, msys
27621- # awkward: cmd appends spaces to result
27622- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
27623- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
27624- ;;
27625- *cygwin* )
27626- func_to_host_path_result=`cygpath -w "$1" |
27627- $SED -e "$lt_sed_naive_backslashify"`
27628- ;;
27629- * )
27630- # Unfortunately, winepath does not exit with a non-zero
27631- # error code, so we are forced to check the contents of
27632- # stdout. On the other hand, if the command is not
27633- # found, the shell will set an exit code of 127 and print
27634- # *an error message* to stdout. So we must check for both
27635- # error code of zero AND non-empty stdout, which explains
27636- # the odd construction:
27637- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
27638- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
27639- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
27640- $SED -e "$lt_sed_naive_backslashify"`
27641- else
27642- # Allow warning below.
27643- func_to_host_path_result=
27644- fi
27645- ;;
27646- esac
27647- if test -z "$func_to_host_path_result" ; then
27648- func_error "Could not determine host path corresponding to"
27649- func_error " \`$1'"
27650- func_error "Continuing, but uninstalled executables may not work."
27651- # Fallback:
27652- func_to_host_path_result="$1"
27653- fi
27654- ;;
27655- esac
27656- fi
27657-}
27658-# end: func_to_host_path
27659-
27660-# func_to_host_pathlist arg
27661-#
27662-# Convert pathlists to host format when used with build tools.
27663-# See func_to_host_path(), above. This function supports the
27664-# following $build/$host combinations (but does no harm for
27665-# combinations not listed here):
27666-# $build $host
27667-# mingw (msys) mingw [e.g. native]
27668-# cygwin mingw
27669-# *nix + wine mingw
27670-#
27671-# Path separators are also converted from $build format to
27672-# $host format. If ARG begins or ends with a path separator
27673-# character, it is preserved (but converted to $host format)
27674-# on output.
27675-#
27676-# ARG is a pathlist (on $build) that should be converted to
27677-# the proper representation on $host. The result is stored
27678-# in $func_to_host_pathlist_result.
27679-func_to_host_pathlist ()
27680-{
27681- func_to_host_pathlist_result="$1"
27682- if test -n "$1"; then
27683- case $host in
27684- *mingw* )
27685- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
27686- # Remove leading and trailing path separator characters from
27687- # ARG. msys behavior is inconsistent here, cygpath turns them
27688- # into '.;' and ';.', and winepath ignores them completely.
27689- func_stripname : : "$1"
27690- func_to_host_pathlist_tmp1=$func_stripname_result
27691- case $build in
27692- *mingw* ) # Actually, msys.
27693- # Awkward: cmd appends spaces to result.
27694- func_to_host_pathlist_result=`
27695- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
27696- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
27697- ;;
27698- *cygwin* )
27699- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
27700- $SED -e "$lt_sed_naive_backslashify"`
27701- ;;
27702- * )
27703- # unfortunately, winepath doesn't convert pathlists
27704- func_to_host_pathlist_result=""
27705- func_to_host_pathlist_oldIFS=$IFS
27706- IFS=:
27707- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
27708- IFS=$func_to_host_pathlist_oldIFS
27709- if test -n "$func_to_host_pathlist_f" ; then
27710- func_to_host_path "$func_to_host_pathlist_f"
27711- if test -n "$func_to_host_path_result" ; then
27712- if test -z "$func_to_host_pathlist_result" ; then
27713- func_to_host_pathlist_result="$func_to_host_path_result"
27714- else
27715- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
27716- fi
27717- fi
27718- fi
27719- done
27720- IFS=$func_to_host_pathlist_oldIFS
27721- ;;
27722- esac
27723- if test -z "$func_to_host_pathlist_result"; then
27724- func_error "Could not determine the host path(s) corresponding to"
27725- func_error " \`$1'"
27726- func_error "Continuing, but uninstalled executables may not work."
27727- # Fallback. This may break if $1 contains DOS-style drive
27728- # specifications. The fix is not to complicate the expression
27729- # below, but for the user to provide a working wine installation
27730- # with winepath so that path translation in the cross-to-mingw
27731- # case works properly.
27732- lt_replace_pathsep_nix_to_dos="s|:|;|g"
27733- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
27734- $SED -e "$lt_replace_pathsep_nix_to_dos"`
27735- fi
27736- # Now, add the leading and trailing path separators back
27737- case "$1" in
27738- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
27739- ;;
27740- esac
27741- case "$1" in
27742- *: ) func_append func_to_host_pathlist_result ";"
27743- ;;
27744- esac
27745- ;;
27746- esac
27747- fi
27748-}
27749-# end: func_to_host_pathlist
27750-
27751 # func_emit_cwrapperexe_src
27752 # emit the source code for a wrapper executable on stdout
27753 # Must ONLY be called from within func_mode_link because
27754@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
27755
27756 This wrapper executable should never be moved out of the build directory.
27757 If it is, it will not operate correctly.
27758-
27759- Currently, it simply execs the wrapper *script* "$SHELL $output",
27760- but could eventually absorb all of the scripts functionality and
27761- exec $objdir/$outputname directly.
27762 */
27763 EOF
27764 cat <<"EOF"
27765@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
27766 if (stale) { free ((void *) stale); stale = 0; } \
27767 } while (0)
27768
27769-#undef LTWRAPPER_DEBUGPRINTF
27770-#if defined LT_DEBUGWRAPPER
27771-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
27772-static void
27773-ltwrapper_debugprintf (const char *fmt, ...)
27774-{
27775- va_list args;
27776- va_start (args, fmt);
27777- (void) vfprintf (stderr, fmt, args);
27778- va_end (args);
27779-}
27780+#if defined(LT_DEBUGWRAPPER)
27781+static int lt_debug = 1;
27782 #else
27783-# define LTWRAPPER_DEBUGPRINTF(args)
27784+static int lt_debug = 0;
27785 #endif
27786
27787-const char *program_name = NULL;
27788+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
27789
27790 void *xmalloc (size_t num);
27791 char *xstrdup (const char *string);
27792@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
27793 int make_executable (const char *path);
27794 int check_executable (const char *path);
27795 char *strendzap (char *str, const char *pat);
27796-void lt_fatal (const char *message, ...);
27797+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
27798+void lt_fatal (const char *file, int line, const char *message, ...);
27799+static const char *nonnull (const char *s);
27800+static const char *nonempty (const char *s);
27801 void lt_setenv (const char *name, const char *value);
27802 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
27803 void lt_update_exe_path (const char *name, const char *value);
27804@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
27805 EOF
27806
27807 cat <<EOF
27808-const char * MAGIC_EXE = "$magic_exe";
27809+volatile const char * MAGIC_EXE = "$magic_exe";
27810 const char * LIB_PATH_VARNAME = "$shlibpath_var";
27811 EOF
27812
27813 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
27814- func_to_host_pathlist "$temp_rpath"
27815+ func_to_host_path "$temp_rpath"
27816 cat <<EOF
27817-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
27818+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
27819 EOF
27820 else
27821 cat <<"EOF"
27822@@ -3513,10 +4317,10 @@ EOF
27823 fi
27824
27825 if test -n "$dllsearchpath"; then
27826- func_to_host_pathlist "$dllsearchpath:"
27827+ func_to_host_path "$dllsearchpath:"
27828 cat <<EOF
27829 const char * EXE_PATH_VARNAME = "PATH";
27830-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
27831+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
27832 EOF
27833 else
27834 cat <<"EOF"
27835@@ -3539,12 +4343,10 @@ EOF
27836 cat <<"EOF"
27837
27838 #define LTWRAPPER_OPTION_PREFIX "--lt-"
27839-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
27840
27841-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
27842 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
27843-
27844 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
27845+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
27846
27847 int
27848 main (int argc, char *argv[])
27849@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
27850 int i;
27851
27852 program_name = (char *) xstrdup (base_name (argv[0]));
27853- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
27854- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
27855+ newargz = XMALLOC (char *, argc + 1);
27856
27857- /* very simple arg parsing; don't want to rely on getopt */
27858+ /* very simple arg parsing; don't want to rely on getopt
27859+ * also, copy all non cwrapper options to newargz, except
27860+ * argz[0], which is handled differently
27861+ */
27862+ newargc=0;
27863 for (i = 1; i < argc; i++)
27864 {
27865 if (strcmp (argv[i], dumpscript_opt) == 0)
27866@@ -3581,21 +4386,54 @@ EOF
27867 lt_dump_script (stdout);
27868 return 0;
27869 }
27870+ if (strcmp (argv[i], debug_opt) == 0)
27871+ {
27872+ lt_debug = 1;
27873+ continue;
27874+ }
27875+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
27876+ {
27877+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
27878+ namespace, but it is not one of the ones we know about and
27879+ have already dealt with, above (inluding dump-script), then
27880+ report an error. Otherwise, targets might begin to believe
27881+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
27882+ namespace. The first time any user complains about this, we'll
27883+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
27884+ or a configure.ac-settable value.
27885+ */
27886+ lt_fatal (__FILE__, __LINE__,
27887+ "unrecognized %s option: '%s'",
27888+ ltwrapper_option_prefix, argv[i]);
27889+ }
27890+ /* otherwise ... */
27891+ newargz[++newargc] = xstrdup (argv[i]);
27892 }
27893+ newargz[++newargc] = NULL;
27894+
27895+EOF
27896+ cat <<EOF
27897+ /* The GNU banner must be the first non-error debug message */
27898+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
27899+EOF
27900+ cat <<"EOF"
27901+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
27902+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
27903
27904- newargz = XMALLOC (char *, argc + 1);
27905 tmp_pathspec = find_executable (argv[0]);
27906 if (tmp_pathspec == NULL)
27907- lt_fatal ("Couldn't find %s", argv[0]);
27908- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
27909- tmp_pathspec));
27910+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
27911+ lt_debugprintf (__FILE__, __LINE__,
27912+ "(main) found exe (before symlink chase) at: %s\n",
27913+ tmp_pathspec);
27914
27915 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
27916- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
27917- actual_cwrapper_path));
27918+ lt_debugprintf (__FILE__, __LINE__,
27919+ "(main) found exe (after symlink chase) at: %s\n",
27920+ actual_cwrapper_path);
27921 XFREE (tmp_pathspec);
27922
27923- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
27924+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
27925 strendzap (actual_cwrapper_path, actual_cwrapper_name);
27926
27927 /* wrapper name transforms */
27928@@ -3613,8 +4451,9 @@ EOF
27929 target_name = tmp_pathspec;
27930 tmp_pathspec = 0;
27931
27932- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
27933- target_name));
27934+ lt_debugprintf (__FILE__, __LINE__,
27935+ "(main) libtool target name: %s\n",
27936+ target_name);
27937 EOF
27938
27939 cat <<EOF
27940@@ -3664,35 +4503,19 @@ EOF
27941
27942 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
27943 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
27944- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
27945+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
27946+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
27947+ because on Windows, both *_VARNAMEs are PATH but uninstalled
27948+ libraries must come first. */
27949 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
27950+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
27951
27952- newargc=0;
27953- for (i = 1; i < argc; i++)
27954- {
27955- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
27956- {
27957- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
27958- namespace, but it is not one of the ones we know about and
27959- have already dealt with, above (inluding dump-script), then
27960- report an error. Otherwise, targets might begin to believe
27961- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
27962- namespace. The first time any user complains about this, we'll
27963- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
27964- or a configure.ac-settable value.
27965- */
27966- lt_fatal ("Unrecognized option in %s namespace: '%s'",
27967- ltwrapper_option_prefix, argv[i]);
27968- }
27969- /* otherwise ... */
27970- newargz[++newargc] = xstrdup (argv[i]);
27971- }
27972- newargz[++newargc] = NULL;
27973-
27974- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
27975+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
27976+ nonnull (lt_argv_zero));
27977 for (i = 0; i < newargc; i++)
27978 {
27979- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
27980+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
27981+ i, nonnull (newargz[i]));
27982 }
27983
27984 EOF
27985@@ -3706,7 +4529,9 @@ EOF
27986 if (rval == -1)
27987 {
27988 /* failed to start process */
27989- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
27990+ lt_debugprintf (__FILE__, __LINE__,
27991+ "(main) failed to launch target \"%s\": %s\n",
27992+ lt_argv_zero, nonnull (strerror (errno)));
27993 return 127;
27994 }
27995 return rval;
27996@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
27997 {
27998 void *p = (void *) malloc (num);
27999 if (!p)
28000- lt_fatal ("Memory exhausted");
28001+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
28002
28003 return p;
28004 }
28005@@ -3762,8 +4587,8 @@ check_executable (const char *path)
28006 {
28007 struct stat st;
28008
28009- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
28010- path ? (*path ? path : "EMPTY!") : "NULL!"));
28011+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
28012+ nonempty (path));
28013 if ((!path) || (!*path))
28014 return 0;
28015
28016@@ -3780,8 +4605,8 @@ make_executable (const char *path)
28017 int rval = 0;
28018 struct stat st;
28019
28020- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
28021- path ? (*path ? path : "EMPTY!") : "NULL!"));
28022+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
28023+ nonempty (path));
28024 if ((!path) || (!*path))
28025 return 0;
28026
28027@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
28028 int tmp_len;
28029 char *concat_name;
28030
28031- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
28032- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
28033+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
28034+ nonempty (wrapper));
28035
28036 if ((wrapper == NULL) || (*wrapper == '\0'))
28037 return NULL;
28038@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
28039 {
28040 /* empty path: current directory */
28041 if (getcwd (tmp, LT_PATHMAX) == NULL)
28042- lt_fatal ("getcwd failed");
28043+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
28044+ nonnull (strerror (errno)));
28045 tmp_len = strlen (tmp);
28046 concat_name =
28047 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
28048@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
28049 }
28050 /* Relative path | not found in path: prepend cwd */
28051 if (getcwd (tmp, LT_PATHMAX) == NULL)
28052- lt_fatal ("getcwd failed");
28053+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
28054+ nonnull (strerror (errno)));
28055 tmp_len = strlen (tmp);
28056 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
28057 memcpy (concat_name, tmp, tmp_len);
28058@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
28059 int has_symlinks = 0;
28060 while (strlen (tmp_pathspec) && !has_symlinks)
28061 {
28062- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
28063- tmp_pathspec));
28064+ lt_debugprintf (__FILE__, __LINE__,
28065+ "checking path component for symlinks: %s\n",
28066+ tmp_pathspec);
28067 if (lstat (tmp_pathspec, &s) == 0)
28068 {
28069 if (S_ISLNK (s.st_mode) != 0)
28070@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
28071 }
28072 else
28073 {
28074- char *errstr = strerror (errno);
28075- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
28076+ lt_fatal (__FILE__, __LINE__,
28077+ "error accessing file \"%s\": %s",
28078+ tmp_pathspec, nonnull (strerror (errno)));
28079 }
28080 }
28081 XFREE (tmp_pathspec);
28082@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
28083 tmp_pathspec = realpath (pathspec, buf);
28084 if (tmp_pathspec == 0)
28085 {
28086- lt_fatal ("Could not follow symlinks for %s", pathspec);
28087+ lt_fatal (__FILE__, __LINE__,
28088+ "could not follow symlinks for %s", pathspec);
28089 }
28090 return xstrdup (tmp_pathspec);
28091 #endif
28092@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
28093 return str;
28094 }
28095
28096+void
28097+lt_debugprintf (const char *file, int line, const char *fmt, ...)
28098+{
28099+ va_list args;
28100+ if (lt_debug)
28101+ {
28102+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
28103+ va_start (args, fmt);
28104+ (void) vfprintf (stderr, fmt, args);
28105+ va_end (args);
28106+ }
28107+}
28108+
28109 static void
28110-lt_error_core (int exit_status, const char *mode,
28111+lt_error_core (int exit_status, const char *file,
28112+ int line, const char *mode,
28113 const char *message, va_list ap)
28114 {
28115- fprintf (stderr, "%s: %s: ", program_name, mode);
28116+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
28117 vfprintf (stderr, message, ap);
28118 fprintf (stderr, ".\n");
28119
28120@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
28121 }
28122
28123 void
28124-lt_fatal (const char *message, ...)
28125+lt_fatal (const char *file, int line, const char *message, ...)
28126 {
28127 va_list ap;
28128 va_start (ap, message);
28129- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
28130+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
28131 va_end (ap);
28132 }
28133
28134+static const char *
28135+nonnull (const char *s)
28136+{
28137+ return s ? s : "(null)";
28138+}
28139+
28140+static const char *
28141+nonempty (const char *s)
28142+{
28143+ return (s && !*s) ? "(empty)" : nonnull (s);
28144+}
28145+
28146 void
28147 lt_setenv (const char *name, const char *value)
28148 {
28149- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
28150- (name ? name : "<NULL>"),
28151- (value ? value : "<NULL>")));
28152+ lt_debugprintf (__FILE__, __LINE__,
28153+ "(lt_setenv) setting '%s' to '%s'\n",
28154+ nonnull (name), nonnull (value));
28155 {
28156 #ifdef HAVE_SETENV
28157 /* always make a copy, for consistency with !HAVE_SETENV */
28158@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
28159 void
28160 lt_update_exe_path (const char *name, const char *value)
28161 {
28162- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
28163- (name ? name : "<NULL>"),
28164- (value ? value : "<NULL>")));
28165+ lt_debugprintf (__FILE__, __LINE__,
28166+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
28167+ nonnull (name), nonnull (value));
28168
28169 if (name && *name && value && *value)
28170 {
28171@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
28172 void
28173 lt_update_lib_path (const char *name, const char *value)
28174 {
28175- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
28176- (name ? name : "<NULL>"),
28177- (value ? value : "<NULL>")));
28178+ lt_debugprintf (__FILE__, __LINE__,
28179+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
28180+ nonnull (name), nonnull (value));
28181
28182 if (name && *name && value && *value)
28183 {
28184@@ -4222,7 +5078,7 @@ EOF
28185 func_win32_import_lib_p ()
28186 {
28187 $opt_debug
28188- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
28189+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
28190 *import*) : ;;
28191 *) false ;;
28192 esac
28193@@ -4401,9 +5257,9 @@ func_mode_link ()
28194 ;;
28195 *)
28196 if test "$prev" = dlfiles; then
28197- dlfiles="$dlfiles $arg"
28198+ func_append dlfiles " $arg"
28199 else
28200- dlprefiles="$dlprefiles $arg"
28201+ func_append dlprefiles " $arg"
28202 fi
28203 prev=
28204 continue
28205@@ -4427,7 +5283,7 @@ func_mode_link ()
28206 *-*-darwin*)
28207 case "$deplibs " in
28208 *" $qarg.ltframework "*) ;;
28209- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
28210+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
28211 ;;
28212 esac
28213 ;;
28214@@ -4446,7 +5302,7 @@ func_mode_link ()
28215 moreargs=
28216 for fil in `cat "$save_arg"`
28217 do
28218-# moreargs="$moreargs $fil"
28219+# func_append moreargs " $fil"
28220 arg=$fil
28221 # A libtool-controlled object.
28222
28223@@ -4475,7 +5331,7 @@ func_mode_link ()
28224
28225 if test "$prev" = dlfiles; then
28226 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
28227- dlfiles="$dlfiles $pic_object"
28228+ func_append dlfiles " $pic_object"
28229 prev=
28230 continue
28231 else
28232@@ -4487,7 +5343,7 @@ func_mode_link ()
28233 # CHECK ME: I think I busted this. -Ossama
28234 if test "$prev" = dlprefiles; then
28235 # Preload the old-style object.
28236- dlprefiles="$dlprefiles $pic_object"
28237+ func_append dlprefiles " $pic_object"
28238 prev=
28239 fi
28240
28241@@ -4557,12 +5413,12 @@ func_mode_link ()
28242 if test "$prev" = rpath; then
28243 case "$rpath " in
28244 *" $arg "*) ;;
28245- *) rpath="$rpath $arg" ;;
28246+ *) func_append rpath " $arg" ;;
28247 esac
28248 else
28249 case "$xrpath " in
28250 *" $arg "*) ;;
28251- *) xrpath="$xrpath $arg" ;;
28252+ *) func_append xrpath " $arg" ;;
28253 esac
28254 fi
28255 prev=
28256@@ -4574,28 +5430,28 @@ func_mode_link ()
28257 continue
28258 ;;
28259 weak)
28260- weak_libs="$weak_libs $arg"
28261+ func_append weak_libs " $arg"
28262 prev=
28263 continue
28264 ;;
28265 xcclinker)
28266- linker_flags="$linker_flags $qarg"
28267- compiler_flags="$compiler_flags $qarg"
28268+ func_append linker_flags " $qarg"
28269+ func_append compiler_flags " $qarg"
28270 prev=
28271 func_append compile_command " $qarg"
28272 func_append finalize_command " $qarg"
28273 continue
28274 ;;
28275 xcompiler)
28276- compiler_flags="$compiler_flags $qarg"
28277+ func_append compiler_flags " $qarg"
28278 prev=
28279 func_append compile_command " $qarg"
28280 func_append finalize_command " $qarg"
28281 continue
28282 ;;
28283 xlinker)
28284- linker_flags="$linker_flags $qarg"
28285- compiler_flags="$compiler_flags $wl$qarg"
28286+ func_append linker_flags " $qarg"
28287+ func_append compiler_flags " $wl$qarg"
28288 prev=
28289 func_append compile_command " $wl$qarg"
28290 func_append finalize_command " $wl$qarg"
28291@@ -4686,15 +5542,16 @@ func_mode_link ()
28292 ;;
28293
28294 -L*)
28295- func_stripname '-L' '' "$arg"
28296- dir=$func_stripname_result
28297- if test -z "$dir"; then
28298+ func_stripname "-L" '' "$arg"
28299+ if test -z "$func_stripname_result"; then
28300 if test "$#" -gt 0; then
28301 func_fatal_error "require no space between \`-L' and \`$1'"
28302 else
28303 func_fatal_error "need path for \`-L' option"
28304 fi
28305 fi
28306+ func_resolve_sysroot "$func_stripname_result"
28307+ dir=$func_resolve_sysroot_result
28308 # We need an absolute path.
28309 case $dir in
28310 [\\/]* | [A-Za-z]:[\\/]*) ;;
28311@@ -4706,10 +5563,16 @@ func_mode_link ()
28312 ;;
28313 esac
28314 case "$deplibs " in
28315- *" -L$dir "*) ;;
28316+ *" -L$dir "* | *" $arg "*)
28317+ # Will only happen for absolute or sysroot arguments
28318+ ;;
28319 *)
28320- deplibs="$deplibs -L$dir"
28321- lib_search_path="$lib_search_path $dir"
28322+ # Preserve sysroot, but never include relative directories
28323+ case $dir in
28324+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
28325+ *) func_append deplibs " -L$dir" ;;
28326+ esac
28327+ func_append lib_search_path " $dir"
28328 ;;
28329 esac
28330 case $host in
28331@@ -4718,12 +5581,12 @@ func_mode_link ()
28332 case :$dllsearchpath: in
28333 *":$dir:"*) ;;
28334 ::) dllsearchpath=$dir;;
28335- *) dllsearchpath="$dllsearchpath:$dir";;
28336+ *) func_append dllsearchpath ":$dir";;
28337 esac
28338 case :$dllsearchpath: in
28339 *":$testbindir:"*) ;;
28340 ::) dllsearchpath=$testbindir;;
28341- *) dllsearchpath="$dllsearchpath:$testbindir";;
28342+ *) func_append dllsearchpath ":$testbindir";;
28343 esac
28344 ;;
28345 esac
28346@@ -4747,7 +5610,7 @@ func_mode_link ()
28347 ;;
28348 *-*-rhapsody* | *-*-darwin1.[012])
28349 # Rhapsody C and math libraries are in the System framework
28350- deplibs="$deplibs System.ltframework"
28351+ func_append deplibs " System.ltframework"
28352 continue
28353 ;;
28354 *-*-sco3.2v5* | *-*-sco5v6*)
28355@@ -4758,9 +5621,6 @@ func_mode_link ()
28356 # Compiler inserts libc in the correct place for threads to work
28357 test "X$arg" = "X-lc" && continue
28358 ;;
28359- *-*-linux*)
28360- test "X$arg" = "X-lc" && continue
28361- ;;
28362 esac
28363 elif test "X$arg" = "X-lc_r"; then
28364 case $host in
28365@@ -4770,7 +5630,7 @@ func_mode_link ()
28366 ;;
28367 esac
28368 fi
28369- deplibs="$deplibs $arg"
28370+ func_append deplibs " $arg"
28371 continue
28372 ;;
28373
28374@@ -4782,8 +5642,8 @@ func_mode_link ()
28375 # Tru64 UNIX uses -model [arg] to determine the layout of C++
28376 # classes, name mangling, and exception handling.
28377 # Darwin uses the -arch flag to determine output architecture.
28378- -model|-arch|-isysroot)
28379- compiler_flags="$compiler_flags $arg"
28380+ -model|-arch|-isysroot|--sysroot)
28381+ func_append compiler_flags " $arg"
28382 func_append compile_command " $arg"
28383 func_append finalize_command " $arg"
28384 prev=xcompiler
28385@@ -4791,12 +5651,12 @@ func_mode_link ()
28386 ;;
28387
28388 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
28389- compiler_flags="$compiler_flags $arg"
28390+ func_append compiler_flags " $arg"
28391 func_append compile_command " $arg"
28392 func_append finalize_command " $arg"
28393 case "$new_inherited_linker_flags " in
28394 *" $arg "*) ;;
28395- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
28396+ * ) func_append new_inherited_linker_flags " $arg" ;;
28397 esac
28398 continue
28399 ;;
28400@@ -4863,13 +5723,17 @@ func_mode_link ()
28401 # We need an absolute path.
28402 case $dir in
28403 [\\/]* | [A-Za-z]:[\\/]*) ;;
28404+ =*)
28405+ func_stripname '=' '' "$dir"
28406+ dir=$lt_sysroot$func_stripname_result
28407+ ;;
28408 *)
28409 func_fatal_error "only absolute run-paths are allowed"
28410 ;;
28411 esac
28412 case "$xrpath " in
28413 *" $dir "*) ;;
28414- *) xrpath="$xrpath $dir" ;;
28415+ *) func_append xrpath " $dir" ;;
28416 esac
28417 continue
28418 ;;
28419@@ -4922,8 +5786,8 @@ func_mode_link ()
28420 for flag in $args; do
28421 IFS="$save_ifs"
28422 func_quote_for_eval "$flag"
28423- arg="$arg $func_quote_for_eval_result"
28424- compiler_flags="$compiler_flags $func_quote_for_eval_result"
28425+ func_append arg " $func_quote_for_eval_result"
28426+ func_append compiler_flags " $func_quote_for_eval_result"
28427 done
28428 IFS="$save_ifs"
28429 func_stripname ' ' '' "$arg"
28430@@ -4938,9 +5802,9 @@ func_mode_link ()
28431 for flag in $args; do
28432 IFS="$save_ifs"
28433 func_quote_for_eval "$flag"
28434- arg="$arg $wl$func_quote_for_eval_result"
28435- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
28436- linker_flags="$linker_flags $func_quote_for_eval_result"
28437+ func_append arg " $wl$func_quote_for_eval_result"
28438+ func_append compiler_flags " $wl$func_quote_for_eval_result"
28439+ func_append linker_flags " $func_quote_for_eval_result"
28440 done
28441 IFS="$save_ifs"
28442 func_stripname ' ' '' "$arg"
28443@@ -4968,24 +5832,27 @@ func_mode_link ()
28444 arg="$func_quote_for_eval_result"
28445 ;;
28446
28447- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
28448- # -r[0-9][0-9]* specifies the processor on the SGI compiler
28449- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
28450- # +DA*, +DD* enable 64-bit mode on the HP compiler
28451- # -q* pass through compiler args for the IBM compiler
28452- # -m*, -t[45]*, -txscale* pass through architecture-specific
28453- # compiler args for GCC
28454- # -F/path gives path to uninstalled frameworks, gcc on darwin
28455- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
28456- # @file GCC response files
28457- # -tp=* Portland pgcc target processor selection
28458+ # Flags to be passed through unchanged, with rationale:
28459+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
28460+ # -r[0-9][0-9]* specify processor for the SGI compiler
28461+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
28462+ # +DA*, +DD* enable 64-bit mode for the HP compiler
28463+ # -q* compiler args for the IBM compiler
28464+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
28465+ # -F/path path to uninstalled frameworks, gcc on darwin
28466+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
28467+ # @file GCC response files
28468+ # -tp=* Portland pgcc target processor selection
28469+ # --sysroot=* for sysroot support
28470+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
28471 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
28472- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
28473+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
28474+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
28475 func_quote_for_eval "$arg"
28476 arg="$func_quote_for_eval_result"
28477 func_append compile_command " $arg"
28478 func_append finalize_command " $arg"
28479- compiler_flags="$compiler_flags $arg"
28480+ func_append compiler_flags " $arg"
28481 continue
28482 ;;
28483
28484@@ -4997,7 +5864,7 @@ func_mode_link ()
28485
28486 *.$objext)
28487 # A standard object.
28488- objs="$objs $arg"
28489+ func_append objs " $arg"
28490 ;;
28491
28492 *.lo)
28493@@ -5028,7 +5895,7 @@ func_mode_link ()
28494
28495 if test "$prev" = dlfiles; then
28496 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
28497- dlfiles="$dlfiles $pic_object"
28498+ func_append dlfiles " $pic_object"
28499 prev=
28500 continue
28501 else
28502@@ -5040,7 +5907,7 @@ func_mode_link ()
28503 # CHECK ME: I think I busted this. -Ossama
28504 if test "$prev" = dlprefiles; then
28505 # Preload the old-style object.
28506- dlprefiles="$dlprefiles $pic_object"
28507+ func_append dlprefiles " $pic_object"
28508 prev=
28509 fi
28510
28511@@ -5085,24 +5952,25 @@ func_mode_link ()
28512
28513 *.$libext)
28514 # An archive.
28515- deplibs="$deplibs $arg"
28516- old_deplibs="$old_deplibs $arg"
28517+ func_append deplibs " $arg"
28518+ func_append old_deplibs " $arg"
28519 continue
28520 ;;
28521
28522 *.la)
28523 # A libtool-controlled library.
28524
28525+ func_resolve_sysroot "$arg"
28526 if test "$prev" = dlfiles; then
28527 # This library was specified with -dlopen.
28528- dlfiles="$dlfiles $arg"
28529+ func_append dlfiles " $func_resolve_sysroot_result"
28530 prev=
28531 elif test "$prev" = dlprefiles; then
28532 # The library was specified with -dlpreopen.
28533- dlprefiles="$dlprefiles $arg"
28534+ func_append dlprefiles " $func_resolve_sysroot_result"
28535 prev=
28536 else
28537- deplibs="$deplibs $arg"
28538+ func_append deplibs " $func_resolve_sysroot_result"
28539 fi
28540 continue
28541 ;;
28542@@ -5127,7 +5995,7 @@ func_mode_link ()
28543 func_fatal_help "the \`$prevarg' option requires an argument"
28544
28545 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
28546- eval "arg=\"$export_dynamic_flag_spec\""
28547+ eval arg=\"$export_dynamic_flag_spec\"
28548 func_append compile_command " $arg"
28549 func_append finalize_command " $arg"
28550 fi
28551@@ -5144,11 +6012,13 @@ func_mode_link ()
28552 else
28553 shlib_search_path=
28554 fi
28555- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
28556- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
28557+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
28558+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
28559
28560 func_dirname "$output" "/" ""
28561 output_objdir="$func_dirname_result$objdir"
28562+ func_to_tool_file "$output_objdir/"
28563+ tool_output_objdir=$func_to_tool_file_result
28564 # Create the object directory.
28565 func_mkdir_p "$output_objdir"
28566
28567@@ -5169,12 +6039,12 @@ func_mode_link ()
28568 # Find all interdependent deplibs by searching for libraries
28569 # that are linked more than once (e.g. -la -lb -la)
28570 for deplib in $deplibs; do
28571- if $opt_duplicate_deps ; then
28572+ if $opt_preserve_dup_deps ; then
28573 case "$libs " in
28574- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
28575+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
28576 esac
28577 fi
28578- libs="$libs $deplib"
28579+ func_append libs " $deplib"
28580 done
28581
28582 if test "$linkmode" = lib; then
28583@@ -5187,9 +6057,9 @@ func_mode_link ()
28584 if $opt_duplicate_compiler_generated_deps; then
28585 for pre_post_dep in $predeps $postdeps; do
28586 case "$pre_post_deps " in
28587- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
28588+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
28589 esac
28590- pre_post_deps="$pre_post_deps $pre_post_dep"
28591+ func_append pre_post_deps " $pre_post_dep"
28592 done
28593 fi
28594 pre_post_deps=
28595@@ -5256,8 +6126,9 @@ func_mode_link ()
28596 for lib in $dlprefiles; do
28597 # Ignore non-libtool-libs
28598 dependency_libs=
28599+ func_resolve_sysroot "$lib"
28600 case $lib in
28601- *.la) func_source "$lib" ;;
28602+ *.la) func_source "$func_resolve_sysroot_result" ;;
28603 esac
28604
28605 # Collect preopened libtool deplibs, except any this library
28606@@ -5267,7 +6138,7 @@ func_mode_link ()
28607 deplib_base=$func_basename_result
28608 case " $weak_libs " in
28609 *" $deplib_base "*) ;;
28610- *) deplibs="$deplibs $deplib" ;;
28611+ *) func_append deplibs " $deplib" ;;
28612 esac
28613 done
28614 done
28615@@ -5288,11 +6159,11 @@ func_mode_link ()
28616 compile_deplibs="$deplib $compile_deplibs"
28617 finalize_deplibs="$deplib $finalize_deplibs"
28618 else
28619- compiler_flags="$compiler_flags $deplib"
28620+ func_append compiler_flags " $deplib"
28621 if test "$linkmode" = lib ; then
28622 case "$new_inherited_linker_flags " in
28623 *" $deplib "*) ;;
28624- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
28625+ * ) func_append new_inherited_linker_flags " $deplib" ;;
28626 esac
28627 fi
28628 fi
28629@@ -5377,7 +6248,7 @@ func_mode_link ()
28630 if test "$linkmode" = lib ; then
28631 case "$new_inherited_linker_flags " in
28632 *" $deplib "*) ;;
28633- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
28634+ * ) func_append new_inherited_linker_flags " $deplib" ;;
28635 esac
28636 fi
28637 fi
28638@@ -5390,7 +6261,8 @@ func_mode_link ()
28639 test "$pass" = conv && continue
28640 newdependency_libs="$deplib $newdependency_libs"
28641 func_stripname '-L' '' "$deplib"
28642- newlib_search_path="$newlib_search_path $func_stripname_result"
28643+ func_resolve_sysroot "$func_stripname_result"
28644+ func_append newlib_search_path " $func_resolve_sysroot_result"
28645 ;;
28646 prog)
28647 if test "$pass" = conv; then
28648@@ -5404,7 +6276,8 @@ func_mode_link ()
28649 finalize_deplibs="$deplib $finalize_deplibs"
28650 fi
28651 func_stripname '-L' '' "$deplib"
28652- newlib_search_path="$newlib_search_path $func_stripname_result"
28653+ func_resolve_sysroot "$func_stripname_result"
28654+ func_append newlib_search_path " $func_resolve_sysroot_result"
28655 ;;
28656 *)
28657 func_warning "\`-L' is ignored for archives/objects"
28658@@ -5415,17 +6288,21 @@ func_mode_link ()
28659 -R*)
28660 if test "$pass" = link; then
28661 func_stripname '-R' '' "$deplib"
28662- dir=$func_stripname_result
28663+ func_resolve_sysroot "$func_stripname_result"
28664+ dir=$func_resolve_sysroot_result
28665 # Make sure the xrpath contains only unique directories.
28666 case "$xrpath " in
28667 *" $dir "*) ;;
28668- *) xrpath="$xrpath $dir" ;;
28669+ *) func_append xrpath " $dir" ;;
28670 esac
28671 fi
28672 deplibs="$deplib $deplibs"
28673 continue
28674 ;;
28675- *.la) lib="$deplib" ;;
28676+ *.la)
28677+ func_resolve_sysroot "$deplib"
28678+ lib=$func_resolve_sysroot_result
28679+ ;;
28680 *.$libext)
28681 if test "$pass" = conv; then
28682 deplibs="$deplib $deplibs"
28683@@ -5488,11 +6365,11 @@ func_mode_link ()
28684 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
28685 # If there is no dlopen support or we're linking statically,
28686 # we need to preload.
28687- newdlprefiles="$newdlprefiles $deplib"
28688+ func_append newdlprefiles " $deplib"
28689 compile_deplibs="$deplib $compile_deplibs"
28690 finalize_deplibs="$deplib $finalize_deplibs"
28691 else
28692- newdlfiles="$newdlfiles $deplib"
28693+ func_append newdlfiles " $deplib"
28694 fi
28695 fi
28696 continue
28697@@ -5538,7 +6415,7 @@ func_mode_link ()
28698 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
28699 case " $new_inherited_linker_flags " in
28700 *" $tmp_inherited_linker_flag "*) ;;
28701- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
28702+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
28703 esac
28704 done
28705 fi
28706@@ -5546,8 +6423,8 @@ func_mode_link ()
28707 if test "$linkmode,$pass" = "lib,link" ||
28708 test "$linkmode,$pass" = "prog,scan" ||
28709 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
28710- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
28711- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
28712+ test -n "$dlopen" && func_append dlfiles " $dlopen"
28713+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
28714 fi
28715
28716 if test "$pass" = conv; then
28717@@ -5558,20 +6435,20 @@ func_mode_link ()
28718 func_fatal_error "cannot find name of link library for \`$lib'"
28719 fi
28720 # It is a libtool convenience library, so add in its objects.
28721- convenience="$convenience $ladir/$objdir/$old_library"
28722- old_convenience="$old_convenience $ladir/$objdir/$old_library"
28723+ func_append convenience " $ladir/$objdir/$old_library"
28724+ func_append old_convenience " $ladir/$objdir/$old_library"
28725 elif test "$linkmode" != prog && test "$linkmode" != lib; then
28726 func_fatal_error "\`$lib' is not a convenience library"
28727 fi
28728 tmp_libs=
28729 for deplib in $dependency_libs; do
28730 deplibs="$deplib $deplibs"
28731- if $opt_duplicate_deps ; then
28732+ if $opt_preserve_dup_deps ; then
28733 case "$tmp_libs " in
28734- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
28735+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
28736 esac
28737 fi
28738- tmp_libs="$tmp_libs $deplib"
28739+ func_append tmp_libs " $deplib"
28740 done
28741 continue
28742 fi # $pass = conv
28743@@ -5579,9 +6456,15 @@ func_mode_link ()
28744
28745 # Get the name of the library we link against.
28746 linklib=
28747- for l in $old_library $library_names; do
28748- linklib="$l"
28749- done
28750+ if test -n "$old_library" &&
28751+ { test "$prefer_static_libs" = yes ||
28752+ test "$prefer_static_libs,$installed" = "built,no"; }; then
28753+ linklib=$old_library
28754+ else
28755+ for l in $old_library $library_names; do
28756+ linklib="$l"
28757+ done
28758+ fi
28759 if test -z "$linklib"; then
28760 func_fatal_error "cannot find name of link library for \`$lib'"
28761 fi
28762@@ -5598,9 +6481,9 @@ func_mode_link ()
28763 # statically, we need to preload. We also need to preload any
28764 # dependent libraries so libltdl's deplib preloader doesn't
28765 # bomb out in the load deplibs phase.
28766- dlprefiles="$dlprefiles $lib $dependency_libs"
28767+ func_append dlprefiles " $lib $dependency_libs"
28768 else
28769- newdlfiles="$newdlfiles $lib"
28770+ func_append newdlfiles " $lib"
28771 fi
28772 continue
28773 fi # $pass = dlopen
28774@@ -5622,14 +6505,14 @@ func_mode_link ()
28775
28776 # Find the relevant object directory and library name.
28777 if test "X$installed" = Xyes; then
28778- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
28779+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
28780 func_warning "library \`$lib' was moved."
28781 dir="$ladir"
28782 absdir="$abs_ladir"
28783 libdir="$abs_ladir"
28784 else
28785- dir="$libdir"
28786- absdir="$libdir"
28787+ dir="$lt_sysroot$libdir"
28788+ absdir="$lt_sysroot$libdir"
28789 fi
28790 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
28791 else
28792@@ -5637,12 +6520,12 @@ func_mode_link ()
28793 dir="$ladir"
28794 absdir="$abs_ladir"
28795 # Remove this search path later
28796- notinst_path="$notinst_path $abs_ladir"
28797+ func_append notinst_path " $abs_ladir"
28798 else
28799 dir="$ladir/$objdir"
28800 absdir="$abs_ladir/$objdir"
28801 # Remove this search path later
28802- notinst_path="$notinst_path $abs_ladir"
28803+ func_append notinst_path " $abs_ladir"
28804 fi
28805 fi # $installed = yes
28806 func_stripname 'lib' '.la' "$laname"
28807@@ -5653,20 +6536,46 @@ func_mode_link ()
28808 if test -z "$libdir" && test "$linkmode" = prog; then
28809 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
28810 fi
28811- # Prefer using a static library (so that no silly _DYNAMIC symbols
28812- # are required to link).
28813- if test -n "$old_library"; then
28814- newdlprefiles="$newdlprefiles $dir/$old_library"
28815- # Keep a list of preopened convenience libraries to check
28816- # that they are being used correctly in the link pass.
28817- test -z "$libdir" && \
28818- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
28819- # Otherwise, use the dlname, so that lt_dlopen finds it.
28820- elif test -n "$dlname"; then
28821- newdlprefiles="$newdlprefiles $dir/$dlname"
28822- else
28823- newdlprefiles="$newdlprefiles $dir/$linklib"
28824- fi
28825+ case "$host" in
28826+ # special handling for platforms with PE-DLLs.
28827+ *cygwin* | *mingw* | *cegcc* )
28828+ # Linker will automatically link against shared library if both
28829+ # static and shared are present. Therefore, ensure we extract
28830+ # symbols from the import library if a shared library is present
28831+ # (otherwise, the dlopen module name will be incorrect). We do
28832+ # this by putting the import library name into $newdlprefiles.
28833+ # We recover the dlopen module name by 'saving' the la file
28834+ # name in a special purpose variable, and (later) extracting the
28835+ # dlname from the la file.
28836+ if test -n "$dlname"; then
28837+ func_tr_sh "$dir/$linklib"
28838+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
28839+ func_append newdlprefiles " $dir/$linklib"
28840+ else
28841+ func_append newdlprefiles " $dir/$old_library"
28842+ # Keep a list of preopened convenience libraries to check
28843+ # that they are being used correctly in the link pass.
28844+ test -z "$libdir" && \
28845+ func_append dlpreconveniencelibs " $dir/$old_library"
28846+ fi
28847+ ;;
28848+ * )
28849+ # Prefer using a static library (so that no silly _DYNAMIC symbols
28850+ # are required to link).
28851+ if test -n "$old_library"; then
28852+ func_append newdlprefiles " $dir/$old_library"
28853+ # Keep a list of preopened convenience libraries to check
28854+ # that they are being used correctly in the link pass.
28855+ test -z "$libdir" && \
28856+ func_append dlpreconveniencelibs " $dir/$old_library"
28857+ # Otherwise, use the dlname, so that lt_dlopen finds it.
28858+ elif test -n "$dlname"; then
28859+ func_append newdlprefiles " $dir/$dlname"
28860+ else
28861+ func_append newdlprefiles " $dir/$linklib"
28862+ fi
28863+ ;;
28864+ esac
28865 fi # $pass = dlpreopen
28866
28867 if test -z "$libdir"; then
28868@@ -5684,7 +6593,7 @@ func_mode_link ()
28869
28870
28871 if test "$linkmode" = prog && test "$pass" != link; then
28872- newlib_search_path="$newlib_search_path $ladir"
28873+ func_append newlib_search_path " $ladir"
28874 deplibs="$lib $deplibs"
28875
28876 linkalldeplibs=no
28877@@ -5697,7 +6606,8 @@ func_mode_link ()
28878 for deplib in $dependency_libs; do
28879 case $deplib in
28880 -L*) func_stripname '-L' '' "$deplib"
28881- newlib_search_path="$newlib_search_path $func_stripname_result"
28882+ func_resolve_sysroot "$func_stripname_result"
28883+ func_append newlib_search_path " $func_resolve_sysroot_result"
28884 ;;
28885 esac
28886 # Need to link against all dependency_libs?
28887@@ -5708,12 +6618,12 @@ func_mode_link ()
28888 # or/and link against static libraries
28889 newdependency_libs="$deplib $newdependency_libs"
28890 fi
28891- if $opt_duplicate_deps ; then
28892+ if $opt_preserve_dup_deps ; then
28893 case "$tmp_libs " in
28894- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
28895+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
28896 esac
28897 fi
28898- tmp_libs="$tmp_libs $deplib"
28899+ func_append tmp_libs " $deplib"
28900 done # for deplib
28901 continue
28902 fi # $linkmode = prog...
28903@@ -5728,7 +6638,7 @@ func_mode_link ()
28904 # Make sure the rpath contains only unique directories.
28905 case "$temp_rpath:" in
28906 *"$absdir:"*) ;;
28907- *) temp_rpath="$temp_rpath$absdir:" ;;
28908+ *) func_append temp_rpath "$absdir:" ;;
28909 esac
28910 fi
28911
28912@@ -5740,7 +6650,7 @@ func_mode_link ()
28913 *)
28914 case "$compile_rpath " in
28915 *" $absdir "*) ;;
28916- *) compile_rpath="$compile_rpath $absdir"
28917+ *) func_append compile_rpath " $absdir" ;;
28918 esac
28919 ;;
28920 esac
28921@@ -5749,7 +6659,7 @@ func_mode_link ()
28922 *)
28923 case "$finalize_rpath " in
28924 *" $libdir "*) ;;
28925- *) finalize_rpath="$finalize_rpath $libdir"
28926+ *) func_append finalize_rpath " $libdir" ;;
28927 esac
28928 ;;
28929 esac
28930@@ -5774,12 +6684,12 @@ func_mode_link ()
28931 case $host in
28932 *cygwin* | *mingw* | *cegcc*)
28933 # No point in relinking DLLs because paths are not encoded
28934- notinst_deplibs="$notinst_deplibs $lib"
28935+ func_append notinst_deplibs " $lib"
28936 need_relink=no
28937 ;;
28938 *)
28939 if test "$installed" = no; then
28940- notinst_deplibs="$notinst_deplibs $lib"
28941+ func_append notinst_deplibs " $lib"
28942 need_relink=yes
28943 fi
28944 ;;
28945@@ -5814,7 +6724,7 @@ func_mode_link ()
28946 *)
28947 case "$compile_rpath " in
28948 *" $absdir "*) ;;
28949- *) compile_rpath="$compile_rpath $absdir"
28950+ *) func_append compile_rpath " $absdir" ;;
28951 esac
28952 ;;
28953 esac
28954@@ -5823,7 +6733,7 @@ func_mode_link ()
28955 *)
28956 case "$finalize_rpath " in
28957 *" $libdir "*) ;;
28958- *) finalize_rpath="$finalize_rpath $libdir"
28959+ *) func_append finalize_rpath " $libdir" ;;
28960 esac
28961 ;;
28962 esac
28963@@ -5835,7 +6745,7 @@ func_mode_link ()
28964 shift
28965 realname="$1"
28966 shift
28967- eval "libname=\"$libname_spec\""
28968+ libname=`eval "\\$ECHO \"$libname_spec\""`
28969 # use dlname if we got it. it's perfectly good, no?
28970 if test -n "$dlname"; then
28971 soname="$dlname"
28972@@ -5848,7 +6758,7 @@ func_mode_link ()
28973 versuffix="-$major"
28974 ;;
28975 esac
28976- eval "soname=\"$soname_spec\""
28977+ eval soname=\"$soname_spec\"
28978 else
28979 soname="$realname"
28980 fi
28981@@ -5877,7 +6787,7 @@ func_mode_link ()
28982 linklib=$newlib
28983 fi # test -n "$old_archive_from_expsyms_cmds"
28984
28985- if test "$linkmode" = prog || test "$mode" != relink; then
28986+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
28987 add_shlibpath=
28988 add_dir=
28989 add=
28990@@ -5933,7 +6843,7 @@ func_mode_link ()
28991 if test -n "$inst_prefix_dir"; then
28992 case $libdir in
28993 [\\/]*)
28994- add_dir="$add_dir -L$inst_prefix_dir$libdir"
28995+ func_append add_dir " -L$inst_prefix_dir$libdir"
28996 ;;
28997 esac
28998 fi
28999@@ -5955,7 +6865,7 @@ func_mode_link ()
29000 if test -n "$add_shlibpath"; then
29001 case :$compile_shlibpath: in
29002 *":$add_shlibpath:"*) ;;
29003- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
29004+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
29005 esac
29006 fi
29007 if test "$linkmode" = prog; then
29008@@ -5969,13 +6879,13 @@ func_mode_link ()
29009 test "$hardcode_shlibpath_var" = yes; then
29010 case :$finalize_shlibpath: in
29011 *":$libdir:"*) ;;
29012- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
29013+ *) func_append finalize_shlibpath "$libdir:" ;;
29014 esac
29015 fi
29016 fi
29017 fi
29018
29019- if test "$linkmode" = prog || test "$mode" = relink; then
29020+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
29021 add_shlibpath=
29022 add_dir=
29023 add=
29024@@ -5989,7 +6899,7 @@ func_mode_link ()
29025 elif test "$hardcode_shlibpath_var" = yes; then
29026 case :$finalize_shlibpath: in
29027 *":$libdir:"*) ;;
29028- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
29029+ *) func_append finalize_shlibpath "$libdir:" ;;
29030 esac
29031 add="-l$name"
29032 elif test "$hardcode_automatic" = yes; then
29033@@ -6001,12 +6911,12 @@ func_mode_link ()
29034 fi
29035 else
29036 # We cannot seem to hardcode it, guess we'll fake it.
29037- add_dir="-L$libdir"
29038+ add_dir="-L$lt_sysroot$libdir"
29039 # Try looking first in the location we're being installed to.
29040 if test -n "$inst_prefix_dir"; then
29041 case $libdir in
29042 [\\/]*)
29043- add_dir="$add_dir -L$inst_prefix_dir$libdir"
29044+ func_append add_dir " -L$inst_prefix_dir$libdir"
29045 ;;
29046 esac
29047 fi
29048@@ -6083,27 +6993,33 @@ func_mode_link ()
29049 temp_xrpath=$func_stripname_result
29050 case " $xrpath " in
29051 *" $temp_xrpath "*) ;;
29052- *) xrpath="$xrpath $temp_xrpath";;
29053+ *) func_append xrpath " $temp_xrpath";;
29054 esac;;
29055- *) temp_deplibs="$temp_deplibs $libdir";;
29056+ *) func_append temp_deplibs " $libdir";;
29057 esac
29058 done
29059 dependency_libs="$temp_deplibs"
29060 fi
29061
29062- newlib_search_path="$newlib_search_path $absdir"
29063+ func_append newlib_search_path " $absdir"
29064 # Link against this library
29065 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
29066 # ... and its dependency_libs
29067 tmp_libs=
29068 for deplib in $dependency_libs; do
29069 newdependency_libs="$deplib $newdependency_libs"
29070- if $opt_duplicate_deps ; then
29071+ case $deplib in
29072+ -L*) func_stripname '-L' '' "$deplib"
29073+ func_resolve_sysroot "$func_stripname_result";;
29074+ *) func_resolve_sysroot "$deplib" ;;
29075+ esac
29076+ if $opt_preserve_dup_deps ; then
29077 case "$tmp_libs " in
29078- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
29079+ *" $func_resolve_sysroot_result "*)
29080+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
29081 esac
29082 fi
29083- tmp_libs="$tmp_libs $deplib"
29084+ func_append tmp_libs " $func_resolve_sysroot_result"
29085 done
29086
29087 if test "$link_all_deplibs" != no; then
29088@@ -6113,8 +7029,10 @@ func_mode_link ()
29089 case $deplib in
29090 -L*) path="$deplib" ;;
29091 *.la)
29092+ func_resolve_sysroot "$deplib"
29093+ deplib=$func_resolve_sysroot_result
29094 func_dirname "$deplib" "" "."
29095- dir="$func_dirname_result"
29096+ dir=$func_dirname_result
29097 # We need an absolute path.
29098 case $dir in
29099 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
29100@@ -6130,7 +7048,7 @@ func_mode_link ()
29101 case $host in
29102 *-*-darwin*)
29103 depdepl=
29104- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
29105+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
29106 if test -n "$deplibrary_names" ; then
29107 for tmp in $deplibrary_names ; do
29108 depdepl=$tmp
29109@@ -6141,8 +7059,8 @@ func_mode_link ()
29110 if test -z "$darwin_install_name"; then
29111 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
29112 fi
29113- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
29114- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
29115+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
29116+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
29117 path=
29118 fi
29119 fi
29120@@ -6152,7 +7070,7 @@ func_mode_link ()
29121 ;;
29122 esac
29123 else
29124- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
29125+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
29126 test -z "$libdir" && \
29127 func_fatal_error "\`$deplib' is not a valid libtool archive"
29128 test "$absdir" != "$libdir" && \
29129@@ -6192,7 +7110,7 @@ func_mode_link ()
29130 for dir in $newlib_search_path; do
29131 case "$lib_search_path " in
29132 *" $dir "*) ;;
29133- *) lib_search_path="$lib_search_path $dir" ;;
29134+ *) func_append lib_search_path " $dir" ;;
29135 esac
29136 done
29137 newlib_search_path=
29138@@ -6205,7 +7123,7 @@ func_mode_link ()
29139 fi
29140 for var in $vars dependency_libs; do
29141 # Add libraries to $var in reverse order
29142- eval tmp_libs=\$$var
29143+ eval tmp_libs=\"\$$var\"
29144 new_libs=
29145 for deplib in $tmp_libs; do
29146 # FIXME: Pedantically, this is the right thing to do, so
29147@@ -6250,13 +7168,13 @@ func_mode_link ()
29148 -L*)
29149 case " $tmp_libs " in
29150 *" $deplib "*) ;;
29151- *) tmp_libs="$tmp_libs $deplib" ;;
29152+ *) func_append tmp_libs " $deplib" ;;
29153 esac
29154 ;;
29155- *) tmp_libs="$tmp_libs $deplib" ;;
29156+ *) func_append tmp_libs " $deplib" ;;
29157 esac
29158 done
29159- eval $var=\$tmp_libs
29160+ eval $var=\"$tmp_libs\"
29161 done # for var
29162 fi
29163 # Last step: remove runtime libs from dependency_libs
29164@@ -6269,7 +7187,7 @@ func_mode_link ()
29165 ;;
29166 esac
29167 if test -n "$i" ; then
29168- tmp_libs="$tmp_libs $i"
29169+ func_append tmp_libs " $i"
29170 fi
29171 done
29172 dependency_libs=$tmp_libs
29173@@ -6310,7 +7228,7 @@ func_mode_link ()
29174 # Now set the variables for building old libraries.
29175 build_libtool_libs=no
29176 oldlibs="$output"
29177- objs="$objs$old_deplibs"
29178+ func_append objs "$old_deplibs"
29179 ;;
29180
29181 lib)
29182@@ -6319,8 +7237,8 @@ func_mode_link ()
29183 lib*)
29184 func_stripname 'lib' '.la' "$outputname"
29185 name=$func_stripname_result
29186- eval "shared_ext=\"$shrext_cmds\""
29187- eval "libname=\"$libname_spec\""
29188+ eval shared_ext=\"$shrext_cmds\"
29189+ eval libname=\"$libname_spec\"
29190 ;;
29191 *)
29192 test "$module" = no && \
29193@@ -6330,8 +7248,8 @@ func_mode_link ()
29194 # Add the "lib" prefix for modules if required
29195 func_stripname '' '.la' "$outputname"
29196 name=$func_stripname_result
29197- eval "shared_ext=\"$shrext_cmds\""
29198- eval "libname=\"$libname_spec\""
29199+ eval shared_ext=\"$shrext_cmds\"
29200+ eval libname=\"$libname_spec\"
29201 else
29202 func_stripname '' '.la' "$outputname"
29203 libname=$func_stripname_result
29204@@ -6346,7 +7264,7 @@ func_mode_link ()
29205 echo
29206 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
29207 $ECHO "*** objects $objs is not portable!"
29208- libobjs="$libobjs $objs"
29209+ func_append libobjs " $objs"
29210 fi
29211 fi
29212
29213@@ -6544,7 +7462,7 @@ func_mode_link ()
29214 done
29215
29216 # Make executables depend on our current version.
29217- verstring="$verstring:${current}.0"
29218+ func_append verstring ":${current}.0"
29219 ;;
29220
29221 qnx)
29222@@ -6612,10 +7530,10 @@ func_mode_link ()
29223 fi
29224
29225 func_generate_dlsyms "$libname" "$libname" "yes"
29226- libobjs="$libobjs $symfileobj"
29227+ func_append libobjs " $symfileobj"
29228 test "X$libobjs" = "X " && libobjs=
29229
29230- if test "$mode" != relink; then
29231+ if test "$opt_mode" != relink; then
29232 # Remove our outputs, but don't remove object files since they
29233 # may have been created when compiling PIC objects.
29234 removelist=
29235@@ -6631,7 +7549,7 @@ func_mode_link ()
29236 continue
29237 fi
29238 fi
29239- removelist="$removelist $p"
29240+ func_append removelist " $p"
29241 ;;
29242 *) ;;
29243 esac
29244@@ -6642,7 +7560,7 @@ func_mode_link ()
29245
29246 # Now set the variables for building old libraries.
29247 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
29248- oldlibs="$oldlibs $output_objdir/$libname.$libext"
29249+ func_append oldlibs " $output_objdir/$libname.$libext"
29250
29251 # Transform .lo files to .o files.
29252 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
29253@@ -6659,10 +7577,11 @@ func_mode_link ()
29254 # If the user specified any rpath flags, then add them.
29255 temp_xrpath=
29256 for libdir in $xrpath; do
29257- temp_xrpath="$temp_xrpath -R$libdir"
29258+ func_replace_sysroot "$libdir"
29259+ func_append temp_xrpath " -R$func_replace_sysroot_result"
29260 case "$finalize_rpath " in
29261 *" $libdir "*) ;;
29262- *) finalize_rpath="$finalize_rpath $libdir" ;;
29263+ *) func_append finalize_rpath " $libdir" ;;
29264 esac
29265 done
29266 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
29267@@ -6676,7 +7595,7 @@ func_mode_link ()
29268 for lib in $old_dlfiles; do
29269 case " $dlprefiles $dlfiles " in
29270 *" $lib "*) ;;
29271- *) dlfiles="$dlfiles $lib" ;;
29272+ *) func_append dlfiles " $lib" ;;
29273 esac
29274 done
29275
29276@@ -6686,7 +7605,7 @@ func_mode_link ()
29277 for lib in $old_dlprefiles; do
29278 case "$dlprefiles " in
29279 *" $lib "*) ;;
29280- *) dlprefiles="$dlprefiles $lib" ;;
29281+ *) func_append dlprefiles " $lib" ;;
29282 esac
29283 done
29284
29285@@ -6698,7 +7617,7 @@ func_mode_link ()
29286 ;;
29287 *-*-rhapsody* | *-*-darwin1.[012])
29288 # Rhapsody C library is in the System framework
29289- deplibs="$deplibs System.ltframework"
29290+ func_append deplibs " System.ltframework"
29291 ;;
29292 *-*-netbsd*)
29293 # Don't link with libc until the a.out ld.so is fixed.
29294@@ -6715,7 +7634,7 @@ func_mode_link ()
29295 *)
29296 # Add libc to deplibs on all other systems if necessary.
29297 if test "$build_libtool_need_lc" = "yes"; then
29298- deplibs="$deplibs -lc"
29299+ func_append deplibs " -lc"
29300 fi
29301 ;;
29302 esac
29303@@ -6764,18 +7683,18 @@ EOF
29304 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29305 case " $predeps $postdeps " in
29306 *" $i "*)
29307- newdeplibs="$newdeplibs $i"
29308+ func_append newdeplibs " $i"
29309 i=""
29310 ;;
29311 esac
29312 fi
29313 if test -n "$i" ; then
29314- eval "libname=\"$libname_spec\""
29315- eval "deplib_matches=\"$library_names_spec\""
29316+ libname=`eval "\\$ECHO \"$libname_spec\""`
29317+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
29318 set dummy $deplib_matches; shift
29319 deplib_match=$1
29320 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
29321- newdeplibs="$newdeplibs $i"
29322+ func_append newdeplibs " $i"
29323 else
29324 droppeddeps=yes
29325 echo
29326@@ -6789,7 +7708,7 @@ EOF
29327 fi
29328 ;;
29329 *)
29330- newdeplibs="$newdeplibs $i"
29331+ func_append newdeplibs " $i"
29332 ;;
29333 esac
29334 done
29335@@ -6807,18 +7726,18 @@ EOF
29336 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29337 case " $predeps $postdeps " in
29338 *" $i "*)
29339- newdeplibs="$newdeplibs $i"
29340+ func_append newdeplibs " $i"
29341 i=""
29342 ;;
29343 esac
29344 fi
29345 if test -n "$i" ; then
29346- eval "libname=\"$libname_spec\""
29347- eval "deplib_matches=\"$library_names_spec\""
29348+ libname=`eval "\\$ECHO \"$libname_spec\""`
29349+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
29350 set dummy $deplib_matches; shift
29351 deplib_match=$1
29352 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
29353- newdeplibs="$newdeplibs $i"
29354+ func_append newdeplibs " $i"
29355 else
29356 droppeddeps=yes
29357 echo
29358@@ -6840,7 +7759,7 @@ EOF
29359 fi
29360 ;;
29361 *)
29362- newdeplibs="$newdeplibs $i"
29363+ func_append newdeplibs " $i"
29364 ;;
29365 esac
29366 done
29367@@ -6857,15 +7776,27 @@ EOF
29368 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29369 case " $predeps $postdeps " in
29370 *" $a_deplib "*)
29371- newdeplibs="$newdeplibs $a_deplib"
29372+ func_append newdeplibs " $a_deplib"
29373 a_deplib=""
29374 ;;
29375 esac
29376 fi
29377 if test -n "$a_deplib" ; then
29378- eval "libname=\"$libname_spec\""
29379+ libname=`eval "\\$ECHO \"$libname_spec\""`
29380+ if test -n "$file_magic_glob"; then
29381+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
29382+ else
29383+ libnameglob=$libname
29384+ fi
29385+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
29386 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
29387- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
29388+ if test "$want_nocaseglob" = yes; then
29389+ shopt -s nocaseglob
29390+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
29391+ $nocaseglob
29392+ else
29393+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
29394+ fi
29395 for potent_lib in $potential_libs; do
29396 # Follow soft links.
29397 if ls -lLd "$potent_lib" 2>/dev/null |
29398@@ -6885,10 +7816,10 @@ EOF
29399 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
29400 esac
29401 done
29402- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
29403+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
29404 $SED -e 10q |
29405 $EGREP "$file_magic_regex" > /dev/null; then
29406- newdeplibs="$newdeplibs $a_deplib"
29407+ func_append newdeplibs " $a_deplib"
29408 a_deplib=""
29409 break 2
29410 fi
29411@@ -6913,7 +7844,7 @@ EOF
29412 ;;
29413 *)
29414 # Add a -L argument.
29415- newdeplibs="$newdeplibs $a_deplib"
29416+ func_append newdeplibs " $a_deplib"
29417 ;;
29418 esac
29419 done # Gone through all deplibs.
29420@@ -6929,20 +7860,20 @@ EOF
29421 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29422 case " $predeps $postdeps " in
29423 *" $a_deplib "*)
29424- newdeplibs="$newdeplibs $a_deplib"
29425+ func_append newdeplibs " $a_deplib"
29426 a_deplib=""
29427 ;;
29428 esac
29429 fi
29430 if test -n "$a_deplib" ; then
29431- eval "libname=\"$libname_spec\""
29432+ libname=`eval "\\$ECHO \"$libname_spec\""`
29433 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
29434 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
29435 for potent_lib in $potential_libs; do
29436 potlib="$potent_lib" # see symlink-check above in file_magic test
29437 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
29438 $EGREP "$match_pattern_regex" > /dev/null; then
29439- newdeplibs="$newdeplibs $a_deplib"
29440+ func_append newdeplibs " $a_deplib"
29441 a_deplib=""
29442 break 2
29443 fi
29444@@ -6967,7 +7898,7 @@ EOF
29445 ;;
29446 *)
29447 # Add a -L argument.
29448- newdeplibs="$newdeplibs $a_deplib"
29449+ func_append newdeplibs " $a_deplib"
29450 ;;
29451 esac
29452 done # Gone through all deplibs.
29453@@ -7071,7 +8002,7 @@ EOF
29454 *)
29455 case " $deplibs " in
29456 *" -L$path/$objdir "*)
29457- new_libs="$new_libs -L$path/$objdir" ;;
29458+ func_append new_libs " -L$path/$objdir" ;;
29459 esac
29460 ;;
29461 esac
29462@@ -7081,10 +8012,10 @@ EOF
29463 -L*)
29464 case " $new_libs " in
29465 *" $deplib "*) ;;
29466- *) new_libs="$new_libs $deplib" ;;
29467+ *) func_append new_libs " $deplib" ;;
29468 esac
29469 ;;
29470- *) new_libs="$new_libs $deplib" ;;
29471+ *) func_append new_libs " $deplib" ;;
29472 esac
29473 done
29474 deplibs="$new_libs"
29475@@ -7101,10 +8032,12 @@ EOF
29476 hardcode_libdirs=
29477 dep_rpath=
29478 rpath="$finalize_rpath"
29479- test "$mode" != relink && rpath="$compile_rpath$rpath"
29480+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
29481 for libdir in $rpath; do
29482 if test -n "$hardcode_libdir_flag_spec"; then
29483 if test -n "$hardcode_libdir_separator"; then
29484+ func_replace_sysroot "$libdir"
29485+ libdir=$func_replace_sysroot_result
29486 if test -z "$hardcode_libdirs"; then
29487 hardcode_libdirs="$libdir"
29488 else
29489@@ -7113,18 +8046,18 @@ EOF
29490 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
29491 ;;
29492 *)
29493- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
29494+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
29495 ;;
29496 esac
29497 fi
29498 else
29499- eval "flag=\"$hardcode_libdir_flag_spec\""
29500- dep_rpath="$dep_rpath $flag"
29501+ eval flag=\"$hardcode_libdir_flag_spec\"
29502+ func_append dep_rpath " $flag"
29503 fi
29504 elif test -n "$runpath_var"; then
29505 case "$perm_rpath " in
29506 *" $libdir "*) ;;
29507- *) perm_rpath="$perm_rpath $libdir" ;;
29508+ *) func_apped perm_rpath " $libdir" ;;
29509 esac
29510 fi
29511 done
29512@@ -7133,40 +8066,38 @@ EOF
29513 test -n "$hardcode_libdirs"; then
29514 libdir="$hardcode_libdirs"
29515 if test -n "$hardcode_libdir_flag_spec_ld"; then
29516- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
29517+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
29518 else
29519- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
29520+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
29521 fi
29522 fi
29523 if test -n "$runpath_var" && test -n "$perm_rpath"; then
29524 # We should set the runpath_var.
29525 rpath=
29526 for dir in $perm_rpath; do
29527- rpath="$rpath$dir:"
29528+ func_append rpath "$dir:"
29529 done
29530- eval $runpath_var=\$rpath\$$runpath_var
29531- export $runpath_var
29532+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
29533 fi
29534 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
29535 fi
29536
29537 shlibpath="$finalize_shlibpath"
29538- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
29539+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
29540 if test -n "$shlibpath"; then
29541- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
29542- export $shlibpath_var
29543+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
29544 fi
29545
29546 # Get the real and link names of the library.
29547- eval "shared_ext=\"$shrext_cmds\""
29548- eval "library_names=\"$library_names_spec\""
29549+ eval shared_ext=\"$shrext_cmds\"
29550+ eval library_names=\"$library_names_spec\"
29551 set dummy $library_names
29552 shift
29553 realname="$1"
29554 shift
29555
29556 if test -n "$soname_spec"; then
29557- eval "soname=\"$soname_spec\""
29558+ eval soname=\"$soname_spec\"
29559 else
29560 soname="$realname"
29561 fi
29562@@ -7178,7 +8109,7 @@ EOF
29563 linknames=
29564 for link
29565 do
29566- linknames="$linknames $link"
29567+ func_append linknames " $link"
29568 done
29569
29570 # Use standard objects if they are pic
29571@@ -7189,7 +8120,7 @@ EOF
29572 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29573 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
29574 export_symbols="$output_objdir/$libname.uexp"
29575- delfiles="$delfiles $export_symbols"
29576+ func_append delfiles " $export_symbols"
29577 fi
29578
29579 orig_export_symbols=
29580@@ -7220,13 +8151,45 @@ EOF
29581 $opt_dry_run || $RM $export_symbols
29582 cmds=$export_symbols_cmds
29583 save_ifs="$IFS"; IFS='~'
29584- for cmd in $cmds; do
29585+ for cmd1 in $cmds; do
29586 IFS="$save_ifs"
29587- eval "cmd=\"$cmd\""
29588- func_len " $cmd"
29589- len=$func_len_result
29590- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
29591+ # Take the normal branch if the nm_file_list_spec branch
29592+ # doesn't work or if tool conversion is not needed.
29593+ case $nm_file_list_spec~$to_tool_file_cmd in
29594+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
29595+ try_normal_branch=yes
29596+ eval cmd=\"$cmd1\"
29597+ func_len " $cmd"
29598+ len=$func_len_result
29599+ ;;
29600+ *)
29601+ try_normal_branch=no
29602+ ;;
29603+ esac
29604+ if test "$try_normal_branch" = yes \
29605+ && { test "$len" -lt "$max_cmd_len" \
29606+ || test "$max_cmd_len" -le -1; }
29607+ then
29608+ func_show_eval "$cmd" 'exit $?'
29609+ skipped_export=false
29610+ elif test -n "$nm_file_list_spec"; then
29611+ func_basename "$output"
29612+ output_la=$func_basename_result
29613+ save_libobjs=$libobjs
29614+ save_output=$output
29615+ output=${output_objdir}/${output_la}.nm
29616+ func_to_tool_file "$output"
29617+ libobjs=$nm_file_list_spec$func_to_tool_file_result
29618+ func_append delfiles " $output"
29619+ func_verbose "creating $NM input file list: $output"
29620+ for obj in $save_libobjs; do
29621+ func_to_tool_file "$obj"
29622+ $ECHO "$func_to_tool_file_result"
29623+ done > "$output"
29624+ eval cmd=\"$cmd1\"
29625 func_show_eval "$cmd" 'exit $?'
29626+ output=$save_output
29627+ libobjs=$save_libobjs
29628 skipped_export=false
29629 else
29630 # The command line is too long to execute in one step.
29631@@ -7248,7 +8211,7 @@ EOF
29632 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29633 tmp_export_symbols="$export_symbols"
29634 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
29635- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
29636+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
29637 fi
29638
29639 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
29640@@ -7260,7 +8223,7 @@ EOF
29641 # global variables. join(1) would be nice here, but unfortunately
29642 # isn't a blessed tool.
29643 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
29644- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
29645+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
29646 export_symbols=$output_objdir/$libname.def
29647 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
29648 fi
29649@@ -7270,7 +8233,7 @@ EOF
29650 case " $convenience " in
29651 *" $test_deplib "*) ;;
29652 *)
29653- tmp_deplibs="$tmp_deplibs $test_deplib"
29654+ func_append tmp_deplibs " $test_deplib"
29655 ;;
29656 esac
29657 done
29658@@ -7286,43 +8249,43 @@ EOF
29659 fi
29660 if test -n "$whole_archive_flag_spec"; then
29661 save_libobjs=$libobjs
29662- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
29663+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
29664 test "X$libobjs" = "X " && libobjs=
29665 else
29666 gentop="$output_objdir/${outputname}x"
29667- generated="$generated $gentop"
29668+ func_append generated " $gentop"
29669
29670 func_extract_archives $gentop $convenience
29671- libobjs="$libobjs $func_extract_archives_result"
29672+ func_append libobjs " $func_extract_archives_result"
29673 test "X$libobjs" = "X " && libobjs=
29674 fi
29675 fi
29676
29677 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
29678- eval "flag=\"$thread_safe_flag_spec\""
29679- linker_flags="$linker_flags $flag"
29680+ eval flag=\"$thread_safe_flag_spec\"
29681+ func_append linker_flags " $flag"
29682 fi
29683
29684 # Make a backup of the uninstalled library when relinking
29685- if test "$mode" = relink; then
29686- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
29687+ if test "$opt_mode" = relink; then
29688+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
29689 fi
29690
29691 # Do each of the archive commands.
29692 if test "$module" = yes && test -n "$module_cmds" ; then
29693 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
29694- eval "test_cmds=\"$module_expsym_cmds\""
29695+ eval test_cmds=\"$module_expsym_cmds\"
29696 cmds=$module_expsym_cmds
29697 else
29698- eval "test_cmds=\"$module_cmds\""
29699+ eval test_cmds=\"$module_cmds\"
29700 cmds=$module_cmds
29701 fi
29702 else
29703 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
29704- eval "test_cmds=\"$archive_expsym_cmds\""
29705+ eval test_cmds=\"$archive_expsym_cmds\"
29706 cmds=$archive_expsym_cmds
29707 else
29708- eval "test_cmds=\"$archive_cmds\""
29709+ eval test_cmds=\"$archive_cmds\"
29710 cmds=$archive_cmds
29711 fi
29712 fi
29713@@ -7366,10 +8329,13 @@ EOF
29714 echo 'INPUT (' > $output
29715 for obj in $save_libobjs
29716 do
29717- $ECHO "$obj" >> $output
29718+ func_to_tool_file "$obj"
29719+ $ECHO "$func_to_tool_file_result" >> $output
29720 done
29721 echo ')' >> $output
29722- delfiles="$delfiles $output"
29723+ func_append delfiles " $output"
29724+ func_to_tool_file "$output"
29725+ output=$func_to_tool_file_result
29726 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
29727 output=${output_objdir}/${output_la}.lnk
29728 func_verbose "creating linker input file list: $output"
29729@@ -7383,15 +8349,17 @@ EOF
29730 fi
29731 for obj
29732 do
29733- $ECHO "$obj" >> $output
29734+ func_to_tool_file "$obj"
29735+ $ECHO "$func_to_tool_file_result" >> $output
29736 done
29737- delfiles="$delfiles $output"
29738- output=$firstobj\"$file_list_spec$output\"
29739+ func_append delfiles " $output"
29740+ func_to_tool_file "$output"
29741+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
29742 else
29743 if test -n "$save_libobjs"; then
29744 func_verbose "creating reloadable object files..."
29745 output=$output_objdir/$output_la-${k}.$objext
29746- eval "test_cmds=\"$reload_cmds\""
29747+ eval test_cmds=\"$reload_cmds\"
29748 func_len " $test_cmds"
29749 len0=$func_len_result
29750 len=$len0
29751@@ -7411,12 +8379,12 @@ EOF
29752 if test "$k" -eq 1 ; then
29753 # The first file doesn't have a previous command to add.
29754 reload_objs=$objlist
29755- eval "concat_cmds=\"$reload_cmds\""
29756+ eval concat_cmds=\"$reload_cmds\"
29757 else
29758 # All subsequent reloadable object files will link in
29759 # the last one created.
29760 reload_objs="$objlist $last_robj"
29761- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
29762+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
29763 fi
29764 last_robj=$output_objdir/$output_la-${k}.$objext
29765 func_arith $k + 1
29766@@ -7433,11 +8401,11 @@ EOF
29767 # files will link in the last one created.
29768 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
29769 reload_objs="$objlist $last_robj"
29770- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
29771+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
29772 if test -n "$last_robj"; then
29773- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
29774+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
29775 fi
29776- delfiles="$delfiles $output"
29777+ func_append delfiles " $output"
29778
29779 else
29780 output=
29781@@ -7450,9 +8418,9 @@ EOF
29782 libobjs=$output
29783 # Append the command to create the export file.
29784 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
29785- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
29786+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
29787 if test -n "$last_robj"; then
29788- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
29789+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
29790 fi
29791 fi
29792
29793@@ -7471,7 +8439,7 @@ EOF
29794 lt_exit=$?
29795
29796 # Restore the uninstalled library and exit
29797- if test "$mode" = relink; then
29798+ if test "$opt_mode" = relink; then
29799 ( cd "$output_objdir" && \
29800 $RM "${realname}T" && \
29801 $MV "${realname}U" "$realname" )
29802@@ -7492,7 +8460,7 @@ EOF
29803 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29804 tmp_export_symbols="$export_symbols"
29805 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
29806- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
29807+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
29808 fi
29809
29810 if test -n "$orig_export_symbols"; then
29811@@ -7504,7 +8472,7 @@ EOF
29812 # global variables. join(1) would be nice here, but unfortunately
29813 # isn't a blessed tool.
29814 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
29815- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
29816+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
29817 export_symbols=$output_objdir/$libname.def
29818 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
29819 fi
29820@@ -7515,7 +8483,7 @@ EOF
29821 output=$save_output
29822
29823 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
29824- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
29825+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
29826 test "X$libobjs" = "X " && libobjs=
29827 fi
29828 # Expand the library linking commands again to reset the
29829@@ -7539,23 +8507,23 @@ EOF
29830
29831 if test -n "$delfiles"; then
29832 # Append the command to remove temporary files to $cmds.
29833- eval "cmds=\"\$cmds~\$RM $delfiles\""
29834+ eval cmds=\"\$cmds~\$RM $delfiles\"
29835 fi
29836
29837 # Add any objects from preloaded convenience libraries
29838 if test -n "$dlprefiles"; then
29839 gentop="$output_objdir/${outputname}x"
29840- generated="$generated $gentop"
29841+ func_append generated " $gentop"
29842
29843 func_extract_archives $gentop $dlprefiles
29844- libobjs="$libobjs $func_extract_archives_result"
29845+ func_append libobjs " $func_extract_archives_result"
29846 test "X$libobjs" = "X " && libobjs=
29847 fi
29848
29849 save_ifs="$IFS"; IFS='~'
29850 for cmd in $cmds; do
29851 IFS="$save_ifs"
29852- eval "cmd=\"$cmd\""
29853+ eval cmd=\"$cmd\"
29854 $opt_silent || {
29855 func_quote_for_expand "$cmd"
29856 eval "func_echo $func_quote_for_expand_result"
29857@@ -7564,7 +8532,7 @@ EOF
29858 lt_exit=$?
29859
29860 # Restore the uninstalled library and exit
29861- if test "$mode" = relink; then
29862+ if test "$opt_mode" = relink; then
29863 ( cd "$output_objdir" && \
29864 $RM "${realname}T" && \
29865 $MV "${realname}U" "$realname" )
29866@@ -7576,8 +8544,8 @@ EOF
29867 IFS="$save_ifs"
29868
29869 # Restore the uninstalled library and exit
29870- if test "$mode" = relink; then
29871- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
29872+ if test "$opt_mode" = relink; then
29873+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
29874
29875 if test -n "$convenience"; then
29876 if test -z "$whole_archive_flag_spec"; then
29877@@ -7656,17 +8624,20 @@ EOF
29878
29879 if test -n "$convenience"; then
29880 if test -n "$whole_archive_flag_spec"; then
29881- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
29882+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
29883 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
29884 else
29885 gentop="$output_objdir/${obj}x"
29886- generated="$generated $gentop"
29887+ func_append generated " $gentop"
29888
29889 func_extract_archives $gentop $convenience
29890 reload_conv_objs="$reload_objs $func_extract_archives_result"
29891 fi
29892 fi
29893
29894+ # If we're not building shared, we need to use non_pic_objs
29895+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
29896+
29897 # Create the old-style object.
29898 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
29899
29900@@ -7690,7 +8661,7 @@ EOF
29901 # Create an invalid libtool object if no PIC, so that we don't
29902 # accidentally link it into a program.
29903 # $show "echo timestamp > $libobj"
29904- # $opt_dry_run || echo timestamp > $libobj || exit $?
29905+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
29906 exit $EXIT_SUCCESS
29907 fi
29908
29909@@ -7740,8 +8711,8 @@ EOF
29910 if test "$tagname" = CXX ; then
29911 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
29912 10.[0123])
29913- compile_command="$compile_command ${wl}-bind_at_load"
29914- finalize_command="$finalize_command ${wl}-bind_at_load"
29915+ func_append compile_command " ${wl}-bind_at_load"
29916+ func_append finalize_command " ${wl}-bind_at_load"
29917 ;;
29918 esac
29919 fi
29920@@ -7761,7 +8732,7 @@ EOF
29921 *)
29922 case " $compile_deplibs " in
29923 *" -L$path/$objdir "*)
29924- new_libs="$new_libs -L$path/$objdir" ;;
29925+ func_append new_libs " -L$path/$objdir" ;;
29926 esac
29927 ;;
29928 esac
29929@@ -7771,17 +8742,17 @@ EOF
29930 -L*)
29931 case " $new_libs " in
29932 *" $deplib "*) ;;
29933- *) new_libs="$new_libs $deplib" ;;
29934+ *) func_append new_libs " $deplib" ;;
29935 esac
29936 ;;
29937- *) new_libs="$new_libs $deplib" ;;
29938+ *) func_append new_libs " $deplib" ;;
29939 esac
29940 done
29941 compile_deplibs="$new_libs"
29942
29943
29944- compile_command="$compile_command $compile_deplibs"
29945- finalize_command="$finalize_command $finalize_deplibs"
29946+ func_append compile_command " $compile_deplibs"
29947+ func_append finalize_command " $finalize_deplibs"
29948
29949 if test -n "$rpath$xrpath"; then
29950 # If the user specified any rpath flags, then add them.
29951@@ -7789,7 +8760,7 @@ EOF
29952 # This is the magic to use -rpath.
29953 case "$finalize_rpath " in
29954 *" $libdir "*) ;;
29955- *) finalize_rpath="$finalize_rpath $libdir" ;;
29956+ *) func_append finalize_rpath " $libdir" ;;
29957 esac
29958 done
29959 fi
29960@@ -7808,18 +8779,18 @@ EOF
29961 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
29962 ;;
29963 *)
29964- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
29965+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
29966 ;;
29967 esac
29968 fi
29969 else
29970- eval "flag=\"$hardcode_libdir_flag_spec\""
29971- rpath="$rpath $flag"
29972+ eval flag=\"$hardcode_libdir_flag_spec\"
29973+ func_append rpath " $flag"
29974 fi
29975 elif test -n "$runpath_var"; then
29976 case "$perm_rpath " in
29977 *" $libdir "*) ;;
29978- *) perm_rpath="$perm_rpath $libdir" ;;
29979+ *) func_append perm_rpath " $libdir" ;;
29980 esac
29981 fi
29982 case $host in
29983@@ -7828,12 +8799,12 @@ EOF
29984 case :$dllsearchpath: in
29985 *":$libdir:"*) ;;
29986 ::) dllsearchpath=$libdir;;
29987- *) dllsearchpath="$dllsearchpath:$libdir";;
29988+ *) func_append dllsearchpath ":$libdir";;
29989 esac
29990 case :$dllsearchpath: in
29991 *":$testbindir:"*) ;;
29992 ::) dllsearchpath=$testbindir;;
29993- *) dllsearchpath="$dllsearchpath:$testbindir";;
29994+ *) func_append dllsearchpath ":$testbindir";;
29995 esac
29996 ;;
29997 esac
29998@@ -7842,7 +8813,7 @@ EOF
29999 if test -n "$hardcode_libdir_separator" &&
30000 test -n "$hardcode_libdirs"; then
30001 libdir="$hardcode_libdirs"
30002- eval "rpath=\" $hardcode_libdir_flag_spec\""
30003+ eval rpath=\" $hardcode_libdir_flag_spec\"
30004 fi
30005 compile_rpath="$rpath"
30006
30007@@ -7859,18 +8830,18 @@ EOF
30008 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
30009 ;;
30010 *)
30011- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
30012+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
30013 ;;
30014 esac
30015 fi
30016 else
30017- eval "flag=\"$hardcode_libdir_flag_spec\""
30018- rpath="$rpath $flag"
30019+ eval flag=\"$hardcode_libdir_flag_spec\"
30020+ func_append rpath " $flag"
30021 fi
30022 elif test -n "$runpath_var"; then
30023 case "$finalize_perm_rpath " in
30024 *" $libdir "*) ;;
30025- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
30026+ *) func_append finalize_perm_rpath " $libdir" ;;
30027 esac
30028 fi
30029 done
30030@@ -7878,7 +8849,7 @@ EOF
30031 if test -n "$hardcode_libdir_separator" &&
30032 test -n "$hardcode_libdirs"; then
30033 libdir="$hardcode_libdirs"
30034- eval "rpath=\" $hardcode_libdir_flag_spec\""
30035+ eval rpath=\" $hardcode_libdir_flag_spec\"
30036 fi
30037 finalize_rpath="$rpath"
30038
30039@@ -7921,6 +8892,12 @@ EOF
30040 exit_status=0
30041 func_show_eval "$link_command" 'exit_status=$?'
30042
30043+ if test -n "$postlink_cmds"; then
30044+ func_to_tool_file "$output"
30045+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
30046+ func_execute_cmds "$postlink_cmds" 'exit $?'
30047+ fi
30048+
30049 # Delete the generated files.
30050 if test -f "$output_objdir/${outputname}S.${objext}"; then
30051 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
30052@@ -7943,7 +8920,7 @@ EOF
30053 # We should set the runpath_var.
30054 rpath=
30055 for dir in $perm_rpath; do
30056- rpath="$rpath$dir:"
30057+ func_append rpath "$dir:"
30058 done
30059 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
30060 fi
30061@@ -7951,7 +8928,7 @@ EOF
30062 # We should set the runpath_var.
30063 rpath=
30064 for dir in $finalize_perm_rpath; do
30065- rpath="$rpath$dir:"
30066+ func_append rpath "$dir:"
30067 done
30068 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
30069 fi
30070@@ -7966,6 +8943,13 @@ EOF
30071 $opt_dry_run || $RM $output
30072 # Link the executable and exit
30073 func_show_eval "$link_command" 'exit $?'
30074+
30075+ if test -n "$postlink_cmds"; then
30076+ func_to_tool_file "$output"
30077+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
30078+ func_execute_cmds "$postlink_cmds" 'exit $?'
30079+ fi
30080+
30081 exit $EXIT_SUCCESS
30082 fi
30083
30084@@ -7999,6 +8983,12 @@ EOF
30085
30086 func_show_eval "$link_command" 'exit $?'
30087
30088+ if test -n "$postlink_cmds"; then
30089+ func_to_tool_file "$output_objdir/$outputname"
30090+ 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'`
30091+ func_execute_cmds "$postlink_cmds" 'exit $?'
30092+ fi
30093+
30094 # Now create the wrapper script.
30095 func_verbose "creating $output"
30096
30097@@ -8096,7 +9086,7 @@ EOF
30098 else
30099 oldobjs="$old_deplibs $non_pic_objects"
30100 if test "$preload" = yes && test -f "$symfileobj"; then
30101- oldobjs="$oldobjs $symfileobj"
30102+ func_append oldobjs " $symfileobj"
30103 fi
30104 fi
30105 addlibs="$old_convenience"
30106@@ -8104,10 +9094,10 @@ EOF
30107
30108 if test -n "$addlibs"; then
30109 gentop="$output_objdir/${outputname}x"
30110- generated="$generated $gentop"
30111+ func_append generated " $gentop"
30112
30113 func_extract_archives $gentop $addlibs
30114- oldobjs="$oldobjs $func_extract_archives_result"
30115+ func_append oldobjs " $func_extract_archives_result"
30116 fi
30117
30118 # Do each command in the archive commands.
30119@@ -8118,10 +9108,10 @@ EOF
30120 # Add any objects from preloaded convenience libraries
30121 if test -n "$dlprefiles"; then
30122 gentop="$output_objdir/${outputname}x"
30123- generated="$generated $gentop"
30124+ func_append generated " $gentop"
30125
30126 func_extract_archives $gentop $dlprefiles
30127- oldobjs="$oldobjs $func_extract_archives_result"
30128+ func_append oldobjs " $func_extract_archives_result"
30129 fi
30130
30131 # POSIX demands no paths to be encoded in archives. We have
30132@@ -8139,7 +9129,7 @@ EOF
30133 else
30134 echo "copying selected object files to avoid basename conflicts..."
30135 gentop="$output_objdir/${outputname}x"
30136- generated="$generated $gentop"
30137+ func_append generated " $gentop"
30138 func_mkdir_p "$gentop"
30139 save_oldobjs=$oldobjs
30140 oldobjs=
30141@@ -8163,18 +9153,28 @@ EOF
30142 esac
30143 done
30144 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
30145- oldobjs="$oldobjs $gentop/$newobj"
30146+ func_append oldobjs " $gentop/$newobj"
30147 ;;
30148- *) oldobjs="$oldobjs $obj" ;;
30149+ *) func_append oldobjs " $obj" ;;
30150 esac
30151 done
30152 fi
30153- eval "cmds=\"$old_archive_cmds\""
30154+ eval cmds=\"$old_archive_cmds\"
30155
30156 func_len " $cmds"
30157 len=$func_len_result
30158 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
30159 cmds=$old_archive_cmds
30160+ elif test -n "$archiver_list_spec"; then
30161+ func_verbose "using command file archive linking..."
30162+ for obj in $oldobjs
30163+ do
30164+ func_to_tool_file "$obj"
30165+ $ECHO "$func_to_tool_file_result"
30166+ done > $output_objdir/$libname.libcmd
30167+ func_to_tool_file "$output_objdir/$libname.libcmd"
30168+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
30169+ cmds=$old_archive_cmds
30170 else
30171 # the command line is too long to link in one step, link in parts
30172 func_verbose "using piecewise archive linking..."
30173@@ -8189,7 +9189,7 @@ EOF
30174 do
30175 last_oldobj=$obj
30176 done
30177- eval "test_cmds=\"$old_archive_cmds\""
30178+ eval test_cmds=\"$old_archive_cmds\"
30179 func_len " $test_cmds"
30180 len0=$func_len_result
30181 len=$len0
30182@@ -8208,7 +9208,7 @@ EOF
30183 RANLIB=$save_RANLIB
30184 fi
30185 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
30186- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
30187+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
30188 objlist=
30189 len=$len0
30190 fi
30191@@ -8216,9 +9216,9 @@ EOF
30192 RANLIB=$save_RANLIB
30193 oldobjs=$objlist
30194 if test "X$oldobjs" = "X" ; then
30195- eval "cmds=\"\$concat_cmds\""
30196+ eval cmds=\"\$concat_cmds\"
30197 else
30198- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
30199+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
30200 fi
30201 fi
30202 fi
30203@@ -8268,12 +9268,23 @@ EOF
30204 *.la)
30205 func_basename "$deplib"
30206 name="$func_basename_result"
30207- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
30208+ func_resolve_sysroot "$deplib"
30209+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
30210 test -z "$libdir" && \
30211 func_fatal_error "\`$deplib' is not a valid libtool archive"
30212- newdependency_libs="$newdependency_libs $libdir/$name"
30213+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
30214+ ;;
30215+ -L*)
30216+ func_stripname -L '' "$deplib"
30217+ func_replace_sysroot "$func_stripname_result"
30218+ func_append newdependency_libs " -L$func_replace_sysroot_result"
30219 ;;
30220- *) newdependency_libs="$newdependency_libs $deplib" ;;
30221+ -R*)
30222+ func_stripname -R '' "$deplib"
30223+ func_replace_sysroot "$func_stripname_result"
30224+ func_append newdependency_libs " -R$func_replace_sysroot_result"
30225+ ;;
30226+ *) func_append newdependency_libs " $deplib" ;;
30227 esac
30228 done
30229 dependency_libs="$newdependency_libs"
30230@@ -8284,12 +9295,14 @@ EOF
30231 *.la)
30232 func_basename "$lib"
30233 name="$func_basename_result"
30234- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
30235+ func_resolve_sysroot "$lib"
30236+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
30237+
30238 test -z "$libdir" && \
30239 func_fatal_error "\`$lib' is not a valid libtool archive"
30240- newdlfiles="$newdlfiles $libdir/$name"
30241+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
30242 ;;
30243- *) newdlfiles="$newdlfiles $lib" ;;
30244+ *) func_append newdlfiles " $lib" ;;
30245 esac
30246 done
30247 dlfiles="$newdlfiles"
30248@@ -8303,10 +9316,11 @@ EOF
30249 # the library:
30250 func_basename "$lib"
30251 name="$func_basename_result"
30252- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
30253+ func_resolve_sysroot "$lib"
30254+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
30255 test -z "$libdir" && \
30256 func_fatal_error "\`$lib' is not a valid libtool archive"
30257- newdlprefiles="$newdlprefiles $libdir/$name"
30258+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
30259 ;;
30260 esac
30261 done
30262@@ -8318,7 +9332,7 @@ EOF
30263 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
30264 *) abs=`pwd`"/$lib" ;;
30265 esac
30266- newdlfiles="$newdlfiles $abs"
30267+ func_append newdlfiles " $abs"
30268 done
30269 dlfiles="$newdlfiles"
30270 newdlprefiles=
30271@@ -8327,7 +9341,7 @@ EOF
30272 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
30273 *) abs=`pwd`"/$lib" ;;
30274 esac
30275- newdlprefiles="$newdlprefiles $abs"
30276+ func_append newdlprefiles " $abs"
30277 done
30278 dlprefiles="$newdlprefiles"
30279 fi
30280@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
30281 exit $EXIT_SUCCESS
30282 }
30283
30284-{ test "$mode" = link || test "$mode" = relink; } &&
30285+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
30286 func_mode_link ${1+"$@"}
30287
30288
30289@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
30290 for arg
30291 do
30292 case $arg in
30293- -f) RM="$RM $arg"; rmforce=yes ;;
30294- -*) RM="$RM $arg" ;;
30295- *) files="$files $arg" ;;
30296+ -f) func_append RM " $arg"; rmforce=yes ;;
30297+ -*) func_append RM " $arg" ;;
30298+ *) func_append files " $arg" ;;
30299 esac
30300 done
30301
30302@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
30303
30304 rmdirs=
30305
30306- origobjdir="$objdir"
30307 for file in $files; do
30308 func_dirname "$file" "" "."
30309 dir="$func_dirname_result"
30310 if test "X$dir" = X.; then
30311- objdir="$origobjdir"
30312+ odir="$objdir"
30313 else
30314- objdir="$dir/$origobjdir"
30315+ odir="$dir/$objdir"
30316 fi
30317 func_basename "$file"
30318 name="$func_basename_result"
30319- test "$mode" = uninstall && objdir="$dir"
30320+ test "$opt_mode" = uninstall && odir="$dir"
30321
30322- # Remember objdir for removal later, being careful to avoid duplicates
30323- if test "$mode" = clean; then
30324+ # Remember odir for removal later, being careful to avoid duplicates
30325+ if test "$opt_mode" = clean; then
30326 case " $rmdirs " in
30327- *" $objdir "*) ;;
30328- *) rmdirs="$rmdirs $objdir" ;;
30329+ *" $odir "*) ;;
30330+ *) func_append rmdirs " $odir" ;;
30331 esac
30332 fi
30333
30334@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
30335
30336 # Delete the libtool libraries and symlinks.
30337 for n in $library_names; do
30338- rmfiles="$rmfiles $objdir/$n"
30339+ func_append rmfiles " $odir/$n"
30340 done
30341- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
30342+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
30343
30344- case "$mode" in
30345+ case "$opt_mode" in
30346 clean)
30347- case " $library_names " in
30348- # " " in the beginning catches empty $dlname
30349+ case " $library_names " in
30350 *" $dlname "*) ;;
30351- *) rmfiles="$rmfiles $objdir/$dlname" ;;
30352+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
30353 esac
30354- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
30355+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
30356 ;;
30357 uninstall)
30358 if test -n "$library_names"; then
30359@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
30360 # Add PIC object to the list of files to remove.
30361 if test -n "$pic_object" &&
30362 test "$pic_object" != none; then
30363- rmfiles="$rmfiles $dir/$pic_object"
30364+ func_append rmfiles " $dir/$pic_object"
30365 fi
30366
30367 # Add non-PIC object to the list of files to remove.
30368 if test -n "$non_pic_object" &&
30369 test "$non_pic_object" != none; then
30370- rmfiles="$rmfiles $dir/$non_pic_object"
30371+ func_append rmfiles " $dir/$non_pic_object"
30372 fi
30373 fi
30374 ;;
30375
30376 *)
30377- if test "$mode" = clean ; then
30378+ if test "$opt_mode" = clean ; then
30379 noexename=$name
30380 case $file in
30381 *.exe)
30382@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
30383 noexename=$func_stripname_result
30384 # $file with .exe has already been added to rmfiles,
30385 # add $file without .exe
30386- rmfiles="$rmfiles $file"
30387+ func_append rmfiles " $file"
30388 ;;
30389 esac
30390 # Do a test to see if this is a libtool program.
30391@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
30392 func_ltwrapper_scriptname "$file"
30393 relink_command=
30394 func_source $func_ltwrapper_scriptname_result
30395- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
30396+ func_append rmfiles " $func_ltwrapper_scriptname_result"
30397 else
30398 relink_command=
30399 func_source $dir/$noexename
30400@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
30401
30402 # note $name still contains .exe if it was in $file originally
30403 # as does the version of $file that was added into $rmfiles
30404- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
30405+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
30406 if test "$fast_install" = yes && test -n "$relink_command"; then
30407- rmfiles="$rmfiles $objdir/lt-$name"
30408+ func_append rmfiles " $odir/lt-$name"
30409 fi
30410 if test "X$noexename" != "X$name" ; then
30411- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
30412+ func_append rmfiles " $odir/lt-${noexename}.c"
30413 fi
30414 fi
30415 fi
30416@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
30417 esac
30418 func_show_eval "$RM $rmfiles" 'exit_status=1'
30419 done
30420- objdir="$origobjdir"
30421
30422 # Try to remove the ${objdir}s in the directories where we deleted files
30423 for dir in $rmdirs; do
30424@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
30425 exit $exit_status
30426 }
30427
30428-{ test "$mode" = uninstall || test "$mode" = clean; } &&
30429+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
30430 func_mode_uninstall ${1+"$@"}
30431
30432-test -z "$mode" && {
30433+test -z "$opt_mode" && {
30434 help="$generic_help"
30435 func_fatal_help "you must specify a MODE"
30436 }
30437
30438 test -z "$exec_cmd" && \
30439- func_fatal_help "invalid operation mode \`$mode'"
30440+ func_fatal_help "invalid operation mode \`$opt_mode'"
30441
30442 if test -n "$exec_cmd"; then
30443 eval exec "$exec_cmd"
30444diff --git a/ltoptions.m4 b/ltoptions.m4
30445index 5ef12ced2a8..17cfd51c0b3 100644
30446--- a/ltoptions.m4
30447+++ b/ltoptions.m4
30448@@ -8,7 +8,7 @@
30449 # unlimited permission to copy and/or distribute it, with or without
30450 # modifications, as long as this notice is preserved.
30451
30452-# serial 6 ltoptions.m4
30453+# serial 7 ltoptions.m4
30454
30455 # This is to help aclocal find these macros, as it can't see m4_define.
30456 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
30457diff --git a/ltversion.m4 b/ltversion.m4
30458index bf87f77132d..9c7b5d41185 100644
30459--- a/ltversion.m4
30460+++ b/ltversion.m4
30461@@ -7,17 +7,17 @@
30462 # unlimited permission to copy and/or distribute it, with or without
30463 # modifications, as long as this notice is preserved.
30464
30465-# Generated from ltversion.in.
30466+# @configure_input@
30467
30468-# serial 3134 ltversion.m4
30469+# serial 3293 ltversion.m4
30470 # This file is part of GNU Libtool
30471
30472-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
30473-m4_define([LT_PACKAGE_REVISION], [1.3134])
30474+m4_define([LT_PACKAGE_VERSION], [2.4])
30475+m4_define([LT_PACKAGE_REVISION], [1.3293])
30476
30477 AC_DEFUN([LTVERSION_VERSION],
30478-[macro_version='2.2.7a'
30479-macro_revision='1.3134'
30480+[macro_version='2.4'
30481+macro_revision='1.3293'
30482 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
30483 _LT_DECL(, macro_revision, 0)
30484 ])
30485diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
30486index bf92b5e0790..c573da90c5c 100644
30487--- a/lt~obsolete.m4
30488+++ b/lt~obsolete.m4
30489@@ -7,7 +7,7 @@
30490 # unlimited permission to copy and/or distribute it, with or without
30491 # modifications, as long as this notice is preserved.
30492
30493-# serial 4 lt~obsolete.m4
30494+# serial 5 lt~obsolete.m4
30495
30496 # These exist entirely to fool aclocal when bootstrapping libtool.
30497 #
30498diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
30499index 245479140c9..bfed90449bf 100644
30500--- a/opcodes/Makefile.in
30501+++ b/opcodes/Makefile.in
30502@@ -298,6 +298,7 @@ CYGPATH_W = @CYGPATH_W@
30503 DATADIRNAME = @DATADIRNAME@
30504 DEFS = @DEFS@
30505 DEPDIR = @DEPDIR@
30506+DLLTOOL = @DLLTOOL@
30507 DSYMUTIL = @DSYMUTIL@
30508 DUMPBIN = @DUMPBIN@
30509 ECHO_C = @ECHO_C@
30510@@ -336,6 +337,7 @@ LTLIBINTL = @LTLIBINTL@
30511 LTLIBOBJS = @LTLIBOBJS@
30512 MAINT = @MAINT@
30513 MAKEINFO = @MAKEINFO@
30514+MANIFEST_TOOL = @MANIFEST_TOOL@
30515 MKDIR_P = @MKDIR_P@
30516 MKINSTALLDIRS = @MKINSTALLDIRS@
30517 MSGFMT = @MSGFMT@
30518@@ -374,6 +376,7 @@ abs_builddir = @abs_builddir@
30519 abs_srcdir = @abs_srcdir@
30520 abs_top_builddir = @abs_top_builddir@
30521 abs_top_srcdir = @abs_top_srcdir@
30522+ac_ct_AR = @ac_ct_AR@
30523 ac_ct_CC = @ac_ct_CC@
30524 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
30525 am__include = @am__include@
30526diff --git a/opcodes/configure b/opcodes/configure
30527index 1660c3266a3..a1b84ed81f9 100755
30528--- a/opcodes/configure
30529+++ b/opcodes/configure
30530@@ -688,6 +688,9 @@ OTOOL
30531 LIPO
30532 NMEDIT
30533 DSYMUTIL
30534+MANIFEST_TOOL
30535+ac_ct_AR
30536+DLLTOOL
30537 OBJDUMP
30538 LN_S
30539 NM
30540@@ -806,6 +809,7 @@ enable_static
30541 with_pic
30542 enable_fast_install
30543 with_gnu_ld
30544+with_libtool_sysroot
30545 enable_libtool_lock
30546 enable_checking
30547 enable_targets
30548@@ -1487,6 +1491,8 @@ Optional Packages:
30549 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
30550 --without-libintl-prefix don't search for libintl in includedir and libdir
30551 --with-libintl-type=TYPE type of library to search for (auto/static/shared)
30552+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
30553+ (or the compiler's sysroot if not specified).
30554
30555 Some influential environment variables:
30556 CC C compiler command
30557@@ -4997,8 +5003,8 @@ esac
30558
30559
30560
30561-macro_version='2.2.7a'
30562-macro_revision='1.3134'
30563+macro_version='2.4'
30564+macro_revision='1.3293'
30565
30566
30567
30568@@ -5038,7 +5044,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
30569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
30570 $as_echo_n "checking how to print strings... " >&6; }
30571 # Test print first, because it will be a builtin if present.
30572-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
30573+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
30574 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
30575 ECHO='print -r --'
30576 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
30577@@ -5731,8 +5737,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
30578 # Try some XSI features
30579 xsi_shell=no
30580 ( _lt_dummy="a/b/c"
30581- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
30582- = c,a/b,, \
30583+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
30584+ = c,a/b,b/c, \
30585 && eval 'test $(( 1 + 1 )) -eq 2 \
30586 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
30587 && xsi_shell=yes
30588@@ -5781,6 +5787,80 @@ esac
30589
30590
30591
30592+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
30593+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
30594+if ${lt_cv_to_host_file_cmd+:} false; then :
30595+ $as_echo_n "(cached) " >&6
30596+else
30597+ case $host in
30598+ *-*-mingw* )
30599+ case $build in
30600+ *-*-mingw* ) # actually msys
30601+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
30602+ ;;
30603+ *-*-cygwin* )
30604+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
30605+ ;;
30606+ * ) # otherwise, assume *nix
30607+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
30608+ ;;
30609+ esac
30610+ ;;
30611+ *-*-cygwin* )
30612+ case $build in
30613+ *-*-mingw* ) # actually msys
30614+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
30615+ ;;
30616+ *-*-cygwin* )
30617+ lt_cv_to_host_file_cmd=func_convert_file_noop
30618+ ;;
30619+ * ) # otherwise, assume *nix
30620+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
30621+ ;;
30622+ esac
30623+ ;;
30624+ * ) # unhandled hosts (and "normal" native builds)
30625+ lt_cv_to_host_file_cmd=func_convert_file_noop
30626+ ;;
30627+esac
30628+
30629+fi
30630+
30631+to_host_file_cmd=$lt_cv_to_host_file_cmd
30632+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
30633+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
30634+
30635+
30636+
30637+
30638+
30639+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
30640+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
30641+if ${lt_cv_to_tool_file_cmd+:} false; then :
30642+ $as_echo_n "(cached) " >&6
30643+else
30644+ #assume ordinary cross tools, or native build.
30645+lt_cv_to_tool_file_cmd=func_convert_file_noop
30646+case $host in
30647+ *-*-mingw* )
30648+ case $build in
30649+ *-*-mingw* ) # actually msys
30650+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
30651+ ;;
30652+ esac
30653+ ;;
30654+esac
30655+
30656+fi
30657+
30658+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
30659+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
30660+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
30661+
30662+
30663+
30664+
30665+
30666 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
30667 $as_echo_n "checking for $LD option to reload object files... " >&6; }
30668 if ${lt_cv_ld_reload_flag+:} false; then :
30669@@ -5797,6 +5877,11 @@ case $reload_flag in
30670 esac
30671 reload_cmds='$LD$reload_flag -o $output$reload_objs'
30672 case $host_os in
30673+ cygwin* | mingw* | pw32* | cegcc*)
30674+ if test "$GCC" != yes; then
30675+ reload_cmds=false
30676+ fi
30677+ ;;
30678 darwin*)
30679 if test "$GCC" = yes; then
30680 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
30681@@ -5965,7 +6050,8 @@ mingw* | pw32*)
30682 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
30683 lt_cv_file_magic_cmd='func_win32_libid'
30684 else
30685- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
30686+ # Keep this pattern in sync with the one in func_win32_libid.
30687+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
30688 lt_cv_file_magic_cmd='$OBJDUMP -f'
30689 fi
30690 ;;
30691@@ -6124,6 +6210,21 @@ esac
30692 fi
30693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
30694 $as_echo "$lt_cv_deplibs_check_method" >&6; }
30695+
30696+file_magic_glob=
30697+want_nocaseglob=no
30698+if test "$build" = "$host"; then
30699+ case $host_os in
30700+ mingw* | pw32*)
30701+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
30702+ want_nocaseglob=yes
30703+ else
30704+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
30705+ fi
30706+ ;;
30707+ esac
30708+fi
30709+
30710 file_magic_cmd=$lt_cv_file_magic_cmd
30711 deplibs_check_method=$lt_cv_deplibs_check_method
30712 test -z "$deplibs_check_method" && deplibs_check_method=unknown
30713@@ -6139,6 +6240,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
30714
30715
30716
30717+
30718+
30719+
30720+
30721+
30722+
30723+
30724+
30725+
30726+
30727+if test -n "$ac_tool_prefix"; then
30728+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
30729+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
30730+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30731+$as_echo_n "checking for $ac_word... " >&6; }
30732+if ${ac_cv_prog_DLLTOOL+:} false; then :
30733+ $as_echo_n "(cached) " >&6
30734+else
30735+ if test -n "$DLLTOOL"; then
30736+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
30737+else
30738+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
30739+for as_dir in $PATH
30740+do
30741+ IFS=$as_save_IFS
30742+ test -z "$as_dir" && as_dir=.
30743+ for ac_exec_ext in '' $ac_executable_extensions; do
30744+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30745+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
30746+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30747+ break 2
30748+ fi
30749+done
30750+ done
30751+IFS=$as_save_IFS
30752+
30753+fi
30754+fi
30755+DLLTOOL=$ac_cv_prog_DLLTOOL
30756+if test -n "$DLLTOOL"; then
30757+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
30758+$as_echo "$DLLTOOL" >&6; }
30759+else
30760+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
30761+$as_echo "no" >&6; }
30762+fi
30763+
30764+
30765+fi
30766+if test -z "$ac_cv_prog_DLLTOOL"; then
30767+ ac_ct_DLLTOOL=$DLLTOOL
30768+ # Extract the first word of "dlltool", so it can be a program name with args.
30769+set dummy dlltool; ac_word=$2
30770+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30771+$as_echo_n "checking for $ac_word... " >&6; }
30772+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
30773+ $as_echo_n "(cached) " >&6
30774+else
30775+ if test -n "$ac_ct_DLLTOOL"; then
30776+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
30777+else
30778+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
30779+for as_dir in $PATH
30780+do
30781+ IFS=$as_save_IFS
30782+ test -z "$as_dir" && as_dir=.
30783+ for ac_exec_ext in '' $ac_executable_extensions; do
30784+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30785+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
30786+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30787+ break 2
30788+ fi
30789+done
30790+ done
30791+IFS=$as_save_IFS
30792+
30793+fi
30794+fi
30795+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
30796+if test -n "$ac_ct_DLLTOOL"; then
30797+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
30798+$as_echo "$ac_ct_DLLTOOL" >&6; }
30799+else
30800+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
30801+$as_echo "no" >&6; }
30802+fi
30803+
30804+ if test "x$ac_ct_DLLTOOL" = x; then
30805+ DLLTOOL="false"
30806+ else
30807+ case $cross_compiling:$ac_tool_warned in
30808+yes:)
30809+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
30810+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
30811+ac_tool_warned=yes ;;
30812+esac
30813+ DLLTOOL=$ac_ct_DLLTOOL
30814+ fi
30815+else
30816+ DLLTOOL="$ac_cv_prog_DLLTOOL"
30817+fi
30818+
30819+test -z "$DLLTOOL" && DLLTOOL=dlltool
30820+
30821+
30822+
30823+
30824+
30825+
30826+
30827+
30828+
30829+
30830+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
30831+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
30832+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
30833+ $as_echo_n "(cached) " >&6
30834+else
30835+ lt_cv_sharedlib_from_linklib_cmd='unknown'
30836+
30837+case $host_os in
30838+cygwin* | mingw* | pw32* | cegcc*)
30839+ # two different shell functions defined in ltmain.sh
30840+ # decide which to use based on capabilities of $DLLTOOL
30841+ case `$DLLTOOL --help 2>&1` in
30842+ *--identify-strict*)
30843+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
30844+ ;;
30845+ *)
30846+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
30847+ ;;
30848+ esac
30849+ ;;
30850+*)
30851+ # fallback: assume linklib IS sharedlib
30852+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
30853+ ;;
30854+esac
30855+
30856+fi
30857+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
30858+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
30859+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
30860+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
30861+
30862+
30863+
30864+
30865+
30866+
30867+
30868 plugin_option=
30869 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
30870 for plugin in $plugin_names; do
30871@@ -6153,8 +6405,10 @@ for plugin in $plugin_names; do
30872 done
30873
30874 if test -n "$ac_tool_prefix"; then
30875- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
30876-set dummy ${ac_tool_prefix}ar; ac_word=$2
30877+ for ac_prog in ar
30878+ do
30879+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
30880+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
30881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30882 $as_echo_n "checking for $ac_word... " >&6; }
30883 if ${ac_cv_prog_AR+:} false; then :
30884@@ -6170,7 +6424,7 @@ do
30885 test -z "$as_dir" && as_dir=.
30886 for ac_exec_ext in '' $ac_executable_extensions; do
30887 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30888- ac_cv_prog_AR="${ac_tool_prefix}ar"
30889+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
30890 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30891 break 2
30892 fi
30893@@ -6190,11 +6444,15 @@ $as_echo "no" >&6; }
30894 fi
30895
30896
30897+ test -n "$AR" && break
30898+ done
30899 fi
30900-if test -z "$ac_cv_prog_AR"; then
30901+if test -z "$AR"; then
30902 ac_ct_AR=$AR
30903- # Extract the first word of "ar", so it can be a program name with args.
30904-set dummy ar; ac_word=$2
30905+ for ac_prog in ar
30906+do
30907+ # Extract the first word of "$ac_prog", so it can be a program name with args.
30908+set dummy $ac_prog; ac_word=$2
30909 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30910 $as_echo_n "checking for $ac_word... " >&6; }
30911 if ${ac_cv_prog_ac_ct_AR+:} false; then :
30912@@ -6210,7 +6468,7 @@ do
30913 test -z "$as_dir" && as_dir=.
30914 for ac_exec_ext in '' $ac_executable_extensions; do
30915 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30916- ac_cv_prog_ac_ct_AR="ar"
30917+ ac_cv_prog_ac_ct_AR="$ac_prog"
30918 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30919 break 2
30920 fi
30921@@ -6229,6 +6487,10 @@ else
30922 $as_echo "no" >&6; }
30923 fi
30924
30925+
30926+ test -n "$ac_ct_AR" && break
30927+done
30928+
30929 if test "x$ac_ct_AR" = x; then
30930 AR="false"
30931 else
30932@@ -6240,25 +6502,20 @@ ac_tool_warned=yes ;;
30933 esac
30934 AR=$ac_ct_AR
30935 fi
30936-else
30937- AR="$ac_cv_prog_AR"
30938 fi
30939
30940-test -z "$AR" && AR=ar
30941-if test -n "$plugin_option"; then
30942- if $AR --help 2>&1 | grep -q "\--plugin"; then
30943- touch conftest.c
30944- $AR $plugin_option rc conftest.a conftest.c
30945- if test "$?" != 0; then
30946- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
30947+ touch conftest.c
30948+ $AR $plugin_option rc conftest.a conftest.c
30949+ if test "$?" != 0; then
30950+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
30951 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
30952- else
30953- AR="$AR $plugin_option"
30954- fi
30955- rm -f conftest.*
30956+ else
30957+ AR="$AR $plugin_option"
30958 fi
30959-fi
30960-test -z "$AR_FLAGS" && AR_FLAGS=cru
30961+ rm -f conftest.*
30962+: ${AR=ar}
30963+: ${AR_FLAGS=cru}
30964+
30965
30966
30967
30968@@ -6269,6 +6526,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
30969
30970
30971
30972+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
30973+$as_echo_n "checking for archiver @FILE support... " >&6; }
30974+if ${lt_cv_ar_at_file+:} false; then :
30975+ $as_echo_n "(cached) " >&6
30976+else
30977+ lt_cv_ar_at_file=no
30978+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
30979+/* end confdefs.h. */
30980+
30981+int
30982+main ()
30983+{
30984+
30985+ ;
30986+ return 0;
30987+}
30988+_ACEOF
30989+if ac_fn_c_try_compile "$LINENO"; then :
30990+ echo conftest.$ac_objext > conftest.lst
30991+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
30992+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
30993+ (eval $lt_ar_try) 2>&5
30994+ ac_status=$?
30995+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
30996+ test $ac_status = 0; }
30997+ if test "$ac_status" -eq 0; then
30998+ # Ensure the archiver fails upon bogus file names.
30999+ rm -f conftest.$ac_objext libconftest.a
31000+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
31001+ (eval $lt_ar_try) 2>&5
31002+ ac_status=$?
31003+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
31004+ test $ac_status = 0; }
31005+ if test "$ac_status" -ne 0; then
31006+ lt_cv_ar_at_file=@
31007+ fi
31008+ fi
31009+ rm -f conftest.* libconftest.a
31010+
31011+fi
31012+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
31013+
31014+fi
31015+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
31016+$as_echo "$lt_cv_ar_at_file" >&6; }
31017+
31018+if test "x$lt_cv_ar_at_file" = xno; then
31019+ archiver_list_spec=
31020+else
31021+ archiver_list_spec=$lt_cv_ar_at_file
31022+fi
31023+
31024+
31025+
31026+
31027+
31028+
31029
31030 if test -n "$ac_tool_prefix"; then
31031 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
31032@@ -6609,8 +6923,8 @@ esac
31033 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
31034
31035 # Transform an extracted symbol line into symbol name and symbol address
31036-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
31037-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'"
31038+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
31039+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'"
31040
31041 # Handle CRLF in mingw tool chain
31042 opt_cr=
31043@@ -6646,6 +6960,7 @@ for ac_symprfx in "" "_"; do
31044 else
31045 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
31046 fi
31047+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
31048
31049 # Check to see that the pipe works correctly.
31050 pipe_works=no
31051@@ -6687,6 +7002,18 @@ _LT_EOF
31052 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
31053 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
31054 cat <<_LT_EOF > conftest.$ac_ext
31055+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
31056+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
31057+/* DATA imports from DLLs on WIN32 con't be const, because runtime
31058+ relocations are performed -- see ld's documentation on pseudo-relocs. */
31059+# define LT_DLSYM_CONST
31060+#elif defined(__osf__)
31061+/* This system does not cope well with relocations in const data. */
31062+# define LT_DLSYM_CONST
31063+#else
31064+# define LT_DLSYM_CONST const
31065+#endif
31066+
31067 #ifdef __cplusplus
31068 extern "C" {
31069 #endif
31070@@ -6698,7 +7025,7 @@ _LT_EOF
31071 cat <<_LT_EOF >> conftest.$ac_ext
31072
31073 /* The mapping between symbol names and symbols. */
31074-const struct {
31075+LT_DLSYM_CONST struct {
31076 const char *name;
31077 void *address;
31078 }
31079@@ -6724,8 +7051,8 @@ static const void *lt_preloaded_setup() {
31080 _LT_EOF
31081 # Now try linking the two files.
31082 mv conftest.$ac_objext conftstm.$ac_objext
31083- lt_save_LIBS="$LIBS"
31084- lt_save_CFLAGS="$CFLAGS"
31085+ lt_globsym_save_LIBS=$LIBS
31086+ lt_globsym_save_CFLAGS=$CFLAGS
31087 LIBS="conftstm.$ac_objext"
31088 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
31089 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
31090@@ -6735,8 +7062,8 @@ _LT_EOF
31091 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
31092 pipe_works=yes
31093 fi
31094- LIBS="$lt_save_LIBS"
31095- CFLAGS="$lt_save_CFLAGS"
31096+ LIBS=$lt_globsym_save_LIBS
31097+ CFLAGS=$lt_globsym_save_CFLAGS
31098 else
31099 echo "cannot find nm_test_func in $nlist" >&5
31100 fi
31101@@ -6773,6 +7100,14 @@ else
31102 $as_echo "ok" >&6; }
31103 fi
31104
31105+# Response file support.
31106+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
31107+ nm_file_list_spec='@'
31108+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
31109+ nm_file_list_spec='@'
31110+fi
31111+
31112+
31113
31114
31115
31116@@ -6791,6 +7126,47 @@ fi
31117
31118
31119
31120+
31121+
31122+
31123+
31124+
31125+
31126+
31127+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
31128+$as_echo_n "checking for sysroot... " >&6; }
31129+
31130+# Check whether --with-libtool-sysroot was given.
31131+if test "${with_libtool_sysroot+set}" = set; then :
31132+ withval=$with_libtool_sysroot;
31133+else
31134+ with_libtool_sysroot=no
31135+fi
31136+
31137+
31138+lt_sysroot=
31139+case ${with_libtool_sysroot} in #(
31140+ yes)
31141+ if test "$GCC" = yes; then
31142+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
31143+ fi
31144+ ;; #(
31145+ /*)
31146+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
31147+ ;; #(
31148+ no|'')
31149+ ;; #(
31150+ *)
31151+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
31152+$as_echo "${with_libtool_sysroot}" >&6; }
31153+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
31154+ ;;
31155+esac
31156+
31157+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
31158+$as_echo "${lt_sysroot:-no}" >&6; }
31159+
31160+
31161
31162
31163
31164@@ -7000,6 +7376,123 @@ esac
31165
31166 need_locks="$enable_libtool_lock"
31167
31168+if test -n "$ac_tool_prefix"; then
31169+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
31170+set dummy ${ac_tool_prefix}mt; ac_word=$2
31171+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31172+$as_echo_n "checking for $ac_word... " >&6; }
31173+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
31174+ $as_echo_n "(cached) " >&6
31175+else
31176+ if test -n "$MANIFEST_TOOL"; then
31177+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
31178+else
31179+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
31180+for as_dir in $PATH
31181+do
31182+ IFS=$as_save_IFS
31183+ test -z "$as_dir" && as_dir=.
31184+ for ac_exec_ext in '' $ac_executable_extensions; do
31185+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
31186+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
31187+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31188+ break 2
31189+ fi
31190+done
31191+ done
31192+IFS=$as_save_IFS
31193+
31194+fi
31195+fi
31196+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
31197+if test -n "$MANIFEST_TOOL"; then
31198+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
31199+$as_echo "$MANIFEST_TOOL" >&6; }
31200+else
31201+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
31202+$as_echo "no" >&6; }
31203+fi
31204+
31205+
31206+fi
31207+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
31208+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
31209+ # Extract the first word of "mt", so it can be a program name with args.
31210+set dummy mt; ac_word=$2
31211+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31212+$as_echo_n "checking for $ac_word... " >&6; }
31213+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
31214+ $as_echo_n "(cached) " >&6
31215+else
31216+ if test -n "$ac_ct_MANIFEST_TOOL"; then
31217+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
31218+else
31219+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
31220+for as_dir in $PATH
31221+do
31222+ IFS=$as_save_IFS
31223+ test -z "$as_dir" && as_dir=.
31224+ for ac_exec_ext in '' $ac_executable_extensions; do
31225+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
31226+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
31227+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31228+ break 2
31229+ fi
31230+done
31231+ done
31232+IFS=$as_save_IFS
31233+
31234+fi
31235+fi
31236+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
31237+if test -n "$ac_ct_MANIFEST_TOOL"; then
31238+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
31239+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
31240+else
31241+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
31242+$as_echo "no" >&6; }
31243+fi
31244+
31245+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
31246+ MANIFEST_TOOL=":"
31247+ else
31248+ case $cross_compiling:$ac_tool_warned in
31249+yes:)
31250+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
31251+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
31252+ac_tool_warned=yes ;;
31253+esac
31254+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
31255+ fi
31256+else
31257+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
31258+fi
31259+
31260+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
31261+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
31262+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
31263+if ${lt_cv_path_mainfest_tool+:} false; then :
31264+ $as_echo_n "(cached) " >&6
31265+else
31266+ lt_cv_path_mainfest_tool=no
31267+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
31268+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
31269+ cat conftest.err >&5
31270+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
31271+ lt_cv_path_mainfest_tool=yes
31272+ fi
31273+ rm -f conftest*
31274+fi
31275+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
31276+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
31277+if test "x$lt_cv_path_mainfest_tool" != xyes; then
31278+ MANIFEST_TOOL=:
31279+fi
31280+
31281+
31282+
31283+
31284+
31285
31286 case $host_os in
31287 rhapsody* | darwin*)
31288@@ -7563,6 +8056,8 @@ _LT_EOF
31289 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
31290 echo "$AR cru libconftest.a conftest.o" >&5
31291 $AR cru libconftest.a conftest.o 2>&5
31292+ echo "$RANLIB libconftest.a" >&5
31293+ $RANLIB libconftest.a 2>&5
31294 cat > conftest.c << _LT_EOF
31295 int main() { return 0;}
31296 _LT_EOF
31297@@ -8117,8 +8612,6 @@ fi
31298 lt_prog_compiler_pic=
31299 lt_prog_compiler_static=
31300
31301-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
31302-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31303
31304 if test "$GCC" = yes; then
31305 lt_prog_compiler_wl='-Wl,'
31306@@ -8284,6 +8777,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31307 lt_prog_compiler_pic='--shared'
31308 lt_prog_compiler_static='--static'
31309 ;;
31310+ nagfor*)
31311+ # NAG Fortran compiler
31312+ lt_prog_compiler_wl='-Wl,-Wl,,'
31313+ lt_prog_compiler_pic='-PIC'
31314+ lt_prog_compiler_static='-Bstatic'
31315+ ;;
31316 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
31317 # Portland Group compilers (*not* the Pentium gcc compiler,
31318 # which looks to be a dead project)
31319@@ -8346,7 +8845,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31320 lt_prog_compiler_pic='-KPIC'
31321 lt_prog_compiler_static='-Bstatic'
31322 case $cc_basename in
31323- f77* | f90* | f95*)
31324+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
31325 lt_prog_compiler_wl='-Qoption ld ';;
31326 *)
31327 lt_prog_compiler_wl='-Wl,';;
31328@@ -8403,13 +8902,17 @@ case $host_os in
31329 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
31330 ;;
31331 esac
31332-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
31333-$as_echo "$lt_prog_compiler_pic" >&6; }
31334-
31335-
31336-
31337-
31338
31339+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
31340+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31341+if ${lt_cv_prog_compiler_pic+:} false; then :
31342+ $as_echo_n "(cached) " >&6
31343+else
31344+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
31345+fi
31346+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
31347+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
31348+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
31349
31350 #
31351 # Check to make sure the PIC flag actually works.
31352@@ -8470,6 +8973,11 @@ fi
31353
31354
31355
31356+
31357+
31358+
31359+
31360+
31361 #
31362 # Check to make sure the static flag actually works.
31363 #
31364@@ -8820,7 +9328,8 @@ _LT_EOF
31365 allow_undefined_flag=unsupported
31366 always_export_symbols=no
31367 enable_shared_with_static_runtimes=yes
31368- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
31369+ 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'
31370+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
31371
31372 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
31373 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
31374@@ -8919,12 +9428,12 @@ _LT_EOF
31375 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
31376 hardcode_libdir_flag_spec=
31377 hardcode_libdir_flag_spec_ld='-rpath $libdir'
31378- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
31379+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
31380 if test "x$supports_anon_versioning" = xyes; then
31381 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
31382 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
31383 echo "local: *; };" >> $output_objdir/$libname.ver~
31384- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
31385+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
31386 fi
31387 ;;
31388 esac
31389@@ -8938,8 +9447,8 @@ _LT_EOF
31390 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
31391 wlarc=
31392 else
31393- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31394- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31395+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31396+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31397 fi
31398 ;;
31399
31400@@ -8957,8 +9466,8 @@ _LT_EOF
31401
31402 _LT_EOF
31403 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
31404- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31405- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31406+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31407+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31408 else
31409 ld_shlibs=no
31410 fi
31411@@ -9004,8 +9513,8 @@ _LT_EOF
31412
31413 *)
31414 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
31415- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31416- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31417+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31418+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31419 else
31420 ld_shlibs=no
31421 fi
31422@@ -9135,7 +9644,13 @@ _LT_EOF
31423 allow_undefined_flag='-berok'
31424 # Determine the default libpath from the value encoded in an
31425 # empty executable.
31426- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31427+ if test "${lt_cv_aix_libpath+set}" = set; then
31428+ aix_libpath=$lt_cv_aix_libpath
31429+else
31430+ if ${lt_cv_aix_libpath_+:} false; then :
31431+ $as_echo_n "(cached) " >&6
31432+else
31433+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31434 /* end confdefs.h. */
31435
31436 int
31437@@ -9148,22 +9663,29 @@ main ()
31438 _ACEOF
31439 if ac_fn_c_try_link "$LINENO"; then :
31440
31441-lt_aix_libpath_sed='
31442- /Import File Strings/,/^$/ {
31443- /^0/ {
31444- s/^0 *\(.*\)$/\1/
31445- p
31446- }
31447- }'
31448-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31449-# Check for a 64-bit object if we didn't find anything.
31450-if test -z "$aix_libpath"; then
31451- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31452-fi
31453+ lt_aix_libpath_sed='
31454+ /Import File Strings/,/^$/ {
31455+ /^0/ {
31456+ s/^0 *\([^ ]*\) *$/\1/
31457+ p
31458+ }
31459+ }'
31460+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31461+ # Check for a 64-bit object if we didn't find anything.
31462+ if test -z "$lt_cv_aix_libpath_"; then
31463+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31464+ fi
31465 fi
31466 rm -f core conftest.err conftest.$ac_objext \
31467 conftest$ac_exeext conftest.$ac_ext
31468-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31469+ if test -z "$lt_cv_aix_libpath_"; then
31470+ lt_cv_aix_libpath_="/usr/lib:/lib"
31471+ fi
31472+
31473+fi
31474+
31475+ aix_libpath=$lt_cv_aix_libpath_
31476+fi
31477
31478 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31479 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"
31480@@ -9175,7 +9697,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31481 else
31482 # Determine the default libpath from the value encoded in an
31483 # empty executable.
31484- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31485+ if test "${lt_cv_aix_libpath+set}" = set; then
31486+ aix_libpath=$lt_cv_aix_libpath
31487+else
31488+ if ${lt_cv_aix_libpath_+:} false; then :
31489+ $as_echo_n "(cached) " >&6
31490+else
31491+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31492 /* end confdefs.h. */
31493
31494 int
31495@@ -9188,22 +9716,29 @@ main ()
31496 _ACEOF
31497 if ac_fn_c_try_link "$LINENO"; then :
31498
31499-lt_aix_libpath_sed='
31500- /Import File Strings/,/^$/ {
31501- /^0/ {
31502- s/^0 *\(.*\)$/\1/
31503- p
31504- }
31505- }'
31506-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31507-# Check for a 64-bit object if we didn't find anything.
31508-if test -z "$aix_libpath"; then
31509- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31510-fi
31511+ lt_aix_libpath_sed='
31512+ /Import File Strings/,/^$/ {
31513+ /^0/ {
31514+ s/^0 *\([^ ]*\) *$/\1/
31515+ p
31516+ }
31517+ }'
31518+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31519+ # Check for a 64-bit object if we didn't find anything.
31520+ if test -z "$lt_cv_aix_libpath_"; then
31521+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31522+ fi
31523 fi
31524 rm -f core conftest.err conftest.$ac_objext \
31525 conftest$ac_exeext conftest.$ac_ext
31526-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31527+ if test -z "$lt_cv_aix_libpath_"; then
31528+ lt_cv_aix_libpath_="/usr/lib:/lib"
31529+ fi
31530+
31531+fi
31532+
31533+ aix_libpath=$lt_cv_aix_libpath_
31534+fi
31535
31536 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31537 # Warning - without using the other run time loading flags,
31538@@ -9248,20 +9783,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31539 # Microsoft Visual C++.
31540 # hardcode_libdir_flag_spec is actually meaningless, as there is
31541 # no search path for DLLs.
31542- hardcode_libdir_flag_spec=' '
31543- allow_undefined_flag=unsupported
31544- # Tell ltmain to make .lib files, not .a files.
31545- libext=lib
31546- # Tell ltmain to make .dll files, not .so files.
31547- shrext_cmds=".dll"
31548- # FIXME: Setting linknames here is a bad hack.
31549- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
31550- # The linker will automatically build a .lib file if we build a DLL.
31551- old_archive_from_new_cmds='true'
31552- # FIXME: Should let the user specify the lib program.
31553- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
31554- fix_srcfile_path='`cygpath -w "$srcfile"`'
31555- enable_shared_with_static_runtimes=yes
31556+ case $cc_basename in
31557+ cl*)
31558+ # Native MSVC
31559+ hardcode_libdir_flag_spec=' '
31560+ allow_undefined_flag=unsupported
31561+ always_export_symbols=yes
31562+ file_list_spec='@'
31563+ # Tell ltmain to make .lib files, not .a files.
31564+ libext=lib
31565+ # Tell ltmain to make .dll files, not .so files.
31566+ shrext_cmds=".dll"
31567+ # FIXME: Setting linknames here is a bad hack.
31568+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
31569+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
31570+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
31571+ else
31572+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
31573+ fi~
31574+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
31575+ linknames='
31576+ # The linker will not automatically build a static lib if we build a DLL.
31577+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
31578+ enable_shared_with_static_runtimes=yes
31579+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
31580+ # Don't use ranlib
31581+ old_postinstall_cmds='chmod 644 $oldlib'
31582+ postlink_cmds='lt_outputfile="@OUTPUT@"~
31583+ lt_tool_outputfile="@TOOL_OUTPUT@"~
31584+ case $lt_outputfile in
31585+ *.exe|*.EXE) ;;
31586+ *)
31587+ lt_outputfile="$lt_outputfile.exe"
31588+ lt_tool_outputfile="$lt_tool_outputfile.exe"
31589+ ;;
31590+ esac~
31591+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
31592+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
31593+ $RM "$lt_outputfile.manifest";
31594+ fi'
31595+ ;;
31596+ *)
31597+ # Assume MSVC wrapper
31598+ hardcode_libdir_flag_spec=' '
31599+ allow_undefined_flag=unsupported
31600+ # Tell ltmain to make .lib files, not .a files.
31601+ libext=lib
31602+ # Tell ltmain to make .dll files, not .so files.
31603+ shrext_cmds=".dll"
31604+ # FIXME: Setting linknames here is a bad hack.
31605+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
31606+ # The linker will automatically build a .lib file if we build a DLL.
31607+ old_archive_from_new_cmds='true'
31608+ # FIXME: Should let the user specify the lib program.
31609+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
31610+ enable_shared_with_static_runtimes=yes
31611+ ;;
31612+ esac
31613 ;;
31614
31615 darwin* | rhapsody*)
31616@@ -9322,7 +9900,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31617
31618 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
31619 freebsd* | dragonfly*)
31620- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
31621+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
31622 hardcode_libdir_flag_spec='-R$libdir'
31623 hardcode_direct=yes
31624 hardcode_shlibpath_var=no
31625@@ -9330,7 +9908,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31626
31627 hpux9*)
31628 if test "$GCC" = yes; then
31629- 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'
31630+ 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'
31631 else
31632 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'
31633 fi
31634@@ -9346,7 +9924,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31635
31636 hpux10*)
31637 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
31638- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31639+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31640 else
31641 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
31642 fi
31643@@ -9370,10 +9948,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31644 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31645 ;;
31646 ia64*)
31647- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31648+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31649 ;;
31650 *)
31651- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31652+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31653 ;;
31654 esac
31655 else
31656@@ -9452,23 +10030,36 @@ fi
31657
31658 irix5* | irix6* | nonstopux*)
31659 if test "$GCC" = yes; then
31660- 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'
31661+ 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'
31662 # Try to use the -exported_symbol ld option, if it does not
31663 # work, assume that -exports_file does not work either and
31664 # implicitly export all symbols.
31665- save_LDFLAGS="$LDFLAGS"
31666- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
31667- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31668+ # This should be the same for all languages, so no per-tag cache variable.
31669+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
31670+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
31671+if ${lt_cv_irix_exported_symbol+:} false; then :
31672+ $as_echo_n "(cached) " >&6
31673+else
31674+ save_LDFLAGS="$LDFLAGS"
31675+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
31676+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31677 /* end confdefs.h. */
31678-int foo(void) {}
31679+int foo (void) { return 0; }
31680 _ACEOF
31681 if ac_fn_c_try_link "$LINENO"; then :
31682- 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'
31683-
31684+ lt_cv_irix_exported_symbol=yes
31685+else
31686+ lt_cv_irix_exported_symbol=no
31687 fi
31688 rm -f core conftest.err conftest.$ac_objext \
31689 conftest$ac_exeext conftest.$ac_ext
31690- LDFLAGS="$save_LDFLAGS"
31691+ LDFLAGS="$save_LDFLAGS"
31692+fi
31693+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
31694+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
31695+ if test "$lt_cv_irix_exported_symbol" = yes; then
31696+ 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'
31697+ fi
31698 else
31699 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'
31700 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'
31701@@ -9553,7 +10144,7 @@ rm -f core conftest.err conftest.$ac_objext \
31702 osf4* | osf5*) # as osf3* with the addition of -msym flag
31703 if test "$GCC" = yes; then
31704 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
31705- 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'
31706+ 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'
31707 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
31708 else
31709 allow_undefined_flag=' -expect_unresolved \*'
31710@@ -9572,9 +10163,9 @@ rm -f core conftest.err conftest.$ac_objext \
31711 no_undefined_flag=' -z defs'
31712 if test "$GCC" = yes; then
31713 wlarc='${wl}'
31714- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
31715+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
31716 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
31717- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
31718+ $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'
31719 else
31720 case `$CC -V 2>&1` in
31721 *"Compilers 5.0"*)
31722@@ -10150,8 +10741,9 @@ cygwin* | mingw* | pw32* | cegcc*)
31723 need_version=no
31724 need_lib_prefix=no
31725
31726- case $GCC,$host_os in
31727- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
31728+ case $GCC,$cc_basename in
31729+ yes,*)
31730+ # gcc
31731 library_names_spec='$libname.dll.a'
31732 # DLL is installed to $(libdir)/../bin by postinstall_cmds
31733 postinstall_cmds='base_file=`basename \${file}`~
31734@@ -10184,13 +10776,71 @@ cygwin* | mingw* | pw32* | cegcc*)
31735 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
31736 ;;
31737 esac
31738+ dynamic_linker='Win32 ld.exe'
31739+ ;;
31740+
31741+ *,cl*)
31742+ # Native MSVC
31743+ libname_spec='$name'
31744+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
31745+ library_names_spec='${libname}.dll.lib'
31746+
31747+ case $build_os in
31748+ mingw*)
31749+ sys_lib_search_path_spec=
31750+ lt_save_ifs=$IFS
31751+ IFS=';'
31752+ for lt_path in $LIB
31753+ do
31754+ IFS=$lt_save_ifs
31755+ # Let DOS variable expansion print the short 8.3 style file name.
31756+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
31757+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
31758+ done
31759+ IFS=$lt_save_ifs
31760+ # Convert to MSYS style.
31761+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
31762+ ;;
31763+ cygwin*)
31764+ # Convert to unix form, then to dos form, then back to unix form
31765+ # but this time dos style (no spaces!) so that the unix form looks
31766+ # like /cygdrive/c/PROGRA~1:/cygdr...
31767+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
31768+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
31769+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
31770+ ;;
31771+ *)
31772+ sys_lib_search_path_spec="$LIB"
31773+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
31774+ # It is most probably a Windows format PATH.
31775+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
31776+ else
31777+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
31778+ fi
31779+ # FIXME: find the short name or the path components, as spaces are
31780+ # common. (e.g. "Program Files" -> "PROGRA~1")
31781+ ;;
31782+ esac
31783+
31784+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
31785+ postinstall_cmds='base_file=`basename \${file}`~
31786+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
31787+ dldir=$destdir/`dirname \$dlpath`~
31788+ test -d \$dldir || mkdir -p \$dldir~
31789+ $install_prog $dir/$dlname \$dldir/$dlname'
31790+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
31791+ dlpath=$dir/\$dldll~
31792+ $RM \$dlpath'
31793+ shlibpath_overrides_runpath=yes
31794+ dynamic_linker='Win32 link.exe'
31795 ;;
31796
31797 *)
31798+ # Assume MSVC wrapper
31799 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
31800+ dynamic_linker='Win32 ld.exe'
31801 ;;
31802 esac
31803- dynamic_linker='Win32 ld.exe'
31804 # FIXME: first we should search . and the directory the executable is in
31805 shlibpath_var=PATH
31806 ;;
31807@@ -11092,7 +11742,7 @@ else
31808 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31809 lt_status=$lt_dlunknown
31810 cat > conftest.$ac_ext <<_LT_EOF
31811-#line 11095 "configure"
31812+#line $LINENO "configure"
31813 #include "confdefs.h"
31814
31815 #if HAVE_DLFCN_H
31816@@ -11136,10 +11786,10 @@ else
31817 /* When -fvisbility=hidden is used, assume the code has been annotated
31818 correspondingly for the symbols needed. */
31819 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
31820-void fnord () __attribute__((visibility("default")));
31821+int fnord () __attribute__((visibility("default")));
31822 #endif
31823
31824-void fnord () { int i=42; }
31825+int fnord () { return 42; }
31826 int main ()
31827 {
31828 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31829@@ -11198,7 +11848,7 @@ else
31830 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31831 lt_status=$lt_dlunknown
31832 cat > conftest.$ac_ext <<_LT_EOF
31833-#line 11201 "configure"
31834+#line $LINENO "configure"
31835 #include "confdefs.h"
31836
31837 #if HAVE_DLFCN_H
31838@@ -11242,10 +11892,10 @@ else
31839 /* When -fvisbility=hidden is used, assume the code has been annotated
31840 correspondingly for the symbols needed. */
31841 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
31842-void fnord () __attribute__((visibility("default")));
31843+int fnord () __attribute__((visibility("default")));
31844 #endif
31845
31846-void fnord () { int i=42; }
31847+int fnord () { return 42; }
31848 int main ()
31849 {
31850 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31851@@ -15351,13 +16001,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
31852 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
31853 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
31854 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
31855+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
31856+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
31857 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
31858 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
31859 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
31860 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
31861 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
31862+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
31863+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
31864+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
31865+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
31866 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
31867 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
31868+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
31869 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
31870 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
31871 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
31872@@ -15372,14 +16029,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
31873 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
31874 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
31875 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"`'
31876+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
31877+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
31878 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
31879 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
31880 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
31881-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
31882 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
31883+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
31884 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
31885 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
31886 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
31887+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
31888 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
31889 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
31890 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
31891@@ -15412,12 +16072,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
31892 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
31893 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
31894 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
31895-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
31896 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
31897 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
31898 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
31899 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
31900 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
31901+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
31902 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
31903 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
31904 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
31905@@ -15472,8 +16132,13 @@ reload_flag \
31906 OBJDUMP \
31907 deplibs_check_method \
31908 file_magic_cmd \
31909+file_magic_glob \
31910+want_nocaseglob \
31911+DLLTOOL \
31912+sharedlib_from_linklib_cmd \
31913 AR \
31914 AR_FLAGS \
31915+archiver_list_spec \
31916 STRIP \
31917 RANLIB \
31918 CC \
31919@@ -15483,12 +16148,14 @@ lt_cv_sys_global_symbol_pipe \
31920 lt_cv_sys_global_symbol_to_cdecl \
31921 lt_cv_sys_global_symbol_to_c_name_address \
31922 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
31923+nm_file_list_spec \
31924 lt_prog_compiler_no_builtin_flag \
31925-lt_prog_compiler_wl \
31926 lt_prog_compiler_pic \
31927+lt_prog_compiler_wl \
31928 lt_prog_compiler_static \
31929 lt_cv_prog_compiler_c_o \
31930 need_locks \
31931+MANIFEST_TOOL \
31932 DSYMUTIL \
31933 NMEDIT \
31934 LIPO \
31935@@ -15504,7 +16171,6 @@ no_undefined_flag \
31936 hardcode_libdir_flag_spec \
31937 hardcode_libdir_flag_spec_ld \
31938 hardcode_libdir_separator \
31939-fix_srcfile_path \
31940 exclude_expsyms \
31941 include_expsyms \
31942 file_list_spec \
31943@@ -15540,6 +16206,7 @@ module_cmds \
31944 module_expsym_cmds \
31945 export_symbols_cmds \
31946 prelink_cmds \
31947+postlink_cmds \
31948 postinstall_cmds \
31949 postuninstall_cmds \
31950 finish_cmds \
31951@@ -16313,7 +16980,8 @@ $as_echo X"$file" |
31952 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
31953 #
31954 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
31955-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
31956+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
31957+# Inc.
31958 # Written by Gordon Matzigkeit, 1996
31959 #
31960 # This file is part of GNU Libtool.
31961@@ -16416,19 +17084,42 @@ SP2NL=$lt_lt_SP2NL
31962 # turn newlines into spaces.
31963 NL2SP=$lt_lt_NL2SP
31964
31965+# convert \$build file names to \$host format.
31966+to_host_file_cmd=$lt_cv_to_host_file_cmd
31967+
31968+# convert \$build files to toolchain format.
31969+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
31970+
31971 # An object symbol dumper.
31972 OBJDUMP=$lt_OBJDUMP
31973
31974 # Method to check whether dependent libraries are shared objects.
31975 deplibs_check_method=$lt_deplibs_check_method
31976
31977-# Command to use when deplibs_check_method == "file_magic".
31978+# Command to use when deplibs_check_method = "file_magic".
31979 file_magic_cmd=$lt_file_magic_cmd
31980
31981+# How to find potential files when deplibs_check_method = "file_magic".
31982+file_magic_glob=$lt_file_magic_glob
31983+
31984+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
31985+want_nocaseglob=$lt_want_nocaseglob
31986+
31987+# DLL creation program.
31988+DLLTOOL=$lt_DLLTOOL
31989+
31990+# Command to associate shared and link libraries.
31991+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
31992+
31993 # The archiver.
31994 AR=$lt_AR
31995+
31996+# Flags to create an archive.
31997 AR_FLAGS=$lt_AR_FLAGS
31998
31999+# How to feed a file listing to the archiver.
32000+archiver_list_spec=$lt_archiver_list_spec
32001+
32002 # A symbol stripping program.
32003 STRIP=$lt_STRIP
32004
32005@@ -16458,6 +17149,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
32006 # Transform the output of nm in a C name address pair when lib prefix is needed.
32007 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
32008
32009+# Specify filename containing input files for \$NM.
32010+nm_file_list_spec=$lt_nm_file_list_spec
32011+
32012+# The root where to search for dependent libraries,and in which our libraries should be installed.
32013+lt_sysroot=$lt_sysroot
32014+
32015 # The name of the directory that contains temporary libtool files.
32016 objdir=$objdir
32017
32018@@ -16467,6 +17164,9 @@ MAGIC_CMD=$MAGIC_CMD
32019 # Must we lock files when doing compilation?
32020 need_locks=$lt_need_locks
32021
32022+# Manifest tool.
32023+MANIFEST_TOOL=$lt_MANIFEST_TOOL
32024+
32025 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
32026 DSYMUTIL=$lt_DSYMUTIL
32027
32028@@ -16581,12 +17281,12 @@ with_gcc=$GCC
32029 # Compiler flag to turn off builtin functions.
32030 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
32031
32032-# How to pass a linker flag through the compiler.
32033-wl=$lt_lt_prog_compiler_wl
32034-
32035 # Additional compiler flags for building library objects.
32036 pic_flag=$lt_lt_prog_compiler_pic
32037
32038+# How to pass a linker flag through the compiler.
32039+wl=$lt_lt_prog_compiler_wl
32040+
32041 # Compiler flag to prevent dynamic linking.
32042 link_static_flag=$lt_lt_prog_compiler_static
32043
32044@@ -16673,9 +17373,6 @@ inherit_rpath=$inherit_rpath
32045 # Whether libtool must link a program against all its dependency libraries.
32046 link_all_deplibs=$link_all_deplibs
32047
32048-# Fix the shell variable \$srcfile for the compiler.
32049-fix_srcfile_path=$lt_fix_srcfile_path
32050-
32051 # Set to "yes" if exported symbols are required.
32052 always_export_symbols=$always_export_symbols
32053
32054@@ -16691,6 +17388,9 @@ include_expsyms=$lt_include_expsyms
32055 # Commands necessary for linking programs (against libraries) with templates.
32056 prelink_cmds=$lt_prelink_cmds
32057
32058+# Commands necessary for finishing linking programs.
32059+postlink_cmds=$lt_postlink_cmds
32060+
32061 # Specify filename containing input files.
32062 file_list_spec=$lt_file_list_spec
32063
32064@@ -16723,210 +17423,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
32065 # if finds mixed CR/LF and LF-only lines. Since sed operates in
32066 # text mode, it properly converts lines to CR/LF. This bash problem
32067 # is reportedly fixed, but why not run on old versions too?
32068- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
32069- || (rm -f "$cfgfile"; exit 1)
32070-
32071- case $xsi_shell in
32072- yes)
32073- cat << \_LT_EOF >> "$cfgfile"
32074-
32075-# func_dirname file append nondir_replacement
32076-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
32077-# otherwise set result to NONDIR_REPLACEMENT.
32078-func_dirname ()
32079-{
32080- case ${1} in
32081- */*) func_dirname_result="${1%/*}${2}" ;;
32082- * ) func_dirname_result="${3}" ;;
32083- esac
32084-}
32085-
32086-# func_basename file
32087-func_basename ()
32088-{
32089- func_basename_result="${1##*/}"
32090-}
32091-
32092-# func_dirname_and_basename file append nondir_replacement
32093-# perform func_basename and func_dirname in a single function
32094-# call:
32095-# dirname: Compute the dirname of FILE. If nonempty,
32096-# add APPEND to the result, otherwise set result
32097-# to NONDIR_REPLACEMENT.
32098-# value returned in "$func_dirname_result"
32099-# basename: Compute filename of FILE.
32100-# value retuned in "$func_basename_result"
32101-# Implementation must be kept synchronized with func_dirname
32102-# and func_basename. For efficiency, we do not delegate to
32103-# those functions but instead duplicate the functionality here.
32104-func_dirname_and_basename ()
32105-{
32106- case ${1} in
32107- */*) func_dirname_result="${1%/*}${2}" ;;
32108- * ) func_dirname_result="${3}" ;;
32109- esac
32110- func_basename_result="${1##*/}"
32111-}
32112-
32113-# func_stripname prefix suffix name
32114-# strip PREFIX and SUFFIX off of NAME.
32115-# PREFIX and SUFFIX must not contain globbing or regex special
32116-# characters, hashes, percent signs, but SUFFIX may contain a leading
32117-# dot (in which case that matches only a dot).
32118-func_stripname ()
32119-{
32120- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
32121- # positional parameters, so assign one to ordinary parameter first.
32122- func_stripname_result=${3}
32123- func_stripname_result=${func_stripname_result#"${1}"}
32124- func_stripname_result=${func_stripname_result%"${2}"}
32125-}
32126-
32127-# func_opt_split
32128-func_opt_split ()
32129-{
32130- func_opt_split_opt=${1%%=*}
32131- func_opt_split_arg=${1#*=}
32132-}
32133-
32134-# func_lo2o object
32135-func_lo2o ()
32136-{
32137- case ${1} in
32138- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
32139- *) func_lo2o_result=${1} ;;
32140- esac
32141-}
32142-
32143-# func_xform libobj-or-source
32144-func_xform ()
32145-{
32146- func_xform_result=${1%.*}.lo
32147-}
32148-
32149-# func_arith arithmetic-term...
32150-func_arith ()
32151-{
32152- func_arith_result=$(( $* ))
32153-}
32154-
32155-# func_len string
32156-# STRING may not start with a hyphen.
32157-func_len ()
32158-{
32159- func_len_result=${#1}
32160-}
32161-
32162-_LT_EOF
32163- ;;
32164- *) # Bourne compatible functions.
32165- cat << \_LT_EOF >> "$cfgfile"
32166-
32167-# func_dirname file append nondir_replacement
32168-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
32169-# otherwise set result to NONDIR_REPLACEMENT.
32170-func_dirname ()
32171-{
32172- # Extract subdirectory from the argument.
32173- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
32174- if test "X$func_dirname_result" = "X${1}"; then
32175- func_dirname_result="${3}"
32176- else
32177- func_dirname_result="$func_dirname_result${2}"
32178- fi
32179-}
32180-
32181-# func_basename file
32182-func_basename ()
32183-{
32184- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
32185-}
32186-
32187-
32188-# func_stripname prefix suffix name
32189-# strip PREFIX and SUFFIX off of NAME.
32190-# PREFIX and SUFFIX must not contain globbing or regex special
32191-# characters, hashes, percent signs, but SUFFIX may contain a leading
32192-# dot (in which case that matches only a dot).
32193-# func_strip_suffix prefix name
32194-func_stripname ()
32195-{
32196- case ${2} in
32197- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
32198- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
32199- esac
32200-}
32201-
32202-# sed scripts:
32203-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
32204-my_sed_long_arg='1s/^-[^=]*=//'
32205-
32206-# func_opt_split
32207-func_opt_split ()
32208-{
32209- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
32210- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
32211-}
32212-
32213-# func_lo2o object
32214-func_lo2o ()
32215-{
32216- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
32217-}
32218-
32219-# func_xform libobj-or-source
32220-func_xform ()
32221-{
32222- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
32223-}
32224-
32225-# func_arith arithmetic-term...
32226-func_arith ()
32227-{
32228- func_arith_result=`expr "$@"`
32229-}
32230-
32231-# func_len string
32232-# STRING may not start with a hyphen.
32233-func_len ()
32234-{
32235- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
32236-}
32237-
32238-_LT_EOF
32239-esac
32240-
32241-case $lt_shell_append in
32242- yes)
32243- cat << \_LT_EOF >> "$cfgfile"
32244-
32245-# func_append var value
32246-# Append VALUE to the end of shell variable VAR.
32247-func_append ()
32248-{
32249- eval "$1+=\$2"
32250-}
32251-_LT_EOF
32252- ;;
32253- *)
32254- cat << \_LT_EOF >> "$cfgfile"
32255-
32256-# func_append var value
32257-# Append VALUE to the end of shell variable VAR.
32258-func_append ()
32259-{
32260- eval "$1=\$$1\$2"
32261-}
32262-
32263-_LT_EOF
32264- ;;
32265- esac
32266-
32267-
32268- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
32269- || (rm -f "$cfgfile"; exit 1)
32270-
32271- mv -f "$cfgfile" "$ofile" ||
32272+ sed '$q' "$ltmain" >> "$cfgfile" \
32273+ || (rm -f "$cfgfile"; exit 1)
32274+
32275+ if test x"$xsi_shell" = xyes; then
32276+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
32277+func_dirname ()\
32278+{\
32279+\ case ${1} in\
32280+\ */*) func_dirname_result="${1%/*}${2}" ;;\
32281+\ * ) func_dirname_result="${3}" ;;\
32282+\ esac\
32283+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
32284+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32285+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32286+test 0 -eq $? || _lt_function_replace_fail=:
32287+
32288+
32289+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
32290+func_basename ()\
32291+{\
32292+\ func_basename_result="${1##*/}"\
32293+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
32294+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32295+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32296+test 0 -eq $? || _lt_function_replace_fail=:
32297+
32298+
32299+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
32300+func_dirname_and_basename ()\
32301+{\
32302+\ case ${1} in\
32303+\ */*) func_dirname_result="${1%/*}${2}" ;;\
32304+\ * ) func_dirname_result="${3}" ;;\
32305+\ esac\
32306+\ func_basename_result="${1##*/}"\
32307+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
32308+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32309+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32310+test 0 -eq $? || _lt_function_replace_fail=:
32311+
32312+
32313+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
32314+func_stripname ()\
32315+{\
32316+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
32317+\ # positional parameters, so assign one to ordinary parameter first.\
32318+\ func_stripname_result=${3}\
32319+\ func_stripname_result=${func_stripname_result#"${1}"}\
32320+\ func_stripname_result=${func_stripname_result%"${2}"}\
32321+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
32322+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32323+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32324+test 0 -eq $? || _lt_function_replace_fail=:
32325+
32326+
32327+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
32328+func_split_long_opt ()\
32329+{\
32330+\ func_split_long_opt_name=${1%%=*}\
32331+\ func_split_long_opt_arg=${1#*=}\
32332+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
32333+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32334+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32335+test 0 -eq $? || _lt_function_replace_fail=:
32336+
32337+
32338+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
32339+func_split_short_opt ()\
32340+{\
32341+\ func_split_short_opt_arg=${1#??}\
32342+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
32343+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
32344+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32345+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32346+test 0 -eq $? || _lt_function_replace_fail=:
32347+
32348+
32349+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
32350+func_lo2o ()\
32351+{\
32352+\ case ${1} in\
32353+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
32354+\ *) func_lo2o_result=${1} ;;\
32355+\ esac\
32356+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
32357+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32358+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32359+test 0 -eq $? || _lt_function_replace_fail=:
32360+
32361+
32362+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
32363+func_xform ()\
32364+{\
32365+ func_xform_result=${1%.*}.lo\
32366+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
32367+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32368+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32369+test 0 -eq $? || _lt_function_replace_fail=:
32370+
32371+
32372+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
32373+func_arith ()\
32374+{\
32375+ func_arith_result=$(( $* ))\
32376+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
32377+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32378+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32379+test 0 -eq $? || _lt_function_replace_fail=:
32380+
32381+
32382+ sed -e '/^func_len ()$/,/^} # func_len /c\
32383+func_len ()\
32384+{\
32385+ func_len_result=${#1}\
32386+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
32387+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32388+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32389+test 0 -eq $? || _lt_function_replace_fail=:
32390+
32391+fi
32392+
32393+if test x"$lt_shell_append" = xyes; then
32394+ sed -e '/^func_append ()$/,/^} # func_append /c\
32395+func_append ()\
32396+{\
32397+ eval "${1}+=\\${2}"\
32398+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
32399+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32400+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32401+test 0 -eq $? || _lt_function_replace_fail=:
32402+
32403+
32404+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
32405+func_append_quoted ()\
32406+{\
32407+\ func_quote_for_eval "${2}"\
32408+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
32409+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
32410+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32411+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32412+test 0 -eq $? || _lt_function_replace_fail=:
32413+
32414+
32415+ # Save a `func_append' function call where possible by direct use of '+='
32416+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
32417+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32418+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32419+ test 0 -eq $? || _lt_function_replace_fail=:
32420+else
32421+ # Save a `func_append' function call even when '+=' is not available
32422+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
32423+ && mv -f "$cfgfile.tmp" "$cfgfile" \
32424+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
32425+ test 0 -eq $? || _lt_function_replace_fail=:
32426+fi
32427+
32428+if test x"$_lt_function_replace_fail" = x":"; then
32429+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
32430+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
32431+fi
32432+
32433+
32434+ mv -f "$cfgfile" "$ofile" ||
32435 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
32436 chmod +x "$ofile"
32437
32438diff --git a/zlib/Makefile.in b/zlib/Makefile.in
32439index dd8a21deba1..28628282c56 100644
32440--- a/zlib/Makefile.in
32441+++ b/zlib/Makefile.in
32442@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@
32443 CYGPATH_W = @CYGPATH_W@
32444 DEFS = @DEFS@
32445 DEPDIR = @DEPDIR@
32446+DLLTOOL = @DLLTOOL@
32447 DSYMUTIL = @DSYMUTIL@
32448 DUMPBIN = @DUMPBIN@
32449 ECHO_C = @ECHO_C@
32450@@ -305,6 +306,7 @@ LN_S = @LN_S@
32451 LTLIBOBJS = @LTLIBOBJS@
32452 MAINT = @MAINT@
32453 MAKEINFO = @MAKEINFO@
32454+MANIFEST_TOOL = @MANIFEST_TOOL@
32455 MKDIR_P = @MKDIR_P@
32456 NM = @NM@
32457 NMEDIT = @NMEDIT@
32458@@ -331,6 +333,7 @@ abs_builddir = @abs_builddir@
32459 abs_srcdir = @abs_srcdir@
32460 abs_top_builddir = @abs_top_builddir@
32461 abs_top_srcdir = @abs_top_srcdir@
32462+ac_ct_AR = @ac_ct_AR@
32463 ac_ct_CC = @ac_ct_CC@
32464 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
32465 am__include = @am__include@
32466diff --git a/zlib/configure b/zlib/configure
32467index 2d551360683..e01d0a70438 100755
32468--- a/zlib/configure
32469+++ b/zlib/configure
32470@@ -648,8 +648,11 @@ OTOOL
32471 LIPO
32472 NMEDIT
32473 DSYMUTIL
32474+MANIFEST_TOOL
32475 RANLIB
32476+ac_ct_AR
32477 AR
32478+DLLTOOL
32479 OBJDUMP
32480 LN_S
32481 NM
32482@@ -776,6 +779,7 @@ enable_static
32483 with_pic
32484 enable_fast_install
32485 with_gnu_ld
32486+with_libtool_sysroot
32487 enable_libtool_lock
32488 enable_host_shared
32489 enable_host_pie
32490@@ -1432,6 +1436,8 @@ Optional Packages:
32491 --with-pic try to use only PIC/non-PIC objects [default=use
32492 both]
32493 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
32494+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
32495+ (or the compiler's sysroot if not specified).
32496
32497 Some influential environment variables:
32498 CC C compiler command
32499@@ -4190,8 +4196,8 @@ esac
32500
32501
32502
32503-macro_version='2.2.7a'
32504-macro_revision='1.3134'
32505+macro_version='2.4'
32506+macro_revision='1.3293'
32507
32508
32509
32510@@ -4231,7 +4237,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
32511 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
32512 $as_echo_n "checking how to print strings... " >&6; }
32513 # Test print first, because it will be a builtin if present.
32514-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
32515+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
32516 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
32517 ECHO='print -r --'
32518 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
32519@@ -5054,8 +5060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
32520 # Try some XSI features
32521 xsi_shell=no
32522 ( _lt_dummy="a/b/c"
32523- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
32524- = c,a/b,, \
32525+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
32526+ = c,a/b,b/c, \
32527 && eval 'test $(( 1 + 1 )) -eq 2 \
32528 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
32529 && xsi_shell=yes
32530@@ -5104,6 +5110,80 @@ esac
32531
32532
32533
32534+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
32535+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
32536+if ${lt_cv_to_host_file_cmd+:} false; then :
32537+ $as_echo_n "(cached) " >&6
32538+else
32539+ case $host in
32540+ *-*-mingw* )
32541+ case $build in
32542+ *-*-mingw* ) # actually msys
32543+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
32544+ ;;
32545+ *-*-cygwin* )
32546+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
32547+ ;;
32548+ * ) # otherwise, assume *nix
32549+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
32550+ ;;
32551+ esac
32552+ ;;
32553+ *-*-cygwin* )
32554+ case $build in
32555+ *-*-mingw* ) # actually msys
32556+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
32557+ ;;
32558+ *-*-cygwin* )
32559+ lt_cv_to_host_file_cmd=func_convert_file_noop
32560+ ;;
32561+ * ) # otherwise, assume *nix
32562+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
32563+ ;;
32564+ esac
32565+ ;;
32566+ * ) # unhandled hosts (and "normal" native builds)
32567+ lt_cv_to_host_file_cmd=func_convert_file_noop
32568+ ;;
32569+esac
32570+
32571+fi
32572+
32573+to_host_file_cmd=$lt_cv_to_host_file_cmd
32574+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
32575+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
32576+
32577+
32578+
32579+
32580+
32581+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
32582+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
32583+if ${lt_cv_to_tool_file_cmd+:} false; then :
32584+ $as_echo_n "(cached) " >&6
32585+else
32586+ #assume ordinary cross tools, or native build.
32587+lt_cv_to_tool_file_cmd=func_convert_file_noop
32588+case $host in
32589+ *-*-mingw* )
32590+ case $build in
32591+ *-*-mingw* ) # actually msys
32592+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
32593+ ;;
32594+ esac
32595+ ;;
32596+esac
32597+
32598+fi
32599+
32600+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
32601+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
32602+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
32603+
32604+
32605+
32606+
32607+
32608 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
32609 $as_echo_n "checking for $LD option to reload object files... " >&6; }
32610 if ${lt_cv_ld_reload_flag+:} false; then :
32611@@ -5120,6 +5200,11 @@ case $reload_flag in
32612 esac
32613 reload_cmds='$LD$reload_flag -o $output$reload_objs'
32614 case $host_os in
32615+ cygwin* | mingw* | pw32* | cegcc*)
32616+ if test "$GCC" != yes; then
32617+ reload_cmds=false
32618+ fi
32619+ ;;
32620 darwin*)
32621 if test "$GCC" = yes; then
32622 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
32623@@ -5288,7 +5373,8 @@ mingw* | pw32*)
32624 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
32625 lt_cv_file_magic_cmd='func_win32_libid'
32626 else
32627- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
32628+ # Keep this pattern in sync with the one in func_win32_libid.
32629+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
32630 lt_cv_file_magic_cmd='$OBJDUMP -f'
32631 fi
32632 ;;
32633@@ -5447,6 +5533,21 @@ esac
32634 fi
32635 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
32636 $as_echo "$lt_cv_deplibs_check_method" >&6; }
32637+
32638+file_magic_glob=
32639+want_nocaseglob=no
32640+if test "$build" = "$host"; then
32641+ case $host_os in
32642+ mingw* | pw32*)
32643+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
32644+ want_nocaseglob=yes
32645+ else
32646+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
32647+ fi
32648+ ;;
32649+ esac
32650+fi
32651+
32652 file_magic_cmd=$lt_cv_file_magic_cmd
32653 deplibs_check_method=$lt_cv_deplibs_check_method
32654 test -z "$deplibs_check_method" && deplibs_check_method=unknown
32655@@ -5462,6 +5563,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
32656
32657
32658
32659+
32660+
32661+
32662+
32663+
32664+
32665+
32666+
32667+
32668+
32669+if test -n "$ac_tool_prefix"; then
32670+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
32671+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
32672+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32673+$as_echo_n "checking for $ac_word... " >&6; }
32674+if ${ac_cv_prog_DLLTOOL+:} false; then :
32675+ $as_echo_n "(cached) " >&6
32676+else
32677+ if test -n "$DLLTOOL"; then
32678+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
32679+else
32680+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
32681+for as_dir in $PATH
32682+do
32683+ IFS=$as_save_IFS
32684+ test -z "$as_dir" && as_dir=.
32685+ for ac_exec_ext in '' $ac_executable_extensions; do
32686+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
32687+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
32688+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32689+ break 2
32690+ fi
32691+done
32692+ done
32693+IFS=$as_save_IFS
32694+
32695+fi
32696+fi
32697+DLLTOOL=$ac_cv_prog_DLLTOOL
32698+if test -n "$DLLTOOL"; then
32699+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
32700+$as_echo "$DLLTOOL" >&6; }
32701+else
32702+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
32703+$as_echo "no" >&6; }
32704+fi
32705+
32706+
32707+fi
32708+if test -z "$ac_cv_prog_DLLTOOL"; then
32709+ ac_ct_DLLTOOL=$DLLTOOL
32710+ # Extract the first word of "dlltool", so it can be a program name with args.
32711+set dummy dlltool; ac_word=$2
32712+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32713+$as_echo_n "checking for $ac_word... " >&6; }
32714+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
32715+ $as_echo_n "(cached) " >&6
32716+else
32717+ if test -n "$ac_ct_DLLTOOL"; then
32718+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
32719+else
32720+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
32721+for as_dir in $PATH
32722+do
32723+ IFS=$as_save_IFS
32724+ test -z "$as_dir" && as_dir=.
32725+ for ac_exec_ext in '' $ac_executable_extensions; do
32726+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
32727+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
32728+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32729+ break 2
32730+ fi
32731+done
32732+ done
32733+IFS=$as_save_IFS
32734+
32735+fi
32736+fi
32737+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
32738+if test -n "$ac_ct_DLLTOOL"; then
32739+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
32740+$as_echo "$ac_ct_DLLTOOL" >&6; }
32741+else
32742+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
32743+$as_echo "no" >&6; }
32744+fi
32745+
32746+ if test "x$ac_ct_DLLTOOL" = x; then
32747+ DLLTOOL="false"
32748+ else
32749+ case $cross_compiling:$ac_tool_warned in
32750+yes:)
32751+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
32752+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
32753+ac_tool_warned=yes ;;
32754+esac
32755+ DLLTOOL=$ac_ct_DLLTOOL
32756+ fi
32757+else
32758+ DLLTOOL="$ac_cv_prog_DLLTOOL"
32759+fi
32760+
32761+test -z "$DLLTOOL" && DLLTOOL=dlltool
32762+
32763+
32764+
32765+
32766+
32767+
32768+
32769+
32770+
32771+
32772+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
32773+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
32774+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
32775+ $as_echo_n "(cached) " >&6
32776+else
32777+ lt_cv_sharedlib_from_linklib_cmd='unknown'
32778+
32779+case $host_os in
32780+cygwin* | mingw* | pw32* | cegcc*)
32781+ # two different shell functions defined in ltmain.sh
32782+ # decide which to use based on capabilities of $DLLTOOL
32783+ case `$DLLTOOL --help 2>&1` in
32784+ *--identify-strict*)
32785+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
32786+ ;;
32787+ *)
32788+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
32789+ ;;
32790+ esac
32791+ ;;
32792+*)
32793+ # fallback: assume linklib IS sharedlib
32794+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
32795+ ;;
32796+esac
32797+
32798+fi
32799+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
32800+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
32801+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
32802+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
32803+
32804+
32805+
32806+
32807+
32808+
32809+
32810+
32811 plugin_option=
32812 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
32813 for plugin in $plugin_names; do
32814@@ -5476,8 +5729,10 @@ for plugin in $plugin_names; do
32815 done
32816
32817 if test -n "$ac_tool_prefix"; then
32818- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
32819-set dummy ${ac_tool_prefix}ar; ac_word=$2
32820+ for ac_prog in ar
32821+ do
32822+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
32823+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
32824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32825 $as_echo_n "checking for $ac_word... " >&6; }
32826 if ${ac_cv_prog_AR+:} false; then :
32827@@ -5493,7 +5748,7 @@ do
32828 test -z "$as_dir" && as_dir=.
32829 for ac_exec_ext in '' $ac_executable_extensions; do
32830 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
32831- ac_cv_prog_AR="${ac_tool_prefix}ar"
32832+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
32833 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32834 break 2
32835 fi
32836@@ -5513,11 +5768,15 @@ $as_echo "no" >&6; }
32837 fi
32838
32839
32840+ test -n "$AR" && break
32841+ done
32842 fi
32843-if test -z "$ac_cv_prog_AR"; then
32844+if test -z "$AR"; then
32845 ac_ct_AR=$AR
32846- # Extract the first word of "ar", so it can be a program name with args.
32847-set dummy ar; ac_word=$2
32848+ for ac_prog in ar
32849+do
32850+ # Extract the first word of "$ac_prog", so it can be a program name with args.
32851+set dummy $ac_prog; ac_word=$2
32852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32853 $as_echo_n "checking for $ac_word... " >&6; }
32854 if ${ac_cv_prog_ac_ct_AR+:} false; then :
32855@@ -5533,7 +5792,7 @@ do
32856 test -z "$as_dir" && as_dir=.
32857 for ac_exec_ext in '' $ac_executable_extensions; do
32858 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
32859- ac_cv_prog_ac_ct_AR="ar"
32860+ ac_cv_prog_ac_ct_AR="$ac_prog"
32861 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32862 break 2
32863 fi
32864@@ -5552,6 +5811,10 @@ else
32865 $as_echo "no" >&6; }
32866 fi
32867
32868+
32869+ test -n "$ac_ct_AR" && break
32870+done
32871+
32872 if test "x$ac_ct_AR" = x; then
32873 AR="false"
32874 else
32875@@ -5563,25 +5826,19 @@ ac_tool_warned=yes ;;
32876 esac
32877 AR=$ac_ct_AR
32878 fi
32879-else
32880- AR="$ac_cv_prog_AR"
32881 fi
32882
32883-test -z "$AR" && AR=ar
32884-if test -n "$plugin_option"; then
32885- if $AR --help 2>&1 | grep -q "\--plugin"; then
32886- touch conftest.c
32887- $AR $plugin_option rc conftest.a conftest.c
32888- if test "$?" != 0; then
32889- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
32890+ touch conftest.c
32891+ $AR $plugin_option rc conftest.a conftest.c
32892+ if test "$?" != 0; then
32893+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
32894 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
32895- else
32896- AR="$AR $plugin_option"
32897- fi
32898- rm -f conftest.*
32899+ else
32900+ AR="$AR $plugin_option"
32901 fi
32902-fi
32903-test -z "$AR_FLAGS" && AR_FLAGS=cru
32904+ rm -f conftest.*
32905+: ${AR=ar}
32906+: ${AR_FLAGS=cru}
32907
32908
32909
32910@@ -5593,6 +5850,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
32911
32912
32913
32914+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
32915+$as_echo_n "checking for archiver @FILE support... " >&6; }
32916+if ${lt_cv_ar_at_file+:} false; then :
32917+ $as_echo_n "(cached) " >&6
32918+else
32919+ lt_cv_ar_at_file=no
32920+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
32921+/* end confdefs.h. */
32922+
32923+int
32924+main ()
32925+{
32926+
32927+ ;
32928+ return 0;
32929+}
32930+_ACEOF
32931+if ac_fn_c_try_compile "$LINENO"; then :
32932+ echo conftest.$ac_objext > conftest.lst
32933+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
32934+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
32935+ (eval $lt_ar_try) 2>&5
32936+ ac_status=$?
32937+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
32938+ test $ac_status = 0; }
32939+ if test "$ac_status" -eq 0; then
32940+ # Ensure the archiver fails upon bogus file names.
32941+ rm -f conftest.$ac_objext libconftest.a
32942+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
32943+ (eval $lt_ar_try) 2>&5
32944+ ac_status=$?
32945+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
32946+ test $ac_status = 0; }
32947+ if test "$ac_status" -ne 0; then
32948+ lt_cv_ar_at_file=@
32949+ fi
32950+ fi
32951+ rm -f conftest.* libconftest.a
32952+
32953+fi
32954+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
32955+
32956+fi
32957+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
32958+$as_echo "$lt_cv_ar_at_file" >&6; }
32959+
32960+if test "x$lt_cv_ar_at_file" = xno; then
32961+ archiver_list_spec=
32962+else
32963+ archiver_list_spec=$lt_cv_ar_at_file
32964+fi
32965+
32966+
32967+
32968+
32969+
32970+
32971+
32972 if test -n "$ac_tool_prefix"; then
32973 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
32974 set dummy ${ac_tool_prefix}strip; ac_word=$2
32975@@ -5932,8 +6247,8 @@ esac
32976 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
32977
32978 # Transform an extracted symbol line into symbol name and symbol address
32979-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
32980-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'"
32981+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
32982+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'"
32983
32984 # Handle CRLF in mingw tool chain
32985 opt_cr=
32986@@ -5969,6 +6284,7 @@ for ac_symprfx in "" "_"; do
32987 else
32988 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
32989 fi
32990+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
32991
32992 # Check to see that the pipe works correctly.
32993 pipe_works=no
32994@@ -6010,6 +6326,18 @@ _LT_EOF
32995 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
32996 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
32997 cat <<_LT_EOF > conftest.$ac_ext
32998+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
32999+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
33000+/* DATA imports from DLLs on WIN32 con't be const, because runtime
33001+ relocations are performed -- see ld's documentation on pseudo-relocs. */
33002+# define LT_DLSYM_CONST
33003+#elif defined(__osf__)
33004+/* This system does not cope well with relocations in const data. */
33005+# define LT_DLSYM_CONST
33006+#else
33007+# define LT_DLSYM_CONST const
33008+#endif
33009+
33010 #ifdef __cplusplus
33011 extern "C" {
33012 #endif
33013@@ -6021,7 +6349,7 @@ _LT_EOF
33014 cat <<_LT_EOF >> conftest.$ac_ext
33015
33016 /* The mapping between symbol names and symbols. */
33017-const struct {
33018+LT_DLSYM_CONST struct {
33019 const char *name;
33020 void *address;
33021 }
33022@@ -6047,8 +6375,8 @@ static const void *lt_preloaded_setup() {
33023 _LT_EOF
33024 # Now try linking the two files.
33025 mv conftest.$ac_objext conftstm.$ac_objext
33026- lt_save_LIBS="$LIBS"
33027- lt_save_CFLAGS="$CFLAGS"
33028+ lt_globsym_save_LIBS=$LIBS
33029+ lt_globsym_save_CFLAGS=$CFLAGS
33030 LIBS="conftstm.$ac_objext"
33031 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
33032 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
33033@@ -6058,8 +6386,8 @@ _LT_EOF
33034 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
33035 pipe_works=yes
33036 fi
33037- LIBS="$lt_save_LIBS"
33038- CFLAGS="$lt_save_CFLAGS"
33039+ LIBS=$lt_globsym_save_LIBS
33040+ CFLAGS=$lt_globsym_save_CFLAGS
33041 else
33042 echo "cannot find nm_test_func in $nlist" >&5
33043 fi
33044@@ -6096,6 +6424,17 @@ else
33045 $as_echo "ok" >&6; }
33046 fi
33047
33048+# Response file support.
33049+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
33050+ nm_file_list_spec='@'
33051+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
33052+ nm_file_list_spec='@'
33053+fi
33054+
33055+
33056+
33057+
33058+
33059
33060
33061
33062@@ -6113,6 +6452,43 @@ fi
33063
33064
33065
33066+
33067+
33068+
33069+
33070+
33071+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
33072+$as_echo_n "checking for sysroot... " >&6; }
33073+
33074+# Check whether --with-libtool-sysroot was given.
33075+if test "${with_libtool_sysroot+set}" = set; then :
33076+ withval=$with_libtool_sysroot;
33077+else
33078+ with_libtool_sysroot=no
33079+fi
33080+
33081+
33082+lt_sysroot=
33083+case ${with_libtool_sysroot} in #(
33084+ yes)
33085+ if test "$GCC" = yes; then
33086+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
33087+ fi
33088+ ;; #(
33089+ /*)
33090+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
33091+ ;; #(
33092+ no|'')
33093+ ;; #(
33094+ *)
33095+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
33096+$as_echo "${with_libtool_sysroot}" >&6; }
33097+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
33098+ ;;
33099+esac
33100+
33101+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
33102+$as_echo "${lt_sysroot:-no}" >&6; }
33103
33104
33105
33106@@ -6327,6 +6703,123 @@ esac
33107
33108 need_locks="$enable_libtool_lock"
33109
33110+if test -n "$ac_tool_prefix"; then
33111+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
33112+set dummy ${ac_tool_prefix}mt; ac_word=$2
33113+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
33114+$as_echo_n "checking for $ac_word... " >&6; }
33115+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
33116+ $as_echo_n "(cached) " >&6
33117+else
33118+ if test -n "$MANIFEST_TOOL"; then
33119+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
33120+else
33121+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
33122+for as_dir in $PATH
33123+do
33124+ IFS=$as_save_IFS
33125+ test -z "$as_dir" && as_dir=.
33126+ for ac_exec_ext in '' $ac_executable_extensions; do
33127+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
33128+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
33129+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
33130+ break 2
33131+ fi
33132+done
33133+ done
33134+IFS=$as_save_IFS
33135+
33136+fi
33137+fi
33138+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
33139+if test -n "$MANIFEST_TOOL"; then
33140+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
33141+$as_echo "$MANIFEST_TOOL" >&6; }
33142+else
33143+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
33144+$as_echo "no" >&6; }
33145+fi
33146+
33147+
33148+fi
33149+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
33150+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
33151+ # Extract the first word of "mt", so it can be a program name with args.
33152+set dummy mt; ac_word=$2
33153+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
33154+$as_echo_n "checking for $ac_word... " >&6; }
33155+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
33156+ $as_echo_n "(cached) " >&6
33157+else
33158+ if test -n "$ac_ct_MANIFEST_TOOL"; then
33159+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
33160+else
33161+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
33162+for as_dir in $PATH
33163+do
33164+ IFS=$as_save_IFS
33165+ test -z "$as_dir" && as_dir=.
33166+ for ac_exec_ext in '' $ac_executable_extensions; do
33167+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
33168+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
33169+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
33170+ break 2
33171+ fi
33172+done
33173+ done
33174+IFS=$as_save_IFS
33175+
33176+fi
33177+fi
33178+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
33179+if test -n "$ac_ct_MANIFEST_TOOL"; then
33180+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
33181+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
33182+else
33183+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
33184+$as_echo "no" >&6; }
33185+fi
33186+
33187+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
33188+ MANIFEST_TOOL=":"
33189+ else
33190+ case $cross_compiling:$ac_tool_warned in
33191+yes:)
33192+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
33193+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
33194+ac_tool_warned=yes ;;
33195+esac
33196+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
33197+ fi
33198+else
33199+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
33200+fi
33201+
33202+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
33203+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
33204+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
33205+if ${lt_cv_path_mainfest_tool+:} false; then :
33206+ $as_echo_n "(cached) " >&6
33207+else
33208+ lt_cv_path_mainfest_tool=no
33209+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
33210+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
33211+ cat conftest.err >&5
33212+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
33213+ lt_cv_path_mainfest_tool=yes
33214+ fi
33215+ rm -f conftest*
33216+fi
33217+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
33218+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
33219+if test "x$lt_cv_path_mainfest_tool" != xyes; then
33220+ MANIFEST_TOOL=:
33221+fi
33222+
33223+
33224+
33225+
33226+
33227
33228 case $host_os in
33229 rhapsody* | darwin*)
33230@@ -6893,6 +7386,8 @@ _LT_EOF
33231 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
33232 echo "$AR cru libconftest.a conftest.o" >&5
33233 $AR cru libconftest.a conftest.o 2>&5
33234+ echo "$RANLIB libconftest.a" >&5
33235+ $RANLIB libconftest.a 2>&5
33236 cat > conftest.c << _LT_EOF
33237 int main() { return 0;}
33238 _LT_EOF
33239@@ -7744,8 +8239,6 @@ fi
33240 lt_prog_compiler_pic=
33241 lt_prog_compiler_static=
33242
33243-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
33244-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33245
33246 if test "$GCC" = yes; then
33247 lt_prog_compiler_wl='-Wl,'
33248@@ -7911,6 +8404,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33249 lt_prog_compiler_pic='--shared'
33250 lt_prog_compiler_static='--static'
33251 ;;
33252+ nagfor*)
33253+ # NAG Fortran compiler
33254+ lt_prog_compiler_wl='-Wl,-Wl,,'
33255+ lt_prog_compiler_pic='-PIC'
33256+ lt_prog_compiler_static='-Bstatic'
33257+ ;;
33258 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
33259 # Portland Group compilers (*not* the Pentium gcc compiler,
33260 # which looks to be a dead project)
33261@@ -7973,7 +8472,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33262 lt_prog_compiler_pic='-KPIC'
33263 lt_prog_compiler_static='-Bstatic'
33264 case $cc_basename in
33265- f77* | f90* | f95*)
33266+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
33267 lt_prog_compiler_wl='-Qoption ld ';;
33268 *)
33269 lt_prog_compiler_wl='-Wl,';;
33270@@ -8030,13 +8529,17 @@ case $host_os in
33271 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
33272 ;;
33273 esac
33274-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
33275-$as_echo "$lt_prog_compiler_pic" >&6; }
33276-
33277-
33278-
33279-
33280
33281+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
33282+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33283+if ${lt_cv_prog_compiler_pic+:} false; then :
33284+ $as_echo_n "(cached) " >&6
33285+else
33286+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
33287+fi
33288+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
33289+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
33290+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
33291
33292 #
33293 # Check to make sure the PIC flag actually works.
33294@@ -8097,6 +8600,11 @@ fi
33295
33296
33297
33298+
33299+
33300+
33301+
33302+
33303 #
33304 # Check to make sure the static flag actually works.
33305 #
33306@@ -8447,7 +8955,8 @@ _LT_EOF
33307 allow_undefined_flag=unsupported
33308 always_export_symbols=no
33309 enable_shared_with_static_runtimes=yes
33310- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
33311+ 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'
33312+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
33313
33314 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
33315 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
33316@@ -8546,12 +9055,12 @@ _LT_EOF
33317 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
33318 hardcode_libdir_flag_spec=
33319 hardcode_libdir_flag_spec_ld='-rpath $libdir'
33320- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
33321+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
33322 if test "x$supports_anon_versioning" = xyes; then
33323 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
33324 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
33325 echo "local: *; };" >> $output_objdir/$libname.ver~
33326- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
33327+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
33328 fi
33329 ;;
33330 esac
33331@@ -8565,8 +9074,8 @@ _LT_EOF
33332 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
33333 wlarc=
33334 else
33335- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33336- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33337+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33338+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33339 fi
33340 ;;
33341
33342@@ -8584,8 +9093,8 @@ _LT_EOF
33343
33344 _LT_EOF
33345 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
33346- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33347- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33348+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33349+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33350 else
33351 ld_shlibs=no
33352 fi
33353@@ -8631,8 +9140,8 @@ _LT_EOF
33354
33355 *)
33356 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
33357- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33358- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33359+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
33360+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
33361 else
33362 ld_shlibs=no
33363 fi
33364@@ -8762,7 +9271,13 @@ _LT_EOF
33365 allow_undefined_flag='-berok'
33366 # Determine the default libpath from the value encoded in an
33367 # empty executable.
33368- if test x$gcc_no_link = xyes; then
33369+ if test "${lt_cv_aix_libpath+set}" = set; then
33370+ aix_libpath=$lt_cv_aix_libpath
33371+else
33372+ if ${lt_cv_aix_libpath_+:} false; then :
33373+ $as_echo_n "(cached) " >&6
33374+else
33375+ if test x$gcc_no_link = xyes; then
33376 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33377 fi
33378 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33379@@ -8778,22 +9293,29 @@ main ()
33380 _ACEOF
33381 if ac_fn_c_try_link "$LINENO"; then :
33382
33383-lt_aix_libpath_sed='
33384- /Import File Strings/,/^$/ {
33385- /^0/ {
33386- s/^0 *\(.*\)$/\1/
33387- p
33388- }
33389- }'
33390-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33391-# Check for a 64-bit object if we didn't find anything.
33392-if test -z "$aix_libpath"; then
33393- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33394-fi
33395+ lt_aix_libpath_sed='
33396+ /Import File Strings/,/^$/ {
33397+ /^0/ {
33398+ s/^0 *\([^ ]*\) *$/\1/
33399+ p
33400+ }
33401+ }'
33402+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33403+ # Check for a 64-bit object if we didn't find anything.
33404+ if test -z "$lt_cv_aix_libpath_"; then
33405+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33406+ fi
33407 fi
33408 rm -f core conftest.err conftest.$ac_objext \
33409 conftest$ac_exeext conftest.$ac_ext
33410-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33411+ if test -z "$lt_cv_aix_libpath_"; then
33412+ lt_cv_aix_libpath_="/usr/lib:/lib"
33413+ fi
33414+
33415+fi
33416+
33417+ aix_libpath=$lt_cv_aix_libpath_
33418+fi
33419
33420 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33421 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"
33422@@ -8805,7 +9327,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33423 else
33424 # Determine the default libpath from the value encoded in an
33425 # empty executable.
33426- if test x$gcc_no_link = xyes; then
33427+ if test "${lt_cv_aix_libpath+set}" = set; then
33428+ aix_libpath=$lt_cv_aix_libpath
33429+else
33430+ if ${lt_cv_aix_libpath_+:} false; then :
33431+ $as_echo_n "(cached) " >&6
33432+else
33433+ if test x$gcc_no_link = xyes; then
33434 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33435 fi
33436 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33437@@ -8821,22 +9349,29 @@ main ()
33438 _ACEOF
33439 if ac_fn_c_try_link "$LINENO"; then :
33440
33441-lt_aix_libpath_sed='
33442- /Import File Strings/,/^$/ {
33443- /^0/ {
33444- s/^0 *\(.*\)$/\1/
33445- p
33446- }
33447- }'
33448-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33449-# Check for a 64-bit object if we didn't find anything.
33450-if test -z "$aix_libpath"; then
33451- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33452-fi
33453+ lt_aix_libpath_sed='
33454+ /Import File Strings/,/^$/ {
33455+ /^0/ {
33456+ s/^0 *\([^ ]*\) *$/\1/
33457+ p
33458+ }
33459+ }'
33460+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33461+ # Check for a 64-bit object if we didn't find anything.
33462+ if test -z "$lt_cv_aix_libpath_"; then
33463+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
33464+ fi
33465 fi
33466 rm -f core conftest.err conftest.$ac_objext \
33467 conftest$ac_exeext conftest.$ac_ext
33468-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33469+ if test -z "$lt_cv_aix_libpath_"; then
33470+ lt_cv_aix_libpath_="/usr/lib:/lib"
33471+ fi
33472+
33473+fi
33474+
33475+ aix_libpath=$lt_cv_aix_libpath_
33476+fi
33477
33478 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33479 # Warning - without using the other run time loading flags,
33480@@ -8881,20 +9416,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33481 # Microsoft Visual C++.
33482 # hardcode_libdir_flag_spec is actually meaningless, as there is
33483 # no search path for DLLs.
33484- hardcode_libdir_flag_spec=' '
33485- allow_undefined_flag=unsupported
33486- # Tell ltmain to make .lib files, not .a files.
33487- libext=lib
33488- # Tell ltmain to make .dll files, not .so files.
33489- shrext_cmds=".dll"
33490- # FIXME: Setting linknames here is a bad hack.
33491- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
33492- # The linker will automatically build a .lib file if we build a DLL.
33493- old_archive_from_new_cmds='true'
33494- # FIXME: Should let the user specify the lib program.
33495- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
33496- fix_srcfile_path='`cygpath -w "$srcfile"`'
33497- enable_shared_with_static_runtimes=yes
33498+ case $cc_basename in
33499+ cl*)
33500+ # Native MSVC
33501+ hardcode_libdir_flag_spec=' '
33502+ allow_undefined_flag=unsupported
33503+ always_export_symbols=yes
33504+ file_list_spec='@'
33505+ # Tell ltmain to make .lib files, not .a files.
33506+ libext=lib
33507+ # Tell ltmain to make .dll files, not .so files.
33508+ shrext_cmds=".dll"
33509+ # FIXME: Setting linknames here is a bad hack.
33510+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
33511+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
33512+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
33513+ else
33514+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
33515+ fi~
33516+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
33517+ linknames='
33518+ # The linker will not automatically build a static lib if we build a DLL.
33519+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
33520+ enable_shared_with_static_runtimes=yes
33521+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
33522+ # Don't use ranlib
33523+ old_postinstall_cmds='chmod 644 $oldlib'
33524+ postlink_cmds='lt_outputfile="@OUTPUT@"~
33525+ lt_tool_outputfile="@TOOL_OUTPUT@"~
33526+ case $lt_outputfile in
33527+ *.exe|*.EXE) ;;
33528+ *)
33529+ lt_outputfile="$lt_outputfile.exe"
33530+ lt_tool_outputfile="$lt_tool_outputfile.exe"
33531+ ;;
33532+ esac~
33533+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
33534+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
33535+ $RM "$lt_outputfile.manifest";
33536+ fi'
33537+ ;;
33538+ *)
33539+ # Assume MSVC wrapper
33540+ hardcode_libdir_flag_spec=' '
33541+ allow_undefined_flag=unsupported
33542+ # Tell ltmain to make .lib files, not .a files.
33543+ libext=lib
33544+ # Tell ltmain to make .dll files, not .so files.
33545+ shrext_cmds=".dll"
33546+ # FIXME: Setting linknames here is a bad hack.
33547+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
33548+ # The linker will automatically build a .lib file if we build a DLL.
33549+ old_archive_from_new_cmds='true'
33550+ # FIXME: Should let the user specify the lib program.
33551+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
33552+ enable_shared_with_static_runtimes=yes
33553+ ;;
33554+ esac
33555 ;;
33556
33557 darwin* | rhapsody*)
33558@@ -8955,7 +9533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33559
33560 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
33561 freebsd* | dragonfly*)
33562- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
33563+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
33564 hardcode_libdir_flag_spec='-R$libdir'
33565 hardcode_direct=yes
33566 hardcode_shlibpath_var=no
33567@@ -8963,7 +9541,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33568
33569 hpux9*)
33570 if test "$GCC" = yes; then
33571- 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'
33572+ 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'
33573 else
33574 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'
33575 fi
33576@@ -8979,7 +9557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33577
33578 hpux10*)
33579 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
33580- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
33581+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
33582 else
33583 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
33584 fi
33585@@ -9003,10 +9581,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33586 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
33587 ;;
33588 ia64*)
33589- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
33590+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
33591 ;;
33592 *)
33593- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
33594+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
33595 ;;
33596 esac
33597 else
33598@@ -9085,26 +9663,39 @@ fi
33599
33600 irix5* | irix6* | nonstopux*)
33601 if test "$GCC" = yes; then
33602- 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'
33603+ 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'
33604 # Try to use the -exported_symbol ld option, if it does not
33605 # work, assume that -exports_file does not work either and
33606 # implicitly export all symbols.
33607- save_LDFLAGS="$LDFLAGS"
33608- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
33609- if test x$gcc_no_link = xyes; then
33610+ # This should be the same for all languages, so no per-tag cache variable.
33611+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
33612+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
33613+if ${lt_cv_irix_exported_symbol+:} false; then :
33614+ $as_echo_n "(cached) " >&6
33615+else
33616+ save_LDFLAGS="$LDFLAGS"
33617+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
33618+ if test x$gcc_no_link = xyes; then
33619 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33620 fi
33621 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33622 /* end confdefs.h. */
33623-int foo(void) {}
33624+int foo (void) { return 0; }
33625 _ACEOF
33626 if ac_fn_c_try_link "$LINENO"; then :
33627- 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'
33628-
33629+ lt_cv_irix_exported_symbol=yes
33630+else
33631+ lt_cv_irix_exported_symbol=no
33632 fi
33633 rm -f core conftest.err conftest.$ac_objext \
33634 conftest$ac_exeext conftest.$ac_ext
33635- LDFLAGS="$save_LDFLAGS"
33636+ LDFLAGS="$save_LDFLAGS"
33637+fi
33638+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
33639+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
33640+ if test "$lt_cv_irix_exported_symbol" = yes; then
33641+ 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'
33642+ fi
33643 else
33644 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'
33645 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'
33646@@ -9189,7 +9780,7 @@ rm -f core conftest.err conftest.$ac_objext \
33647 osf4* | osf5*) # as osf3* with the addition of -msym flag
33648 if test "$GCC" = yes; then
33649 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
33650- 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'
33651+ 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'
33652 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
33653 else
33654 allow_undefined_flag=' -expect_unresolved \*'
33655@@ -9208,9 +9799,9 @@ rm -f core conftest.err conftest.$ac_objext \
33656 no_undefined_flag=' -z defs'
33657 if test "$GCC" = yes; then
33658 wlarc='${wl}'
33659- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
33660+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
33661 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
33662- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
33663+ $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'
33664 else
33665 case `$CC -V 2>&1` in
33666 *"Compilers 5.0"*)
33667@@ -9786,8 +10377,9 @@ cygwin* | mingw* | pw32* | cegcc*)
33668 need_version=no
33669 need_lib_prefix=no
33670
33671- case $GCC,$host_os in
33672- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
33673+ case $GCC,$cc_basename in
33674+ yes,*)
33675+ # gcc
33676 library_names_spec='$libname.dll.a'
33677 # DLL is installed to $(libdir)/../bin by postinstall_cmds
33678 postinstall_cmds='base_file=`basename \${file}`~
33679@@ -9820,13 +10412,71 @@ cygwin* | mingw* | pw32* | cegcc*)
33680 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
33681 ;;
33682 esac
33683+ dynamic_linker='Win32 ld.exe'
33684+ ;;
33685+
33686+ *,cl*)
33687+ # Native MSVC
33688+ libname_spec='$name'
33689+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
33690+ library_names_spec='${libname}.dll.lib'
33691+
33692+ case $build_os in
33693+ mingw*)
33694+ sys_lib_search_path_spec=
33695+ lt_save_ifs=$IFS
33696+ IFS=';'
33697+ for lt_path in $LIB
33698+ do
33699+ IFS=$lt_save_ifs
33700+ # Let DOS variable expansion print the short 8.3 style file name.
33701+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
33702+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
33703+ done
33704+ IFS=$lt_save_ifs
33705+ # Convert to MSYS style.
33706+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
33707+ ;;
33708+ cygwin*)
33709+ # Convert to unix form, then to dos form, then back to unix form
33710+ # but this time dos style (no spaces!) so that the unix form looks
33711+ # like /cygdrive/c/PROGRA~1:/cygdr...
33712+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
33713+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
33714+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
33715+ ;;
33716+ *)
33717+ sys_lib_search_path_spec="$LIB"
33718+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
33719+ # It is most probably a Windows format PATH.
33720+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
33721+ else
33722+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
33723+ fi
33724+ # FIXME: find the short name or the path components, as spaces are
33725+ # common. (e.g. "Program Files" -> "PROGRA~1")
33726+ ;;
33727+ esac
33728+
33729+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
33730+ postinstall_cmds='base_file=`basename \${file}`~
33731+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
33732+ dldir=$destdir/`dirname \$dlpath`~
33733+ test -d \$dldir || mkdir -p \$dldir~
33734+ $install_prog $dir/$dlname \$dldir/$dlname'
33735+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
33736+ dlpath=$dir/\$dldll~
33737+ $RM \$dlpath'
33738+ shlibpath_overrides_runpath=yes
33739+ dynamic_linker='Win32 link.exe'
33740 ;;
33741
33742 *)
33743+ # Assume MSVC wrapper
33744 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
33745+ dynamic_linker='Win32 ld.exe'
33746 ;;
33747 esac
33748- dynamic_linker='Win32 ld.exe'
33749 # FIXME: first we should search . and the directory the executable is in
33750 shlibpath_var=PATH
33751 ;;
33752@@ -10746,7 +11396,7 @@ else
33753 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33754 lt_status=$lt_dlunknown
33755 cat > conftest.$ac_ext <<_LT_EOF
33756-#line 10749 "configure"
33757+#line $LINENO "configure"
33758 #include "confdefs.h"
33759
33760 #if HAVE_DLFCN_H
33761@@ -10790,10 +11440,10 @@ else
33762 /* When -fvisbility=hidden is used, assume the code has been annotated
33763 correspondingly for the symbols needed. */
33764 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
33765-void fnord () __attribute__((visibility("default")));
33766+int fnord () __attribute__((visibility("default")));
33767 #endif
33768
33769-void fnord () { int i=42; }
33770+int fnord () { return 42; }
33771 int main ()
33772 {
33773 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33774@@ -10852,7 +11502,7 @@ else
33775 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33776 lt_status=$lt_dlunknown
33777 cat > conftest.$ac_ext <<_LT_EOF
33778-#line 10855 "configure"
33779+#line $LINENO "configure"
33780 #include "confdefs.h"
33781
33782 #if HAVE_DLFCN_H
33783@@ -10896,10 +11546,10 @@ else
33784 /* When -fvisbility=hidden is used, assume the code has been annotated
33785 correspondingly for the symbols needed. */
33786 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
33787-void fnord () __attribute__((visibility("default")));
33788+int fnord () __attribute__((visibility("default")));
33789 #endif
33790
33791-void fnord () { int i=42; }
33792+int fnord () { return 42; }
33793 int main ()
33794 {
33795 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33796@@ -12385,13 +13035,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
33797 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
33798 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
33799 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
33800+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
33801+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
33802 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
33803 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
33804 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
33805 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
33806 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
33807+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
33808+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
33809+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
33810+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
33811 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
33812 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
33813+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
33814 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
33815 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
33816 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
33817@@ -12406,14 +13063,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
33818 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
33819 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
33820 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"`'
33821+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
33822+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
33823 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
33824 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
33825 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
33826-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
33827 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
33828+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
33829 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
33830 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
33831 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
33832+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
33833 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
33834 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
33835 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
33836@@ -12446,12 +13106,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
33837 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
33838 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
33839 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
33840-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
33841 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
33842 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
33843 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
33844 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
33845 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
33846+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
33847 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
33848 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
33849 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
33850@@ -12506,8 +13166,13 @@ reload_flag \
33851 OBJDUMP \
33852 deplibs_check_method \
33853 file_magic_cmd \
33854+file_magic_glob \
33855+want_nocaseglob \
33856+DLLTOOL \
33857+sharedlib_from_linklib_cmd \
33858 AR \
33859 AR_FLAGS \
33860+archiver_list_spec \
33861 STRIP \
33862 RANLIB \
33863 CC \
33864@@ -12517,12 +13182,14 @@ lt_cv_sys_global_symbol_pipe \
33865 lt_cv_sys_global_symbol_to_cdecl \
33866 lt_cv_sys_global_symbol_to_c_name_address \
33867 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
33868+nm_file_list_spec \
33869 lt_prog_compiler_no_builtin_flag \
33870-lt_prog_compiler_wl \
33871 lt_prog_compiler_pic \
33872+lt_prog_compiler_wl \
33873 lt_prog_compiler_static \
33874 lt_cv_prog_compiler_c_o \
33875 need_locks \
33876+MANIFEST_TOOL \
33877 DSYMUTIL \
33878 NMEDIT \
33879 LIPO \
33880@@ -12538,7 +13205,6 @@ no_undefined_flag \
33881 hardcode_libdir_flag_spec \
33882 hardcode_libdir_flag_spec_ld \
33883 hardcode_libdir_separator \
33884-fix_srcfile_path \
33885 exclude_expsyms \
33886 include_expsyms \
33887 file_list_spec \
33888@@ -12574,6 +13240,7 @@ module_cmds \
33889 module_expsym_cmds \
33890 export_symbols_cmds \
33891 prelink_cmds \
33892+postlink_cmds \
33893 postinstall_cmds \
33894 postuninstall_cmds \
33895 finish_cmds \
33896@@ -13172,7 +13839,8 @@ $as_echo X"$file" |
33897 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
33898 #
33899 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
33900-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
33901+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
33902+# Inc.
33903 # Written by Gordon Matzigkeit, 1996
33904 #
33905 # This file is part of GNU Libtool.
33906@@ -13275,19 +13943,42 @@ SP2NL=$lt_lt_SP2NL
33907 # turn newlines into spaces.
33908 NL2SP=$lt_lt_NL2SP
33909
33910+# convert \$build file names to \$host format.
33911+to_host_file_cmd=$lt_cv_to_host_file_cmd
33912+
33913+# convert \$build files to toolchain format.
33914+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
33915+
33916 # An object symbol dumper.
33917 OBJDUMP=$lt_OBJDUMP
33918
33919 # Method to check whether dependent libraries are shared objects.
33920 deplibs_check_method=$lt_deplibs_check_method
33921
33922-# Command to use when deplibs_check_method == "file_magic".
33923+# Command to use when deplibs_check_method = "file_magic".
33924 file_magic_cmd=$lt_file_magic_cmd
33925
33926+# How to find potential files when deplibs_check_method = "file_magic".
33927+file_magic_glob=$lt_file_magic_glob
33928+
33929+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
33930+want_nocaseglob=$lt_want_nocaseglob
33931+
33932+# DLL creation program.
33933+DLLTOOL=$lt_DLLTOOL
33934+
33935+# Command to associate shared and link libraries.
33936+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
33937+
33938 # The archiver.
33939 AR=$lt_AR
33940+
33941+# Flags to create an archive.
33942 AR_FLAGS=$lt_AR_FLAGS
33943
33944+# How to feed a file listing to the archiver.
33945+archiver_list_spec=$lt_archiver_list_spec
33946+
33947 # A symbol stripping program.
33948 STRIP=$lt_STRIP
33949
33950@@ -13317,6 +14008,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
33951 # Transform the output of nm in a C name address pair when lib prefix is needed.
33952 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
33953
33954+# Specify filename containing input files for \$NM.
33955+nm_file_list_spec=$lt_nm_file_list_spec
33956+
33957+# The root where to search for dependent libraries,and in which our libraries should be installed.
33958+lt_sysroot=$lt_sysroot
33959+
33960 # The name of the directory that contains temporary libtool files.
33961 objdir=$objdir
33962
33963@@ -13326,6 +14023,9 @@ MAGIC_CMD=$MAGIC_CMD
33964 # Must we lock files when doing compilation?
33965 need_locks=$lt_need_locks
33966
33967+# Manifest tool.
33968+MANIFEST_TOOL=$lt_MANIFEST_TOOL
33969+
33970 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
33971 DSYMUTIL=$lt_DSYMUTIL
33972
33973@@ -13440,12 +14140,12 @@ with_gcc=$GCC
33974 # Compiler flag to turn off builtin functions.
33975 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
33976
33977-# How to pass a linker flag through the compiler.
33978-wl=$lt_lt_prog_compiler_wl
33979-
33980 # Additional compiler flags for building library objects.
33981 pic_flag=$lt_lt_prog_compiler_pic
33982
33983+# How to pass a linker flag through the compiler.
33984+wl=$lt_lt_prog_compiler_wl
33985+
33986 # Compiler flag to prevent dynamic linking.
33987 link_static_flag=$lt_lt_prog_compiler_static
33988
33989@@ -13532,9 +14232,6 @@ inherit_rpath=$inherit_rpath
33990 # Whether libtool must link a program against all its dependency libraries.
33991 link_all_deplibs=$link_all_deplibs
33992
33993-# Fix the shell variable \$srcfile for the compiler.
33994-fix_srcfile_path=$lt_fix_srcfile_path
33995-
33996 # Set to "yes" if exported symbols are required.
33997 always_export_symbols=$always_export_symbols
33998
33999@@ -13550,6 +14247,9 @@ include_expsyms=$lt_include_expsyms
34000 # Commands necessary for linking programs (against libraries) with templates.
34001 prelink_cmds=$lt_prelink_cmds
34002
34003+# Commands necessary for finishing linking programs.
34004+postlink_cmds=$lt_postlink_cmds
34005+
34006 # Specify filename containing input files.
34007 file_list_spec=$lt_file_list_spec
34008
34009@@ -13582,210 +14282,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
34010 # if finds mixed CR/LF and LF-only lines. Since sed operates in
34011 # text mode, it properly converts lines to CR/LF. This bash problem
34012 # is reportedly fixed, but why not run on old versions too?
34013- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
34014- || (rm -f "$cfgfile"; exit 1)
34015-
34016- case $xsi_shell in
34017- yes)
34018- cat << \_LT_EOF >> "$cfgfile"
34019-
34020-# func_dirname file append nondir_replacement
34021-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
34022-# otherwise set result to NONDIR_REPLACEMENT.
34023-func_dirname ()
34024-{
34025- case ${1} in
34026- */*) func_dirname_result="${1%/*}${2}" ;;
34027- * ) func_dirname_result="${3}" ;;
34028- esac
34029-}
34030-
34031-# func_basename file
34032-func_basename ()
34033-{
34034- func_basename_result="${1##*/}"
34035-}
34036-
34037-# func_dirname_and_basename file append nondir_replacement
34038-# perform func_basename and func_dirname in a single function
34039-# call:
34040-# dirname: Compute the dirname of FILE. If nonempty,
34041-# add APPEND to the result, otherwise set result
34042-# to NONDIR_REPLACEMENT.
34043-# value returned in "$func_dirname_result"
34044-# basename: Compute filename of FILE.
34045-# value retuned in "$func_basename_result"
34046-# Implementation must be kept synchronized with func_dirname
34047-# and func_basename. For efficiency, we do not delegate to
34048-# those functions but instead duplicate the functionality here.
34049-func_dirname_and_basename ()
34050-{
34051- case ${1} in
34052- */*) func_dirname_result="${1%/*}${2}" ;;
34053- * ) func_dirname_result="${3}" ;;
34054- esac
34055- func_basename_result="${1##*/}"
34056-}
34057-
34058-# func_stripname prefix suffix name
34059-# strip PREFIX and SUFFIX off of NAME.
34060-# PREFIX and SUFFIX must not contain globbing or regex special
34061-# characters, hashes, percent signs, but SUFFIX may contain a leading
34062-# dot (in which case that matches only a dot).
34063-func_stripname ()
34064-{
34065- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
34066- # positional parameters, so assign one to ordinary parameter first.
34067- func_stripname_result=${3}
34068- func_stripname_result=${func_stripname_result#"${1}"}
34069- func_stripname_result=${func_stripname_result%"${2}"}
34070-}
34071-
34072-# func_opt_split
34073-func_opt_split ()
34074-{
34075- func_opt_split_opt=${1%%=*}
34076- func_opt_split_arg=${1#*=}
34077-}
34078-
34079-# func_lo2o object
34080-func_lo2o ()
34081-{
34082- case ${1} in
34083- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
34084- *) func_lo2o_result=${1} ;;
34085- esac
34086-}
34087-
34088-# func_xform libobj-or-source
34089-func_xform ()
34090-{
34091- func_xform_result=${1%.*}.lo
34092-}
34093-
34094-# func_arith arithmetic-term...
34095-func_arith ()
34096-{
34097- func_arith_result=$(( $* ))
34098-}
34099-
34100-# func_len string
34101-# STRING may not start with a hyphen.
34102-func_len ()
34103-{
34104- func_len_result=${#1}
34105-}
34106-
34107-_LT_EOF
34108- ;;
34109- *) # Bourne compatible functions.
34110- cat << \_LT_EOF >> "$cfgfile"
34111-
34112-# func_dirname file append nondir_replacement
34113-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
34114-# otherwise set result to NONDIR_REPLACEMENT.
34115-func_dirname ()
34116-{
34117- # Extract subdirectory from the argument.
34118- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
34119- if test "X$func_dirname_result" = "X${1}"; then
34120- func_dirname_result="${3}"
34121- else
34122- func_dirname_result="$func_dirname_result${2}"
34123- fi
34124-}
34125-
34126-# func_basename file
34127-func_basename ()
34128-{
34129- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
34130-}
34131-
34132-
34133-# func_stripname prefix suffix name
34134-# strip PREFIX and SUFFIX off of NAME.
34135-# PREFIX and SUFFIX must not contain globbing or regex special
34136-# characters, hashes, percent signs, but SUFFIX may contain a leading
34137-# dot (in which case that matches only a dot).
34138-# func_strip_suffix prefix name
34139-func_stripname ()
34140-{
34141- case ${2} in
34142- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
34143- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
34144- esac
34145-}
34146-
34147-# sed scripts:
34148-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
34149-my_sed_long_arg='1s/^-[^=]*=//'
34150-
34151-# func_opt_split
34152-func_opt_split ()
34153-{
34154- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
34155- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
34156-}
34157-
34158-# func_lo2o object
34159-func_lo2o ()
34160-{
34161- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
34162-}
34163-
34164-# func_xform libobj-or-source
34165-func_xform ()
34166-{
34167- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
34168-}
34169-
34170-# func_arith arithmetic-term...
34171-func_arith ()
34172-{
34173- func_arith_result=`expr "$@"`
34174-}
34175-
34176-# func_len string
34177-# STRING may not start with a hyphen.
34178-func_len ()
34179-{
34180- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
34181-}
34182-
34183-_LT_EOF
34184-esac
34185-
34186-case $lt_shell_append in
34187- yes)
34188- cat << \_LT_EOF >> "$cfgfile"
34189-
34190-# func_append var value
34191-# Append VALUE to the end of shell variable VAR.
34192-func_append ()
34193-{
34194- eval "$1+=\$2"
34195-}
34196-_LT_EOF
34197- ;;
34198- *)
34199- cat << \_LT_EOF >> "$cfgfile"
34200-
34201-# func_append var value
34202-# Append VALUE to the end of shell variable VAR.
34203-func_append ()
34204-{
34205- eval "$1=\$$1\$2"
34206-}
34207-
34208-_LT_EOF
34209- ;;
34210- esac
34211-
34212-
34213- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
34214- || (rm -f "$cfgfile"; exit 1)
34215-
34216- mv -f "$cfgfile" "$ofile" ||
34217+ sed '$q' "$ltmain" >> "$cfgfile" \
34218+ || (rm -f "$cfgfile"; exit 1)
34219+
34220+ if test x"$xsi_shell" = xyes; then
34221+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
34222+func_dirname ()\
34223+{\
34224+\ case ${1} in\
34225+\ */*) func_dirname_result="${1%/*}${2}" ;;\
34226+\ * ) func_dirname_result="${3}" ;;\
34227+\ esac\
34228+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
34229+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34230+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34231+test 0 -eq $? || _lt_function_replace_fail=:
34232+
34233+
34234+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
34235+func_basename ()\
34236+{\
34237+\ func_basename_result="${1##*/}"\
34238+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
34239+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34240+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34241+test 0 -eq $? || _lt_function_replace_fail=:
34242+
34243+
34244+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
34245+func_dirname_and_basename ()\
34246+{\
34247+\ case ${1} in\
34248+\ */*) func_dirname_result="${1%/*}${2}" ;;\
34249+\ * ) func_dirname_result="${3}" ;;\
34250+\ esac\
34251+\ func_basename_result="${1##*/}"\
34252+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
34253+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34254+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34255+test 0 -eq $? || _lt_function_replace_fail=:
34256+
34257+
34258+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
34259+func_stripname ()\
34260+{\
34261+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
34262+\ # positional parameters, so assign one to ordinary parameter first.\
34263+\ func_stripname_result=${3}\
34264+\ func_stripname_result=${func_stripname_result#"${1}"}\
34265+\ func_stripname_result=${func_stripname_result%"${2}"}\
34266+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
34267+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34268+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34269+test 0 -eq $? || _lt_function_replace_fail=:
34270+
34271+
34272+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
34273+func_split_long_opt ()\
34274+{\
34275+\ func_split_long_opt_name=${1%%=*}\
34276+\ func_split_long_opt_arg=${1#*=}\
34277+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
34278+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34279+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34280+test 0 -eq $? || _lt_function_replace_fail=:
34281+
34282+
34283+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
34284+func_split_short_opt ()\
34285+{\
34286+\ func_split_short_opt_arg=${1#??}\
34287+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
34288+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
34289+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34290+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34291+test 0 -eq $? || _lt_function_replace_fail=:
34292+
34293+
34294+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
34295+func_lo2o ()\
34296+{\
34297+\ case ${1} in\
34298+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
34299+\ *) func_lo2o_result=${1} ;;\
34300+\ esac\
34301+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
34302+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34303+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34304+test 0 -eq $? || _lt_function_replace_fail=:
34305+
34306+
34307+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
34308+func_xform ()\
34309+{\
34310+ func_xform_result=${1%.*}.lo\
34311+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
34312+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34313+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34314+test 0 -eq $? || _lt_function_replace_fail=:
34315+
34316+
34317+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
34318+func_arith ()\
34319+{\
34320+ func_arith_result=$(( $* ))\
34321+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
34322+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34323+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34324+test 0 -eq $? || _lt_function_replace_fail=:
34325+
34326+
34327+ sed -e '/^func_len ()$/,/^} # func_len /c\
34328+func_len ()\
34329+{\
34330+ func_len_result=${#1}\
34331+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
34332+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34333+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34334+test 0 -eq $? || _lt_function_replace_fail=:
34335+
34336+fi
34337+
34338+if test x"$lt_shell_append" = xyes; then
34339+ sed -e '/^func_append ()$/,/^} # func_append /c\
34340+func_append ()\
34341+{\
34342+ eval "${1}+=\\${2}"\
34343+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
34344+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34345+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34346+test 0 -eq $? || _lt_function_replace_fail=:
34347+
34348+
34349+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
34350+func_append_quoted ()\
34351+{\
34352+\ func_quote_for_eval "${2}"\
34353+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
34354+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
34355+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34356+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34357+test 0 -eq $? || _lt_function_replace_fail=:
34358+
34359+
34360+ # Save a `func_append' function call where possible by direct use of '+='
34361+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
34362+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34363+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34364+ test 0 -eq $? || _lt_function_replace_fail=:
34365+else
34366+ # Save a `func_append' function call even when '+=' is not available
34367+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
34368+ && mv -f "$cfgfile.tmp" "$cfgfile" \
34369+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
34370+ test 0 -eq $? || _lt_function_replace_fail=:
34371+fi
34372+
34373+if test x"$_lt_function_replace_fail" = x":"; then
34374+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
34375+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
34376+fi
34377+
34378+
34379+ mv -f "$cfgfile" "$ofile" ||
34380 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
34381 chmod +x "$ofile"
34382
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-09 23:00:17 +0000