summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-03-25 16:16:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-30 12:33:29 +0100
commit10be0e446ca2adf325cd59a3d1ec6c01709c208f (patch)
tree789bbe09eb44b2a7e9e6c879b32ec9761243fd0c
parent4b57b45b379cb11abb031bcff4a7ae5a2247f50e (diff)
downloadpoky-10be0e446ca2adf325cd59a3d1ec6c01709c208f.tar.gz
binutils: Pregenerate autoconf files
libtool patch will result in configure file regeneration, instead of doing that at build time, do it in patch itself, this avoids running autoconf before configure step. Since binutils needs specific version of autoconf ( which is 2.69 ) this will break on systems using newer or older verisons of autoconf in current state. (From OE-Core rev: 525d703d6f846e9706481a816910aef2ee70fb54) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch14151
2 files changed, 14136 insertions, 23 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index b0937e62fc..53f46bb611 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -114,13 +114,7 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
114MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" 114MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
115do_configure[vardeps] += "MULTIARCH" 115do_configure[vardeps] += "MULTIARCH"
116do_configure () { 116do_configure () {
117 (for d in . bfd binutils gas gold gprof ld libctf opcodes; do 117 (cd ${S} && gnu-configize)
118 cd ${S}/$d
119 autoconf
120 rm -rf autom4te.cache
121 done
122 cd ${S}
123 gnu-configize)
124 118
125 oe_runconf 119 oe_runconf
126# 120#
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
index c71e19ecb4..89da62fbf7 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
@@ -1,7 +1,7 @@
1From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001 1From b8fafd8ce6c47c9a551ed796176d884a34930086 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000 3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH] Use libtool 2.4 4Subject: [PATCH 07/15] Use libtool 2.4
5 5
6get libtool sysroot support 6get libtool sysroot support
7 7
@@ -9,19 +9,1948 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/configure.ac | 2 +- 12 bfd/configure | 1322 +++++++++++++++-----
13 libtool.m4 | 1080 +++++++++++------ 13 bfd/configure.ac | 2 +-
14 ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- 14 binutils/configure | 1320 +++++++++++++++-----
15 ltoptions.m4 | 2 +- 15 gas/configure | 1320 +++++++++++++++-----
16 ltversion.m4 | 12 +- 16 gprof/configure | 1320 +++++++++++++++-----
17 lt~obsolete.m4 | 2 +- 17 ld/configure | 1695 ++++++++++++++++++-------
18 6 files changed, 2717 insertions(+), 1306 deletions(-) 18 libctf/configure | 1319 +++++++++++++++-----
19 libtool.m4 | 1080 +++++++++++-----
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++---------------
21 ltoptions.m4 | 2 +-
22 ltversion.m4 | 12 +-
23 lt~obsolete.m4 | 2 +-
24 opcodes/configure | 1320 +++++++++++++++-----
25 13 files changed, 9939 insertions(+), 3700 deletions(-)
19 26
27diff --git a/bfd/configure b/bfd/configure
28index bc576b7894a..cd036638081 100755
29--- a/bfd/configure
30+++ b/bfd/configure
31@@ -704,6 +704,9 @@ OTOOL
32 LIPO
33 NMEDIT
34 DSYMUTIL
35+MANIFEST_TOOL
36+ac_ct_AR
37+DLLTOOL
38 OBJDUMP
39 LN_S
40 NM
41@@ -822,6 +825,7 @@ enable_static
42 with_pic
43 enable_fast_install
44 with_gnu_ld
45+with_libtool_sysroot
46 enable_libtool_lock
47 enable_plugins
48 enable_largefile
49@@ -1504,6 +1508,8 @@ Optional Packages:
50 --with-pic try to use only PIC/non-PIC objects [default=use
51 both]
52 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
53+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
54+ (or the compiler's sysroot if not specified).
55 --with-mmap try using mmap for BFD input files if available
56 --with-separate-debug-dir=DIR
57 Look for global separate debug info in DIR
58@@ -5693,8 +5699,8 @@ esac
59
60
61
62-macro_version='2.2.7a'
63-macro_revision='1.3134'
64+macro_version='2.4'
65+macro_revision='1.3293'
66
67
68
69@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
70 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
71 $as_echo_n "checking how to print strings... " >&6; }
72 # Test print first, because it will be a builtin if present.
73-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
74+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
75 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
76 ECHO='print -r --'
77 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
78@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
79 # Try some XSI features
80 xsi_shell=no
81 ( _lt_dummy="a/b/c"
82- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
83- = c,a/b,, \
84+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
85+ = c,a/b,b/c, \
86 && eval 'test $(( 1 + 1 )) -eq 2 \
87 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
88 && xsi_shell=yes
89@@ -6470,6 +6476,80 @@ esac
90
91
92
93+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
94+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
95+if ${lt_cv_to_host_file_cmd+:} false; then :
96+ $as_echo_n "(cached) " >&6
97+else
98+ case $host in
99+ *-*-mingw* )
100+ case $build in
101+ *-*-mingw* ) # actually msys
102+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
103+ ;;
104+ *-*-cygwin* )
105+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
106+ ;;
107+ * ) # otherwise, assume *nix
108+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
109+ ;;
110+ esac
111+ ;;
112+ *-*-cygwin* )
113+ case $build in
114+ *-*-mingw* ) # actually msys
115+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
116+ ;;
117+ *-*-cygwin* )
118+ lt_cv_to_host_file_cmd=func_convert_file_noop
119+ ;;
120+ * ) # otherwise, assume *nix
121+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
122+ ;;
123+ esac
124+ ;;
125+ * ) # unhandled hosts (and "normal" native builds)
126+ lt_cv_to_host_file_cmd=func_convert_file_noop
127+ ;;
128+esac
129+
130+fi
131+
132+to_host_file_cmd=$lt_cv_to_host_file_cmd
133+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
134+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
135+
136+
137+
138+
139+
140+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
141+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
142+if ${lt_cv_to_tool_file_cmd+:} false; then :
143+ $as_echo_n "(cached) " >&6
144+else
145+ #assume ordinary cross tools, or native build.
146+lt_cv_to_tool_file_cmd=func_convert_file_noop
147+case $host in
148+ *-*-mingw* )
149+ case $build in
150+ *-*-mingw* ) # actually msys
151+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
152+ ;;
153+ esac
154+ ;;
155+esac
156+
157+fi
158+
159+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
160+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
161+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
162+
163+
164+
165+
166+
167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
168 $as_echo_n "checking for $LD option to reload object files... " >&6; }
169 if ${lt_cv_ld_reload_flag+:} false; then :
170@@ -6486,6 +6566,11 @@ case $reload_flag in
171 esac
172 reload_cmds='$LD$reload_flag -o $output$reload_objs'
173 case $host_os in
174+ cygwin* | mingw* | pw32* | cegcc*)
175+ if test "$GCC" != yes; then
176+ reload_cmds=false
177+ fi
178+ ;;
179 darwin*)
180 if test "$GCC" = yes; then
181 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
182@@ -6654,7 +6739,8 @@ mingw* | pw32*)
183 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
184 lt_cv_file_magic_cmd='func_win32_libid'
185 else
186- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
187+ # Keep this pattern in sync with the one in func_win32_libid.
188+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
189 lt_cv_file_magic_cmd='$OBJDUMP -f'
190 fi
191 ;;
192@@ -6808,6 +6894,21 @@ esac
193 fi
194 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
195 $as_echo "$lt_cv_deplibs_check_method" >&6; }
196+
197+file_magic_glob=
198+want_nocaseglob=no
199+if test "$build" = "$host"; then
200+ case $host_os in
201+ mingw* | pw32*)
202+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
203+ want_nocaseglob=yes
204+ else
205+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
206+ fi
207+ ;;
208+ esac
209+fi
210+
211 file_magic_cmd=$lt_cv_file_magic_cmd
212 deplibs_check_method=$lt_cv_deplibs_check_method
213 test -z "$deplibs_check_method" && deplibs_check_method=unknown
214@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
215
216
217
218+
219+
220+
221+
222+
223+
224+
225+
226+
227+
228
229
230 if test -n "$ac_tool_prefix"; then
231- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
232-set dummy ${ac_tool_prefix}ar; ac_word=$2
233+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
234+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
236+$as_echo_n "checking for $ac_word... " >&6; }
237+if ${ac_cv_prog_DLLTOOL+:} false; then :
238+ $as_echo_n "(cached) " >&6
239+else
240+ if test -n "$DLLTOOL"; then
241+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
242+else
243+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
244+for as_dir in $PATH
245+do
246+ IFS=$as_save_IFS
247+ test -z "$as_dir" && as_dir=.
248+ for ac_exec_ext in '' $ac_executable_extensions; do
249+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
250+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
251+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
252+ break 2
253+ fi
254+done
255+ done
256+IFS=$as_save_IFS
257+
258+fi
259+fi
260+DLLTOOL=$ac_cv_prog_DLLTOOL
261+if test -n "$DLLTOOL"; then
262+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
263+$as_echo "$DLLTOOL" >&6; }
264+else
265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
266+$as_echo "no" >&6; }
267+fi
268+
269+
270+fi
271+if test -z "$ac_cv_prog_DLLTOOL"; then
272+ ac_ct_DLLTOOL=$DLLTOOL
273+ # Extract the first word of "dlltool", so it can be a program name with args.
274+set dummy dlltool; ac_word=$2
275+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
276+$as_echo_n "checking for $ac_word... " >&6; }
277+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
278+ $as_echo_n "(cached) " >&6
279+else
280+ if test -n "$ac_ct_DLLTOOL"; then
281+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
282+else
283+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
284+for as_dir in $PATH
285+do
286+ IFS=$as_save_IFS
287+ test -z "$as_dir" && as_dir=.
288+ for ac_exec_ext in '' $ac_executable_extensions; do
289+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
290+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
291+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
292+ break 2
293+ fi
294+done
295+ done
296+IFS=$as_save_IFS
297+
298+fi
299+fi
300+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
301+if test -n "$ac_ct_DLLTOOL"; then
302+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
303+$as_echo "$ac_ct_DLLTOOL" >&6; }
304+else
305+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
306+$as_echo "no" >&6; }
307+fi
308+
309+ if test "x$ac_ct_DLLTOOL" = x; then
310+ DLLTOOL="false"
311+ else
312+ case $cross_compiling:$ac_tool_warned in
313+yes:)
314+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
315+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
316+ac_tool_warned=yes ;;
317+esac
318+ DLLTOOL=$ac_ct_DLLTOOL
319+ fi
320+else
321+ DLLTOOL="$ac_cv_prog_DLLTOOL"
322+fi
323+
324+test -z "$DLLTOOL" && DLLTOOL=dlltool
325+
326+
327+
328+
329+
330+
331+
332+
333+
334+
335+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
336+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
337+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
338+ $as_echo_n "(cached) " >&6
339+else
340+ lt_cv_sharedlib_from_linklib_cmd='unknown'
341+
342+case $host_os in
343+cygwin* | mingw* | pw32* | cegcc*)
344+ # two different shell functions defined in ltmain.sh
345+ # decide which to use based on capabilities of $DLLTOOL
346+ case `$DLLTOOL --help 2>&1` in
347+ *--identify-strict*)
348+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
349+ ;;
350+ *)
351+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
352+ ;;
353+ esac
354+ ;;
355+*)
356+ # fallback: assume linklib IS sharedlib
357+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
358+ ;;
359+esac
360+
361+fi
362+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
363+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
364+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
365+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
366+
367+
368+
369+
370+
371+
372+
373+if test -n "$ac_tool_prefix"; then
374+ for ac_prog in ar
375+ do
376+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
377+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
379 $as_echo_n "checking for $ac_word... " >&6; }
380 if ${ac_cv_prog_AR+:} false; then :
381@@ -6841,7 +7095,7 @@ do
382 test -z "$as_dir" && as_dir=.
383 for ac_exec_ext in '' $ac_executable_extensions; do
384 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
385- ac_cv_prog_AR="${ac_tool_prefix}ar"
386+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
387 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
388 break 2
389 fi
390@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; }
391 fi
392
393
394+ test -n "$AR" && break
395+ done
396 fi
397-if test -z "$ac_cv_prog_AR"; then
398+if test -z "$AR"; then
399 ac_ct_AR=$AR
400- # Extract the first word of "ar", so it can be a program name with args.
401-set dummy ar; ac_word=$2
402+ for ac_prog in ar
403+do
404+ # Extract the first word of "$ac_prog", so it can be a program name with args.
405+set dummy $ac_prog; ac_word=$2
406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
407 $as_echo_n "checking for $ac_word... " >&6; }
408 if ${ac_cv_prog_ac_ct_AR+:} false; then :
409@@ -6881,7 +7139,7 @@ do
410 test -z "$as_dir" && as_dir=.
411 for ac_exec_ext in '' $ac_executable_extensions; do
412 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
413- ac_cv_prog_ac_ct_AR="ar"
414+ ac_cv_prog_ac_ct_AR="$ac_prog"
415 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
416 break 2
417 fi
418@@ -6900,6 +7158,10 @@ else
419 $as_echo "no" >&6; }
420 fi
421
422+
423+ test -n "$ac_ct_AR" && break
424+done
425+
426 if test "x$ac_ct_AR" = x; then
427 AR="false"
428 else
429@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;;
430 esac
431 AR=$ac_ct_AR
432 fi
433-else
434- AR="$ac_cv_prog_AR"
435 fi
436
437-test -z "$AR" && AR=ar
438-test -z "$AR_FLAGS" && AR_FLAGS=cru
439+: ${AR=ar}
440+: ${AR_FLAGS=cru}
441+
442+
443+
444+
445+
446+
447+
448+
449+
450+
451+
452+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
453+$as_echo_n "checking for archiver @FILE support... " >&6; }
454+if ${lt_cv_ar_at_file+:} false; then :
455+ $as_echo_n "(cached) " >&6
456+else
457+ lt_cv_ar_at_file=no
458+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
459+/* end confdefs.h. */
460+
461+int
462+main ()
463+{
464
465+ ;
466+ return 0;
467+}
468+_ACEOF
469+if ac_fn_c_try_compile "$LINENO"; then :
470+ echo conftest.$ac_objext > conftest.lst
471+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
472+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
473+ (eval $lt_ar_try) 2>&5
474+ ac_status=$?
475+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
476+ test $ac_status = 0; }
477+ if test "$ac_status" -eq 0; then
478+ # Ensure the archiver fails upon bogus file names.
479+ rm -f conftest.$ac_objext libconftest.a
480+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
481+ (eval $lt_ar_try) 2>&5
482+ ac_status=$?
483+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
484+ test $ac_status = 0; }
485+ if test "$ac_status" -ne 0; then
486+ lt_cv_ar_at_file=@
487+ fi
488+ fi
489+ rm -f conftest.* libconftest.a
490
491+fi
492+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
493
494+fi
495+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
496+$as_echo "$lt_cv_ar_at_file" >&6; }
497
498+if test "x$lt_cv_ar_at_file" = xno; then
499+ archiver_list_spec=
500+else
501+ archiver_list_spec=$lt_cv_ar_at_file
502+fi
503
504
505
506@@ -7262,8 +7580,8 @@ esac
507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
508
509 # Transform an extracted symbol line into symbol name and symbol address
510-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
511-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
512+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
513+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
514
515 # Handle CRLF in mingw tool chain
516 opt_cr=
517@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do
518 else
519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
520 fi
521+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
522
523 # Check to see that the pipe works correctly.
524 pipe_works=no
525@@ -7340,6 +7659,18 @@ _LT_EOF
526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
528 cat <<_LT_EOF > conftest.$ac_ext
529+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
530+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
531+/* DATA imports from DLLs on WIN32 con't be const, because runtime
532+ relocations are performed -- see ld's documentation on pseudo-relocs. */
533+# define LT_DLSYM_CONST
534+#elif defined(__osf__)
535+/* This system does not cope well with relocations in const data. */
536+# define LT_DLSYM_CONST
537+#else
538+# define LT_DLSYM_CONST const
539+#endif
540+
541 #ifdef __cplusplus
542 extern "C" {
543 #endif
544@@ -7351,7 +7682,7 @@ _LT_EOF
545 cat <<_LT_EOF >> conftest.$ac_ext
546
547 /* The mapping between symbol names and symbols. */
548-const struct {
549+LT_DLSYM_CONST struct {
550 const char *name;
551 void *address;
552 }
553@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() {
554 _LT_EOF
555 # Now try linking the two files.
556 mv conftest.$ac_objext conftstm.$ac_objext
557- lt_save_LIBS="$LIBS"
558- lt_save_CFLAGS="$CFLAGS"
559+ lt_globsym_save_LIBS=$LIBS
560+ lt_globsym_save_CFLAGS=$CFLAGS
561 LIBS="conftstm.$ac_objext"
562 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
563 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
564@@ -7388,8 +7719,8 @@ _LT_EOF
565 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
566 pipe_works=yes
567 fi
568- LIBS="$lt_save_LIBS"
569- CFLAGS="$lt_save_CFLAGS"
570+ LIBS=$lt_globsym_save_LIBS
571+ CFLAGS=$lt_globsym_save_CFLAGS
572 else
573 echo "cannot find nm_test_func in $nlist" >&5
574 fi
575@@ -7426,6 +7757,16 @@ else
576 $as_echo "ok" >&6; }
577 fi
578
579+# Response file support.
580+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
581+ nm_file_list_spec='@'
582+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
583+ nm_file_list_spec='@'
584+fi
585+
586+
587+
588+
589
590
591
592@@ -7442,6 +7783,45 @@ fi
593
594
595
596+
597+
598+
599+
600+
601+
602+
603+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
604+$as_echo_n "checking for sysroot... " >&6; }
605+
606+# Check whether --with-libtool-sysroot was given.
607+if test "${with_libtool_sysroot+set}" = set; then :
608+ withval=$with_libtool_sysroot;
609+else
610+ with_libtool_sysroot=no
611+fi
612+
613+
614+lt_sysroot=
615+case ${with_libtool_sysroot} in #(
616+ yes)
617+ if test "$GCC" = yes; then
618+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
619+ fi
620+ ;; #(
621+ /*)
622+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
623+ ;; #(
624+ no|'')
625+ ;; #(
626+ *)
627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
628+$as_echo "${with_libtool_sysroot}" >&6; }
629+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
630+ ;;
631+esac
632+
633+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
634+$as_echo "${lt_sysroot:-no}" >&6; }
635
636
637
638@@ -7653,6 +8033,123 @@ esac
639
640 need_locks="$enable_libtool_lock"
641
642+if test -n "$ac_tool_prefix"; then
643+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
644+set dummy ${ac_tool_prefix}mt; ac_word=$2
645+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
646+$as_echo_n "checking for $ac_word... " >&6; }
647+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
648+ $as_echo_n "(cached) " >&6
649+else
650+ if test -n "$MANIFEST_TOOL"; then
651+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
652+else
653+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
654+for as_dir in $PATH
655+do
656+ IFS=$as_save_IFS
657+ test -z "$as_dir" && as_dir=.
658+ for ac_exec_ext in '' $ac_executable_extensions; do
659+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
660+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
661+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
662+ break 2
663+ fi
664+done
665+ done
666+IFS=$as_save_IFS
667+
668+fi
669+fi
670+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
671+if test -n "$MANIFEST_TOOL"; then
672+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
673+$as_echo "$MANIFEST_TOOL" >&6; }
674+else
675+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
676+$as_echo "no" >&6; }
677+fi
678+
679+
680+fi
681+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
682+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
683+ # Extract the first word of "mt", so it can be a program name with args.
684+set dummy mt; ac_word=$2
685+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
686+$as_echo_n "checking for $ac_word... " >&6; }
687+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
688+ $as_echo_n "(cached) " >&6
689+else
690+ if test -n "$ac_ct_MANIFEST_TOOL"; then
691+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
692+else
693+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
694+for as_dir in $PATH
695+do
696+ IFS=$as_save_IFS
697+ test -z "$as_dir" && as_dir=.
698+ for ac_exec_ext in '' $ac_executable_extensions; do
699+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
700+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
701+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
702+ break 2
703+ fi
704+done
705+ done
706+IFS=$as_save_IFS
707+
708+fi
709+fi
710+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
711+if test -n "$ac_ct_MANIFEST_TOOL"; then
712+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
713+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
714+else
715+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
716+$as_echo "no" >&6; }
717+fi
718+
719+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
720+ MANIFEST_TOOL=":"
721+ else
722+ case $cross_compiling:$ac_tool_warned in
723+yes:)
724+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
725+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
726+ac_tool_warned=yes ;;
727+esac
728+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
729+ fi
730+else
731+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
732+fi
733+
734+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
735+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
736+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
737+if ${lt_cv_path_mainfest_tool+:} false; then :
738+ $as_echo_n "(cached) " >&6
739+else
740+ lt_cv_path_mainfest_tool=no
741+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
742+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
743+ cat conftest.err >&5
744+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
745+ lt_cv_path_mainfest_tool=yes
746+ fi
747+ rm -f conftest*
748+fi
749+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
750+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
751+if test "x$lt_cv_path_mainfest_tool" != xyes; then
752+ MANIFEST_TOOL=:
753+fi
754+
755+
756+
757+
758+
759
760 case $host_os in
761 rhapsody* | darwin*)
762@@ -8216,6 +8713,8 @@ _LT_EOF
763 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
764 echo "$AR cru libconftest.a conftest.o" >&5
765 $AR cru libconftest.a conftest.o 2>&5
766+ echo "$RANLIB libconftest.a" >&5
767+ $RANLIB libconftest.a 2>&5
768 cat > conftest.c << _LT_EOF
769 int main() { return 0;}
770 _LT_EOF
771@@ -8380,7 +8879,8 @@ fi
772 LIBTOOL_DEPS="$ltmain"
773
774 # Always use our own libtool.
775-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
776+LIBTOOL='$(SHELL) $(top_builddir)'
777+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
778
779
780
781@@ -8469,7 +8969,7 @@ aix3*)
782 esac
783
784 # Global variables:
785-ofile=libtool
786+ofile=${host_alias}-libtool
787 can_build_shared=yes
788
789 # All known linkers require a `.a' archive for static linking (except MSVC,
790@@ -8767,8 +9267,6 @@ fi
791 lt_prog_compiler_pic=
792 lt_prog_compiler_static=
793
794-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
795-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
796
797 if test "$GCC" = yes; then
798 lt_prog_compiler_wl='-Wl,'
799@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
800 lt_prog_compiler_pic='--shared'
801 lt_prog_compiler_static='--static'
802 ;;
803+ nagfor*)
804+ # NAG Fortran compiler
805+ lt_prog_compiler_wl='-Wl,-Wl,,'
806+ lt_prog_compiler_pic='-PIC'
807+ lt_prog_compiler_static='-Bstatic'
808+ ;;
809 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
810 # Portland Group compilers (*not* the Pentium gcc compiler,
811 # which looks to be a dead project)
812@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
813 lt_prog_compiler_pic='-KPIC'
814 lt_prog_compiler_static='-Bstatic'
815 case $cc_basename in
816- f77* | f90* | f95*)
817+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
818 lt_prog_compiler_wl='-Qoption ld ';;
819 *)
820 lt_prog_compiler_wl='-Wl,';;
821@@ -9053,13 +9557,17 @@ case $host_os in
822 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
823 ;;
824 esac
825-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
826-$as_echo "$lt_prog_compiler_pic" >&6; }
827-
828-
829-
830-
831
832+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
833+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
834+if ${lt_cv_prog_compiler_pic+:} false; then :
835+ $as_echo_n "(cached) " >&6
836+else
837+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
838+fi
839+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
840+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
841+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
842
843 #
844 # Check to make sure the PIC flag actually works.
845@@ -9120,6 +9628,11 @@ fi
846
847
848
849+
850+
851+
852+
853+
854 #
855 # Check to make sure the static flag actually works.
856 #
857@@ -9470,7 +9983,8 @@ _LT_EOF
858 allow_undefined_flag=unsupported
859 always_export_symbols=no
860 enable_shared_with_static_runtimes=yes
861- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
862+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
863+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
864
865 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
866 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
867@@ -9569,12 +10083,12 @@ _LT_EOF
868 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
869 hardcode_libdir_flag_spec=
870 hardcode_libdir_flag_spec_ld='-rpath $libdir'
871- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
872+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
873 if test "x$supports_anon_versioning" = xyes; then
874 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
875 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
876 echo "local: *; };" >> $output_objdir/$libname.ver~
877- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
878+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
879 fi
880 ;;
881 esac
882@@ -9588,8 +10102,8 @@ _LT_EOF
883 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
884 wlarc=
885 else
886- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
887- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
888+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
889+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
890 fi
891 ;;
892
893@@ -9607,8 +10121,8 @@ _LT_EOF
894
895 _LT_EOF
896 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
897- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
898- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
899+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
900+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
901 else
902 ld_shlibs=no
903 fi
904@@ -9654,8 +10168,8 @@ _LT_EOF
905
906 *)
907 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
908- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
909- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
910+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
911+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
912 else
913 ld_shlibs=no
914 fi
915@@ -9785,7 +10299,13 @@ _LT_EOF
916 allow_undefined_flag='-berok'
917 # Determine the default libpath from the value encoded in an
918 # empty executable.
919- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
920+ if test "${lt_cv_aix_libpath+set}" = set; then
921+ aix_libpath=$lt_cv_aix_libpath
922+else
923+ if ${lt_cv_aix_libpath_+:} false; then :
924+ $as_echo_n "(cached) " >&6
925+else
926+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
927 /* end confdefs.h. */
928
929 int
930@@ -9798,22 +10318,29 @@ main ()
931 _ACEOF
932 if ac_fn_c_try_link "$LINENO"; then :
933
934-lt_aix_libpath_sed='
935- /Import File Strings/,/^$/ {
936- /^0/ {
937- s/^0 *\(.*\)$/\1/
938- p
939- }
940- }'
941-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
942-# Check for a 64-bit object if we didn't find anything.
943-if test -z "$aix_libpath"; then
944- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
945-fi
946+ lt_aix_libpath_sed='
947+ /Import File Strings/,/^$/ {
948+ /^0/ {
949+ s/^0 *\([^ ]*\) *$/\1/
950+ p
951+ }
952+ }'
953+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
954+ # Check for a 64-bit object if we didn't find anything.
955+ if test -z "$lt_cv_aix_libpath_"; then
956+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
957+ fi
958 fi
959 rm -f core conftest.err conftest.$ac_objext \
960 conftest$ac_exeext conftest.$ac_ext
961-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
962+ if test -z "$lt_cv_aix_libpath_"; then
963+ lt_cv_aix_libpath_="/usr/lib:/lib"
964+ fi
965+
966+fi
967+
968+ aix_libpath=$lt_cv_aix_libpath_
969+fi
970
971 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
972 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
973@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
974 else
975 # Determine the default libpath from the value encoded in an
976 # empty executable.
977- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
978+ if test "${lt_cv_aix_libpath+set}" = set; then
979+ aix_libpath=$lt_cv_aix_libpath
980+else
981+ if ${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@@ -9838,22 +10371,29 @@ main ()
989 _ACEOF
990 if ac_fn_c_try_link "$LINENO"; then :
991
992-lt_aix_libpath_sed='
993- /Import File Strings/,/^$/ {
994- /^0/ {
995- s/^0 *\(.*\)$/\1/
996- p
997- }
998- }'
999-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1000-# Check for a 64-bit object if we didn't find anything.
1001-if test -z "$aix_libpath"; then
1002- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1003-fi
1004+ lt_aix_libpath_sed='
1005+ /Import File Strings/,/^$/ {
1006+ /^0/ {
1007+ s/^0 *\([^ ]*\) *$/\1/
1008+ p
1009+ }
1010+ }'
1011+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1012+ # Check for a 64-bit object if we didn't find anything.
1013+ if test -z "$lt_cv_aix_libpath_"; then
1014+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1015+ fi
1016 fi
1017 rm -f core conftest.err conftest.$ac_objext \
1018 conftest$ac_exeext conftest.$ac_ext
1019-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1020+ if test -z "$lt_cv_aix_libpath_"; then
1021+ lt_cv_aix_libpath_="/usr/lib:/lib"
1022+ fi
1023+
1024+fi
1025+
1026+ aix_libpath=$lt_cv_aix_libpath_
1027+fi
1028
1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1030 # Warning - without using the other run time loading flags,
1031@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 # Microsoft Visual C++.
1033 # hardcode_libdir_flag_spec is actually meaningless, as there is
1034 # no search path for DLLs.
1035- hardcode_libdir_flag_spec=' '
1036- allow_undefined_flag=unsupported
1037- # Tell ltmain to make .lib files, not .a files.
1038- libext=lib
1039- # Tell ltmain to make .dll files, not .so files.
1040- shrext_cmds=".dll"
1041- # FIXME: Setting linknames here is a bad hack.
1042- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1043- # The linker will automatically build a .lib file if we build a DLL.
1044- old_archive_from_new_cmds='true'
1045- # FIXME: Should let the user specify the lib program.
1046- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1047- fix_srcfile_path='`cygpath -w "$srcfile"`'
1048- enable_shared_with_static_runtimes=yes
1049+ case $cc_basename in
1050+ cl*)
1051+ # Native MSVC
1052+ hardcode_libdir_flag_spec=' '
1053+ allow_undefined_flag=unsupported
1054+ always_export_symbols=yes
1055+ file_list_spec='@'
1056+ # Tell ltmain to make .lib files, not .a files.
1057+ libext=lib
1058+ # Tell ltmain to make .dll files, not .so files.
1059+ shrext_cmds=".dll"
1060+ # FIXME: Setting linknames here is a bad hack.
1061+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1062+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1063+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1064+ else
1065+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1066+ fi~
1067+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1068+ linknames='
1069+ # The linker will not automatically build a static lib if we build a DLL.
1070+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1071+ enable_shared_with_static_runtimes=yes
1072+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1073+ # Don't use ranlib
1074+ old_postinstall_cmds='chmod 644 $oldlib'
1075+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1076+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1077+ case $lt_outputfile in
1078+ *.exe|*.EXE) ;;
1079+ *)
1080+ lt_outputfile="$lt_outputfile.exe"
1081+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1082+ ;;
1083+ esac~
1084+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1085+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1086+ $RM "$lt_outputfile.manifest";
1087+ fi'
1088+ ;;
1089+ *)
1090+ # Assume MSVC wrapper
1091+ hardcode_libdir_flag_spec=' '
1092+ allow_undefined_flag=unsupported
1093+ # Tell ltmain to make .lib files, not .a files.
1094+ libext=lib
1095+ # Tell ltmain to make .dll files, not .so files.
1096+ shrext_cmds=".dll"
1097+ # FIXME: Setting linknames here is a bad hack.
1098+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1099+ # The linker will automatically build a .lib file if we build a DLL.
1100+ old_archive_from_new_cmds='true'
1101+ # FIXME: Should let the user specify the lib program.
1102+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1103+ enable_shared_with_static_runtimes=yes
1104+ ;;
1105+ esac
1106 ;;
1107
1108 darwin* | rhapsody*)
1109@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1110
1111 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1112 freebsd* | dragonfly*)
1113- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1114+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1115 hardcode_libdir_flag_spec='-R$libdir'
1116 hardcode_direct=yes
1117 hardcode_shlibpath_var=no
1118@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1119
1120 hpux9*)
1121 if test "$GCC" = yes; then
1122- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1123+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1124 else
1125 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1126 fi
1127@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1128
1129 hpux10*)
1130 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1131- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1132+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1133 else
1134 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1135 fi
1136@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1137 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1138 ;;
1139 ia64*)
1140- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1141+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1142 ;;
1143 *)
1144- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1145+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1146 ;;
1147 esac
1148 else
1149@@ -10102,23 +10685,36 @@ fi
1150
1151 irix5* | irix6* | nonstopux*)
1152 if test "$GCC" = yes; then
1153- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1154+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1155 # Try to use the -exported_symbol ld option, if it does not
1156 # work, assume that -exports_file does not work either and
1157 # implicitly export all symbols.
1158- save_LDFLAGS="$LDFLAGS"
1159- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1160- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1161+ # This should be the same for all languages, so no per-tag cache variable.
1162+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1163+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1164+if ${lt_cv_irix_exported_symbol+:} false; then :
1165+ $as_echo_n "(cached) " >&6
1166+else
1167+ save_LDFLAGS="$LDFLAGS"
1168+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1169+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1170 /* end confdefs.h. */
1171-int foo(void) {}
1172+int foo (void) { return 0; }
1173 _ACEOF
1174 if ac_fn_c_try_link "$LINENO"; then :
1175- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
1176-
1177+ lt_cv_irix_exported_symbol=yes
1178+else
1179+ lt_cv_irix_exported_symbol=no
1180 fi
1181 rm -f core conftest.err conftest.$ac_objext \
1182 conftest$ac_exeext conftest.$ac_ext
1183- LDFLAGS="$save_LDFLAGS"
1184+ LDFLAGS="$save_LDFLAGS"
1185+fi
1186+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1187+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1188+ if test "$lt_cv_irix_exported_symbol" = yes; then
1189+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
1190+ fi
1191 else
1192 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1193 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1194@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \
1195 osf4* | osf5*) # as osf3* with the addition of -msym flag
1196 if test "$GCC" = yes; then
1197 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1198- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1199+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1200 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1201 else
1202 allow_undefined_flag=' -expect_unresolved \*'
1203@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \
1204 no_undefined_flag=' -z defs'
1205 if test "$GCC" = yes; then
1206 wlarc='${wl}'
1207- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1208+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1209 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1210- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1211+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1212 else
1213 case `$CC -V 2>&1` in
1214 *"Compilers 5.0"*)
1215@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1216 need_version=no
1217 need_lib_prefix=no
1218
1219- case $GCC,$host_os in
1220- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1221+ case $GCC,$cc_basename in
1222+ yes,*)
1223+ # gcc
1224 library_names_spec='$libname.dll.a'
1225 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1226 postinstall_cmds='base_file=`basename \${file}`~
1227@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1228 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1229 ;;
1230 esac
1231+ dynamic_linker='Win32 ld.exe'
1232+ ;;
1233+
1234+ *,cl*)
1235+ # Native MSVC
1236+ libname_spec='$name'
1237+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1238+ library_names_spec='${libname}.dll.lib'
1239+
1240+ case $build_os in
1241+ mingw*)
1242+ sys_lib_search_path_spec=
1243+ lt_save_ifs=$IFS
1244+ IFS=';'
1245+ for lt_path in $LIB
1246+ do
1247+ IFS=$lt_save_ifs
1248+ # Let DOS variable expansion print the short 8.3 style file name.
1249+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1250+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1251+ done
1252+ IFS=$lt_save_ifs
1253+ # Convert to MSYS style.
1254+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1255+ ;;
1256+ cygwin*)
1257+ # Convert to unix form, then to dos form, then back to unix form
1258+ # but this time dos style (no spaces!) so that the unix form looks
1259+ # like /cygdrive/c/PROGRA~1:/cygdr...
1260+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1261+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1262+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1263+ ;;
1264+ *)
1265+ sys_lib_search_path_spec="$LIB"
1266+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1267+ # It is most probably a Windows format PATH.
1268+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1269+ else
1270+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1271+ fi
1272+ # FIXME: find the short name or the path components, as spaces are
1273+ # common. (e.g. "Program Files" -> "PROGRA~1")
1274+ ;;
1275+ esac
1276+
1277+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1278+ postinstall_cmds='base_file=`basename \${file}`~
1279+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1280+ dldir=$destdir/`dirname \$dlpath`~
1281+ test -d \$dldir || mkdir -p \$dldir~
1282+ $install_prog $dir/$dlname \$dldir/$dlname'
1283+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1284+ dlpath=$dir/\$dldll~
1285+ $RM \$dlpath'
1286+ shlibpath_overrides_runpath=yes
1287+ dynamic_linker='Win32 link.exe'
1288 ;;
1289
1290 *)
1291+ # Assume MSVC wrapper
1292 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1293+ dynamic_linker='Win32 ld.exe'
1294 ;;
1295 esac
1296- dynamic_linker='Win32 ld.exe'
1297 # FIXME: first we should search . and the directory the executable is in
1298 shlibpath_var=PATH
1299 ;;
1300@@ -10932,7 +11587,7 @@ haiku*)
1301 soname_spec='${libname}${release}${shared_ext}$major'
1302 shlibpath_var=LIBRARY_PATH
1303 shlibpath_overrides_runpath=yes
1304- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1305+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1306 hardcode_into_libs=yes
1307 ;;
1308
1309@@ -11728,7 +12383,7 @@ else
1310 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1311 lt_status=$lt_dlunknown
1312 cat > conftest.$ac_ext <<_LT_EOF
1313-#line 11731 "configure"
1314+#line $LINENO "configure"
1315 #include "confdefs.h"
1316
1317 #if HAVE_DLFCN_H
1318@@ -11772,10 +12427,10 @@ else
1319 /* When -fvisbility=hidden is used, assume the code has been annotated
1320 correspondingly for the symbols needed. */
1321 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1322-void fnord () __attribute__((visibility("default")));
1323+int fnord () __attribute__((visibility("default")));
1324 #endif
1325
1326-void fnord () { int i=42; }
1327+int fnord () { return 42; }
1328 int main ()
1329 {
1330 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1331@@ -11834,7 +12489,7 @@ else
1332 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1333 lt_status=$lt_dlunknown
1334 cat > conftest.$ac_ext <<_LT_EOF
1335-#line 11837 "configure"
1336+#line $LINENO "configure"
1337 #include "confdefs.h"
1338
1339 #if HAVE_DLFCN_H
1340@@ -11878,10 +12533,10 @@ else
1341 /* When -fvisbility=hidden is used, assume the code has been annotated
1342 correspondingly for the symbols needed. */
1343 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1344-void fnord () __attribute__((visibility("default")));
1345+int fnord () __attribute__((visibility("default")));
1346 #endif
1347
1348-void fnord () { int i=42; }
1349+int fnord () { return 42; }
1350 int main ()
1351 {
1352 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1353@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS=
1354 if test "$enable_shared" = "yes"; then
1355 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1356 if test -n "$x"; then
1357- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1358+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1359 fi
1360
1361 case "${host}" in
1362@@ -17176,13 +17831,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1363 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1364 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1365 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1366+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1367+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1368 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1369 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1370 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1371 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1372 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1373+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1374+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1375+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1376+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1377 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1378 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1379+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1380 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1381 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1382 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1383@@ -17197,14 +17859,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1384 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1385 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1386 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"`'
1387+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1388+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1389 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1390 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1391 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1392-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1393 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1394+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1395 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1396 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1397 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1398+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1399 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1400 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1401 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1402@@ -17237,12 +17902,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1403 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1404 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1405 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1406-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1407 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1408 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1409 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1410 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1411 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1412+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1413 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1414 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1415 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1416@@ -17297,8 +17962,13 @@ reload_flag \
1417 OBJDUMP \
1418 deplibs_check_method \
1419 file_magic_cmd \
1420+file_magic_glob \
1421+want_nocaseglob \
1422+DLLTOOL \
1423+sharedlib_from_linklib_cmd \
1424 AR \
1425 AR_FLAGS \
1426+archiver_list_spec \
1427 STRIP \
1428 RANLIB \
1429 CC \
1430@@ -17308,12 +17978,14 @@ lt_cv_sys_global_symbol_pipe \
1431 lt_cv_sys_global_symbol_to_cdecl \
1432 lt_cv_sys_global_symbol_to_c_name_address \
1433 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1434+nm_file_list_spec \
1435 lt_prog_compiler_no_builtin_flag \
1436-lt_prog_compiler_wl \
1437 lt_prog_compiler_pic \
1438+lt_prog_compiler_wl \
1439 lt_prog_compiler_static \
1440 lt_cv_prog_compiler_c_o \
1441 need_locks \
1442+MANIFEST_TOOL \
1443 DSYMUTIL \
1444 NMEDIT \
1445 LIPO \
1446@@ -17329,7 +18001,6 @@ no_undefined_flag \
1447 hardcode_libdir_flag_spec \
1448 hardcode_libdir_flag_spec_ld \
1449 hardcode_libdir_separator \
1450-fix_srcfile_path \
1451 exclude_expsyms \
1452 include_expsyms \
1453 file_list_spec \
1454@@ -17365,6 +18036,7 @@ module_cmds \
1455 module_expsym_cmds \
1456 export_symbols_cmds \
1457 prelink_cmds \
1458+postlink_cmds \
1459 postinstall_cmds \
1460 postuninstall_cmds \
1461 finish_cmds \
1462@@ -18153,7 +18825,8 @@ $as_echo X"$file" |
1463 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1464 #
1465 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1466-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1467+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1468+# Inc.
1469 # Written by Gordon Matzigkeit, 1996
1470 #
1471 # This file is part of GNU Libtool.
1472@@ -18256,19 +18929,42 @@ SP2NL=$lt_lt_SP2NL
1473 # turn newlines into spaces.
1474 NL2SP=$lt_lt_NL2SP
1475
1476+# convert \$build file names to \$host format.
1477+to_host_file_cmd=$lt_cv_to_host_file_cmd
1478+
1479+# convert \$build files to toolchain format.
1480+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1481+
1482 # An object symbol dumper.
1483 OBJDUMP=$lt_OBJDUMP
1484
1485 # Method to check whether dependent libraries are shared objects.
1486 deplibs_check_method=$lt_deplibs_check_method
1487
1488-# Command to use when deplibs_check_method == "file_magic".
1489+# Command to use when deplibs_check_method = "file_magic".
1490 file_magic_cmd=$lt_file_magic_cmd
1491
1492+# How to find potential files when deplibs_check_method = "file_magic".
1493+file_magic_glob=$lt_file_magic_glob
1494+
1495+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1496+want_nocaseglob=$lt_want_nocaseglob
1497+
1498+# DLL creation program.
1499+DLLTOOL=$lt_DLLTOOL
1500+
1501+# Command to associate shared and link libraries.
1502+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1503+
1504 # The archiver.
1505 AR=$lt_AR
1506+
1507+# Flags to create an archive.
1508 AR_FLAGS=$lt_AR_FLAGS
1509
1510+# How to feed a file listing to the archiver.
1511+archiver_list_spec=$lt_archiver_list_spec
1512+
1513 # A symbol stripping program.
1514 STRIP=$lt_STRIP
1515
1516@@ -18298,6 +18994,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1517 # Transform the output of nm in a C name address pair when lib prefix is needed.
1518 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1519
1520+# Specify filename containing input files for \$NM.
1521+nm_file_list_spec=$lt_nm_file_list_spec
1522+
1523+# The root where to search for dependent libraries,and in which our libraries should be installed.
1524+lt_sysroot=$lt_sysroot
1525+
1526 # The name of the directory that contains temporary libtool files.
1527 objdir=$objdir
1528
1529@@ -18307,6 +19009,9 @@ MAGIC_CMD=$MAGIC_CMD
1530 # Must we lock files when doing compilation?
1531 need_locks=$lt_need_locks
1532
1533+# Manifest tool.
1534+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1535+
1536 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1537 DSYMUTIL=$lt_DSYMUTIL
1538
1539@@ -18421,12 +19126,12 @@ with_gcc=$GCC
1540 # Compiler flag to turn off builtin functions.
1541 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1542
1543-# How to pass a linker flag through the compiler.
1544-wl=$lt_lt_prog_compiler_wl
1545-
1546 # Additional compiler flags for building library objects.
1547 pic_flag=$lt_lt_prog_compiler_pic
1548
1549+# How to pass a linker flag through the compiler.
1550+wl=$lt_lt_prog_compiler_wl
1551+
1552 # Compiler flag to prevent dynamic linking.
1553 link_static_flag=$lt_lt_prog_compiler_static
1554
1555@@ -18513,9 +19218,6 @@ inherit_rpath=$inherit_rpath
1556 # Whether libtool must link a program against all its dependency libraries.
1557 link_all_deplibs=$link_all_deplibs
1558
1559-# Fix the shell variable \$srcfile for the compiler.
1560-fix_srcfile_path=$lt_fix_srcfile_path
1561-
1562 # Set to "yes" if exported symbols are required.
1563 always_export_symbols=$always_export_symbols
1564
1565@@ -18531,6 +19233,9 @@ include_expsyms=$lt_include_expsyms
1566 # Commands necessary for linking programs (against libraries) with templates.
1567 prelink_cmds=$lt_prelink_cmds
1568
1569+# Commands necessary for finishing linking programs.
1570+postlink_cmds=$lt_postlink_cmds
1571+
1572 # Specify filename containing input files.
1573 file_list_spec=$lt_file_list_spec
1574
1575@@ -18563,210 +19268,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1576 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1577 # text mode, it properly converts lines to CR/LF. This bash problem
1578 # is reportedly fixed, but why not run on old versions too?
1579- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1580- || (rm -f "$cfgfile"; exit 1)
1581-
1582- case $xsi_shell in
1583- yes)
1584- cat << \_LT_EOF >> "$cfgfile"
1585-
1586-# func_dirname file append nondir_replacement
1587-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1588-# otherwise set result to NONDIR_REPLACEMENT.
1589-func_dirname ()
1590-{
1591- case ${1} in
1592- */*) func_dirname_result="${1%/*}${2}" ;;
1593- * ) func_dirname_result="${3}" ;;
1594- esac
1595-}
1596-
1597-# func_basename file
1598-func_basename ()
1599-{
1600- func_basename_result="${1##*/}"
1601-}
1602-
1603-# func_dirname_and_basename file append nondir_replacement
1604-# perform func_basename and func_dirname in a single function
1605-# call:
1606-# dirname: Compute the dirname of FILE. If nonempty,
1607-# add APPEND to the result, otherwise set result
1608-# to NONDIR_REPLACEMENT.
1609-# value returned in "$func_dirname_result"
1610-# basename: Compute filename of FILE.
1611-# value retuned in "$func_basename_result"
1612-# Implementation must be kept synchronized with func_dirname
1613-# and func_basename. For efficiency, we do not delegate to
1614-# those functions but instead duplicate the functionality here.
1615-func_dirname_and_basename ()
1616-{
1617- case ${1} in
1618- */*) func_dirname_result="${1%/*}${2}" ;;
1619- * ) func_dirname_result="${3}" ;;
1620- esac
1621- func_basename_result="${1##*/}"
1622-}
1623-
1624-# func_stripname prefix suffix name
1625-# strip PREFIX and SUFFIX off of NAME.
1626-# PREFIX and SUFFIX must not contain globbing or regex special
1627-# characters, hashes, percent signs, but SUFFIX may contain a leading
1628-# dot (in which case that matches only a dot).
1629-func_stripname ()
1630-{
1631- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1632- # positional parameters, so assign one to ordinary parameter first.
1633- func_stripname_result=${3}
1634- func_stripname_result=${func_stripname_result#"${1}"}
1635- func_stripname_result=${func_stripname_result%"${2}"}
1636-}
1637-
1638-# func_opt_split
1639-func_opt_split ()
1640-{
1641- func_opt_split_opt=${1%%=*}
1642- func_opt_split_arg=${1#*=}
1643-}
1644-
1645-# func_lo2o object
1646-func_lo2o ()
1647-{
1648- case ${1} in
1649- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1650- *) func_lo2o_result=${1} ;;
1651- esac
1652-}
1653-
1654-# func_xform libobj-or-source
1655-func_xform ()
1656-{
1657- func_xform_result=${1%.*}.lo
1658-}
1659-
1660-# func_arith arithmetic-term...
1661-func_arith ()
1662-{
1663- func_arith_result=$(( $* ))
1664-}
1665-
1666-# func_len string
1667-# STRING may not start with a hyphen.
1668-func_len ()
1669-{
1670- func_len_result=${#1}
1671-}
1672-
1673-_LT_EOF
1674- ;;
1675- *) # Bourne compatible functions.
1676- cat << \_LT_EOF >> "$cfgfile"
1677-
1678-# func_dirname file append nondir_replacement
1679-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1680-# otherwise set result to NONDIR_REPLACEMENT.
1681-func_dirname ()
1682-{
1683- # Extract subdirectory from the argument.
1684- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1685- if test "X$func_dirname_result" = "X${1}"; then
1686- func_dirname_result="${3}"
1687- else
1688- func_dirname_result="$func_dirname_result${2}"
1689- fi
1690-}
1691-
1692-# func_basename file
1693-func_basename ()
1694-{
1695- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1696-}
1697-
1698-
1699-# func_stripname prefix suffix name
1700-# strip PREFIX and SUFFIX off of NAME.
1701-# PREFIX and SUFFIX must not contain globbing or regex special
1702-# characters, hashes, percent signs, but SUFFIX may contain a leading
1703-# dot (in which case that matches only a dot).
1704-# func_strip_suffix prefix name
1705-func_stripname ()
1706-{
1707- case ${2} in
1708- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1709- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1710- esac
1711-}
1712-
1713-# sed scripts:
1714-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1715-my_sed_long_arg='1s/^-[^=]*=//'
1716-
1717-# func_opt_split
1718-func_opt_split ()
1719-{
1720- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1721- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1722-}
1723-
1724-# func_lo2o object
1725-func_lo2o ()
1726-{
1727- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1728-}
1729-
1730-# func_xform libobj-or-source
1731-func_xform ()
1732-{
1733- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1734-}
1735-
1736-# func_arith arithmetic-term...
1737-func_arith ()
1738-{
1739- func_arith_result=`expr "$@"`
1740-}
1741-
1742-# func_len string
1743-# STRING may not start with a hyphen.
1744-func_len ()
1745-{
1746- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1747-}
1748-
1749-_LT_EOF
1750-esac
1751-
1752-case $lt_shell_append in
1753- yes)
1754- cat << \_LT_EOF >> "$cfgfile"
1755-
1756-# func_append var value
1757-# Append VALUE to the end of shell variable VAR.
1758-func_append ()
1759-{
1760- eval "$1+=\$2"
1761-}
1762-_LT_EOF
1763- ;;
1764- *)
1765- cat << \_LT_EOF >> "$cfgfile"
1766-
1767-# func_append var value
1768-# Append VALUE to the end of shell variable VAR.
1769-func_append ()
1770-{
1771- eval "$1=\$$1\$2"
1772-}
1773-
1774-_LT_EOF
1775- ;;
1776- esac
1777-
1778-
1779- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1780- || (rm -f "$cfgfile"; exit 1)
1781-
1782- mv -f "$cfgfile" "$ofile" ||
1783+ sed '$q' "$ltmain" >> "$cfgfile" \
1784+ || (rm -f "$cfgfile"; exit 1)
1785+
1786+ if test x"$xsi_shell" = xyes; then
1787+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1788+func_dirname ()\
1789+{\
1790+\ case ${1} in\
1791+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1792+\ * ) func_dirname_result="${3}" ;;\
1793+\ esac\
1794+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1795+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1796+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1797+test 0 -eq $? || _lt_function_replace_fail=:
1798+
1799+
1800+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1801+func_basename ()\
1802+{\
1803+\ func_basename_result="${1##*/}"\
1804+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1805+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1806+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1807+test 0 -eq $? || _lt_function_replace_fail=:
1808+
1809+
1810+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1811+func_dirname_and_basename ()\
1812+{\
1813+\ case ${1} in\
1814+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1815+\ * ) func_dirname_result="${3}" ;;\
1816+\ esac\
1817+\ func_basename_result="${1##*/}"\
1818+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1819+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1820+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1821+test 0 -eq $? || _lt_function_replace_fail=:
1822+
1823+
1824+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1825+func_stripname ()\
1826+{\
1827+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1828+\ # positional parameters, so assign one to ordinary parameter first.\
1829+\ func_stripname_result=${3}\
1830+\ func_stripname_result=${func_stripname_result#"${1}"}\
1831+\ func_stripname_result=${func_stripname_result%"${2}"}\
1832+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1833+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1834+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1835+test 0 -eq $? || _lt_function_replace_fail=:
1836+
1837+
1838+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1839+func_split_long_opt ()\
1840+{\
1841+\ func_split_long_opt_name=${1%%=*}\
1842+\ func_split_long_opt_arg=${1#*=}\
1843+} # Extended-shell func_split_long_opt 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_split_short_opt ()$/,/^} # func_split_short_opt /c\
1850+func_split_short_opt ()\
1851+{\
1852+\ func_split_short_opt_arg=${1#??}\
1853+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1854+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1855+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1856+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1857+test 0 -eq $? || _lt_function_replace_fail=:
1858+
1859+
1860+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1861+func_lo2o ()\
1862+{\
1863+\ case ${1} in\
1864+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1865+\ *) func_lo2o_result=${1} ;;\
1866+\ esac\
1867+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
1874+func_xform ()\
1875+{\
1876+ func_xform_result=${1%.*}.lo\
1877+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1878+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1879+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1880+test 0 -eq $? || _lt_function_replace_fail=:
1881+
1882+
1883+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1884+func_arith ()\
1885+{\
1886+ func_arith_result=$(( $* ))\
1887+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1888+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1889+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1890+test 0 -eq $? || _lt_function_replace_fail=:
1891+
1892+
1893+ sed -e '/^func_len ()$/,/^} # func_len /c\
1894+func_len ()\
1895+{\
1896+ func_len_result=${#1}\
1897+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1898+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1899+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1900+test 0 -eq $? || _lt_function_replace_fail=:
1901+
1902+fi
1903+
1904+if test x"$lt_shell_append" = xyes; then
1905+ sed -e '/^func_append ()$/,/^} # func_append /c\
1906+func_append ()\
1907+{\
1908+ eval "${1}+=\\${2}"\
1909+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1910+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1911+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1912+test 0 -eq $? || _lt_function_replace_fail=:
1913+
1914+
1915+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1916+func_append_quoted ()\
1917+{\
1918+\ func_quote_for_eval "${2}"\
1919+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1920+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1921+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1922+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1923+test 0 -eq $? || _lt_function_replace_fail=:
1924+
1925+
1926+ # Save a `func_append' function call where possible by direct use of '+='
1927+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1928+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1929+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1930+ test 0 -eq $? || _lt_function_replace_fail=:
1931+else
1932+ # Save a `func_append' function call even when '+=' is not available
1933+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1934+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1935+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1936+ test 0 -eq $? || _lt_function_replace_fail=:
1937+fi
1938+
1939+if test x"$_lt_function_replace_fail" = x":"; then
1940+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1941+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1942+fi
1943+
1944+
1945+ mv -f "$cfgfile" "$ofile" ||
1946 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1947 chmod +x "$ofile"
1948
20diff --git a/bfd/configure.ac b/bfd/configure.ac 1949diff --git a/bfd/configure.ac b/bfd/configure.ac
21index af4d4b8c13..a521738244 100644 1950index c5bfbd5d129..e666b1cc106 100644
22--- a/bfd/configure.ac 1951--- a/bfd/configure.ac
23+++ b/bfd/configure.ac 1952+++ b/bfd/configure.ac
24@@ -296,7 +296,7 @@ changequote(,)dnl 1953@@ -290,7 +290,7 @@ changequote(,)dnl
25 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1954 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
26 changequote([,])dnl 1955 changequote([,])dnl
27 if test -n "$x"; then 1956 if test -n "$x"; then
@@ -30,8 +1959,10282 @@ index af4d4b8c13..a521738244 100644
30 fi 1959 fi
31 1960
32 case "${host}" in 1961 case "${host}" in
1962diff --git a/binutils/configure b/binutils/configure
1963index a8dfd4bd68c..82316496953 100755
1964--- a/binutils/configure
1965+++ b/binutils/configure
1966@@ -690,8 +690,11 @@ OTOOL
1967 LIPO
1968 NMEDIT
1969 DSYMUTIL
1970+MANIFEST_TOOL
1971 RANLIB
1972+ac_ct_AR
1973 AR
1974+DLLTOOL
1975 OBJDUMP
1976 LN_S
1977 NM
1978@@ -808,6 +811,7 @@ enable_static
1979 with_pic
1980 enable_fast_install
1981 with_gnu_ld
1982+with_libtool_sysroot
1983 enable_libtool_lock
1984 enable_plugins
1985 enable_largefile
1986@@ -1485,6 +1489,8 @@ Optional Packages:
1987 --with-pic try to use only PIC/non-PIC objects [default=use
1988 both]
1989 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1990+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1991+ (or the compiler's sysroot if not specified).
1992 --with-debuginfod Enable debuginfo lookups with debuginfod
1993 (auto/yes/no)
1994 --with-system-zlib use installed libz
1995@@ -5461,8 +5467,8 @@ esac
1996
1997
1998
1999-macro_version='2.2.7a'
2000-macro_revision='1.3134'
2001+macro_version='2.4'
2002+macro_revision='1.3293'
2003
2004
2005
2006@@ -5502,7 +5508,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2008 $as_echo_n "checking how to print strings... " >&6; }
2009 # Test print first, because it will be a builtin if present.
2010-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2011+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
2012 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2013 ECHO='print -r --'
2014 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2015@@ -6188,8 +6194,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2016 # Try some XSI features
2017 xsi_shell=no
2018 ( _lt_dummy="a/b/c"
2019- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2020- = c,a/b,, \
2021+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2022+ = c,a/b,b/c, \
2023 && eval 'test $(( 1 + 1 )) -eq 2 \
2024 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2025 && xsi_shell=yes
2026@@ -6238,6 +6244,80 @@ esac
2027
2028
2029
2030+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2031+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2032+if ${lt_cv_to_host_file_cmd+:} false; then :
2033+ $as_echo_n "(cached) " >&6
2034+else
2035+ case $host in
2036+ *-*-mingw* )
2037+ case $build in
2038+ *-*-mingw* ) # actually msys
2039+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2040+ ;;
2041+ *-*-cygwin* )
2042+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2043+ ;;
2044+ * ) # otherwise, assume *nix
2045+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2046+ ;;
2047+ esac
2048+ ;;
2049+ *-*-cygwin* )
2050+ case $build in
2051+ *-*-mingw* ) # actually msys
2052+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2053+ ;;
2054+ *-*-cygwin* )
2055+ lt_cv_to_host_file_cmd=func_convert_file_noop
2056+ ;;
2057+ * ) # otherwise, assume *nix
2058+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2059+ ;;
2060+ esac
2061+ ;;
2062+ * ) # unhandled hosts (and "normal" native builds)
2063+ lt_cv_to_host_file_cmd=func_convert_file_noop
2064+ ;;
2065+esac
2066+
2067+fi
2068+
2069+to_host_file_cmd=$lt_cv_to_host_file_cmd
2070+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2071+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2072+
2073+
2074+
2075+
2076+
2077+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2078+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2079+if ${lt_cv_to_tool_file_cmd+:} false; then :
2080+ $as_echo_n "(cached) " >&6
2081+else
2082+ #assume ordinary cross tools, or native build.
2083+lt_cv_to_tool_file_cmd=func_convert_file_noop
2084+case $host in
2085+ *-*-mingw* )
2086+ case $build in
2087+ *-*-mingw* ) # actually msys
2088+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2089+ ;;
2090+ esac
2091+ ;;
2092+esac
2093+
2094+fi
2095+
2096+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2097+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2098+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2099+
2100+
2101+
2102+
2103+
2104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2105 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2106 if ${lt_cv_ld_reload_flag+:} false; then :
2107@@ -6254,6 +6334,11 @@ case $reload_flag in
2108 esac
2109 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2110 case $host_os in
2111+ cygwin* | mingw* | pw32* | cegcc*)
2112+ if test "$GCC" != yes; then
2113+ reload_cmds=false
2114+ fi
2115+ ;;
2116 darwin*)
2117 if test "$GCC" = yes; then
2118 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2119@@ -6422,7 +6507,8 @@ mingw* | pw32*)
2120 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2121 lt_cv_file_magic_cmd='func_win32_libid'
2122 else
2123- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2124+ # Keep this pattern in sync with the one in func_win32_libid.
2125+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2126 lt_cv_file_magic_cmd='$OBJDUMP -f'
2127 fi
2128 ;;
2129@@ -6576,6 +6662,21 @@ esac
2130 fi
2131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2132 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2133+
2134+file_magic_glob=
2135+want_nocaseglob=no
2136+if test "$build" = "$host"; then
2137+ case $host_os in
2138+ mingw* | pw32*)
2139+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2140+ want_nocaseglob=yes
2141+ else
2142+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2143+ fi
2144+ ;;
2145+ esac
2146+fi
2147+
2148 file_magic_cmd=$lt_cv_file_magic_cmd
2149 deplibs_check_method=$lt_cv_deplibs_check_method
2150 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2151@@ -6591,9 +6692,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152
2153
2154
2155+
2156+
2157+
2158+
2159+
2160+
2161+
2162+
2163+
2164+
2165+if test -n "$ac_tool_prefix"; then
2166+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2167+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2168+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2169+$as_echo_n "checking for $ac_word... " >&6; }
2170+if ${ac_cv_prog_DLLTOOL+:} false; then :
2171+ $as_echo_n "(cached) " >&6
2172+else
2173+ if test -n "$DLLTOOL"; then
2174+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2175+else
2176+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2177+for as_dir in $PATH
2178+do
2179+ IFS=$as_save_IFS
2180+ test -z "$as_dir" && as_dir=.
2181+ for ac_exec_ext in '' $ac_executable_extensions; do
2182+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2183+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2184+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2185+ break 2
2186+ fi
2187+done
2188+ done
2189+IFS=$as_save_IFS
2190+
2191+fi
2192+fi
2193+DLLTOOL=$ac_cv_prog_DLLTOOL
2194+if test -n "$DLLTOOL"; then
2195+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2196+$as_echo "$DLLTOOL" >&6; }
2197+else
2198+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2199+$as_echo "no" >&6; }
2200+fi
2201+
2202+
2203+fi
2204+if test -z "$ac_cv_prog_DLLTOOL"; then
2205+ ac_ct_DLLTOOL=$DLLTOOL
2206+ # Extract the first word of "dlltool", so it can be a program name with args.
2207+set dummy dlltool; ac_word=$2
2208+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2209+$as_echo_n "checking for $ac_word... " >&6; }
2210+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
2211+ $as_echo_n "(cached) " >&6
2212+else
2213+ if test -n "$ac_ct_DLLTOOL"; then
2214+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2215+else
2216+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2217+for as_dir in $PATH
2218+do
2219+ IFS=$as_save_IFS
2220+ test -z "$as_dir" && as_dir=.
2221+ for ac_exec_ext in '' $ac_executable_extensions; do
2222+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2223+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2224+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2225+ break 2
2226+ fi
2227+done
2228+ done
2229+IFS=$as_save_IFS
2230+
2231+fi
2232+fi
2233+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2234+if test -n "$ac_ct_DLLTOOL"; then
2235+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2236+$as_echo "$ac_ct_DLLTOOL" >&6; }
2237+else
2238+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2239+$as_echo "no" >&6; }
2240+fi
2241+
2242+ if test "x$ac_ct_DLLTOOL" = x; then
2243+ DLLTOOL="false"
2244+ else
2245+ case $cross_compiling:$ac_tool_warned in
2246+yes:)
2247+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2248+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2249+ac_tool_warned=yes ;;
2250+esac
2251+ DLLTOOL=$ac_ct_DLLTOOL
2252+ fi
2253+else
2254+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2255+fi
2256+
2257+test -z "$DLLTOOL" && DLLTOOL=dlltool
2258+
2259+
2260+
2261+
2262+
2263+
2264+
2265+
2266+
2267+
2268+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2269+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2270+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
2271+ $as_echo_n "(cached) " >&6
2272+else
2273+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2274+
2275+case $host_os in
2276+cygwin* | mingw* | pw32* | cegcc*)
2277+ # two different shell functions defined in ltmain.sh
2278+ # decide which to use based on capabilities of $DLLTOOL
2279+ case `$DLLTOOL --help 2>&1` in
2280+ *--identify-strict*)
2281+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2282+ ;;
2283+ *)
2284+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2285+ ;;
2286+ esac
2287+ ;;
2288+*)
2289+ # fallback: assume linklib IS sharedlib
2290+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2291+ ;;
2292+esac
2293+
2294+fi
2295+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2296+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2297+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2298+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2299+
2300+
2301+
2302+
2303+
2304+
2305+
2306 if test -n "$ac_tool_prefix"; then
2307- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2308-set dummy ${ac_tool_prefix}ar; ac_word=$2
2309+ for ac_prog in ar
2310+ do
2311+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2312+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2314 $as_echo_n "checking for $ac_word... " >&6; }
2315 if ${ac_cv_prog_AR+:} false; then :
2316@@ -6609,7 +6863,7 @@ do
2317 test -z "$as_dir" && as_dir=.
2318 for ac_exec_ext in '' $ac_executable_extensions; do
2319 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2320- ac_cv_prog_AR="${ac_tool_prefix}ar"
2321+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2322 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2323 break 2
2324 fi
2325@@ -6629,11 +6883,15 @@ $as_echo "no" >&6; }
2326 fi
2327
2328
2329+ test -n "$AR" && break
2330+ done
2331 fi
2332-if test -z "$ac_cv_prog_AR"; then
2333+if test -z "$AR"; then
2334 ac_ct_AR=$AR
2335- # Extract the first word of "ar", so it can be a program name with args.
2336-set dummy ar; ac_word=$2
2337+ for ac_prog in ar
2338+do
2339+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2340+set dummy $ac_prog; ac_word=$2
2341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2342 $as_echo_n "checking for $ac_word... " >&6; }
2343 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2344@@ -6649,7 +6907,7 @@ do
2345 test -z "$as_dir" && as_dir=.
2346 for ac_exec_ext in '' $ac_executable_extensions; do
2347 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2348- ac_cv_prog_ac_ct_AR="ar"
2349+ ac_cv_prog_ac_ct_AR="$ac_prog"
2350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2351 break 2
2352 fi
2353@@ -6668,6 +6926,10 @@ else
2354 $as_echo "no" >&6; }
2355 fi
2356
2357+
2358+ test -n "$ac_ct_AR" && break
2359+done
2360+
2361 if test "x$ac_ct_AR" = x; then
2362 AR="false"
2363 else
2364@@ -6679,12 +6941,10 @@ ac_tool_warned=yes ;;
2365 esac
2366 AR=$ac_ct_AR
2367 fi
2368-else
2369- AR="$ac_cv_prog_AR"
2370 fi
2371
2372-test -z "$AR" && AR=ar
2373-test -z "$AR_FLAGS" && AR_FLAGS=cru
2374+: ${AR=ar}
2375+: ${AR_FLAGS=cru}
2376
2377
2378
2379@@ -6696,6 +6956,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2380
2381
2382
2383+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2384+$as_echo_n "checking for archiver @FILE support... " >&6; }
2385+if ${lt_cv_ar_at_file+:} false; then :
2386+ $as_echo_n "(cached) " >&6
2387+else
2388+ lt_cv_ar_at_file=no
2389+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2390+/* end confdefs.h. */
2391+
2392+int
2393+main ()
2394+{
2395+
2396+ ;
2397+ return 0;
2398+}
2399+_ACEOF
2400+if ac_fn_c_try_compile "$LINENO"; then :
2401+ echo conftest.$ac_objext > conftest.lst
2402+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2403+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2404+ (eval $lt_ar_try) 2>&5
2405+ ac_status=$?
2406+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2407+ test $ac_status = 0; }
2408+ if test "$ac_status" -eq 0; then
2409+ # Ensure the archiver fails upon bogus file names.
2410+ rm -f conftest.$ac_objext libconftest.a
2411+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2412+ (eval $lt_ar_try) 2>&5
2413+ ac_status=$?
2414+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2415+ test $ac_status = 0; }
2416+ if test "$ac_status" -ne 0; then
2417+ lt_cv_ar_at_file=@
2418+ fi
2419+ fi
2420+ rm -f conftest.* libconftest.a
2421+
2422+fi
2423+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2424+
2425+fi
2426+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2427+$as_echo "$lt_cv_ar_at_file" >&6; }
2428+
2429+if test "x$lt_cv_ar_at_file" = xno; then
2430+ archiver_list_spec=
2431+else
2432+ archiver_list_spec=$lt_cv_ar_at_file
2433+fi
2434+
2435+
2436+
2437+
2438+
2439+
2440+
2441 if test -n "$ac_tool_prefix"; then
2442 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2443 set dummy ${ac_tool_prefix}strip; ac_word=$2
2444@@ -7030,8 +7348,8 @@ esac
2445 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2446
2447 # Transform an extracted symbol line into symbol name and symbol address
2448-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2449-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'"
2450+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2451+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'"
2452
2453 # Handle CRLF in mingw tool chain
2454 opt_cr=
2455@@ -7067,6 +7385,7 @@ for ac_symprfx in "" "_"; do
2456 else
2457 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2458 fi
2459+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2460
2461 # Check to see that the pipe works correctly.
2462 pipe_works=no
2463@@ -7108,6 +7427,18 @@ _LT_EOF
2464 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2465 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2466 cat <<_LT_EOF > conftest.$ac_ext
2467+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2468+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2469+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2470+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2471+# define LT_DLSYM_CONST
2472+#elif defined(__osf__)
2473+/* This system does not cope well with relocations in const data. */
2474+# define LT_DLSYM_CONST
2475+#else
2476+# define LT_DLSYM_CONST const
2477+#endif
2478+
2479 #ifdef __cplusplus
2480 extern "C" {
2481 #endif
2482@@ -7119,7 +7450,7 @@ _LT_EOF
2483 cat <<_LT_EOF >> conftest.$ac_ext
2484
2485 /* The mapping between symbol names and symbols. */
2486-const struct {
2487+LT_DLSYM_CONST struct {
2488 const char *name;
2489 void *address;
2490 }
2491@@ -7145,8 +7476,8 @@ static const void *lt_preloaded_setup() {
2492 _LT_EOF
2493 # Now try linking the two files.
2494 mv conftest.$ac_objext conftstm.$ac_objext
2495- lt_save_LIBS="$LIBS"
2496- lt_save_CFLAGS="$CFLAGS"
2497+ lt_globsym_save_LIBS=$LIBS
2498+ lt_globsym_save_CFLAGS=$CFLAGS
2499 LIBS="conftstm.$ac_objext"
2500 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2502@@ -7156,8 +7487,8 @@ _LT_EOF
2503 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2504 pipe_works=yes
2505 fi
2506- LIBS="$lt_save_LIBS"
2507- CFLAGS="$lt_save_CFLAGS"
2508+ LIBS=$lt_globsym_save_LIBS
2509+ CFLAGS=$lt_globsym_save_CFLAGS
2510 else
2511 echo "cannot find nm_test_func in $nlist" >&5
2512 fi
2513@@ -7194,6 +7525,21 @@ else
2514 $as_echo "ok" >&6; }
2515 fi
2516
2517+# Response file support.
2518+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2519+ nm_file_list_spec='@'
2520+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2521+ nm_file_list_spec='@'
2522+fi
2523+
2524+
2525+
2526+
2527+
2528+
2529+
2530+
2531+
2532
2533
2534
2535@@ -7210,6 +7556,40 @@ fi
2536
2537
2538
2539+
2540+
2541+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2542+$as_echo_n "checking for sysroot... " >&6; }
2543+
2544+# Check whether --with-libtool-sysroot was given.
2545+if test "${with_libtool_sysroot+set}" = set; then :
2546+ withval=$with_libtool_sysroot;
2547+else
2548+ with_libtool_sysroot=no
2549+fi
2550+
2551+
2552+lt_sysroot=
2553+case ${with_libtool_sysroot} in #(
2554+ yes)
2555+ if test "$GCC" = yes; then
2556+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2557+ fi
2558+ ;; #(
2559+ /*)
2560+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2561+ ;; #(
2562+ no|'')
2563+ ;; #(
2564+ *)
2565+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2566+$as_echo "${with_libtool_sysroot}" >&6; }
2567+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
2568+ ;;
2569+esac
2570+
2571+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2572+$as_echo "${lt_sysroot:-no}" >&6; }
2573
2574
2575
2576@@ -7421,6 +7801,123 @@ esac
2577
2578 need_locks="$enable_libtool_lock"
2579
2580+if test -n "$ac_tool_prefix"; then
2581+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2582+set dummy ${ac_tool_prefix}mt; ac_word=$2
2583+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2584+$as_echo_n "checking for $ac_word... " >&6; }
2585+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
2586+ $as_echo_n "(cached) " >&6
2587+else
2588+ if test -n "$MANIFEST_TOOL"; then
2589+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2590+else
2591+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2592+for as_dir in $PATH
2593+do
2594+ IFS=$as_save_IFS
2595+ test -z "$as_dir" && as_dir=.
2596+ for ac_exec_ext in '' $ac_executable_extensions; do
2597+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2598+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2599+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2600+ break 2
2601+ fi
2602+done
2603+ done
2604+IFS=$as_save_IFS
2605+
2606+fi
2607+fi
2608+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2609+if test -n "$MANIFEST_TOOL"; then
2610+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2611+$as_echo "$MANIFEST_TOOL" >&6; }
2612+else
2613+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2614+$as_echo "no" >&6; }
2615+fi
2616+
2617+
2618+fi
2619+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2620+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2621+ # Extract the first word of "mt", so it can be a program name with args.
2622+set dummy mt; ac_word=$2
2623+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2624+$as_echo_n "checking for $ac_word... " >&6; }
2625+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
2626+ $as_echo_n "(cached) " >&6
2627+else
2628+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2629+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2630+else
2631+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2632+for as_dir in $PATH
2633+do
2634+ IFS=$as_save_IFS
2635+ test -z "$as_dir" && as_dir=.
2636+ for ac_exec_ext in '' $ac_executable_extensions; do
2637+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2638+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2639+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2640+ break 2
2641+ fi
2642+done
2643+ done
2644+IFS=$as_save_IFS
2645+
2646+fi
2647+fi
2648+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2649+if test -n "$ac_ct_MANIFEST_TOOL"; then
2650+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2651+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2652+else
2653+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2654+$as_echo "no" >&6; }
2655+fi
2656+
2657+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2658+ MANIFEST_TOOL=":"
2659+ else
2660+ case $cross_compiling:$ac_tool_warned in
2661+yes:)
2662+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2663+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2664+ac_tool_warned=yes ;;
2665+esac
2666+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2667+ fi
2668+else
2669+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2670+fi
2671+
2672+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2673+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2674+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2675+if ${lt_cv_path_mainfest_tool+:} false; then :
2676+ $as_echo_n "(cached) " >&6
2677+else
2678+ lt_cv_path_mainfest_tool=no
2679+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2680+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2681+ cat conftest.err >&5
2682+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2683+ lt_cv_path_mainfest_tool=yes
2684+ fi
2685+ rm -f conftest*
2686+fi
2687+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2688+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2689+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2690+ MANIFEST_TOOL=:
2691+fi
2692+
2693+
2694+
2695+
2696+
2697
2698 case $host_os in
2699 rhapsody* | darwin*)
2700@@ -7984,6 +8481,8 @@ _LT_EOF
2701 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2702 echo "$AR cru libconftest.a conftest.o" >&5
2703 $AR cru libconftest.a conftest.o 2>&5
2704+ echo "$RANLIB libconftest.a" >&5
2705+ $RANLIB libconftest.a 2>&5
2706 cat > conftest.c << _LT_EOF
2707 int main() { return 0;}
2708 _LT_EOF
2709@@ -8179,7 +8678,8 @@ fi
2710 LIBTOOL_DEPS="$ltmain"
2711
2712 # Always use our own libtool.
2713-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2714+LIBTOOL='$(SHELL) $(top_builddir)'
2715+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2716
2717
2718
2719@@ -8268,7 +8768,7 @@ aix3*)
2720 esac
2721
2722 # Global variables:
2723-ofile=libtool
2724+ofile=${host_alias}-libtool
2725 can_build_shared=yes
2726
2727 # All known linkers require a `.a' archive for static linking (except MSVC,
2728@@ -8566,8 +9066,6 @@ fi
2729 lt_prog_compiler_pic=
2730 lt_prog_compiler_static=
2731
2732-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2733-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2734
2735 if test "$GCC" = yes; then
2736 lt_prog_compiler_wl='-Wl,'
2737@@ -8733,6 +9231,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2738 lt_prog_compiler_pic='--shared'
2739 lt_prog_compiler_static='--static'
2740 ;;
2741+ nagfor*)
2742+ # NAG Fortran compiler
2743+ lt_prog_compiler_wl='-Wl,-Wl,,'
2744+ lt_prog_compiler_pic='-PIC'
2745+ lt_prog_compiler_static='-Bstatic'
2746+ ;;
2747 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2748 # Portland Group compilers (*not* the Pentium gcc compiler,
2749 # which looks to be a dead project)
2750@@ -8795,7 +9299,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2751 lt_prog_compiler_pic='-KPIC'
2752 lt_prog_compiler_static='-Bstatic'
2753 case $cc_basename in
2754- f77* | f90* | f95*)
2755+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2756 lt_prog_compiler_wl='-Qoption ld ';;
2757 *)
2758 lt_prog_compiler_wl='-Wl,';;
2759@@ -8852,13 +9356,17 @@ case $host_os in
2760 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2761 ;;
2762 esac
2763-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2764-$as_echo "$lt_prog_compiler_pic" >&6; }
2765-
2766-
2767-
2768-
2769
2770+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2771+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2772+if ${lt_cv_prog_compiler_pic+:} false; then :
2773+ $as_echo_n "(cached) " >&6
2774+else
2775+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2776+fi
2777+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2778+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2779+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2780
2781 #
2782 # Check to make sure the PIC flag actually works.
2783@@ -8919,6 +9427,11 @@ fi
2784
2785
2786
2787+
2788+
2789+
2790+
2791+
2792 #
2793 # Check to make sure the static flag actually works.
2794 #
2795@@ -9269,7 +9782,8 @@ _LT_EOF
2796 allow_undefined_flag=unsupported
2797 always_export_symbols=no
2798 enable_shared_with_static_runtimes=yes
2799- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2800+ 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'
2801+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2802
2803 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2804 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2805@@ -9368,12 +9882,12 @@ _LT_EOF
2806 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2807 hardcode_libdir_flag_spec=
2808 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2809- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2810+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2811 if test "x$supports_anon_versioning" = xyes; then
2812 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2813 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2814 echo "local: *; };" >> $output_objdir/$libname.ver~
2815- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2816+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2817 fi
2818 ;;
2819 esac
2820@@ -9387,8 +9901,8 @@ _LT_EOF
2821 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2822 wlarc=
2823 else
2824- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2825- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2826+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2827+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2828 fi
2829 ;;
2830
2831@@ -9406,8 +9920,8 @@ _LT_EOF
2832
2833 _LT_EOF
2834 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2835- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2836- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2837+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2838+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2839 else
2840 ld_shlibs=no
2841 fi
2842@@ -9453,8 +9967,8 @@ _LT_EOF
2843
2844 *)
2845 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2846- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2847- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2848+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2849+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2850 else
2851 ld_shlibs=no
2852 fi
2853@@ -9584,7 +10098,13 @@ _LT_EOF
2854 allow_undefined_flag='-berok'
2855 # Determine the default libpath from the value encoded in an
2856 # empty executable.
2857- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2858+ if test "${lt_cv_aix_libpath+set}" = set; then
2859+ aix_libpath=$lt_cv_aix_libpath
2860+else
2861+ if ${lt_cv_aix_libpath_+:} false; then :
2862+ $as_echo_n "(cached) " >&6
2863+else
2864+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2865 /* end confdefs.h. */
2866
2867 int
2868@@ -9597,22 +10117,29 @@ main ()
2869 _ACEOF
2870 if ac_fn_c_try_link "$LINENO"; then :
2871
2872-lt_aix_libpath_sed='
2873- /Import File Strings/,/^$/ {
2874- /^0/ {
2875- s/^0 *\(.*\)$/\1/
2876- p
2877- }
2878- }'
2879-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2880-# Check for a 64-bit object if we didn't find anything.
2881-if test -z "$aix_libpath"; then
2882- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2883-fi
2884+ lt_aix_libpath_sed='
2885+ /Import File Strings/,/^$/ {
2886+ /^0/ {
2887+ s/^0 *\([^ ]*\) *$/\1/
2888+ p
2889+ }
2890+ }'
2891+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2892+ # Check for a 64-bit object if we didn't find anything.
2893+ if test -z "$lt_cv_aix_libpath_"; then
2894+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2895+ fi
2896 fi
2897 rm -f core conftest.err conftest.$ac_objext \
2898 conftest$ac_exeext conftest.$ac_ext
2899-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2900+ if test -z "$lt_cv_aix_libpath_"; then
2901+ lt_cv_aix_libpath_="/usr/lib:/lib"
2902+ fi
2903+
2904+fi
2905+
2906+ aix_libpath=$lt_cv_aix_libpath_
2907+fi
2908
2909 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2910 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"
2911@@ -9624,7 +10151,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2912 else
2913 # Determine the default libpath from the value encoded in an
2914 # empty executable.
2915- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2916+ if test "${lt_cv_aix_libpath+set}" = set; then
2917+ aix_libpath=$lt_cv_aix_libpath
2918+else
2919+ if ${lt_cv_aix_libpath_+:} false; then :
2920+ $as_echo_n "(cached) " >&6
2921+else
2922+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2923 /* end confdefs.h. */
2924
2925 int
2926@@ -9637,22 +10170,29 @@ main ()
2927 _ACEOF
2928 if ac_fn_c_try_link "$LINENO"; then :
2929
2930-lt_aix_libpath_sed='
2931- /Import File Strings/,/^$/ {
2932- /^0/ {
2933- s/^0 *\(.*\)$/\1/
2934- p
2935- }
2936- }'
2937-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2938-# Check for a 64-bit object if we didn't find anything.
2939-if test -z "$aix_libpath"; then
2940- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2941-fi
2942+ lt_aix_libpath_sed='
2943+ /Import File Strings/,/^$/ {
2944+ /^0/ {
2945+ s/^0 *\([^ ]*\) *$/\1/
2946+ p
2947+ }
2948+ }'
2949+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2950+ # Check for a 64-bit object if we didn't find anything.
2951+ if test -z "$lt_cv_aix_libpath_"; then
2952+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2953+ fi
2954 fi
2955 rm -f core conftest.err conftest.$ac_objext \
2956 conftest$ac_exeext conftest.$ac_ext
2957-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2958+ if test -z "$lt_cv_aix_libpath_"; then
2959+ lt_cv_aix_libpath_="/usr/lib:/lib"
2960+ fi
2961+
2962+fi
2963+
2964+ aix_libpath=$lt_cv_aix_libpath_
2965+fi
2966
2967 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2968 # Warning - without using the other run time loading flags,
2969@@ -9697,20 +10237,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2970 # Microsoft Visual C++.
2971 # hardcode_libdir_flag_spec is actually meaningless, as there is
2972 # no search path for DLLs.
2973- hardcode_libdir_flag_spec=' '
2974- allow_undefined_flag=unsupported
2975- # Tell ltmain to make .lib files, not .a files.
2976- libext=lib
2977- # Tell ltmain to make .dll files, not .so files.
2978- shrext_cmds=".dll"
2979- # FIXME: Setting linknames here is a bad hack.
2980- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2981- # The linker will automatically build a .lib file if we build a DLL.
2982- old_archive_from_new_cmds='true'
2983- # FIXME: Should let the user specify the lib program.
2984- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2985- fix_srcfile_path='`cygpath -w "$srcfile"`'
2986- enable_shared_with_static_runtimes=yes
2987+ case $cc_basename in
2988+ cl*)
2989+ # Native MSVC
2990+ hardcode_libdir_flag_spec=' '
2991+ allow_undefined_flag=unsupported
2992+ always_export_symbols=yes
2993+ file_list_spec='@'
2994+ # Tell ltmain to make .lib files, not .a files.
2995+ libext=lib
2996+ # Tell ltmain to make .dll files, not .so files.
2997+ shrext_cmds=".dll"
2998+ # FIXME: Setting linknames here is a bad hack.
2999+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
3000+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
3001+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
3002+ else
3003+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
3004+ fi~
3005+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
3006+ linknames='
3007+ # The linker will not automatically build a static lib if we build a DLL.
3008+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
3009+ enable_shared_with_static_runtimes=yes
3010+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
3011+ # Don't use ranlib
3012+ old_postinstall_cmds='chmod 644 $oldlib'
3013+ postlink_cmds='lt_outputfile="@OUTPUT@"~
3014+ lt_tool_outputfile="@TOOL_OUTPUT@"~
3015+ case $lt_outputfile in
3016+ *.exe|*.EXE) ;;
3017+ *)
3018+ lt_outputfile="$lt_outputfile.exe"
3019+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3020+ ;;
3021+ esac~
3022+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3023+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3024+ $RM "$lt_outputfile.manifest";
3025+ fi'
3026+ ;;
3027+ *)
3028+ # Assume MSVC wrapper
3029+ hardcode_libdir_flag_spec=' '
3030+ allow_undefined_flag=unsupported
3031+ # Tell ltmain to make .lib files, not .a files.
3032+ libext=lib
3033+ # Tell ltmain to make .dll files, not .so files.
3034+ shrext_cmds=".dll"
3035+ # FIXME: Setting linknames here is a bad hack.
3036+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3037+ # The linker will automatically build a .lib file if we build a DLL.
3038+ old_archive_from_new_cmds='true'
3039+ # FIXME: Should let the user specify the lib program.
3040+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3041+ enable_shared_with_static_runtimes=yes
3042+ ;;
3043+ esac
3044 ;;
3045
3046 darwin* | rhapsody*)
3047@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3048
3049 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3050 freebsd* | dragonfly*)
3051- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3052+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3053 hardcode_libdir_flag_spec='-R$libdir'
3054 hardcode_direct=yes
3055 hardcode_shlibpath_var=no
3056@@ -9779,7 +10362,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3057
3058 hpux9*)
3059 if test "$GCC" = yes; then
3060- 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'
3061+ 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'
3062 else
3063 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'
3064 fi
3065@@ -9795,7 +10378,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3066
3067 hpux10*)
3068 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3069- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3070+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3071 else
3072 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3073 fi
3074@@ -9819,10 +10402,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3075 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3076 ;;
3077 ia64*)
3078- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3079+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3080 ;;
3081 *)
3082- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3083+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3084 ;;
3085 esac
3086 else
3087@@ -9901,23 +10484,36 @@ fi
3088
3089 irix5* | irix6* | nonstopux*)
3090 if test "$GCC" = yes; then
3091- 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'
3092+ 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'
3093 # Try to use the -exported_symbol ld option, if it does not
3094 # work, assume that -exports_file does not work either and
3095 # implicitly export all symbols.
3096- save_LDFLAGS="$LDFLAGS"
3097- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3098- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3099+ # This should be the same for all languages, so no per-tag cache variable.
3100+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3101+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3102+if ${lt_cv_irix_exported_symbol+:} false; then :
3103+ $as_echo_n "(cached) " >&6
3104+else
3105+ save_LDFLAGS="$LDFLAGS"
3106+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3107+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3108 /* end confdefs.h. */
3109-int foo(void) {}
3110+int foo (void) { return 0; }
3111 _ACEOF
3112 if ac_fn_c_try_link "$LINENO"; then :
3113- 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'
3114-
3115+ lt_cv_irix_exported_symbol=yes
3116+else
3117+ lt_cv_irix_exported_symbol=no
3118 fi
3119 rm -f core conftest.err conftest.$ac_objext \
3120 conftest$ac_exeext conftest.$ac_ext
3121- LDFLAGS="$save_LDFLAGS"
3122+ LDFLAGS="$save_LDFLAGS"
3123+fi
3124+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3125+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3126+ if test "$lt_cv_irix_exported_symbol" = yes; then
3127+ 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'
3128+ fi
3129 else
3130 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'
3131 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'
3132@@ -10002,7 +10598,7 @@ rm -f core conftest.err conftest.$ac_objext \
3133 osf4* | osf5*) # as osf3* with the addition of -msym flag
3134 if test "$GCC" = yes; then
3135 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3136- 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'
3137+ 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'
3138 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3139 else
3140 allow_undefined_flag=' -expect_unresolved \*'
3141@@ -10021,9 +10617,9 @@ rm -f core conftest.err conftest.$ac_objext \
3142 no_undefined_flag=' -z defs'
3143 if test "$GCC" = yes; then
3144 wlarc='${wl}'
3145- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3146+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3147 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3148- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3149+ $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'
3150 else
3151 case `$CC -V 2>&1` in
3152 *"Compilers 5.0"*)
3153@@ -10599,8 +11195,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3154 need_version=no
3155 need_lib_prefix=no
3156
3157- case $GCC,$host_os in
3158- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3159+ case $GCC,$cc_basename in
3160+ yes,*)
3161+ # gcc
3162 library_names_spec='$libname.dll.a'
3163 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3164 postinstall_cmds='base_file=`basename \${file}`~
3165@@ -10633,13 +11230,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3166 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3167 ;;
3168 esac
3169+ dynamic_linker='Win32 ld.exe'
3170+ ;;
3171+
3172+ *,cl*)
3173+ # Native MSVC
3174+ libname_spec='$name'
3175+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3176+ library_names_spec='${libname}.dll.lib'
3177+
3178+ case $build_os in
3179+ mingw*)
3180+ sys_lib_search_path_spec=
3181+ lt_save_ifs=$IFS
3182+ IFS=';'
3183+ for lt_path in $LIB
3184+ do
3185+ IFS=$lt_save_ifs
3186+ # Let DOS variable expansion print the short 8.3 style file name.
3187+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3188+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3189+ done
3190+ IFS=$lt_save_ifs
3191+ # Convert to MSYS style.
3192+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3193+ ;;
3194+ cygwin*)
3195+ # Convert to unix form, then to dos form, then back to unix form
3196+ # but this time dos style (no spaces!) so that the unix form looks
3197+ # like /cygdrive/c/PROGRA~1:/cygdr...
3198+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3199+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3200+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3201+ ;;
3202+ *)
3203+ sys_lib_search_path_spec="$LIB"
3204+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3205+ # It is most probably a Windows format PATH.
3206+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3207+ else
3208+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3209+ fi
3210+ # FIXME: find the short name or the path components, as spaces are
3211+ # common. (e.g. "Program Files" -> "PROGRA~1")
3212+ ;;
3213+ esac
3214+
3215+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3216+ postinstall_cmds='base_file=`basename \${file}`~
3217+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3218+ dldir=$destdir/`dirname \$dlpath`~
3219+ test -d \$dldir || mkdir -p \$dldir~
3220+ $install_prog $dir/$dlname \$dldir/$dlname'
3221+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3222+ dlpath=$dir/\$dldll~
3223+ $RM \$dlpath'
3224+ shlibpath_overrides_runpath=yes
3225+ dynamic_linker='Win32 link.exe'
3226 ;;
3227
3228 *)
3229+ # Assume MSVC wrapper
3230 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3231+ dynamic_linker='Win32 ld.exe'
3232 ;;
3233 esac
3234- dynamic_linker='Win32 ld.exe'
3235 # FIXME: first we should search . and the directory the executable is in
3236 shlibpath_var=PATH
3237 ;;
3238@@ -10731,7 +11386,7 @@ haiku*)
3239 soname_spec='${libname}${release}${shared_ext}$major'
3240 shlibpath_var=LIBRARY_PATH
3241 shlibpath_overrides_runpath=yes
3242- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3243+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3244 hardcode_into_libs=yes
3245 ;;
3246
3247@@ -11527,7 +12182,7 @@ else
3248 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3249 lt_status=$lt_dlunknown
3250 cat > conftest.$ac_ext <<_LT_EOF
3251-#line 11530 "configure"
3252+#line $LINENO "configure"
3253 #include "confdefs.h"
3254
3255 #if HAVE_DLFCN_H
3256@@ -11571,10 +12226,10 @@ else
3257 /* When -fvisbility=hidden is used, assume the code has been annotated
3258 correspondingly for the symbols needed. */
3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3260-void fnord () __attribute__((visibility("default")));
3261+int fnord () __attribute__((visibility("default")));
3262 #endif
3263
3264-void fnord () { int i=42; }
3265+int fnord () { return 42; }
3266 int main ()
3267 {
3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3269@@ -11633,7 +12288,7 @@ else
3270 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3271 lt_status=$lt_dlunknown
3272 cat > conftest.$ac_ext <<_LT_EOF
3273-#line 11636 "configure"
3274+#line $LINENO "configure"
3275 #include "confdefs.h"
3276
3277 #if HAVE_DLFCN_H
3278@@ -11677,10 +12332,10 @@ else
3279 /* When -fvisbility=hidden is used, assume the code has been annotated
3280 correspondingly for the symbols needed. */
3281 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3282-void fnord () __attribute__((visibility("default")));
3283+int fnord () __attribute__((visibility("default")));
3284 #endif
3285
3286-void fnord () { int i=42; }
3287+int fnord () { return 42; }
3288 int main ()
3289 {
3290 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3291@@ -16024,13 +16679,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3292 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3293 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3294 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3295+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3296+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3297 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3298 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3299 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3300 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3301 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3302+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3303+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3304+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3305+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3306 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3307 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3308+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3309 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3310 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3311 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3312@@ -16045,14 +16707,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3313 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3314 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3315 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"`'
3316+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3317+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3318 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3319 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3320 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3321-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3322 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3323+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3324 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3325 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3326 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3327+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3328 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3329 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3330 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3331@@ -16085,12 +16750,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3332 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3333 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3334 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3335-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3336 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3337 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3338 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3339 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3340 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3341+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3342 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3343 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3344 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3345@@ -16145,8 +16810,13 @@ reload_flag \
3346 OBJDUMP \
3347 deplibs_check_method \
3348 file_magic_cmd \
3349+file_magic_glob \
3350+want_nocaseglob \
3351+DLLTOOL \
3352+sharedlib_from_linklib_cmd \
3353 AR \
3354 AR_FLAGS \
3355+archiver_list_spec \
3356 STRIP \
3357 RANLIB \
3358 CC \
3359@@ -16156,12 +16826,14 @@ lt_cv_sys_global_symbol_pipe \
3360 lt_cv_sys_global_symbol_to_cdecl \
3361 lt_cv_sys_global_symbol_to_c_name_address \
3362 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3363+nm_file_list_spec \
3364 lt_prog_compiler_no_builtin_flag \
3365-lt_prog_compiler_wl \
3366 lt_prog_compiler_pic \
3367+lt_prog_compiler_wl \
3368 lt_prog_compiler_static \
3369 lt_cv_prog_compiler_c_o \
3370 need_locks \
3371+MANIFEST_TOOL \
3372 DSYMUTIL \
3373 NMEDIT \
3374 LIPO \
3375@@ -16177,7 +16849,6 @@ no_undefined_flag \
3376 hardcode_libdir_flag_spec \
3377 hardcode_libdir_flag_spec_ld \
3378 hardcode_libdir_separator \
3379-fix_srcfile_path \
3380 exclude_expsyms \
3381 include_expsyms \
3382 file_list_spec \
3383@@ -16213,6 +16884,7 @@ module_cmds \
3384 module_expsym_cmds \
3385 export_symbols_cmds \
3386 prelink_cmds \
3387+postlink_cmds \
3388 postinstall_cmds \
3389 postuninstall_cmds \
3390 finish_cmds \
3391@@ -16979,7 +17651,8 @@ $as_echo X"$file" |
3392 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3393 #
3394 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3395-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3396+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3397+# Inc.
3398 # Written by Gordon Matzigkeit, 1996
3399 #
3400 # This file is part of GNU Libtool.
3401@@ -17082,19 +17755,42 @@ SP2NL=$lt_lt_SP2NL
3402 # turn newlines into spaces.
3403 NL2SP=$lt_lt_NL2SP
3404
3405+# convert \$build file names to \$host format.
3406+to_host_file_cmd=$lt_cv_to_host_file_cmd
3407+
3408+# convert \$build files to toolchain format.
3409+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3410+
3411 # An object symbol dumper.
3412 OBJDUMP=$lt_OBJDUMP
3413
3414 # Method to check whether dependent libraries are shared objects.
3415 deplibs_check_method=$lt_deplibs_check_method
3416
3417-# Command to use when deplibs_check_method == "file_magic".
3418+# Command to use when deplibs_check_method = "file_magic".
3419 file_magic_cmd=$lt_file_magic_cmd
3420
3421+# How to find potential files when deplibs_check_method = "file_magic".
3422+file_magic_glob=$lt_file_magic_glob
3423+
3424+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3425+want_nocaseglob=$lt_want_nocaseglob
3426+
3427+# DLL creation program.
3428+DLLTOOL=$lt_DLLTOOL
3429+
3430+# Command to associate shared and link libraries.
3431+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3432+
3433 # The archiver.
3434 AR=$lt_AR
3435+
3436+# Flags to create an archive.
3437 AR_FLAGS=$lt_AR_FLAGS
3438
3439+# How to feed a file listing to the archiver.
3440+archiver_list_spec=$lt_archiver_list_spec
3441+
3442 # A symbol stripping program.
3443 STRIP=$lt_STRIP
3444
3445@@ -17124,6 +17820,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3446 # Transform the output of nm in a C name address pair when lib prefix is needed.
3447 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3448
3449+# Specify filename containing input files for \$NM.
3450+nm_file_list_spec=$lt_nm_file_list_spec
3451+
3452+# The root where to search for dependent libraries,and in which our libraries should be installed.
3453+lt_sysroot=$lt_sysroot
3454+
3455 # The name of the directory that contains temporary libtool files.
3456 objdir=$objdir
3457
3458@@ -17133,6 +17835,9 @@ MAGIC_CMD=$MAGIC_CMD
3459 # Must we lock files when doing compilation?
3460 need_locks=$lt_need_locks
3461
3462+# Manifest tool.
3463+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3464+
3465 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3466 DSYMUTIL=$lt_DSYMUTIL
3467
3468@@ -17247,12 +17952,12 @@ with_gcc=$GCC
3469 # Compiler flag to turn off builtin functions.
3470 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3471
3472-# How to pass a linker flag through the compiler.
3473-wl=$lt_lt_prog_compiler_wl
3474-
3475 # Additional compiler flags for building library objects.
3476 pic_flag=$lt_lt_prog_compiler_pic
3477
3478+# How to pass a linker flag through the compiler.
3479+wl=$lt_lt_prog_compiler_wl
3480+
3481 # Compiler flag to prevent dynamic linking.
3482 link_static_flag=$lt_lt_prog_compiler_static
3483
3484@@ -17339,9 +18044,6 @@ inherit_rpath=$inherit_rpath
3485 # Whether libtool must link a program against all its dependency libraries.
3486 link_all_deplibs=$link_all_deplibs
3487
3488-# Fix the shell variable \$srcfile for the compiler.
3489-fix_srcfile_path=$lt_fix_srcfile_path
3490-
3491 # Set to "yes" if exported symbols are required.
3492 always_export_symbols=$always_export_symbols
3493
3494@@ -17357,6 +18059,9 @@ include_expsyms=$lt_include_expsyms
3495 # Commands necessary for linking programs (against libraries) with templates.
3496 prelink_cmds=$lt_prelink_cmds
3497
3498+# Commands necessary for finishing linking programs.
3499+postlink_cmds=$lt_postlink_cmds
3500+
3501 # Specify filename containing input files.
3502 file_list_spec=$lt_file_list_spec
3503
3504@@ -17389,210 +18094,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3505 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3506 # text mode, it properly converts lines to CR/LF. This bash problem
3507 # is reportedly fixed, but why not run on old versions too?
3508- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3509- || (rm -f "$cfgfile"; exit 1)
3510-
3511- case $xsi_shell in
3512- yes)
3513- cat << \_LT_EOF >> "$cfgfile"
3514-
3515-# func_dirname file append nondir_replacement
3516-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3517-# otherwise set result to NONDIR_REPLACEMENT.
3518-func_dirname ()
3519-{
3520- case ${1} in
3521- */*) func_dirname_result="${1%/*}${2}" ;;
3522- * ) func_dirname_result="${3}" ;;
3523- esac
3524-}
3525-
3526-# func_basename file
3527-func_basename ()
3528-{
3529- func_basename_result="${1##*/}"
3530-}
3531-
3532-# func_dirname_and_basename file append nondir_replacement
3533-# perform func_basename and func_dirname in a single function
3534-# call:
3535-# dirname: Compute the dirname of FILE. If nonempty,
3536-# add APPEND to the result, otherwise set result
3537-# to NONDIR_REPLACEMENT.
3538-# value returned in "$func_dirname_result"
3539-# basename: Compute filename of FILE.
3540-# value retuned in "$func_basename_result"
3541-# Implementation must be kept synchronized with func_dirname
3542-# and func_basename. For efficiency, we do not delegate to
3543-# those functions but instead duplicate the functionality here.
3544-func_dirname_and_basename ()
3545-{
3546- case ${1} in
3547- */*) func_dirname_result="${1%/*}${2}" ;;
3548- * ) func_dirname_result="${3}" ;;
3549- esac
3550- func_basename_result="${1##*/}"
3551-}
3552-
3553-# func_stripname prefix suffix name
3554-# strip PREFIX and SUFFIX off of NAME.
3555-# PREFIX and SUFFIX must not contain globbing or regex special
3556-# characters, hashes, percent signs, but SUFFIX may contain a leading
3557-# dot (in which case that matches only a dot).
3558-func_stripname ()
3559-{
3560- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3561- # positional parameters, so assign one to ordinary parameter first.
3562- func_stripname_result=${3}
3563- func_stripname_result=${func_stripname_result#"${1}"}
3564- func_stripname_result=${func_stripname_result%"${2}"}
3565-}
3566-
3567-# func_opt_split
3568-func_opt_split ()
3569-{
3570- func_opt_split_opt=${1%%=*}
3571- func_opt_split_arg=${1#*=}
3572-}
3573-
3574-# func_lo2o object
3575-func_lo2o ()
3576-{
3577- case ${1} in
3578- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3579- *) func_lo2o_result=${1} ;;
3580- esac
3581-}
3582-
3583-# func_xform libobj-or-source
3584-func_xform ()
3585-{
3586- func_xform_result=${1%.*}.lo
3587-}
3588-
3589-# func_arith arithmetic-term...
3590-func_arith ()
3591-{
3592- func_arith_result=$(( $* ))
3593-}
3594-
3595-# func_len string
3596-# STRING may not start with a hyphen.
3597-func_len ()
3598-{
3599- func_len_result=${#1}
3600-}
3601-
3602-_LT_EOF
3603- ;;
3604- *) # Bourne compatible functions.
3605- cat << \_LT_EOF >> "$cfgfile"
3606-
3607-# func_dirname file append nondir_replacement
3608-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3609-# otherwise set result to NONDIR_REPLACEMENT.
3610-func_dirname ()
3611-{
3612- # Extract subdirectory from the argument.
3613- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3614- if test "X$func_dirname_result" = "X${1}"; then
3615- func_dirname_result="${3}"
3616- else
3617- func_dirname_result="$func_dirname_result${2}"
3618- fi
3619-}
3620-
3621-# func_basename file
3622-func_basename ()
3623-{
3624- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3625-}
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_strip_suffix prefix name
3634-func_stripname ()
3635-{
3636- case ${2} in
3637- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3638- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3639- esac
3640-}
3641-
3642-# sed scripts:
3643-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3644-my_sed_long_arg='1s/^-[^=]*=//'
3645-
3646-# func_opt_split
3647-func_opt_split ()
3648-{
3649- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3650- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3651-}
3652-
3653-# func_lo2o object
3654-func_lo2o ()
3655-{
3656- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3657-}
3658-
3659-# func_xform libobj-or-source
3660-func_xform ()
3661-{
3662- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3663-}
3664-
3665-# func_arith arithmetic-term...
3666-func_arith ()
3667-{
3668- func_arith_result=`expr "$@"`
3669-}
3670-
3671-# func_len string
3672-# STRING may not start with a hyphen.
3673-func_len ()
3674-{
3675- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3676-}
3677-
3678-_LT_EOF
3679-esac
3680-
3681-case $lt_shell_append in
3682- yes)
3683- cat << \_LT_EOF >> "$cfgfile"
3684-
3685-# func_append var value
3686-# Append VALUE to the end of shell variable VAR.
3687-func_append ()
3688-{
3689- eval "$1+=\$2"
3690-}
3691-_LT_EOF
3692- ;;
3693- *)
3694- cat << \_LT_EOF >> "$cfgfile"
3695-
3696-# func_append var value
3697-# Append VALUE to the end of shell variable VAR.
3698-func_append ()
3699-{
3700- eval "$1=\$$1\$2"
3701-}
3702-
3703-_LT_EOF
3704- ;;
3705- esac
3706-
3707-
3708- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3709- || (rm -f "$cfgfile"; exit 1)
3710-
3711- mv -f "$cfgfile" "$ofile" ||
3712+ sed '$q' "$ltmain" >> "$cfgfile" \
3713+ || (rm -f "$cfgfile"; exit 1)
3714+
3715+ if test x"$xsi_shell" = xyes; then
3716+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3717+func_dirname ()\
3718+{\
3719+\ case ${1} in\
3720+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3721+\ * ) func_dirname_result="${3}" ;;\
3722+\ esac\
3723+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3724+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3725+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3726+test 0 -eq $? || _lt_function_replace_fail=:
3727+
3728+
3729+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3730+func_basename ()\
3731+{\
3732+\ func_basename_result="${1##*/}"\
3733+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3734+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3735+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3736+test 0 -eq $? || _lt_function_replace_fail=:
3737+
3738+
3739+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3740+func_dirname_and_basename ()\
3741+{\
3742+\ case ${1} in\
3743+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3744+\ * ) func_dirname_result="${3}" ;;\
3745+\ esac\
3746+\ func_basename_result="${1##*/}"\
3747+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3748+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3749+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3750+test 0 -eq $? || _lt_function_replace_fail=:
3751+
3752+
3753+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3754+func_stripname ()\
3755+{\
3756+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3757+\ # positional parameters, so assign one to ordinary parameter first.\
3758+\ func_stripname_result=${3}\
3759+\ func_stripname_result=${func_stripname_result#"${1}"}\
3760+\ func_stripname_result=${func_stripname_result%"${2}"}\
3761+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3762+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3764+test 0 -eq $? || _lt_function_replace_fail=:
3765+
3766+
3767+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3768+func_split_long_opt ()\
3769+{\
3770+\ func_split_long_opt_name=${1%%=*}\
3771+\ func_split_long_opt_arg=${1#*=}\
3772+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3773+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3774+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3775+test 0 -eq $? || _lt_function_replace_fail=:
3776+
3777+
3778+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3779+func_split_short_opt ()\
3780+{\
3781+\ func_split_short_opt_arg=${1#??}\
3782+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3783+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3784+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3785+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3786+test 0 -eq $? || _lt_function_replace_fail=:
3787+
3788+
3789+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3790+func_lo2o ()\
3791+{\
3792+\ case ${1} in\
3793+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3794+\ *) func_lo2o_result=${1} ;;\
3795+\ esac\
3796+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3797+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3798+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3799+test 0 -eq $? || _lt_function_replace_fail=:
3800+
3801+
3802+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3803+func_xform ()\
3804+{\
3805+ func_xform_result=${1%.*}.lo\
3806+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3807+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3808+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3809+test 0 -eq $? || _lt_function_replace_fail=:
3810+
3811+
3812+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3813+func_arith ()\
3814+{\
3815+ func_arith_result=$(( $* ))\
3816+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3817+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3818+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3819+test 0 -eq $? || _lt_function_replace_fail=:
3820+
3821+
3822+ sed -e '/^func_len ()$/,/^} # func_len /c\
3823+func_len ()\
3824+{\
3825+ func_len_result=${#1}\
3826+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3827+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3828+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3829+test 0 -eq $? || _lt_function_replace_fail=:
3830+
3831+fi
3832+
3833+if test x"$lt_shell_append" = xyes; then
3834+ sed -e '/^func_append ()$/,/^} # func_append /c\
3835+func_append ()\
3836+{\
3837+ eval "${1}+=\\${2}"\
3838+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3839+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3840+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3841+test 0 -eq $? || _lt_function_replace_fail=:
3842+
3843+
3844+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3845+func_append_quoted ()\
3846+{\
3847+\ func_quote_for_eval "${2}"\
3848+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3849+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3850+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3851+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3852+test 0 -eq $? || _lt_function_replace_fail=:
3853+
3854+
3855+ # Save a `func_append' function call where possible by direct use of '+='
3856+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3857+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3858+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3859+ test 0 -eq $? || _lt_function_replace_fail=:
3860+else
3861+ # Save a `func_append' function call even when '+=' is not available
3862+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3863+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3864+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3865+ test 0 -eq $? || _lt_function_replace_fail=:
3866+fi
3867+
3868+if test x"$_lt_function_replace_fail" = x":"; then
3869+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3870+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3871+fi
3872+
3873+
3874+ mv -f "$cfgfile" "$ofile" ||
3875 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3876 chmod +x "$ofile"
3877
3878diff --git a/gas/configure b/gas/configure
3879index 60c1a055ae2..0e0ce4c0e23 100755
3880--- a/gas/configure
3881+++ b/gas/configure
3882@@ -681,8 +681,11 @@ OTOOL
3883 LIPO
3884 NMEDIT
3885 DSYMUTIL
3886+MANIFEST_TOOL
3887 RANLIB
3888+ac_ct_AR
3889 AR
3890+DLLTOOL
3891 OBJDUMP
3892 LN_S
3893 NM
3894@@ -799,6 +802,7 @@ enable_static
3895 with_pic
3896 enable_fast_install
3897 with_gnu_ld
3898+with_libtool_sysroot
3899 enable_libtool_lock
3900 enable_plugins
3901 enable_largefile
3902@@ -1490,6 +1494,8 @@ Optional Packages:
3903 --with-pic try to use only PIC/non-PIC objects [default=use
3904 both]
3905 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3906+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3907+ (or the compiler's sysroot if not specified).
3908 --with-cpu=CPU default cpu variant is CPU (currently only supported
3909 on ARC)
3910 --with-system-zlib use installed libz
3911@@ -5277,8 +5283,8 @@ esac
3912
3913
3914
3915-macro_version='2.2.7a'
3916-macro_revision='1.3134'
3917+macro_version='2.4'
3918+macro_revision='1.3293'
3919
3920
3921
3922@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3923 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3924 $as_echo_n "checking how to print strings... " >&6; }
3925 # Test print first, because it will be a builtin if present.
3926-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3927+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3928 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3929 ECHO='print -r --'
3930 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3931@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3932 # Try some XSI features
3933 xsi_shell=no
3934 ( _lt_dummy="a/b/c"
3935- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3936- = c,a/b,, \
3937+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3938+ = c,a/b,b/c, \
3939 && eval 'test $(( 1 + 1 )) -eq 2 \
3940 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3941 && xsi_shell=yes
3942@@ -6054,6 +6060,80 @@ esac
3943
3944
3945
3946+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3947+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3948+if ${lt_cv_to_host_file_cmd+:} false; then :
3949+ $as_echo_n "(cached) " >&6
3950+else
3951+ case $host in
3952+ *-*-mingw* )
3953+ case $build in
3954+ *-*-mingw* ) # actually msys
3955+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3956+ ;;
3957+ *-*-cygwin* )
3958+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3959+ ;;
3960+ * ) # otherwise, assume *nix
3961+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3962+ ;;
3963+ esac
3964+ ;;
3965+ *-*-cygwin* )
3966+ case $build in
3967+ *-*-mingw* ) # actually msys
3968+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3969+ ;;
3970+ *-*-cygwin* )
3971+ lt_cv_to_host_file_cmd=func_convert_file_noop
3972+ ;;
3973+ * ) # otherwise, assume *nix
3974+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3975+ ;;
3976+ esac
3977+ ;;
3978+ * ) # unhandled hosts (and "normal" native builds)
3979+ lt_cv_to_host_file_cmd=func_convert_file_noop
3980+ ;;
3981+esac
3982+
3983+fi
3984+
3985+to_host_file_cmd=$lt_cv_to_host_file_cmd
3986+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3987+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3988+
3989+
3990+
3991+
3992+
3993+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3994+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3995+if ${lt_cv_to_tool_file_cmd+:} false; then :
3996+ $as_echo_n "(cached) " >&6
3997+else
3998+ #assume ordinary cross tools, or native build.
3999+lt_cv_to_tool_file_cmd=func_convert_file_noop
4000+case $host in
4001+ *-*-mingw* )
4002+ case $build in
4003+ *-*-mingw* ) # actually msys
4004+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
4005+ ;;
4006+ esac
4007+ ;;
4008+esac
4009+
4010+fi
4011+
4012+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
4013+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
4014+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
4015+
4016+
4017+
4018+
4019+
4020 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4021 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4022 if ${lt_cv_ld_reload_flag+:} false; then :
4023@@ -6070,6 +6150,11 @@ case $reload_flag in
4024 esac
4025 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4026 case $host_os in
4027+ cygwin* | mingw* | pw32* | cegcc*)
4028+ if test "$GCC" != yes; then
4029+ reload_cmds=false
4030+ fi
4031+ ;;
4032 darwin*)
4033 if test "$GCC" = yes; then
4034 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4035@@ -6238,7 +6323,8 @@ mingw* | pw32*)
4036 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4037 lt_cv_file_magic_cmd='func_win32_libid'
4038 else
4039- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4040+ # Keep this pattern in sync with the one in func_win32_libid.
4041+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4042 lt_cv_file_magic_cmd='$OBJDUMP -f'
4043 fi
4044 ;;
4045@@ -6392,6 +6478,21 @@ esac
4046 fi
4047 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4048 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4049+
4050+file_magic_glob=
4051+want_nocaseglob=no
4052+if test "$build" = "$host"; then
4053+ case $host_os in
4054+ mingw* | pw32*)
4055+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4056+ want_nocaseglob=yes
4057+ else
4058+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4059+ fi
4060+ ;;
4061+ esac
4062+fi
4063+
4064 file_magic_cmd=$lt_cv_file_magic_cmd
4065 deplibs_check_method=$lt_cv_deplibs_check_method
4066 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4067@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4068
4069
4070
4071+
4072+
4073+
4074+
4075+
4076+
4077+
4078+
4079+
4080+
4081+if test -n "$ac_tool_prefix"; then
4082+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4083+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4084+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4085+$as_echo_n "checking for $ac_word... " >&6; }
4086+if ${ac_cv_prog_DLLTOOL+:} false; then :
4087+ $as_echo_n "(cached) " >&6
4088+else
4089+ if test -n "$DLLTOOL"; then
4090+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4091+else
4092+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4093+for as_dir in $PATH
4094+do
4095+ IFS=$as_save_IFS
4096+ test -z "$as_dir" && as_dir=.
4097+ for ac_exec_ext in '' $ac_executable_extensions; do
4098+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4099+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4100+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4101+ break 2
4102+ fi
4103+done
4104+ done
4105+IFS=$as_save_IFS
4106+
4107+fi
4108+fi
4109+DLLTOOL=$ac_cv_prog_DLLTOOL
4110+if test -n "$DLLTOOL"; then
4111+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4112+$as_echo "$DLLTOOL" >&6; }
4113+else
4114+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4115+$as_echo "no" >&6; }
4116+fi
4117+
4118+
4119+fi
4120+if test -z "$ac_cv_prog_DLLTOOL"; then
4121+ ac_ct_DLLTOOL=$DLLTOOL
4122+ # Extract the first word of "dlltool", so it can be a program name with args.
4123+set dummy dlltool; ac_word=$2
4124+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4125+$as_echo_n "checking for $ac_word... " >&6; }
4126+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
4127+ $as_echo_n "(cached) " >&6
4128+else
4129+ if test -n "$ac_ct_DLLTOOL"; then
4130+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4131+else
4132+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4133+for as_dir in $PATH
4134+do
4135+ IFS=$as_save_IFS
4136+ test -z "$as_dir" && as_dir=.
4137+ for ac_exec_ext in '' $ac_executable_extensions; do
4138+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4139+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4140+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4141+ break 2
4142+ fi
4143+done
4144+ done
4145+IFS=$as_save_IFS
4146+
4147+fi
4148+fi
4149+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4150+if test -n "$ac_ct_DLLTOOL"; then
4151+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4152+$as_echo "$ac_ct_DLLTOOL" >&6; }
4153+else
4154+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4155+$as_echo "no" >&6; }
4156+fi
4157+
4158+ if test "x$ac_ct_DLLTOOL" = x; then
4159+ DLLTOOL="false"
4160+ else
4161+ case $cross_compiling:$ac_tool_warned in
4162+yes:)
4163+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4164+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4165+ac_tool_warned=yes ;;
4166+esac
4167+ DLLTOOL=$ac_ct_DLLTOOL
4168+ fi
4169+else
4170+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4171+fi
4172+
4173+test -z "$DLLTOOL" && DLLTOOL=dlltool
4174+
4175+
4176+
4177+
4178+
4179+
4180+
4181+
4182+
4183+
4184+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4185+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4186+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
4187+ $as_echo_n "(cached) " >&6
4188+else
4189+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4190+
4191+case $host_os in
4192+cygwin* | mingw* | pw32* | cegcc*)
4193+ # two different shell functions defined in ltmain.sh
4194+ # decide which to use based on capabilities of $DLLTOOL
4195+ case `$DLLTOOL --help 2>&1` in
4196+ *--identify-strict*)
4197+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4198+ ;;
4199+ *)
4200+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4201+ ;;
4202+ esac
4203+ ;;
4204+*)
4205+ # fallback: assume linklib IS sharedlib
4206+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4207+ ;;
4208+esac
4209+
4210+fi
4211+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4212+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4213+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4214+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4215+
4216+
4217+
4218+
4219+
4220+
4221+
4222 if test -n "$ac_tool_prefix"; then
4223- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4224-set dummy ${ac_tool_prefix}ar; ac_word=$2
4225+ for ac_prog in ar
4226+ do
4227+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4228+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4229 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4230 $as_echo_n "checking for $ac_word... " >&6; }
4231 if ${ac_cv_prog_AR+:} false; then :
4232@@ -6425,7 +6679,7 @@ do
4233 test -z "$as_dir" && as_dir=.
4234 for ac_exec_ext in '' $ac_executable_extensions; do
4235 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4236- ac_cv_prog_AR="${ac_tool_prefix}ar"
4237+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4238 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4239 break 2
4240 fi
4241@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; }
4242 fi
4243
4244
4245+ test -n "$AR" && break
4246+ done
4247 fi
4248-if test -z "$ac_cv_prog_AR"; then
4249+if test -z "$AR"; then
4250 ac_ct_AR=$AR
4251- # Extract the first word of "ar", so it can be a program name with args.
4252-set dummy ar; ac_word=$2
4253+ for ac_prog in ar
4254+do
4255+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4256+set dummy $ac_prog; ac_word=$2
4257 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4258 $as_echo_n "checking for $ac_word... " >&6; }
4259 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4260@@ -6465,7 +6723,7 @@ do
4261 test -z "$as_dir" && as_dir=.
4262 for ac_exec_ext in '' $ac_executable_extensions; do
4263 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4264- ac_cv_prog_ac_ct_AR="ar"
4265+ ac_cv_prog_ac_ct_AR="$ac_prog"
4266 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4267 break 2
4268 fi
4269@@ -6484,6 +6742,10 @@ else
4270 $as_echo "no" >&6; }
4271 fi
4272
4273+
4274+ test -n "$ac_ct_AR" && break
4275+done
4276+
4277 if test "x$ac_ct_AR" = x; then
4278 AR="false"
4279 else
4280@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;;
4281 esac
4282 AR=$ac_ct_AR
4283 fi
4284-else
4285- AR="$ac_cv_prog_AR"
4286 fi
4287
4288-test -z "$AR" && AR=ar
4289-test -z "$AR_FLAGS" && AR_FLAGS=cru
4290+: ${AR=ar}
4291+: ${AR_FLAGS=cru}
4292
4293
4294
4295@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4296
4297
4298
4299+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4300+$as_echo_n "checking for archiver @FILE support... " >&6; }
4301+if ${lt_cv_ar_at_file+:} false; then :
4302+ $as_echo_n "(cached) " >&6
4303+else
4304+ lt_cv_ar_at_file=no
4305+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4306+/* end confdefs.h. */
4307+
4308+int
4309+main ()
4310+{
4311+
4312+ ;
4313+ return 0;
4314+}
4315+_ACEOF
4316+if ac_fn_c_try_compile "$LINENO"; then :
4317+ echo conftest.$ac_objext > conftest.lst
4318+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4319+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4320+ (eval $lt_ar_try) 2>&5
4321+ ac_status=$?
4322+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4323+ test $ac_status = 0; }
4324+ if test "$ac_status" -eq 0; then
4325+ # Ensure the archiver fails upon bogus file names.
4326+ rm -f conftest.$ac_objext libconftest.a
4327+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4328+ (eval $lt_ar_try) 2>&5
4329+ ac_status=$?
4330+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4331+ test $ac_status = 0; }
4332+ if test "$ac_status" -ne 0; then
4333+ lt_cv_ar_at_file=@
4334+ fi
4335+ fi
4336+ rm -f conftest.* libconftest.a
4337+
4338+fi
4339+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4340+
4341+fi
4342+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4343+$as_echo "$lt_cv_ar_at_file" >&6; }
4344+
4345+if test "x$lt_cv_ar_at_file" = xno; then
4346+ archiver_list_spec=
4347+else
4348+ archiver_list_spec=$lt_cv_ar_at_file
4349+fi
4350+
4351+
4352+
4353+
4354+
4355+
4356+
4357 if test -n "$ac_tool_prefix"; then
4358 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4359 set dummy ${ac_tool_prefix}strip; ac_word=$2
4360@@ -6846,8 +7164,8 @@ esac
4361 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4362
4363 # Transform an extracted symbol line into symbol name and symbol address
4364-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4365-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'"
4366+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4367+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'"
4368
4369 # Handle CRLF in mingw tool chain
4370 opt_cr=
4371@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do
4372 else
4373 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4374 fi
4375+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4376
4377 # Check to see that the pipe works correctly.
4378 pipe_works=no
4379@@ -6924,6 +7243,18 @@ _LT_EOF
4380 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4381 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4382 cat <<_LT_EOF > conftest.$ac_ext
4383+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4384+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4385+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4386+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4387+# define LT_DLSYM_CONST
4388+#elif defined(__osf__)
4389+/* This system does not cope well with relocations in const data. */
4390+# define LT_DLSYM_CONST
4391+#else
4392+# define LT_DLSYM_CONST const
4393+#endif
4394+
4395 #ifdef __cplusplus
4396 extern "C" {
4397 #endif
4398@@ -6935,7 +7266,7 @@ _LT_EOF
4399 cat <<_LT_EOF >> conftest.$ac_ext
4400
4401 /* The mapping between symbol names and symbols. */
4402-const struct {
4403+LT_DLSYM_CONST struct {
4404 const char *name;
4405 void *address;
4406 }
4407@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() {
4408 _LT_EOF
4409 # Now try linking the two files.
4410 mv conftest.$ac_objext conftstm.$ac_objext
4411- lt_save_LIBS="$LIBS"
4412- lt_save_CFLAGS="$CFLAGS"
4413+ lt_globsym_save_LIBS=$LIBS
4414+ lt_globsym_save_CFLAGS=$CFLAGS
4415 LIBS="conftstm.$ac_objext"
4416 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4417 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4418@@ -6972,8 +7303,8 @@ _LT_EOF
4419 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4420 pipe_works=yes
4421 fi
4422- LIBS="$lt_save_LIBS"
4423- CFLAGS="$lt_save_CFLAGS"
4424+ LIBS=$lt_globsym_save_LIBS
4425+ CFLAGS=$lt_globsym_save_CFLAGS
4426 else
4427 echo "cannot find nm_test_func in $nlist" >&5
4428 fi
4429@@ -7010,6 +7341,21 @@ else
4430 $as_echo "ok" >&6; }
4431 fi
4432
4433+# Response file support.
4434+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4435+ nm_file_list_spec='@'
4436+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4437+ nm_file_list_spec='@'
4438+fi
4439+
4440+
4441+
4442+
4443+
4444+
4445+
4446+
4447+
4448
4449
4450
4451@@ -7026,6 +7372,40 @@ fi
4452
4453
4454
4455+
4456+
4457+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4458+$as_echo_n "checking for sysroot... " >&6; }
4459+
4460+# Check whether --with-libtool-sysroot was given.
4461+if test "${with_libtool_sysroot+set}" = set; then :
4462+ withval=$with_libtool_sysroot;
4463+else
4464+ with_libtool_sysroot=no
4465+fi
4466+
4467+
4468+lt_sysroot=
4469+case ${with_libtool_sysroot} in #(
4470+ yes)
4471+ if test "$GCC" = yes; then
4472+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4473+ fi
4474+ ;; #(
4475+ /*)
4476+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4477+ ;; #(
4478+ no|'')
4479+ ;; #(
4480+ *)
4481+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4482+$as_echo "${with_libtool_sysroot}" >&6; }
4483+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
4484+ ;;
4485+esac
4486+
4487+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4488+$as_echo "${lt_sysroot:-no}" >&6; }
4489
4490
4491
4492@@ -7237,6 +7617,123 @@ esac
4493
4494 need_locks="$enable_libtool_lock"
4495
4496+if test -n "$ac_tool_prefix"; then
4497+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4498+set dummy ${ac_tool_prefix}mt; ac_word=$2
4499+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4500+$as_echo_n "checking for $ac_word... " >&6; }
4501+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
4502+ $as_echo_n "(cached) " >&6
4503+else
4504+ if test -n "$MANIFEST_TOOL"; then
4505+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4506+else
4507+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4508+for as_dir in $PATH
4509+do
4510+ IFS=$as_save_IFS
4511+ test -z "$as_dir" && as_dir=.
4512+ for ac_exec_ext in '' $ac_executable_extensions; do
4513+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4514+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4515+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4516+ break 2
4517+ fi
4518+done
4519+ done
4520+IFS=$as_save_IFS
4521+
4522+fi
4523+fi
4524+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4525+if test -n "$MANIFEST_TOOL"; then
4526+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4527+$as_echo "$MANIFEST_TOOL" >&6; }
4528+else
4529+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4530+$as_echo "no" >&6; }
4531+fi
4532+
4533+
4534+fi
4535+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4536+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4537+ # Extract the first word of "mt", so it can be a program name with args.
4538+set dummy mt; ac_word=$2
4539+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4540+$as_echo_n "checking for $ac_word... " >&6; }
4541+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
4542+ $as_echo_n "(cached) " >&6
4543+else
4544+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4545+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4546+else
4547+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4548+for as_dir in $PATH
4549+do
4550+ IFS=$as_save_IFS
4551+ test -z "$as_dir" && as_dir=.
4552+ for ac_exec_ext in '' $ac_executable_extensions; do
4553+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4554+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4555+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4556+ break 2
4557+ fi
4558+done
4559+ done
4560+IFS=$as_save_IFS
4561+
4562+fi
4563+fi
4564+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4565+if test -n "$ac_ct_MANIFEST_TOOL"; then
4566+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4567+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4568+else
4569+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4570+$as_echo "no" >&6; }
4571+fi
4572+
4573+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4574+ MANIFEST_TOOL=":"
4575+ else
4576+ case $cross_compiling:$ac_tool_warned in
4577+yes:)
4578+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4579+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4580+ac_tool_warned=yes ;;
4581+esac
4582+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4583+ fi
4584+else
4585+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4586+fi
4587+
4588+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4589+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4590+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4591+if ${lt_cv_path_mainfest_tool+:} false; then :
4592+ $as_echo_n "(cached) " >&6
4593+else
4594+ lt_cv_path_mainfest_tool=no
4595+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4596+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4597+ cat conftest.err >&5
4598+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4599+ lt_cv_path_mainfest_tool=yes
4600+ fi
4601+ rm -f conftest*
4602+fi
4603+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4604+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4605+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4606+ MANIFEST_TOOL=:
4607+fi
4608+
4609+
4610+
4611+
4612+
4613
4614 case $host_os in
4615 rhapsody* | darwin*)
4616@@ -7800,6 +8297,8 @@ _LT_EOF
4617 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4618 echo "$AR cru libconftest.a conftest.o" >&5
4619 $AR cru libconftest.a conftest.o 2>&5
4620+ echo "$RANLIB libconftest.a" >&5
4621+ $RANLIB libconftest.a 2>&5
4622 cat > conftest.c << _LT_EOF
4623 int main() { return 0;}
4624 _LT_EOF
4625@@ -7995,7 +8494,8 @@ fi
4626 LIBTOOL_DEPS="$ltmain"
4627
4628 # Always use our own libtool.
4629-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4630+LIBTOOL='$(SHELL) $(top_builddir)'
4631+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4632
4633
4634
4635@@ -8084,7 +8584,7 @@ aix3*)
4636 esac
4637
4638 # Global variables:
4639-ofile=libtool
4640+ofile=${host_alias}-libtool
4641 can_build_shared=yes
4642
4643 # All known linkers require a `.a' archive for static linking (except MSVC,
4644@@ -8382,8 +8882,6 @@ fi
4645 lt_prog_compiler_pic=
4646 lt_prog_compiler_static=
4647
4648-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4649-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4650
4651 if test "$GCC" = yes; then
4652 lt_prog_compiler_wl='-Wl,'
4653@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4654 lt_prog_compiler_pic='--shared'
4655 lt_prog_compiler_static='--static'
4656 ;;
4657+ nagfor*)
4658+ # NAG Fortran compiler
4659+ lt_prog_compiler_wl='-Wl,-Wl,,'
4660+ lt_prog_compiler_pic='-PIC'
4661+ lt_prog_compiler_static='-Bstatic'
4662+ ;;
4663 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4664 # Portland Group compilers (*not* the Pentium gcc compiler,
4665 # which looks to be a dead project)
4666@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4667 lt_prog_compiler_pic='-KPIC'
4668 lt_prog_compiler_static='-Bstatic'
4669 case $cc_basename in
4670- f77* | f90* | f95*)
4671+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4672 lt_prog_compiler_wl='-Qoption ld ';;
4673 *)
4674 lt_prog_compiler_wl='-Wl,';;
4675@@ -8668,13 +9172,17 @@ case $host_os in
4676 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4677 ;;
4678 esac
4679-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4680-$as_echo "$lt_prog_compiler_pic" >&6; }
4681-
4682-
4683-
4684-
4685
4686+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4687+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4688+if ${lt_cv_prog_compiler_pic+:} false; then :
4689+ $as_echo_n "(cached) " >&6
4690+else
4691+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4692+fi
4693+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4694+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4695+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4696
4697 #
4698 # Check to make sure the PIC flag actually works.
4699@@ -8735,6 +9243,11 @@ fi
4700
4701
4702
4703+
4704+
4705+
4706+
4707+
4708 #
4709 # Check to make sure the static flag actually works.
4710 #
4711@@ -9085,7 +9598,8 @@ _LT_EOF
4712 allow_undefined_flag=unsupported
4713 always_export_symbols=no
4714 enable_shared_with_static_runtimes=yes
4715- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4716+ 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'
4717+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4718
4719 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4720 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4721@@ -9184,12 +9698,12 @@ _LT_EOF
4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4723 hardcode_libdir_flag_spec=
4724 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4725- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4726+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4727 if test "x$supports_anon_versioning" = xyes; then
4728 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4729 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4730 echo "local: *; };" >> $output_objdir/$libname.ver~
4731- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4732+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4733 fi
4734 ;;
4735 esac
4736@@ -9203,8 +9717,8 @@ _LT_EOF
4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4738 wlarc=
4739 else
4740- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4741- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4742+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4743+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4744 fi
4745 ;;
4746
4747@@ -9222,8 +9736,8 @@ _LT_EOF
4748
4749 _LT_EOF
4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4751- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4752- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4753+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4754+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4755 else
4756 ld_shlibs=no
4757 fi
4758@@ -9269,8 +9783,8 @@ _LT_EOF
4759
4760 *)
4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4762- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4763- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4764+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4765+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4766 else
4767 ld_shlibs=no
4768 fi
4769@@ -9400,7 +9914,13 @@ _LT_EOF
4770 allow_undefined_flag='-berok'
4771 # Determine the default libpath from the value encoded in an
4772 # empty executable.
4773- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4774+ if test "${lt_cv_aix_libpath+set}" = set; then
4775+ aix_libpath=$lt_cv_aix_libpath
4776+else
4777+ if ${lt_cv_aix_libpath_+:} false; then :
4778+ $as_echo_n "(cached) " >&6
4779+else
4780+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4781 /* end confdefs.h. */
4782
4783 int
4784@@ -9413,22 +9933,29 @@ main ()
4785 _ACEOF
4786 if ac_fn_c_try_link "$LINENO"; then :
4787
4788-lt_aix_libpath_sed='
4789- /Import File Strings/,/^$/ {
4790- /^0/ {
4791- s/^0 *\(.*\)$/\1/
4792- p
4793- }
4794- }'
4795-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4796-# Check for a 64-bit object if we didn't find anything.
4797-if test -z "$aix_libpath"; then
4798- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4799-fi
4800+ lt_aix_libpath_sed='
4801+ /Import File Strings/,/^$/ {
4802+ /^0/ {
4803+ s/^0 *\([^ ]*\) *$/\1/
4804+ p
4805+ }
4806+ }'
4807+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4808+ # Check for a 64-bit object if we didn't find anything.
4809+ if test -z "$lt_cv_aix_libpath_"; then
4810+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4811+ fi
4812 fi
4813 rm -f core conftest.err conftest.$ac_objext \
4814 conftest$ac_exeext conftest.$ac_ext
4815-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4816+ if test -z "$lt_cv_aix_libpath_"; then
4817+ lt_cv_aix_libpath_="/usr/lib:/lib"
4818+ fi
4819+
4820+fi
4821+
4822+ aix_libpath=$lt_cv_aix_libpath_
4823+fi
4824
4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4826 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"
4827@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4828 else
4829 # Determine the default libpath from the value encoded in an
4830 # empty executable.
4831- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4832+ if test "${lt_cv_aix_libpath+set}" = set; then
4833+ aix_libpath=$lt_cv_aix_libpath
4834+else
4835+ if ${lt_cv_aix_libpath_+:} false; then :
4836+ $as_echo_n "(cached) " >&6
4837+else
4838+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4839 /* end confdefs.h. */
4840
4841 int
4842@@ -9453,22 +9986,29 @@ main ()
4843 _ACEOF
4844 if ac_fn_c_try_link "$LINENO"; then :
4845
4846-lt_aix_libpath_sed='
4847- /Import File Strings/,/^$/ {
4848- /^0/ {
4849- s/^0 *\(.*\)$/\1/
4850- p
4851- }
4852- }'
4853-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4854-# Check for a 64-bit object if we didn't find anything.
4855-if test -z "$aix_libpath"; then
4856- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4857-fi
4858+ lt_aix_libpath_sed='
4859+ /Import File Strings/,/^$/ {
4860+ /^0/ {
4861+ s/^0 *\([^ ]*\) *$/\1/
4862+ p
4863+ }
4864+ }'
4865+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4866+ # Check for a 64-bit object if we didn't find anything.
4867+ if test -z "$lt_cv_aix_libpath_"; then
4868+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4869+ fi
4870 fi
4871 rm -f core conftest.err conftest.$ac_objext \
4872 conftest$ac_exeext conftest.$ac_ext
4873-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4874+ if test -z "$lt_cv_aix_libpath_"; then
4875+ lt_cv_aix_libpath_="/usr/lib:/lib"
4876+ fi
4877+
4878+fi
4879+
4880+ aix_libpath=$lt_cv_aix_libpath_
4881+fi
4882
4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4884 # Warning - without using the other run time loading flags,
4885@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4886 # Microsoft Visual C++.
4887 # hardcode_libdir_flag_spec is actually meaningless, as there is
4888 # no search path for DLLs.
4889- hardcode_libdir_flag_spec=' '
4890- allow_undefined_flag=unsupported
4891- # Tell ltmain to make .lib files, not .a files.
4892- libext=lib
4893- # Tell ltmain to make .dll files, not .so files.
4894- shrext_cmds=".dll"
4895- # FIXME: Setting linknames here is a bad hack.
4896- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4897- # The linker will automatically build a .lib file if we build a DLL.
4898- old_archive_from_new_cmds='true'
4899- # FIXME: Should let the user specify the lib program.
4900- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4901- fix_srcfile_path='`cygpath -w "$srcfile"`'
4902- enable_shared_with_static_runtimes=yes
4903+ case $cc_basename in
4904+ cl*)
4905+ # Native MSVC
4906+ hardcode_libdir_flag_spec=' '
4907+ allow_undefined_flag=unsupported
4908+ always_export_symbols=yes
4909+ file_list_spec='@'
4910+ # Tell ltmain to make .lib files, not .a files.
4911+ libext=lib
4912+ # Tell ltmain to make .dll files, not .so files.
4913+ shrext_cmds=".dll"
4914+ # FIXME: Setting linknames here is a bad hack.
4915+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4916+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4917+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4918+ else
4919+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4920+ fi~
4921+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4922+ linknames='
4923+ # The linker will not automatically build a static lib if we build a DLL.
4924+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4925+ enable_shared_with_static_runtimes=yes
4926+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4927+ # Don't use ranlib
4928+ old_postinstall_cmds='chmod 644 $oldlib'
4929+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4930+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4931+ case $lt_outputfile in
4932+ *.exe|*.EXE) ;;
4933+ *)
4934+ lt_outputfile="$lt_outputfile.exe"
4935+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4936+ ;;
4937+ esac~
4938+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4939+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4940+ $RM "$lt_outputfile.manifest";
4941+ fi'
4942+ ;;
4943+ *)
4944+ # Assume MSVC wrapper
4945+ hardcode_libdir_flag_spec=' '
4946+ allow_undefined_flag=unsupported
4947+ # Tell ltmain to make .lib files, not .a files.
4948+ libext=lib
4949+ # Tell ltmain to make .dll files, not .so files.
4950+ shrext_cmds=".dll"
4951+ # FIXME: Setting linknames here is a bad hack.
4952+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4953+ # The linker will automatically build a .lib file if we build a DLL.
4954+ old_archive_from_new_cmds='true'
4955+ # FIXME: Should let the user specify the lib program.
4956+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4957+ enable_shared_with_static_runtimes=yes
4958+ ;;
4959+ esac
4960 ;;
4961
4962 darwin* | rhapsody*)
4963@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4964
4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4966 freebsd* | dragonfly*)
4967- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4968+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4969 hardcode_libdir_flag_spec='-R$libdir'
4970 hardcode_direct=yes
4971 hardcode_shlibpath_var=no
4972@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4973
4974 hpux9*)
4975 if test "$GCC" = yes; then
4976- 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'
4977+ 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'
4978 else
4979 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'
4980 fi
4981@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4982
4983 hpux10*)
4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4985- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4986+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4987 else
4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4989 fi
4990@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4992 ;;
4993 ia64*)
4994- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4995+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4996 ;;
4997 *)
4998- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4999+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5000 ;;
5001 esac
5002 else
5003@@ -9717,23 +10300,36 @@ fi
5004
5005 irix5* | irix6* | nonstopux*)
5006 if test "$GCC" = yes; then
5007- 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'
5008+ 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'
5009 # Try to use the -exported_symbol ld option, if it does not
5010 # work, assume that -exports_file does not work either and
5011 # implicitly export all symbols.
5012- save_LDFLAGS="$LDFLAGS"
5013- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5014- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5015+ # This should be the same for all languages, so no per-tag cache variable.
5016+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
5017+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
5018+if ${lt_cv_irix_exported_symbol+:} false; then :
5019+ $as_echo_n "(cached) " >&6
5020+else
5021+ save_LDFLAGS="$LDFLAGS"
5022+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5023+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5024 /* end confdefs.h. */
5025-int foo(void) {}
5026+int foo (void) { return 0; }
5027 _ACEOF
5028 if ac_fn_c_try_link "$LINENO"; then :
5029- 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'
5030-
5031+ lt_cv_irix_exported_symbol=yes
5032+else
5033+ lt_cv_irix_exported_symbol=no
5034 fi
5035 rm -f core conftest.err conftest.$ac_objext \
5036 conftest$ac_exeext conftest.$ac_ext
5037- LDFLAGS="$save_LDFLAGS"
5038+ LDFLAGS="$save_LDFLAGS"
5039+fi
5040+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5041+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5042+ if test "$lt_cv_irix_exported_symbol" = yes; then
5043+ 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'
5044+ fi
5045 else
5046 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'
5047 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'
5048@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \
5049 osf4* | osf5*) # as osf3* with the addition of -msym flag
5050 if test "$GCC" = yes; then
5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5052- 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'
5053+ 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'
5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5055 else
5056 allow_undefined_flag=' -expect_unresolved \*'
5057@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \
5058 no_undefined_flag=' -z defs'
5059 if test "$GCC" = yes; then
5060 wlarc='${wl}'
5061- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5062+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5063 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5064- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5065+ $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'
5066 else
5067 case `$CC -V 2>&1` in
5068 *"Compilers 5.0"*)
5069@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5070 need_version=no
5071 need_lib_prefix=no
5072
5073- case $GCC,$host_os in
5074- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5075+ case $GCC,$cc_basename in
5076+ yes,*)
5077+ # gcc
5078 library_names_spec='$libname.dll.a'
5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5080 postinstall_cmds='base_file=`basename \${file}`~
5081@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5083 ;;
5084 esac
5085+ dynamic_linker='Win32 ld.exe'
5086+ ;;
5087+
5088+ *,cl*)
5089+ # Native MSVC
5090+ libname_spec='$name'
5091+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5092+ library_names_spec='${libname}.dll.lib'
5093+
5094+ case $build_os in
5095+ mingw*)
5096+ sys_lib_search_path_spec=
5097+ lt_save_ifs=$IFS
5098+ IFS=';'
5099+ for lt_path in $LIB
5100+ do
5101+ IFS=$lt_save_ifs
5102+ # Let DOS variable expansion print the short 8.3 style file name.
5103+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5104+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5105+ done
5106+ IFS=$lt_save_ifs
5107+ # Convert to MSYS style.
5108+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5109+ ;;
5110+ cygwin*)
5111+ # Convert to unix form, then to dos form, then back to unix form
5112+ # but this time dos style (no spaces!) so that the unix form looks
5113+ # like /cygdrive/c/PROGRA~1:/cygdr...
5114+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5115+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5116+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5117+ ;;
5118+ *)
5119+ sys_lib_search_path_spec="$LIB"
5120+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5121+ # It is most probably a Windows format PATH.
5122+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5123+ else
5124+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5125+ fi
5126+ # FIXME: find the short name or the path components, as spaces are
5127+ # common. (e.g. "Program Files" -> "PROGRA~1")
5128+ ;;
5129+ esac
5130+
5131+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5132+ postinstall_cmds='base_file=`basename \${file}`~
5133+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5134+ dldir=$destdir/`dirname \$dlpath`~
5135+ test -d \$dldir || mkdir -p \$dldir~
5136+ $install_prog $dir/$dlname \$dldir/$dlname'
5137+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5138+ dlpath=$dir/\$dldll~
5139+ $RM \$dlpath'
5140+ shlibpath_overrides_runpath=yes
5141+ dynamic_linker='Win32 link.exe'
5142 ;;
5143
5144 *)
5145+ # Assume MSVC wrapper
5146 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5147+ dynamic_linker='Win32 ld.exe'
5148 ;;
5149 esac
5150- dynamic_linker='Win32 ld.exe'
5151 # FIXME: first we should search . and the directory the executable is in
5152 shlibpath_var=PATH
5153 ;;
5154@@ -10547,7 +11202,7 @@ haiku*)
5155 soname_spec='${libname}${release}${shared_ext}$major'
5156 shlibpath_var=LIBRARY_PATH
5157 shlibpath_overrides_runpath=yes
5158- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5159+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5160 hardcode_into_libs=yes
5161 ;;
5162
5163@@ -11343,7 +11998,7 @@ else
5164 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5165 lt_status=$lt_dlunknown
5166 cat > conftest.$ac_ext <<_LT_EOF
5167-#line 11346 "configure"
5168+#line $LINENO "configure"
5169 #include "confdefs.h"
5170
5171 #if HAVE_DLFCN_H
5172@@ -11387,10 +12042,10 @@ else
5173 /* When -fvisbility=hidden is used, assume the code has been annotated
5174 correspondingly for the symbols needed. */
5175 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5176-void fnord () __attribute__((visibility("default")));
5177+int fnord () __attribute__((visibility("default")));
5178 #endif
5179
5180-void fnord () { int i=42; }
5181+int fnord () { return 42; }
5182 int main ()
5183 {
5184 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5185@@ -11449,7 +12104,7 @@ else
5186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5187 lt_status=$lt_dlunknown
5188 cat > conftest.$ac_ext <<_LT_EOF
5189-#line 11452 "configure"
5190+#line $LINENO "configure"
5191 #include "confdefs.h"
5192
5193 #if HAVE_DLFCN_H
5194@@ -11493,10 +12148,10 @@ else
5195 /* When -fvisbility=hidden is used, assume the code has been annotated
5196 correspondingly for the symbols needed. */
5197 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5198-void fnord () __attribute__((visibility("default")));
5199+int fnord () __attribute__((visibility("default")));
5200 #endif
5201
5202-void fnord () { int i=42; }
5203+int fnord () { return 42; }
5204 int main ()
5205 {
5206 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5207@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5208 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5209 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5210 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5211+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5212+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5213 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5214 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5215 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5216 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5217 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5218+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5219+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5220+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5221+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5222 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5223 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5224+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5225 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5226 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5227 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5228@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5229 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5230 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5231 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"`'
5232+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5233+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5234 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5235 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5236 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5237-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5238 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5239+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5240 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5241 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5242 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5243+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5244 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5245 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5246 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5247@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5248 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5249 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5250 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5251-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5252 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5253 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5254 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5255 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5256 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5257+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5258 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5259 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5260 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5261@@ -16049,8 +16714,13 @@ reload_flag \
5262 OBJDUMP \
5263 deplibs_check_method \
5264 file_magic_cmd \
5265+file_magic_glob \
5266+want_nocaseglob \
5267+DLLTOOL \
5268+sharedlib_from_linklib_cmd \
5269 AR \
5270 AR_FLAGS \
5271+archiver_list_spec \
5272 STRIP \
5273 RANLIB \
5274 CC \
5275@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \
5276 lt_cv_sys_global_symbol_to_cdecl \
5277 lt_cv_sys_global_symbol_to_c_name_address \
5278 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5279+nm_file_list_spec \
5280 lt_prog_compiler_no_builtin_flag \
5281-lt_prog_compiler_wl \
5282 lt_prog_compiler_pic \
5283+lt_prog_compiler_wl \
5284 lt_prog_compiler_static \
5285 lt_cv_prog_compiler_c_o \
5286 need_locks \
5287+MANIFEST_TOOL \
5288 DSYMUTIL \
5289 NMEDIT \
5290 LIPO \
5291@@ -16081,7 +16753,6 @@ no_undefined_flag \
5292 hardcode_libdir_flag_spec \
5293 hardcode_libdir_flag_spec_ld \
5294 hardcode_libdir_separator \
5295-fix_srcfile_path \
5296 exclude_expsyms \
5297 include_expsyms \
5298 file_list_spec \
5299@@ -16117,6 +16788,7 @@ module_cmds \
5300 module_expsym_cmds \
5301 export_symbols_cmds \
5302 prelink_cmds \
5303+postlink_cmds \
5304 postinstall_cmds \
5305 postuninstall_cmds \
5306 finish_cmds \
5307@@ -16890,7 +17562,8 @@ $as_echo X"$file" |
5308 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5309 #
5310 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5311-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5312+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5313+# Inc.
5314 # Written by Gordon Matzigkeit, 1996
5315 #
5316 # This file is part of GNU Libtool.
5317@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL
5318 # turn newlines into spaces.
5319 NL2SP=$lt_lt_NL2SP
5320
5321+# convert \$build file names to \$host format.
5322+to_host_file_cmd=$lt_cv_to_host_file_cmd
5323+
5324+# convert \$build files to toolchain format.
5325+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5326+
5327 # An object symbol dumper.
5328 OBJDUMP=$lt_OBJDUMP
5329
5330 # Method to check whether dependent libraries are shared objects.
5331 deplibs_check_method=$lt_deplibs_check_method
5332
5333-# Command to use when deplibs_check_method == "file_magic".
5334+# Command to use when deplibs_check_method = "file_magic".
5335 file_magic_cmd=$lt_file_magic_cmd
5336
5337+# How to find potential files when deplibs_check_method = "file_magic".
5338+file_magic_glob=$lt_file_magic_glob
5339+
5340+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5341+want_nocaseglob=$lt_want_nocaseglob
5342+
5343+# DLL creation program.
5344+DLLTOOL=$lt_DLLTOOL
5345+
5346+# Command to associate shared and link libraries.
5347+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5348+
5349 # The archiver.
5350 AR=$lt_AR
5351+
5352+# Flags to create an archive.
5353 AR_FLAGS=$lt_AR_FLAGS
5354
5355+# How to feed a file listing to the archiver.
5356+archiver_list_spec=$lt_archiver_list_spec
5357+
5358 # A symbol stripping program.
5359 STRIP=$lt_STRIP
5360
5361@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5362 # Transform the output of nm in a C name address pair when lib prefix is needed.
5363 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5364
5365+# Specify filename containing input files for \$NM.
5366+nm_file_list_spec=$lt_nm_file_list_spec
5367+
5368+# The root where to search for dependent libraries,and in which our libraries should be installed.
5369+lt_sysroot=$lt_sysroot
5370+
5371 # The name of the directory that contains temporary libtool files.
5372 objdir=$objdir
5373
5374@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD
5375 # Must we lock files when doing compilation?
5376 need_locks=$lt_need_locks
5377
5378+# Manifest tool.
5379+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5380+
5381 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5382 DSYMUTIL=$lt_DSYMUTIL
5383
5384@@ -17158,12 +17863,12 @@ with_gcc=$GCC
5385 # Compiler flag to turn off builtin functions.
5386 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5387
5388-# How to pass a linker flag through the compiler.
5389-wl=$lt_lt_prog_compiler_wl
5390-
5391 # Additional compiler flags for building library objects.
5392 pic_flag=$lt_lt_prog_compiler_pic
5393
5394+# How to pass a linker flag through the compiler.
5395+wl=$lt_lt_prog_compiler_wl
5396+
5397 # Compiler flag to prevent dynamic linking.
5398 link_static_flag=$lt_lt_prog_compiler_static
5399
5400@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath
5401 # Whether libtool must link a program against all its dependency libraries.
5402 link_all_deplibs=$link_all_deplibs
5403
5404-# Fix the shell variable \$srcfile for the compiler.
5405-fix_srcfile_path=$lt_fix_srcfile_path
5406-
5407 # Set to "yes" if exported symbols are required.
5408 always_export_symbols=$always_export_symbols
5409
5410@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms
5411 # Commands necessary for linking programs (against libraries) with templates.
5412 prelink_cmds=$lt_prelink_cmds
5413
5414+# Commands necessary for finishing linking programs.
5415+postlink_cmds=$lt_postlink_cmds
5416+
5417 # Specify filename containing input files.
5418 file_list_spec=$lt_file_list_spec
5419
5420@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5421 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5422 # text mode, it properly converts lines to CR/LF. This bash problem
5423 # is reportedly fixed, but why not run on old versions too?
5424- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5425- || (rm -f "$cfgfile"; exit 1)
5426-
5427- case $xsi_shell in
5428- yes)
5429- cat << \_LT_EOF >> "$cfgfile"
5430-
5431-# func_dirname file append nondir_replacement
5432-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5433-# otherwise set result to NONDIR_REPLACEMENT.
5434-func_dirname ()
5435-{
5436- case ${1} in
5437- */*) func_dirname_result="${1%/*}${2}" ;;
5438- * ) func_dirname_result="${3}" ;;
5439- esac
5440-}
5441-
5442-# func_basename file
5443-func_basename ()
5444-{
5445- func_basename_result="${1##*/}"
5446-}
5447-
5448-# func_dirname_and_basename file append nondir_replacement
5449-# perform func_basename and func_dirname in a single function
5450-# call:
5451-# dirname: Compute the dirname of FILE. If nonempty,
5452-# add APPEND to the result, otherwise set result
5453-# to NONDIR_REPLACEMENT.
5454-# value returned in "$func_dirname_result"
5455-# basename: Compute filename of FILE.
5456-# value retuned in "$func_basename_result"
5457-# Implementation must be kept synchronized with func_dirname
5458-# and func_basename. For efficiency, we do not delegate to
5459-# those functions but instead duplicate the functionality here.
5460-func_dirname_and_basename ()
5461-{
5462- case ${1} in
5463- */*) func_dirname_result="${1%/*}${2}" ;;
5464- * ) func_dirname_result="${3}" ;;
5465- esac
5466- func_basename_result="${1##*/}"
5467-}
5468-
5469-# func_stripname prefix suffix name
5470-# strip PREFIX and SUFFIX off of NAME.
5471-# PREFIX and SUFFIX must not contain globbing or regex special
5472-# characters, hashes, percent signs, but SUFFIX may contain a leading
5473-# dot (in which case that matches only a dot).
5474-func_stripname ()
5475-{
5476- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5477- # positional parameters, so assign one to ordinary parameter first.
5478- func_stripname_result=${3}
5479- func_stripname_result=${func_stripname_result#"${1}"}
5480- func_stripname_result=${func_stripname_result%"${2}"}
5481-}
5482-
5483-# func_opt_split
5484-func_opt_split ()
5485-{
5486- func_opt_split_opt=${1%%=*}
5487- func_opt_split_arg=${1#*=}
5488-}
5489-
5490-# func_lo2o object
5491-func_lo2o ()
5492-{
5493- case ${1} in
5494- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5495- *) func_lo2o_result=${1} ;;
5496- esac
5497-}
5498-
5499-# func_xform libobj-or-source
5500-func_xform ()
5501-{
5502- func_xform_result=${1%.*}.lo
5503-}
5504-
5505-# func_arith arithmetic-term...
5506-func_arith ()
5507-{
5508- func_arith_result=$(( $* ))
5509-}
5510-
5511-# func_len string
5512-# STRING may not start with a hyphen.
5513-func_len ()
5514-{
5515- func_len_result=${#1}
5516-}
5517-
5518-_LT_EOF
5519- ;;
5520- *) # Bourne compatible functions.
5521- cat << \_LT_EOF >> "$cfgfile"
5522-
5523-# func_dirname file append nondir_replacement
5524-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5525-# otherwise set result to NONDIR_REPLACEMENT.
5526-func_dirname ()
5527-{
5528- # Extract subdirectory from the argument.
5529- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5530- if test "X$func_dirname_result" = "X${1}"; then
5531- func_dirname_result="${3}"
5532- else
5533- func_dirname_result="$func_dirname_result${2}"
5534- fi
5535-}
5536-
5537-# func_basename file
5538-func_basename ()
5539-{
5540- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5541-}
5542-
5543-
5544-# func_stripname prefix suffix name
5545-# strip PREFIX and SUFFIX off of NAME.
5546-# PREFIX and SUFFIX must not contain globbing or regex special
5547-# characters, hashes, percent signs, but SUFFIX may contain a leading
5548-# dot (in which case that matches only a dot).
5549-# func_strip_suffix prefix name
5550-func_stripname ()
5551-{
5552- case ${2} in
5553- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5554- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5555- esac
5556-}
5557-
5558-# sed scripts:
5559-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5560-my_sed_long_arg='1s/^-[^=]*=//'
5561-
5562-# func_opt_split
5563-func_opt_split ()
5564-{
5565- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5566- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5567-}
5568-
5569-# func_lo2o object
5570-func_lo2o ()
5571-{
5572- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5573-}
5574-
5575-# func_xform libobj-or-source
5576-func_xform ()
5577-{
5578- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5579-}
5580-
5581-# func_arith arithmetic-term...
5582-func_arith ()
5583-{
5584- func_arith_result=`expr "$@"`
5585-}
5586-
5587-# func_len string
5588-# STRING may not start with a hyphen.
5589-func_len ()
5590-{
5591- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5592-}
5593-
5594-_LT_EOF
5595-esac
5596-
5597-case $lt_shell_append in
5598- yes)
5599- cat << \_LT_EOF >> "$cfgfile"
5600-
5601-# func_append var value
5602-# Append VALUE to the end of shell variable VAR.
5603-func_append ()
5604-{
5605- eval "$1+=\$2"
5606-}
5607-_LT_EOF
5608- ;;
5609- *)
5610- cat << \_LT_EOF >> "$cfgfile"
5611-
5612-# func_append var value
5613-# Append VALUE to the end of shell variable VAR.
5614-func_append ()
5615-{
5616- eval "$1=\$$1\$2"
5617-}
5618-
5619-_LT_EOF
5620- ;;
5621- esac
5622-
5623-
5624- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5625- || (rm -f "$cfgfile"; exit 1)
5626-
5627- mv -f "$cfgfile" "$ofile" ||
5628+ sed '$q' "$ltmain" >> "$cfgfile" \
5629+ || (rm -f "$cfgfile"; exit 1)
5630+
5631+ if test x"$xsi_shell" = xyes; then
5632+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5633+func_dirname ()\
5634+{\
5635+\ case ${1} in\
5636+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5637+\ * ) func_dirname_result="${3}" ;;\
5638+\ esac\
5639+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5640+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5641+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5642+test 0 -eq $? || _lt_function_replace_fail=:
5643+
5644+
5645+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5646+func_basename ()\
5647+{\
5648+\ func_basename_result="${1##*/}"\
5649+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5650+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5651+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5652+test 0 -eq $? || _lt_function_replace_fail=:
5653+
5654+
5655+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5656+func_dirname_and_basename ()\
5657+{\
5658+\ case ${1} in\
5659+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5660+\ * ) func_dirname_result="${3}" ;;\
5661+\ esac\
5662+\ func_basename_result="${1##*/}"\
5663+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5664+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5665+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5666+test 0 -eq $? || _lt_function_replace_fail=:
5667+
5668+
5669+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5670+func_stripname ()\
5671+{\
5672+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5673+\ # positional parameters, so assign one to ordinary parameter first.\
5674+\ func_stripname_result=${3}\
5675+\ func_stripname_result=${func_stripname_result#"${1}"}\
5676+\ func_stripname_result=${func_stripname_result%"${2}"}\
5677+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5678+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5679+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5680+test 0 -eq $? || _lt_function_replace_fail=:
5681+
5682+
5683+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5684+func_split_long_opt ()\
5685+{\
5686+\ func_split_long_opt_name=${1%%=*}\
5687+\ func_split_long_opt_arg=${1#*=}\
5688+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5689+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5690+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5691+test 0 -eq $? || _lt_function_replace_fail=:
5692+
5693+
5694+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5695+func_split_short_opt ()\
5696+{\
5697+\ func_split_short_opt_arg=${1#??}\
5698+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5699+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5700+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5701+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5702+test 0 -eq $? || _lt_function_replace_fail=:
5703+
5704+
5705+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5706+func_lo2o ()\
5707+{\
5708+\ case ${1} in\
5709+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5710+\ *) func_lo2o_result=${1} ;;\
5711+\ esac\
5712+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5713+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5714+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5715+test 0 -eq $? || _lt_function_replace_fail=:
5716+
5717+
5718+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5719+func_xform ()\
5720+{\
5721+ func_xform_result=${1%.*}.lo\
5722+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5723+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5724+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5725+test 0 -eq $? || _lt_function_replace_fail=:
5726+
5727+
5728+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5729+func_arith ()\
5730+{\
5731+ func_arith_result=$(( $* ))\
5732+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5733+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5734+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5735+test 0 -eq $? || _lt_function_replace_fail=:
5736+
5737+
5738+ sed -e '/^func_len ()$/,/^} # func_len /c\
5739+func_len ()\
5740+{\
5741+ func_len_result=${#1}\
5742+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5743+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5744+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5745+test 0 -eq $? || _lt_function_replace_fail=:
5746+
5747+fi
5748+
5749+if test x"$lt_shell_append" = xyes; then
5750+ sed -e '/^func_append ()$/,/^} # func_append /c\
5751+func_append ()\
5752+{\
5753+ eval "${1}+=\\${2}"\
5754+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5755+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5756+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5757+test 0 -eq $? || _lt_function_replace_fail=:
5758+
5759+
5760+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5761+func_append_quoted ()\
5762+{\
5763+\ func_quote_for_eval "${2}"\
5764+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5765+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5766+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5767+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5768+test 0 -eq $? || _lt_function_replace_fail=:
5769+
5770+
5771+ # Save a `func_append' function call where possible by direct use of '+='
5772+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5773+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5774+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5775+ test 0 -eq $? || _lt_function_replace_fail=:
5776+else
5777+ # Save a `func_append' function call even when '+=' is not available
5778+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5779+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5780+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5781+ test 0 -eq $? || _lt_function_replace_fail=:
5782+fi
5783+
5784+if test x"$_lt_function_replace_fail" = x":"; then
5785+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5786+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5787+fi
5788+
5789+
5790+ mv -f "$cfgfile" "$ofile" ||
5791 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5792 chmod +x "$ofile"
5793
5794diff --git a/gprof/configure b/gprof/configure
5795index c23692e5c3d..9f936a5b03d 100755
5796--- a/gprof/configure
5797+++ b/gprof/configure
5798@@ -662,8 +662,11 @@ OTOOL
5799 LIPO
5800 NMEDIT
5801 DSYMUTIL
5802+MANIFEST_TOOL
5803 RANLIB
5804+ac_ct_AR
5805 AR
5806+DLLTOOL
5807 OBJDUMP
5808 LN_S
5809 NM
5810@@ -780,6 +783,7 @@ enable_static
5811 with_pic
5812 enable_fast_install
5813 with_gnu_ld
5814+with_libtool_sysroot
5815 enable_libtool_lock
5816 enable_plugins
5817 enable_largefile
5818@@ -1442,6 +1446,8 @@ Optional Packages:
5819 --with-pic try to use only PIC/non-PIC objects [default=use
5820 both]
5821 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5822+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5823+ (or the compiler's sysroot if not specified).
5824
5825 Some influential environment variables:
5826 CC C compiler command
5827@@ -5124,8 +5130,8 @@ esac
5828
5829
5830
5831-macro_version='2.2.7a'
5832-macro_revision='1.3134'
5833+macro_version='2.4'
5834+macro_revision='1.3293'
5835
5836
5837
5838@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5840 $as_echo_n "checking how to print strings... " >&6; }
5841 # Test print first, because it will be a builtin if present.
5842-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5843+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5844 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5845 ECHO='print -r --'
5846 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5847@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5848 # Try some XSI features
5849 xsi_shell=no
5850 ( _lt_dummy="a/b/c"
5851- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5852- = c,a/b,, \
5853+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5854+ = c,a/b,b/c, \
5855 && eval 'test $(( 1 + 1 )) -eq 2 \
5856 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5857 && xsi_shell=yes
5858@@ -5901,6 +5907,80 @@ esac
5859
5860
5861
5862+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5863+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5864+if ${lt_cv_to_host_file_cmd+:} false; then :
5865+ $as_echo_n "(cached) " >&6
5866+else
5867+ case $host in
5868+ *-*-mingw* )
5869+ case $build in
5870+ *-*-mingw* ) # actually msys
5871+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5872+ ;;
5873+ *-*-cygwin* )
5874+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5875+ ;;
5876+ * ) # otherwise, assume *nix
5877+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5878+ ;;
5879+ esac
5880+ ;;
5881+ *-*-cygwin* )
5882+ case $build in
5883+ *-*-mingw* ) # actually msys
5884+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5885+ ;;
5886+ *-*-cygwin* )
5887+ lt_cv_to_host_file_cmd=func_convert_file_noop
5888+ ;;
5889+ * ) # otherwise, assume *nix
5890+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5891+ ;;
5892+ esac
5893+ ;;
5894+ * ) # unhandled hosts (and "normal" native builds)
5895+ lt_cv_to_host_file_cmd=func_convert_file_noop
5896+ ;;
5897+esac
5898+
5899+fi
5900+
5901+to_host_file_cmd=$lt_cv_to_host_file_cmd
5902+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5903+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5904+
5905+
5906+
5907+
5908+
5909+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5910+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5911+if ${lt_cv_to_tool_file_cmd+:} false; then :
5912+ $as_echo_n "(cached) " >&6
5913+else
5914+ #assume ordinary cross tools, or native build.
5915+lt_cv_to_tool_file_cmd=func_convert_file_noop
5916+case $host in
5917+ *-*-mingw* )
5918+ case $build in
5919+ *-*-mingw* ) # actually msys
5920+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5921+ ;;
5922+ esac
5923+ ;;
5924+esac
5925+
5926+fi
5927+
5928+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5929+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5930+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5931+
5932+
5933+
5934+
5935+
5936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5937 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5938 if ${lt_cv_ld_reload_flag+:} false; then :
5939@@ -5917,6 +5997,11 @@ case $reload_flag in
5940 esac
5941 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5942 case $host_os in
5943+ cygwin* | mingw* | pw32* | cegcc*)
5944+ if test "$GCC" != yes; then
5945+ reload_cmds=false
5946+ fi
5947+ ;;
5948 darwin*)
5949 if test "$GCC" = yes; then
5950 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5951@@ -6085,7 +6170,8 @@ mingw* | pw32*)
5952 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5953 lt_cv_file_magic_cmd='func_win32_libid'
5954 else
5955- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5956+ # Keep this pattern in sync with the one in func_win32_libid.
5957+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5958 lt_cv_file_magic_cmd='$OBJDUMP -f'
5959 fi
5960 ;;
5961@@ -6239,6 +6325,21 @@ esac
5962 fi
5963 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5964 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5965+
5966+file_magic_glob=
5967+want_nocaseglob=no
5968+if test "$build" = "$host"; then
5969+ case $host_os in
5970+ mingw* | pw32*)
5971+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5972+ want_nocaseglob=yes
5973+ else
5974+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5975+ fi
5976+ ;;
5977+ esac
5978+fi
5979+
5980 file_magic_cmd=$lt_cv_file_magic_cmd
5981 deplibs_check_method=$lt_cv_deplibs_check_method
5982 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5983@@ -6252,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5984
5985
5986
5987+
5988+
5989+
5990+
5991+
5992+
5993+
5994+
5995+
5996+
5997
5998
5999 if test -n "$ac_tool_prefix"; then
6000- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6001-set dummy ${ac_tool_prefix}ar; ac_word=$2
6002+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
6003+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
6004+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6005+$as_echo_n "checking for $ac_word... " >&6; }
6006+if ${ac_cv_prog_DLLTOOL+:} false; then :
6007+ $as_echo_n "(cached) " >&6
6008+else
6009+ if test -n "$DLLTOOL"; then
6010+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
6011+else
6012+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6013+for as_dir in $PATH
6014+do
6015+ IFS=$as_save_IFS
6016+ test -z "$as_dir" && as_dir=.
6017+ for ac_exec_ext in '' $ac_executable_extensions; do
6018+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6019+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6020+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6021+ break 2
6022+ fi
6023+done
6024+ done
6025+IFS=$as_save_IFS
6026+
6027+fi
6028+fi
6029+DLLTOOL=$ac_cv_prog_DLLTOOL
6030+if test -n "$DLLTOOL"; then
6031+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
6032+$as_echo "$DLLTOOL" >&6; }
6033+else
6034+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6035+$as_echo "no" >&6; }
6036+fi
6037+
6038+
6039+fi
6040+if test -z "$ac_cv_prog_DLLTOOL"; then
6041+ ac_ct_DLLTOOL=$DLLTOOL
6042+ # Extract the first word of "dlltool", so it can be a program name with args.
6043+set dummy dlltool; ac_word=$2
6044+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6045+$as_echo_n "checking for $ac_word... " >&6; }
6046+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
6047+ $as_echo_n "(cached) " >&6
6048+else
6049+ if test -n "$ac_ct_DLLTOOL"; then
6050+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6051+else
6052+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6053+for as_dir in $PATH
6054+do
6055+ IFS=$as_save_IFS
6056+ test -z "$as_dir" && as_dir=.
6057+ for ac_exec_ext in '' $ac_executable_extensions; do
6058+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6059+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6060+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6061+ break 2
6062+ fi
6063+done
6064+ done
6065+IFS=$as_save_IFS
6066+
6067+fi
6068+fi
6069+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6070+if test -n "$ac_ct_DLLTOOL"; then
6071+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6072+$as_echo "$ac_ct_DLLTOOL" >&6; }
6073+else
6074+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6075+$as_echo "no" >&6; }
6076+fi
6077+
6078+ if test "x$ac_ct_DLLTOOL" = x; then
6079+ DLLTOOL="false"
6080+ else
6081+ case $cross_compiling:$ac_tool_warned in
6082+yes:)
6083+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6084+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6085+ac_tool_warned=yes ;;
6086+esac
6087+ DLLTOOL=$ac_ct_DLLTOOL
6088+ fi
6089+else
6090+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6091+fi
6092+
6093+test -z "$DLLTOOL" && DLLTOOL=dlltool
6094+
6095+
6096+
6097+
6098+
6099+
6100+
6101+
6102+
6103+
6104+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6105+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6106+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
6107+ $as_echo_n "(cached) " >&6
6108+else
6109+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6110+
6111+case $host_os in
6112+cygwin* | mingw* | pw32* | cegcc*)
6113+ # two different shell functions defined in ltmain.sh
6114+ # decide which to use based on capabilities of $DLLTOOL
6115+ case `$DLLTOOL --help 2>&1` in
6116+ *--identify-strict*)
6117+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6118+ ;;
6119+ *)
6120+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6121+ ;;
6122+ esac
6123+ ;;
6124+*)
6125+ # fallback: assume linklib IS sharedlib
6126+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6127+ ;;
6128+esac
6129+
6130+fi
6131+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6132+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6133+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6134+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6135+
6136+
6137+
6138+
6139+
6140+
6141+
6142+if test -n "$ac_tool_prefix"; then
6143+ for ac_prog in ar
6144+ do
6145+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6146+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6148 $as_echo_n "checking for $ac_word... " >&6; }
6149 if ${ac_cv_prog_AR+:} false; then :
6150@@ -6272,7 +6526,7 @@ do
6151 test -z "$as_dir" && as_dir=.
6152 for ac_exec_ext in '' $ac_executable_extensions; do
6153 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6154- ac_cv_prog_AR="${ac_tool_prefix}ar"
6155+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6156 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6157 break 2
6158 fi
6159@@ -6292,11 +6546,15 @@ $as_echo "no" >&6; }
6160 fi
6161
6162
6163+ test -n "$AR" && break
6164+ done
6165 fi
6166-if test -z "$ac_cv_prog_AR"; then
6167+if test -z "$AR"; then
6168 ac_ct_AR=$AR
6169- # Extract the first word of "ar", so it can be a program name with args.
6170-set dummy ar; ac_word=$2
6171+ for ac_prog in ar
6172+do
6173+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6174+set dummy $ac_prog; ac_word=$2
6175 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6176 $as_echo_n "checking for $ac_word... " >&6; }
6177 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6178@@ -6312,7 +6570,7 @@ do
6179 test -z "$as_dir" && as_dir=.
6180 for ac_exec_ext in '' $ac_executable_extensions; do
6181 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6182- ac_cv_prog_ac_ct_AR="ar"
6183+ ac_cv_prog_ac_ct_AR="$ac_prog"
6184 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6185 break 2
6186 fi
6187@@ -6331,6 +6589,10 @@ else
6188 $as_echo "no" >&6; }
6189 fi
6190
6191+
6192+ test -n "$ac_ct_AR" && break
6193+done
6194+
6195 if test "x$ac_ct_AR" = x; then
6196 AR="false"
6197 else
6198@@ -6342,16 +6604,72 @@ ac_tool_warned=yes ;;
6199 esac
6200 AR=$ac_ct_AR
6201 fi
6202-else
6203- AR="$ac_cv_prog_AR"
6204 fi
6205
6206-test -z "$AR" && AR=ar
6207-test -z "$AR_FLAGS" && AR_FLAGS=cru
6208+: ${AR=ar}
6209+: ${AR_FLAGS=cru}
6210+
6211+
6212+
6213+
6214+
6215+
6216+
6217+
6218+
6219+
6220+
6221+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6222+$as_echo_n "checking for archiver @FILE support... " >&6; }
6223+if ${lt_cv_ar_at_file+:} false; then :
6224+ $as_echo_n "(cached) " >&6
6225+else
6226+ lt_cv_ar_at_file=no
6227+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6228+/* end confdefs.h. */
6229+
6230+int
6231+main ()
6232+{
6233
6234+ ;
6235+ return 0;
6236+}
6237+_ACEOF
6238+if ac_fn_c_try_compile "$LINENO"; then :
6239+ echo conftest.$ac_objext > conftest.lst
6240+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6241+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6242+ (eval $lt_ar_try) 2>&5
6243+ ac_status=$?
6244+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6245+ test $ac_status = 0; }
6246+ if test "$ac_status" -eq 0; then
6247+ # Ensure the archiver fails upon bogus file names.
6248+ rm -f conftest.$ac_objext libconftest.a
6249+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6250+ (eval $lt_ar_try) 2>&5
6251+ ac_status=$?
6252+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6253+ test $ac_status = 0; }
6254+ if test "$ac_status" -ne 0; then
6255+ lt_cv_ar_at_file=@
6256+ fi
6257+ fi
6258+ rm -f conftest.* libconftest.a
6259
6260+fi
6261+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6262
6263+fi
6264+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6265+$as_echo "$lt_cv_ar_at_file" >&6; }
6266
6267+if test "x$lt_cv_ar_at_file" = xno; then
6268+ archiver_list_spec=
6269+else
6270+ archiver_list_spec=$lt_cv_ar_at_file
6271+fi
6272
6273
6274
6275@@ -6693,8 +7011,8 @@ esac
6276 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6277
6278 # Transform an extracted symbol line into symbol name and symbol address
6279-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6280-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'"
6281+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6282+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'"
6283
6284 # Handle CRLF in mingw tool chain
6285 opt_cr=
6286@@ -6730,6 +7048,7 @@ for ac_symprfx in "" "_"; do
6287 else
6288 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6289 fi
6290+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6291
6292 # Check to see that the pipe works correctly.
6293 pipe_works=no
6294@@ -6771,6 +7090,18 @@ _LT_EOF
6295 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6296 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6297 cat <<_LT_EOF > conftest.$ac_ext
6298+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6299+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6300+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6301+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6302+# define LT_DLSYM_CONST
6303+#elif defined(__osf__)
6304+/* This system does not cope well with relocations in const data. */
6305+# define LT_DLSYM_CONST
6306+#else
6307+# define LT_DLSYM_CONST const
6308+#endif
6309+
6310 #ifdef __cplusplus
6311 extern "C" {
6312 #endif
6313@@ -6782,7 +7113,7 @@ _LT_EOF
6314 cat <<_LT_EOF >> conftest.$ac_ext
6315
6316 /* The mapping between symbol names and symbols. */
6317-const struct {
6318+LT_DLSYM_CONST struct {
6319 const char *name;
6320 void *address;
6321 }
6322@@ -6808,8 +7139,8 @@ static const void *lt_preloaded_setup() {
6323 _LT_EOF
6324 # Now try linking the two files.
6325 mv conftest.$ac_objext conftstm.$ac_objext
6326- lt_save_LIBS="$LIBS"
6327- lt_save_CFLAGS="$CFLAGS"
6328+ lt_globsym_save_LIBS=$LIBS
6329+ lt_globsym_save_CFLAGS=$CFLAGS
6330 LIBS="conftstm.$ac_objext"
6331 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6332 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6333@@ -6819,8 +7150,8 @@ _LT_EOF
6334 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6335 pipe_works=yes
6336 fi
6337- LIBS="$lt_save_LIBS"
6338- CFLAGS="$lt_save_CFLAGS"
6339+ LIBS=$lt_globsym_save_LIBS
6340+ CFLAGS=$lt_globsym_save_CFLAGS
6341 else
6342 echo "cannot find nm_test_func in $nlist" >&5
6343 fi
6344@@ -6857,6 +7188,20 @@ else
6345 $as_echo "ok" >&6; }
6346 fi
6347
6348+# Response file support.
6349+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6350+ nm_file_list_spec='@'
6351+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6352+ nm_file_list_spec='@'
6353+fi
6354+
6355+
6356+
6357+
6358+
6359+
6360+
6361+
6362
6363
6364
6365@@ -6873,6 +7218,41 @@ fi
6366
6367
6368
6369+
6370+
6371+
6372+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6373+$as_echo_n "checking for sysroot... " >&6; }
6374+
6375+# Check whether --with-libtool-sysroot was given.
6376+if test "${with_libtool_sysroot+set}" = set; then :
6377+ withval=$with_libtool_sysroot;
6378+else
6379+ with_libtool_sysroot=no
6380+fi
6381+
6382+
6383+lt_sysroot=
6384+case ${with_libtool_sysroot} in #(
6385+ yes)
6386+ if test "$GCC" = yes; then
6387+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6388+ fi
6389+ ;; #(
6390+ /*)
6391+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6392+ ;; #(
6393+ no|'')
6394+ ;; #(
6395+ *)
6396+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6397+$as_echo "${with_libtool_sysroot}" >&6; }
6398+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
6399+ ;;
6400+esac
6401+
6402+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6403+$as_echo "${lt_sysroot:-no}" >&6; }
6404
6405
6406
6407@@ -7084,6 +7464,123 @@ esac
6408
6409 need_locks="$enable_libtool_lock"
6410
6411+if test -n "$ac_tool_prefix"; then
6412+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6413+set dummy ${ac_tool_prefix}mt; ac_word=$2
6414+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6415+$as_echo_n "checking for $ac_word... " >&6; }
6416+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
6417+ $as_echo_n "(cached) " >&6
6418+else
6419+ if test -n "$MANIFEST_TOOL"; then
6420+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6421+else
6422+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6423+for as_dir in $PATH
6424+do
6425+ IFS=$as_save_IFS
6426+ test -z "$as_dir" && as_dir=.
6427+ for ac_exec_ext in '' $ac_executable_extensions; do
6428+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6429+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6430+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6431+ break 2
6432+ fi
6433+done
6434+ done
6435+IFS=$as_save_IFS
6436+
6437+fi
6438+fi
6439+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6440+if test -n "$MANIFEST_TOOL"; then
6441+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6442+$as_echo "$MANIFEST_TOOL" >&6; }
6443+else
6444+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6445+$as_echo "no" >&6; }
6446+fi
6447+
6448+
6449+fi
6450+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6451+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6452+ # Extract the first word of "mt", so it can be a program name with args.
6453+set dummy mt; ac_word=$2
6454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6455+$as_echo_n "checking for $ac_word... " >&6; }
6456+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
6457+ $as_echo_n "(cached) " >&6
6458+else
6459+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6460+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6461+else
6462+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6463+for as_dir in $PATH
6464+do
6465+ IFS=$as_save_IFS
6466+ test -z "$as_dir" && as_dir=.
6467+ for ac_exec_ext in '' $ac_executable_extensions; do
6468+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6469+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6470+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6471+ break 2
6472+ fi
6473+done
6474+ done
6475+IFS=$as_save_IFS
6476+
6477+fi
6478+fi
6479+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6480+if test -n "$ac_ct_MANIFEST_TOOL"; then
6481+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6482+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6483+else
6484+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6485+$as_echo "no" >&6; }
6486+fi
6487+
6488+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6489+ MANIFEST_TOOL=":"
6490+ else
6491+ case $cross_compiling:$ac_tool_warned in
6492+yes:)
6493+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6494+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6495+ac_tool_warned=yes ;;
6496+esac
6497+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6498+ fi
6499+else
6500+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6501+fi
6502+
6503+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6504+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6505+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6506+if ${lt_cv_path_mainfest_tool+:} false; then :
6507+ $as_echo_n "(cached) " >&6
6508+else
6509+ lt_cv_path_mainfest_tool=no
6510+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6511+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6512+ cat conftest.err >&5
6513+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6514+ lt_cv_path_mainfest_tool=yes
6515+ fi
6516+ rm -f conftest*
6517+fi
6518+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6519+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6520+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6521+ MANIFEST_TOOL=:
6522+fi
6523+
6524+
6525+
6526+
6527+
6528
6529 case $host_os in
6530 rhapsody* | darwin*)
6531@@ -7647,6 +8144,8 @@ _LT_EOF
6532 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6533 echo "$AR cru libconftest.a conftest.o" >&5
6534 $AR cru libconftest.a conftest.o 2>&5
6535+ echo "$RANLIB libconftest.a" >&5
6536+ $RANLIB libconftest.a 2>&5
6537 cat > conftest.c << _LT_EOF
6538 int main() { return 0;}
6539 _LT_EOF
6540@@ -7842,7 +8341,8 @@ fi
6541 LIBTOOL_DEPS="$ltmain"
6542
6543 # Always use our own libtool.
6544-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6545+LIBTOOL='$(SHELL) $(top_builddir)'
6546+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6547
6548
6549
6550@@ -7931,7 +8431,7 @@ aix3*)
6551 esac
6552
6553 # Global variables:
6554-ofile=libtool
6555+ofile=${host_alias}-libtool
6556 can_build_shared=yes
6557
6558 # All known linkers require a `.a' archive for static linking (except MSVC,
6559@@ -8229,8 +8729,6 @@ fi
6560 lt_prog_compiler_pic=
6561 lt_prog_compiler_static=
6562
6563-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6564-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6565
6566 if test "$GCC" = yes; then
6567 lt_prog_compiler_wl='-Wl,'
6568@@ -8396,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6569 lt_prog_compiler_pic='--shared'
6570 lt_prog_compiler_static='--static'
6571 ;;
6572+ nagfor*)
6573+ # NAG Fortran compiler
6574+ lt_prog_compiler_wl='-Wl,-Wl,,'
6575+ lt_prog_compiler_pic='-PIC'
6576+ lt_prog_compiler_static='-Bstatic'
6577+ ;;
6578 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6579 # Portland Group compilers (*not* the Pentium gcc compiler,
6580 # which looks to be a dead project)
6581@@ -8458,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6582 lt_prog_compiler_pic='-KPIC'
6583 lt_prog_compiler_static='-Bstatic'
6584 case $cc_basename in
6585- f77* | f90* | f95*)
6586+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6587 lt_prog_compiler_wl='-Qoption ld ';;
6588 *)
6589 lt_prog_compiler_wl='-Wl,';;
6590@@ -8515,13 +9019,17 @@ case $host_os in
6591 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6592 ;;
6593 esac
6594-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6595-$as_echo "$lt_prog_compiler_pic" >&6; }
6596-
6597-
6598-
6599-
6600
6601+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6602+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6603+if ${lt_cv_prog_compiler_pic+:} false; then :
6604+ $as_echo_n "(cached) " >&6
6605+else
6606+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6607+fi
6608+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6609+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6610+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6611
6612 #
6613 # Check to make sure the PIC flag actually works.
6614@@ -8582,6 +9090,11 @@ fi
6615
6616
6617
6618+
6619+
6620+
6621+
6622+
6623 #
6624 # Check to make sure the static flag actually works.
6625 #
6626@@ -8932,7 +9445,8 @@ _LT_EOF
6627 allow_undefined_flag=unsupported
6628 always_export_symbols=no
6629 enable_shared_with_static_runtimes=yes
6630- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6631+ 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'
6632+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6633
6634 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6635 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6636@@ -9031,12 +9545,12 @@ _LT_EOF
6637 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6638 hardcode_libdir_flag_spec=
6639 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6640- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6641+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6642 if test "x$supports_anon_versioning" = xyes; then
6643 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6644 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6645 echo "local: *; };" >> $output_objdir/$libname.ver~
6646- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6647+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6648 fi
6649 ;;
6650 esac
6651@@ -9050,8 +9564,8 @@ _LT_EOF
6652 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6653 wlarc=
6654 else
6655- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6656- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6657+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6658+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6659 fi
6660 ;;
6661
6662@@ -9069,8 +9583,8 @@ _LT_EOF
6663
6664 _LT_EOF
6665 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6666- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6667- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6668+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6669+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6670 else
6671 ld_shlibs=no
6672 fi
6673@@ -9116,8 +9630,8 @@ _LT_EOF
6674
6675 *)
6676 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6677- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6678- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6679+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6680+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6681 else
6682 ld_shlibs=no
6683 fi
6684@@ -9247,7 +9761,13 @@ _LT_EOF
6685 allow_undefined_flag='-berok'
6686 # Determine the default libpath from the value encoded in an
6687 # empty executable.
6688- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6689+ if test "${lt_cv_aix_libpath+set}" = set; then
6690+ aix_libpath=$lt_cv_aix_libpath
6691+else
6692+ if ${lt_cv_aix_libpath_+:} false; then :
6693+ $as_echo_n "(cached) " >&6
6694+else
6695+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6696 /* end confdefs.h. */
6697
6698 int
6699@@ -9260,22 +9780,29 @@ main ()
6700 _ACEOF
6701 if ac_fn_c_try_link "$LINENO"; then :
6702
6703-lt_aix_libpath_sed='
6704- /Import File Strings/,/^$/ {
6705- /^0/ {
6706- s/^0 *\(.*\)$/\1/
6707- p
6708- }
6709- }'
6710-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6711-# Check for a 64-bit object if we didn't find anything.
6712-if test -z "$aix_libpath"; then
6713- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6714-fi
6715+ lt_aix_libpath_sed='
6716+ /Import File Strings/,/^$/ {
6717+ /^0/ {
6718+ s/^0 *\([^ ]*\) *$/\1/
6719+ p
6720+ }
6721+ }'
6722+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6723+ # Check for a 64-bit object if we didn't find anything.
6724+ if test -z "$lt_cv_aix_libpath_"; then
6725+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6726+ fi
6727 fi
6728 rm -f core conftest.err conftest.$ac_objext \
6729 conftest$ac_exeext conftest.$ac_ext
6730-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6731+ if test -z "$lt_cv_aix_libpath_"; then
6732+ lt_cv_aix_libpath_="/usr/lib:/lib"
6733+ fi
6734+
6735+fi
6736+
6737+ aix_libpath=$lt_cv_aix_libpath_
6738+fi
6739
6740 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6741 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"
6742@@ -9287,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6743 else
6744 # Determine the default libpath from the value encoded in an
6745 # empty executable.
6746- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6747+ if test "${lt_cv_aix_libpath+set}" = set; then
6748+ aix_libpath=$lt_cv_aix_libpath
6749+else
6750+ if ${lt_cv_aix_libpath_+:} false; then :
6751+ $as_echo_n "(cached) " >&6
6752+else
6753+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6754 /* end confdefs.h. */
6755
6756 int
6757@@ -9300,22 +9833,29 @@ main ()
6758 _ACEOF
6759 if ac_fn_c_try_link "$LINENO"; then :
6760
6761-lt_aix_libpath_sed='
6762- /Import File Strings/,/^$/ {
6763- /^0/ {
6764- s/^0 *\(.*\)$/\1/
6765- p
6766- }
6767- }'
6768-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6769-# Check for a 64-bit object if we didn't find anything.
6770-if test -z "$aix_libpath"; then
6771- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6772-fi
6773+ lt_aix_libpath_sed='
6774+ /Import File Strings/,/^$/ {
6775+ /^0/ {
6776+ s/^0 *\([^ ]*\) *$/\1/
6777+ p
6778+ }
6779+ }'
6780+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6781+ # Check for a 64-bit object if we didn't find anything.
6782+ if test -z "$lt_cv_aix_libpath_"; then
6783+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6784+ fi
6785 fi
6786 rm -f core conftest.err conftest.$ac_objext \
6787 conftest$ac_exeext conftest.$ac_ext
6788-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6789+ if test -z "$lt_cv_aix_libpath_"; then
6790+ lt_cv_aix_libpath_="/usr/lib:/lib"
6791+ fi
6792+
6793+fi
6794+
6795+ aix_libpath=$lt_cv_aix_libpath_
6796+fi
6797
6798 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6799 # Warning - without using the other run time loading flags,
6800@@ -9360,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6801 # Microsoft Visual C++.
6802 # hardcode_libdir_flag_spec is actually meaningless, as there is
6803 # no search path for DLLs.
6804- hardcode_libdir_flag_spec=' '
6805- allow_undefined_flag=unsupported
6806- # Tell ltmain to make .lib files, not .a files.
6807- libext=lib
6808- # Tell ltmain to make .dll files, not .so files.
6809- shrext_cmds=".dll"
6810- # FIXME: Setting linknames here is a bad hack.
6811- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6812- # The linker will automatically build a .lib file if we build a DLL.
6813- old_archive_from_new_cmds='true'
6814- # FIXME: Should let the user specify the lib program.
6815- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6816- fix_srcfile_path='`cygpath -w "$srcfile"`'
6817- enable_shared_with_static_runtimes=yes
6818+ case $cc_basename in
6819+ cl*)
6820+ # Native MSVC
6821+ hardcode_libdir_flag_spec=' '
6822+ allow_undefined_flag=unsupported
6823+ always_export_symbols=yes
6824+ file_list_spec='@'
6825+ # Tell ltmain to make .lib files, not .a files.
6826+ libext=lib
6827+ # Tell ltmain to make .dll files, not .so files.
6828+ shrext_cmds=".dll"
6829+ # FIXME: Setting linknames here is a bad hack.
6830+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6831+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6832+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6833+ else
6834+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6835+ fi~
6836+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6837+ linknames='
6838+ # The linker will not automatically build a static lib if we build a DLL.
6839+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6840+ enable_shared_with_static_runtimes=yes
6841+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6842+ # Don't use ranlib
6843+ old_postinstall_cmds='chmod 644 $oldlib'
6844+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6845+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6846+ case $lt_outputfile in
6847+ *.exe|*.EXE) ;;
6848+ *)
6849+ lt_outputfile="$lt_outputfile.exe"
6850+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6851+ ;;
6852+ esac~
6853+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6854+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6855+ $RM "$lt_outputfile.manifest";
6856+ fi'
6857+ ;;
6858+ *)
6859+ # Assume MSVC wrapper
6860+ hardcode_libdir_flag_spec=' '
6861+ allow_undefined_flag=unsupported
6862+ # Tell ltmain to make .lib files, not .a files.
6863+ libext=lib
6864+ # Tell ltmain to make .dll files, not .so files.
6865+ shrext_cmds=".dll"
6866+ # FIXME: Setting linknames here is a bad hack.
6867+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6868+ # The linker will automatically build a .lib file if we build a DLL.
6869+ old_archive_from_new_cmds='true'
6870+ # FIXME: Should let the user specify the lib program.
6871+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6872+ enable_shared_with_static_runtimes=yes
6873+ ;;
6874+ esac
6875 ;;
6876
6877 darwin* | rhapsody*)
6878@@ -9434,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6879
6880 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6881 freebsd* | dragonfly*)
6882- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6883+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6884 hardcode_libdir_flag_spec='-R$libdir'
6885 hardcode_direct=yes
6886 hardcode_shlibpath_var=no
6887@@ -9442,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6888
6889 hpux9*)
6890 if test "$GCC" = yes; then
6891- 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'
6892+ 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'
6893 else
6894 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'
6895 fi
6896@@ -9458,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6897
6898 hpux10*)
6899 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6900- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6901+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6902 else
6903 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6904 fi
6905@@ -9482,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6906 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6907 ;;
6908 ia64*)
6909- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6910+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6911 ;;
6912 *)
6913- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6914+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6915 ;;
6916 esac
6917 else
6918@@ -9564,23 +10147,36 @@ fi
6919
6920 irix5* | irix6* | nonstopux*)
6921 if test "$GCC" = yes; then
6922- 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'
6923+ 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'
6924 # Try to use the -exported_symbol ld option, if it does not
6925 # work, assume that -exports_file does not work either and
6926 # implicitly export all symbols.
6927- save_LDFLAGS="$LDFLAGS"
6928- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6929- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6930+ # This should be the same for all languages, so no per-tag cache variable.
6931+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6932+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6933+if ${lt_cv_irix_exported_symbol+:} false; then :
6934+ $as_echo_n "(cached) " >&6
6935+else
6936+ save_LDFLAGS="$LDFLAGS"
6937+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6938+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6939 /* end confdefs.h. */
6940-int foo(void) {}
6941+int foo (void) { return 0; }
6942 _ACEOF
6943 if ac_fn_c_try_link "$LINENO"; then :
6944- 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'
6945-
6946+ lt_cv_irix_exported_symbol=yes
6947+else
6948+ lt_cv_irix_exported_symbol=no
6949 fi
6950 rm -f core conftest.err conftest.$ac_objext \
6951 conftest$ac_exeext conftest.$ac_ext
6952- LDFLAGS="$save_LDFLAGS"
6953+ LDFLAGS="$save_LDFLAGS"
6954+fi
6955+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6956+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6957+ if test "$lt_cv_irix_exported_symbol" = yes; then
6958+ 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'
6959+ fi
6960 else
6961 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'
6962 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'
6963@@ -9665,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \
6964 osf4* | osf5*) # as osf3* with the addition of -msym flag
6965 if test "$GCC" = yes; then
6966 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6967- 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'
6968+ 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'
6969 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6970 else
6971 allow_undefined_flag=' -expect_unresolved \*'
6972@@ -9684,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \
6973 no_undefined_flag=' -z defs'
6974 if test "$GCC" = yes; then
6975 wlarc='${wl}'
6976- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6977+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6978 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6979- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6980+ $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'
6981 else
6982 case `$CC -V 2>&1` in
6983 *"Compilers 5.0"*)
6984@@ -10262,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6985 need_version=no
6986 need_lib_prefix=no
6987
6988- case $GCC,$host_os in
6989- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6990+ case $GCC,$cc_basename in
6991+ yes,*)
6992+ # gcc
6993 library_names_spec='$libname.dll.a'
6994 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6995 postinstall_cmds='base_file=`basename \${file}`~
6996@@ -10296,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6997 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6998 ;;
6999 esac
7000+ dynamic_linker='Win32 ld.exe'
7001+ ;;
7002+
7003+ *,cl*)
7004+ # Native MSVC
7005+ libname_spec='$name'
7006+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7007+ library_names_spec='${libname}.dll.lib'
7008+
7009+ case $build_os in
7010+ mingw*)
7011+ sys_lib_search_path_spec=
7012+ lt_save_ifs=$IFS
7013+ IFS=';'
7014+ for lt_path in $LIB
7015+ do
7016+ IFS=$lt_save_ifs
7017+ # Let DOS variable expansion print the short 8.3 style file name.
7018+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
7019+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
7020+ done
7021+ IFS=$lt_save_ifs
7022+ # Convert to MSYS style.
7023+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
7024+ ;;
7025+ cygwin*)
7026+ # Convert to unix form, then to dos form, then back to unix form
7027+ # but this time dos style (no spaces!) so that the unix form looks
7028+ # like /cygdrive/c/PROGRA~1:/cygdr...
7029+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7030+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7031+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7032+ ;;
7033+ *)
7034+ sys_lib_search_path_spec="$LIB"
7035+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7036+ # It is most probably a Windows format PATH.
7037+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7038+ else
7039+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7040+ fi
7041+ # FIXME: find the short name or the path components, as spaces are
7042+ # common. (e.g. "Program Files" -> "PROGRA~1")
7043+ ;;
7044+ esac
7045+
7046+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7047+ postinstall_cmds='base_file=`basename \${file}`~
7048+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7049+ dldir=$destdir/`dirname \$dlpath`~
7050+ test -d \$dldir || mkdir -p \$dldir~
7051+ $install_prog $dir/$dlname \$dldir/$dlname'
7052+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7053+ dlpath=$dir/\$dldll~
7054+ $RM \$dlpath'
7055+ shlibpath_overrides_runpath=yes
7056+ dynamic_linker='Win32 link.exe'
7057 ;;
7058
7059 *)
7060+ # Assume MSVC wrapper
7061 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7062+ dynamic_linker='Win32 ld.exe'
7063 ;;
7064 esac
7065- dynamic_linker='Win32 ld.exe'
7066 # FIXME: first we should search . and the directory the executable is in
7067 shlibpath_var=PATH
7068 ;;
7069@@ -10394,7 +11049,7 @@ haiku*)
7070 soname_spec='${libname}${release}${shared_ext}$major'
7071 shlibpath_var=LIBRARY_PATH
7072 shlibpath_overrides_runpath=yes
7073- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7074+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7075 hardcode_into_libs=yes
7076 ;;
7077
7078@@ -11190,7 +11845,7 @@ else
7079 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7080 lt_status=$lt_dlunknown
7081 cat > conftest.$ac_ext <<_LT_EOF
7082-#line 11193 "configure"
7083+#line $LINENO "configure"
7084 #include "confdefs.h"
7085
7086 #if HAVE_DLFCN_H
7087@@ -11234,10 +11889,10 @@ else
7088 /* When -fvisbility=hidden is used, assume the code has been annotated
7089 correspondingly for the symbols needed. */
7090 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7091-void fnord () __attribute__((visibility("default")));
7092+int fnord () __attribute__((visibility("default")));
7093 #endif
7094
7095-void fnord () { int i=42; }
7096+int fnord () { return 42; }
7097 int main ()
7098 {
7099 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7100@@ -11296,7 +11951,7 @@ else
7101 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7102 lt_status=$lt_dlunknown
7103 cat > conftest.$ac_ext <<_LT_EOF
7104-#line 11299 "configure"
7105+#line $LINENO "configure"
7106 #include "confdefs.h"
7107
7108 #if HAVE_DLFCN_H
7109@@ -11340,10 +11995,10 @@ else
7110 /* When -fvisbility=hidden is used, assume the code has been annotated
7111 correspondingly for the symbols needed. */
7112 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7113-void fnord () __attribute__((visibility("default")));
7114+int fnord () __attribute__((visibility("default")));
7115 #endif
7116
7117-void fnord () { int i=42; }
7118+int fnord () { return 42; }
7119 int main ()
7120 {
7121 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7122@@ -13309,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7123 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7124 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7125 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7126+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7127+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7128 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7129 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7130 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7131 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7132 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7133+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7134+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7135+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7136+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7137 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7138 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7139+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7140 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7141 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7142 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7143@@ -13330,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7144 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7145 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7146 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"`'
7147+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7148+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7149 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7150 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7151 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7152-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7153 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7154+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7155 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7156 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7157 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7158+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7159 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7160 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7161 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7162@@ -13370,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7163 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7164 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7165 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7166-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7167 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7168 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7169 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7170 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7171 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7172+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7173 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7174 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7175 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7176@@ -13430,8 +14095,13 @@ reload_flag \
7177 OBJDUMP \
7178 deplibs_check_method \
7179 file_magic_cmd \
7180+file_magic_glob \
7181+want_nocaseglob \
7182+DLLTOOL \
7183+sharedlib_from_linklib_cmd \
7184 AR \
7185 AR_FLAGS \
7186+archiver_list_spec \
7187 STRIP \
7188 RANLIB \
7189 CC \
7190@@ -13441,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \
7191 lt_cv_sys_global_symbol_to_cdecl \
7192 lt_cv_sys_global_symbol_to_c_name_address \
7193 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7194+nm_file_list_spec \
7195 lt_prog_compiler_no_builtin_flag \
7196-lt_prog_compiler_wl \
7197 lt_prog_compiler_pic \
7198+lt_prog_compiler_wl \
7199 lt_prog_compiler_static \
7200 lt_cv_prog_compiler_c_o \
7201 need_locks \
7202+MANIFEST_TOOL \
7203 DSYMUTIL \
7204 NMEDIT \
7205 LIPO \
7206@@ -13462,7 +14134,6 @@ no_undefined_flag \
7207 hardcode_libdir_flag_spec \
7208 hardcode_libdir_flag_spec_ld \
7209 hardcode_libdir_separator \
7210-fix_srcfile_path \
7211 exclude_expsyms \
7212 include_expsyms \
7213 file_list_spec \
7214@@ -13498,6 +14169,7 @@ module_cmds \
7215 module_expsym_cmds \
7216 export_symbols_cmds \
7217 prelink_cmds \
7218+postlink_cmds \
7219 postinstall_cmds \
7220 postuninstall_cmds \
7221 finish_cmds \
7222@@ -14263,7 +14935,8 @@ $as_echo X"$file" |
7223 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7224 #
7225 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7226-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7227+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7228+# Inc.
7229 # Written by Gordon Matzigkeit, 1996
7230 #
7231 # This file is part of GNU Libtool.
7232@@ -14366,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL
7233 # turn newlines into spaces.
7234 NL2SP=$lt_lt_NL2SP
7235
7236+# convert \$build file names to \$host format.
7237+to_host_file_cmd=$lt_cv_to_host_file_cmd
7238+
7239+# convert \$build files to toolchain format.
7240+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7241+
7242 # An object symbol dumper.
7243 OBJDUMP=$lt_OBJDUMP
7244
7245 # Method to check whether dependent libraries are shared objects.
7246 deplibs_check_method=$lt_deplibs_check_method
7247
7248-# Command to use when deplibs_check_method == "file_magic".
7249+# Command to use when deplibs_check_method = "file_magic".
7250 file_magic_cmd=$lt_file_magic_cmd
7251
7252+# How to find potential files when deplibs_check_method = "file_magic".
7253+file_magic_glob=$lt_file_magic_glob
7254+
7255+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7256+want_nocaseglob=$lt_want_nocaseglob
7257+
7258+# DLL creation program.
7259+DLLTOOL=$lt_DLLTOOL
7260+
7261+# Command to associate shared and link libraries.
7262+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7263+
7264 # The archiver.
7265 AR=$lt_AR
7266+
7267+# Flags to create an archive.
7268 AR_FLAGS=$lt_AR_FLAGS
7269
7270+# How to feed a file listing to the archiver.
7271+archiver_list_spec=$lt_archiver_list_spec
7272+
7273 # A symbol stripping program.
7274 STRIP=$lt_STRIP
7275
7276@@ -14408,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7277 # Transform the output of nm in a C name address pair when lib prefix is needed.
7278 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7279
7280+# Specify filename containing input files for \$NM.
7281+nm_file_list_spec=$lt_nm_file_list_spec
7282+
7283+# The root where to search for dependent libraries,and in which our libraries should be installed.
7284+lt_sysroot=$lt_sysroot
7285+
7286 # The name of the directory that contains temporary libtool files.
7287 objdir=$objdir
7288
7289@@ -14417,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD
7290 # Must we lock files when doing compilation?
7291 need_locks=$lt_need_locks
7292
7293+# Manifest tool.
7294+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7295+
7296 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7297 DSYMUTIL=$lt_DSYMUTIL
7298
7299@@ -14531,12 +15236,12 @@ with_gcc=$GCC
7300 # Compiler flag to turn off builtin functions.
7301 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7302
7303-# How to pass a linker flag through the compiler.
7304-wl=$lt_lt_prog_compiler_wl
7305-
7306 # Additional compiler flags for building library objects.
7307 pic_flag=$lt_lt_prog_compiler_pic
7308
7309+# How to pass a linker flag through the compiler.
7310+wl=$lt_lt_prog_compiler_wl
7311+
7312 # Compiler flag to prevent dynamic linking.
7313 link_static_flag=$lt_lt_prog_compiler_static
7314
7315@@ -14623,9 +15328,6 @@ inherit_rpath=$inherit_rpath
7316 # Whether libtool must link a program against all its dependency libraries.
7317 link_all_deplibs=$link_all_deplibs
7318
7319-# Fix the shell variable \$srcfile for the compiler.
7320-fix_srcfile_path=$lt_fix_srcfile_path
7321-
7322 # Set to "yes" if exported symbols are required.
7323 always_export_symbols=$always_export_symbols
7324
7325@@ -14641,6 +15343,9 @@ include_expsyms=$lt_include_expsyms
7326 # Commands necessary for linking programs (against libraries) with templates.
7327 prelink_cmds=$lt_prelink_cmds
7328
7329+# Commands necessary for finishing linking programs.
7330+postlink_cmds=$lt_postlink_cmds
7331+
7332 # Specify filename containing input files.
7333 file_list_spec=$lt_file_list_spec
7334
7335@@ -14673,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7336 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7337 # text mode, it properly converts lines to CR/LF. This bash problem
7338 # is reportedly fixed, but why not run on old versions too?
7339- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7340- || (rm -f "$cfgfile"; exit 1)
7341-
7342- case $xsi_shell in
7343- yes)
7344- cat << \_LT_EOF >> "$cfgfile"
7345-
7346-# func_dirname file append nondir_replacement
7347-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7348-# otherwise set result to NONDIR_REPLACEMENT.
7349-func_dirname ()
7350-{
7351- case ${1} in
7352- */*) func_dirname_result="${1%/*}${2}" ;;
7353- * ) func_dirname_result="${3}" ;;
7354- esac
7355-}
7356-
7357-# func_basename file
7358-func_basename ()
7359-{
7360- func_basename_result="${1##*/}"
7361-}
7362-
7363-# func_dirname_and_basename file append nondir_replacement
7364-# perform func_basename and func_dirname in a single function
7365-# call:
7366-# dirname: Compute the dirname of FILE. If nonempty,
7367-# add APPEND to the result, otherwise set result
7368-# to NONDIR_REPLACEMENT.
7369-# value returned in "$func_dirname_result"
7370-# basename: Compute filename of FILE.
7371-# value retuned in "$func_basename_result"
7372-# Implementation must be kept synchronized with func_dirname
7373-# and func_basename. For efficiency, we do not delegate to
7374-# those functions but instead duplicate the functionality here.
7375-func_dirname_and_basename ()
7376-{
7377- case ${1} in
7378- */*) func_dirname_result="${1%/*}${2}" ;;
7379- * ) func_dirname_result="${3}" ;;
7380- esac
7381- func_basename_result="${1##*/}"
7382-}
7383-
7384-# func_stripname prefix suffix name
7385-# strip PREFIX and SUFFIX off of NAME.
7386-# PREFIX and SUFFIX must not contain globbing or regex special
7387-# characters, hashes, percent signs, but SUFFIX may contain a leading
7388-# dot (in which case that matches only a dot).
7389-func_stripname ()
7390-{
7391- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7392- # positional parameters, so assign one to ordinary parameter first.
7393- func_stripname_result=${3}
7394- func_stripname_result=${func_stripname_result#"${1}"}
7395- func_stripname_result=${func_stripname_result%"${2}"}
7396-}
7397-
7398-# func_opt_split
7399-func_opt_split ()
7400-{
7401- func_opt_split_opt=${1%%=*}
7402- func_opt_split_arg=${1#*=}
7403-}
7404-
7405-# func_lo2o object
7406-func_lo2o ()
7407-{
7408- case ${1} in
7409- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7410- *) func_lo2o_result=${1} ;;
7411- esac
7412-}
7413-
7414-# func_xform libobj-or-source
7415-func_xform ()
7416-{
7417- func_xform_result=${1%.*}.lo
7418-}
7419-
7420-# func_arith arithmetic-term...
7421-func_arith ()
7422-{
7423- func_arith_result=$(( $* ))
7424-}
7425-
7426-# func_len string
7427-# STRING may not start with a hyphen.
7428-func_len ()
7429-{
7430- func_len_result=${#1}
7431-}
7432-
7433-_LT_EOF
7434- ;;
7435- *) # Bourne compatible functions.
7436- cat << \_LT_EOF >> "$cfgfile"
7437-
7438-# func_dirname file append nondir_replacement
7439-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7440-# otherwise set result to NONDIR_REPLACEMENT.
7441-func_dirname ()
7442-{
7443- # Extract subdirectory from the argument.
7444- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7445- if test "X$func_dirname_result" = "X${1}"; then
7446- func_dirname_result="${3}"
7447- else
7448- func_dirname_result="$func_dirname_result${2}"
7449- fi
7450-}
7451-
7452-# func_basename file
7453-func_basename ()
7454-{
7455- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7456-}
7457-
7458-
7459-# func_stripname prefix suffix name
7460-# strip PREFIX and SUFFIX off of NAME.
7461-# PREFIX and SUFFIX must not contain globbing or regex special
7462-# characters, hashes, percent signs, but SUFFIX may contain a leading
7463-# dot (in which case that matches only a dot).
7464-# func_strip_suffix prefix name
7465-func_stripname ()
7466-{
7467- case ${2} in
7468- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7469- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7470- esac
7471-}
7472-
7473-# sed scripts:
7474-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7475-my_sed_long_arg='1s/^-[^=]*=//'
7476-
7477-# func_opt_split
7478-func_opt_split ()
7479-{
7480- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7481- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7482-}
7483-
7484-# func_lo2o object
7485-func_lo2o ()
7486-{
7487- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7488-}
7489-
7490-# func_xform libobj-or-source
7491-func_xform ()
7492-{
7493- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7494-}
7495-
7496-# func_arith arithmetic-term...
7497-func_arith ()
7498-{
7499- func_arith_result=`expr "$@"`
7500-}
7501-
7502-# func_len string
7503-# STRING may not start with a hyphen.
7504-func_len ()
7505-{
7506- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7507-}
7508-
7509-_LT_EOF
7510-esac
7511-
7512-case $lt_shell_append in
7513- yes)
7514- cat << \_LT_EOF >> "$cfgfile"
7515-
7516-# func_append var value
7517-# Append VALUE to the end of shell variable VAR.
7518-func_append ()
7519-{
7520- eval "$1+=\$2"
7521-}
7522-_LT_EOF
7523- ;;
7524- *)
7525- cat << \_LT_EOF >> "$cfgfile"
7526-
7527-# func_append var value
7528-# Append VALUE to the end of shell variable VAR.
7529-func_append ()
7530-{
7531- eval "$1=\$$1\$2"
7532-}
7533-
7534-_LT_EOF
7535- ;;
7536- esac
7537-
7538-
7539- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7540- || (rm -f "$cfgfile"; exit 1)
7541-
7542- mv -f "$cfgfile" "$ofile" ||
7543+ sed '$q' "$ltmain" >> "$cfgfile" \
7544+ || (rm -f "$cfgfile"; exit 1)
7545+
7546+ if test x"$xsi_shell" = xyes; then
7547+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7548+func_dirname ()\
7549+{\
7550+\ case ${1} in\
7551+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7552+\ * ) func_dirname_result="${3}" ;;\
7553+\ esac\
7554+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7555+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7556+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7557+test 0 -eq $? || _lt_function_replace_fail=:
7558+
7559+
7560+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7561+func_basename ()\
7562+{\
7563+\ func_basename_result="${1##*/}"\
7564+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7565+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7566+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7567+test 0 -eq $? || _lt_function_replace_fail=:
7568+
7569+
7570+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7571+func_dirname_and_basename ()\
7572+{\
7573+\ case ${1} in\
7574+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7575+\ * ) func_dirname_result="${3}" ;;\
7576+\ esac\
7577+\ func_basename_result="${1##*/}"\
7578+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7579+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7580+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7581+test 0 -eq $? || _lt_function_replace_fail=:
7582+
7583+
7584+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7585+func_stripname ()\
7586+{\
7587+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7588+\ # positional parameters, so assign one to ordinary parameter first.\
7589+\ func_stripname_result=${3}\
7590+\ func_stripname_result=${func_stripname_result#"${1}"}\
7591+\ func_stripname_result=${func_stripname_result%"${2}"}\
7592+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7593+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7594+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7595+test 0 -eq $? || _lt_function_replace_fail=:
7596+
7597+
7598+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7599+func_split_long_opt ()\
7600+{\
7601+\ func_split_long_opt_name=${1%%=*}\
7602+\ func_split_long_opt_arg=${1#*=}\
7603+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7604+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7605+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7606+test 0 -eq $? || _lt_function_replace_fail=:
7607+
7608+
7609+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7610+func_split_short_opt ()\
7611+{\
7612+\ func_split_short_opt_arg=${1#??}\
7613+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7614+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7615+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7616+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7617+test 0 -eq $? || _lt_function_replace_fail=:
7618+
7619+
7620+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7621+func_lo2o ()\
7622+{\
7623+\ case ${1} in\
7624+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7625+\ *) func_lo2o_result=${1} ;;\
7626+\ esac\
7627+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7628+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7629+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7630+test 0 -eq $? || _lt_function_replace_fail=:
7631+
7632+
7633+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7634+func_xform ()\
7635+{\
7636+ func_xform_result=${1%.*}.lo\
7637+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7638+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7639+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7640+test 0 -eq $? || _lt_function_replace_fail=:
7641+
7642+
7643+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7644+func_arith ()\
7645+{\
7646+ func_arith_result=$(( $* ))\
7647+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7648+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7649+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7650+test 0 -eq $? || _lt_function_replace_fail=:
7651+
7652+
7653+ sed -e '/^func_len ()$/,/^} # func_len /c\
7654+func_len ()\
7655+{\
7656+ func_len_result=${#1}\
7657+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7658+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7659+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7660+test 0 -eq $? || _lt_function_replace_fail=:
7661+
7662+fi
7663+
7664+if test x"$lt_shell_append" = xyes; then
7665+ sed -e '/^func_append ()$/,/^} # func_append /c\
7666+func_append ()\
7667+{\
7668+ eval "${1}+=\\${2}"\
7669+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7670+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7671+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7672+test 0 -eq $? || _lt_function_replace_fail=:
7673+
7674+
7675+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7676+func_append_quoted ()\
7677+{\
7678+\ func_quote_for_eval "${2}"\
7679+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7680+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7681+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7682+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7683+test 0 -eq $? || _lt_function_replace_fail=:
7684+
7685+
7686+ # Save a `func_append' function call where possible by direct use of '+='
7687+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7688+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7689+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7690+ test 0 -eq $? || _lt_function_replace_fail=:
7691+else
7692+ # Save a `func_append' function call even when '+=' is not available
7693+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7694+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7695+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7696+ test 0 -eq $? || _lt_function_replace_fail=:
7697+fi
7698+
7699+if test x"$_lt_function_replace_fail" = x":"; then
7700+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7701+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7702+fi
7703+
7704+
7705+ mv -f "$cfgfile" "$ofile" ||
7706 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7707 chmod +x "$ofile"
7708
7709diff --git a/ld/configure b/ld/configure
7710index 811134a503b..f432f4637d0 100755
7711--- a/ld/configure
7712+++ b/ld/configure
7713@@ -691,8 +691,11 @@ OTOOL
7714 LIPO
7715 NMEDIT
7716 DSYMUTIL
7717+MANIFEST_TOOL
7718 RANLIB
7719+ac_ct_AR
7720 AR
7721+DLLTOOL
7722 OBJDUMP
7723 LN_S
7724 NM
7725@@ -819,6 +822,7 @@ enable_static
7726 with_pic
7727 enable_fast_install
7728 with_gnu_ld
7729+with_libtool_sysroot
7730 enable_libtool_lock
7731 enable_plugins
7732 enable_largefile
7733@@ -1512,6 +1516,8 @@ Optional Packages:
7734 --with-pic try to use only PIC/non-PIC objects [default=use
7735 both]
7736 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7737+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7738+ (or the compiler's sysroot if not specified).
7739 --with-lib-path=dir1:dir2... set default LIB_PATH
7740 --with-sysroot=DIR Search for usr/lib et al within DIR.
7741 --with-system-zlib use installed libz
7742@@ -5965,8 +5971,8 @@ esac
7743
7744
7745
7746-macro_version='2.2.7a'
7747-macro_revision='1.3134'
7748+macro_version='2.4'
7749+macro_revision='1.3293'
7750
7751
7752
7753@@ -6006,7 +6012,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7754 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7755 $as_echo_n "checking how to print strings... " >&6; }
7756 # Test print first, because it will be a builtin if present.
7757-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7758+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7759 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7760 ECHO='print -r --'
7761 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7762@@ -6692,8 +6698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7763 # Try some XSI features
7764 xsi_shell=no
7765 ( _lt_dummy="a/b/c"
7766- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7767- = c,a/b,, \
7768+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7769+ = c,a/b,b/c, \
7770 && eval 'test $(( 1 + 1 )) -eq 2 \
7771 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7772 && xsi_shell=yes
7773@@ -6742,6 +6748,80 @@ esac
7774
7775
7776
7777+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7778+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7779+if ${lt_cv_to_host_file_cmd+:} false; then :
7780+ $as_echo_n "(cached) " >&6
7781+else
7782+ case $host in
7783+ *-*-mingw* )
7784+ case $build in
7785+ *-*-mingw* ) # actually msys
7786+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7787+ ;;
7788+ *-*-cygwin* )
7789+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7790+ ;;
7791+ * ) # otherwise, assume *nix
7792+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7793+ ;;
7794+ esac
7795+ ;;
7796+ *-*-cygwin* )
7797+ case $build in
7798+ *-*-mingw* ) # actually msys
7799+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7800+ ;;
7801+ *-*-cygwin* )
7802+ lt_cv_to_host_file_cmd=func_convert_file_noop
7803+ ;;
7804+ * ) # otherwise, assume *nix
7805+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7806+ ;;
7807+ esac
7808+ ;;
7809+ * ) # unhandled hosts (and "normal" native builds)
7810+ lt_cv_to_host_file_cmd=func_convert_file_noop
7811+ ;;
7812+esac
7813+
7814+fi
7815+
7816+to_host_file_cmd=$lt_cv_to_host_file_cmd
7817+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7818+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7819+
7820+
7821+
7822+
7823+
7824+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7825+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7826+if ${lt_cv_to_tool_file_cmd+:} false; then :
7827+ $as_echo_n "(cached) " >&6
7828+else
7829+ #assume ordinary cross tools, or native build.
7830+lt_cv_to_tool_file_cmd=func_convert_file_noop
7831+case $host in
7832+ *-*-mingw* )
7833+ case $build in
7834+ *-*-mingw* ) # actually msys
7835+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7836+ ;;
7837+ esac
7838+ ;;
7839+esac
7840+
7841+fi
7842+
7843+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7844+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7845+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7846+
7847+
7848+
7849+
7850+
7851 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7852 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7853 if ${lt_cv_ld_reload_flag+:} false; then :
7854@@ -6758,6 +6838,11 @@ case $reload_flag in
7855 esac
7856 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7857 case $host_os in
7858+ cygwin* | mingw* | pw32* | cegcc*)
7859+ if test "$GCC" != yes; then
7860+ reload_cmds=false
7861+ fi
7862+ ;;
7863 darwin*)
7864 if test "$GCC" = yes; then
7865 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7866@@ -6926,7 +7011,8 @@ mingw* | pw32*)
7867 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7868 lt_cv_file_magic_cmd='func_win32_libid'
7869 else
7870- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7871+ # Keep this pattern in sync with the one in func_win32_libid.
7872+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7873 lt_cv_file_magic_cmd='$OBJDUMP -f'
7874 fi
7875 ;;
7876@@ -7080,6 +7166,21 @@ esac
7877 fi
7878 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7879 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7880+
7881+file_magic_glob=
7882+want_nocaseglob=no
7883+if test "$build" = "$host"; then
7884+ case $host_os in
7885+ mingw* | pw32*)
7886+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7887+ want_nocaseglob=yes
7888+ else
7889+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7890+ fi
7891+ ;;
7892+ esac
7893+fi
7894+
7895 file_magic_cmd=$lt_cv_file_magic_cmd
7896 deplibs_check_method=$lt_cv_deplibs_check_method
7897 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7898@@ -7095,9 +7196,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7899
7900
7901
7902+
7903+
7904+
7905+
7906+
7907+
7908+
7909+
7910+
7911+
7912+if test -n "$ac_tool_prefix"; then
7913+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7914+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7915+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7916+$as_echo_n "checking for $ac_word... " >&6; }
7917+if ${ac_cv_prog_DLLTOOL+:} false; then :
7918+ $as_echo_n "(cached) " >&6
7919+else
7920+ if test -n "$DLLTOOL"; then
7921+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7922+else
7923+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7924+for as_dir in $PATH
7925+do
7926+ IFS=$as_save_IFS
7927+ test -z "$as_dir" && as_dir=.
7928+ for ac_exec_ext in '' $ac_executable_extensions; do
7929+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7930+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7931+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7932+ break 2
7933+ fi
7934+done
7935+ done
7936+IFS=$as_save_IFS
7937+
7938+fi
7939+fi
7940+DLLTOOL=$ac_cv_prog_DLLTOOL
7941+if test -n "$DLLTOOL"; then
7942+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7943+$as_echo "$DLLTOOL" >&6; }
7944+else
7945+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7946+$as_echo "no" >&6; }
7947+fi
7948+
7949+
7950+fi
7951+if test -z "$ac_cv_prog_DLLTOOL"; then
7952+ ac_ct_DLLTOOL=$DLLTOOL
7953+ # Extract the first word of "dlltool", so it can be a program name with args.
7954+set dummy dlltool; ac_word=$2
7955+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7956+$as_echo_n "checking for $ac_word... " >&6; }
7957+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
7958+ $as_echo_n "(cached) " >&6
7959+else
7960+ if test -n "$ac_ct_DLLTOOL"; then
7961+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7962+else
7963+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7964+for as_dir in $PATH
7965+do
7966+ IFS=$as_save_IFS
7967+ test -z "$as_dir" && as_dir=.
7968+ for ac_exec_ext in '' $ac_executable_extensions; do
7969+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7970+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7971+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7972+ break 2
7973+ fi
7974+done
7975+ done
7976+IFS=$as_save_IFS
7977+
7978+fi
7979+fi
7980+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7981+if test -n "$ac_ct_DLLTOOL"; then
7982+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7983+$as_echo "$ac_ct_DLLTOOL" >&6; }
7984+else
7985+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7986+$as_echo "no" >&6; }
7987+fi
7988+
7989+ if test "x$ac_ct_DLLTOOL" = x; then
7990+ DLLTOOL="false"
7991+ else
7992+ case $cross_compiling:$ac_tool_warned in
7993+yes:)
7994+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7995+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7996+ac_tool_warned=yes ;;
7997+esac
7998+ DLLTOOL=$ac_ct_DLLTOOL
7999+ fi
8000+else
8001+ DLLTOOL="$ac_cv_prog_DLLTOOL"
8002+fi
8003+
8004+test -z "$DLLTOOL" && DLLTOOL=dlltool
8005+
8006+
8007+
8008+
8009+
8010+
8011+
8012+
8013+
8014+
8015+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
8016+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
8017+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
8018+ $as_echo_n "(cached) " >&6
8019+else
8020+ lt_cv_sharedlib_from_linklib_cmd='unknown'
8021+
8022+case $host_os in
8023+cygwin* | mingw* | pw32* | cegcc*)
8024+ # two different shell functions defined in ltmain.sh
8025+ # decide which to use based on capabilities of $DLLTOOL
8026+ case `$DLLTOOL --help 2>&1` in
8027+ *--identify-strict*)
8028+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
8029+ ;;
8030+ *)
8031+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
8032+ ;;
8033+ esac
8034+ ;;
8035+*)
8036+ # fallback: assume linklib IS sharedlib
8037+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
8038+ ;;
8039+esac
8040+
8041+fi
8042+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
8043+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
8044+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
8045+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8046+
8047+
8048+
8049+
8050+
8051+
8052+
8053 if test -n "$ac_tool_prefix"; then
8054- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8055-set dummy ${ac_tool_prefix}ar; ac_word=$2
8056+ for ac_prog in ar
8057+ do
8058+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8059+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8061 $as_echo_n "checking for $ac_word... " >&6; }
8062 if ${ac_cv_prog_AR+:} false; then :
8063@@ -7113,7 +7367,7 @@ do
8064 test -z "$as_dir" && as_dir=.
8065 for ac_exec_ext in '' $ac_executable_extensions; do
8066 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8067- ac_cv_prog_AR="${ac_tool_prefix}ar"
8068+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8069 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8070 break 2
8071 fi
8072@@ -7133,11 +7387,15 @@ $as_echo "no" >&6; }
8073 fi
8074
8075
8076+ test -n "$AR" && break
8077+ done
8078 fi
8079-if test -z "$ac_cv_prog_AR"; then
8080+if test -z "$AR"; then
8081 ac_ct_AR=$AR
8082- # Extract the first word of "ar", so it can be a program name with args.
8083-set dummy ar; ac_word=$2
8084+ for ac_prog in ar
8085+do
8086+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8087+set dummy $ac_prog; ac_word=$2
8088 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8089 $as_echo_n "checking for $ac_word... " >&6; }
8090 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8091@@ -7153,7 +7411,7 @@ do
8092 test -z "$as_dir" && as_dir=.
8093 for ac_exec_ext in '' $ac_executable_extensions; do
8094 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8095- ac_cv_prog_ac_ct_AR="ar"
8096+ ac_cv_prog_ac_ct_AR="$ac_prog"
8097 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8098 break 2
8099 fi
8100@@ -7172,6 +7430,10 @@ else
8101 $as_echo "no" >&6; }
8102 fi
8103
8104+
8105+ test -n "$ac_ct_AR" && break
8106+done
8107+
8108 if test "x$ac_ct_AR" = x; then
8109 AR="false"
8110 else
8111@@ -7183,12 +7445,12 @@ ac_tool_warned=yes ;;
8112 esac
8113 AR=$ac_ct_AR
8114 fi
8115-else
8116- AR="$ac_cv_prog_AR"
8117 fi
8118
8119-test -z "$AR" && AR=ar
8120-test -z "$AR_FLAGS" && AR_FLAGS=cru
8121+: ${AR=ar}
8122+: ${AR_FLAGS=cru}
8123+
8124+
8125
8126
8127
8128@@ -7198,6 +7460,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8129
8130
8131
8132+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8133+$as_echo_n "checking for archiver @FILE support... " >&6; }
8134+if ${lt_cv_ar_at_file+:} false; then :
8135+ $as_echo_n "(cached) " >&6
8136+else
8137+ lt_cv_ar_at_file=no
8138+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8139+/* end confdefs.h. */
8140+
8141+int
8142+main ()
8143+{
8144+
8145+ ;
8146+ return 0;
8147+}
8148+_ACEOF
8149+if ac_fn_c_try_compile "$LINENO"; then :
8150+ echo conftest.$ac_objext > conftest.lst
8151+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8152+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8153+ (eval $lt_ar_try) 2>&5
8154+ ac_status=$?
8155+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8156+ test $ac_status = 0; }
8157+ if test "$ac_status" -eq 0; then
8158+ # Ensure the archiver fails upon bogus file names.
8159+ rm -f conftest.$ac_objext libconftest.a
8160+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8161+ (eval $lt_ar_try) 2>&5
8162+ ac_status=$?
8163+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8164+ test $ac_status = 0; }
8165+ if test "$ac_status" -ne 0; then
8166+ lt_cv_ar_at_file=@
8167+ fi
8168+ fi
8169+ rm -f conftest.* libconftest.a
8170+
8171+fi
8172+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8173+
8174+fi
8175+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8176+$as_echo "$lt_cv_ar_at_file" >&6; }
8177+
8178+if test "x$lt_cv_ar_at_file" = xno; then
8179+ archiver_list_spec=
8180+else
8181+ archiver_list_spec=$lt_cv_ar_at_file
8182+fi
8183+
8184+
8185+
8186+
8187+
8188
8189
8190 if test -n "$ac_tool_prefix"; then
8191@@ -7534,8 +7852,8 @@ esac
8192 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8193
8194 # Transform an extracted symbol line into symbol name and symbol address
8195-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8196-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'"
8197+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8198+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'"
8199
8200 # Handle CRLF in mingw tool chain
8201 opt_cr=
8202@@ -7571,6 +7889,7 @@ for ac_symprfx in "" "_"; do
8203 else
8204 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8205 fi
8206+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8207
8208 # Check to see that the pipe works correctly.
8209 pipe_works=no
8210@@ -7612,6 +7931,18 @@ _LT_EOF
8211 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8212 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8213 cat <<_LT_EOF > conftest.$ac_ext
8214+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8215+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8216+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8217+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8218+# define LT_DLSYM_CONST
8219+#elif defined(__osf__)
8220+/* This system does not cope well with relocations in const data. */
8221+# define LT_DLSYM_CONST
8222+#else
8223+# define LT_DLSYM_CONST const
8224+#endif
8225+
8226 #ifdef __cplusplus
8227 extern "C" {
8228 #endif
8229@@ -7623,7 +7954,7 @@ _LT_EOF
8230 cat <<_LT_EOF >> conftest.$ac_ext
8231
8232 /* The mapping between symbol names and symbols. */
8233-const struct {
8234+LT_DLSYM_CONST struct {
8235 const char *name;
8236 void *address;
8237 }
8238@@ -7649,8 +7980,8 @@ static const void *lt_preloaded_setup() {
8239 _LT_EOF
8240 # Now try linking the two files.
8241 mv conftest.$ac_objext conftstm.$ac_objext
8242- lt_save_LIBS="$LIBS"
8243- lt_save_CFLAGS="$CFLAGS"
8244+ lt_globsym_save_LIBS=$LIBS
8245+ lt_globsym_save_CFLAGS=$CFLAGS
8246 LIBS="conftstm.$ac_objext"
8247 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8248 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8249@@ -7660,8 +7991,8 @@ _LT_EOF
8250 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8251 pipe_works=yes
8252 fi
8253- LIBS="$lt_save_LIBS"
8254- CFLAGS="$lt_save_CFLAGS"
8255+ LIBS=$lt_globsym_save_LIBS
8256+ CFLAGS=$lt_globsym_save_CFLAGS
8257 else
8258 echo "cannot find nm_test_func in $nlist" >&5
8259 fi
8260@@ -7698,6 +8029,19 @@ else
8261 $as_echo "ok" >&6; }
8262 fi
8263
8264+# Response file support.
8265+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8266+ nm_file_list_spec='@'
8267+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8268+ nm_file_list_spec='@'
8269+fi
8270+
8271+
8272+
8273+
8274+
8275+
8276+
8277
8278
8279
8280@@ -7714,6 +8058,42 @@ fi
8281
8282
8283
8284+
8285+
8286+
8287+
8288+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8289+$as_echo_n "checking for sysroot... " >&6; }
8290+
8291+# Check whether --with-libtool-sysroot was given.
8292+if test "${with_libtool_sysroot+set}" = set; then :
8293+ withval=$with_libtool_sysroot;
8294+else
8295+ with_libtool_sysroot=no
8296+fi
8297+
8298+
8299+lt_sysroot=
8300+case ${with_libtool_sysroot} in #(
8301+ yes)
8302+ if test "$GCC" = yes; then
8303+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8304+ fi
8305+ ;; #(
8306+ /*)
8307+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8308+ ;; #(
8309+ no|'')
8310+ ;; #(
8311+ *)
8312+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8313+$as_echo "${with_libtool_sysroot}" >&6; }
8314+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
8315+ ;;
8316+esac
8317+
8318+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8319+$as_echo "${lt_sysroot:-no}" >&6; }
8320
8321
8322
8323@@ -7925,6 +8305,123 @@ esac
8324
8325 need_locks="$enable_libtool_lock"
8326
8327+if test -n "$ac_tool_prefix"; then
8328+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8329+set dummy ${ac_tool_prefix}mt; ac_word=$2
8330+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8331+$as_echo_n "checking for $ac_word... " >&6; }
8332+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
8333+ $as_echo_n "(cached) " >&6
8334+else
8335+ if test -n "$MANIFEST_TOOL"; then
8336+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8337+else
8338+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8339+for as_dir in $PATH
8340+do
8341+ IFS=$as_save_IFS
8342+ test -z "$as_dir" && as_dir=.
8343+ for ac_exec_ext in '' $ac_executable_extensions; do
8344+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8345+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8346+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8347+ break 2
8348+ fi
8349+done
8350+ done
8351+IFS=$as_save_IFS
8352+
8353+fi
8354+fi
8355+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8356+if test -n "$MANIFEST_TOOL"; then
8357+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8358+$as_echo "$MANIFEST_TOOL" >&6; }
8359+else
8360+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8361+$as_echo "no" >&6; }
8362+fi
8363+
8364+
8365+fi
8366+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8367+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8368+ # Extract the first word of "mt", so it can be a program name with args.
8369+set dummy mt; ac_word=$2
8370+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8371+$as_echo_n "checking for $ac_word... " >&6; }
8372+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
8373+ $as_echo_n "(cached) " >&6
8374+else
8375+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8376+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8377+else
8378+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8379+for as_dir in $PATH
8380+do
8381+ IFS=$as_save_IFS
8382+ test -z "$as_dir" && as_dir=.
8383+ for ac_exec_ext in '' $ac_executable_extensions; do
8384+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8385+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8386+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8387+ break 2
8388+ fi
8389+done
8390+ done
8391+IFS=$as_save_IFS
8392+
8393+fi
8394+fi
8395+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8396+if test -n "$ac_ct_MANIFEST_TOOL"; then
8397+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8398+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8399+else
8400+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8401+$as_echo "no" >&6; }
8402+fi
8403+
8404+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8405+ MANIFEST_TOOL=":"
8406+ else
8407+ case $cross_compiling:$ac_tool_warned in
8408+yes:)
8409+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8410+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8411+ac_tool_warned=yes ;;
8412+esac
8413+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8414+ fi
8415+else
8416+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8417+fi
8418+
8419+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8420+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8421+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8422+if ${lt_cv_path_mainfest_tool+:} false; then :
8423+ $as_echo_n "(cached) " >&6
8424+else
8425+ lt_cv_path_mainfest_tool=no
8426+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8427+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8428+ cat conftest.err >&5
8429+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8430+ lt_cv_path_mainfest_tool=yes
8431+ fi
8432+ rm -f conftest*
8433+fi
8434+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8435+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8436+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8437+ MANIFEST_TOOL=:
8438+fi
8439+
8440+
8441+
8442+
8443+
8444
8445 case $host_os in
8446 rhapsody* | darwin*)
8447@@ -8488,6 +8985,8 @@ _LT_EOF
8448 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8449 echo "$AR cru libconftest.a conftest.o" >&5
8450 $AR cru libconftest.a conftest.o 2>&5
8451+ echo "$RANLIB libconftest.a" >&5
8452+ $RANLIB libconftest.a 2>&5
8453 cat > conftest.c << _LT_EOF
8454 int main() { return 0;}
8455 _LT_EOF
8456@@ -8556,6 +9055,16 @@ done
8457
8458
8459
8460+func_stripname_cnf ()
8461+{
8462+ case ${2} in
8463+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8464+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8465+ esac
8466+} # func_stripname_cnf
8467+
8468+
8469+
8470
8471
8472 # Set options
8473@@ -8684,7 +9193,8 @@ fi
8474 LIBTOOL_DEPS="$ltmain"
8475
8476 # Always use our own libtool.
8477-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8478+LIBTOOL='$(SHELL) $(top_builddir)'
8479+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8480
8481
8482
8483@@ -8773,7 +9283,7 @@ aix3*)
8484 esac
8485
8486 # Global variables:
8487-ofile=libtool
8488+ofile=${host_alias}-libtool
8489 can_build_shared=yes
8490
8491 # All known linkers require a `.a' archive for static linking (except MSVC,
8492@@ -9071,8 +9581,6 @@ fi
8493 lt_prog_compiler_pic=
8494 lt_prog_compiler_static=
8495
8496-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8497-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8498
8499 if test "$GCC" = yes; then
8500 lt_prog_compiler_wl='-Wl,'
8501@@ -9238,6 +9746,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8502 lt_prog_compiler_pic='--shared'
8503 lt_prog_compiler_static='--static'
8504 ;;
8505+ nagfor*)
8506+ # NAG Fortran compiler
8507+ lt_prog_compiler_wl='-Wl,-Wl,,'
8508+ lt_prog_compiler_pic='-PIC'
8509+ lt_prog_compiler_static='-Bstatic'
8510+ ;;
8511 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8512 # Portland Group compilers (*not* the Pentium gcc compiler,
8513 # which looks to be a dead project)
8514@@ -9300,7 +9814,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8515 lt_prog_compiler_pic='-KPIC'
8516 lt_prog_compiler_static='-Bstatic'
8517 case $cc_basename in
8518- f77* | f90* | f95*)
8519+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8520 lt_prog_compiler_wl='-Qoption ld ';;
8521 *)
8522 lt_prog_compiler_wl='-Wl,';;
8523@@ -9357,13 +9871,17 @@ case $host_os in
8524 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8525 ;;
8526 esac
8527-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8528-$as_echo "$lt_prog_compiler_pic" >&6; }
8529-
8530-
8531-
8532-
8533
8534+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8535+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8536+if ${lt_cv_prog_compiler_pic+:} false; then :
8537+ $as_echo_n "(cached) " >&6
8538+else
8539+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8540+fi
8541+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8542+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8543+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8544
8545 #
8546 # Check to make sure the PIC flag actually works.
8547@@ -9424,6 +9942,11 @@ fi
8548
8549
8550
8551+
8552+
8553+
8554+
8555+
8556 #
8557 # Check to make sure the static flag actually works.
8558 #
8559@@ -9774,7 +10297,8 @@ _LT_EOF
8560 allow_undefined_flag=unsupported
8561 always_export_symbols=no
8562 enable_shared_with_static_runtimes=yes
8563- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8564+ 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'
8565+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8566
8567 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8568 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8569@@ -9873,12 +10397,12 @@ _LT_EOF
8570 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8571 hardcode_libdir_flag_spec=
8572 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8573- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8574+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8575 if test "x$supports_anon_versioning" = xyes; then
8576 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8577 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8578 echo "local: *; };" >> $output_objdir/$libname.ver~
8579- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8580+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8581 fi
8582 ;;
8583 esac
8584@@ -9892,8 +10416,8 @@ _LT_EOF
8585 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8586 wlarc=
8587 else
8588- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8589- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8590+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8591+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8592 fi
8593 ;;
8594
8595@@ -9911,8 +10435,8 @@ _LT_EOF
8596
8597 _LT_EOF
8598 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8599- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8600- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8601+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8602+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8603 else
8604 ld_shlibs=no
8605 fi
8606@@ -9958,8 +10482,8 @@ _LT_EOF
8607
8608 *)
8609 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8610- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8611- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8612+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8613+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8614 else
8615 ld_shlibs=no
8616 fi
8617@@ -10089,7 +10613,13 @@ _LT_EOF
8618 allow_undefined_flag='-berok'
8619 # Determine the default libpath from the value encoded in an
8620 # empty executable.
8621- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8622+ if test "${lt_cv_aix_libpath+set}" = set; then
8623+ aix_libpath=$lt_cv_aix_libpath
8624+else
8625+ if ${lt_cv_aix_libpath_+:} false; then :
8626+ $as_echo_n "(cached) " >&6
8627+else
8628+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8629 /* end confdefs.h. */
8630
8631 int
8632@@ -10102,22 +10632,29 @@ main ()
8633 _ACEOF
8634 if ac_fn_c_try_link "$LINENO"; then :
8635
8636-lt_aix_libpath_sed='
8637- /Import File Strings/,/^$/ {
8638- /^0/ {
8639- s/^0 *\(.*\)$/\1/
8640- p
8641- }
8642- }'
8643-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8644-# Check for a 64-bit object if we didn't find anything.
8645-if test -z "$aix_libpath"; then
8646- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8647-fi
8648+ lt_aix_libpath_sed='
8649+ /Import File Strings/,/^$/ {
8650+ /^0/ {
8651+ s/^0 *\([^ ]*\) *$/\1/
8652+ p
8653+ }
8654+ }'
8655+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8656+ # Check for a 64-bit object if we didn't find anything.
8657+ if test -z "$lt_cv_aix_libpath_"; then
8658+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8659+ fi
8660 fi
8661 rm -f core conftest.err conftest.$ac_objext \
8662 conftest$ac_exeext conftest.$ac_ext
8663-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8664+ if test -z "$lt_cv_aix_libpath_"; then
8665+ lt_cv_aix_libpath_="/usr/lib:/lib"
8666+ fi
8667+
8668+fi
8669+
8670+ aix_libpath=$lt_cv_aix_libpath_
8671+fi
8672
8673 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8674 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"
8675@@ -10129,7 +10666,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8676 else
8677 # Determine the default libpath from the value encoded in an
8678 # empty executable.
8679- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8680+ if test "${lt_cv_aix_libpath+set}" = set; then
8681+ aix_libpath=$lt_cv_aix_libpath
8682+else
8683+ if ${lt_cv_aix_libpath_+:} false; then :
8684+ $as_echo_n "(cached) " >&6
8685+else
8686+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8687 /* end confdefs.h. */
8688
8689 int
8690@@ -10142,22 +10685,29 @@ main ()
8691 _ACEOF
8692 if ac_fn_c_try_link "$LINENO"; then :
8693
8694-lt_aix_libpath_sed='
8695- /Import File Strings/,/^$/ {
8696- /^0/ {
8697- s/^0 *\(.*\)$/\1/
8698- p
8699- }
8700- }'
8701-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8702-# Check for a 64-bit object if we didn't find anything.
8703-if test -z "$aix_libpath"; then
8704- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8705-fi
8706+ lt_aix_libpath_sed='
8707+ /Import File Strings/,/^$/ {
8708+ /^0/ {
8709+ s/^0 *\([^ ]*\) *$/\1/
8710+ p
8711+ }
8712+ }'
8713+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8714+ # Check for a 64-bit object if we didn't find anything.
8715+ if test -z "$lt_cv_aix_libpath_"; then
8716+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8717+ fi
8718 fi
8719 rm -f core conftest.err conftest.$ac_objext \
8720 conftest$ac_exeext conftest.$ac_ext
8721-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8722+ if test -z "$lt_cv_aix_libpath_"; then
8723+ lt_cv_aix_libpath_="/usr/lib:/lib"
8724+ fi
8725+
8726+fi
8727+
8728+ aix_libpath=$lt_cv_aix_libpath_
8729+fi
8730
8731 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8732 # Warning - without using the other run time loading flags,
8733@@ -10201,21 +10751,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8734 # When not using gcc, we currently assume that we are using
8735 # Microsoft Visual C++.
8736 # hardcode_libdir_flag_spec is actually meaningless, as there is
8737- # no search path for DLLs.
8738- hardcode_libdir_flag_spec=' '
8739- allow_undefined_flag=unsupported
8740- # Tell ltmain to make .lib files, not .a files.
8741- libext=lib
8742- # Tell ltmain to make .dll files, not .so files.
8743- shrext_cmds=".dll"
8744- # FIXME: Setting linknames here is a bad hack.
8745- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8746- # The linker will automatically build a .lib file if we build a DLL.
8747- old_archive_from_new_cmds='true'
8748- # FIXME: Should let the user specify the lib program.
8749- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8750- fix_srcfile_path='`cygpath -w "$srcfile"`'
8751- enable_shared_with_static_runtimes=yes
8752+ # no search path for DLLs.
8753+ case $cc_basename in
8754+ cl*)
8755+ # Native MSVC
8756+ hardcode_libdir_flag_spec=' '
8757+ allow_undefined_flag=unsupported
8758+ always_export_symbols=yes
8759+ file_list_spec='@'
8760+ # Tell ltmain to make .lib files, not .a files.
8761+ libext=lib
8762+ # Tell ltmain to make .dll files, not .so files.
8763+ shrext_cmds=".dll"
8764+ # FIXME: Setting linknames here is a bad hack.
8765+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8766+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8767+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8768+ else
8769+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8770+ fi~
8771+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8772+ linknames='
8773+ # The linker will not automatically build a static lib if we build a DLL.
8774+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8775+ enable_shared_with_static_runtimes=yes
8776+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8777+ # Don't use ranlib
8778+ old_postinstall_cmds='chmod 644 $oldlib'
8779+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8780+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8781+ case $lt_outputfile in
8782+ *.exe|*.EXE) ;;
8783+ *)
8784+ lt_outputfile="$lt_outputfile.exe"
8785+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8786+ ;;
8787+ esac~
8788+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8789+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8790+ $RM "$lt_outputfile.manifest";
8791+ fi'
8792+ ;;
8793+ *)
8794+ # Assume MSVC wrapper
8795+ hardcode_libdir_flag_spec=' '
8796+ allow_undefined_flag=unsupported
8797+ # Tell ltmain to make .lib files, not .a files.
8798+ libext=lib
8799+ # Tell ltmain to make .dll files, not .so files.
8800+ shrext_cmds=".dll"
8801+ # FIXME: Setting linknames here is a bad hack.
8802+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8803+ # The linker will automatically build a .lib file if we build a DLL.
8804+ old_archive_from_new_cmds='true'
8805+ # FIXME: Should let the user specify the lib program.
8806+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8807+ enable_shared_with_static_runtimes=yes
8808+ ;;
8809+ esac
8810 ;;
8811
8812 darwin* | rhapsody*)
8813@@ -10276,7 +10869,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8814
8815 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8816 freebsd* | dragonfly*)
8817- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8818+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8819 hardcode_libdir_flag_spec='-R$libdir'
8820 hardcode_direct=yes
8821 hardcode_shlibpath_var=no
8822@@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8823
8824 hpux9*)
8825 if test "$GCC" = yes; then
8826- 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'
8827+ 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'
8828 else
8829 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'
8830 fi
8831@@ -10300,7 +10893,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8832
8833 hpux10*)
8834 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8835- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8836+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8837 else
8838 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8839 fi
8840@@ -10324,10 +10917,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8841 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8842 ;;
8843 ia64*)
8844- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8845+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8846 ;;
8847 *)
8848- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8849+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8850 ;;
8851 esac
8852 else
8853@@ -10406,23 +10999,36 @@ fi
8854
8855 irix5* | irix6* | nonstopux*)
8856 if test "$GCC" = yes; then
8857- 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'
8858+ 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'
8859 # Try to use the -exported_symbol ld option, if it does not
8860 # work, assume that -exports_file does not work either and
8861 # implicitly export all symbols.
8862- save_LDFLAGS="$LDFLAGS"
8863- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8864- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8865+ # This should be the same for all languages, so no per-tag cache variable.
8866+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8867+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8868+if ${lt_cv_irix_exported_symbol+:} false; then :
8869+ $as_echo_n "(cached) " >&6
8870+else
8871+ save_LDFLAGS="$LDFLAGS"
8872+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8873+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8874 /* end confdefs.h. */
8875-int foo(void) {}
8876+int foo (void) { return 0; }
8877 _ACEOF
8878 if ac_fn_c_try_link "$LINENO"; then :
8879- 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'
8880-
8881+ lt_cv_irix_exported_symbol=yes
8882+else
8883+ lt_cv_irix_exported_symbol=no
8884 fi
8885 rm -f core conftest.err conftest.$ac_objext \
8886 conftest$ac_exeext conftest.$ac_ext
8887- LDFLAGS="$save_LDFLAGS"
8888+ LDFLAGS="$save_LDFLAGS"
8889+fi
8890+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8891+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8892+ if test "$lt_cv_irix_exported_symbol" = yes; then
8893+ 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'
8894+ fi
8895 else
8896 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'
8897 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'
8898@@ -10507,7 +11113,7 @@ rm -f core conftest.err conftest.$ac_objext \
8899 osf4* | osf5*) # as osf3* with the addition of -msym flag
8900 if test "$GCC" = yes; then
8901 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8902- 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'
8903+ 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'
8904 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8905 else
8906 allow_undefined_flag=' -expect_unresolved \*'
8907@@ -10526,9 +11132,9 @@ rm -f core conftest.err conftest.$ac_objext \
8908 no_undefined_flag=' -z defs'
8909 if test "$GCC" = yes; then
8910 wlarc='${wl}'
8911- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8912+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8913 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8914- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8915+ $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'
8916 else
8917 case `$CC -V 2>&1` in
8918 *"Compilers 5.0"*)
8919@@ -11104,8 +11710,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8920 need_version=no
8921 need_lib_prefix=no
8922
8923- case $GCC,$host_os in
8924- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8925+ case $GCC,$cc_basename in
8926+ yes,*)
8927+ # gcc
8928 library_names_spec='$libname.dll.a'
8929 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8930 postinstall_cmds='base_file=`basename \${file}`~
8931@@ -11138,13 +11745,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8932 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8933 ;;
8934 esac
8935+ dynamic_linker='Win32 ld.exe'
8936+ ;;
8937+
8938+ *,cl*)
8939+ # Native MSVC
8940+ libname_spec='$name'
8941+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8942+ library_names_spec='${libname}.dll.lib'
8943+
8944+ case $build_os in
8945+ mingw*)
8946+ sys_lib_search_path_spec=
8947+ lt_save_ifs=$IFS
8948+ IFS=';'
8949+ for lt_path in $LIB
8950+ do
8951+ IFS=$lt_save_ifs
8952+ # Let DOS variable expansion print the short 8.3 style file name.
8953+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8954+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8955+ done
8956+ IFS=$lt_save_ifs
8957+ # Convert to MSYS style.
8958+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8959+ ;;
8960+ cygwin*)
8961+ # Convert to unix form, then to dos form, then back to unix form
8962+ # but this time dos style (no spaces!) so that the unix form looks
8963+ # like /cygdrive/c/PROGRA~1:/cygdr...
8964+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8965+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8966+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8967+ ;;
8968+ *)
8969+ sys_lib_search_path_spec="$LIB"
8970+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8971+ # It is most probably a Windows format PATH.
8972+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8973+ else
8974+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8975+ fi
8976+ # FIXME: find the short name or the path components, as spaces are
8977+ # common. (e.g. "Program Files" -> "PROGRA~1")
8978+ ;;
8979+ esac
8980+
8981+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8982+ postinstall_cmds='base_file=`basename \${file}`~
8983+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8984+ dldir=$destdir/`dirname \$dlpath`~
8985+ test -d \$dldir || mkdir -p \$dldir~
8986+ $install_prog $dir/$dlname \$dldir/$dlname'
8987+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8988+ dlpath=$dir/\$dldll~
8989+ $RM \$dlpath'
8990+ shlibpath_overrides_runpath=yes
8991+ dynamic_linker='Win32 link.exe'
8992 ;;
8993
8994 *)
8995+ # Assume MSVC wrapper
8996 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8997+ dynamic_linker='Win32 ld.exe'
8998 ;;
8999 esac
9000- dynamic_linker='Win32 ld.exe'
9001 # FIXME: first we should search . and the directory the executable is in
9002 shlibpath_var=PATH
9003 ;;
9004@@ -11236,7 +11901,7 @@ haiku*)
9005 soname_spec='${libname}${release}${shared_ext}$major'
9006 shlibpath_var=LIBRARY_PATH
9007 shlibpath_overrides_runpath=yes
9008- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9009+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9010 hardcode_into_libs=yes
9011 ;;
9012
9013@@ -12032,7 +12697,7 @@ else
9014 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9015 lt_status=$lt_dlunknown
9016 cat > conftest.$ac_ext <<_LT_EOF
9017-#line 12035 "configure"
9018+#line $LINENO "configure"
9019 #include "confdefs.h"
9020
9021 #if HAVE_DLFCN_H
9022@@ -12076,10 +12741,10 @@ else
9023 /* When -fvisbility=hidden is used, assume the code has been annotated
9024 correspondingly for the symbols needed. */
9025 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9026-void fnord () __attribute__((visibility("default")));
9027+int fnord () __attribute__((visibility("default")));
9028 #endif
9029
9030-void fnord () { int i=42; }
9031+int fnord () { return 42; }
9032 int main ()
9033 {
9034 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9035@@ -12138,7 +12803,7 @@ else
9036 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9037 lt_status=$lt_dlunknown
9038 cat > conftest.$ac_ext <<_LT_EOF
9039-#line 12141 "configure"
9040+#line $LINENO "configure"
9041 #include "confdefs.h"
9042
9043 #if HAVE_DLFCN_H
9044@@ -12182,10 +12847,10 @@ else
9045 /* When -fvisbility=hidden is used, assume the code has been annotated
9046 correspondingly for the symbols needed. */
9047 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9048-void fnord () __attribute__((visibility("default")));
9049+int fnord () __attribute__((visibility("default")));
9050 #endif
9051
9052-void fnord () { int i=42; }
9053+int fnord () { return 42; }
9054 int main ()
9055 {
9056 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9057@@ -12577,6 +13242,7 @@ $RM -r conftest*
9058
9059 # Allow CC to be a program name with arguments.
9060 lt_save_CC=$CC
9061+ lt_save_CFLAGS=$CFLAGS
9062 lt_save_LD=$LD
9063 lt_save_GCC=$GCC
9064 GCC=$GXX
9065@@ -12594,6 +13260,7 @@ $RM -r conftest*
9066 fi
9067 test -z "${LDCXX+set}" || LD=$LDCXX
9068 CC=${CXX-"c++"}
9069+ CFLAGS=$CXXFLAGS
9070 compiler=$CC
9071 compiler_CXX=$CC
9072 for cc_temp in $compiler""; do
9073@@ -12876,7 +13543,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9074 allow_undefined_flag_CXX='-berok'
9075 # Determine the default libpath from the value encoded in an empty
9076 # executable.
9077- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9078+ if test "${lt_cv_aix_libpath+set}" = set; then
9079+ aix_libpath=$lt_cv_aix_libpath
9080+else
9081+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9082+ $as_echo_n "(cached) " >&6
9083+else
9084+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9085 /* end confdefs.h. */
9086
9087 int
9088@@ -12889,22 +13562,29 @@ main ()
9089 _ACEOF
9090 if ac_fn_cxx_try_link "$LINENO"; then :
9091
9092-lt_aix_libpath_sed='
9093- /Import File Strings/,/^$/ {
9094- /^0/ {
9095- s/^0 *\(.*\)$/\1/
9096- p
9097- }
9098- }'
9099-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9100-# Check for a 64-bit object if we didn't find anything.
9101-if test -z "$aix_libpath"; then
9102- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9103-fi
9104+ lt_aix_libpath_sed='
9105+ /Import File Strings/,/^$/ {
9106+ /^0/ {
9107+ s/^0 *\([^ ]*\) *$/\1/
9108+ p
9109+ }
9110+ }'
9111+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9112+ # Check for a 64-bit object if we didn't find anything.
9113+ if test -z "$lt_cv_aix_libpath__CXX"; then
9114+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9115+ fi
9116 fi
9117 rm -f core conftest.err conftest.$ac_objext \
9118 conftest$ac_exeext conftest.$ac_ext
9119-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9120+ if test -z "$lt_cv_aix_libpath__CXX"; then
9121+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9122+ fi
9123+
9124+fi
9125+
9126+ aix_libpath=$lt_cv_aix_libpath__CXX
9127+fi
9128
9129 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9130
9131@@ -12917,7 +13597,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9132 else
9133 # Determine the default libpath from the value encoded in an
9134 # empty executable.
9135- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9136+ if test "${lt_cv_aix_libpath+set}" = set; then
9137+ aix_libpath=$lt_cv_aix_libpath
9138+else
9139+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9140+ $as_echo_n "(cached) " >&6
9141+else
9142+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9143 /* end confdefs.h. */
9144
9145 int
9146@@ -12930,22 +13616,29 @@ main ()
9147 _ACEOF
9148 if ac_fn_cxx_try_link "$LINENO"; then :
9149
9150-lt_aix_libpath_sed='
9151- /Import File Strings/,/^$/ {
9152- /^0/ {
9153- s/^0 *\(.*\)$/\1/
9154- p
9155- }
9156- }'
9157-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9158-# Check for a 64-bit object if we didn't find anything.
9159-if test -z "$aix_libpath"; then
9160- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9161-fi
9162+ lt_aix_libpath_sed='
9163+ /Import File Strings/,/^$/ {
9164+ /^0/ {
9165+ s/^0 *\([^ ]*\) *$/\1/
9166+ p
9167+ }
9168+ }'
9169+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9170+ # Check for a 64-bit object if we didn't find anything.
9171+ if test -z "$lt_cv_aix_libpath__CXX"; then
9172+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9173+ fi
9174 fi
9175 rm -f core conftest.err conftest.$ac_objext \
9176 conftest$ac_exeext conftest.$ac_ext
9177-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9178+ if test -z "$lt_cv_aix_libpath__CXX"; then
9179+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9180+ fi
9181+
9182+fi
9183+
9184+ aix_libpath=$lt_cv_aix_libpath__CXX
9185+fi
9186
9187 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9188 # Warning - without using the other run time loading flags,
9189@@ -12988,29 +13681,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9190 ;;
9191
9192 cygwin* | mingw* | pw32* | cegcc*)
9193- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9194- # as there is no search path for DLLs.
9195- hardcode_libdir_flag_spec_CXX='-L$libdir'
9196- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9197- allow_undefined_flag_CXX=unsupported
9198- always_export_symbols_CXX=no
9199- enable_shared_with_static_runtimes_CXX=yes
9200-
9201- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9202- 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'
9203- # If the export-symbols file already is a .def file (1st line
9204- # is EXPORTS), use it as is; otherwise, prepend...
9205- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9206- cp $export_symbols $output_objdir/$soname.def;
9207- else
9208- echo EXPORTS > $output_objdir/$soname.def;
9209- cat $export_symbols >> $output_objdir/$soname.def;
9210- fi~
9211- $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'
9212- else
9213- ld_shlibs_CXX=no
9214- fi
9215- ;;
9216+ case $GXX,$cc_basename in
9217+ ,cl* | no,cl*)
9218+ # Native MSVC
9219+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9220+ # no search path for DLLs.
9221+ hardcode_libdir_flag_spec_CXX=' '
9222+ allow_undefined_flag_CXX=unsupported
9223+ always_export_symbols_CXX=yes
9224+ file_list_spec_CXX='@'
9225+ # Tell ltmain to make .lib files, not .a files.
9226+ libext=lib
9227+ # Tell ltmain to make .dll files, not .so files.
9228+ shrext_cmds=".dll"
9229+ # FIXME: Setting linknames here is a bad hack.
9230+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9231+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9232+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9233+ else
9234+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9235+ fi~
9236+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9237+ linknames='
9238+ # The linker will not automatically build a static lib if we build a DLL.
9239+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9240+ enable_shared_with_static_runtimes_CXX=yes
9241+ # Don't use ranlib
9242+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9243+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9244+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9245+ case $lt_outputfile in
9246+ *.exe|*.EXE) ;;
9247+ *)
9248+ lt_outputfile="$lt_outputfile.exe"
9249+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9250+ ;;
9251+ esac~
9252+ func_to_tool_file "$lt_outputfile"~
9253+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9254+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9255+ $RM "$lt_outputfile.manifest";
9256+ fi'
9257+ ;;
9258+ *)
9259+ # g++
9260+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9261+ # as there is no search path for DLLs.
9262+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9263+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9264+ allow_undefined_flag_CXX=unsupported
9265+ always_export_symbols_CXX=no
9266+ enable_shared_with_static_runtimes_CXX=yes
9267+
9268+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9269+ 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'
9270+ # If the export-symbols file already is a .def file (1st line
9271+ # is EXPORTS), use it as is; otherwise, prepend...
9272+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9273+ cp $export_symbols $output_objdir/$soname.def;
9274+ else
9275+ echo EXPORTS > $output_objdir/$soname.def;
9276+ cat $export_symbols >> $output_objdir/$soname.def;
9277+ fi~
9278+ $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'
9279+ else
9280+ ld_shlibs_CXX=no
9281+ fi
9282+ ;;
9283+ esac
9284+ ;;
9285 darwin* | rhapsody*)
9286
9287
9288@@ -13116,7 +13855,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9289 ;;
9290 *)
9291 if test "$GXX" = yes; then
9292- 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'
9293+ 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'
9294 else
9295 # FIXME: insert proper C++ library support
9296 ld_shlibs_CXX=no
9297@@ -13187,10 +13926,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9298 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9299 ;;
9300 ia64*)
9301- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9302+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9303 ;;
9304 *)
9305- 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'
9306+ 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'
9307 ;;
9308 esac
9309 fi
9310@@ -13231,9 +13970,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9311 *)
9312 if test "$GXX" = yes; then
9313 if test "$with_gnu_ld" = no; then
9314- 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'
9315+ 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'
9316 else
9317- 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'
9318+ 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'
9319 fi
9320 fi
9321 link_all_deplibs_CXX=yes
9322@@ -13303,20 +14042,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9323 prelink_cmds_CXX='tpldir=Template.dir~
9324 rm -rf $tpldir~
9325 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9326- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9327+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9328 old_archive_cmds_CXX='tpldir=Template.dir~
9329 rm -rf $tpldir~
9330 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9331- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9332+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9333 $RANLIB $oldlib'
9334 archive_cmds_CXX='tpldir=Template.dir~
9335 rm -rf $tpldir~
9336 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9337- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9338+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9339 archive_expsym_cmds_CXX='tpldir=Template.dir~
9340 rm -rf $tpldir~
9341 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9342- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9343+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9344 ;;
9345 *) # Version 6 and above use weak symbols
9346 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9347@@ -13511,7 +14250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9348 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'
9349 ;;
9350 *)
9351- 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'
9352+ 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'
9353 ;;
9354 esac
9355
9356@@ -13557,7 +14296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9357
9358 solaris*)
9359 case $cc_basename in
9360- CC*)
9361+ CC* | sunCC*)
9362 # Sun C++ 4.2, 5.x and Centerline C++
9363 archive_cmds_need_lc_CXX=yes
9364 no_undefined_flag_CXX=' -zdefs'
9365@@ -13598,9 +14337,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9366 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9367 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9368 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9369- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9370+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9371 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9372- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9373+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9374
9375 # Commands to make compiler produce verbose output that lists
9376 # what "hidden" libraries, object files and flags are used when
9377@@ -13735,6 +14474,13 @@ private:
9378 };
9379 _LT_EOF
9380
9381+
9382+_lt_libdeps_save_CFLAGS=$CFLAGS
9383+case "$CC $CFLAGS " in #(
9384+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9385+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9386+esac
9387+
9388 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9389 (eval $ac_compile) 2>&5
9390 ac_status=$?
9391@@ -13748,7 +14494,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9392 pre_test_object_deps_done=no
9393
9394 for p in `eval "$output_verbose_link_cmd"`; do
9395- case $p in
9396+ case ${prev}${p} in
9397
9398 -L* | -R* | -l*)
9399 # Some compilers place space between "-{L,R}" and the path.
9400@@ -13757,13 +14503,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9401 test $p = "-R"; then
9402 prev=$p
9403 continue
9404- else
9405- prev=
9406 fi
9407
9408+ # Expand the sysroot to ease extracting the directories later.
9409+ if test -z "$prev"; then
9410+ case $p in
9411+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9412+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9413+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9414+ esac
9415+ fi
9416+ case $p in
9417+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9418+ esac
9419 if test "$pre_test_object_deps_done" = no; then
9420- case $p in
9421- -L* | -R*)
9422+ case ${prev} in
9423+ -L | -R)
9424 # Internal compiler library paths should come after those
9425 # provided the user. The postdeps already come after the
9426 # user supplied libs so there is no need to process them.
9427@@ -13783,8 +14538,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9428 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9429 fi
9430 fi
9431+ prev=
9432 ;;
9433
9434+ *.lto.$objext) ;; # Ignore GCC LTO objects
9435 *.$objext)
9436 # This assumes that the test object file only shows up
9437 # once in the compiler output.
9438@@ -13820,6 +14577,7 @@ else
9439 fi
9440
9441 $RM -f confest.$objext
9442+CFLAGS=$_lt_libdeps_save_CFLAGS
9443
9444 # PORTME: override above test on systems where it is broken
9445 case $host_os in
9446@@ -13855,7 +14613,7 @@ linux*)
9447
9448 solaris*)
9449 case $cc_basename in
9450- CC*)
9451+ CC* | sunCC*)
9452 # The more standards-conforming stlport4 library is
9453 # incompatible with the Cstd library. Avoid specifying
9454 # it if it's in CXXFLAGS. Ignore libCrun as
9455@@ -13920,8 +14678,6 @@ fi
9456 lt_prog_compiler_pic_CXX=
9457 lt_prog_compiler_static_CXX=
9458
9459-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9460-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9461
9462 # C++ specific cases for pic, static, wl, etc.
9463 if test "$GXX" = yes; then
9464@@ -14026,6 +14782,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9465 ;;
9466 esac
9467 ;;
9468+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9469+ # This hack is so that the source file can tell whether it is being
9470+ # built for inclusion in a dll (and should export symbols for example).
9471+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9472+ ;;
9473 dgux*)
9474 case $cc_basename in
9475 ec++*)
9476@@ -14178,7 +14939,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9477 ;;
9478 solaris*)
9479 case $cc_basename in
9480- CC*)
9481+ CC* | sunCC*)
9482 # Sun C++ 4.2, 5.x and Centerline C++
9483 lt_prog_compiler_pic_CXX='-KPIC'
9484 lt_prog_compiler_static_CXX='-Bstatic'
9485@@ -14243,10 +15004,17 @@ case $host_os in
9486 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9487 ;;
9488 esac
9489-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9490-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9491-
9492
9493+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9494+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9495+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
9496+ $as_echo_n "(cached) " >&6
9497+else
9498+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9499+fi
9500+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9501+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9502+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9503
9504 #
9505 # Check to make sure the PIC flag actually works.
9506@@ -14304,6 +15072,8 @@ fi
9507
9508
9509
9510+
9511+
9512 #
9513 # Check to make sure the static flag actually works.
9514 #
9515@@ -14481,6 +15251,7 @@ fi
9516 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9517
9518 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9519+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9520 case $host_os in
9521 aix[4-9]*)
9522 # If we're using GNU nm, then we don't want the "-C" option.
9523@@ -14495,15 +15266,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9524 ;;
9525 pw32*)
9526 export_symbols_cmds_CXX="$ltdll_cmds"
9527- ;;
9528+ ;;
9529 cygwin* | mingw* | cegcc*)
9530- 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'
9531- ;;
9532+ case $cc_basename in
9533+ cl*) ;;
9534+ *)
9535+ 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'
9536+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9537+ ;;
9538+ esac
9539+ ;;
9540 *)
9541 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9542- ;;
9543+ ;;
9544 esac
9545- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9546
9547 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9548 $as_echo "$ld_shlibs_CXX" >&6; }
9549@@ -14766,8 +15542,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9550 need_version=no
9551 need_lib_prefix=no
9552
9553- case $GCC,$host_os in
9554- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9555+ case $GCC,$cc_basename in
9556+ yes,*)
9557+ # gcc
9558 library_names_spec='$libname.dll.a'
9559 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9560 postinstall_cmds='base_file=`basename \${file}`~
9561@@ -14799,13 +15576,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9562 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9563 ;;
9564 esac
9565+ dynamic_linker='Win32 ld.exe'
9566+ ;;
9567+
9568+ *,cl*)
9569+ # Native MSVC
9570+ libname_spec='$name'
9571+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9572+ library_names_spec='${libname}.dll.lib'
9573+
9574+ case $build_os in
9575+ mingw*)
9576+ sys_lib_search_path_spec=
9577+ lt_save_ifs=$IFS
9578+ IFS=';'
9579+ for lt_path in $LIB
9580+ do
9581+ IFS=$lt_save_ifs
9582+ # Let DOS variable expansion print the short 8.3 style file name.
9583+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9584+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9585+ done
9586+ IFS=$lt_save_ifs
9587+ # Convert to MSYS style.
9588+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9589+ ;;
9590+ cygwin*)
9591+ # Convert to unix form, then to dos form, then back to unix form
9592+ # but this time dos style (no spaces!) so that the unix form looks
9593+ # like /cygdrive/c/PROGRA~1:/cygdr...
9594+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9595+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9596+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9597+ ;;
9598+ *)
9599+ sys_lib_search_path_spec="$LIB"
9600+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9601+ # It is most probably a Windows format PATH.
9602+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9603+ else
9604+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9605+ fi
9606+ # FIXME: find the short name or the path components, as spaces are
9607+ # common. (e.g. "Program Files" -> "PROGRA~1")
9608+ ;;
9609+ esac
9610+
9611+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9612+ postinstall_cmds='base_file=`basename \${file}`~
9613+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9614+ dldir=$destdir/`dirname \$dlpath`~
9615+ test -d \$dldir || mkdir -p \$dldir~
9616+ $install_prog $dir/$dlname \$dldir/$dlname'
9617+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9618+ dlpath=$dir/\$dldll~
9619+ $RM \$dlpath'
9620+ shlibpath_overrides_runpath=yes
9621+ dynamic_linker='Win32 link.exe'
9622 ;;
9623
9624 *)
9625+ # Assume MSVC wrapper
9626 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9627+ dynamic_linker='Win32 ld.exe'
9628 ;;
9629 esac
9630- dynamic_linker='Win32 ld.exe'
9631 # FIXME: first we should search . and the directory the executable is in
9632 shlibpath_var=PATH
9633 ;;
9634@@ -14896,7 +15731,7 @@ haiku*)
9635 soname_spec='${libname}${release}${shared_ext}$major'
9636 shlibpath_var=LIBRARY_PATH
9637 shlibpath_overrides_runpath=yes
9638- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9639+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9640 hardcode_into_libs=yes
9641 ;;
9642
9643@@ -15355,6 +16190,7 @@ fi
9644 fi # test -n "$compiler"
9645
9646 CC=$lt_save_CC
9647+ CFLAGS=$lt_save_CFLAGS
9648 LDCXX=$LD
9649 LD=$lt_save_LD
9650 GCC=$lt_save_GCC
9651@@ -18477,13 +19313,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9652 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9653 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9654 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9655+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9656+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9657 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9658 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9659 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9660 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9661 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9662+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9663+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9664+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9665+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9666 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9667 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9668+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9669 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9670 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9671 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9672@@ -18498,14 +19341,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9673 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9674 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9675 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"`'
9676+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9677+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9678 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9679 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9680 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9681-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9682 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9683+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9684 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9685 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9686 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9687+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9688 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9689 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9690 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9691@@ -18538,12 +19384,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9692 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9693 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9694 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9695-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9696 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9697 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9698 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9699 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9700 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9701+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9702 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9703 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9704 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9705@@ -18582,8 +19428,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9706 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9707 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9708 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9709-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9710 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9711+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9712 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9713 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9714 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9715@@ -18610,12 +19456,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9716 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9717 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9718 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9719-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9720 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9721 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9722 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9723 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9724 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9725+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9726 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9727 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9728 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9729@@ -18653,8 +19499,13 @@ reload_flag \
9730 OBJDUMP \
9731 deplibs_check_method \
9732 file_magic_cmd \
9733+file_magic_glob \
9734+want_nocaseglob \
9735+DLLTOOL \
9736+sharedlib_from_linklib_cmd \
9737 AR \
9738 AR_FLAGS \
9739+archiver_list_spec \
9740 STRIP \
9741 RANLIB \
9742 CC \
9743@@ -18664,12 +19515,14 @@ lt_cv_sys_global_symbol_pipe \
9744 lt_cv_sys_global_symbol_to_cdecl \
9745 lt_cv_sys_global_symbol_to_c_name_address \
9746 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9747+nm_file_list_spec \
9748 lt_prog_compiler_no_builtin_flag \
9749-lt_prog_compiler_wl \
9750 lt_prog_compiler_pic \
9751+lt_prog_compiler_wl \
9752 lt_prog_compiler_static \
9753 lt_cv_prog_compiler_c_o \
9754 need_locks \
9755+MANIFEST_TOOL \
9756 DSYMUTIL \
9757 NMEDIT \
9758 LIPO \
9759@@ -18685,7 +19538,6 @@ no_undefined_flag \
9760 hardcode_libdir_flag_spec \
9761 hardcode_libdir_flag_spec_ld \
9762 hardcode_libdir_separator \
9763-fix_srcfile_path \
9764 exclude_expsyms \
9765 include_expsyms \
9766 file_list_spec \
9767@@ -18707,8 +19559,8 @@ LD_CXX \
9768 reload_flag_CXX \
9769 compiler_CXX \
9770 lt_prog_compiler_no_builtin_flag_CXX \
9771-lt_prog_compiler_wl_CXX \
9772 lt_prog_compiler_pic_CXX \
9773+lt_prog_compiler_wl_CXX \
9774 lt_prog_compiler_static_CXX \
9775 lt_cv_prog_compiler_c_o_CXX \
9776 export_dynamic_flag_spec_CXX \
9777@@ -18720,7 +19572,6 @@ no_undefined_flag_CXX \
9778 hardcode_libdir_flag_spec_CXX \
9779 hardcode_libdir_flag_spec_ld_CXX \
9780 hardcode_libdir_separator_CXX \
9781-fix_srcfile_path_CXX \
9782 exclude_expsyms_CXX \
9783 include_expsyms_CXX \
9784 file_list_spec_CXX \
9785@@ -18754,6 +19605,7 @@ module_cmds \
9786 module_expsym_cmds \
9787 export_symbols_cmds \
9788 prelink_cmds \
9789+postlink_cmds \
9790 postinstall_cmds \
9791 postuninstall_cmds \
9792 finish_cmds \
9793@@ -18768,7 +19620,8 @@ archive_expsym_cmds_CXX \
9794 module_cmds_CXX \
9795 module_expsym_cmds_CXX \
9796 export_symbols_cmds_CXX \
9797-prelink_cmds_CXX; do
9798+prelink_cmds_CXX \
9799+postlink_cmds_CXX; do
9800 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9801 *[\\\\\\\`\\"\\\$]*)
9802 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9803@@ -19533,7 +20386,8 @@ $as_echo X"$file" |
9804 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9805 #
9806 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9807-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9808+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9809+# Inc.
9810 # Written by Gordon Matzigkeit, 1996
9811 #
9812 # This file is part of GNU Libtool.
9813@@ -19636,19 +20490,42 @@ SP2NL=$lt_lt_SP2NL
9814 # turn newlines into spaces.
9815 NL2SP=$lt_lt_NL2SP
9816
9817+# convert \$build file names to \$host format.
9818+to_host_file_cmd=$lt_cv_to_host_file_cmd
9819+
9820+# convert \$build files to toolchain format.
9821+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9822+
9823 # An object symbol dumper.
9824 OBJDUMP=$lt_OBJDUMP
9825
9826 # Method to check whether dependent libraries are shared objects.
9827 deplibs_check_method=$lt_deplibs_check_method
9828
9829-# Command to use when deplibs_check_method == "file_magic".
9830+# Command to use when deplibs_check_method = "file_magic".
9831 file_magic_cmd=$lt_file_magic_cmd
9832
9833+# How to find potential files when deplibs_check_method = "file_magic".
9834+file_magic_glob=$lt_file_magic_glob
9835+
9836+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9837+want_nocaseglob=$lt_want_nocaseglob
9838+
9839+# DLL creation program.
9840+DLLTOOL=$lt_DLLTOOL
9841+
9842+# Command to associate shared and link libraries.
9843+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9844+
9845 # The archiver.
9846 AR=$lt_AR
9847+
9848+# Flags to create an archive.
9849 AR_FLAGS=$lt_AR_FLAGS
9850
9851+# How to feed a file listing to the archiver.
9852+archiver_list_spec=$lt_archiver_list_spec
9853+
9854 # A symbol stripping program.
9855 STRIP=$lt_STRIP
9856
9857@@ -19678,6 +20555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9858 # Transform the output of nm in a C name address pair when lib prefix is needed.
9859 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9860
9861+# Specify filename containing input files for \$NM.
9862+nm_file_list_spec=$lt_nm_file_list_spec
9863+
9864+# The root where to search for dependent libraries,and in which our libraries should be installed.
9865+lt_sysroot=$lt_sysroot
9866+
9867 # The name of the directory that contains temporary libtool files.
9868 objdir=$objdir
9869
9870@@ -19687,6 +20570,9 @@ MAGIC_CMD=$MAGIC_CMD
9871 # Must we lock files when doing compilation?
9872 need_locks=$lt_need_locks
9873
9874+# Manifest tool.
9875+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9876+
9877 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9878 DSYMUTIL=$lt_DSYMUTIL
9879
9880@@ -19801,12 +20687,12 @@ with_gcc=$GCC
9881 # Compiler flag to turn off builtin functions.
9882 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9883
9884-# How to pass a linker flag through the compiler.
9885-wl=$lt_lt_prog_compiler_wl
9886-
9887 # Additional compiler flags for building library objects.
9888 pic_flag=$lt_lt_prog_compiler_pic
9889
9890+# How to pass a linker flag through the compiler.
9891+wl=$lt_lt_prog_compiler_wl
9892+
9893 # Compiler flag to prevent dynamic linking.
9894 link_static_flag=$lt_lt_prog_compiler_static
9895
9896@@ -19893,9 +20779,6 @@ inherit_rpath=$inherit_rpath
9897 # Whether libtool must link a program against all its dependency libraries.
9898 link_all_deplibs=$link_all_deplibs
9899
9900-# Fix the shell variable \$srcfile for the compiler.
9901-fix_srcfile_path=$lt_fix_srcfile_path
9902-
9903 # Set to "yes" if exported symbols are required.
9904 always_export_symbols=$always_export_symbols
9905
9906@@ -19911,6 +20794,9 @@ include_expsyms=$lt_include_expsyms
9907 # Commands necessary for linking programs (against libraries) with templates.
9908 prelink_cmds=$lt_prelink_cmds
9909
9910+# Commands necessary for finishing linking programs.
9911+postlink_cmds=$lt_postlink_cmds
9912+
9913 # Specify filename containing input files.
9914 file_list_spec=$lt_file_list_spec
9915
9916@@ -19957,210 +20843,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9917 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9918 # text mode, it properly converts lines to CR/LF. This bash problem
9919 # is reportedly fixed, but why not run on old versions too?
9920- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9921- || (rm -f "$cfgfile"; exit 1)
9922-
9923- case $xsi_shell in
9924- yes)
9925- cat << \_LT_EOF >> "$cfgfile"
9926-
9927-# func_dirname file append nondir_replacement
9928-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9929-# otherwise set result to NONDIR_REPLACEMENT.
9930-func_dirname ()
9931-{
9932- case ${1} in
9933- */*) func_dirname_result="${1%/*}${2}" ;;
9934- * ) func_dirname_result="${3}" ;;
9935- esac
9936-}
9937-
9938-# func_basename file
9939-func_basename ()
9940-{
9941- func_basename_result="${1##*/}"
9942-}
9943-
9944-# func_dirname_and_basename file append nondir_replacement
9945-# perform func_basename and func_dirname in a single function
9946-# call:
9947-# dirname: Compute the dirname of FILE. If nonempty,
9948-# add APPEND to the result, otherwise set result
9949-# to NONDIR_REPLACEMENT.
9950-# value returned in "$func_dirname_result"
9951-# basename: Compute filename of FILE.
9952-# value retuned in "$func_basename_result"
9953-# Implementation must be kept synchronized with func_dirname
9954-# and func_basename. For efficiency, we do not delegate to
9955-# those functions but instead duplicate the functionality here.
9956-func_dirname_and_basename ()
9957-{
9958- case ${1} in
9959- */*) func_dirname_result="${1%/*}${2}" ;;
9960- * ) func_dirname_result="${3}" ;;
9961- esac
9962- func_basename_result="${1##*/}"
9963-}
9964-
9965-# func_stripname prefix suffix name
9966-# strip PREFIX and SUFFIX off of NAME.
9967-# PREFIX and SUFFIX must not contain globbing or regex special
9968-# characters, hashes, percent signs, but SUFFIX may contain a leading
9969-# dot (in which case that matches only a dot).
9970-func_stripname ()
9971-{
9972- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9973- # positional parameters, so assign one to ordinary parameter first.
9974- func_stripname_result=${3}
9975- func_stripname_result=${func_stripname_result#"${1}"}
9976- func_stripname_result=${func_stripname_result%"${2}"}
9977-}
9978-
9979-# func_opt_split
9980-func_opt_split ()
9981-{
9982- func_opt_split_opt=${1%%=*}
9983- func_opt_split_arg=${1#*=}
9984-}
9985-
9986-# func_lo2o object
9987-func_lo2o ()
9988-{
9989- case ${1} in
9990- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9991- *) func_lo2o_result=${1} ;;
9992- esac
9993-}
9994-
9995-# func_xform libobj-or-source
9996-func_xform ()
9997-{
9998- func_xform_result=${1%.*}.lo
9999-}
10000-
10001-# func_arith arithmetic-term...
10002-func_arith ()
10003-{
10004- func_arith_result=$(( $* ))
10005-}
10006-
10007-# func_len string
10008-# STRING may not start with a hyphen.
10009-func_len ()
10010-{
10011- func_len_result=${#1}
10012-}
10013-
10014-_LT_EOF
10015- ;;
10016- *) # Bourne compatible functions.
10017- cat << \_LT_EOF >> "$cfgfile"
10018-
10019-# func_dirname file append nondir_replacement
10020-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10021-# otherwise set result to NONDIR_REPLACEMENT.
10022-func_dirname ()
10023-{
10024- # Extract subdirectory from the argument.
10025- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10026- if test "X$func_dirname_result" = "X${1}"; then
10027- func_dirname_result="${3}"
10028- else
10029- func_dirname_result="$func_dirname_result${2}"
10030- fi
10031-}
10032-
10033-# func_basename file
10034-func_basename ()
10035-{
10036- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10037-}
10038-
10039-
10040-# func_stripname prefix suffix name
10041-# strip PREFIX and SUFFIX off of NAME.
10042-# PREFIX and SUFFIX must not contain globbing or regex special
10043-# characters, hashes, percent signs, but SUFFIX may contain a leading
10044-# dot (in which case that matches only a dot).
10045-# func_strip_suffix prefix name
10046-func_stripname ()
10047-{
10048- case ${2} in
10049- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10050- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10051- esac
10052-}
10053-
10054-# sed scripts:
10055-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10056-my_sed_long_arg='1s/^-[^=]*=//'
10057-
10058-# func_opt_split
10059-func_opt_split ()
10060-{
10061- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10062- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10063-}
10064-
10065-# func_lo2o object
10066-func_lo2o ()
10067-{
10068- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10069-}
10070-
10071-# func_xform libobj-or-source
10072-func_xform ()
10073-{
10074- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10075-}
10076-
10077-# func_arith arithmetic-term...
10078-func_arith ()
10079-{
10080- func_arith_result=`expr "$@"`
10081-}
10082-
10083-# func_len string
10084-# STRING may not start with a hyphen.
10085-func_len ()
10086-{
10087- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10088-}
10089-
10090-_LT_EOF
10091-esac
10092-
10093-case $lt_shell_append in
10094- yes)
10095- cat << \_LT_EOF >> "$cfgfile"
10096-
10097-# func_append var value
10098-# Append VALUE to the end of shell variable VAR.
10099-func_append ()
10100-{
10101- eval "$1+=\$2"
10102-}
10103-_LT_EOF
10104- ;;
10105- *)
10106- cat << \_LT_EOF >> "$cfgfile"
10107-
10108-# func_append var value
10109-# Append VALUE to the end of shell variable VAR.
10110-func_append ()
10111-{
10112- eval "$1=\$$1\$2"
10113-}
10114-
10115-_LT_EOF
10116- ;;
10117- esac
10118-
10119-
10120- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10121- || (rm -f "$cfgfile"; exit 1)
10122-
10123- mv -f "$cfgfile" "$ofile" ||
10124+ sed '$q' "$ltmain" >> "$cfgfile" \
10125+ || (rm -f "$cfgfile"; exit 1)
10126+
10127+ if test x"$xsi_shell" = xyes; then
10128+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10129+func_dirname ()\
10130+{\
10131+\ case ${1} in\
10132+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10133+\ * ) func_dirname_result="${3}" ;;\
10134+\ esac\
10135+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10136+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10137+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10138+test 0 -eq $? || _lt_function_replace_fail=:
10139+
10140+
10141+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10142+func_basename ()\
10143+{\
10144+\ func_basename_result="${1##*/}"\
10145+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10146+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10147+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10148+test 0 -eq $? || _lt_function_replace_fail=:
10149+
10150+
10151+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10152+func_dirname_and_basename ()\
10153+{\
10154+\ case ${1} in\
10155+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10156+\ * ) func_dirname_result="${3}" ;;\
10157+\ esac\
10158+\ func_basename_result="${1##*/}"\
10159+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10160+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10161+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10162+test 0 -eq $? || _lt_function_replace_fail=:
10163+
10164+
10165+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10166+func_stripname ()\
10167+{\
10168+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10169+\ # positional parameters, so assign one to ordinary parameter first.\
10170+\ func_stripname_result=${3}\
10171+\ func_stripname_result=${func_stripname_result#"${1}"}\
10172+\ func_stripname_result=${func_stripname_result%"${2}"}\
10173+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10174+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10175+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10176+test 0 -eq $? || _lt_function_replace_fail=:
10177+
10178+
10179+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10180+func_split_long_opt ()\
10181+{\
10182+\ func_split_long_opt_name=${1%%=*}\
10183+\ func_split_long_opt_arg=${1#*=}\
10184+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10185+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10186+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10187+test 0 -eq $? || _lt_function_replace_fail=:
10188+
10189+
10190+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10191+func_split_short_opt ()\
10192+{\
10193+\ func_split_short_opt_arg=${1#??}\
10194+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10195+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10196+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10197+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10198+test 0 -eq $? || _lt_function_replace_fail=:
10199+
10200+
10201+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10202+func_lo2o ()\
10203+{\
10204+\ case ${1} in\
10205+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10206+\ *) func_lo2o_result=${1} ;;\
10207+\ esac\
10208+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10209+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10210+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10211+test 0 -eq $? || _lt_function_replace_fail=:
10212+
10213+
10214+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10215+func_xform ()\
10216+{\
10217+ func_xform_result=${1%.*}.lo\
10218+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10219+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10220+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10221+test 0 -eq $? || _lt_function_replace_fail=:
10222+
10223+
10224+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10225+func_arith ()\
10226+{\
10227+ func_arith_result=$(( $* ))\
10228+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10229+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10230+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10231+test 0 -eq $? || _lt_function_replace_fail=:
10232+
10233+
10234+ sed -e '/^func_len ()$/,/^} # func_len /c\
10235+func_len ()\
10236+{\
10237+ func_len_result=${#1}\
10238+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10239+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10240+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10241+test 0 -eq $? || _lt_function_replace_fail=:
10242+
10243+fi
10244+
10245+if test x"$lt_shell_append" = xyes; then
10246+ sed -e '/^func_append ()$/,/^} # func_append /c\
10247+func_append ()\
10248+{\
10249+ eval "${1}+=\\${2}"\
10250+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10251+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10252+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10253+test 0 -eq $? || _lt_function_replace_fail=:
10254+
10255+
10256+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10257+func_append_quoted ()\
10258+{\
10259+\ func_quote_for_eval "${2}"\
10260+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10261+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10262+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10263+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10264+test 0 -eq $? || _lt_function_replace_fail=:
10265+
10266+
10267+ # Save a `func_append' function call where possible by direct use of '+='
10268+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10269+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10270+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10271+ test 0 -eq $? || _lt_function_replace_fail=:
10272+else
10273+ # Save a `func_append' function call even when '+=' is not available
10274+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10275+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10276+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10277+ test 0 -eq $? || _lt_function_replace_fail=:
10278+fi
10279+
10280+if test x"$_lt_function_replace_fail" = x":"; then
10281+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10282+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10283+fi
10284+
10285+
10286+ mv -f "$cfgfile" "$ofile" ||
10287 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10288 chmod +x "$ofile"
10289
10290@@ -20188,12 +21033,12 @@ with_gcc=$GCC_CXX
10291 # Compiler flag to turn off builtin functions.
10292 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10293
10294-# How to pass a linker flag through the compiler.
10295-wl=$lt_lt_prog_compiler_wl_CXX
10296-
10297 # Additional compiler flags for building library objects.
10298 pic_flag=$lt_lt_prog_compiler_pic_CXX
10299
10300+# How to pass a linker flag through the compiler.
10301+wl=$lt_lt_prog_compiler_wl_CXX
10302+
10303 # Compiler flag to prevent dynamic linking.
10304 link_static_flag=$lt_lt_prog_compiler_static_CXX
10305
10306@@ -20280,9 +21125,6 @@ inherit_rpath=$inherit_rpath_CXX
10307 # Whether libtool must link a program against all its dependency libraries.
10308 link_all_deplibs=$link_all_deplibs_CXX
10309
10310-# Fix the shell variable \$srcfile for the compiler.
10311-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10312-
10313 # Set to "yes" if exported symbols are required.
10314 always_export_symbols=$always_export_symbols_CXX
10315
10316@@ -20298,6 +21140,9 @@ include_expsyms=$lt_include_expsyms_CXX
10317 # Commands necessary for linking programs (against libraries) with templates.
10318 prelink_cmds=$lt_prelink_cmds_CXX
10319
10320+# Commands necessary for finishing linking programs.
10321+postlink_cmds=$lt_postlink_cmds_CXX
10322+
10323 # Specify filename containing input files.
10324 file_list_spec=$lt_file_list_spec_CXX
10325
10326diff --git a/libctf/configure b/libctf/configure
10327index e5493b31691..9977e4f7a42 100755
10328--- a/libctf/configure
10329+++ b/libctf/configure
10330@@ -663,6 +663,8 @@ OTOOL
10331 LIPO
10332 NMEDIT
10333 DSYMUTIL
10334+MANIFEST_TOOL
10335+DLLTOOL
10336 OBJDUMP
10337 LN_S
10338 NM
10339@@ -778,6 +780,7 @@ enable_static
10340 with_pic
10341 enable_fast_install
10342 with_gnu_ld
10343+with_libtool_sysroot
10344 enable_libtool_lock
10345 enable_largefile
10346 enable_werror_always
10347@@ -1436,6 +1439,8 @@ Optional Packages:
10348 --with-pic try to use only PIC/non-PIC objects [default=use
10349 both]
10350 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
10351+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
10352+ (or the compiler's sysroot if not specified).
10353 --with-system-zlib use installed libz
10354
10355 Some influential environment variables:
10356@@ -5324,8 +5329,8 @@ esac
10357
10358
10359
10360-macro_version='2.2.7a'
10361-macro_revision='1.3134'
10362+macro_version='2.4'
10363+macro_revision='1.3293'
10364
10365
10366
10367@@ -5436,7 +5441,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10369 $as_echo_n "checking how to print strings... " >&6; }
10370 # Test print first, because it will be a builtin if present.
10371-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10372+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10373 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10374 ECHO='print -r --'
10375 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10376@@ -6122,8 +6127,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10377 # Try some XSI features
10378 xsi_shell=no
10379 ( _lt_dummy="a/b/c"
10380- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
10381- = c,a/b,, \
10382+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
10383+ = c,a/b,b/c, \
10384 && eval 'test $(( 1 + 1 )) -eq 2 \
10385 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10386 && xsi_shell=yes
10387@@ -6172,6 +6177,80 @@ esac
10388
10389
10390
10391+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
10392+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
10393+if ${lt_cv_to_host_file_cmd+:} false; then :
10394+ $as_echo_n "(cached) " >&6
10395+else
10396+ case $host in
10397+ *-*-mingw* )
10398+ case $build in
10399+ *-*-mingw* ) # actually msys
10400+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
10401+ ;;
10402+ *-*-cygwin* )
10403+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
10404+ ;;
10405+ * ) # otherwise, assume *nix
10406+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
10407+ ;;
10408+ esac
10409+ ;;
10410+ *-*-cygwin* )
10411+ case $build in
10412+ *-*-mingw* ) # actually msys
10413+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
10414+ ;;
10415+ *-*-cygwin* )
10416+ lt_cv_to_host_file_cmd=func_convert_file_noop
10417+ ;;
10418+ * ) # otherwise, assume *nix
10419+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
10420+ ;;
10421+ esac
10422+ ;;
10423+ * ) # unhandled hosts (and "normal" native builds)
10424+ lt_cv_to_host_file_cmd=func_convert_file_noop
10425+ ;;
10426+esac
10427+
10428+fi
10429+
10430+to_host_file_cmd=$lt_cv_to_host_file_cmd
10431+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
10432+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
10433+
10434+
10435+
10436+
10437+
10438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
10439+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
10440+if ${lt_cv_to_tool_file_cmd+:} false; then :
10441+ $as_echo_n "(cached) " >&6
10442+else
10443+ #assume ordinary cross tools, or native build.
10444+lt_cv_to_tool_file_cmd=func_convert_file_noop
10445+case $host in
10446+ *-*-mingw* )
10447+ case $build in
10448+ *-*-mingw* ) # actually msys
10449+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
10450+ ;;
10451+ esac
10452+ ;;
10453+esac
10454+
10455+fi
10456+
10457+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10458+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
10459+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
10460+
10461+
10462+
10463+
10464+
10465 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10466 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10467 if ${lt_cv_ld_reload_flag+:} false; then :
10468@@ -6188,6 +6267,11 @@ case $reload_flag in
10469 esac
10470 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10471 case $host_os in
10472+ cygwin* | mingw* | pw32* | cegcc*)
10473+ if test "$GCC" != yes; then
10474+ reload_cmds=false
10475+ fi
10476+ ;;
10477 darwin*)
10478 if test "$GCC" = yes; then
10479 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10480@@ -6356,7 +6440,8 @@ mingw* | pw32*)
10481 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10482 lt_cv_file_magic_cmd='func_win32_libid'
10483 else
10484- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10485+ # Keep this pattern in sync with the one in func_win32_libid.
10486+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10487 lt_cv_file_magic_cmd='$OBJDUMP -f'
10488 fi
10489 ;;
10490@@ -6510,6 +6595,21 @@ esac
10491 fi
10492 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10493 $as_echo "$lt_cv_deplibs_check_method" >&6; }
10494+
10495+file_magic_glob=
10496+want_nocaseglob=no
10497+if test "$build" = "$host"; then
10498+ case $host_os in
10499+ mingw* | pw32*)
10500+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10501+ want_nocaseglob=yes
10502+ else
10503+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
10504+ fi
10505+ ;;
10506+ esac
10507+fi
10508+
10509 file_magic_cmd=$lt_cv_file_magic_cmd
10510 deplibs_check_method=$lt_cv_deplibs_check_method
10511 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10512@@ -6525,9 +6625,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10513
10514
10515
10516+
10517+
10518+
10519+
10520+
10521+
10522+
10523+
10524+
10525+
10526+if test -n "$ac_tool_prefix"; then
10527+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
10528+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
10529+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10530+$as_echo_n "checking for $ac_word... " >&6; }
10531+if ${ac_cv_prog_DLLTOOL+:} false; then :
10532+ $as_echo_n "(cached) " >&6
10533+else
10534+ if test -n "$DLLTOOL"; then
10535+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
10536+else
10537+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10538+for as_dir in $PATH
10539+do
10540+ IFS=$as_save_IFS
10541+ test -z "$as_dir" && as_dir=.
10542+ for ac_exec_ext in '' $ac_executable_extensions; do
10543+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10544+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
10545+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10546+ break 2
10547+ fi
10548+done
10549+ done
10550+IFS=$as_save_IFS
10551+
10552+fi
10553+fi
10554+DLLTOOL=$ac_cv_prog_DLLTOOL
10555+if test -n "$DLLTOOL"; then
10556+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
10557+$as_echo "$DLLTOOL" >&6; }
10558+else
10559+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10560+$as_echo "no" >&6; }
10561+fi
10562+
10563+
10564+fi
10565+if test -z "$ac_cv_prog_DLLTOOL"; then
10566+ ac_ct_DLLTOOL=$DLLTOOL
10567+ # Extract the first word of "dlltool", so it can be a program name with args.
10568+set dummy dlltool; ac_word=$2
10569+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10570+$as_echo_n "checking for $ac_word... " >&6; }
10571+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
10572+ $as_echo_n "(cached) " >&6
10573+else
10574+ if test -n "$ac_ct_DLLTOOL"; then
10575+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
10576+else
10577+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10578+for as_dir in $PATH
10579+do
10580+ IFS=$as_save_IFS
10581+ test -z "$as_dir" && as_dir=.
10582+ for ac_exec_ext in '' $ac_executable_extensions; do
10583+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10584+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
10585+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10586+ break 2
10587+ fi
10588+done
10589+ done
10590+IFS=$as_save_IFS
10591+
10592+fi
10593+fi
10594+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
10595+if test -n "$ac_ct_DLLTOOL"; then
10596+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
10597+$as_echo "$ac_ct_DLLTOOL" >&6; }
10598+else
10599+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10600+$as_echo "no" >&6; }
10601+fi
10602+
10603+ if test "x$ac_ct_DLLTOOL" = x; then
10604+ DLLTOOL="false"
10605+ else
10606+ case $cross_compiling:$ac_tool_warned in
10607+yes:)
10608+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10609+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10610+ac_tool_warned=yes ;;
10611+esac
10612+ DLLTOOL=$ac_ct_DLLTOOL
10613+ fi
10614+else
10615+ DLLTOOL="$ac_cv_prog_DLLTOOL"
10616+fi
10617+
10618+test -z "$DLLTOOL" && DLLTOOL=dlltool
10619+
10620+
10621+
10622+
10623+
10624+
10625+
10626+
10627+
10628+
10629+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
10630+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
10631+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
10632+ $as_echo_n "(cached) " >&6
10633+else
10634+ lt_cv_sharedlib_from_linklib_cmd='unknown'
10635+
10636+case $host_os in
10637+cygwin* | mingw* | pw32* | cegcc*)
10638+ # two different shell functions defined in ltmain.sh
10639+ # decide which to use based on capabilities of $DLLTOOL
10640+ case `$DLLTOOL --help 2>&1` in
10641+ *--identify-strict*)
10642+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10643+ ;;
10644+ *)
10645+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10646+ ;;
10647+ esac
10648+ ;;
10649+*)
10650+ # fallback: assume linklib IS sharedlib
10651+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10652+ ;;
10653+esac
10654+
10655+fi
10656+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
10657+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
10658+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10659+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10660+
10661+
10662+
10663+
10664+
10665+
10666+
10667 if test -n "$ac_tool_prefix"; then
10668- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10669-set dummy ${ac_tool_prefix}ar; ac_word=$2
10670+ for ac_prog in ar
10671+ do
10672+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10673+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10674 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10675 $as_echo_n "checking for $ac_word... " >&6; }
10676 if ${ac_cv_prog_AR+:} false; then :
10677@@ -6543,7 +6796,7 @@ do
10678 test -z "$as_dir" && as_dir=.
10679 for ac_exec_ext in '' $ac_executable_extensions; do
10680 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10681- ac_cv_prog_AR="${ac_tool_prefix}ar"
10682+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
10683 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10684 break 2
10685 fi
10686@@ -6563,11 +6816,15 @@ $as_echo "no" >&6; }
10687 fi
10688
10689
10690+ test -n "$AR" && break
10691+ done
10692 fi
10693-if test -z "$ac_cv_prog_AR"; then
10694+if test -z "$AR"; then
10695 ac_ct_AR=$AR
10696- # Extract the first word of "ar", so it can be a program name with args.
10697-set dummy ar; ac_word=$2
10698+ for ac_prog in ar
10699+do
10700+ # Extract the first word of "$ac_prog", so it can be a program name with args.
10701+set dummy $ac_prog; ac_word=$2
10702 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10703 $as_echo_n "checking for $ac_word... " >&6; }
10704 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10705@@ -6583,7 +6840,7 @@ do
10706 test -z "$as_dir" && as_dir=.
10707 for ac_exec_ext in '' $ac_executable_extensions; do
10708 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10709- ac_cv_prog_ac_ct_AR="ar"
10710+ ac_cv_prog_ac_ct_AR="$ac_prog"
10711 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10712 break 2
10713 fi
10714@@ -6602,6 +6859,10 @@ else
10715 $as_echo "no" >&6; }
10716 fi
10717
10718+
10719+ test -n "$ac_ct_AR" && break
10720+done
10721+
10722 if test "x$ac_ct_AR" = x; then
10723 AR="false"
10724 else
10725@@ -6613,16 +6874,72 @@ ac_tool_warned=yes ;;
10726 esac
10727 AR=$ac_ct_AR
10728 fi
10729-else
10730- AR="$ac_cv_prog_AR"
10731 fi
10732
10733-test -z "$AR" && AR=ar
10734-test -z "$AR_FLAGS" && AR_FLAGS=cru
10735+: ${AR=ar}
10736+: ${AR_FLAGS=cru}
10737+
10738+
10739+
10740+
10741+
10742+
10743+
10744+
10745+
10746+
10747+
10748+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10749+$as_echo_n "checking for archiver @FILE support... " >&6; }
10750+if ${lt_cv_ar_at_file+:} false; then :
10751+ $as_echo_n "(cached) " >&6
10752+else
10753+ lt_cv_ar_at_file=no
10754+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10755+/* end confdefs.h. */
10756+
10757+int
10758+main ()
10759+{
10760
10761+ ;
10762+ return 0;
10763+}
10764+_ACEOF
10765+if ac_fn_c_try_compile "$LINENO"; then :
10766+ echo conftest.$ac_objext > conftest.lst
10767+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
10768+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10769+ (eval $lt_ar_try) 2>&5
10770+ ac_status=$?
10771+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10772+ test $ac_status = 0; }
10773+ if test "$ac_status" -eq 0; then
10774+ # Ensure the archiver fails upon bogus file names.
10775+ rm -f conftest.$ac_objext libconftest.a
10776+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10777+ (eval $lt_ar_try) 2>&5
10778+ ac_status=$?
10779+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10780+ test $ac_status = 0; }
10781+ if test "$ac_status" -ne 0; then
10782+ lt_cv_ar_at_file=@
10783+ fi
10784+ fi
10785+ rm -f conftest.* libconftest.a
10786
10787+fi
10788+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10789
10790+fi
10791+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
10792+$as_echo "$lt_cv_ar_at_file" >&6; }
10793
10794+if test "x$lt_cv_ar_at_file" = xno; then
10795+ archiver_list_spec=
10796+else
10797+ archiver_list_spec=$lt_cv_ar_at_file
10798+fi
10799
10800
10801
10802@@ -6964,8 +7281,8 @@ esac
10803 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10804
10805 # Transform an extracted symbol line into symbol name and symbol address
10806-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
10807-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'"
10808+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
10809+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'"
10810
10811 # Handle CRLF in mingw tool chain
10812 opt_cr=
10813@@ -7001,6 +7318,7 @@ for ac_symprfx in "" "_"; do
10814 else
10815 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10816 fi
10817+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10818
10819 # Check to see that the pipe works correctly.
10820 pipe_works=no
10821@@ -7042,6 +7360,18 @@ _LT_EOF
10822 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10823 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10824 cat <<_LT_EOF > conftest.$ac_ext
10825+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10826+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10827+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10828+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10829+# define LT_DLSYM_CONST
10830+#elif defined(__osf__)
10831+/* This system does not cope well with relocations in const data. */
10832+# define LT_DLSYM_CONST
10833+#else
10834+# define LT_DLSYM_CONST const
10835+#endif
10836+
10837 #ifdef __cplusplus
10838 extern "C" {
10839 #endif
10840@@ -7053,7 +7383,7 @@ _LT_EOF
10841 cat <<_LT_EOF >> conftest.$ac_ext
10842
10843 /* The mapping between symbol names and symbols. */
10844-const struct {
10845+LT_DLSYM_CONST struct {
10846 const char *name;
10847 void *address;
10848 }
10849@@ -7079,8 +7409,8 @@ static const void *lt_preloaded_setup() {
10850 _LT_EOF
10851 # Now try linking the two files.
10852 mv conftest.$ac_objext conftstm.$ac_objext
10853- lt_save_LIBS="$LIBS"
10854- lt_save_CFLAGS="$CFLAGS"
10855+ lt_globsym_save_LIBS=$LIBS
10856+ lt_globsym_save_CFLAGS=$CFLAGS
10857 LIBS="conftstm.$ac_objext"
10858 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10859 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10860@@ -7090,8 +7420,8 @@ _LT_EOF
10861 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10862 pipe_works=yes
10863 fi
10864- LIBS="$lt_save_LIBS"
10865- CFLAGS="$lt_save_CFLAGS"
10866+ LIBS=$lt_globsym_save_LIBS
10867+ CFLAGS=$lt_globsym_save_CFLAGS
10868 else
10869 echo "cannot find nm_test_func in $nlist" >&5
10870 fi
10871@@ -7128,6 +7458,16 @@ else
10872 $as_echo "ok" >&6; }
10873 fi
10874
10875+# Response file support.
10876+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10877+ nm_file_list_spec='@'
10878+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
10879+ nm_file_list_spec='@'
10880+fi
10881+
10882+
10883+
10884+
10885
10886
10887
10888@@ -7144,6 +7484,45 @@ fi
10889
10890
10891
10892+
10893+
10894+
10895+
10896+
10897+
10898+
10899+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
10900+$as_echo_n "checking for sysroot... " >&6; }
10901+
10902+# Check whether --with-libtool-sysroot was given.
10903+if test "${with_libtool_sysroot+set}" = set; then :
10904+ withval=$with_libtool_sysroot;
10905+else
10906+ with_libtool_sysroot=no
10907+fi
10908+
10909+
10910+lt_sysroot=
10911+case ${with_libtool_sysroot} in #(
10912+ yes)
10913+ if test "$GCC" = yes; then
10914+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10915+ fi
10916+ ;; #(
10917+ /*)
10918+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10919+ ;; #(
10920+ no|'')
10921+ ;; #(
10922+ *)
10923+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
10924+$as_echo "${with_libtool_sysroot}" >&6; }
10925+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
10926+ ;;
10927+esac
10928+
10929+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
10930+$as_echo "${lt_sysroot:-no}" >&6; }
10931
10932
10933
10934@@ -7355,6 +7734,123 @@ esac
10935
10936 need_locks="$enable_libtool_lock"
10937
10938+if test -n "$ac_tool_prefix"; then
10939+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
10940+set dummy ${ac_tool_prefix}mt; ac_word=$2
10941+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10942+$as_echo_n "checking for $ac_word... " >&6; }
10943+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
10944+ $as_echo_n "(cached) " >&6
10945+else
10946+ if test -n "$MANIFEST_TOOL"; then
10947+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
10948+else
10949+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10950+for as_dir in $PATH
10951+do
10952+ IFS=$as_save_IFS
10953+ test -z "$as_dir" && as_dir=.
10954+ for ac_exec_ext in '' $ac_executable_extensions; do
10955+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10956+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
10957+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10958+ break 2
10959+ fi
10960+done
10961+ done
10962+IFS=$as_save_IFS
10963+
10964+fi
10965+fi
10966+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
10967+if test -n "$MANIFEST_TOOL"; then
10968+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
10969+$as_echo "$MANIFEST_TOOL" >&6; }
10970+else
10971+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10972+$as_echo "no" >&6; }
10973+fi
10974+
10975+
10976+fi
10977+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
10978+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
10979+ # Extract the first word of "mt", so it can be a program name with args.
10980+set dummy mt; ac_word=$2
10981+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10982+$as_echo_n "checking for $ac_word... " >&6; }
10983+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
10984+ $as_echo_n "(cached) " >&6
10985+else
10986+ if test -n "$ac_ct_MANIFEST_TOOL"; then
10987+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
10988+else
10989+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10990+for as_dir in $PATH
10991+do
10992+ IFS=$as_save_IFS
10993+ test -z "$as_dir" && as_dir=.
10994+ for ac_exec_ext in '' $ac_executable_extensions; do
10995+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10996+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
10997+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10998+ break 2
10999+ fi
11000+done
11001+ done
11002+IFS=$as_save_IFS
11003+
11004+fi
11005+fi
11006+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11007+if test -n "$ac_ct_MANIFEST_TOOL"; then
11008+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11009+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11010+else
11011+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11012+$as_echo "no" >&6; }
11013+fi
11014+
11015+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11016+ MANIFEST_TOOL=":"
11017+ else
11018+ case $cross_compiling:$ac_tool_warned in
11019+yes:)
11020+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11021+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11022+ac_tool_warned=yes ;;
11023+esac
11024+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11025+ fi
11026+else
11027+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11028+fi
11029+
11030+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11031+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11032+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11033+if ${lt_cv_path_mainfest_tool+:} false; then :
11034+ $as_echo_n "(cached) " >&6
11035+else
11036+ lt_cv_path_mainfest_tool=no
11037+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11038+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11039+ cat conftest.err >&5
11040+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11041+ lt_cv_path_mainfest_tool=yes
11042+ fi
11043+ rm -f conftest*
11044+fi
11045+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11046+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11047+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11048+ MANIFEST_TOOL=:
11049+fi
11050+
11051+
11052+
11053+
11054+
11055
11056 case $host_os in
11057 rhapsody* | darwin*)
11058@@ -7918,6 +8414,8 @@ _LT_EOF
11059 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11060 echo "$AR cru libconftest.a conftest.o" >&5
11061 $AR cru libconftest.a conftest.o 2>&5
11062+ echo "$RANLIB libconftest.a" >&5
11063+ $RANLIB libconftest.a 2>&5
11064 cat > conftest.c << _LT_EOF
11065 int main() { return 0;}
11066 _LT_EOF
11067@@ -8083,7 +8581,8 @@ fi
11068 LIBTOOL_DEPS="$ltmain"
11069
11070 # Always use our own libtool.
11071-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11072+LIBTOOL='$(SHELL) $(top_builddir)'
11073+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
11074
11075
11076
11077@@ -8172,7 +8671,7 @@ aix3*)
11078 esac
11079
11080 # Global variables:
11081-ofile=libtool
11082+ofile=${host_alias}-libtool
11083 can_build_shared=yes
11084
11085 # All known linkers require a `.a' archive for static linking (except MSVC,
11086@@ -8470,8 +8969,6 @@ fi
11087 lt_prog_compiler_pic=
11088 lt_prog_compiler_static=
11089
11090-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11091-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11092
11093 if test "$GCC" = yes; then
11094 lt_prog_compiler_wl='-Wl,'
11095@@ -8637,6 +9134,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11096 lt_prog_compiler_pic='--shared'
11097 lt_prog_compiler_static='--static'
11098 ;;
11099+ nagfor*)
11100+ # NAG Fortran compiler
11101+ lt_prog_compiler_wl='-Wl,-Wl,,'
11102+ lt_prog_compiler_pic='-PIC'
11103+ lt_prog_compiler_static='-Bstatic'
11104+ ;;
11105 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11106 # Portland Group compilers (*not* the Pentium gcc compiler,
11107 # which looks to be a dead project)
11108@@ -8699,7 +9202,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11109 lt_prog_compiler_pic='-KPIC'
11110 lt_prog_compiler_static='-Bstatic'
11111 case $cc_basename in
11112- f77* | f90* | f95*)
11113+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11114 lt_prog_compiler_wl='-Qoption ld ';;
11115 *)
11116 lt_prog_compiler_wl='-Wl,';;
11117@@ -8756,13 +9259,17 @@ case $host_os in
11118 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11119 ;;
11120 esac
11121-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11122-$as_echo "$lt_prog_compiler_pic" >&6; }
11123-
11124-
11125-
11126-
11127
11128+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11129+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11130+if ${lt_cv_prog_compiler_pic+:} false; then :
11131+ $as_echo_n "(cached) " >&6
11132+else
11133+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11134+fi
11135+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11136+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11137+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11138
11139 #
11140 # Check to make sure the PIC flag actually works.
11141@@ -8823,6 +9330,11 @@ fi
11142
11143
11144
11145+
11146+
11147+
11148+
11149+
11150 #
11151 # Check to make sure the static flag actually works.
11152 #
11153@@ -9173,7 +9685,8 @@ _LT_EOF
11154 allow_undefined_flag=unsupported
11155 always_export_symbols=no
11156 enable_shared_with_static_runtimes=yes
11157- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11158+ 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'
11159+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11160
11161 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11162 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11163@@ -9272,12 +9785,12 @@ _LT_EOF
11164 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11165 hardcode_libdir_flag_spec=
11166 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11167- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11168+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11169 if test "x$supports_anon_versioning" = xyes; then
11170 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11171 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11172 echo "local: *; };" >> $output_objdir/$libname.ver~
11173- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11174+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11175 fi
11176 ;;
11177 esac
11178@@ -9291,8 +9804,8 @@ _LT_EOF
11179 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11180 wlarc=
11181 else
11182- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11183- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11184+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11185+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11186 fi
11187 ;;
11188
11189@@ -9310,8 +9823,8 @@ _LT_EOF
11190
11191 _LT_EOF
11192 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11193- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11194- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11195+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11196+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11197 else
11198 ld_shlibs=no
11199 fi
11200@@ -9357,8 +9870,8 @@ _LT_EOF
11201
11202 *)
11203 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11204- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11205- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11206+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11207+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11208 else
11209 ld_shlibs=no
11210 fi
11211@@ -9488,7 +10001,13 @@ _LT_EOF
11212 allow_undefined_flag='-berok'
11213 # Determine the default libpath from the value encoded in an
11214 # empty executable.
11215- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11216+ if test "${lt_cv_aix_libpath+set}" = set; then
11217+ aix_libpath=$lt_cv_aix_libpath
11218+else
11219+ if ${lt_cv_aix_libpath_+:} false; then :
11220+ $as_echo_n "(cached) " >&6
11221+else
11222+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11223 /* end confdefs.h. */
11224
11225 int
11226@@ -9501,22 +10020,29 @@ main ()
11227 _ACEOF
11228 if ac_fn_c_try_link "$LINENO"; then :
11229
11230-lt_aix_libpath_sed='
11231- /Import File Strings/,/^$/ {
11232- /^0/ {
11233- s/^0 *\(.*\)$/\1/
11234- p
11235- }
11236- }'
11237-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11238-# Check for a 64-bit object if we didn't find anything.
11239-if test -z "$aix_libpath"; then
11240- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11241-fi
11242+ lt_aix_libpath_sed='
11243+ /Import File Strings/,/^$/ {
11244+ /^0/ {
11245+ s/^0 *\([^ ]*\) *$/\1/
11246+ p
11247+ }
11248+ }'
11249+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11250+ # Check for a 64-bit object if we didn't find anything.
11251+ if test -z "$lt_cv_aix_libpath_"; then
11252+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11253+ fi
11254 fi
11255 rm -f core conftest.err conftest.$ac_objext \
11256 conftest$ac_exeext conftest.$ac_ext
11257-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11258+ if test -z "$lt_cv_aix_libpath_"; then
11259+ lt_cv_aix_libpath_="/usr/lib:/lib"
11260+ fi
11261+
11262+fi
11263+
11264+ aix_libpath=$lt_cv_aix_libpath_
11265+fi
11266
11267 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11268 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"
11269@@ -9528,7 +10054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11270 else
11271 # Determine the default libpath from the value encoded in an
11272 # empty executable.
11273- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11274+ if test "${lt_cv_aix_libpath+set}" = set; then
11275+ aix_libpath=$lt_cv_aix_libpath
11276+else
11277+ if ${lt_cv_aix_libpath_+:} false; then :
11278+ $as_echo_n "(cached) " >&6
11279+else
11280+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11281 /* end confdefs.h. */
11282
11283 int
11284@@ -9541,22 +10073,29 @@ main ()
11285 _ACEOF
11286 if ac_fn_c_try_link "$LINENO"; then :
11287
11288-lt_aix_libpath_sed='
11289- /Import File Strings/,/^$/ {
11290- /^0/ {
11291- s/^0 *\(.*\)$/\1/
11292- p
11293- }
11294- }'
11295-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11296-# Check for a 64-bit object if we didn't find anything.
11297-if test -z "$aix_libpath"; then
11298- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11299-fi
11300+ lt_aix_libpath_sed='
11301+ /Import File Strings/,/^$/ {
11302+ /^0/ {
11303+ s/^0 *\([^ ]*\) *$/\1/
11304+ p
11305+ }
11306+ }'
11307+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11308+ # Check for a 64-bit object if we didn't find anything.
11309+ if test -z "$lt_cv_aix_libpath_"; then
11310+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11311+ fi
11312 fi
11313 rm -f core conftest.err conftest.$ac_objext \
11314 conftest$ac_exeext conftest.$ac_ext
11315-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11316+ if test -z "$lt_cv_aix_libpath_"; then
11317+ lt_cv_aix_libpath_="/usr/lib:/lib"
11318+ fi
11319+
11320+fi
11321+
11322+ aix_libpath=$lt_cv_aix_libpath_
11323+fi
11324
11325 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11326 # Warning - without using the other run time loading flags,
11327@@ -9601,20 +10140,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11328 # Microsoft Visual C++.
11329 # hardcode_libdir_flag_spec is actually meaningless, as there is
11330 # no search path for DLLs.
11331- hardcode_libdir_flag_spec=' '
11332- allow_undefined_flag=unsupported
11333- # Tell ltmain to make .lib files, not .a files.
11334- libext=lib
11335- # Tell ltmain to make .dll files, not .so files.
11336- shrext_cmds=".dll"
11337- # FIXME: Setting linknames here is a bad hack.
11338- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11339- # The linker will automatically build a .lib file if we build a DLL.
11340- old_archive_from_new_cmds='true'
11341- # FIXME: Should let the user specify the lib program.
11342- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11343- fix_srcfile_path='`cygpath -w "$srcfile"`'
11344- enable_shared_with_static_runtimes=yes
11345+ case $cc_basename in
11346+ cl*)
11347+ # Native MSVC
11348+ hardcode_libdir_flag_spec=' '
11349+ allow_undefined_flag=unsupported
11350+ always_export_symbols=yes
11351+ file_list_spec='@'
11352+ # Tell ltmain to make .lib files, not .a files.
11353+ libext=lib
11354+ # Tell ltmain to make .dll files, not .so files.
11355+ shrext_cmds=".dll"
11356+ # FIXME: Setting linknames here is a bad hack.
11357+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11358+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11359+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11360+ else
11361+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11362+ fi~
11363+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11364+ linknames='
11365+ # The linker will not automatically build a static lib if we build a DLL.
11366+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
11367+ enable_shared_with_static_runtimes=yes
11368+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11369+ # Don't use ranlib
11370+ old_postinstall_cmds='chmod 644 $oldlib'
11371+ postlink_cmds='lt_outputfile="@OUTPUT@"~
11372+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11373+ case $lt_outputfile in
11374+ *.exe|*.EXE) ;;
11375+ *)
11376+ lt_outputfile="$lt_outputfile.exe"
11377+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11378+ ;;
11379+ esac~
11380+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11381+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11382+ $RM "$lt_outputfile.manifest";
11383+ fi'
11384+ ;;
11385+ *)
11386+ # Assume MSVC wrapper
11387+ hardcode_libdir_flag_spec=' '
11388+ allow_undefined_flag=unsupported
11389+ # Tell ltmain to make .lib files, not .a files.
11390+ libext=lib
11391+ # Tell ltmain to make .dll files, not .so files.
11392+ shrext_cmds=".dll"
11393+ # FIXME: Setting linknames here is a bad hack.
11394+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11395+ # The linker will automatically build a .lib file if we build a DLL.
11396+ old_archive_from_new_cmds='true'
11397+ # FIXME: Should let the user specify the lib program.
11398+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11399+ enable_shared_with_static_runtimes=yes
11400+ ;;
11401+ esac
11402 ;;
11403
11404 darwin* | rhapsody*)
11405@@ -9675,7 +10257,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11406
11407 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11408 freebsd* | dragonfly*)
11409- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11410+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11411 hardcode_libdir_flag_spec='-R$libdir'
11412 hardcode_direct=yes
11413 hardcode_shlibpath_var=no
11414@@ -9683,7 +10265,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11415
11416 hpux9*)
11417 if test "$GCC" = yes; then
11418- 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'
11419+ 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'
11420 else
11421 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'
11422 fi
11423@@ -9699,7 +10281,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11424
11425 hpux10*)
11426 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11427- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11428+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11429 else
11430 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11431 fi
11432@@ -9723,10 +10305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11433 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11434 ;;
11435 ia64*)
11436- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11437+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11438 ;;
11439 *)
11440- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11441+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11442 ;;
11443 esac
11444 else
11445@@ -9805,23 +10387,36 @@ fi
11446
11447 irix5* | irix6* | nonstopux*)
11448 if test "$GCC" = yes; then
11449- 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'
11450+ 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'
11451 # Try to use the -exported_symbol ld option, if it does not
11452 # work, assume that -exports_file does not work either and
11453 # implicitly export all symbols.
11454- save_LDFLAGS="$LDFLAGS"
11455- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11456- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11457+ # This should be the same for all languages, so no per-tag cache variable.
11458+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
11459+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
11460+if ${lt_cv_irix_exported_symbol+:} false; then :
11461+ $as_echo_n "(cached) " >&6
11462+else
11463+ save_LDFLAGS="$LDFLAGS"
11464+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11465+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11466 /* end confdefs.h. */
11467-int foo(void) {}
11468+int foo (void) { return 0; }
11469 _ACEOF
11470 if ac_fn_c_try_link "$LINENO"; then :
11471- 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'
11472-
11473+ lt_cv_irix_exported_symbol=yes
11474+else
11475+ lt_cv_irix_exported_symbol=no
11476 fi
11477 rm -f core conftest.err conftest.$ac_objext \
11478 conftest$ac_exeext conftest.$ac_ext
11479- LDFLAGS="$save_LDFLAGS"
11480+ LDFLAGS="$save_LDFLAGS"
11481+fi
11482+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
11483+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
11484+ if test "$lt_cv_irix_exported_symbol" = yes; then
11485+ 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'
11486+ fi
11487 else
11488 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'
11489 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'
11490@@ -9906,7 +10501,7 @@ rm -f core conftest.err conftest.$ac_objext \
11491 osf4* | osf5*) # as osf3* with the addition of -msym flag
11492 if test "$GCC" = yes; then
11493 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
11494- 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'
11495+ 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'
11496 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11497 else
11498 allow_undefined_flag=' -expect_unresolved \*'
11499@@ -9925,9 +10520,9 @@ rm -f core conftest.err conftest.$ac_objext \
11500 no_undefined_flag=' -z defs'
11501 if test "$GCC" = yes; then
11502 wlarc='${wl}'
11503- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11504+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11505 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11506- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11507+ $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'
11508 else
11509 case `$CC -V 2>&1` in
11510 *"Compilers 5.0"*)
11511@@ -10503,8 +11098,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11512 need_version=no
11513 need_lib_prefix=no
11514
11515- case $GCC,$host_os in
11516- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
11517+ case $GCC,$cc_basename in
11518+ yes,*)
11519+ # gcc
11520 library_names_spec='$libname.dll.a'
11521 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11522 postinstall_cmds='base_file=`basename \${file}`~
11523@@ -10537,13 +11133,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11524 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11525 ;;
11526 esac
11527+ dynamic_linker='Win32 ld.exe'
11528+ ;;
11529+
11530+ *,cl*)
11531+ # Native MSVC
11532+ libname_spec='$name'
11533+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11534+ library_names_spec='${libname}.dll.lib'
11535+
11536+ case $build_os in
11537+ mingw*)
11538+ sys_lib_search_path_spec=
11539+ lt_save_ifs=$IFS
11540+ IFS=';'
11541+ for lt_path in $LIB
11542+ do
11543+ IFS=$lt_save_ifs
11544+ # Let DOS variable expansion print the short 8.3 style file name.
11545+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
11546+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
11547+ done
11548+ IFS=$lt_save_ifs
11549+ # Convert to MSYS style.
11550+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
11551+ ;;
11552+ cygwin*)
11553+ # Convert to unix form, then to dos form, then back to unix form
11554+ # but this time dos style (no spaces!) so that the unix form looks
11555+ # like /cygdrive/c/PROGRA~1:/cygdr...
11556+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
11557+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
11558+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11559+ ;;
11560+ *)
11561+ sys_lib_search_path_spec="$LIB"
11562+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
11563+ # It is most probably a Windows format PATH.
11564+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
11565+ else
11566+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11567+ fi
11568+ # FIXME: find the short name or the path components, as spaces are
11569+ # common. (e.g. "Program Files" -> "PROGRA~1")
11570+ ;;
11571+ esac
11572+
11573+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
11574+ postinstall_cmds='base_file=`basename \${file}`~
11575+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
11576+ dldir=$destdir/`dirname \$dlpath`~
11577+ test -d \$dldir || mkdir -p \$dldir~
11578+ $install_prog $dir/$dlname \$dldir/$dlname'
11579+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
11580+ dlpath=$dir/\$dldll~
11581+ $RM \$dlpath'
11582+ shlibpath_overrides_runpath=yes
11583+ dynamic_linker='Win32 link.exe'
11584 ;;
11585
11586 *)
11587+ # Assume MSVC wrapper
11588 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
11589+ dynamic_linker='Win32 ld.exe'
11590 ;;
11591 esac
11592- dynamic_linker='Win32 ld.exe'
11593 # FIXME: first we should search . and the directory the executable is in
11594 shlibpath_var=PATH
11595 ;;
11596@@ -10635,7 +11289,7 @@ haiku*)
11597 soname_spec='${libname}${release}${shared_ext}$major'
11598 shlibpath_var=LIBRARY_PATH
11599 shlibpath_overrides_runpath=yes
11600- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
11601+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
11602 hardcode_into_libs=yes
11603 ;;
11604
11605@@ -11431,7 +12085,7 @@ else
11606 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11607 lt_status=$lt_dlunknown
11608 cat > conftest.$ac_ext <<_LT_EOF
11609-#line 11434 "configure"
11610+#line $LINENO "configure"
11611 #include "confdefs.h"
11612
11613 #if HAVE_DLFCN_H
11614@@ -11475,10 +12129,10 @@ else
11615 /* When -fvisbility=hidden is used, assume the code has been annotated
11616 correspondingly for the symbols needed. */
11617 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11618-void fnord () __attribute__((visibility("default")));
11619+int fnord () __attribute__((visibility("default")));
11620 #endif
11621
11622-void fnord () { int i=42; }
11623+int fnord () { return 42; }
11624 int main ()
11625 {
11626 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11627@@ -11537,7 +12191,7 @@ else
11628 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11629 lt_status=$lt_dlunknown
11630 cat > conftest.$ac_ext <<_LT_EOF
11631-#line 11540 "configure"
11632+#line $LINENO "configure"
11633 #include "confdefs.h"
11634
11635 #if HAVE_DLFCN_H
11636@@ -11581,10 +12235,10 @@ else
11637 /* When -fvisbility=hidden is used, assume the code has been annotated
11638 correspondingly for the symbols needed. */
11639 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11640-void fnord () __attribute__((visibility("default")));
11641+int fnord () __attribute__((visibility("default")));
11642 #endif
11643
11644-void fnord () { int i=42; }
11645+int fnord () { return 42; }
11646 int main ()
11647 {
11648 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11649@@ -13994,13 +14648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11650 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11651 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11652 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
11653+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
11654+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
11655 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
11656 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
11657 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
11658 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
11659 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
11660+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
11661+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
11662+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
11663+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
11664 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
11665 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
11666+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
11667 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11668 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11669 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11670@@ -14015,14 +14676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
11671 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
11672 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
11673 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"`'
11674+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
11675+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
11676 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
11677 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
11678 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
11679-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
11680 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
11681+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
11682 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
11683 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
11684 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
11685+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
11686 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11687 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11688 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11689@@ -14055,12 +14719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11690 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11691 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11692 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
11693-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
11694 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
11695 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
11696 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
11697 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
11698 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
11699+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
11700 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
11701 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
11702 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11703@@ -14115,8 +14779,13 @@ reload_flag \
11704 OBJDUMP \
11705 deplibs_check_method \
11706 file_magic_cmd \
11707+file_magic_glob \
11708+want_nocaseglob \
11709+DLLTOOL \
11710+sharedlib_from_linklib_cmd \
11711 AR \
11712 AR_FLAGS \
11713+archiver_list_spec \
11714 STRIP \
11715 RANLIB \
11716 CC \
11717@@ -14126,12 +14795,14 @@ lt_cv_sys_global_symbol_pipe \
11718 lt_cv_sys_global_symbol_to_cdecl \
11719 lt_cv_sys_global_symbol_to_c_name_address \
11720 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
11721+nm_file_list_spec \
11722 lt_prog_compiler_no_builtin_flag \
11723-lt_prog_compiler_wl \
11724 lt_prog_compiler_pic \
11725+lt_prog_compiler_wl \
11726 lt_prog_compiler_static \
11727 lt_cv_prog_compiler_c_o \
11728 need_locks \
11729+MANIFEST_TOOL \
11730 DSYMUTIL \
11731 NMEDIT \
11732 LIPO \
11733@@ -14147,7 +14818,6 @@ no_undefined_flag \
11734 hardcode_libdir_flag_spec \
11735 hardcode_libdir_flag_spec_ld \
11736 hardcode_libdir_separator \
11737-fix_srcfile_path \
11738 exclude_expsyms \
11739 include_expsyms \
11740 file_list_spec \
11741@@ -14183,6 +14853,7 @@ module_cmds \
11742 module_expsym_cmds \
11743 export_symbols_cmds \
11744 prelink_cmds \
11745+postlink_cmds \
11746 postinstall_cmds \
11747 postuninstall_cmds \
11748 finish_cmds \
11749@@ -14939,7 +15610,8 @@ $as_echo X"$file" |
11750 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11751 #
11752 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
11753-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
11754+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
11755+# Inc.
11756 # Written by Gordon Matzigkeit, 1996
11757 #
11758 # This file is part of GNU Libtool.
11759@@ -15042,19 +15714,42 @@ SP2NL=$lt_lt_SP2NL
11760 # turn newlines into spaces.
11761 NL2SP=$lt_lt_NL2SP
11762
11763+# convert \$build file names to \$host format.
11764+to_host_file_cmd=$lt_cv_to_host_file_cmd
11765+
11766+# convert \$build files to toolchain format.
11767+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
11768+
11769 # An object symbol dumper.
11770 OBJDUMP=$lt_OBJDUMP
11771
11772 # Method to check whether dependent libraries are shared objects.
11773 deplibs_check_method=$lt_deplibs_check_method
11774
11775-# Command to use when deplibs_check_method == "file_magic".
11776+# Command to use when deplibs_check_method = "file_magic".
11777 file_magic_cmd=$lt_file_magic_cmd
11778
11779+# How to find potential files when deplibs_check_method = "file_magic".
11780+file_magic_glob=$lt_file_magic_glob
11781+
11782+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
11783+want_nocaseglob=$lt_want_nocaseglob
11784+
11785+# DLL creation program.
11786+DLLTOOL=$lt_DLLTOOL
11787+
11788+# Command to associate shared and link libraries.
11789+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
11790+
11791 # The archiver.
11792 AR=$lt_AR
11793+
11794+# Flags to create an archive.
11795 AR_FLAGS=$lt_AR_FLAGS
11796
11797+# How to feed a file listing to the archiver.
11798+archiver_list_spec=$lt_archiver_list_spec
11799+
11800 # A symbol stripping program.
11801 STRIP=$lt_STRIP
11802
11803@@ -15084,6 +15779,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
11804 # Transform the output of nm in a C name address pair when lib prefix is needed.
11805 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
11806
11807+# Specify filename containing input files for \$NM.
11808+nm_file_list_spec=$lt_nm_file_list_spec
11809+
11810+# The root where to search for dependent libraries,and in which our libraries should be installed.
11811+lt_sysroot=$lt_sysroot
11812+
11813 # The name of the directory that contains temporary libtool files.
11814 objdir=$objdir
11815
11816@@ -15093,6 +15794,9 @@ MAGIC_CMD=$MAGIC_CMD
11817 # Must we lock files when doing compilation?
11818 need_locks=$lt_need_locks
11819
11820+# Manifest tool.
11821+MANIFEST_TOOL=$lt_MANIFEST_TOOL
11822+
11823 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
11824 DSYMUTIL=$lt_DSYMUTIL
11825
11826@@ -15207,12 +15911,12 @@ with_gcc=$GCC
11827 # Compiler flag to turn off builtin functions.
11828 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
11829
11830-# How to pass a linker flag through the compiler.
11831-wl=$lt_lt_prog_compiler_wl
11832-
11833 # Additional compiler flags for building library objects.
11834 pic_flag=$lt_lt_prog_compiler_pic
11835
11836+# How to pass a linker flag through the compiler.
11837+wl=$lt_lt_prog_compiler_wl
11838+
11839 # Compiler flag to prevent dynamic linking.
11840 link_static_flag=$lt_lt_prog_compiler_static
11841
11842@@ -15299,9 +16003,6 @@ inherit_rpath=$inherit_rpath
11843 # Whether libtool must link a program against all its dependency libraries.
11844 link_all_deplibs=$link_all_deplibs
11845
11846-# Fix the shell variable \$srcfile for the compiler.
11847-fix_srcfile_path=$lt_fix_srcfile_path
11848-
11849 # Set to "yes" if exported symbols are required.
11850 always_export_symbols=$always_export_symbols
11851
11852@@ -15317,6 +16018,9 @@ include_expsyms=$lt_include_expsyms
11853 # Commands necessary for linking programs (against libraries) with templates.
11854 prelink_cmds=$lt_prelink_cmds
11855
11856+# Commands necessary for finishing linking programs.
11857+postlink_cmds=$lt_postlink_cmds
11858+
11859 # Specify filename containing input files.
11860 file_list_spec=$lt_file_list_spec
11861
11862@@ -15349,210 +16053,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
11863 # if finds mixed CR/LF and LF-only lines. Since sed operates in
11864 # text mode, it properly converts lines to CR/LF. This bash problem
11865 # is reportedly fixed, but why not run on old versions too?
11866- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
11867- || (rm -f "$cfgfile"; exit 1)
11868-
11869- case $xsi_shell in
11870- yes)
11871- cat << \_LT_EOF >> "$cfgfile"
11872-
11873-# func_dirname file append nondir_replacement
11874-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11875-# otherwise set result to NONDIR_REPLACEMENT.
11876-func_dirname ()
11877-{
11878- case ${1} in
11879- */*) func_dirname_result="${1%/*}${2}" ;;
11880- * ) func_dirname_result="${3}" ;;
11881- esac
11882-}
11883-
11884-# func_basename file
11885-func_basename ()
11886-{
11887- func_basename_result="${1##*/}"
11888-}
11889-
11890-# func_dirname_and_basename file append nondir_replacement
11891-# perform func_basename and func_dirname in a single function
11892-# call:
11893-# dirname: Compute the dirname of FILE. If nonempty,
11894-# add APPEND to the result, otherwise set result
11895-# to NONDIR_REPLACEMENT.
11896-# value returned in "$func_dirname_result"
11897-# basename: Compute filename of FILE.
11898-# value retuned in "$func_basename_result"
11899-# Implementation must be kept synchronized with func_dirname
11900-# and func_basename. For efficiency, we do not delegate to
11901-# those functions but instead duplicate the functionality here.
11902-func_dirname_and_basename ()
11903-{
11904- case ${1} in
11905- */*) func_dirname_result="${1%/*}${2}" ;;
11906- * ) func_dirname_result="${3}" ;;
11907- esac
11908- func_basename_result="${1##*/}"
11909-}
11910-
11911-# func_stripname prefix suffix name
11912-# strip PREFIX and SUFFIX off of NAME.
11913-# PREFIX and SUFFIX must not contain globbing or regex special
11914-# characters, hashes, percent signs, but SUFFIX may contain a leading
11915-# dot (in which case that matches only a dot).
11916-func_stripname ()
11917-{
11918- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11919- # positional parameters, so assign one to ordinary parameter first.
11920- func_stripname_result=${3}
11921- func_stripname_result=${func_stripname_result#"${1}"}
11922- func_stripname_result=${func_stripname_result%"${2}"}
11923-}
11924-
11925-# func_opt_split
11926-func_opt_split ()
11927-{
11928- func_opt_split_opt=${1%%=*}
11929- func_opt_split_arg=${1#*=}
11930-}
11931-
11932-# func_lo2o object
11933-func_lo2o ()
11934-{
11935- case ${1} in
11936- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11937- *) func_lo2o_result=${1} ;;
11938- esac
11939-}
11940-
11941-# func_xform libobj-or-source
11942-func_xform ()
11943-{
11944- func_xform_result=${1%.*}.lo
11945-}
11946-
11947-# func_arith arithmetic-term...
11948-func_arith ()
11949-{
11950- func_arith_result=$(( $* ))
11951-}
11952-
11953-# func_len string
11954-# STRING may not start with a hyphen.
11955-func_len ()
11956-{
11957- func_len_result=${#1}
11958-}
11959-
11960-_LT_EOF
11961- ;;
11962- *) # Bourne compatible functions.
11963- cat << \_LT_EOF >> "$cfgfile"
11964-
11965-# func_dirname file append nondir_replacement
11966-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11967-# otherwise set result to NONDIR_REPLACEMENT.
11968-func_dirname ()
11969-{
11970- # Extract subdirectory from the argument.
11971- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11972- if test "X$func_dirname_result" = "X${1}"; then
11973- func_dirname_result="${3}"
11974- else
11975- func_dirname_result="$func_dirname_result${2}"
11976- fi
11977-}
11978-
11979-# func_basename file
11980-func_basename ()
11981-{
11982- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11983-}
11984-
11985-
11986-# func_stripname prefix suffix name
11987-# strip PREFIX and SUFFIX off of NAME.
11988-# PREFIX and SUFFIX must not contain globbing or regex special
11989-# characters, hashes, percent signs, but SUFFIX may contain a leading
11990-# dot (in which case that matches only a dot).
11991-# func_strip_suffix prefix name
11992-func_stripname ()
11993-{
11994- case ${2} in
11995- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11996- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11997- esac
11998-}
11999-
12000-# sed scripts:
12001-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12002-my_sed_long_arg='1s/^-[^=]*=//'
12003-
12004-# func_opt_split
12005-func_opt_split ()
12006-{
12007- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12008- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12009-}
12010-
12011-# func_lo2o object
12012-func_lo2o ()
12013-{
12014- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12015-}
12016-
12017-# func_xform libobj-or-source
12018-func_xform ()
12019-{
12020- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12021-}
12022-
12023-# func_arith arithmetic-term...
12024-func_arith ()
12025-{
12026- func_arith_result=`expr "$@"`
12027-}
12028-
12029-# func_len string
12030-# STRING may not start with a hyphen.
12031-func_len ()
12032-{
12033- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12034-}
12035-
12036-_LT_EOF
12037-esac
12038-
12039-case $lt_shell_append in
12040- yes)
12041- cat << \_LT_EOF >> "$cfgfile"
12042-
12043-# func_append var value
12044-# Append VALUE to the end of shell variable VAR.
12045-func_append ()
12046-{
12047- eval "$1+=\$2"
12048-}
12049-_LT_EOF
12050- ;;
12051- *)
12052- cat << \_LT_EOF >> "$cfgfile"
12053-
12054-# func_append var value
12055-# Append VALUE to the end of shell variable VAR.
12056-func_append ()
12057-{
12058- eval "$1=\$$1\$2"
12059-}
12060-
12061-_LT_EOF
12062- ;;
12063- esac
12064-
12065-
12066- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12067- || (rm -f "$cfgfile"; exit 1)
12068-
12069- mv -f "$cfgfile" "$ofile" ||
12070+ sed '$q' "$ltmain" >> "$cfgfile" \
12071+ || (rm -f "$cfgfile"; exit 1)
12072+
12073+ if test x"$xsi_shell" = xyes; then
12074+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12075+func_dirname ()\
12076+{\
12077+\ case ${1} in\
12078+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12079+\ * ) func_dirname_result="${3}" ;;\
12080+\ esac\
12081+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12082+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12083+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12084+test 0 -eq $? || _lt_function_replace_fail=:
12085+
12086+
12087+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12088+func_basename ()\
12089+{\
12090+\ func_basename_result="${1##*/}"\
12091+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12092+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12093+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12094+test 0 -eq $? || _lt_function_replace_fail=:
12095+
12096+
12097+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12098+func_dirname_and_basename ()\
12099+{\
12100+\ case ${1} in\
12101+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12102+\ * ) func_dirname_result="${3}" ;;\
12103+\ esac\
12104+\ func_basename_result="${1##*/}"\
12105+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12106+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12107+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12108+test 0 -eq $? || _lt_function_replace_fail=:
12109+
12110+
12111+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12112+func_stripname ()\
12113+{\
12114+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12115+\ # positional parameters, so assign one to ordinary parameter first.\
12116+\ func_stripname_result=${3}\
12117+\ func_stripname_result=${func_stripname_result#"${1}"}\
12118+\ func_stripname_result=${func_stripname_result%"${2}"}\
12119+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12120+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12121+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12122+test 0 -eq $? || _lt_function_replace_fail=:
12123+
12124+
12125+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12126+func_split_long_opt ()\
12127+{\
12128+\ func_split_long_opt_name=${1%%=*}\
12129+\ func_split_long_opt_arg=${1#*=}\
12130+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12131+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12132+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12133+test 0 -eq $? || _lt_function_replace_fail=:
12134+
12135+
12136+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12137+func_split_short_opt ()\
12138+{\
12139+\ func_split_short_opt_arg=${1#??}\
12140+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12141+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12142+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12143+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12144+test 0 -eq $? || _lt_function_replace_fail=:
12145+
12146+
12147+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12148+func_lo2o ()\
12149+{\
12150+\ case ${1} in\
12151+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12152+\ *) func_lo2o_result=${1} ;;\
12153+\ esac\
12154+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
12155+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12156+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12157+test 0 -eq $? || _lt_function_replace_fail=:
12158+
12159+
12160+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
12161+func_xform ()\
12162+{\
12163+ func_xform_result=${1%.*}.lo\
12164+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
12165+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12166+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12167+test 0 -eq $? || _lt_function_replace_fail=:
12168+
12169+
12170+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12171+func_arith ()\
12172+{\
12173+ func_arith_result=$(( $* ))\
12174+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12175+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12176+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12177+test 0 -eq $? || _lt_function_replace_fail=:
12178+
12179+
12180+ sed -e '/^func_len ()$/,/^} # func_len /c\
12181+func_len ()\
12182+{\
12183+ func_len_result=${#1}\
12184+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12185+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12186+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12187+test 0 -eq $? || _lt_function_replace_fail=:
12188+
12189+fi
12190+
12191+if test x"$lt_shell_append" = xyes; then
12192+ sed -e '/^func_append ()$/,/^} # func_append /c\
12193+func_append ()\
12194+{\
12195+ eval "${1}+=\\${2}"\
12196+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12197+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12198+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12199+test 0 -eq $? || _lt_function_replace_fail=:
12200+
12201+
12202+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12203+func_append_quoted ()\
12204+{\
12205+\ func_quote_for_eval "${2}"\
12206+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
12207+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
12208+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12209+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12210+test 0 -eq $? || _lt_function_replace_fail=:
12211+
12212+
12213+ # Save a `func_append' function call where possible by direct use of '+='
12214+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12215+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12216+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12217+ test 0 -eq $? || _lt_function_replace_fail=:
12218+else
12219+ # Save a `func_append' function call even when '+=' is not available
12220+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12221+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12222+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12223+ test 0 -eq $? || _lt_function_replace_fail=:
12224+fi
12225+
12226+if test x"$_lt_function_replace_fail" = x":"; then
12227+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12228+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12229+fi
12230+
12231+
12232+ mv -f "$cfgfile" "$ofile" ||
12233 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12234 chmod +x "$ofile"
12235
33diff --git a/libtool.m4 b/libtool.m4 12236diff --git a/libtool.m4 b/libtool.m4
34index 434530059f..e45fdc6998 100644 12237index 434530059fa..e45fdc6998c 100644
35--- a/libtool.m4 12238--- a/libtool.m4
36+++ b/libtool.m4 12239+++ b/libtool.m4
37@@ -1,7 +1,8 @@ 12240@@ -1,7 +1,8 @@
@@ -1830,7 +14033,7 @@ index 434530059f..e45fdc6998 100644
1830+ [0], [convert $build files to toolchain format])dnl 14033+ [0], [convert $build files to toolchain format])dnl
1831+])# _LT_PATH_CONVERSION_FUNCTIONS 14034+])# _LT_PATH_CONVERSION_FUNCTIONS
1832diff --git a/ltmain.sh b/ltmain.sh 14035diff --git a/ltmain.sh b/ltmain.sh
1833index 9503ec85d7..70e856e065 100644 14036index 9503ec85d70..70e856e0659 100644
1834--- a/ltmain.sh 14037--- a/ltmain.sh
1835+++ b/ltmain.sh 14038+++ b/ltmain.sh
1836@@ -1,10 +1,9 @@ 14039@@ -1,10 +1,9 @@
@@ -7060,7 +19263,7 @@ index 9503ec85d7..70e856e065 100644
7060 if test -n "$exec_cmd"; then 19263 if test -n "$exec_cmd"; then
7061 eval exec "$exec_cmd" 19264 eval exec "$exec_cmd"
7062diff --git a/ltoptions.m4 b/ltoptions.m4 19265diff --git a/ltoptions.m4 b/ltoptions.m4
7063index 5ef12ced2a..17cfd51c0b 100644 19266index 5ef12ced2a8..17cfd51c0b3 100644
7064--- a/ltoptions.m4 19267--- a/ltoptions.m4
7065+++ b/ltoptions.m4 19268+++ b/ltoptions.m4
7066@@ -8,7 +8,7 @@ 19269@@ -8,7 +8,7 @@
@@ -7073,7 +19276,7 @@ index 5ef12ced2a..17cfd51c0b 100644
7073 # This is to help aclocal find these macros, as it can't see m4_define. 19276 # This is to help aclocal find these macros, as it can't see m4_define.
7074 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 19277 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7075diff --git a/ltversion.m4 b/ltversion.m4 19278diff --git a/ltversion.m4 b/ltversion.m4
7076index bf87f77132..9c7b5d4118 100644 19279index bf87f77132d..9c7b5d41185 100644
7077--- a/ltversion.m4 19280--- a/ltversion.m4
7078+++ b/ltversion.m4 19281+++ b/ltversion.m4
7079@@ -7,17 +7,17 @@ 19282@@ -7,17 +7,17 @@
@@ -7101,7 +19304,7 @@ index bf87f77132..9c7b5d4118 100644
7101 _LT_DECL(, macro_revision, 0) 19304 _LT_DECL(, macro_revision, 0)
7102 ]) 19305 ])
7103diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 19306diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
7104index bf92b5e079..c573da90c5 100644 19307index bf92b5e0790..c573da90c5c 100644
7105--- a/lt~obsolete.m4 19308--- a/lt~obsolete.m4
7106+++ b/lt~obsolete.m4 19309+++ b/lt~obsolete.m4
7107@@ -7,7 +7,7 @@ 19310@@ -7,7 +7,7 @@
@@ -7113,3 +19316,1919 @@ index bf92b5e079..c573da90c5 100644
7113 19316
7114 # These exist entirely to fool aclocal when bootstrapping libtool. 19317 # These exist entirely to fool aclocal when bootstrapping libtool.
7115 # 19318 #
19319diff --git a/opcodes/configure b/opcodes/configure
19320index 4723dcdc1e8..006ccdaa458 100755
19321--- a/opcodes/configure
19322+++ b/opcodes/configure
19323@@ -680,6 +680,9 @@ OTOOL
19324 LIPO
19325 NMEDIT
19326 DSYMUTIL
19327+MANIFEST_TOOL
19328+ac_ct_AR
19329+DLLTOOL
19330 OBJDUMP
19331 LN_S
19332 NM
19333@@ -798,6 +801,7 @@ enable_static
19334 with_pic
19335 enable_fast_install
19336 with_gnu_ld
19337+with_libtool_sysroot
19338 enable_libtool_lock
19339 enable_targets
19340 enable_werror
19341@@ -1462,6 +1466,8 @@ Optional Packages:
19342 --with-pic try to use only PIC/non-PIC objects [default=use
19343 both]
19344 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19345+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19346+ (or the compiler's sysroot if not specified).
19347
19348 Some influential environment variables:
19349 CC C compiler command
19350@@ -5403,8 +5409,8 @@ esac
19351
19352
19353
19354-macro_version='2.2.7a'
19355-macro_revision='1.3134'
19356+macro_version='2.4'
19357+macro_revision='1.3293'
19358
19359
19360
19361@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19362 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19363 $as_echo_n "checking how to print strings... " >&6; }
19364 # Test print first, because it will be a builtin if present.
19365-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19366+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19367 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19368 ECHO='print -r --'
19369 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19370@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19371 # Try some XSI features
19372 xsi_shell=no
19373 ( _lt_dummy="a/b/c"
19374- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19375- = c,a/b,, \
19376+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19377+ = c,a/b,b/c, \
19378 && eval 'test $(( 1 + 1 )) -eq 2 \
19379 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19380 && xsi_shell=yes
19381@@ -6180,6 +6186,80 @@ esac
19382
19383
19384
19385+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19386+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19387+if ${lt_cv_to_host_file_cmd+:} false; then :
19388+ $as_echo_n "(cached) " >&6
19389+else
19390+ case $host in
19391+ *-*-mingw* )
19392+ case $build in
19393+ *-*-mingw* ) # actually msys
19394+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19395+ ;;
19396+ *-*-cygwin* )
19397+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19398+ ;;
19399+ * ) # otherwise, assume *nix
19400+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19401+ ;;
19402+ esac
19403+ ;;
19404+ *-*-cygwin* )
19405+ case $build in
19406+ *-*-mingw* ) # actually msys
19407+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19408+ ;;
19409+ *-*-cygwin* )
19410+ lt_cv_to_host_file_cmd=func_convert_file_noop
19411+ ;;
19412+ * ) # otherwise, assume *nix
19413+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19414+ ;;
19415+ esac
19416+ ;;
19417+ * ) # unhandled hosts (and "normal" native builds)
19418+ lt_cv_to_host_file_cmd=func_convert_file_noop
19419+ ;;
19420+esac
19421+
19422+fi
19423+
19424+to_host_file_cmd=$lt_cv_to_host_file_cmd
19425+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19426+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19427+
19428+
19429+
19430+
19431+
19432+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19433+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19434+if ${lt_cv_to_tool_file_cmd+:} false; then :
19435+ $as_echo_n "(cached) " >&6
19436+else
19437+ #assume ordinary cross tools, or native build.
19438+lt_cv_to_tool_file_cmd=func_convert_file_noop
19439+case $host in
19440+ *-*-mingw* )
19441+ case $build in
19442+ *-*-mingw* ) # actually msys
19443+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19444+ ;;
19445+ esac
19446+ ;;
19447+esac
19448+
19449+fi
19450+
19451+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19452+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19453+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19454+
19455+
19456+
19457+
19458+
19459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19460 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19461 if ${lt_cv_ld_reload_flag+:} false; then :
19462@@ -6196,6 +6276,11 @@ case $reload_flag in
19463 esac
19464 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19465 case $host_os in
19466+ cygwin* | mingw* | pw32* | cegcc*)
19467+ if test "$GCC" != yes; then
19468+ reload_cmds=false
19469+ fi
19470+ ;;
19471 darwin*)
19472 if test "$GCC" = yes; then
19473 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19474@@ -6364,7 +6449,8 @@ mingw* | pw32*)
19475 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19476 lt_cv_file_magic_cmd='func_win32_libid'
19477 else
19478- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19479+ # Keep this pattern in sync with the one in func_win32_libid.
19480+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19481 lt_cv_file_magic_cmd='$OBJDUMP -f'
19482 fi
19483 ;;
19484@@ -6518,6 +6604,21 @@ esac
19485 fi
19486 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19487 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19488+
19489+file_magic_glob=
19490+want_nocaseglob=no
19491+if test "$build" = "$host"; then
19492+ case $host_os in
19493+ mingw* | pw32*)
19494+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19495+ want_nocaseglob=yes
19496+ else
19497+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19498+ fi
19499+ ;;
19500+ esac
19501+fi
19502+
19503 file_magic_cmd=$lt_cv_file_magic_cmd
19504 deplibs_check_method=$lt_cv_deplibs_check_method
19505 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19506@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19507
19508
19509
19510+
19511+
19512+
19513+
19514+
19515+
19516+
19517+
19518+
19519+
19520
19521
19522 if test -n "$ac_tool_prefix"; then
19523- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19524-set dummy ${ac_tool_prefix}ar; ac_word=$2
19525+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19526+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19527+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19528+$as_echo_n "checking for $ac_word... " >&6; }
19529+if ${ac_cv_prog_DLLTOOL+:} false; then :
19530+ $as_echo_n "(cached) " >&6
19531+else
19532+ if test -n "$DLLTOOL"; then
19533+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19534+else
19535+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19536+for as_dir in $PATH
19537+do
19538+ IFS=$as_save_IFS
19539+ test -z "$as_dir" && as_dir=.
19540+ for ac_exec_ext in '' $ac_executable_extensions; do
19541+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19542+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19543+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19544+ break 2
19545+ fi
19546+done
19547+ done
19548+IFS=$as_save_IFS
19549+
19550+fi
19551+fi
19552+DLLTOOL=$ac_cv_prog_DLLTOOL
19553+if test -n "$DLLTOOL"; then
19554+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19555+$as_echo "$DLLTOOL" >&6; }
19556+else
19557+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19558+$as_echo "no" >&6; }
19559+fi
19560+
19561+
19562+fi
19563+if test -z "$ac_cv_prog_DLLTOOL"; then
19564+ ac_ct_DLLTOOL=$DLLTOOL
19565+ # Extract the first word of "dlltool", so it can be a program name with args.
19566+set dummy dlltool; ac_word=$2
19567+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19568+$as_echo_n "checking for $ac_word... " >&6; }
19569+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
19570+ $as_echo_n "(cached) " >&6
19571+else
19572+ if test -n "$ac_ct_DLLTOOL"; then
19573+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19574+else
19575+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19576+for as_dir in $PATH
19577+do
19578+ IFS=$as_save_IFS
19579+ test -z "$as_dir" && as_dir=.
19580+ for ac_exec_ext in '' $ac_executable_extensions; do
19581+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19582+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19583+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19584+ break 2
19585+ fi
19586+done
19587+ done
19588+IFS=$as_save_IFS
19589+
19590+fi
19591+fi
19592+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19593+if test -n "$ac_ct_DLLTOOL"; then
19594+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19595+$as_echo "$ac_ct_DLLTOOL" >&6; }
19596+else
19597+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19598+$as_echo "no" >&6; }
19599+fi
19600+
19601+ if test "x$ac_ct_DLLTOOL" = x; then
19602+ DLLTOOL="false"
19603+ else
19604+ case $cross_compiling:$ac_tool_warned in
19605+yes:)
19606+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19607+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19608+ac_tool_warned=yes ;;
19609+esac
19610+ DLLTOOL=$ac_ct_DLLTOOL
19611+ fi
19612+else
19613+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19614+fi
19615+
19616+test -z "$DLLTOOL" && DLLTOOL=dlltool
19617+
19618+
19619+
19620+
19621+
19622+
19623+
19624+
19625+
19626+
19627+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19628+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19629+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
19630+ $as_echo_n "(cached) " >&6
19631+else
19632+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19633+
19634+case $host_os in
19635+cygwin* | mingw* | pw32* | cegcc*)
19636+ # two different shell functions defined in ltmain.sh
19637+ # decide which to use based on capabilities of $DLLTOOL
19638+ case `$DLLTOOL --help 2>&1` in
19639+ *--identify-strict*)
19640+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19641+ ;;
19642+ *)
19643+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19644+ ;;
19645+ esac
19646+ ;;
19647+*)
19648+ # fallback: assume linklib IS sharedlib
19649+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19650+ ;;
19651+esac
19652+
19653+fi
19654+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19655+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19656+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19657+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19658+
19659+
19660+
19661+
19662+
19663+
19664+
19665+if test -n "$ac_tool_prefix"; then
19666+ for ac_prog in ar
19667+ do
19668+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19669+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19670 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19671 $as_echo_n "checking for $ac_word... " >&6; }
19672 if ${ac_cv_prog_AR+:} false; then :
19673@@ -6551,7 +6805,7 @@ do
19674 test -z "$as_dir" && as_dir=.
19675 for ac_exec_ext in '' $ac_executable_extensions; do
19676 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19677- ac_cv_prog_AR="${ac_tool_prefix}ar"
19678+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19679 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19680 break 2
19681 fi
19682@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; }
19683 fi
19684
19685
19686+ test -n "$AR" && break
19687+ done
19688 fi
19689-if test -z "$ac_cv_prog_AR"; then
19690+if test -z "$AR"; then
19691 ac_ct_AR=$AR
19692- # Extract the first word of "ar", so it can be a program name with args.
19693-set dummy ar; ac_word=$2
19694+ for ac_prog in ar
19695+do
19696+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19697+set dummy $ac_prog; ac_word=$2
19698 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19699 $as_echo_n "checking for $ac_word... " >&6; }
19700 if ${ac_cv_prog_ac_ct_AR+:} false; then :
19701@@ -6591,7 +6849,7 @@ do
19702 test -z "$as_dir" && as_dir=.
19703 for ac_exec_ext in '' $ac_executable_extensions; do
19704 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19705- ac_cv_prog_ac_ct_AR="ar"
19706+ ac_cv_prog_ac_ct_AR="$ac_prog"
19707 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19708 break 2
19709 fi
19710@@ -6610,6 +6868,10 @@ else
19711 $as_echo "no" >&6; }
19712 fi
19713
19714+
19715+ test -n "$ac_ct_AR" && break
19716+done
19717+
19718 if test "x$ac_ct_AR" = x; then
19719 AR="false"
19720 else
19721@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;;
19722 esac
19723 AR=$ac_ct_AR
19724 fi
19725-else
19726- AR="$ac_cv_prog_AR"
19727 fi
19728
19729-test -z "$AR" && AR=ar
19730-test -z "$AR_FLAGS" && AR_FLAGS=cru
19731+: ${AR=ar}
19732+: ${AR_FLAGS=cru}
19733+
19734+
19735+
19736+
19737+
19738+
19739+
19740+
19741+
19742+
19743+
19744+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19745+$as_echo_n "checking for archiver @FILE support... " >&6; }
19746+if ${lt_cv_ar_at_file+:} false; then :
19747+ $as_echo_n "(cached) " >&6
19748+else
19749+ lt_cv_ar_at_file=no
19750+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19751+/* end confdefs.h. */
19752+
19753+int
19754+main ()
19755+{
19756
19757+ ;
19758+ return 0;
19759+}
19760+_ACEOF
19761+if ac_fn_c_try_compile "$LINENO"; then :
19762+ echo conftest.$ac_objext > conftest.lst
19763+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19764+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19765+ (eval $lt_ar_try) 2>&5
19766+ ac_status=$?
19767+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19768+ test $ac_status = 0; }
19769+ if test "$ac_status" -eq 0; then
19770+ # Ensure the archiver fails upon bogus file names.
19771+ rm -f conftest.$ac_objext libconftest.a
19772+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19773+ (eval $lt_ar_try) 2>&5
19774+ ac_status=$?
19775+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19776+ test $ac_status = 0; }
19777+ if test "$ac_status" -ne 0; then
19778+ lt_cv_ar_at_file=@
19779+ fi
19780+ fi
19781+ rm -f conftest.* libconftest.a
19782
19783+fi
19784+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19785
19786+fi
19787+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19788+$as_echo "$lt_cv_ar_at_file" >&6; }
19789
19790+if test "x$lt_cv_ar_at_file" = xno; then
19791+ archiver_list_spec=
19792+else
19793+ archiver_list_spec=$lt_cv_ar_at_file
19794+fi
19795
19796
19797
19798@@ -6972,8 +7290,8 @@ esac
19799 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19800
19801 # Transform an extracted symbol line into symbol name and symbol address
19802-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19803-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'"
19804+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19805+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'"
19806
19807 # Handle CRLF in mingw tool chain
19808 opt_cr=
19809@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do
19810 else
19811 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19812 fi
19813+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19814
19815 # Check to see that the pipe works correctly.
19816 pipe_works=no
19817@@ -7050,6 +7369,18 @@ _LT_EOF
19818 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19819 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19820 cat <<_LT_EOF > conftest.$ac_ext
19821+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19822+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19823+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19824+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19825+# define LT_DLSYM_CONST
19826+#elif defined(__osf__)
19827+/* This system does not cope well with relocations in const data. */
19828+# define LT_DLSYM_CONST
19829+#else
19830+# define LT_DLSYM_CONST const
19831+#endif
19832+
19833 #ifdef __cplusplus
19834 extern "C" {
19835 #endif
19836@@ -7061,7 +7392,7 @@ _LT_EOF
19837 cat <<_LT_EOF >> conftest.$ac_ext
19838
19839 /* The mapping between symbol names and symbols. */
19840-const struct {
19841+LT_DLSYM_CONST struct {
19842 const char *name;
19843 void *address;
19844 }
19845@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() {
19846 _LT_EOF
19847 # Now try linking the two files.
19848 mv conftest.$ac_objext conftstm.$ac_objext
19849- lt_save_LIBS="$LIBS"
19850- lt_save_CFLAGS="$CFLAGS"
19851+ lt_globsym_save_LIBS=$LIBS
19852+ lt_globsym_save_CFLAGS=$CFLAGS
19853 LIBS="conftstm.$ac_objext"
19854 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19855 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19856@@ -7098,8 +7429,8 @@ _LT_EOF
19857 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19858 pipe_works=yes
19859 fi
19860- LIBS="$lt_save_LIBS"
19861- CFLAGS="$lt_save_CFLAGS"
19862+ LIBS=$lt_globsym_save_LIBS
19863+ CFLAGS=$lt_globsym_save_CFLAGS
19864 else
19865 echo "cannot find nm_test_func in $nlist" >&5
19866 fi
19867@@ -7136,6 +7467,16 @@ else
19868 $as_echo "ok" >&6; }
19869 fi
19870
19871+# Response file support.
19872+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19873+ nm_file_list_spec='@'
19874+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19875+ nm_file_list_spec='@'
19876+fi
19877+
19878+
19879+
19880+
19881
19882
19883
19884@@ -7152,6 +7493,45 @@ fi
19885
19886
19887
19888+
19889+
19890+
19891+
19892+
19893+
19894+
19895+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19896+$as_echo_n "checking for sysroot... " >&6; }
19897+
19898+# Check whether --with-libtool-sysroot was given.
19899+if test "${with_libtool_sysroot+set}" = set; then :
19900+ withval=$with_libtool_sysroot;
19901+else
19902+ with_libtool_sysroot=no
19903+fi
19904+
19905+
19906+lt_sysroot=
19907+case ${with_libtool_sysroot} in #(
19908+ yes)
19909+ if test "$GCC" = yes; then
19910+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19911+ fi
19912+ ;; #(
19913+ /*)
19914+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19915+ ;; #(
19916+ no|'')
19917+ ;; #(
19918+ *)
19919+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19920+$as_echo "${with_libtool_sysroot}" >&6; }
19921+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
19922+ ;;
19923+esac
19924+
19925+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19926+$as_echo "${lt_sysroot:-no}" >&6; }
19927
19928
19929
19930@@ -7363,6 +7743,123 @@ esac
19931
19932 need_locks="$enable_libtool_lock"
19933
19934+if test -n "$ac_tool_prefix"; then
19935+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19936+set dummy ${ac_tool_prefix}mt; ac_word=$2
19937+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19938+$as_echo_n "checking for $ac_word... " >&6; }
19939+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
19940+ $as_echo_n "(cached) " >&6
19941+else
19942+ if test -n "$MANIFEST_TOOL"; then
19943+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19944+else
19945+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19946+for as_dir in $PATH
19947+do
19948+ IFS=$as_save_IFS
19949+ test -z "$as_dir" && as_dir=.
19950+ for ac_exec_ext in '' $ac_executable_extensions; do
19951+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19952+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19953+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19954+ break 2
19955+ fi
19956+done
19957+ done
19958+IFS=$as_save_IFS
19959+
19960+fi
19961+fi
19962+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19963+if test -n "$MANIFEST_TOOL"; then
19964+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19965+$as_echo "$MANIFEST_TOOL" >&6; }
19966+else
19967+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19968+$as_echo "no" >&6; }
19969+fi
19970+
19971+
19972+fi
19973+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19974+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19975+ # Extract the first word of "mt", so it can be a program name with args.
19976+set dummy mt; ac_word=$2
19977+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19978+$as_echo_n "checking for $ac_word... " >&6; }
19979+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
19980+ $as_echo_n "(cached) " >&6
19981+else
19982+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19983+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19984+else
19985+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19986+for as_dir in $PATH
19987+do
19988+ IFS=$as_save_IFS
19989+ test -z "$as_dir" && as_dir=.
19990+ for ac_exec_ext in '' $ac_executable_extensions; do
19991+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19992+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19993+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19994+ break 2
19995+ fi
19996+done
19997+ done
19998+IFS=$as_save_IFS
19999+
20000+fi
20001+fi
20002+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
20003+if test -n "$ac_ct_MANIFEST_TOOL"; then
20004+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
20005+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
20006+else
20007+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
20008+$as_echo "no" >&6; }
20009+fi
20010+
20011+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
20012+ MANIFEST_TOOL=":"
20013+ else
20014+ case $cross_compiling:$ac_tool_warned in
20015+yes:)
20016+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
20017+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20018+ac_tool_warned=yes ;;
20019+esac
20020+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
20021+ fi
20022+else
20023+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
20024+fi
20025+
20026+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
20027+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
20028+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
20029+if ${lt_cv_path_mainfest_tool+:} false; then :
20030+ $as_echo_n "(cached) " >&6
20031+else
20032+ lt_cv_path_mainfest_tool=no
20033+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
20034+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
20035+ cat conftest.err >&5
20036+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
20037+ lt_cv_path_mainfest_tool=yes
20038+ fi
20039+ rm -f conftest*
20040+fi
20041+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
20042+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
20043+if test "x$lt_cv_path_mainfest_tool" != xyes; then
20044+ MANIFEST_TOOL=:
20045+fi
20046+
20047+
20048+
20049+
20050+
20051
20052 case $host_os in
20053 rhapsody* | darwin*)
20054@@ -7926,6 +8423,8 @@ _LT_EOF
20055 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20056 echo "$AR cru libconftest.a conftest.o" >&5
20057 $AR cru libconftest.a conftest.o 2>&5
20058+ echo "$RANLIB libconftest.a" >&5
20059+ $RANLIB libconftest.a 2>&5
20060 cat > conftest.c << _LT_EOF
20061 int main() { return 0;}
20062 _LT_EOF
20063@@ -8091,7 +8590,8 @@ fi
20064 LIBTOOL_DEPS="$ltmain"
20065
20066 # Always use our own libtool.
20067-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
20068+LIBTOOL='$(SHELL) $(top_builddir)'
20069+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
20070
20071
20072
20073@@ -8180,7 +8680,7 @@ aix3*)
20074 esac
20075
20076 # Global variables:
20077-ofile=libtool
20078+ofile=${host_alias}-libtool
20079 can_build_shared=yes
20080
20081 # All known linkers require a `.a' archive for static linking (except MSVC,
20082@@ -8478,8 +8978,6 @@ fi
20083 lt_prog_compiler_pic=
20084 lt_prog_compiler_static=
20085
20086-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20087-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20088
20089 if test "$GCC" = yes; then
20090 lt_prog_compiler_wl='-Wl,'
20091@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20092 lt_prog_compiler_pic='--shared'
20093 lt_prog_compiler_static='--static'
20094 ;;
20095+ nagfor*)
20096+ # NAG Fortran compiler
20097+ lt_prog_compiler_wl='-Wl,-Wl,,'
20098+ lt_prog_compiler_pic='-PIC'
20099+ lt_prog_compiler_static='-Bstatic'
20100+ ;;
20101 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20102 # Portland Group compilers (*not* the Pentium gcc compiler,
20103 # which looks to be a dead project)
20104@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20105 lt_prog_compiler_pic='-KPIC'
20106 lt_prog_compiler_static='-Bstatic'
20107 case $cc_basename in
20108- f77* | f90* | f95*)
20109+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20110 lt_prog_compiler_wl='-Qoption ld ';;
20111 *)
20112 lt_prog_compiler_wl='-Wl,';;
20113@@ -8764,13 +9268,17 @@ case $host_os in
20114 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20115 ;;
20116 esac
20117-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20118-$as_echo "$lt_prog_compiler_pic" >&6; }
20119-
20120-
20121-
20122-
20123
20124+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20125+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20126+if ${lt_cv_prog_compiler_pic+:} false; then :
20127+ $as_echo_n "(cached) " >&6
20128+else
20129+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20130+fi
20131+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20132+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20133+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20134
20135 #
20136 # Check to make sure the PIC flag actually works.
20137@@ -8831,6 +9339,11 @@ fi
20138
20139
20140
20141+
20142+
20143+
20144+
20145+
20146 #
20147 # Check to make sure the static flag actually works.
20148 #
20149@@ -9181,7 +9694,8 @@ _LT_EOF
20150 allow_undefined_flag=unsupported
20151 always_export_symbols=no
20152 enable_shared_with_static_runtimes=yes
20153- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20154+ 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'
20155+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20156
20157 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20158 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20159@@ -9280,12 +9794,12 @@ _LT_EOF
20160 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20161 hardcode_libdir_flag_spec=
20162 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20163- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20164+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20165 if test "x$supports_anon_versioning" = xyes; then
20166 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20167 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20168 echo "local: *; };" >> $output_objdir/$libname.ver~
20169- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20170+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20171 fi
20172 ;;
20173 esac
20174@@ -9299,8 +9813,8 @@ _LT_EOF
20175 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20176 wlarc=
20177 else
20178- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20179- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20180+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20181+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20182 fi
20183 ;;
20184
20185@@ -9318,8 +9832,8 @@ _LT_EOF
20186
20187 _LT_EOF
20188 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20189- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20190- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20191+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20192+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20193 else
20194 ld_shlibs=no
20195 fi
20196@@ -9365,8 +9879,8 @@ _LT_EOF
20197
20198 *)
20199 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20200- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20201- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20202+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20203+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20204 else
20205 ld_shlibs=no
20206 fi
20207@@ -9496,7 +10010,13 @@ _LT_EOF
20208 allow_undefined_flag='-berok'
20209 # Determine the default libpath from the value encoded in an
20210 # empty executable.
20211- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20212+ if test "${lt_cv_aix_libpath+set}" = set; then
20213+ aix_libpath=$lt_cv_aix_libpath
20214+else
20215+ if ${lt_cv_aix_libpath_+:} false; then :
20216+ $as_echo_n "(cached) " >&6
20217+else
20218+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20219 /* end confdefs.h. */
20220
20221 int
20222@@ -9509,22 +10029,29 @@ main ()
20223 _ACEOF
20224 if ac_fn_c_try_link "$LINENO"; then :
20225
20226-lt_aix_libpath_sed='
20227- /Import File Strings/,/^$/ {
20228- /^0/ {
20229- s/^0 *\(.*\)$/\1/
20230- p
20231- }
20232- }'
20233-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20234-# Check for a 64-bit object if we didn't find anything.
20235-if test -z "$aix_libpath"; then
20236- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20237-fi
20238+ lt_aix_libpath_sed='
20239+ /Import File Strings/,/^$/ {
20240+ /^0/ {
20241+ s/^0 *\([^ ]*\) *$/\1/
20242+ p
20243+ }
20244+ }'
20245+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20246+ # Check for a 64-bit object if we didn't find anything.
20247+ if test -z "$lt_cv_aix_libpath_"; then
20248+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20249+ fi
20250 fi
20251 rm -f core conftest.err conftest.$ac_objext \
20252 conftest$ac_exeext conftest.$ac_ext
20253-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20254+ if test -z "$lt_cv_aix_libpath_"; then
20255+ lt_cv_aix_libpath_="/usr/lib:/lib"
20256+ fi
20257+
20258+fi
20259+
20260+ aix_libpath=$lt_cv_aix_libpath_
20261+fi
20262
20263 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20264 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"
20265@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20266 else
20267 # Determine the default libpath from the value encoded in an
20268 # empty executable.
20269- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20270+ if test "${lt_cv_aix_libpath+set}" = set; then
20271+ aix_libpath=$lt_cv_aix_libpath
20272+else
20273+ if ${lt_cv_aix_libpath_+:} false; then :
20274+ $as_echo_n "(cached) " >&6
20275+else
20276+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20277 /* end confdefs.h. */
20278
20279 int
20280@@ -9549,22 +10082,29 @@ main ()
20281 _ACEOF
20282 if ac_fn_c_try_link "$LINENO"; then :
20283
20284-lt_aix_libpath_sed='
20285- /Import File Strings/,/^$/ {
20286- /^0/ {
20287- s/^0 *\(.*\)$/\1/
20288- p
20289- }
20290- }'
20291-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20292-# Check for a 64-bit object if we didn't find anything.
20293-if test -z "$aix_libpath"; then
20294- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20295-fi
20296+ lt_aix_libpath_sed='
20297+ /Import File Strings/,/^$/ {
20298+ /^0/ {
20299+ s/^0 *\([^ ]*\) *$/\1/
20300+ p
20301+ }
20302+ }'
20303+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20304+ # Check for a 64-bit object if we didn't find anything.
20305+ if test -z "$lt_cv_aix_libpath_"; then
20306+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20307+ fi
20308 fi
20309 rm -f core conftest.err conftest.$ac_objext \
20310 conftest$ac_exeext conftest.$ac_ext
20311-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20312+ if test -z "$lt_cv_aix_libpath_"; then
20313+ lt_cv_aix_libpath_="/usr/lib:/lib"
20314+ fi
20315+
20316+fi
20317+
20318+ aix_libpath=$lt_cv_aix_libpath_
20319+fi
20320
20321 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20322 # Warning - without using the other run time loading flags,
20323@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20324 # Microsoft Visual C++.
20325 # hardcode_libdir_flag_spec is actually meaningless, as there is
20326 # no search path for DLLs.
20327- hardcode_libdir_flag_spec=' '
20328- allow_undefined_flag=unsupported
20329- # Tell ltmain to make .lib files, not .a files.
20330- libext=lib
20331- # Tell ltmain to make .dll files, not .so files.
20332- shrext_cmds=".dll"
20333- # FIXME: Setting linknames here is a bad hack.
20334- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20335- # The linker will automatically build a .lib file if we build a DLL.
20336- old_archive_from_new_cmds='true'
20337- # FIXME: Should let the user specify the lib program.
20338- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20339- fix_srcfile_path='`cygpath -w "$srcfile"`'
20340- enable_shared_with_static_runtimes=yes
20341+ case $cc_basename in
20342+ cl*)
20343+ # Native MSVC
20344+ hardcode_libdir_flag_spec=' '
20345+ allow_undefined_flag=unsupported
20346+ always_export_symbols=yes
20347+ file_list_spec='@'
20348+ # Tell ltmain to make .lib files, not .a files.
20349+ libext=lib
20350+ # Tell ltmain to make .dll files, not .so files.
20351+ shrext_cmds=".dll"
20352+ # FIXME: Setting linknames here is a bad hack.
20353+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20354+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20355+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20356+ else
20357+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20358+ fi~
20359+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20360+ linknames='
20361+ # The linker will not automatically build a static lib if we build a DLL.
20362+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20363+ enable_shared_with_static_runtimes=yes
20364+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20365+ # Don't use ranlib
20366+ old_postinstall_cmds='chmod 644 $oldlib'
20367+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20368+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20369+ case $lt_outputfile in
20370+ *.exe|*.EXE) ;;
20371+ *)
20372+ lt_outputfile="$lt_outputfile.exe"
20373+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20374+ ;;
20375+ esac~
20376+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20377+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20378+ $RM "$lt_outputfile.manifest";
20379+ fi'
20380+ ;;
20381+ *)
20382+ # Assume MSVC wrapper
20383+ hardcode_libdir_flag_spec=' '
20384+ allow_undefined_flag=unsupported
20385+ # Tell ltmain to make .lib files, not .a files.
20386+ libext=lib
20387+ # Tell ltmain to make .dll files, not .so files.
20388+ shrext_cmds=".dll"
20389+ # FIXME: Setting linknames here is a bad hack.
20390+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20391+ # The linker will automatically build a .lib file if we build a DLL.
20392+ old_archive_from_new_cmds='true'
20393+ # FIXME: Should let the user specify the lib program.
20394+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20395+ enable_shared_with_static_runtimes=yes
20396+ ;;
20397+ esac
20398 ;;
20399
20400 darwin* | rhapsody*)
20401@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20402
20403 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20404 freebsd* | dragonfly*)
20405- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20406+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20407 hardcode_libdir_flag_spec='-R$libdir'
20408 hardcode_direct=yes
20409 hardcode_shlibpath_var=no
20410@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20411
20412 hpux9*)
20413 if test "$GCC" = yes; then
20414- 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'
20415+ 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'
20416 else
20417 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'
20418 fi
20419@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20420
20421 hpux10*)
20422 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20423- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20424+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20425 else
20426 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20427 fi
20428@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20429 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20430 ;;
20431 ia64*)
20432- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20433+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20434 ;;
20435 *)
20436- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20437+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20438 ;;
20439 esac
20440 else
20441@@ -9813,23 +10396,36 @@ fi
20442
20443 irix5* | irix6* | nonstopux*)
20444 if test "$GCC" = yes; then
20445- 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'
20446+ 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'
20447 # Try to use the -exported_symbol ld option, if it does not
20448 # work, assume that -exports_file does not work either and
20449 # implicitly export all symbols.
20450- save_LDFLAGS="$LDFLAGS"
20451- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20452- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20453+ # This should be the same for all languages, so no per-tag cache variable.
20454+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20455+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20456+if ${lt_cv_irix_exported_symbol+:} false; then :
20457+ $as_echo_n "(cached) " >&6
20458+else
20459+ save_LDFLAGS="$LDFLAGS"
20460+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20461+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20462 /* end confdefs.h. */
20463-int foo(void) {}
20464+int foo (void) { return 0; }
20465 _ACEOF
20466 if ac_fn_c_try_link "$LINENO"; then :
20467- 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'
20468-
20469+ lt_cv_irix_exported_symbol=yes
20470+else
20471+ lt_cv_irix_exported_symbol=no
20472 fi
20473 rm -f core conftest.err conftest.$ac_objext \
20474 conftest$ac_exeext conftest.$ac_ext
20475- LDFLAGS="$save_LDFLAGS"
20476+ LDFLAGS="$save_LDFLAGS"
20477+fi
20478+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20479+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20480+ if test "$lt_cv_irix_exported_symbol" = yes; then
20481+ 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'
20482+ fi
20483 else
20484 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'
20485 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'
20486@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \
20487 osf4* | osf5*) # as osf3* with the addition of -msym flag
20488 if test "$GCC" = yes; then
20489 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20490- 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'
20491+ 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'
20492 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20493 else
20494 allow_undefined_flag=' -expect_unresolved \*'
20495@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \
20496 no_undefined_flag=' -z defs'
20497 if test "$GCC" = yes; then
20498 wlarc='${wl}'
20499- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20500+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20501 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20502- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20503+ $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'
20504 else
20505 case `$CC -V 2>&1` in
20506 *"Compilers 5.0"*)
20507@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20508 need_version=no
20509 need_lib_prefix=no
20510
20511- case $GCC,$host_os in
20512- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20513+ case $GCC,$cc_basename in
20514+ yes,*)
20515+ # gcc
20516 library_names_spec='$libname.dll.a'
20517 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20518 postinstall_cmds='base_file=`basename \${file}`~
20519@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20520 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20521 ;;
20522 esac
20523+ dynamic_linker='Win32 ld.exe'
20524+ ;;
20525+
20526+ *,cl*)
20527+ # Native MSVC
20528+ libname_spec='$name'
20529+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20530+ library_names_spec='${libname}.dll.lib'
20531+
20532+ case $build_os in
20533+ mingw*)
20534+ sys_lib_search_path_spec=
20535+ lt_save_ifs=$IFS
20536+ IFS=';'
20537+ for lt_path in $LIB
20538+ do
20539+ IFS=$lt_save_ifs
20540+ # Let DOS variable expansion print the short 8.3 style file name.
20541+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20542+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20543+ done
20544+ IFS=$lt_save_ifs
20545+ # Convert to MSYS style.
20546+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20547+ ;;
20548+ cygwin*)
20549+ # Convert to unix form, then to dos form, then back to unix form
20550+ # but this time dos style (no spaces!) so that the unix form looks
20551+ # like /cygdrive/c/PROGRA~1:/cygdr...
20552+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20553+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20554+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20555+ ;;
20556+ *)
20557+ sys_lib_search_path_spec="$LIB"
20558+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20559+ # It is most probably a Windows format PATH.
20560+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20561+ else
20562+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20563+ fi
20564+ # FIXME: find the short name or the path components, as spaces are
20565+ # common. (e.g. "Program Files" -> "PROGRA~1")
20566+ ;;
20567+ esac
20568+
20569+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20570+ postinstall_cmds='base_file=`basename \${file}`~
20571+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20572+ dldir=$destdir/`dirname \$dlpath`~
20573+ test -d \$dldir || mkdir -p \$dldir~
20574+ $install_prog $dir/$dlname \$dldir/$dlname'
20575+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20576+ dlpath=$dir/\$dldll~
20577+ $RM \$dlpath'
20578+ shlibpath_overrides_runpath=yes
20579+ dynamic_linker='Win32 link.exe'
20580 ;;
20581
20582 *)
20583+ # Assume MSVC wrapper
20584 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20585+ dynamic_linker='Win32 ld.exe'
20586 ;;
20587 esac
20588- dynamic_linker='Win32 ld.exe'
20589 # FIXME: first we should search . and the directory the executable is in
20590 shlibpath_var=PATH
20591 ;;
20592@@ -10643,7 +11298,7 @@ haiku*)
20593 soname_spec='${libname}${release}${shared_ext}$major'
20594 shlibpath_var=LIBRARY_PATH
20595 shlibpath_overrides_runpath=yes
20596- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20597+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20598 hardcode_into_libs=yes
20599 ;;
20600
20601@@ -11439,7 +12094,7 @@ else
20602 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20603 lt_status=$lt_dlunknown
20604 cat > conftest.$ac_ext <<_LT_EOF
20605-#line 11442 "configure"
20606+#line $LINENO "configure"
20607 #include "confdefs.h"
20608
20609 #if HAVE_DLFCN_H
20610@@ -11483,10 +12138,10 @@ else
20611 /* When -fvisbility=hidden is used, assume the code has been annotated
20612 correspondingly for the symbols needed. */
20613 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20614-void fnord () __attribute__((visibility("default")));
20615+int fnord () __attribute__((visibility("default")));
20616 #endif
20617
20618-void fnord () { int i=42; }
20619+int fnord () { return 42; }
20620 int main ()
20621 {
20622 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20623@@ -11545,7 +12200,7 @@ else
20624 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20625 lt_status=$lt_dlunknown
20626 cat > conftest.$ac_ext <<_LT_EOF
20627-#line 11548 "configure"
20628+#line $LINENO "configure"
20629 #include "confdefs.h"
20630
20631 #if HAVE_DLFCN_H
20632@@ -11589,10 +12244,10 @@ else
20633 /* When -fvisbility=hidden is used, assume the code has been annotated
20634 correspondingly for the symbols needed. */
20635 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20636-void fnord () __attribute__((visibility("default")));
20637+int fnord () __attribute__((visibility("default")));
20638 #endif
20639
20640-void fnord () { int i=42; }
20641+int fnord () { return 42; }
20642 int main ()
20643 {
20644 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20645@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20646 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20647 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20648 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20649+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20650+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20651 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20652 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20653 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20654 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20655 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20656+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20657+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20658+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20659+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20660 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20661 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20662+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20663 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20664 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20665 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20666@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20667 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20668 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20669 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"`'
20670+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20671+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20672 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20673 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20674 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20675-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20676 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20677+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20678 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20679 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20680 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20681+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20682 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20683 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20684 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20685@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20686 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20687 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20688 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20689-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20690 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20691 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20692 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20693 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20694 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20695+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20696 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20697 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20698 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20699@@ -13877,8 +14542,13 @@ reload_flag \
20700 OBJDUMP \
20701 deplibs_check_method \
20702 file_magic_cmd \
20703+file_magic_glob \
20704+want_nocaseglob \
20705+DLLTOOL \
20706+sharedlib_from_linklib_cmd \
20707 AR \
20708 AR_FLAGS \
20709+archiver_list_spec \
20710 STRIP \
20711 RANLIB \
20712 CC \
20713@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \
20714 lt_cv_sys_global_symbol_to_cdecl \
20715 lt_cv_sys_global_symbol_to_c_name_address \
20716 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20717+nm_file_list_spec \
20718 lt_prog_compiler_no_builtin_flag \
20719-lt_prog_compiler_wl \
20720 lt_prog_compiler_pic \
20721+lt_prog_compiler_wl \
20722 lt_prog_compiler_static \
20723 lt_cv_prog_compiler_c_o \
20724 need_locks \
20725+MANIFEST_TOOL \
20726 DSYMUTIL \
20727 NMEDIT \
20728 LIPO \
20729@@ -13909,7 +14581,6 @@ no_undefined_flag \
20730 hardcode_libdir_flag_spec \
20731 hardcode_libdir_flag_spec_ld \
20732 hardcode_libdir_separator \
20733-fix_srcfile_path \
20734 exclude_expsyms \
20735 include_expsyms \
20736 file_list_spec \
20737@@ -13945,6 +14616,7 @@ module_cmds \
20738 module_expsym_cmds \
20739 export_symbols_cmds \
20740 prelink_cmds \
20741+postlink_cmds \
20742 postinstall_cmds \
20743 postuninstall_cmds \
20744 finish_cmds \
20745@@ -14710,7 +15382,8 @@ $as_echo X"$file" |
20746 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20747 #
20748 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20749-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20750+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20751+# Inc.
20752 # Written by Gordon Matzigkeit, 1996
20753 #
20754 # This file is part of GNU Libtool.
20755@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL
20756 # turn newlines into spaces.
20757 NL2SP=$lt_lt_NL2SP
20758
20759+# convert \$build file names to \$host format.
20760+to_host_file_cmd=$lt_cv_to_host_file_cmd
20761+
20762+# convert \$build files to toolchain format.
20763+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20764+
20765 # An object symbol dumper.
20766 OBJDUMP=$lt_OBJDUMP
20767
20768 # Method to check whether dependent libraries are shared objects.
20769 deplibs_check_method=$lt_deplibs_check_method
20770
20771-# Command to use when deplibs_check_method == "file_magic".
20772+# Command to use when deplibs_check_method = "file_magic".
20773 file_magic_cmd=$lt_file_magic_cmd
20774
20775+# How to find potential files when deplibs_check_method = "file_magic".
20776+file_magic_glob=$lt_file_magic_glob
20777+
20778+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20779+want_nocaseglob=$lt_want_nocaseglob
20780+
20781+# DLL creation program.
20782+DLLTOOL=$lt_DLLTOOL
20783+
20784+# Command to associate shared and link libraries.
20785+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20786+
20787 # The archiver.
20788 AR=$lt_AR
20789+
20790+# Flags to create an archive.
20791 AR_FLAGS=$lt_AR_FLAGS
20792
20793+# How to feed a file listing to the archiver.
20794+archiver_list_spec=$lt_archiver_list_spec
20795+
20796 # A symbol stripping program.
20797 STRIP=$lt_STRIP
20798
20799@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20800 # Transform the output of nm in a C name address pair when lib prefix is needed.
20801 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20802
20803+# Specify filename containing input files for \$NM.
20804+nm_file_list_spec=$lt_nm_file_list_spec
20805+
20806+# The root where to search for dependent libraries,and in which our libraries should be installed.
20807+lt_sysroot=$lt_sysroot
20808+
20809 # The name of the directory that contains temporary libtool files.
20810 objdir=$objdir
20811
20812@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD
20813 # Must we lock files when doing compilation?
20814 need_locks=$lt_need_locks
20815
20816+# Manifest tool.
20817+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20818+
20819 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20820 DSYMUTIL=$lt_DSYMUTIL
20821
20822@@ -14978,12 +15683,12 @@ with_gcc=$GCC
20823 # Compiler flag to turn off builtin functions.
20824 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20825
20826-# How to pass a linker flag through the compiler.
20827-wl=$lt_lt_prog_compiler_wl
20828-
20829 # Additional compiler flags for building library objects.
20830 pic_flag=$lt_lt_prog_compiler_pic
20831
20832+# How to pass a linker flag through the compiler.
20833+wl=$lt_lt_prog_compiler_wl
20834+
20835 # Compiler flag to prevent dynamic linking.
20836 link_static_flag=$lt_lt_prog_compiler_static
20837
20838@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath
20839 # Whether libtool must link a program against all its dependency libraries.
20840 link_all_deplibs=$link_all_deplibs
20841
20842-# Fix the shell variable \$srcfile for the compiler.
20843-fix_srcfile_path=$lt_fix_srcfile_path
20844-
20845 # Set to "yes" if exported symbols are required.
20846 always_export_symbols=$always_export_symbols
20847
20848@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms
20849 # Commands necessary for linking programs (against libraries) with templates.
20850 prelink_cmds=$lt_prelink_cmds
20851
20852+# Commands necessary for finishing linking programs.
20853+postlink_cmds=$lt_postlink_cmds
20854+
20855 # Specify filename containing input files.
20856 file_list_spec=$lt_file_list_spec
20857
20858@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20859 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20860 # text mode, it properly converts lines to CR/LF. This bash problem
20861 # is reportedly fixed, but why not run on old versions too?
20862- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20863- || (rm -f "$cfgfile"; exit 1)
20864-
20865- case $xsi_shell in
20866- yes)
20867- cat << \_LT_EOF >> "$cfgfile"
20868-
20869-# func_dirname file append nondir_replacement
20870-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20871-# otherwise set result to NONDIR_REPLACEMENT.
20872-func_dirname ()
20873-{
20874- case ${1} in
20875- */*) func_dirname_result="${1%/*}${2}" ;;
20876- * ) func_dirname_result="${3}" ;;
20877- esac
20878-}
20879-
20880-# func_basename file
20881-func_basename ()
20882-{
20883- func_basename_result="${1##*/}"
20884-}
20885-
20886-# func_dirname_and_basename file append nondir_replacement
20887-# perform func_basename and func_dirname in a single function
20888-# call:
20889-# dirname: Compute the dirname of FILE. If nonempty,
20890-# add APPEND to the result, otherwise set result
20891-# to NONDIR_REPLACEMENT.
20892-# value returned in "$func_dirname_result"
20893-# basename: Compute filename of FILE.
20894-# value retuned in "$func_basename_result"
20895-# Implementation must be kept synchronized with func_dirname
20896-# and func_basename. For efficiency, we do not delegate to
20897-# those functions but instead duplicate the functionality here.
20898-func_dirname_and_basename ()
20899-{
20900- case ${1} in
20901- */*) func_dirname_result="${1%/*}${2}" ;;
20902- * ) func_dirname_result="${3}" ;;
20903- esac
20904- func_basename_result="${1##*/}"
20905-}
20906-
20907-# func_stripname prefix suffix name
20908-# strip PREFIX and SUFFIX off of NAME.
20909-# PREFIX and SUFFIX must not contain globbing or regex special
20910-# characters, hashes, percent signs, but SUFFIX may contain a leading
20911-# dot (in which case that matches only a dot).
20912-func_stripname ()
20913-{
20914- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20915- # positional parameters, so assign one to ordinary parameter first.
20916- func_stripname_result=${3}
20917- func_stripname_result=${func_stripname_result#"${1}"}
20918- func_stripname_result=${func_stripname_result%"${2}"}
20919-}
20920-
20921-# func_opt_split
20922-func_opt_split ()
20923-{
20924- func_opt_split_opt=${1%%=*}
20925- func_opt_split_arg=${1#*=}
20926-}
20927-
20928-# func_lo2o object
20929-func_lo2o ()
20930-{
20931- case ${1} in
20932- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20933- *) func_lo2o_result=${1} ;;
20934- esac
20935-}
20936-
20937-# func_xform libobj-or-source
20938-func_xform ()
20939-{
20940- func_xform_result=${1%.*}.lo
20941-}
20942-
20943-# func_arith arithmetic-term...
20944-func_arith ()
20945-{
20946- func_arith_result=$(( $* ))
20947-}
20948-
20949-# func_len string
20950-# STRING may not start with a hyphen.
20951-func_len ()
20952-{
20953- func_len_result=${#1}
20954-}
20955-
20956-_LT_EOF
20957- ;;
20958- *) # Bourne compatible functions.
20959- cat << \_LT_EOF >> "$cfgfile"
20960-
20961-# func_dirname file append nondir_replacement
20962-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20963-# otherwise set result to NONDIR_REPLACEMENT.
20964-func_dirname ()
20965-{
20966- # Extract subdirectory from the argument.
20967- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20968- if test "X$func_dirname_result" = "X${1}"; then
20969- func_dirname_result="${3}"
20970- else
20971- func_dirname_result="$func_dirname_result${2}"
20972- fi
20973-}
20974-
20975-# func_basename file
20976-func_basename ()
20977-{
20978- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20979-}
20980-
20981-
20982-# func_stripname prefix suffix name
20983-# strip PREFIX and SUFFIX off of NAME.
20984-# PREFIX and SUFFIX must not contain globbing or regex special
20985-# characters, hashes, percent signs, but SUFFIX may contain a leading
20986-# dot (in which case that matches only a dot).
20987-# func_strip_suffix prefix name
20988-func_stripname ()
20989-{
20990- case ${2} in
20991- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20992- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20993- esac
20994-}
20995-
20996-# sed scripts:
20997-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20998-my_sed_long_arg='1s/^-[^=]*=//'
20999-
21000-# func_opt_split
21001-func_opt_split ()
21002-{
21003- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
21004- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
21005-}
21006-
21007-# func_lo2o object
21008-func_lo2o ()
21009-{
21010- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
21011-}
21012-
21013-# func_xform libobj-or-source
21014-func_xform ()
21015-{
21016- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
21017-}
21018-
21019-# func_arith arithmetic-term...
21020-func_arith ()
21021-{
21022- func_arith_result=`expr "$@"`
21023-}
21024-
21025-# func_len string
21026-# STRING may not start with a hyphen.
21027-func_len ()
21028-{
21029- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
21030-}
21031-
21032-_LT_EOF
21033-esac
21034-
21035-case $lt_shell_append in
21036- yes)
21037- cat << \_LT_EOF >> "$cfgfile"
21038-
21039-# func_append var value
21040-# Append VALUE to the end of shell variable VAR.
21041-func_append ()
21042-{
21043- eval "$1+=\$2"
21044-}
21045-_LT_EOF
21046- ;;
21047- *)
21048- cat << \_LT_EOF >> "$cfgfile"
21049-
21050-# func_append var value
21051-# Append VALUE to the end of shell variable VAR.
21052-func_append ()
21053-{
21054- eval "$1=\$$1\$2"
21055-}
21056-
21057-_LT_EOF
21058- ;;
21059- esac
21060-
21061-
21062- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21063- || (rm -f "$cfgfile"; exit 1)
21064-
21065- mv -f "$cfgfile" "$ofile" ||
21066+ sed '$q' "$ltmain" >> "$cfgfile" \
21067+ || (rm -f "$cfgfile"; exit 1)
21068+
21069+ if test x"$xsi_shell" = xyes; then
21070+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
21071+func_dirname ()\
21072+{\
21073+\ case ${1} in\
21074+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21075+\ * ) func_dirname_result="${3}" ;;\
21076+\ esac\
21077+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
21078+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21079+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21080+test 0 -eq $? || _lt_function_replace_fail=:
21081+
21082+
21083+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
21084+func_basename ()\
21085+{\
21086+\ func_basename_result="${1##*/}"\
21087+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
21088+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21089+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21090+test 0 -eq $? || _lt_function_replace_fail=:
21091+
21092+
21093+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
21094+func_dirname_and_basename ()\
21095+{\
21096+\ case ${1} in\
21097+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21098+\ * ) func_dirname_result="${3}" ;;\
21099+\ esac\
21100+\ func_basename_result="${1##*/}"\
21101+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21102+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21103+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21104+test 0 -eq $? || _lt_function_replace_fail=:
21105+
21106+
21107+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21108+func_stripname ()\
21109+{\
21110+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21111+\ # positional parameters, so assign one to ordinary parameter first.\
21112+\ func_stripname_result=${3}\
21113+\ func_stripname_result=${func_stripname_result#"${1}"}\
21114+\ func_stripname_result=${func_stripname_result%"${2}"}\
21115+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21116+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21117+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21118+test 0 -eq $? || _lt_function_replace_fail=:
21119+
21120+
21121+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21122+func_split_long_opt ()\
21123+{\
21124+\ func_split_long_opt_name=${1%%=*}\
21125+\ func_split_long_opt_arg=${1#*=}\
21126+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21127+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21128+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21129+test 0 -eq $? || _lt_function_replace_fail=:
21130+
21131+
21132+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21133+func_split_short_opt ()\
21134+{\
21135+\ func_split_short_opt_arg=${1#??}\
21136+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21137+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21138+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21139+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21140+test 0 -eq $? || _lt_function_replace_fail=:
21141+
21142+
21143+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21144+func_lo2o ()\
21145+{\
21146+\ case ${1} in\
21147+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21148+\ *) func_lo2o_result=${1} ;;\
21149+\ esac\
21150+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21151+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21152+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21153+test 0 -eq $? || _lt_function_replace_fail=:
21154+
21155+
21156+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21157+func_xform ()\
21158+{\
21159+ func_xform_result=${1%.*}.lo\
21160+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21161+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21162+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21163+test 0 -eq $? || _lt_function_replace_fail=:
21164+
21165+
21166+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21167+func_arith ()\
21168+{\
21169+ func_arith_result=$(( $* ))\
21170+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21171+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21172+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21173+test 0 -eq $? || _lt_function_replace_fail=:
21174+
21175+
21176+ sed -e '/^func_len ()$/,/^} # func_len /c\
21177+func_len ()\
21178+{\
21179+ func_len_result=${#1}\
21180+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21181+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21182+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21183+test 0 -eq $? || _lt_function_replace_fail=:
21184+
21185+fi
21186+
21187+if test x"$lt_shell_append" = xyes; then
21188+ sed -e '/^func_append ()$/,/^} # func_append /c\
21189+func_append ()\
21190+{\
21191+ eval "${1}+=\\${2}"\
21192+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21193+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21194+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21195+test 0 -eq $? || _lt_function_replace_fail=:
21196+
21197+
21198+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21199+func_append_quoted ()\
21200+{\
21201+\ func_quote_for_eval "${2}"\
21202+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21203+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21204+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21205+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21206+test 0 -eq $? || _lt_function_replace_fail=:
21207+
21208+
21209+ # Save a `func_append' function call where possible by direct use of '+='
21210+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21211+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21212+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21213+ test 0 -eq $? || _lt_function_replace_fail=:
21214+else
21215+ # Save a `func_append' function call even when '+=' is not available
21216+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21217+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21218+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21219+ test 0 -eq $? || _lt_function_replace_fail=:
21220+fi
21221+
21222+if test x"$_lt_function_replace_fail" = x":"; then
21223+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21224+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21225+fi
21226+
21227+
21228+ mv -f "$cfgfile" "$ofile" ||
21229 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21230 chmod +x "$ofile"
21231
21232--
212332.26.0
21234
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 16:12:35 +0000