summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-03-15 01:30:26 -0500
committerMatthew McClintock <msm@freescale.com>2012-03-15 01:31:25 -0500
commit70b5c249639bfa78113aab3a657631cd5b7b1d7a (patch)
treea7adb4185d1810bd81b3a7b48c8f997700eff8b1 /recipes-devtools
parent38cea31cbe1f20b568dc602a5b3440c3887c3e89 (diff)
downloadmeta-fsl-ppc-70b5c249639bfa78113aab3a657631cd5b7b1d7a.tar.gz
binutils: add patches from poky's binutils
This drops my previous changes and just adds in patches from poky that already address libtool issues Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/binutils/binutils-fsl.inc10
-rw-r--r--recipes-devtools/binutils/files/libtool-2.4-update_fsl.patch18705
2 files changed, 18710 insertions, 5 deletions
diff --git a/recipes-devtools/binutils/binutils-fsl.inc b/recipes-devtools/binutils/binutils-fsl.inc
index 0995b83..0309032 100644
--- a/recipes-devtools/binutils/binutils-fsl.inc
+++ b/recipes-devtools/binutils/binutils-fsl.inc
@@ -3,13 +3,13 @@ SRC_URI_fsl = "\
3 file://bin.e5500.patch \ 3 file://bin.e5500.patch \
4 file://bin.e6500-2.patch \ 4 file://bin.e6500-2.patch \
5 file://bin.e500mc_nop.patch \ 5 file://bin.e500mc_nop.patch \
6 file://libtool-2.4-update_fsl.patch \
7 file://binutils-2.19.1-ld-sysroot.patch \
6 file://libiberty_path_fix.patch \ 8 file://libiberty_path_fix.patch \
9 file://binutils-poison.patch \
10 file://libtool-rpath-fix.patch \
7 " 11 "
8 12
9FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 13FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
10 14
11PR_fsl .= "+${DISTRO}.3" 15PR_fsl .= "+${DISTRO}.4"
12
13do_install_append() {
14 rm -f ${D}${libdir}/libbfd.la
15}
diff --git a/recipes-devtools/binutils/files/libtool-2.4-update_fsl.patch b/recipes-devtools/binutils/files/libtool-2.4-update_fsl.patch
new file mode 100644
index 0000000..039241f
--- /dev/null
+++ b/recipes-devtools/binutils/files/libtool-2.4-update_fsl.patch
@@ -0,0 +1,18705 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: binutils-2.21.1/libtool.m4
4===================================================================
5--- binutils-2.21.1.orig/libtool.m4
6+++ binutils-2.21.1/libtool.m4
7@@ -1,7 +1,8 @@
8 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
9 #
10 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
11-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
13+# Inc.
14 # Written by Gordon Matzigkeit, 1996
15 #
16 # This file is free software; the Free Software Foundation gives
17@@ -10,7 +11,8 @@
18
19 m4_define([_LT_COPYING], [dnl
20 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
21-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
22+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
23+# Inc.
24 # Written by Gordon Matzigkeit, 1996
25 #
26 # This file is part of GNU Libtool.
27@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
28 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
29 ])
30
31-# serial 56 LT_INIT
32+# serial 57 LT_INIT
33
34
35 # LT_PREREQ(VERSION)
36@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
37 LIBTOOL_DEPS="$ltmain"
38
39 # Always use our own libtool.
40-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
41+LIBTOOL='$(SHELL) $(top_builddir)'
42+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
43 AC_SUBST(LIBTOOL)dnl
44
45 _LT_SETUP
46@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
47 dnl
48 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
49 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
50+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
51 m4_require([_LT_CMD_RELOAD])dnl
52 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
53+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
54 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
55 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
56+m4_require([_LT_WITH_SYSROOT])dnl
57
58 _LT_CONFIG_LIBTOOL_INIT([
59 # See if we are running on zsh, and set the options which allow our
60@@ -199,7 +205,7 @@ aix3*)
61 esac
62
63 # Global variables:
64-ofile=libtool
65+ofile=${host_alias}-libtool
66 can_build_shared=yes
67
68 # All known linkers require a `.a' archive for static linking (except MSVC,
69@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
70 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
71 configured by $[0], generated by m4_PACKAGE_STRING.
72
73-Copyright (C) 2009 Free Software Foundation, Inc.
74+Copyright (C) 2010 Free Software Foundation, Inc.
75 This config.lt script is free software; the Free Software Foundation
76 gives unlimited permision to copy, distribute and modify it."
77
78@@ -746,15 +752,12 @@ _LT_EOF
79 # if finds mixed CR/LF and LF-only lines. Since sed operates in
80 # text mode, it properly converts lines to CR/LF. This bash problem
81 # is reportedly fixed, but why not run on old versions too?
82- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
83- || (rm -f "$cfgfile"; exit 1)
84+ sed '$q' "$ltmain" >> "$cfgfile" \
85+ || (rm -f "$cfgfile"; exit 1)
86
87- _LT_PROG_XSI_SHELLFNS
88+ _LT_PROG_REPLACE_SHELLFNS
89
90- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
91- || (rm -f "$cfgfile"; exit 1)
92-
93- mv -f "$cfgfile" "$ofile" ||
94+ mv -f "$cfgfile" "$ofile" ||
95 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
96 chmod +x "$ofile"
97 ],
98@@ -980,6 +983,8 @@ _LT_EOF
99 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
100 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
101 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
102+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
103+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
104 cat > conftest.c << _LT_EOF
105 int main() { return 0;}
106 _LT_EOF
107@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
108 fi
109 ])
110
111-# _LT_SYS_MODULE_PATH_AIX
112-# -----------------------
113+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
114+# ----------------------------------
115 # Links a minimal program and checks the executable
116 # for the system default hardcoded library path. In most cases,
117 # this is /usr/lib:/lib, but when the MPI compilers are used
118 # the location of the communication and MPI libs are included too.
119 # If we don't find anything, use the default library path according
120 # to the aix ld manual.
121+# Store the results from the different compilers for each TAGNAME.
122+# Allow to override them for all tags through lt_cv_aix_libpath.
123 m4_defun([_LT_SYS_MODULE_PATH_AIX],
124 [m4_require([_LT_DECL_SED])dnl
125-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
126-lt_aix_libpath_sed='
127- /Import File Strings/,/^$/ {
128- /^0/ {
129- s/^0 *\(.*\)$/\1/
130- p
131- }
132- }'
133-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
134-# Check for a 64-bit object if we didn't find anything.
135-if test -z "$aix_libpath"; then
136- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
137-fi],[])
138-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
139+if test "${lt_cv_aix_libpath+set}" = set; then
140+ aix_libpath=$lt_cv_aix_libpath
141+else
142+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
143+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
144+ lt_aix_libpath_sed='[
145+ /Import File Strings/,/^$/ {
146+ /^0/ {
147+ s/^0 *\([^ ]*\) *$/\1/
148+ p
149+ }
150+ }]'
151+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
152+ # Check for a 64-bit object if we didn't find anything.
153+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
154+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
155+ fi],[])
156+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
157+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
158+ fi
159+ ])
160+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
161+fi
162 ])# _LT_SYS_MODULE_PATH_AIX
163
164
165@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
166
167 AC_MSG_CHECKING([how to print strings])
168 # Test print first, because it will be a builtin if present.
169-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
170+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
171 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
172 ECHO='print -r --'
173 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
174@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
175 ])# _LT_PROG_ECHO_BACKSLASH
176
177
178+# _LT_WITH_SYSROOT
179+# ----------------
180+AC_DEFUN([_LT_WITH_SYSROOT],
181+[AC_MSG_CHECKING([for sysroot])
182+AC_ARG_WITH([libtool-sysroot],
183+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
184+ (or the compiler's sysroot if not specified).],
185+[], [with_libtool_sysroot=no])
186+
187+dnl lt_sysroot will always be passed unquoted. We quote it here
188+dnl in case the user passed a directory name.
189+lt_sysroot=
190+case ${with_libtool_sysroot} in #(
191+ yes)
192+ if test "$GCC" = yes; then
193+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
194+ fi
195+ ;; #(
196+ /*)
197+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
198+ ;; #(
199+ no|'')
200+ ;; #(
201+ *)
202+ AC_MSG_RESULT([${with_libtool_sysroot}])
203+ AC_MSG_ERROR([The sysroot must be an absolute path.])
204+ ;;
205+esac
206+
207+ AC_MSG_RESULT([${lt_sysroot:-no}])
208+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
209+[dependent libraries, and in which our libraries should be installed.])])
210+
211 # _LT_ENABLE_LOCK
212 # ---------------
213 m4_defun([_LT_ENABLE_LOCK],
214@@ -1307,14 +1356,47 @@ need_locks="$enable_libtool_lock"
215 ])# _LT_ENABLE_LOCK
216
217
218+# _LT_PROG_AR
219+# -----------
220+m4_defun([_LT_PROG_AR],
221+[AC_CHECK_TOOLS(AR, [ar], false)
222+: ${AR=ar}
223+: ${AR_FLAGS=cru}
224+_LT_DECL([], [AR], [1], [The archiver])
225+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
226+
227+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
228+ [lt_cv_ar_at_file=no
229+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
230+ [echo conftest.$ac_objext > conftest.lst
231+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
232+ AC_TRY_EVAL([lt_ar_try])
233+ if test "$ac_status" -eq 0; then
234+ # Ensure the archiver fails upon bogus file names.
235+ rm -f conftest.$ac_objext libconftest.a
236+ AC_TRY_EVAL([lt_ar_try])
237+ if test "$ac_status" -ne 0; then
238+ lt_cv_ar_at_file=@
239+ fi
240+ fi
241+ rm -f conftest.* libconftest.a
242+ ])
243+ ])
244+
245+if test "x$lt_cv_ar_at_file" = xno; then
246+ archiver_list_spec=
247+else
248+ archiver_list_spec=$lt_cv_ar_at_file
249+fi
250+_LT_DECL([], [archiver_list_spec], [1],
251+ [How to feed a file listing to the archiver])
252+])# _LT_PROG_AR
253+
254+
255 # _LT_CMD_OLD_ARCHIVE
256 # -------------------
257 m4_defun([_LT_CMD_OLD_ARCHIVE],
258-[AC_CHECK_TOOL(AR, ar, false)
259-test -z "$AR" && AR=ar
260-test -z "$AR_FLAGS" && AR_FLAGS=cru
261-_LT_DECL([], [AR], [1], [The archiver])
262-_LT_DECL([], [AR_FLAGS], [1])
263+[_LT_PROG_AR
264
265 AC_CHECK_TOOL(STRIP, strip, :)
266 test -z "$STRIP" && STRIP=:
267@@ -1610,7 +1692,7 @@ else
268 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
269 lt_status=$lt_dlunknown
270 cat > conftest.$ac_ext <<_LT_EOF
271-[#line __oline__ "configure"
272+[#line $LINENO "configure"
273 #include "confdefs.h"
274
275 #if HAVE_DLFCN_H
276@@ -1654,10 +1736,10 @@ else
277 /* When -fvisbility=hidden is used, assume the code has been annotated
278 correspondingly for the symbols needed. */
279 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
280-void fnord () __attribute__((visibility("default")));
281+int fnord () __attribute__((visibility("default")));
282 #endif
283
284-void fnord () { int i=42; }
285+int fnord () { return 42; }
286 int main ()
287 {
288 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
289@@ -2197,8 +2279,9 @@ cygwin* | mingw* | pw32* | cegcc*)
290 need_version=no
291 need_lib_prefix=no
292
293- case $GCC,$host_os in
294- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
295+ case $GCC,$cc_basename in
296+ yes,*)
297+ # gcc
298 library_names_spec='$libname.dll.a'
299 # DLL is installed to $(libdir)/../bin by postinstall_cmds
300 postinstall_cmds='base_file=`basename \${file}`~
301@@ -2231,13 +2314,71 @@ m4_if([$1], [],[
302 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
303 ;;
304 esac
305+ dynamic_linker='Win32 ld.exe'
306+ ;;
307+
308+ *,cl*)
309+ # Native MSVC
310+ libname_spec='$name'
311+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
312+ library_names_spec='${libname}.dll.lib'
313+
314+ case $build_os in
315+ mingw*)
316+ sys_lib_search_path_spec=
317+ lt_save_ifs=$IFS
318+ IFS=';'
319+ for lt_path in $LIB
320+ do
321+ IFS=$lt_save_ifs
322+ # Let DOS variable expansion print the short 8.3 style file name.
323+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
324+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
325+ done
326+ IFS=$lt_save_ifs
327+ # Convert to MSYS style.
328+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
329+ ;;
330+ cygwin*)
331+ # Convert to unix form, then to dos form, then back to unix form
332+ # but this time dos style (no spaces!) so that the unix form looks
333+ # like /cygdrive/c/PROGRA~1:/cygdr...
334+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
335+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
336+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
337+ ;;
338+ *)
339+ sys_lib_search_path_spec="$LIB"
340+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
341+ # It is most probably a Windows format PATH.
342+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
343+ else
344+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
345+ fi
346+ # FIXME: find the short name or the path components, as spaces are
347+ # common. (e.g. "Program Files" -> "PROGRA~1")
348+ ;;
349+ esac
350+
351+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
352+ postinstall_cmds='base_file=`basename \${file}`~
353+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
354+ dldir=$destdir/`dirname \$dlpath`~
355+ test -d \$dldir || mkdir -p \$dldir~
356+ $install_prog $dir/$dlname \$dldir/$dlname'
357+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
358+ dlpath=$dir/\$dldll~
359+ $RM \$dlpath'
360+ shlibpath_overrides_runpath=yes
361+ dynamic_linker='Win32 link.exe'
362 ;;
363
364 *)
365+ # Assume MSVC wrapper
366 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
367+ dynamic_linker='Win32 ld.exe'
368 ;;
369 esac
370- dynamic_linker='Win32 ld.exe'
371 # FIXME: first we should search . and the directory the executable is in
372 shlibpath_var=PATH
373 ;;
374@@ -2333,7 +2474,7 @@ haiku*)
375 soname_spec='${libname}${release}${shared_ext}$major'
376 shlibpath_var=LIBRARY_PATH
377 shlibpath_overrides_runpath=yes
378- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
379+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
380 hardcode_into_libs=yes
381 ;;
382
383@@ -2941,6 +3082,11 @@ case $reload_flag in
384 esac
385 reload_cmds='$LD$reload_flag -o $output$reload_objs'
386 case $host_os in
387+ cygwin* | mingw* | pw32* | cegcc*)
388+ if test "$GCC" != yes; then
389+ reload_cmds=false
390+ fi
391+ ;;
392 darwin*)
393 if test "$GCC" = yes; then
394 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
395@@ -3007,7 +3153,8 @@ mingw* | pw32*)
396 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
397 lt_cv_file_magic_cmd='func_win32_libid'
398 else
399- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
400+ # Keep this pattern in sync with the one in func_win32_libid.
401+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
402 lt_cv_file_magic_cmd='$OBJDUMP -f'
403 fi
404 ;;
405@@ -3158,6 +3305,21 @@ tpf*)
406 ;;
407 esac
408 ])
409+
410+file_magic_glob=
411+want_nocaseglob=no
412+if test "$build" = "$host"; then
413+ case $host_os in
414+ mingw* | pw32*)
415+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
416+ want_nocaseglob=yes
417+ else
418+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
419+ fi
420+ ;;
421+ esac
422+fi
423+
424 file_magic_cmd=$lt_cv_file_magic_cmd
425 deplibs_check_method=$lt_cv_deplibs_check_method
426 test -z "$deplibs_check_method" && deplibs_check_method=unknown
427@@ -3165,7 +3327,11 @@ test -z "$deplibs_check_method" && depli
428 _LT_DECL([], [deplibs_check_method], [1],
429 [Method to check whether dependent libraries are shared objects])
430 _LT_DECL([], [file_magic_cmd], [1],
431- [Command to use when deplibs_check_method == "file_magic"])
432+ [Command to use when deplibs_check_method = "file_magic"])
433+_LT_DECL([], [file_magic_glob], [1],
434+ [How to find potential files when deplibs_check_method = "file_magic"])
435+_LT_DECL([], [want_nocaseglob], [1],
436+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
437 ])# _LT_CHECK_MAGIC_METHOD
438
439
440@@ -3268,6 +3434,67 @@ dnl aclocal-1.4 backwards compatibility:
441 dnl AC_DEFUN([AM_PROG_NM], [])
442 dnl AC_DEFUN([AC_PROG_NM], [])
443
444+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
445+# --------------------------------
446+# how to determine the name of the shared library
447+# associated with a specific link library.
448+# -- PORTME fill in with the dynamic library characteristics
449+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
450+[m4_require([_LT_DECL_EGREP])
451+m4_require([_LT_DECL_OBJDUMP])
452+m4_require([_LT_DECL_DLLTOOL])
453+AC_CACHE_CHECK([how to associate runtime and link libraries],
454+lt_cv_sharedlib_from_linklib_cmd,
455+[lt_cv_sharedlib_from_linklib_cmd='unknown'
456+
457+case $host_os in
458+cygwin* | mingw* | pw32* | cegcc*)
459+ # two different shell functions defined in ltmain.sh
460+ # decide which to use based on capabilities of $DLLTOOL
461+ case `$DLLTOOL --help 2>&1` in
462+ *--identify-strict*)
463+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
464+ ;;
465+ *)
466+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
467+ ;;
468+ esac
469+ ;;
470+*)
471+ # fallback: assume linklib IS sharedlib
472+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
473+ ;;
474+esac
475+])
476+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
477+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
478+
479+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
480+ [Command to associate shared and link libraries])
481+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
482+
483+
484+# _LT_PATH_MANIFEST_TOOL
485+# ----------------------
486+# locate the manifest tool
487+m4_defun([_LT_PATH_MANIFEST_TOOL],
488+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
489+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
490+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
491+ [lt_cv_path_mainfest_tool=no
492+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
493+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
494+ cat conftest.err >&AS_MESSAGE_LOG_FD
495+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
496+ lt_cv_path_mainfest_tool=yes
497+ fi
498+ rm -f conftest*])
499+if test "x$lt_cv_path_mainfest_tool" != xyes; then
500+ MANIFEST_TOOL=:
501+fi
502+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
503+])# _LT_PATH_MANIFEST_TOOL
504+
505
506 # LT_LIB_M
507 # --------
508@@ -3394,8 +3621,8 @@ esac
509 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
510
511 # Transform an extracted symbol line into symbol name and symbol address
512-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
513-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
514+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
515+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
516
517 # Handle CRLF in mingw tool chain
518 opt_cr=
519@@ -3431,6 +3658,7 @@ for ac_symprfx in "" "_"; do
520 else
521 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
522 fi
523+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
524
525 # Check to see that the pipe works correctly.
526 pipe_works=no
527@@ -3464,6 +3692,18 @@ _LT_EOF
528 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
529 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
530 cat <<_LT_EOF > conftest.$ac_ext
531+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
532+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
533+/* DATA imports from DLLs on WIN32 con't be const, because runtime
534+ relocations are performed -- see ld's documentation on pseudo-relocs. */
535+# define LT@&t@_DLSYM_CONST
536+#elif defined(__osf__)
537+/* This system does not cope well with relocations in const data. */
538+# define LT@&t@_DLSYM_CONST
539+#else
540+# define LT@&t@_DLSYM_CONST const
541+#endif
542+
543 #ifdef __cplusplus
544 extern "C" {
545 #endif
546@@ -3475,7 +3715,7 @@ _LT_EOF
547 cat <<_LT_EOF >> conftest.$ac_ext
548
549 /* The mapping between symbol names and symbols. */
550-const struct {
551+LT@&t@_DLSYM_CONST struct {
552 const char *name;
553 void *address;
554 }
555@@ -3501,15 +3741,15 @@ static const void *lt_preloaded_setup()
556 _LT_EOF
557 # Now try linking the two files.
558 mv conftest.$ac_objext conftstm.$ac_objext
559- lt_save_LIBS="$LIBS"
560- lt_save_CFLAGS="$CFLAGS"
561+ lt_globsym_save_LIBS=$LIBS
562+ lt_globsym_save_CFLAGS=$CFLAGS
563 LIBS="conftstm.$ac_objext"
564 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
565 if AC_TRY_EVAL(ac_link) && 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" >&AS_MESSAGE_LOG_FD
574 fi
575@@ -3542,6 +3782,13 @@ else
576 AC_MSG_RESULT(ok)
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 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
587 [Take the output of nm and produce a listing of raw symbols and C names])
588 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
589@@ -3552,6 +3799,8 @@ _LT_DECL([global_symbol_to_c_name_addres
590 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
591 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
592 [Transform the output of nm in a C name address pair when lib prefix is needed])
593+_LT_DECL([], [nm_file_list_spec], [1],
594+ [Specify filename containing input files for $NM])
595 ]) # _LT_CMD_GLOBAL_SYMBOLS
596
597
598@@ -3563,7 +3812,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
599 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
600 _LT_TAGVAR(lt_prog_compiler_static, $1)=
601
602-AC_MSG_CHECKING([for $compiler option to produce PIC])
603 m4_if([$1], [CXX], [
604 # C++ specific cases for pic, static, wl, etc.
605 if test "$GXX" = yes; then
606@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [
607 ;;
608 esac
609 ;;
610+ mingw* | cygwin* | os2* | pw32* | cegcc*)
611+ # This hack is so that the source file can tell whether it is being
612+ # built for inclusion in a dll (and should export symbols for example).
613+ m4_if([$1], [GCJ], [],
614+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
615+ ;;
616 dgux*)
617 case $cc_basename in
618 ec++*)
619@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [
620 ;;
621 solaris*)
622 case $cc_basename in
623- CC*)
624+ CC* | sunCC*)
625 # Sun C++ 4.2, 5.x and Centerline C++
626 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
627 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
628@@ -4042,6 +4296,12 @@ m4_if([$1], [CXX], [
629 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
630 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
631 ;;
632+ nagfor*)
633+ # NAG Fortran compiler
634+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
635+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
636+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
637+ ;;
638 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
639 # Portland Group compilers (*not* the Pentium gcc compiler,
640 # which looks to be a dead project)
641@@ -4104,7 +4364,7 @@ m4_if([$1], [CXX], [
642 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
643 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
644 case $cc_basename in
645- f77* | f90* | f95*)
646+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
647 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
648 *)
649 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
650@@ -4161,9 +4421,11 @@ case $host_os in
651 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
652 ;;
653 esac
654-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
655-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
656- [How to pass a linker flag through the compiler])
657+
658+AC_CACHE_CHECK([for $compiler option to produce PIC],
659+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
660+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
661+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
662
663 #
664 # Check to make sure the PIC flag actually works.
665@@ -4182,6 +4444,8 @@ fi
666 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
667 [Additional compiler flags for building library objects])
668
669+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
670+ [How to pass a linker flag through the compiler])
671 #
672 # Check to make sure the static flag actually works.
673 #
674@@ -4202,6 +4466,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
675 m4_defun([_LT_LINKER_SHLIBS],
676 [AC_REQUIRE([LT_PATH_LD])dnl
677 AC_REQUIRE([LT_PATH_NM])dnl
678+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
679 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
680 m4_require([_LT_DECL_EGREP])dnl
681 m4_require([_LT_DECL_SED])dnl
682@@ -4210,6 +4475,7 @@ m4_require([_LT_TAG_COMPILER])dnl
683 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
684 m4_if([$1], [CXX], [
685 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
686+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
687 case $host_os in
688 aix[[4-9]]*)
689 # If we're using GNU nm, then we don't want the "-C" option.
690@@ -4224,15 +4490,20 @@ m4_if([$1], [CXX], [
691 ;;
692 pw32*)
693 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
694- ;;
695+ ;;
696 cygwin* | mingw* | cegcc*)
697- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
698- ;;
699+ case $cc_basename in
700+ cl*) ;;
701+ *)
702+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
703+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
704+ ;;
705+ esac
706+ ;;
707 *)
708 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
709- ;;
710+ ;;
711 esac
712- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
713 ], [
714 runpath_var=
715 _LT_TAGVAR(allow_undefined_flag, $1)=
716@@ -4400,7 +4671,8 @@ _LT_EOF
717 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
718 _LT_TAGVAR(always_export_symbols, $1)=no
719 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
720- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
721+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
722+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
723
724 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
725 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
726@@ -4448,7 +4720,7 @@ _LT_EOF
727 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
728 && test "$tmp_diet" = no
729 then
730- tmp_addflag=
731+ tmp_addflag=' $pic_flag'
732 tmp_sharedflag='-shared'
733 case $cc_basename,$host_cpu in
734 pgcc*) # Portland Group C compiler
735@@ -4499,12 +4771,12 @@ _LT_EOF
736 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
737 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
738 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
739- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
740+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
741 if test "x$supports_anon_versioning" = xyes; then
742 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
743 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
744 echo "local: *; };" >> $output_objdir/$libname.ver~
745- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
746+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
747 fi
748 ;;
749 esac
750@@ -4518,8 +4790,8 @@ _LT_EOF
751 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
752 wlarc=
753 else
754- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
755- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
756+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
757+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
758 fi
759 ;;
760
761@@ -4537,8 +4809,8 @@ _LT_EOF
762
763 _LT_EOF
764 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
765- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
766- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
767+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
768+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
769 else
770 _LT_TAGVAR(ld_shlibs, $1)=no
771 fi
772@@ -4584,8 +4856,8 @@ _LT_EOF
773
774 *)
775 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
776- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
777- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
778+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
779+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
780 else
781 _LT_TAGVAR(ld_shlibs, $1)=no
782 fi
783@@ -4715,7 +4987,7 @@ _LT_EOF
784 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
785 # Determine the default libpath from the value encoded in an
786 # empty executable.
787- _LT_SYS_MODULE_PATH_AIX
788+ _LT_SYS_MODULE_PATH_AIX([$1])
789 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
790 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
791 else
792@@ -4726,7 +4998,7 @@ _LT_EOF
793 else
794 # Determine the default libpath from the value encoded in an
795 # empty executable.
796- _LT_SYS_MODULE_PATH_AIX
797+ _LT_SYS_MODULE_PATH_AIX([$1])
798 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
799 # Warning - without using the other run time loading flags,
800 # -berok will link without error, but may produce a broken library.
801@@ -4770,20 +5042,63 @@ _LT_EOF
802 # Microsoft Visual C++.
803 # hardcode_libdir_flag_spec is actually meaningless, as there is
804 # no search path for DLLs.
805- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
806- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
807- # Tell ltmain to make .lib files, not .a files.
808- libext=lib
809- # Tell ltmain to make .dll files, not .so files.
810- shrext_cmds=".dll"
811- # FIXME: Setting linknames here is a bad hack.
812- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
813- # The linker will automatically build a .lib file if we build a DLL.
814- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
815- # FIXME: Should let the user specify the lib program.
816- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
817- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
818- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
819+ case $cc_basename in
820+ cl*)
821+ # Native MSVC
822+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
823+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
824+ _LT_TAGVAR(always_export_symbols, $1)=yes
825+ _LT_TAGVAR(file_list_spec, $1)='@'
826+ # Tell ltmain to make .lib files, not .a files.
827+ libext=lib
828+ # Tell ltmain to make .dll files, not .so files.
829+ shrext_cmds=".dll"
830+ # FIXME: Setting linknames here is a bad hack.
831+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
832+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
833+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
834+ else
835+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
836+ fi~
837+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
838+ linknames='
839+ # The linker will not automatically build a static lib if we build a DLL.
840+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
841+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
842+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
843+ # Don't use ranlib
844+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
845+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
846+ lt_tool_outputfile="@TOOL_OUTPUT@"~
847+ case $lt_outputfile in
848+ *.exe|*.EXE) ;;
849+ *)
850+ lt_outputfile="$lt_outputfile.exe"
851+ lt_tool_outputfile="$lt_tool_outputfile.exe"
852+ ;;
853+ esac~
854+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
855+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
856+ $RM "$lt_outputfile.manifest";
857+ fi'
858+ ;;
859+ *)
860+ # Assume MSVC wrapper
861+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
862+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
863+ # Tell ltmain to make .lib files, not .a files.
864+ libext=lib
865+ # Tell ltmain to make .dll files, not .so files.
866+ shrext_cmds=".dll"
867+ # FIXME: Setting linknames here is a bad hack.
868+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
869+ # The linker will automatically build a .lib file if we build a DLL.
870+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
871+ # FIXME: Should let the user specify the lib program.
872+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
873+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
874+ ;;
875+ esac
876 ;;
877
878 darwin* | rhapsody*)
879@@ -4821,7 +5136,7 @@ _LT_EOF
880
881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
882 freebsd* | dragonfly*)
883- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
884+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
885 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
886 _LT_TAGVAR(hardcode_direct, $1)=yes
887 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
888@@ -4829,7 +5144,7 @@ _LT_EOF
889
890 hpux9*)
891 if test "$GCC" = yes; then
892- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
893+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
894 else
895 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
896 fi
897@@ -4845,7 +5160,7 @@ _LT_EOF
898
899 hpux10*)
900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
901- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
902+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
903 else
904 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
905 fi
906@@ -4869,10 +5184,10 @@ _LT_EOF
907 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
908 ;;
909 ia64*)
910- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
911+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
912 ;;
913 *)
914- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
915+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
916 ;;
917 esac
918 else
919@@ -4919,16 +5234,31 @@ _LT_EOF
920
921 irix5* | irix6* | nonstopux*)
922 if test "$GCC" = yes; then
923- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
924+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
925 # Try to use the -exported_symbol ld option, if it does not
926 # work, assume that -exports_file does not work either and
927 # implicitly export all symbols.
928- save_LDFLAGS="$LDFLAGS"
929- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
930- AC_LINK_IFELSE(int foo(void) {},
931- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
932- )
933- LDFLAGS="$save_LDFLAGS"
934+ # This should be the same for all languages, so no per-tag cache variable.
935+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
936+ [lt_cv_irix_exported_symbol],
937+ [save_LDFLAGS="$LDFLAGS"
938+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
939+ AC_LINK_IFELSE(
940+ [AC_LANG_SOURCE(
941+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
942+ [C++], [[int foo (void) { return 0; }]],
943+ [Fortran 77], [[
944+ subroutine foo
945+ end]],
946+ [Fortran], [[
947+ subroutine foo
948+ end]])])],
949+ [lt_cv_irix_exported_symbol=yes],
950+ [lt_cv_irix_exported_symbol=no])
951+ LDFLAGS="$save_LDFLAGS"])
952+ if test "$lt_cv_irix_exported_symbol" = yes; then
953+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
954+ fi
955 else
956 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
957 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
958@@ -5013,7 +5343,7 @@ _LT_EOF
959 osf4* | osf5*) # as osf3* with the addition of -msym flag
960 if test "$GCC" = yes; then
961 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
962- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
963+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
964 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
965 else
966 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
967@@ -5032,9 +5362,9 @@ _LT_EOF
968 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
969 if test "$GCC" = yes; then
970 wlarc='${wl}'
971- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
972+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
973 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
974- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
975+ $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'
976 else
977 case `$CC -V 2>&1` in
978 *"Compilers 5.0"*)
979@@ -5306,8 +5636,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
980 to runtime path list])
981 _LT_TAGDECL([], [link_all_deplibs], [0],
982 [Whether libtool must link a program against all its dependency libraries])
983-_LT_TAGDECL([], [fix_srcfile_path], [1],
984- [Fix the shell variable $srcfile for the compiler])
985 _LT_TAGDECL([], [always_export_symbols], [0],
986 [Set to "yes" if exported symbols are required])
987 _LT_TAGDECL([], [export_symbols_cmds], [2],
988@@ -5318,6 +5646,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
989 [Symbols that must always be exported])
990 _LT_TAGDECL([], [prelink_cmds], [2],
991 [Commands necessary for linking programs (against libraries) with templates])
992+_LT_TAGDECL([], [postlink_cmds], [2],
993+ [Commands necessary for finishing linking programs])
994 _LT_TAGDECL([], [file_list_spec], [1],
995 [Specify filename containing input files])
996 dnl FIXME: Not yet implemented
997@@ -5419,6 +5749,7 @@ CC="$lt_save_CC"
998 m4_defun([_LT_LANG_CXX_CONFIG],
999 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1000 m4_require([_LT_DECL_EGREP])dnl
1001+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1002 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1003 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1004 (test "X$CXX" != "Xg++"))) ; then
1005@@ -5480,6 +5811,7 @@ if test "$_lt_caught_CXX_error" != yes;
1006
1007 # Allow CC to be a program name with arguments.
1008 lt_save_CC=$CC
1009+ lt_save_CFLAGS=$CFLAGS
1010 lt_save_LD=$LD
1011 lt_save_GCC=$GCC
1012 GCC=$GXX
1013@@ -5497,6 +5829,7 @@ if test "$_lt_caught_CXX_error" != yes;
1014 fi
1015 test -z "${LDCXX+set}" || LD=$LDCXX
1016 CC=${CXX-"c++"}
1017+ CFLAGS=$CXXFLAGS
1018 compiler=$CC
1019 _LT_TAGVAR(compiler, $1)=$CC
1020 _LT_CC_BASENAME([$compiler])
1021@@ -5518,8 +5851,8 @@ if test "$_lt_caught_CXX_error" != yes;
1022 # Check if GNU C++ uses GNU ld as the underlying linker, since the
1023 # archiving commands below assume that GNU ld is being used.
1024 if test "$with_gnu_ld" = yes; then
1025- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1026- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1027+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1028+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1029
1030 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1031 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1032@@ -5660,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes;
1033 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
1034 # Determine the default libpath from the value encoded in an empty
1035 # executable.
1036- _LT_SYS_MODULE_PATH_AIX
1037+ _LT_SYS_MODULE_PATH_AIX([$1])
1038 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1039
1040 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1041@@ -5672,7 +6005,7 @@ if test "$_lt_caught_CXX_error" != yes;
1042 else
1043 # Determine the default libpath from the value encoded in an
1044 # empty executable.
1045- _LT_SYS_MODULE_PATH_AIX
1046+ _LT_SYS_MODULE_PATH_AIX([$1])
1047 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1048 # Warning - without using the other run time loading flags,
1049 # -berok will link without error, but may produce a broken library.
1050@@ -5714,29 +6047,75 @@ if test "$_lt_caught_CXX_error" != yes;
1051 ;;
1052
1053 cygwin* | mingw* | pw32* | cegcc*)
1054- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1055- # as there is no search path for DLLs.
1056- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1057- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1058- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1059- _LT_TAGVAR(always_export_symbols, $1)=no
1060- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1061-
1062- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1063- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1064- # If the export-symbols file already is a .def file (1st line
1065- # is EXPORTS), use it as is; otherwise, prepend...
1066- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1067- cp $export_symbols $output_objdir/$soname.def;
1068- else
1069- echo EXPORTS > $output_objdir/$soname.def;
1070- cat $export_symbols >> $output_objdir/$soname.def;
1071- fi~
1072- $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'
1073- else
1074- _LT_TAGVAR(ld_shlibs, $1)=no
1075- fi
1076- ;;
1077+ case $GXX,$cc_basename in
1078+ ,cl* | no,cl*)
1079+ # Native MSVC
1080+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1081+ # no search path for DLLs.
1082+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1083+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1084+ _LT_TAGVAR(always_export_symbols, $1)=yes
1085+ _LT_TAGVAR(file_list_spec, $1)='@'
1086+ # Tell ltmain to make .lib files, not .a files.
1087+ libext=lib
1088+ # Tell ltmain to make .dll files, not .so files.
1089+ shrext_cmds=".dll"
1090+ # FIXME: Setting linknames here is a bad hack.
1091+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1092+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1093+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1094+ else
1095+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1096+ fi~
1097+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1098+ linknames='
1099+ # The linker will not automatically build a static lib if we build a DLL.
1100+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1101+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1102+ # Don't use ranlib
1103+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1104+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
1105+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1106+ case $lt_outputfile in
1107+ *.exe|*.EXE) ;;
1108+ *)
1109+ lt_outputfile="$lt_outputfile.exe"
1110+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1111+ ;;
1112+ esac~
1113+ func_to_tool_file "$lt_outputfile"~
1114+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1115+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1116+ $RM "$lt_outputfile.manifest";
1117+ fi'
1118+ ;;
1119+ *)
1120+ # g++
1121+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1122+ # as there is no search path for DLLs.
1123+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1124+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1125+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1126+ _LT_TAGVAR(always_export_symbols, $1)=no
1127+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1128+
1129+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1130+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1131+ # If the export-symbols file already is a .def file (1st line
1132+ # is EXPORTS), use it as is; otherwise, prepend...
1133+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1134+ cp $export_symbols $output_objdir/$soname.def;
1135+ else
1136+ echo EXPORTS > $output_objdir/$soname.def;
1137+ cat $export_symbols >> $output_objdir/$soname.def;
1138+ fi~
1139+ $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'
1140+ else
1141+ _LT_TAGVAR(ld_shlibs, $1)=no
1142+ fi
1143+ ;;
1144+ esac
1145+ ;;
1146 darwin* | rhapsody*)
1147 _LT_DARWIN_LINKER_FEATURES($1)
1148 ;;
1149@@ -5811,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes;
1150 ;;
1151 *)
1152 if test "$GXX" = yes; then
1153- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1154+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1155 else
1156 # FIXME: insert proper C++ library support
1157 _LT_TAGVAR(ld_shlibs, $1)=no
1158@@ -5882,10 +6261,10 @@ if test "$_lt_caught_CXX_error" != yes;
1159 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1160 ;;
1161 ia64*)
1162- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1163+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1164 ;;
1165 *)
1166- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1167+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1168 ;;
1169 esac
1170 fi
1171@@ -5926,9 +6305,9 @@ if test "$_lt_caught_CXX_error" != yes;
1172 *)
1173 if test "$GXX" = yes; then
1174 if test "$with_gnu_ld" = no; then
1175- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1176+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1177 else
1178- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1179+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1180 fi
1181 fi
1182 _LT_TAGVAR(link_all_deplibs, $1)=yes
1183@@ -5998,20 +6377,20 @@ if test "$_lt_caught_CXX_error" != yes;
1184 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1185 rm -rf $tpldir~
1186 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1187- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1188+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1189 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1190 rm -rf $tpldir~
1191 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1192- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1193+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1194 $RANLIB $oldlib'
1195 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1196 rm -rf $tpldir~
1197 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1198- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1199+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1200 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1201 rm -rf $tpldir~
1202 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1203- $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'
1204+ $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'
1205 ;;
1206 *) # Version 6 and above use weak symbols
1207 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1208@@ -6206,7 +6585,7 @@ if test "$_lt_caught_CXX_error" != yes;
1209 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1210 ;;
1211 *)
1212- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1213+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1214 ;;
1215 esac
1216
1217@@ -6252,7 +6631,7 @@ if test "$_lt_caught_CXX_error" != yes;
1218
1219 solaris*)
1220 case $cc_basename in
1221- CC*)
1222+ CC* | sunCC*)
1223 # Sun C++ 4.2, 5.x and Centerline C++
1224 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1225 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1226@@ -6293,9 +6672,9 @@ if test "$_lt_caught_CXX_error" != yes;
1227 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1228 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
1229 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
1230- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1231+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1232 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1233- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1234+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1235
1236 # Commands to make compiler produce verbose output that lists
1237 # what "hidden" libraries, object files and flags are used when
1238@@ -6424,6 +6803,7 @@ if test "$_lt_caught_CXX_error" != yes;
1239 fi # test -n "$compiler"
1240
1241 CC=$lt_save_CC
1242+ CFLAGS=$lt_save_CFLAGS
1243 LDCXX=$LD
1244 LD=$lt_save_LD
1245 GCC=$lt_save_GCC
1246@@ -6438,6 +6818,29 @@ AC_LANG_POP
1247 ])# _LT_LANG_CXX_CONFIG
1248
1249
1250+# _LT_FUNC_STRIPNAME_CNF
1251+# ----------------------
1252+# func_stripname_cnf prefix suffix name
1253+# strip PREFIX and SUFFIX off of NAME.
1254+# PREFIX and SUFFIX must not contain globbing or regex special
1255+# characters, hashes, percent signs, but SUFFIX may contain a leading
1256+# dot (in which case that matches only a dot).
1257+#
1258+# This function is identical to the (non-XSI) version of func_stripname,
1259+# except this one can be used by m4 code that may be executed by configure,
1260+# rather than the libtool script.
1261+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
1262+AC_REQUIRE([_LT_DECL_SED])
1263+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
1264+func_stripname_cnf ()
1265+{
1266+ case ${2} in
1267+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1268+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1269+ esac
1270+} # func_stripname_cnf
1271+])# _LT_FUNC_STRIPNAME_CNF
1272+
1273 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
1274 # ---------------------------------
1275 # Figure out "hidden" library dependencies from verbose
1276@@ -6446,6 +6849,7 @@ AC_LANG_POP
1277 # objects, libraries and library flags.
1278 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
1279 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1280+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
1281 # Dependencies to place before and after the object being linked:
1282 _LT_TAGVAR(predep_objects, $1)=
1283 _LT_TAGVAR(postdep_objects, $1)=
1284@@ -6496,6 +6900,13 @@ public class foo {
1285 };
1286 _LT_EOF
1287 ])
1288+
1289+_lt_libdeps_save_CFLAGS=$CFLAGS
1290+case "$CC $CFLAGS " in #(
1291+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1292+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1293+esac
1294+
1295 dnl Parse the compiler output and extract the necessary
1296 dnl objects, libraries and library flags.
1297 if AC_TRY_EVAL(ac_compile); then
1298@@ -6507,7 +6918,7 @@ if AC_TRY_EVAL(ac_compile); then
1299 pre_test_object_deps_done=no
1300
1301 for p in `eval "$output_verbose_link_cmd"`; do
1302- case $p in
1303+ case ${prev}${p} in
1304
1305 -L* | -R* | -l*)
1306 # Some compilers place space between "-{L,R}" and the path.
1307@@ -6516,13 +6927,22 @@ if AC_TRY_EVAL(ac_compile); then
1308 test $p = "-R"; then
1309 prev=$p
1310 continue
1311- else
1312- prev=
1313 fi
1314
1315+ # Expand the sysroot to ease extracting the directories later.
1316+ if test -z "$prev"; then
1317+ case $p in
1318+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
1319+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
1320+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
1321+ esac
1322+ fi
1323+ case $p in
1324+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
1325+ esac
1326 if test "$pre_test_object_deps_done" = no; then
1327- case $p in
1328- -L* | -R*)
1329+ case ${prev} in
1330+ -L | -R)
1331 # Internal compiler library paths should come after those
1332 # provided the user. The postdeps already come after the
1333 # user supplied libs so there is no need to process them.
1334@@ -6542,8 +6962,10 @@ if AC_TRY_EVAL(ac_compile); then
1335 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
1336 fi
1337 fi
1338+ prev=
1339 ;;
1340
1341+ *.lto.$objext) ;; # Ignore GCC LTO objects
1342 *.$objext)
1343 # This assumes that the test object file only shows up
1344 # once in the compiler output.
1345@@ -6579,6 +7001,7 @@ else
1346 fi
1347
1348 $RM -f confest.$objext
1349+CFLAGS=$_lt_libdeps_save_CFLAGS
1350
1351 # PORTME: override above test on systems where it is broken
1352 m4_if([$1], [CXX],
1353@@ -6615,7 +7038,7 @@ linux*)
1354
1355 solaris*)
1356 case $cc_basename in
1357- CC*)
1358+ CC* | sunCC*)
1359 # The more standards-conforming stlport4 library is
1360 # incompatible with the Cstd library. Avoid specifying
1361 # it if it's in CXXFLAGS. Ignore libCrun as
1362@@ -6728,7 +7151,9 @@ if test "$_lt_disable_F77" != yes; then
1363 # Allow CC to be a program name with arguments.
1364 lt_save_CC="$CC"
1365 lt_save_GCC=$GCC
1366+ lt_save_CFLAGS=$CFLAGS
1367 CC=${F77-"f77"}
1368+ CFLAGS=$FFLAGS
1369 compiler=$CC
1370 _LT_TAGVAR(compiler, $1)=$CC
1371 _LT_CC_BASENAME([$compiler])
1372@@ -6782,6 +7207,7 @@ if test "$_lt_disable_F77" != yes; then
1373
1374 GCC=$lt_save_GCC
1375 CC="$lt_save_CC"
1376+ CFLAGS="$lt_save_CFLAGS"
1377 fi # test "$_lt_disable_F77" != yes
1378
1379 AC_LANG_POP
1380@@ -6858,7 +7284,9 @@ if test "$_lt_disable_FC" != yes; then
1381 # Allow CC to be a program name with arguments.
1382 lt_save_CC="$CC"
1383 lt_save_GCC=$GCC
1384+ lt_save_CFLAGS=$CFLAGS
1385 CC=${FC-"f95"}
1386+ CFLAGS=$FCFLAGS
1387 compiler=$CC
1388 GCC=$ac_cv_fc_compiler_gnu
1389
1390@@ -6914,7 +7342,8 @@ if test "$_lt_disable_FC" != yes; then
1391 fi # test -n "$compiler"
1392
1393 GCC=$lt_save_GCC
1394- CC="$lt_save_CC"
1395+ CC=$lt_save_CC
1396+ CFLAGS=$lt_save_CFLAGS
1397 fi # test "$_lt_disable_FC" != yes
1398
1399 AC_LANG_POP
1400@@ -6951,10 +7380,12 @@ _LT_COMPILER_BOILERPLATE
1401 _LT_LINKER_BOILERPLATE
1402
1403 # Allow CC to be a program name with arguments.
1404-lt_save_CC="$CC"
1405+lt_save_CC=$CC
1406+lt_save_CFLAGS=$CFLAGS
1407 lt_save_GCC=$GCC
1408 GCC=yes
1409 CC=${GCJ-"gcj"}
1410+CFLAGS=$GCJFLAGS
1411 compiler=$CC
1412 _LT_TAGVAR(compiler, $1)=$CC
1413 _LT_TAGVAR(LD, $1)="$LD"
1414@@ -6985,7 +7416,8 @@ fi
1415 AC_LANG_RESTORE
1416
1417 GCC=$lt_save_GCC
1418-CC="$lt_save_CC"
1419+CC=$lt_save_CC
1420+CFLAGS=$lt_save_CFLAGS
1421 ])# _LT_LANG_GCJ_CONFIG
1422
1423
1424@@ -7020,9 +7452,11 @@ _LT_LINKER_BOILERPLATE
1425
1426 # Allow CC to be a program name with arguments.
1427 lt_save_CC="$CC"
1428+lt_save_CFLAGS=$CFLAGS
1429 lt_save_GCC=$GCC
1430 GCC=
1431 CC=${RC-"windres"}
1432+CFLAGS=
1433 compiler=$CC
1434 _LT_TAGVAR(compiler, $1)=$CC
1435 _LT_CC_BASENAME([$compiler])
1436@@ -7035,7 +7469,8 @@ fi
1437
1438 GCC=$lt_save_GCC
1439 AC_LANG_RESTORE
1440-CC="$lt_save_CC"
1441+CC=$lt_save_CC
1442+CFLAGS=$lt_save_CFLAGS
1443 ])# _LT_LANG_RC_CONFIG
1444
1445
1446@@ -7094,6 +7529,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
1447 AC_SUBST([OBJDUMP])
1448 ])
1449
1450+# _LT_DECL_DLLTOOL
1451+# ----------------
1452+# Ensure DLLTOOL variable is set.
1453+m4_defun([_LT_DECL_DLLTOOL],
1454+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1455+test -z "$DLLTOOL" && DLLTOOL=dlltool
1456+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
1457+AC_SUBST([DLLTOOL])
1458+])
1459
1460 # _LT_DECL_SED
1461 # ------------
1462@@ -7187,8 +7631,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
1463 # Try some XSI features
1464 xsi_shell=no
1465 ( _lt_dummy="a/b/c"
1466- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
1467- = c,a/b,, \
1468+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
1469+ = c,a/b,b/c, \
1470 && eval 'test $(( 1 + 1 )) -eq 2 \
1471 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
1472 && xsi_shell=yes
1473@@ -7227,206 +7671,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
1474 ])# _LT_CHECK_SHELL_FEATURES
1475
1476
1477-# _LT_PROG_XSI_SHELLFNS
1478-# ---------------------
1479-# Bourne and XSI compatible variants of some useful shell functions.
1480-m4_defun([_LT_PROG_XSI_SHELLFNS],
1481-[case $xsi_shell in
1482- yes)
1483- cat << \_LT_EOF >> "$cfgfile"
1484-
1485-# func_dirname file append nondir_replacement
1486-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1487-# otherwise set result to NONDIR_REPLACEMENT.
1488-func_dirname ()
1489-{
1490- case ${1} in
1491- */*) func_dirname_result="${1%/*}${2}" ;;
1492- * ) func_dirname_result="${3}" ;;
1493- esac
1494-}
1495-
1496-# func_basename file
1497-func_basename ()
1498-{
1499- func_basename_result="${1##*/}"
1500-}
1501-
1502-# func_dirname_and_basename file append nondir_replacement
1503-# perform func_basename and func_dirname in a single function
1504-# call:
1505-# dirname: Compute the dirname of FILE. If nonempty,
1506-# add APPEND to the result, otherwise set result
1507-# to NONDIR_REPLACEMENT.
1508-# value returned in "$func_dirname_result"
1509-# basename: Compute filename of FILE.
1510-# value retuned in "$func_basename_result"
1511-# Implementation must be kept synchronized with func_dirname
1512-# and func_basename. For efficiency, we do not delegate to
1513-# those functions but instead duplicate the functionality here.
1514-func_dirname_and_basename ()
1515-{
1516- case ${1} in
1517- */*) func_dirname_result="${1%/*}${2}" ;;
1518- * ) func_dirname_result="${3}" ;;
1519- esac
1520- func_basename_result="${1##*/}"
1521-}
1522-
1523-# func_stripname prefix suffix name
1524-# strip PREFIX and SUFFIX off of NAME.
1525-# PREFIX and SUFFIX must not contain globbing or regex special
1526-# characters, hashes, percent signs, but SUFFIX may contain a leading
1527-# dot (in which case that matches only a dot).
1528-func_stripname ()
1529-{
1530- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1531- # positional parameters, so assign one to ordinary parameter first.
1532- func_stripname_result=${3}
1533- func_stripname_result=${func_stripname_result#"${1}"}
1534- func_stripname_result=${func_stripname_result%"${2}"}
1535-}
1536-
1537-# func_opt_split
1538-func_opt_split ()
1539-{
1540- func_opt_split_opt=${1%%=*}
1541- func_opt_split_arg=${1#*=}
1542-}
1543-
1544-# func_lo2o object
1545-func_lo2o ()
1546-{
1547- case ${1} in
1548- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1549- *) func_lo2o_result=${1} ;;
1550- esac
1551-}
1552-
1553-# func_xform libobj-or-source
1554-func_xform ()
1555-{
1556- func_xform_result=${1%.*}.lo
1557-}
1558-
1559-# func_arith arithmetic-term...
1560-func_arith ()
1561-{
1562- func_arith_result=$(( $[*] ))
1563-}
1564-
1565-# func_len string
1566-# STRING may not start with a hyphen.
1567-func_len ()
1568-{
1569- func_len_result=${#1}
1570-}
1571-
1572-_LT_EOF
1573- ;;
1574- *) # Bourne compatible functions.
1575- cat << \_LT_EOF >> "$cfgfile"
1576-
1577-# func_dirname file append nondir_replacement
1578-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1579-# otherwise set result to NONDIR_REPLACEMENT.
1580-func_dirname ()
1581-{
1582- # Extract subdirectory from the argument.
1583- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1584- if test "X$func_dirname_result" = "X${1}"; then
1585- func_dirname_result="${3}"
1586- else
1587- func_dirname_result="$func_dirname_result${2}"
1588- fi
1589-}
1590-
1591-# func_basename file
1592-func_basename ()
1593-{
1594- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1595-}
1596+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
1597+# ------------------------------------------------------
1598+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
1599+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
1600+m4_defun([_LT_PROG_FUNCTION_REPLACE],
1601+[dnl {
1602+sed -e '/^$1 ()$/,/^} # $1 /c\
1603+$1 ()\
1604+{\
1605+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
1606+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
1607+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1608+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1609+test 0 -eq $? || _lt_function_replace_fail=:
1610+])
1611
1612-dnl func_dirname_and_basename
1613-dnl A portable version of this function is already defined in general.m4sh
1614-dnl so there is no need for it here.
1615
1616-# func_stripname prefix suffix name
1617-# strip PREFIX and SUFFIX off of NAME.
1618-# PREFIX and SUFFIX must not contain globbing or regex special
1619-# characters, hashes, percent signs, but SUFFIX may contain a leading
1620-# dot (in which case that matches only a dot).
1621-# func_strip_suffix prefix name
1622-func_stripname ()
1623-{
1624- case ${2} in
1625- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1626- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1627- esac
1628-}
1629+# _LT_PROG_REPLACE_SHELLFNS
1630+# -------------------------
1631+# Replace existing portable implementations of several shell functions with
1632+# equivalent extended shell implementations where those features are available..
1633+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
1634+[if test x"$xsi_shell" = xyes; then
1635+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
1636+ case ${1} in
1637+ */*) func_dirname_result="${1%/*}${2}" ;;
1638+ * ) func_dirname_result="${3}" ;;
1639+ esac])
1640+
1641+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
1642+ func_basename_result="${1##*/}"])
1643+
1644+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
1645+ case ${1} in
1646+ */*) func_dirname_result="${1%/*}${2}" ;;
1647+ * ) func_dirname_result="${3}" ;;
1648+ esac
1649+ func_basename_result="${1##*/}"])
1650
1651-# sed scripts:
1652-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
1653-my_sed_long_arg='1s/^-[[^=]]*=//'
1654+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
1655+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1656+ # positional parameters, so assign one to ordinary parameter first.
1657+ func_stripname_result=${3}
1658+ func_stripname_result=${func_stripname_result#"${1}"}
1659+ func_stripname_result=${func_stripname_result%"${2}"}])
1660+
1661+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
1662+ func_split_long_opt_name=${1%%=*}
1663+ func_split_long_opt_arg=${1#*=}])
1664+
1665+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
1666+ func_split_short_opt_arg=${1#??}
1667+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
1668+
1669+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
1670+ case ${1} in
1671+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1672+ *) func_lo2o_result=${1} ;;
1673+ esac])
1674
1675-# func_opt_split
1676-func_opt_split ()
1677-{
1678- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1679- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1680-}
1681+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
1682
1683-# func_lo2o object
1684-func_lo2o ()
1685-{
1686- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1687-}
1688+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
1689
1690-# func_xform libobj-or-source
1691-func_xform ()
1692-{
1693- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
1694-}
1695+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
1696+fi
1697
1698-# func_arith arithmetic-term...
1699-func_arith ()
1700-{
1701- func_arith_result=`expr "$[@]"`
1702-}
1703+if test x"$lt_shell_append" = xyes; then
1704+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
1705
1706-# func_len string
1707-# STRING may not start with a hyphen.
1708-func_len ()
1709-{
1710- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
1711-}
1712+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
1713+ func_quote_for_eval "${2}"
1714+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
1715+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
1716+
1717+ # Save a `func_append' function call where possible by direct use of '+='
1718+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1719+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1720+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1721+ test 0 -eq $? || _lt_function_replace_fail=:
1722+else
1723+ # Save a `func_append' function call even when '+=' is not available
1724+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1727+ test 0 -eq $? || _lt_function_replace_fail=:
1728+fi
1729
1730-_LT_EOF
1731-esac
1732+if test x"$_lt_function_replace_fail" = x":"; then
1733+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
1734+fi
1735+])
1736
1737-case $lt_shell_append in
1738- yes)
1739- cat << \_LT_EOF >> "$cfgfile"
1740-
1741-# func_append var value
1742-# Append VALUE to the end of shell variable VAR.
1743-func_append ()
1744-{
1745- eval "$[1]+=\$[2]"
1746-}
1747-_LT_EOF
1748+# _LT_PATH_CONVERSION_FUNCTIONS
1749+# -----------------------------
1750+# Determine which file name conversion functions should be used by
1751+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
1752+# for certain cross-compile configurations and native mingw.
1753+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
1754+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1755+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1756+AC_MSG_CHECKING([how to convert $build file names to $host format])
1757+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
1758+[case $host in
1759+ *-*-mingw* )
1760+ case $build in
1761+ *-*-mingw* ) # actually msys
1762+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
1763+ ;;
1764+ *-*-cygwin* )
1765+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
1766+ ;;
1767+ * ) # otherwise, assume *nix
1768+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
1769+ ;;
1770+ esac
1771 ;;
1772- *)
1773- cat << \_LT_EOF >> "$cfgfile"
1774-
1775-# func_append var value
1776-# Append VALUE to the end of shell variable VAR.
1777-func_append ()
1778-{
1779- eval "$[1]=\$$[1]\$[2]"
1780-}
1781-
1782-_LT_EOF
1783+ *-*-cygwin* )
1784+ case $build in
1785+ *-*-mingw* ) # actually msys
1786+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
1787+ ;;
1788+ *-*-cygwin* )
1789+ lt_cv_to_host_file_cmd=func_convert_file_noop
1790+ ;;
1791+ * ) # otherwise, assume *nix
1792+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
1793+ ;;
1794+ esac
1795 ;;
1796- esac
1797+ * ) # unhandled hosts (and "normal" native builds)
1798+ lt_cv_to_host_file_cmd=func_convert_file_noop
1799+ ;;
1800+esac
1801+])
1802+to_host_file_cmd=$lt_cv_to_host_file_cmd
1803+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
1804+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
1805+ [0], [convert $build file names to $host format])dnl
1806+
1807+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
1808+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
1809+[#assume ordinary cross tools, or native build.
1810+lt_cv_to_tool_file_cmd=func_convert_file_noop
1811+case $host in
1812+ *-*-mingw* )
1813+ case $build in
1814+ *-*-mingw* ) # actually msys
1815+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
1816+ ;;
1817+ esac
1818+ ;;
1819+esac
1820 ])
1821+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1822+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
1823+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
1824+ [0], [convert $build files to toolchain format])dnl
1825+])# _LT_PATH_CONVERSION_FUNCTIONS
1826Index: binutils-2.21.1/ltmain.sh
1827===================================================================
1828--- binutils-2.21.1.orig/ltmain.sh
1829+++ binutils-2.21.1/ltmain.sh
1830@@ -1,10 +1,9 @@
1831-# Generated from ltmain.m4sh.
1832
1833-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
1834+# libtool (GNU libtool) 2.4
1835 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1836
1837 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
1838-# 2007, 2008, 2009 Free Software Foundation, Inc.
1839+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
1840 # This is free software; see the source for copying conditions. There is NO
1841 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1842
1843@@ -38,7 +37,6 @@
1844 # -n, --dry-run display commands without modifying any files
1845 # --features display basic configuration information and exit
1846 # --mode=MODE use operation mode MODE
1847-# --no-finish let install mode avoid finish commands
1848 # --preserve-dup-deps don't remove duplicate dependency libraries
1849 # --quiet, --silent don't print informational messages
1850 # --no-quiet, --no-silent
1851@@ -71,17 +69,19 @@
1852 # compiler: $LTCC
1853 # compiler flags: $LTCFLAGS
1854 # linker: $LD (gnu? $with_gnu_ld)
1855-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
1856+# $progname: (GNU libtool) 2.4
1857 # automake: $automake_version
1858 # autoconf: $autoconf_version
1859 #
1860 # Report bugs to <bug-libtool@gnu.org>.
1861+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
1862+# General help using GNU software: <http://www.gnu.org/gethelp/>.
1863
1864 PROGRAM=libtool
1865 PACKAGE=libtool
1866-VERSION=2.2.7a
1867-TIMESTAMP=" 1.3134 2009-11-29"
1868-package_revision=1.3134
1869+VERSION=2.4
1870+TIMESTAMP=""
1871+package_revision=1.3293
1872
1873 # Be Bourne compatible
1874 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1875@@ -106,9 +106,6 @@ _LTECHO_EOF'
1876 }
1877
1878 # NLS nuisances: We save the old values to restore during execute mode.
1879-# Only set LANG and LC_ALL to C if already set.
1880-# These must not be set unconditionally because not all systems understand
1881-# e.g. LANG=C (notably SCO).
1882 lt_user_locale=
1883 lt_safe_locale=
1884 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
1885@@ -121,15 +118,13 @@ do
1886 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
1887 fi"
1888 done
1889+LC_ALL=C
1890+LANGUAGE=C
1891+export LANGUAGE LC_ALL
1892
1893 $lt_unset CDPATH
1894
1895
1896-
1897-
1898-
1899-
1900-
1901 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
1902 # is ksh but when the shell is invoked as "sh" and the current value of
1903 # the _XPG environment variable is not equal to 1 (one), the special
1904@@ -140,7 +135,7 @@ progpath="$0"
1905
1906
1907 : ${CP="cp -f"}
1908-: ${ECHO=$as_echo}
1909+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
1910 : ${EGREP="/bin/grep -E"}
1911 : ${FGREP="/bin/grep -F"}
1912 : ${GREP="/bin/grep"}
1913@@ -149,7 +144,7 @@ progpath="$0"
1914 : ${MKDIR="mkdir"}
1915 : ${MV="mv -f"}
1916 : ${RM="rm -f"}
1917-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
1918+: ${SED="/bin/sed"}
1919 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
1920 : ${Xsed="$SED -e 1s/^X//"}
1921
1922@@ -169,6 +164,27 @@ IFS=" $lt_nl"
1923 dirname="s,/[^/]*$,,"
1924 basename="s,^.*/,,"
1925
1926+# func_dirname file append nondir_replacement
1927+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1928+# otherwise set result to NONDIR_REPLACEMENT.
1929+func_dirname ()
1930+{
1931+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1932+ if test "X$func_dirname_result" = "X${1}"; then
1933+ func_dirname_result="${3}"
1934+ else
1935+ func_dirname_result="$func_dirname_result${2}"
1936+ fi
1937+} # func_dirname may be replaced by extended shell implementation
1938+
1939+
1940+# func_basename file
1941+func_basename ()
1942+{
1943+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1944+} # func_basename may be replaced by extended shell implementation
1945+
1946+
1947 # func_dirname_and_basename file append nondir_replacement
1948 # perform func_basename and func_dirname in a single function
1949 # call:
1950@@ -183,17 +199,31 @@ basename="s,^.*/,,"
1951 # those functions but instead duplicate the functionality here.
1952 func_dirname_and_basename ()
1953 {
1954- # Extract subdirectory from the argument.
1955- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1956- if test "X$func_dirname_result" = "X${1}"; then
1957- func_dirname_result="${3}"
1958- else
1959- func_dirname_result="$func_dirname_result${2}"
1960- fi
1961- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1962-}
1963+ # Extract subdirectory from the argument.
1964+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1965+ if test "X$func_dirname_result" = "X${1}"; then
1966+ func_dirname_result="${3}"
1967+ else
1968+ func_dirname_result="$func_dirname_result${2}"
1969+ fi
1970+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1971+} # func_dirname_and_basename may be replaced by extended shell implementation
1972+
1973+
1974+# func_stripname prefix suffix name
1975+# strip PREFIX and SUFFIX off of NAME.
1976+# PREFIX and SUFFIX must not contain globbing or regex special
1977+# characters, hashes, percent signs, but SUFFIX may contain a leading
1978+# dot (in which case that matches only a dot).
1979+# func_strip_suffix prefix name
1980+func_stripname ()
1981+{
1982+ case ${2} in
1983+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1984+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1985+ esac
1986+} # func_stripname may be replaced by extended shell implementation
1987
1988-# Generated shell functions inserted here.
1989
1990 # These SED scripts presuppose an absolute path with a trailing slash.
1991 pathcar='s,^/\([^/]*\).*$,\1,'
1992@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
1993 # Same as above, but do not quote variable references.
1994 double_quote_subst='s/\(["`\\]\)/\\\1/g'
1995
1996+# Sed substitution that turns a string into a regex matching for the
1997+# string literally.
1998+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
1999+
2000+# Sed substitution that converts a w32 file name or path
2001+# which contains forward slashes, into one that contains
2002+# (escaped) backslashes. A very naive implementation.
2003+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2004+
2005 # Re-`\' parameter expansions in output of double_quote_subst that were
2006 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
2007 # in input to double_quote_subst, that '$' was protected from expansion.
2008@@ -404,7 +443,7 @@ opt_warning=:
2009 # name if it has been set yet.
2010 func_echo ()
2011 {
2012- $ECHO "$progname${mode+: }$mode: $*"
2013+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
2014 }
2015
2016 # func_verbose arg...
2017@@ -430,14 +469,14 @@ func_echo_all ()
2018 # Echo program name prefixed message to standard error.
2019 func_error ()
2020 {
2021- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
2022+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
2023 }
2024
2025 # func_warning arg...
2026 # Echo program name prefixed warning message to standard error.
2027 func_warning ()
2028 {
2029- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
2030+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
2031
2032 # bash bug again:
2033 :
2034@@ -656,19 +695,35 @@ func_show_eval_locale ()
2035 fi
2036 }
2037
2038-
2039-
2040+# func_tr_sh
2041+# Turn $1 into a string suitable for a shell variable name.
2042+# Result is stored in $func_tr_sh_result. All characters
2043+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
2044+# if $1 begins with a digit, a '_' is prepended as well.
2045+func_tr_sh ()
2046+{
2047+ case $1 in
2048+ [0-9]* | *[!a-zA-Z0-9_]*)
2049+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
2050+ ;;
2051+ * )
2052+ func_tr_sh_result=$1
2053+ ;;
2054+ esac
2055+}
2056
2057
2058 # func_version
2059 # Echo version message to standard output and exit.
2060 func_version ()
2061 {
2062+ $opt_debug
2063+
2064 $SED -n '/(C)/!b go
2065 :more
2066 /\./!{
2067 N
2068- s/\n# //
2069+ s/\n# / /
2070 b more
2071 }
2072 :go
2073@@ -685,7 +740,9 @@ func_version ()
2074 # Echo short help message to standard output and exit.
2075 func_usage ()
2076 {
2077- $SED -n '/^# Usage:/,/^# *-h/ {
2078+ $opt_debug
2079+
2080+ $SED -n '/^# Usage:/,/^# *.*--help/ {
2081 s/^# //
2082 s/^# *$//
2083 s/\$progname/'$progname'/
2084@@ -701,7 +758,10 @@ func_usage ()
2085 # unless 'noexit' is passed as argument.
2086 func_help ()
2087 {
2088+ $opt_debug
2089+
2090 $SED -n '/^# Usage:/,/# Report bugs to/ {
2091+ :print
2092 s/^# //
2093 s/^# *$//
2094 s*\$progname*'$progname'*
2095@@ -714,7 +774,11 @@ func_help ()
2096 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
2097 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
2098 p
2099- }' < "$progpath"
2100+ d
2101+ }
2102+ /^# .* home page:/b print
2103+ /^# General help using/b print
2104+ ' < "$progpath"
2105 ret=$?
2106 if test -z "$1"; then
2107 exit $ret
2108@@ -726,12 +790,39 @@ func_help ()
2109 # exit_cmd.
2110 func_missing_arg ()
2111 {
2112- func_error "missing argument for $1"
2113+ $opt_debug
2114+
2115+ func_error "missing argument for $1."
2116 exit_cmd=exit
2117 }
2118
2119-exit_cmd=:
2120
2121+# func_split_short_opt shortopt
2122+# Set func_split_short_opt_name and func_split_short_opt_arg shell
2123+# variables after splitting SHORTOPT after the 2nd character.
2124+func_split_short_opt ()
2125+{
2126+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
2127+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
2128+
2129+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
2130+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
2131+} # func_split_short_opt may be replaced by extended shell implementation
2132+
2133+
2134+# func_split_long_opt longopt
2135+# Set func_split_long_opt_name and func_split_long_opt_arg shell
2136+# variables after splitting LONGOPT at the `=' sign.
2137+func_split_long_opt ()
2138+{
2139+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
2140+ my_sed_long_arg='1s/^--[^=]*=//'
2141+
2142+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
2143+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
2144+} # func_split_long_opt may be replaced by extended shell implementation
2145+
2146+exit_cmd=:
2147
2148
2149
2150@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
2151 magic_exe="%%%MAGIC EXE variable%%%"
2152
2153 # Global variables.
2154-# $mode is unset
2155 nonopt=
2156-execute_dlfiles=
2157 preserve_args=
2158 lo2o="s/\\.lo\$/.${objext}/"
2159 o2lo="s/\\.${objext}\$/.lo/"
2160 extracted_archives=
2161 extracted_serial=0
2162
2163-opt_dry_run=false
2164-opt_finish=:
2165-opt_duplicate_deps=false
2166-opt_silent=false
2167-opt_debug=:
2168-
2169 # If this variable is set in any of the actions, the command in it
2170 # will be execed at the end. This prevents here-documents from being
2171 # left over by shells.
2172 exec_cmd=
2173
2174+# func_append var value
2175+# Append VALUE to the end of shell variable VAR.
2176+func_append ()
2177+{
2178+ eval "${1}=\$${1}\${2}"
2179+} # func_append may be replaced by extended shell implementation
2180+
2181+# func_append_quoted var value
2182+# Quote VALUE and append to the end of shell variable VAR, separated
2183+# by a space.
2184+func_append_quoted ()
2185+{
2186+ func_quote_for_eval "${2}"
2187+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
2188+} # func_append_quoted may be replaced by extended shell implementation
2189+
2190+
2191+# func_arith arithmetic-term...
2192+func_arith ()
2193+{
2194+ func_arith_result=`expr "${@}"`
2195+} # func_arith may be replaced by extended shell implementation
2196+
2197+
2198+# func_len string
2199+# STRING may not start with a hyphen.
2200+func_len ()
2201+{
2202+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
2203+} # func_len may be replaced by extended shell implementation
2204+
2205+
2206+# func_lo2o object
2207+func_lo2o ()
2208+{
2209+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2210+} # func_lo2o may be replaced by extended shell implementation
2211+
2212+
2213+# func_xform libobj-or-source
2214+func_xform ()
2215+{
2216+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
2217+} # func_xform may be replaced by extended shell implementation
2218+
2219+
2220 # func_fatal_configuration arg...
2221 # Echo program name prefixed message to standard error, followed by
2222 # a configuration failure hint, and exit.
2223@@ -850,130 +979,204 @@ func_enable_tag ()
2224 esac
2225 }
2226
2227-# Parse options once, thoroughly. This comes as soon as possible in
2228-# the script to make things like `libtool --version' happen quickly.
2229+# func_check_version_match
2230+# Ensure that we are using m4 macros, and libtool script from the same
2231+# release of libtool.
2232+func_check_version_match ()
2233 {
2234+ if test "$package_revision" != "$macro_revision"; then
2235+ if test "$VERSION" != "$macro_version"; then
2236+ if test -z "$macro_version"; then
2237+ cat >&2 <<_LT_EOF
2238+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2239+$progname: definition of this LT_INIT comes from an older release.
2240+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2241+$progname: and run autoconf again.
2242+_LT_EOF
2243+ else
2244+ cat >&2 <<_LT_EOF
2245+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2246+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2247+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2248+$progname: and run autoconf again.
2249+_LT_EOF
2250+ fi
2251+ else
2252+ cat >&2 <<_LT_EOF
2253+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2254+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2255+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2256+$progname: of $PACKAGE $VERSION and run autoconf again.
2257+_LT_EOF
2258+ fi
2259+
2260+ exit $EXIT_MISMATCH
2261+ fi
2262+}
2263+
2264+
2265+# Shorthand for --mode=foo, only valid as the first argument
2266+case $1 in
2267+clean|clea|cle|cl)
2268+ shift; set dummy --mode clean ${1+"$@"}; shift
2269+ ;;
2270+compile|compil|compi|comp|com|co|c)
2271+ shift; set dummy --mode compile ${1+"$@"}; shift
2272+ ;;
2273+execute|execut|execu|exec|exe|ex|e)
2274+ shift; set dummy --mode execute ${1+"$@"}; shift
2275+ ;;
2276+finish|finis|fini|fin|fi|f)
2277+ shift; set dummy --mode finish ${1+"$@"}; shift
2278+ ;;
2279+install|instal|insta|inst|ins|in|i)
2280+ shift; set dummy --mode install ${1+"$@"}; shift
2281+ ;;
2282+link|lin|li|l)
2283+ shift; set dummy --mode link ${1+"$@"}; shift
2284+ ;;
2285+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2286+ shift; set dummy --mode uninstall ${1+"$@"}; shift
2287+ ;;
2288+esac
2289
2290- # Shorthand for --mode=foo, only valid as the first argument
2291- case $1 in
2292- clean|clea|cle|cl)
2293- shift; set dummy --mode clean ${1+"$@"}; shift
2294- ;;
2295- compile|compil|compi|comp|com|co|c)
2296- shift; set dummy --mode compile ${1+"$@"}; shift
2297- ;;
2298- execute|execut|execu|exec|exe|ex|e)
2299- shift; set dummy --mode execute ${1+"$@"}; shift
2300- ;;
2301- finish|finis|fini|fin|fi|f)
2302- shift; set dummy --mode finish ${1+"$@"}; shift
2303- ;;
2304- install|instal|insta|inst|ins|in|i)
2305- shift; set dummy --mode install ${1+"$@"}; shift
2306- ;;
2307- link|lin|li|l)
2308- shift; set dummy --mode link ${1+"$@"}; shift
2309- ;;
2310- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2311- shift; set dummy --mode uninstall ${1+"$@"}; shift
2312- ;;
2313- esac
2314
2315- # Parse non-mode specific arguments:
2316- while test "$#" -gt 0; do
2317+
2318+# Option defaults:
2319+opt_debug=:
2320+opt_dry_run=false
2321+opt_config=false
2322+opt_preserve_dup_deps=false
2323+opt_features=false
2324+opt_finish=false
2325+opt_help=false
2326+opt_help_all=false
2327+opt_silent=:
2328+opt_verbose=:
2329+opt_silent=false
2330+opt_verbose=false
2331+
2332+
2333+# Parse options once, thoroughly. This comes as soon as possible in the
2334+# script to make things like `--version' happen as quickly as we can.
2335+{
2336+ # this just eases exit handling
2337+ while test $# -gt 0; do
2338 opt="$1"
2339 shift
2340-
2341 case $opt in
2342- --config) func_config ;;
2343-
2344- --debug) preserve_args="$preserve_args $opt"
2345+ --debug|-x) opt_debug='set -x'
2346 func_echo "enabling shell trace mode"
2347- opt_debug='set -x'
2348 $opt_debug
2349 ;;
2350-
2351- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
2352- execute_dlfiles="$execute_dlfiles $1"
2353- shift
2354+ --dry-run|--dryrun|-n)
2355+ opt_dry_run=:
2356 ;;
2357-
2358- --dry-run | -n) opt_dry_run=: ;;
2359- --features) func_features ;;
2360- --finish) mode="finish" ;;
2361- --no-finish) opt_finish=false ;;
2362-
2363- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
2364- case $1 in
2365- # Valid mode arguments:
2366- clean) ;;
2367- compile) ;;
2368- execute) ;;
2369- finish) ;;
2370- install) ;;
2371- link) ;;
2372- relink) ;;
2373- uninstall) ;;
2374-
2375- # Catch anything else as an error
2376- *) func_error "invalid argument for $opt"
2377- exit_cmd=exit
2378- break
2379- ;;
2380- esac
2381-
2382- mode="$1"
2383+ --config)
2384+ opt_config=:
2385+func_config
2386+ ;;
2387+ --dlopen|-dlopen)
2388+ optarg="$1"
2389+ opt_dlopen="${opt_dlopen+$opt_dlopen
2390+}$optarg"
2391 shift
2392 ;;
2393-
2394 --preserve-dup-deps)
2395- opt_duplicate_deps=: ;;
2396-
2397- --quiet|--silent) preserve_args="$preserve_args $opt"
2398- opt_silent=:
2399- opt_verbose=false
2400+ opt_preserve_dup_deps=:
2401 ;;
2402-
2403- --no-quiet|--no-silent)
2404- preserve_args="$preserve_args $opt"
2405- opt_silent=false
2406+ --features)
2407+ opt_features=:
2408+func_features
2409 ;;
2410-
2411- --verbose| -v) preserve_args="$preserve_args $opt"
2412+ --finish)
2413+ opt_finish=:
2414+set dummy --mode finish ${1+"$@"}; shift
2415+ ;;
2416+ --help)
2417+ opt_help=:
2418+ ;;
2419+ --help-all)
2420+ opt_help_all=:
2421+opt_help=': help-all'
2422+ ;;
2423+ --mode)
2424+ test $# = 0 && func_missing_arg $opt && break
2425+ optarg="$1"
2426+ opt_mode="$optarg"
2427+case $optarg in
2428+ # Valid mode arguments:
2429+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
2430+
2431+ # Catch anything else as an error
2432+ *) func_error "invalid argument for $opt"
2433+ exit_cmd=exit
2434+ break
2435+ ;;
2436+esac
2437+ shift
2438+ ;;
2439+ --no-silent|--no-quiet)
2440 opt_silent=false
2441- opt_verbose=:
2442+func_append preserve_args " $opt"
2443 ;;
2444-
2445- --no-verbose) preserve_args="$preserve_args $opt"
2446+ --no-verbose)
2447 opt_verbose=false
2448+func_append preserve_args " $opt"
2449 ;;
2450-
2451- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
2452- preserve_args="$preserve_args $opt $1"
2453- func_enable_tag "$1" # tagname is set here
2454+ --silent|--quiet)
2455+ opt_silent=:
2456+func_append preserve_args " $opt"
2457+ opt_verbose=false
2458+ ;;
2459+ --verbose|-v)
2460+ opt_verbose=:
2461+func_append preserve_args " $opt"
2462+opt_silent=false
2463+ ;;
2464+ --tag)
2465+ test $# = 0 && func_missing_arg $opt && break
2466+ optarg="$1"
2467+ opt_tag="$optarg"
2468+func_append preserve_args " $opt $optarg"
2469+func_enable_tag "$optarg"
2470 shift
2471 ;;
2472
2473+ -\?|-h) func_usage ;;
2474+ --help) func_help ;;
2475+ --version) func_version ;;
2476+
2477 # Separate optargs to long options:
2478- -dlopen=*|--mode=*|--tag=*)
2479- func_opt_split "$opt"
2480- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
2481+ --*=*)
2482+ func_split_long_opt "$opt"
2483+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
2484 shift
2485 ;;
2486
2487- -\?|-h) func_usage ;;
2488- --help) opt_help=: ;;
2489- --help-all) opt_help=': help-all' ;;
2490- --version) func_version ;;
2491-
2492- -*) func_fatal_help "unrecognized option \`$opt'" ;;
2493-
2494- *) nonopt="$opt"
2495- break
2496+ # Separate non-argument short options:
2497+ -\?*|-h*|-n*|-v*)
2498+ func_split_short_opt "$opt"
2499+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
2500+ shift
2501 ;;
2502+
2503+ --) break ;;
2504+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
2505+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
2506 esac
2507 done
2508
2509+ # Validate options:
2510+
2511+ # save first non-option argument
2512+ if test "$#" -gt 0; then
2513+ nonopt="$opt"
2514+ shift
2515+ fi
2516+
2517+ # preserve --debug
2518+ test "$opt_debug" = : || func_append preserve_args " --debug"
2519
2520 case $host in
2521 *cygwin* | *mingw* | *pw32* | *cegcc*)
2522@@ -981,82 +1184,44 @@ func_enable_tag ()
2523 opt_duplicate_compiler_generated_deps=:
2524 ;;
2525 *)
2526- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
2527+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
2528 ;;
2529 esac
2530
2531- # Having warned about all mis-specified options, bail out if
2532- # anything was wrong.
2533- $exit_cmd $EXIT_FAILURE
2534-}
2535+ $opt_help || {
2536+ # Sanity checks first:
2537+ func_check_version_match
2538
2539-# func_check_version_match
2540-# Ensure that we are using m4 macros, and libtool script from the same
2541-# release of libtool.
2542-func_check_version_match ()
2543-{
2544- if test "$package_revision" != "$macro_revision"; then
2545- if test "$VERSION" != "$macro_version"; then
2546- if test -z "$macro_version"; then
2547- cat >&2 <<_LT_EOF
2548-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2549-$progname: definition of this LT_INIT comes from an older release.
2550-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2551-$progname: and run autoconf again.
2552-_LT_EOF
2553- else
2554- cat >&2 <<_LT_EOF
2555-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2556-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2557-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2558-$progname: and run autoconf again.
2559-_LT_EOF
2560- fi
2561- else
2562- cat >&2 <<_LT_EOF
2563-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2564-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2565-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2566-$progname: of $PACKAGE $VERSION and run autoconf again.
2567-_LT_EOF
2568+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2569+ func_fatal_configuration "not configured to build any kind of library"
2570 fi
2571
2572- exit $EXIT_MISMATCH
2573- fi
2574-}
2575-
2576+ # Darwin sucks
2577+ eval std_shrext=\"$shrext_cmds\"
2578
2579-## ----------- ##
2580-## Main. ##
2581-## ----------- ##
2582-
2583-$opt_help || {
2584- # Sanity checks first:
2585- func_check_version_match
2586-
2587- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2588- func_fatal_configuration "not configured to build any kind of library"
2589- fi
2590+ # Only execute mode is allowed to have -dlopen flags.
2591+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
2592+ func_error "unrecognized option \`-dlopen'"
2593+ $ECHO "$help" 1>&2
2594+ exit $EXIT_FAILURE
2595+ fi
2596
2597- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
2598+ # Change the help message to a mode-specific one.
2599+ generic_help="$help"
2600+ help="Try \`$progname --help --mode=$opt_mode' for more information."
2601+ }
2602
2603
2604- # Darwin sucks
2605- eval "std_shrext=\"$shrext_cmds\""
2606+ # Bail if the options were screwed
2607+ $exit_cmd $EXIT_FAILURE
2608+}
2609
2610
2611- # Only execute mode is allowed to have -dlopen flags.
2612- if test -n "$execute_dlfiles" && test "$mode" != execute; then
2613- func_error "unrecognized option \`-dlopen'"
2614- $ECHO "$help" 1>&2
2615- exit $EXIT_FAILURE
2616- fi
2617
2618- # Change the help message to a mode-specific one.
2619- generic_help="$help"
2620- help="Try \`$progname --help --mode=$mode' for more information."
2621-}
2622
2623+## ----------- ##
2624+## Main. ##
2625+## ----------- ##
2626
2627 # func_lalib_p file
2628 # True iff FILE is a libtool `.la' library or `.lo' object file.
2629@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
2630 # temporary ltwrapper_script.
2631 func_ltwrapper_scriptname ()
2632 {
2633- func_ltwrapper_scriptname_result=""
2634- if func_ltwrapper_executable_p "$1"; then
2635- func_dirname_and_basename "$1" "" "."
2636- func_stripname '' '.exe' "$func_basename_result"
2637- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2638- fi
2639+ func_dirname_and_basename "$1" "" "."
2640+ func_stripname '' '.exe' "$func_basename_result"
2641+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2642 }
2643
2644 # func_ltwrapper_p file
2645@@ -1149,7 +1311,7 @@ func_execute_cmds ()
2646 save_ifs=$IFS; IFS='~'
2647 for cmd in $1; do
2648 IFS=$save_ifs
2649- eval "cmd=\"$cmd\""
2650+ eval cmd=\"$cmd\"
2651 func_show_eval "$cmd" "${2-:}"
2652 done
2653 IFS=$save_ifs
2654@@ -1172,6 +1334,37 @@ func_source ()
2655 }
2656
2657
2658+# func_resolve_sysroot PATH
2659+# Replace a leading = in PATH with a sysroot. Store the result into
2660+# func_resolve_sysroot_result
2661+func_resolve_sysroot ()
2662+{
2663+ func_resolve_sysroot_result=$1
2664+ case $func_resolve_sysroot_result in
2665+ =*)
2666+ func_stripname '=' '' "$func_resolve_sysroot_result"
2667+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
2668+ ;;
2669+ esac
2670+}
2671+
2672+# func_replace_sysroot PATH
2673+# If PATH begins with the sysroot, replace it with = and
2674+# store the result into func_replace_sysroot_result.
2675+func_replace_sysroot ()
2676+{
2677+ case "$lt_sysroot:$1" in
2678+ ?*:"$lt_sysroot"*)
2679+ func_stripname "$lt_sysroot" '' "$1"
2680+ func_replace_sysroot_result="=$func_stripname_result"
2681+ ;;
2682+ *)
2683+ # Including no sysroot.
2684+ func_replace_sysroot_result=$1
2685+ ;;
2686+ esac
2687+}
2688+
2689 # func_infer_tag arg
2690 # Infer tagged configuration to use if any are available and
2691 # if one wasn't chosen via the "--tag" command line option.
2692@@ -1184,8 +1377,7 @@ func_infer_tag ()
2693 if test -n "$available_tags" && test -z "$tagname"; then
2694 CC_quoted=
2695 for arg in $CC; do
2696- func_quote_for_eval "$arg"
2697- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2698+ func_append_quoted CC_quoted "$arg"
2699 done
2700 CC_expanded=`func_echo_all $CC`
2701 CC_quoted_expanded=`func_echo_all $CC_quoted`
2702@@ -1204,8 +1396,7 @@ func_infer_tag ()
2703 CC_quoted=
2704 for arg in $CC; do
2705 # Double-quote args containing other shell metacharacters.
2706- func_quote_for_eval "$arg"
2707- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2708+ func_append_quoted CC_quoted "$arg"
2709 done
2710 CC_expanded=`func_echo_all $CC`
2711 CC_quoted_expanded=`func_echo_all $CC_quoted`
2712@@ -1274,6 +1465,486 @@ EOF
2713 }
2714 }
2715
2716+
2717+##################################################
2718+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
2719+##################################################
2720+
2721+# func_convert_core_file_wine_to_w32 ARG
2722+# Helper function used by file name conversion functions when $build is *nix,
2723+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
2724+# correctly configured wine environment available, with the winepath program
2725+# in $build's $PATH.
2726+#
2727+# ARG is the $build file name to be converted to w32 format.
2728+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
2729+# be empty on error (or when ARG is empty)
2730+func_convert_core_file_wine_to_w32 ()
2731+{
2732+ $opt_debug
2733+ func_convert_core_file_wine_to_w32_result="$1"
2734+ if test -n "$1"; then
2735+ # Unfortunately, winepath does not exit with a non-zero error code, so we
2736+ # are forced to check the contents of stdout. On the other hand, if the
2737+ # command is not found, the shell will set an exit code of 127 and print
2738+ # *an error message* to stdout. So we must check for both error code of
2739+ # zero AND non-empty stdout, which explains the odd construction:
2740+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
2741+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
2742+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
2743+ $SED -e "$lt_sed_naive_backslashify"`
2744+ else
2745+ func_convert_core_file_wine_to_w32_result=
2746+ fi
2747+ fi
2748+}
2749+# end: func_convert_core_file_wine_to_w32
2750+
2751+
2752+# func_convert_core_path_wine_to_w32 ARG
2753+# Helper function used by path conversion functions when $build is *nix, and
2754+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
2755+# configured wine environment available, with the winepath program in $build's
2756+# $PATH. Assumes ARG has no leading or trailing path separator characters.
2757+#
2758+# ARG is path to be converted from $build format to win32.
2759+# Result is available in $func_convert_core_path_wine_to_w32_result.
2760+# Unconvertible file (directory) names in ARG are skipped; if no directory names
2761+# are convertible, then the result may be empty.
2762+func_convert_core_path_wine_to_w32 ()
2763+{
2764+ $opt_debug
2765+ # unfortunately, winepath doesn't convert paths, only file names
2766+ func_convert_core_path_wine_to_w32_result=""
2767+ if test -n "$1"; then
2768+ oldIFS=$IFS
2769+ IFS=:
2770+ for func_convert_core_path_wine_to_w32_f in $1; do
2771+ IFS=$oldIFS
2772+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
2773+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
2774+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
2775+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
2776+ else
2777+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
2778+ fi
2779+ fi
2780+ done
2781+ IFS=$oldIFS
2782+ fi
2783+}
2784+# end: func_convert_core_path_wine_to_w32
2785+
2786+
2787+# func_cygpath ARGS...
2788+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
2789+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
2790+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
2791+# (2), returns the Cygwin file name or path in func_cygpath_result (input
2792+# file name or path is assumed to be in w32 format, as previously converted
2793+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
2794+# or path in func_cygpath_result (input file name or path is assumed to be in
2795+# Cygwin format). Returns an empty string on error.
2796+#
2797+# ARGS are passed to cygpath, with the last one being the file name or path to
2798+# be converted.
2799+#
2800+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
2801+# environment variable; do not put it in $PATH.
2802+func_cygpath ()
2803+{
2804+ $opt_debug
2805+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
2806+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
2807+ if test "$?" -ne 0; then
2808+ # on failure, ensure result is empty
2809+ func_cygpath_result=
2810+ fi
2811+ else
2812+ func_cygpath_result=
2813+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
2814+ fi
2815+}
2816+#end: func_cygpath
2817+
2818+
2819+# func_convert_core_msys_to_w32 ARG
2820+# Convert file name or path ARG from MSYS format to w32 format. Return
2821+# result in func_convert_core_msys_to_w32_result.
2822+func_convert_core_msys_to_w32 ()
2823+{
2824+ $opt_debug
2825+ # awkward: cmd appends spaces to result
2826+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
2827+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2828+}
2829+#end: func_convert_core_msys_to_w32
2830+
2831+
2832+# func_convert_file_check ARG1 ARG2
2833+# Verify that ARG1 (a file name in $build format) was converted to $host
2834+# format in ARG2. Otherwise, emit an error message, but continue (resetting
2835+# func_to_host_file_result to ARG1).
2836+func_convert_file_check ()
2837+{
2838+ $opt_debug
2839+ if test -z "$2" && test -n "$1" ; then
2840+ func_error "Could not determine host file name corresponding to"
2841+ func_error " \`$1'"
2842+ func_error "Continuing, but uninstalled executables may not work."
2843+ # Fallback:
2844+ func_to_host_file_result="$1"
2845+ fi
2846+}
2847+# end func_convert_file_check
2848+
2849+
2850+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
2851+# Verify that FROM_PATH (a path in $build format) was converted to $host
2852+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
2853+# func_to_host_file_result to a simplistic fallback value (see below).
2854+func_convert_path_check ()
2855+{
2856+ $opt_debug
2857+ if test -z "$4" && test -n "$3"; then
2858+ func_error "Could not determine the host path corresponding to"
2859+ func_error " \`$3'"
2860+ func_error "Continuing, but uninstalled executables may not work."
2861+ # Fallback. This is a deliberately simplistic "conversion" and
2862+ # should not be "improved". See libtool.info.
2863+ if test "x$1" != "x$2"; then
2864+ lt_replace_pathsep_chars="s|$1|$2|g"
2865+ func_to_host_path_result=`echo "$3" |
2866+ $SED -e "$lt_replace_pathsep_chars"`
2867+ else
2868+ func_to_host_path_result="$3"
2869+ fi
2870+ fi
2871+}
2872+# end func_convert_path_check
2873+
2874+
2875+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
2876+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
2877+# and appending REPL if ORIG matches BACKPAT.
2878+func_convert_path_front_back_pathsep ()
2879+{
2880+ $opt_debug
2881+ case $4 in
2882+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
2883+ ;;
2884+ esac
2885+ case $4 in
2886+ $2 ) func_append func_to_host_path_result "$3"
2887+ ;;
2888+ esac
2889+}
2890+# end func_convert_path_front_back_pathsep
2891+
2892+
2893+##################################################
2894+# $build to $host FILE NAME CONVERSION FUNCTIONS #
2895+##################################################
2896+# invoked via `$to_host_file_cmd ARG'
2897+#
2898+# In each case, ARG is the path to be converted from $build to $host format.
2899+# Result will be available in $func_to_host_file_result.
2900+
2901+
2902+# func_to_host_file ARG
2903+# Converts the file name ARG from $build format to $host format. Return result
2904+# in func_to_host_file_result.
2905+func_to_host_file ()
2906+{
2907+ $opt_debug
2908+ $to_host_file_cmd "$1"
2909+}
2910+# end func_to_host_file
2911+
2912+
2913+# func_to_tool_file ARG LAZY
2914+# converts the file name ARG from $build format to toolchain format. Return
2915+# result in func_to_tool_file_result. If the conversion in use is listed
2916+# in (the comma separated) LAZY, no conversion takes place.
2917+func_to_tool_file ()
2918+{
2919+ $opt_debug
2920+ case ,$2, in
2921+ *,"$to_tool_file_cmd",*)
2922+ func_to_tool_file_result=$1
2923+ ;;
2924+ *)
2925+ $to_tool_file_cmd "$1"
2926+ func_to_tool_file_result=$func_to_host_file_result
2927+ ;;
2928+ esac
2929+}
2930+# end func_to_tool_file
2931+
2932+
2933+# func_convert_file_noop ARG
2934+# Copy ARG to func_to_host_file_result.
2935+func_convert_file_noop ()
2936+{
2937+ func_to_host_file_result="$1"
2938+}
2939+# end func_convert_file_noop
2940+
2941+
2942+# func_convert_file_msys_to_w32 ARG
2943+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
2944+# conversion to w32 is not available inside the cwrapper. Returns result in
2945+# func_to_host_file_result.
2946+func_convert_file_msys_to_w32 ()
2947+{
2948+ $opt_debug
2949+ func_to_host_file_result="$1"
2950+ if test -n "$1"; then
2951+ func_convert_core_msys_to_w32 "$1"
2952+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
2953+ fi
2954+ func_convert_file_check "$1" "$func_to_host_file_result"
2955+}
2956+# end func_convert_file_msys_to_w32
2957+
2958+
2959+# func_convert_file_cygwin_to_w32 ARG
2960+# Convert file name ARG from Cygwin to w32 format. Returns result in
2961+# func_to_host_file_result.
2962+func_convert_file_cygwin_to_w32 ()
2963+{
2964+ $opt_debug
2965+ func_to_host_file_result="$1"
2966+ if test -n "$1"; then
2967+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
2968+ # LT_CYGPATH in this case.
2969+ func_to_host_file_result=`cygpath -m "$1"`
2970+ fi
2971+ func_convert_file_check "$1" "$func_to_host_file_result"
2972+}
2973+# end func_convert_file_cygwin_to_w32
2974+
2975+
2976+# func_convert_file_nix_to_w32 ARG
2977+# Convert file name ARG from *nix to w32 format. Requires a wine environment
2978+# and a working winepath. Returns result in func_to_host_file_result.
2979+func_convert_file_nix_to_w32 ()
2980+{
2981+ $opt_debug
2982+ func_to_host_file_result="$1"
2983+ if test -n "$1"; then
2984+ func_convert_core_file_wine_to_w32 "$1"
2985+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
2986+ fi
2987+ func_convert_file_check "$1" "$func_to_host_file_result"
2988+}
2989+# end func_convert_file_nix_to_w32
2990+
2991+
2992+# func_convert_file_msys_to_cygwin ARG
2993+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
2994+# Returns result in func_to_host_file_result.
2995+func_convert_file_msys_to_cygwin ()
2996+{
2997+ $opt_debug
2998+ func_to_host_file_result="$1"
2999+ if test -n "$1"; then
3000+ func_convert_core_msys_to_w32 "$1"
3001+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
3002+ func_to_host_file_result="$func_cygpath_result"
3003+ fi
3004+ func_convert_file_check "$1" "$func_to_host_file_result"
3005+}
3006+# end func_convert_file_msys_to_cygwin
3007+
3008+
3009+# func_convert_file_nix_to_cygwin ARG
3010+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
3011+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
3012+# in func_to_host_file_result.
3013+func_convert_file_nix_to_cygwin ()
3014+{
3015+ $opt_debug
3016+ func_to_host_file_result="$1"
3017+ if test -n "$1"; then
3018+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
3019+ func_convert_core_file_wine_to_w32 "$1"
3020+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
3021+ func_to_host_file_result="$func_cygpath_result"
3022+ fi
3023+ func_convert_file_check "$1" "$func_to_host_file_result"
3024+}
3025+# end func_convert_file_nix_to_cygwin
3026+
3027+
3028+#############################################
3029+# $build to $host PATH CONVERSION FUNCTIONS #
3030+#############################################
3031+# invoked via `$to_host_path_cmd ARG'
3032+#
3033+# In each case, ARG is the path to be converted from $build to $host format.
3034+# The result will be available in $func_to_host_path_result.
3035+#
3036+# Path separators are also converted from $build format to $host format. If
3037+# ARG begins or ends with a path separator character, it is preserved (but
3038+# converted to $host format) on output.
3039+#
3040+# All path conversion functions are named using the following convention:
3041+# file name conversion function : func_convert_file_X_to_Y ()
3042+# path conversion function : func_convert_path_X_to_Y ()
3043+# where, for any given $build/$host combination the 'X_to_Y' value is the
3044+# same. If conversion functions are added for new $build/$host combinations,
3045+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
3046+# will break.
3047+
3048+
3049+# func_init_to_host_path_cmd
3050+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
3051+# appropriate value, based on the value of $to_host_file_cmd.
3052+to_host_path_cmd=
3053+func_init_to_host_path_cmd ()
3054+{
3055+ $opt_debug
3056+ if test -z "$to_host_path_cmd"; then
3057+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
3058+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
3059+ fi
3060+}
3061+
3062+
3063+# func_to_host_path ARG
3064+# Converts the path ARG from $build format to $host format. Return result
3065+# in func_to_host_path_result.
3066+func_to_host_path ()
3067+{
3068+ $opt_debug
3069+ func_init_to_host_path_cmd
3070+ $to_host_path_cmd "$1"
3071+}
3072+# end func_to_host_path
3073+
3074+
3075+# func_convert_path_noop ARG
3076+# Copy ARG to func_to_host_path_result.
3077+func_convert_path_noop ()
3078+{
3079+ func_to_host_path_result="$1"
3080+}
3081+# end func_convert_path_noop
3082+
3083+
3084+# func_convert_path_msys_to_w32 ARG
3085+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
3086+# conversion to w32 is not available inside the cwrapper. Returns result in
3087+# func_to_host_path_result.
3088+func_convert_path_msys_to_w32 ()
3089+{
3090+ $opt_debug
3091+ func_to_host_path_result="$1"
3092+ if test -n "$1"; then
3093+ # Remove leading and trailing path separator characters from ARG. MSYS
3094+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
3095+ # and winepath ignores them completely.
3096+ func_stripname : : "$1"
3097+ func_to_host_path_tmp1=$func_stripname_result
3098+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3099+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
3100+ func_convert_path_check : ";" \
3101+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3102+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3103+ fi
3104+}
3105+# end func_convert_path_msys_to_w32
3106+
3107+
3108+# func_convert_path_cygwin_to_w32 ARG
3109+# Convert path ARG from Cygwin to w32 format. Returns result in
3110+# func_to_host_file_result.
3111+func_convert_path_cygwin_to_w32 ()
3112+{
3113+ $opt_debug
3114+ func_to_host_path_result="$1"
3115+ if test -n "$1"; then
3116+ # See func_convert_path_msys_to_w32:
3117+ func_stripname : : "$1"
3118+ func_to_host_path_tmp1=$func_stripname_result
3119+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
3120+ func_convert_path_check : ";" \
3121+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3122+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3123+ fi
3124+}
3125+# end func_convert_path_cygwin_to_w32
3126+
3127+
3128+# func_convert_path_nix_to_w32 ARG
3129+# Convert path ARG from *nix to w32 format. Requires a wine environment and
3130+# a working winepath. Returns result in func_to_host_file_result.
3131+func_convert_path_nix_to_w32 ()
3132+{
3133+ $opt_debug
3134+ func_to_host_path_result="$1"
3135+ if test -n "$1"; then
3136+ # See func_convert_path_msys_to_w32:
3137+ func_stripname : : "$1"
3138+ func_to_host_path_tmp1=$func_stripname_result
3139+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3140+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
3141+ func_convert_path_check : ";" \
3142+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3143+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3144+ fi
3145+}
3146+# end func_convert_path_nix_to_w32
3147+
3148+
3149+# func_convert_path_msys_to_cygwin ARG
3150+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3151+# Returns result in func_to_host_file_result.
3152+func_convert_path_msys_to_cygwin ()
3153+{
3154+ $opt_debug
3155+ func_to_host_path_result="$1"
3156+ if test -n "$1"; then
3157+ # See func_convert_path_msys_to_w32:
3158+ func_stripname : : "$1"
3159+ func_to_host_path_tmp1=$func_stripname_result
3160+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3161+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
3162+ func_to_host_path_result="$func_cygpath_result"
3163+ func_convert_path_check : : \
3164+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3165+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3166+ fi
3167+}
3168+# end func_convert_path_msys_to_cygwin
3169+
3170+
3171+# func_convert_path_nix_to_cygwin ARG
3172+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
3173+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
3174+# func_to_host_file_result.
3175+func_convert_path_nix_to_cygwin ()
3176+{
3177+ $opt_debug
3178+ func_to_host_path_result="$1"
3179+ if test -n "$1"; then
3180+ # Remove leading and trailing path separator characters from
3181+ # ARG. msys behavior is inconsistent here, cygpath turns them
3182+ # into '.;' and ';.', and winepath ignores them completely.
3183+ func_stripname : : "$1"
3184+ func_to_host_path_tmp1=$func_stripname_result
3185+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3186+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
3187+ func_to_host_path_result="$func_cygpath_result"
3188+ func_convert_path_check : : \
3189+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3190+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3191+ fi
3192+}
3193+# end func_convert_path_nix_to_cygwin
3194+
3195+
3196 # func_mode_compile arg...
3197 func_mode_compile ()
3198 {
3199@@ -1314,12 +1985,12 @@ func_mode_compile ()
3200 ;;
3201
3202 -pie | -fpie | -fPIE)
3203- pie_flag="$pie_flag $arg"
3204+ func_append pie_flag " $arg"
3205 continue
3206 ;;
3207
3208 -shared | -static | -prefer-pic | -prefer-non-pic)
3209- later="$later $arg"
3210+ func_append later " $arg"
3211 continue
3212 ;;
3213
3214@@ -1340,15 +2011,14 @@ func_mode_compile ()
3215 save_ifs="$IFS"; IFS=','
3216 for arg in $args; do
3217 IFS="$save_ifs"
3218- func_quote_for_eval "$arg"
3219- lastarg="$lastarg $func_quote_for_eval_result"
3220+ func_append_quoted lastarg "$arg"
3221 done
3222 IFS="$save_ifs"
3223 func_stripname ' ' '' "$lastarg"
3224 lastarg=$func_stripname_result
3225
3226 # Add the arguments to base_compile.
3227- base_compile="$base_compile $lastarg"
3228+ func_append base_compile " $lastarg"
3229 continue
3230 ;;
3231
3232@@ -1364,8 +2034,7 @@ func_mode_compile ()
3233 esac # case $arg_mode
3234
3235 # Aesthetically quote the previous argument.
3236- func_quote_for_eval "$lastarg"
3237- base_compile="$base_compile $func_quote_for_eval_result"
3238+ func_append_quoted base_compile "$lastarg"
3239 done # for arg
3240
3241 case $arg_mode in
3242@@ -1496,17 +2165,16 @@ compiler."
3243 $opt_dry_run || $RM $removelist
3244 exit $EXIT_FAILURE
3245 fi
3246- removelist="$removelist $output_obj"
3247+ func_append removelist " $output_obj"
3248 $ECHO "$srcfile" > "$lockfile"
3249 fi
3250
3251 $opt_dry_run || $RM $removelist
3252- removelist="$removelist $lockfile"
3253+ func_append removelist " $lockfile"
3254 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
3255
3256- if test -n "$fix_srcfile_path"; then
3257- eval "srcfile=\"$fix_srcfile_path\""
3258- fi
3259+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3260+ srcfile=$func_to_tool_file_result
3261 func_quote_for_eval "$srcfile"
3262 qsrcfile=$func_quote_for_eval_result
3263
3264@@ -1526,7 +2194,7 @@ compiler."
3265
3266 if test -z "$output_obj"; then
3267 # Place PIC objects in $objdir
3268- command="$command -o $lobj"
3269+ func_append command " -o $lobj"
3270 fi
3271
3272 func_show_eval_locale "$command" \
3273@@ -1573,11 +2241,11 @@ compiler."
3274 command="$base_compile $qsrcfile $pic_flag"
3275 fi
3276 if test "$compiler_c_o" = yes; then
3277- command="$command -o $obj"
3278+ func_append command " -o $obj"
3279 fi
3280
3281 # Suppress compiler output if we already did a PIC compilation.
3282- command="$command$suppress_output"
3283+ func_append command "$suppress_output"
3284 func_show_eval_locale "$command" \
3285 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
3286
3287@@ -1622,13 +2290,13 @@ compiler."
3288 }
3289
3290 $opt_help || {
3291- test "$mode" = compile && func_mode_compile ${1+"$@"}
3292+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
3293 }
3294
3295 func_mode_help ()
3296 {
3297 # We need to display help for each of the modes.
3298- case $mode in
3299+ case $opt_mode in
3300 "")
3301 # Generic help is extracted from the usage comments
3302 # at the start of this file.
3303@@ -1659,8 +2327,8 @@ This mode accepts the following addition
3304
3305 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
3306 -no-suppress do not suppress compiler output for multiple passes
3307- -prefer-pic try to building PIC objects only
3308- -prefer-non-pic try to building non-PIC objects only
3309+ -prefer-pic try to build PIC objects only
3310+ -prefer-non-pic try to build non-PIC objects only
3311 -shared do not build a \`.o' file suitable for static linking
3312 -static only build a \`.o' file suitable for static linking
3313 -Wc,FLAG pass FLAG directly to the compiler
3314@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
3315 ;;
3316
3317 *)
3318- func_fatal_help "invalid operation mode \`$mode'"
3319+ func_fatal_help "invalid operation mode \`$opt_mode'"
3320 ;;
3321 esac
3322
3323@@ -1819,13 +2487,13 @@ if $opt_help; then
3324 else
3325 {
3326 func_help noexit
3327- for mode in compile link execute install finish uninstall clean; do
3328+ for opt_mode in compile link execute install finish uninstall clean; do
3329 func_mode_help
3330 done
3331 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
3332 {
3333 func_help noexit
3334- for mode in compile link execute install finish uninstall clean; do
3335+ for opt_mode in compile link execute install finish uninstall clean; do
3336 echo
3337 func_mode_help
3338 done
3339@@ -1854,13 +2522,16 @@ func_mode_execute ()
3340 func_fatal_help "you must specify a COMMAND"
3341
3342 # Handle -dlopen flags immediately.
3343- for file in $execute_dlfiles; do
3344+ for file in $opt_dlopen; do
3345 test -f "$file" \
3346 || func_fatal_help "\`$file' is not a file"
3347
3348 dir=
3349 case $file in
3350 *.la)
3351+ func_resolve_sysroot "$file"
3352+ file=$func_resolve_sysroot_result
3353+
3354 # Check to see that this really is a libtool archive.
3355 func_lalib_unsafe_p "$file" \
3356 || func_fatal_help "\`$lib' is not a valid libtool archive"
3357@@ -1882,7 +2553,7 @@ func_mode_execute ()
3358 dir="$func_dirname_result"
3359
3360 if test -f "$dir/$objdir/$dlname"; then
3361- dir="$dir/$objdir"
3362+ func_append dir "/$objdir"
3363 else
3364 if test ! -f "$dir/$dlname"; then
3365 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
3366@@ -1907,10 +2578,10 @@ func_mode_execute ()
3367 test -n "$absdir" && dir="$absdir"
3368
3369 # Now add the directory to shlibpath_var.
3370- if eval test -z \"\$$shlibpath_var\"; then
3371- eval $shlibpath_var=\$dir
3372+ if eval "test -z \"\$$shlibpath_var\""; then
3373+ eval "$shlibpath_var=\"\$dir\""
3374 else
3375- eval $shlibpath_var=\$dir:\$$shlibpath_var
3376+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
3377 fi
3378 done
3379
3380@@ -1939,8 +2610,7 @@ func_mode_execute ()
3381 ;;
3382 esac
3383 # Quote arguments (to preserve shell metacharacters).
3384- func_quote_for_eval "$file"
3385- args="$args $func_quote_for_eval_result"
3386+ func_append_quoted args "$file"
3387 done
3388
3389 if test "X$opt_dry_run" = Xfalse; then
3390@@ -1972,22 +2642,59 @@ func_mode_execute ()
3391 fi
3392 }
3393
3394-test "$mode" = execute && func_mode_execute ${1+"$@"}
3395+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
3396
3397
3398 # func_mode_finish arg...
3399 func_mode_finish ()
3400 {
3401 $opt_debug
3402- libdirs="$nonopt"
3403+ libs=
3404+ libdirs=
3405 admincmds=
3406
3407- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3408- for dir
3409- do
3410- libdirs="$libdirs $dir"
3411- done
3412+ for opt in "$nonopt" ${1+"$@"}
3413+ do
3414+ if test -d "$opt"; then
3415+ func_append libdirs " $opt"
3416+
3417+ elif test -f "$opt"; then
3418+ if func_lalib_unsafe_p "$opt"; then
3419+ func_append libs " $opt"
3420+ else
3421+ func_warning "\`$opt' is not a valid libtool archive"
3422+ fi
3423+
3424+ else
3425+ func_fatal_error "invalid argument \`$opt'"
3426+ fi
3427+ done
3428+
3429+ if test -n "$libs"; then
3430+ if test -n "$lt_sysroot"; then
3431+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
3432+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
3433+ else
3434+ sysroot_cmd=
3435+ fi
3436+
3437+ # Remove sysroot references
3438+ if $opt_dry_run; then
3439+ for lib in $libs; do
3440+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
3441+ done
3442+ else
3443+ tmpdir=`func_mktempdir`
3444+ for lib in $libs; do
3445+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
3446+ > $tmpdir/tmp-la
3447+ mv -f $tmpdir/tmp-la $lib
3448+ done
3449+ ${RM}r "$tmpdir"
3450+ fi
3451+ fi
3452
3453+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3454 for libdir in $libdirs; do
3455 if test -n "$finish_cmds"; then
3456 # Do each command in the finish commands.
3457@@ -1997,7 +2704,7 @@ func_mode_finish ()
3458 if test -n "$finish_eval"; then
3459 # Do the single finish_eval.
3460 eval cmds=\"$finish_eval\"
3461- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
3462+ $opt_dry_run || eval "$cmds" || func_append admincmds "
3463 $cmds"
3464 fi
3465 done
3466@@ -2006,53 +2713,55 @@ func_mode_finish ()
3467 # Exit here if they wanted silent mode.
3468 $opt_silent && exit $EXIT_SUCCESS
3469
3470- echo "----------------------------------------------------------------------"
3471- echo "Libraries have been installed in:"
3472- for libdir in $libdirs; do
3473- $ECHO " $libdir"
3474- done
3475- echo
3476- echo "If you ever happen to want to link against installed libraries"
3477- echo "in a given directory, LIBDIR, you must either use libtool, and"
3478- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3479- echo "flag during linking and do at least one of the following:"
3480- if test -n "$shlibpath_var"; then
3481- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3482- echo " during execution"
3483- fi
3484- if test -n "$runpath_var"; then
3485- echo " - add LIBDIR to the \`$runpath_var' environment variable"
3486- echo " during linking"
3487- fi
3488- if test -n "$hardcode_libdir_flag_spec"; then
3489- libdir=LIBDIR
3490- eval "flag=\"$hardcode_libdir_flag_spec\""
3491+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3492+ echo "----------------------------------------------------------------------"
3493+ echo "Libraries have been installed in:"
3494+ for libdir in $libdirs; do
3495+ $ECHO " $libdir"
3496+ done
3497+ echo
3498+ echo "If you ever happen to want to link against installed libraries"
3499+ echo "in a given directory, LIBDIR, you must either use libtool, and"
3500+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3501+ echo "flag during linking and do at least one of the following:"
3502+ if test -n "$shlibpath_var"; then
3503+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3504+ echo " during execution"
3505+ fi
3506+ if test -n "$runpath_var"; then
3507+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
3508+ echo " during linking"
3509+ fi
3510+ if test -n "$hardcode_libdir_flag_spec"; then
3511+ libdir=LIBDIR
3512+ eval flag=\"$hardcode_libdir_flag_spec\"
3513
3514- $ECHO " - use the \`$flag' linker flag"
3515- fi
3516- if test -n "$admincmds"; then
3517- $ECHO " - have your system administrator run these commands:$admincmds"
3518- fi
3519- if test -f /etc/ld.so.conf; then
3520- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3521- fi
3522- echo
3523+ $ECHO " - use the \`$flag' linker flag"
3524+ fi
3525+ if test -n "$admincmds"; then
3526+ $ECHO " - have your system administrator run these commands:$admincmds"
3527+ fi
3528+ if test -f /etc/ld.so.conf; then
3529+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3530+ fi
3531+ echo
3532
3533- echo "See any operating system documentation about shared libraries for"
3534- case $host in
3535- solaris2.[6789]|solaris2.1[0-9])
3536- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3537- echo "pages."
3538- ;;
3539- *)
3540- echo "more information, such as the ld(1) and ld.so(8) manual pages."
3541- ;;
3542- esac
3543- echo "----------------------------------------------------------------------"
3544+ echo "See any operating system documentation about shared libraries for"
3545+ case $host in
3546+ solaris2.[6789]|solaris2.1[0-9])
3547+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3548+ echo "pages."
3549+ ;;
3550+ *)
3551+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
3552+ ;;
3553+ esac
3554+ echo "----------------------------------------------------------------------"
3555+ fi
3556 exit $EXIT_SUCCESS
3557 }
3558
3559-test "$mode" = finish && func_mode_finish ${1+"$@"}
3560+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
3561
3562
3563 # func_mode_install arg...
3564@@ -2077,7 +2786,7 @@ func_mode_install ()
3565 # The real first argument should be the name of the installation program.
3566 # Aesthetically quote it.
3567 func_quote_for_eval "$arg"
3568- install_prog="$install_prog$func_quote_for_eval_result"
3569+ func_append install_prog "$func_quote_for_eval_result"
3570 install_shared_prog=$install_prog
3571 case " $install_prog " in
3572 *[\\\ /]cp\ *) install_cp=: ;;
3573@@ -2097,7 +2806,7 @@ func_mode_install ()
3574 do
3575 arg2=
3576 if test -n "$dest"; then
3577- files="$files $dest"
3578+ func_append files " $dest"
3579 dest=$arg
3580 continue
3581 fi
3582@@ -2135,11 +2844,11 @@ func_mode_install ()
3583
3584 # Aesthetically quote the argument.
3585 func_quote_for_eval "$arg"
3586- install_prog="$install_prog $func_quote_for_eval_result"
3587+ func_append install_prog " $func_quote_for_eval_result"
3588 if test -n "$arg2"; then
3589 func_quote_for_eval "$arg2"
3590 fi
3591- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
3592+ func_append install_shared_prog " $func_quote_for_eval_result"
3593 done
3594
3595 test -z "$install_prog" && \
3596@@ -2151,7 +2860,7 @@ func_mode_install ()
3597 if test -n "$install_override_mode" && $no_mode; then
3598 if $install_cp; then :; else
3599 func_quote_for_eval "$install_override_mode"
3600- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
3601+ func_append install_shared_prog " -m $func_quote_for_eval_result"
3602 fi
3603 fi
3604
3605@@ -2209,10 +2918,13 @@ func_mode_install ()
3606 case $file in
3607 *.$libext)
3608 # Do the static libraries later.
3609- staticlibs="$staticlibs $file"
3610+ func_append staticlibs " $file"
3611 ;;
3612
3613 *.la)
3614+ func_resolve_sysroot "$file"
3615+ file=$func_resolve_sysroot_result
3616+
3617 # Check to see that this really is a libtool archive.
3618 func_lalib_unsafe_p "$file" \
3619 || func_fatal_help "\`$file' is not a valid libtool archive"
3620@@ -2226,23 +2938,30 @@ func_mode_install ()
3621 if test "X$destdir" = "X$libdir"; then
3622 case "$current_libdirs " in
3623 *" $libdir "*) ;;
3624- *) current_libdirs="$current_libdirs $libdir" ;;
3625+ *) func_append current_libdirs " $libdir" ;;
3626 esac
3627 else
3628 # Note the libdir as a future libdir.
3629 case "$future_libdirs " in
3630 *" $libdir "*) ;;
3631- *) future_libdirs="$future_libdirs $libdir" ;;
3632+ *) func_append future_libdirs " $libdir" ;;
3633 esac
3634 fi
3635
3636 func_dirname "$file" "/" ""
3637 dir="$func_dirname_result"
3638- dir="$dir$objdir"
3639+ func_append dir "$objdir"
3640
3641 if test -n "$relink_command"; then
3642+ # Strip any trailing slash from the destination.
3643+ func_stripname '' '/' "$libdir"
3644+ destlibdir=$func_stripname_result
3645+
3646+ func_stripname '' '/' "$destdir"
3647+ s_destdir=$func_stripname_result
3648+
3649 # Determine the prefix the user has applied to our future dir.
3650- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
3651+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
3652
3653 # Don't allow the user to place us outside of our expected
3654 # location b/c this prevents finding dependent libraries that
3655@@ -2315,7 +3034,7 @@ func_mode_install ()
3656 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3657
3658 # Maybe install the static library, too.
3659- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3660+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
3661 ;;
3662
3663 *.lo)
3664@@ -2503,7 +3222,7 @@ func_mode_install ()
3665 test -n "$future_libdirs" && \
3666 func_warning "remember to run \`$progname --finish$future_libdirs'"
3667
3668- if test -n "$current_libdirs" && $opt_finish; then
3669+ if test -n "$current_libdirs"; then
3670 # Maybe just do a dry run.
3671 $opt_dry_run && current_libdirs=" -n$current_libdirs"
3672 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
3673@@ -2512,7 +3231,7 @@ func_mode_install ()
3674 fi
3675 }
3676
3677-test "$mode" = install && func_mode_install ${1+"$@"}
3678+test "$opt_mode" = install && func_mode_install ${1+"$@"}
3679
3680
3681 # func_generate_dlsyms outputname originator pic_p
3682@@ -2559,6 +3278,18 @@ extern \"C\" {
3683 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3684 #endif
3685
3686+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3687+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3688+/* DATA imports from DLLs on WIN32 con't be const, because runtime
3689+ relocations are performed -- see ld's documentation on pseudo-relocs. */
3690+# define LT_DLSYM_CONST
3691+#elif defined(__osf__)
3692+/* This system does not cope well with relocations in const data. */
3693+# define LT_DLSYM_CONST
3694+#else
3695+# define LT_DLSYM_CONST const
3696+#endif
3697+
3698 /* External symbol declarations for the compiler. */\
3699 "
3700
3701@@ -2570,21 +3301,22 @@ extern \"C\" {
3702 # Add our own program objects to the symbol list.
3703 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3704 for progfile in $progfiles; do
3705- func_verbose "extracting global C symbols from \`$progfile'"
3706- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3707+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3708+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3709+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
3710 done
3711
3712 if test -n "$exclude_expsyms"; then
3713 $opt_dry_run || {
3714- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
3715- $MV "$nlist"T "$nlist"
3716+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
3717+ eval '$MV "$nlist"T "$nlist"'
3718 }
3719 fi
3720
3721 if test -n "$export_symbols_regex"; then
3722 $opt_dry_run || {
3723- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
3724- $MV "$nlist"T "$nlist"
3725+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
3726+ eval '$MV "$nlist"T "$nlist"'
3727 }
3728 fi
3729
3730@@ -2593,23 +3325,23 @@ extern \"C\" {
3731 export_symbols="$output_objdir/$outputname.exp"
3732 $opt_dry_run || {
3733 $RM $export_symbols
3734- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
3735+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
3736 case $host in
3737 *cygwin* | *mingw* | *cegcc* )
3738- echo EXPORTS > "$output_objdir/$outputname.def"
3739- cat "$export_symbols" >> "$output_objdir/$outputname.def"
3740+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3741+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
3742 ;;
3743 esac
3744 }
3745 else
3746 $opt_dry_run || {
3747- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
3748- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
3749- $MV "$nlist"T "$nlist"
3750+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
3751+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
3752+ eval '$MV "$nlist"T "$nlist"'
3753 case $host in
3754 *cygwin* | *mingw* | *cegcc* )
3755- echo EXPORTS > "$output_objdir/$outputname.def"
3756- cat "$nlist" >> "$output_objdir/$outputname.def"
3757+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3758+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
3759 ;;
3760 esac
3761 }
3762@@ -2620,10 +3352,52 @@ extern \"C\" {
3763 func_verbose "extracting global C symbols from \`$dlprefile'"
3764 func_basename "$dlprefile"
3765 name="$func_basename_result"
3766- $opt_dry_run || {
3767- $ECHO ": $name " >> "$nlist"
3768- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3769- }
3770+ case $host in
3771+ *cygwin* | *mingw* | *cegcc* )
3772+ # if an import library, we need to obtain dlname
3773+ if func_win32_import_lib_p "$dlprefile"; then
3774+ func_tr_sh "$dlprefile"
3775+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
3776+ dlprefile_dlbasename=""
3777+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3778+ # Use subshell, to avoid clobbering current variable values
3779+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3780+ if test -n "$dlprefile_dlname" ; then
3781+ func_basename "$dlprefile_dlname"
3782+ dlprefile_dlbasename="$func_basename_result"
3783+ else
3784+ # no lafile. user explicitly requested -dlpreopen <import library>.
3785+ $sharedlib_from_linklib_cmd "$dlprefile"
3786+ dlprefile_dlbasename=$sharedlib_from_linklib_result
3787+ fi
3788+ fi
3789+ $opt_dry_run || {
3790+ if test -n "$dlprefile_dlbasename" ; then
3791+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3792+ else
3793+ func_warning "Could not compute DLL name from $name"
3794+ eval '$ECHO ": $name " >> "$nlist"'
3795+ fi
3796+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3797+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3798+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3799+ }
3800+ else # not an import lib
3801+ $opt_dry_run || {
3802+ eval '$ECHO ": $name " >> "$nlist"'
3803+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3804+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3805+ }
3806+ fi
3807+ ;;
3808+ *)
3809+ $opt_dry_run || {
3810+ eval '$ECHO ": $name " >> "$nlist"'
3811+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3812+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3813+ }
3814+ ;;
3815+ esac
3816 done
3817
3818 $opt_dry_run || {
3819@@ -2661,26 +3435,9 @@ typedef struct {
3820 const char *name;
3821 void *address;
3822 } lt_dlsymlist;
3823-"
3824- case $host in
3825- *cygwin* | *mingw* | *cegcc* )
3826- echo >> "$output_objdir/$my_dlsyms" "\
3827-/* DATA imports from DLLs on WIN32 con't be const, because
3828- runtime relocations are performed -- see ld's documentation
3829- on pseudo-relocs. */"
3830- lt_dlsym_const= ;;
3831- *osf5*)
3832- echo >> "$output_objdir/$my_dlsyms" "\
3833-/* This system does not cope well with relocations in const data */"
3834- lt_dlsym_const= ;;
3835- *)
3836- lt_dlsym_const=const ;;
3837- esac
3838-
3839- echo >> "$output_objdir/$my_dlsyms" "\
3840-extern $lt_dlsym_const lt_dlsymlist
3841+extern LT_DLSYM_CONST lt_dlsymlist
3842 lt_${my_prefix}_LTX_preloaded_symbols[];
3843-$lt_dlsym_const lt_dlsymlist
3844+LT_DLSYM_CONST lt_dlsymlist
3845 lt_${my_prefix}_LTX_preloaded_symbols[] =
3846 {\
3847 { \"$my_originator\", (void *) 0 },"
3848@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
3849 for arg in $LTCFLAGS; do
3850 case $arg in
3851 -pie | -fpie | -fPIE) ;;
3852- *) symtab_cflags="$symtab_cflags $arg" ;;
3853+ *) func_append symtab_cflags " $arg" ;;
3854 esac
3855 done
3856
3857@@ -2796,9 +3553,11 @@ func_win32_libid ()
3858 win32_libid_type="x86 archive import"
3859 ;;
3860 *ar\ archive*) # could be an import, or static
3861- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
3862- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3863- win32_nmres=`$NM -f posix -A "$1" |
3864+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3865+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3866+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3867+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3868+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
3869 $SED -n -e '
3870 1,100{
3871 / I /{
3872@@ -2827,6 +3586,131 @@ func_win32_libid ()
3873 $ECHO "$win32_libid_type"
3874 }
3875
3876+# func_cygming_dll_for_implib ARG
3877+#
3878+# Platform-specific function to extract the
3879+# name of the DLL associated with the specified
3880+# import library ARG.
3881+# Invoked by eval'ing the libtool variable
3882+# $sharedlib_from_linklib_cmd
3883+# Result is available in the variable
3884+# $sharedlib_from_linklib_result
3885+func_cygming_dll_for_implib ()
3886+{
3887+ $opt_debug
3888+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3889+}
3890+
3891+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3892+#
3893+# The is the core of a fallback implementation of a
3894+# platform-specific function to extract the name of the
3895+# DLL associated with the specified import library LIBNAME.
3896+#
3897+# SECTION_NAME is either .idata$6 or .idata$7, depending
3898+# on the platform and compiler that created the implib.
3899+#
3900+# Echos the name of the DLL associated with the
3901+# specified import library.
3902+func_cygming_dll_for_implib_fallback_core ()
3903+{
3904+ $opt_debug
3905+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3906+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3907+ $SED '/^Contents of section '"$match_literal"':/{
3908+ # Place marker at beginning of archive member dllname section
3909+ s/.*/====MARK====/
3910+ p
3911+ d
3912+ }
3913+ # These lines can sometimes be longer than 43 characters, but
3914+ # are always uninteresting
3915+ /:[ ]*file format pe[i]\{,1\}-/d
3916+ /^In archive [^:]*:/d
3917+ # Ensure marker is printed
3918+ /^====MARK====/p
3919+ # Remove all lines with less than 43 characters
3920+ /^.\{43\}/!d
3921+ # From remaining lines, remove first 43 characters
3922+ s/^.\{43\}//' |
3923+ $SED -n '
3924+ # Join marker and all lines until next marker into a single line
3925+ /^====MARK====/ b para
3926+ H
3927+ $ b para
3928+ b
3929+ :para
3930+ x
3931+ s/\n//g
3932+ # Remove the marker
3933+ s/^====MARK====//
3934+ # Remove trailing dots and whitespace
3935+ s/[\. \t]*$//
3936+ # Print
3937+ /./p' |
3938+ # we now have a list, one entry per line, of the stringified
3939+ # contents of the appropriate section of all members of the
3940+ # archive which possess that section. Heuristic: eliminate
3941+ # all those which have a first or second character that is
3942+ # a '.' (that is, objdump's representation of an unprintable
3943+ # character.) This should work for all archives with less than
3944+ # 0x302f exports -- but will fail for DLLs whose name actually
3945+ # begins with a literal '.' or a single character followed by
3946+ # a '.'.
3947+ #
3948+ # Of those that remain, print the first one.
3949+ $SED -e '/^\./d;/^.\./d;q'
3950+}
3951+
3952+# func_cygming_gnu_implib_p ARG
3953+# This predicate returns with zero status (TRUE) if
3954+# ARG is a GNU/binutils-style import library. Returns
3955+# with nonzero status (FALSE) otherwise.
3956+func_cygming_gnu_implib_p ()
3957+{
3958+ $opt_debug
3959+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3960+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
3961+ test -n "$func_cygming_gnu_implib_tmp"
3962+}
3963+
3964+# func_cygming_ms_implib_p ARG
3965+# This predicate returns with zero status (TRUE) if
3966+# ARG is an MS-style import library. Returns
3967+# with nonzero status (FALSE) otherwise.
3968+func_cygming_ms_implib_p ()
3969+{
3970+ $opt_debug
3971+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3972+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3973+ test -n "$func_cygming_ms_implib_tmp"
3974+}
3975+
3976+# func_cygming_dll_for_implib_fallback ARG
3977+# Platform-specific function to extract the
3978+# name of the DLL associated with the specified
3979+# import library ARG.
3980+#
3981+# This fallback implementation is for use when $DLLTOOL
3982+# does not support the --identify-strict option.
3983+# Invoked by eval'ing the libtool variable
3984+# $sharedlib_from_linklib_cmd
3985+# Result is available in the variable
3986+# $sharedlib_from_linklib_result
3987+func_cygming_dll_for_implib_fallback ()
3988+{
3989+ $opt_debug
3990+ if func_cygming_gnu_implib_p "$1" ; then
3991+ # binutils import library
3992+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3993+ elif func_cygming_ms_implib_p "$1" ; then
3994+ # ms-generated import library
3995+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
3996+ else
3997+ # unknown
3998+ sharedlib_from_linklib_result=""
3999+ fi
4000+}
4001
4002
4003 # func_extract_an_archive dir oldlib
4004@@ -2917,7 +3801,7 @@ func_extract_archives ()
4005 darwin_file=
4006 darwin_files=
4007 for darwin_file in $darwin_filelist; do
4008- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
4009+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
4010 $LIPO -create -output "$darwin_file" $darwin_files
4011 done # $darwin_filelist
4012 $RM -rf unfat-$$
4013@@ -2932,7 +3816,7 @@ func_extract_archives ()
4014 func_extract_an_archive "$my_xdir" "$my_xabs"
4015 ;;
4016 esac
4017- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4018+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
4019 done
4020
4021 func_extract_archives_result="$my_oldobjs"
4022@@ -3014,7 +3898,110 @@ func_fallback_echo ()
4023 _LTECHO_EOF'
4024 }
4025 ECHO=\"$qECHO\"
4026- fi\
4027+ fi
4028+
4029+# Very basic option parsing. These options are (a) specific to
4030+# the libtool wrapper, (b) are identical between the wrapper
4031+# /script/ and the wrapper /executable/ which is used only on
4032+# windows platforms, and (c) all begin with the string "--lt-"
4033+# (application programs are unlikely to have options which match
4034+# this pattern).
4035+#
4036+# There are only two supported options: --lt-debug and
4037+# --lt-dump-script. There is, deliberately, no --lt-help.
4038+#
4039+# The first argument to this parsing function should be the
4040+# script's $0 value, followed by "$@".
4041+lt_option_debug=
4042+func_parse_lt_options ()
4043+{
4044+ lt_script_arg0=\$0
4045+ shift
4046+ for lt_opt
4047+ do
4048+ case \"\$lt_opt\" in
4049+ --lt-debug) lt_option_debug=1 ;;
4050+ --lt-dump-script)
4051+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
4052+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
4053+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
4054+ cat \"\$lt_dump_D/\$lt_dump_F\"
4055+ exit 0
4056+ ;;
4057+ --lt-*)
4058+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
4059+ exit 1
4060+ ;;
4061+ esac
4062+ done
4063+
4064+ # Print the debug banner immediately:
4065+ if test -n \"\$lt_option_debug\"; then
4066+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
4067+ fi
4068+}
4069+
4070+# Used when --lt-debug. Prints its arguments to stdout
4071+# (redirection is the responsibility of the caller)
4072+func_lt_dump_args ()
4073+{
4074+ lt_dump_args_N=1;
4075+ for lt_arg
4076+ do
4077+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
4078+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
4079+ done
4080+}
4081+
4082+# Core function for launching the target application
4083+func_exec_program_core ()
4084+{
4085+"
4086+ case $host in
4087+ # Backslashes separate directories on plain windows
4088+ *-*-mingw | *-*-os2* | *-cegcc*)
4089+ $ECHO "\
4090+ if test -n \"\$lt_option_debug\"; then
4091+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
4092+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4093+ fi
4094+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4095+"
4096+ ;;
4097+
4098+ *)
4099+ $ECHO "\
4100+ if test -n \"\$lt_option_debug\"; then
4101+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
4102+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4103+ fi
4104+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
4105+"
4106+ ;;
4107+ esac
4108+ $ECHO "\
4109+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4110+ exit 1
4111+}
4112+
4113+# A function to encapsulate launching the target application
4114+# Strips options in the --lt-* namespace from \$@ and
4115+# launches target application with the remaining arguments.
4116+func_exec_program ()
4117+{
4118+ for lt_wr_arg
4119+ do
4120+ case \$lt_wr_arg in
4121+ --lt-*) ;;
4122+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
4123+ esac
4124+ shift
4125+ done
4126+ func_exec_program_core \${1+\"\$@\"}
4127+}
4128+
4129+ # Parse options
4130+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
4131
4132 # Find the directory that this script lives in.
4133 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
4134@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
4135
4136 # relink executable if necessary
4137 if test -n \"\$relink_command\"; then
4138- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
4139+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
4140 else
4141 $ECHO \"\$relink_command_output\" >&2
4142 $RM \"\$progdir/\$file\"
4143@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
4144
4145 if test -f \"\$progdir/\$program\"; then"
4146
4147+ # fixup the dll searchpath if we need to.
4148+ #
4149+ # Fix the DLL searchpath if we need to. Do this before prepending
4150+ # to shlibpath, because on Windows, both are PATH and uninstalled
4151+ # libraries must come first.
4152+ if test -n "$dllsearchpath"; then
4153+ $ECHO "\
4154+ # Add the dll search path components to the executable PATH
4155+ PATH=$dllsearchpath:\$PATH
4156+"
4157+ fi
4158+
4159 # Export our shlibpath_var if we have one.
4160 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4161 $ECHO "\
4162@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
4163 "
4164 fi
4165
4166- # fixup the dll searchpath if we need to.
4167- if test -n "$dllsearchpath"; then
4168- $ECHO "\
4169- # Add the dll search path components to the executable PATH
4170- PATH=$dllsearchpath:\$PATH
4171-"
4172- fi
4173-
4174 $ECHO "\
4175 if test \"\$libtool_execute_magic\" != \"$magic\"; then
4176 # Run the actual program with our arguments.
4177-"
4178- case $host in
4179- # Backslashes separate directories on plain windows
4180- *-*-mingw | *-*-os2* | *-cegcc*)
4181- $ECHO "\
4182- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4183-"
4184- ;;
4185-
4186- *)
4187- $ECHO "\
4188- exec \"\$progdir/\$program\" \${1+\"\$@\"}
4189-"
4190- ;;
4191- esac
4192- $ECHO "\
4193- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4194- exit 1
4195+ func_exec_program \${1+\"\$@\"}
4196 fi
4197 else
4198 # The program doesn't exist.
4199@@ -3158,166 +4132,6 @@ fi\
4200 }
4201
4202
4203-# func_to_host_path arg
4204-#
4205-# Convert paths to host format when used with build tools.
4206-# Intended for use with "native" mingw (where libtool itself
4207-# is running under the msys shell), or in the following cross-
4208-# build environments:
4209-# $build $host
4210-# mingw (msys) mingw [e.g. native]
4211-# cygwin mingw
4212-# *nix + wine mingw
4213-# where wine is equipped with the `winepath' executable.
4214-# In the native mingw case, the (msys) shell automatically
4215-# converts paths for any non-msys applications it launches,
4216-# but that facility isn't available from inside the cwrapper.
4217-# Similar accommodations are necessary for $host mingw and
4218-# $build cygwin. Calling this function does no harm for other
4219-# $host/$build combinations not listed above.
4220-#
4221-# ARG is the path (on $build) that should be converted to
4222-# the proper representation for $host. The result is stored
4223-# in $func_to_host_path_result.
4224-func_to_host_path ()
4225-{
4226- func_to_host_path_result="$1"
4227- if test -n "$1"; then
4228- case $host in
4229- *mingw* )
4230- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4231- case $build in
4232- *mingw* ) # actually, msys
4233- # awkward: cmd appends spaces to result
4234- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
4235- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4236- ;;
4237- *cygwin* )
4238- func_to_host_path_result=`cygpath -w "$1" |
4239- $SED -e "$lt_sed_naive_backslashify"`
4240- ;;
4241- * )
4242- # Unfortunately, winepath does not exit with a non-zero
4243- # error code, so we are forced to check the contents of
4244- # stdout. On the other hand, if the command is not
4245- # found, the shell will set an exit code of 127 and print
4246- # *an error message* to stdout. So we must check for both
4247- # error code of zero AND non-empty stdout, which explains
4248- # the odd construction:
4249- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
4250- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
4251- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
4252- $SED -e "$lt_sed_naive_backslashify"`
4253- else
4254- # Allow warning below.
4255- func_to_host_path_result=
4256- fi
4257- ;;
4258- esac
4259- if test -z "$func_to_host_path_result" ; then
4260- func_error "Could not determine host path corresponding to"
4261- func_error " \`$1'"
4262- func_error "Continuing, but uninstalled executables may not work."
4263- # Fallback:
4264- func_to_host_path_result="$1"
4265- fi
4266- ;;
4267- esac
4268- fi
4269-}
4270-# end: func_to_host_path
4271-
4272-# func_to_host_pathlist arg
4273-#
4274-# Convert pathlists to host format when used with build tools.
4275-# See func_to_host_path(), above. This function supports the
4276-# following $build/$host combinations (but does no harm for
4277-# combinations not listed here):
4278-# $build $host
4279-# mingw (msys) mingw [e.g. native]
4280-# cygwin mingw
4281-# *nix + wine mingw
4282-#
4283-# Path separators are also converted from $build format to
4284-# $host format. If ARG begins or ends with a path separator
4285-# character, it is preserved (but converted to $host format)
4286-# on output.
4287-#
4288-# ARG is a pathlist (on $build) that should be converted to
4289-# the proper representation on $host. The result is stored
4290-# in $func_to_host_pathlist_result.
4291-func_to_host_pathlist ()
4292-{
4293- func_to_host_pathlist_result="$1"
4294- if test -n "$1"; then
4295- case $host in
4296- *mingw* )
4297- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4298- # Remove leading and trailing path separator characters from
4299- # ARG. msys behavior is inconsistent here, cygpath turns them
4300- # into '.;' and ';.', and winepath ignores them completely.
4301- func_stripname : : "$1"
4302- func_to_host_pathlist_tmp1=$func_stripname_result
4303- case $build in
4304- *mingw* ) # Actually, msys.
4305- # Awkward: cmd appends spaces to result.
4306- func_to_host_pathlist_result=`
4307- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
4308- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4309- ;;
4310- *cygwin* )
4311- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
4312- $SED -e "$lt_sed_naive_backslashify"`
4313- ;;
4314- * )
4315- # unfortunately, winepath doesn't convert pathlists
4316- func_to_host_pathlist_result=""
4317- func_to_host_pathlist_oldIFS=$IFS
4318- IFS=:
4319- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
4320- IFS=$func_to_host_pathlist_oldIFS
4321- if test -n "$func_to_host_pathlist_f" ; then
4322- func_to_host_path "$func_to_host_pathlist_f"
4323- if test -n "$func_to_host_path_result" ; then
4324- if test -z "$func_to_host_pathlist_result" ; then
4325- func_to_host_pathlist_result="$func_to_host_path_result"
4326- else
4327- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
4328- fi
4329- fi
4330- fi
4331- done
4332- IFS=$func_to_host_pathlist_oldIFS
4333- ;;
4334- esac
4335- if test -z "$func_to_host_pathlist_result"; then
4336- func_error "Could not determine the host path(s) corresponding to"
4337- func_error " \`$1'"
4338- func_error "Continuing, but uninstalled executables may not work."
4339- # Fallback. This may break if $1 contains DOS-style drive
4340- # specifications. The fix is not to complicate the expression
4341- # below, but for the user to provide a working wine installation
4342- # with winepath so that path translation in the cross-to-mingw
4343- # case works properly.
4344- lt_replace_pathsep_nix_to_dos="s|:|;|g"
4345- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
4346- $SED -e "$lt_replace_pathsep_nix_to_dos"`
4347- fi
4348- # Now, add the leading and trailing path separators back
4349- case "$1" in
4350- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
4351- ;;
4352- esac
4353- case "$1" in
4354- *: ) func_append func_to_host_pathlist_result ";"
4355- ;;
4356- esac
4357- ;;
4358- esac
4359- fi
4360-}
4361-# end: func_to_host_pathlist
4362-
4363 # func_emit_cwrapperexe_src
4364 # emit the source code for a wrapper executable on stdout
4365 # Must ONLY be called from within func_mode_link because
4366@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
4367
4368 This wrapper executable should never be moved out of the build directory.
4369 If it is, it will not operate correctly.
4370-
4371- Currently, it simply execs the wrapper *script* "$SHELL $output",
4372- but could eventually absorb all of the scripts functionality and
4373- exec $objdir/$outputname directly.
4374 */
4375 EOF
4376 cat <<"EOF"
4377@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
4378 if (stale) { free ((void *) stale); stale = 0; } \
4379 } while (0)
4380
4381-#undef LTWRAPPER_DEBUGPRINTF
4382-#if defined LT_DEBUGWRAPPER
4383-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
4384-static void
4385-ltwrapper_debugprintf (const char *fmt, ...)
4386-{
4387- va_list args;
4388- va_start (args, fmt);
4389- (void) vfprintf (stderr, fmt, args);
4390- va_end (args);
4391-}
4392+#if defined(LT_DEBUGWRAPPER)
4393+static int lt_debug = 1;
4394 #else
4395-# define LTWRAPPER_DEBUGPRINTF(args)
4396+static int lt_debug = 0;
4397 #endif
4398
4399-const char *program_name = NULL;
4400+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
4401
4402 void *xmalloc (size_t num);
4403 char *xstrdup (const char *string);
4404@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
4405 int make_executable (const char *path);
4406 int check_executable (const char *path);
4407 char *strendzap (char *str, const char *pat);
4408-void lt_fatal (const char *message, ...);
4409+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
4410+void lt_fatal (const char *file, int line, const char *message, ...);
4411+static const char *nonnull (const char *s);
4412+static const char *nonempty (const char *s);
4413 void lt_setenv (const char *name, const char *value);
4414 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
4415 void lt_update_exe_path (const char *name, const char *value);
4416@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
4417 EOF
4418
4419 cat <<EOF
4420-const char * MAGIC_EXE = "$magic_exe";
4421+volatile const char * MAGIC_EXE = "$magic_exe";
4422 const char * LIB_PATH_VARNAME = "$shlibpath_var";
4423 EOF
4424
4425 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4426- func_to_host_pathlist "$temp_rpath"
4427+ func_to_host_path "$temp_rpath"
4428 cat <<EOF
4429-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4430+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
4431 EOF
4432 else
4433 cat <<"EOF"
4434@@ -3513,10 +4317,10 @@ EOF
4435 fi
4436
4437 if test -n "$dllsearchpath"; then
4438- func_to_host_pathlist "$dllsearchpath:"
4439+ func_to_host_path "$dllsearchpath:"
4440 cat <<EOF
4441 const char * EXE_PATH_VARNAME = "PATH";
4442-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4443+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
4444 EOF
4445 else
4446 cat <<"EOF"
4447@@ -3539,12 +4343,10 @@ EOF
4448 cat <<"EOF"
4449
4450 #define LTWRAPPER_OPTION_PREFIX "--lt-"
4451-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
4452
4453-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
4454 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
4455-
4456 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
4457+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
4458
4459 int
4460 main (int argc, char *argv[])
4461@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
4462 int i;
4463
4464 program_name = (char *) xstrdup (base_name (argv[0]));
4465- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
4466- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
4467+ newargz = XMALLOC (char *, argc + 1);
4468
4469- /* very simple arg parsing; don't want to rely on getopt */
4470+ /* very simple arg parsing; don't want to rely on getopt
4471+ * also, copy all non cwrapper options to newargz, except
4472+ * argz[0], which is handled differently
4473+ */
4474+ newargc=0;
4475 for (i = 1; i < argc; i++)
4476 {
4477 if (strcmp (argv[i], dumpscript_opt) == 0)
4478@@ -3581,21 +4386,54 @@ EOF
4479 lt_dump_script (stdout);
4480 return 0;
4481 }
4482+ if (strcmp (argv[i], debug_opt) == 0)
4483+ {
4484+ lt_debug = 1;
4485+ continue;
4486+ }
4487+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
4488+ {
4489+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4490+ namespace, but it is not one of the ones we know about and
4491+ have already dealt with, above (inluding dump-script), then
4492+ report an error. Otherwise, targets might begin to believe
4493+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4494+ namespace. The first time any user complains about this, we'll
4495+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4496+ or a configure.ac-settable value.
4497+ */
4498+ lt_fatal (__FILE__, __LINE__,
4499+ "unrecognized %s option: '%s'",
4500+ ltwrapper_option_prefix, argv[i]);
4501+ }
4502+ /* otherwise ... */
4503+ newargz[++newargc] = xstrdup (argv[i]);
4504 }
4505+ newargz[++newargc] = NULL;
4506+
4507+EOF
4508+ cat <<EOF
4509+ /* The GNU banner must be the first non-error debug message */
4510+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
4511+EOF
4512+ cat <<"EOF"
4513+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
4514+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
4515
4516- newargz = XMALLOC (char *, argc + 1);
4517 tmp_pathspec = find_executable (argv[0]);
4518 if (tmp_pathspec == NULL)
4519- lt_fatal ("Couldn't find %s", argv[0]);
4520- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
4521- tmp_pathspec));
4522+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
4523+ lt_debugprintf (__FILE__, __LINE__,
4524+ "(main) found exe (before symlink chase) at: %s\n",
4525+ tmp_pathspec);
4526
4527 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
4528- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
4529- actual_cwrapper_path));
4530+ lt_debugprintf (__FILE__, __LINE__,
4531+ "(main) found exe (after symlink chase) at: %s\n",
4532+ actual_cwrapper_path);
4533 XFREE (tmp_pathspec);
4534
4535- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
4536+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
4537 strendzap (actual_cwrapper_path, actual_cwrapper_name);
4538
4539 /* wrapper name transforms */
4540@@ -3613,8 +4451,9 @@ EOF
4541 target_name = tmp_pathspec;
4542 tmp_pathspec = 0;
4543
4544- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
4545- target_name));
4546+ lt_debugprintf (__FILE__, __LINE__,
4547+ "(main) libtool target name: %s\n",
4548+ target_name);
4549 EOF
4550
4551 cat <<EOF
4552@@ -3664,35 +4503,19 @@ EOF
4553
4554 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4555 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4556- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4557+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4558+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4559+ because on Windows, both *_VARNAMEs are PATH but uninstalled
4560+ libraries must come first. */
4561 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4562+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4563
4564- newargc=0;
4565- for (i = 1; i < argc; i++)
4566- {
4567- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
4568- {
4569- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4570- namespace, but it is not one of the ones we know about and
4571- have already dealt with, above (inluding dump-script), then
4572- report an error. Otherwise, targets might begin to believe
4573- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4574- namespace. The first time any user complains about this, we'll
4575- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4576- or a configure.ac-settable value.
4577- */
4578- lt_fatal ("Unrecognized option in %s namespace: '%s'",
4579- ltwrapper_option_prefix, argv[i]);
4580- }
4581- /* otherwise ... */
4582- newargz[++newargc] = xstrdup (argv[i]);
4583- }
4584- newargz[++newargc] = NULL;
4585-
4586- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
4587+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4588+ nonnull (lt_argv_zero));
4589 for (i = 0; i < newargc; i++)
4590 {
4591- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
4592+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
4593+ i, nonnull (newargz[i]));
4594 }
4595
4596 EOF
4597@@ -3706,7 +4529,9 @@ EOF
4598 if (rval == -1)
4599 {
4600 /* failed to start process */
4601- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
4602+ lt_debugprintf (__FILE__, __LINE__,
4603+ "(main) failed to launch target \"%s\": %s\n",
4604+ lt_argv_zero, nonnull (strerror (errno)));
4605 return 127;
4606 }
4607 return rval;
4608@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
4609 {
4610 void *p = (void *) malloc (num);
4611 if (!p)
4612- lt_fatal ("Memory exhausted");
4613+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
4614
4615 return p;
4616 }
4617@@ -3762,8 +4587,8 @@ check_executable (const char *path)
4618 {
4619 struct stat st;
4620
4621- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
4622- path ? (*path ? path : "EMPTY!") : "NULL!"));
4623+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
4624+ nonempty (path));
4625 if ((!path) || (!*path))
4626 return 0;
4627
4628@@ -3780,8 +4605,8 @@ make_executable (const char *path)
4629 int rval = 0;
4630 struct stat st;
4631
4632- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
4633- path ? (*path ? path : "EMPTY!") : "NULL!"));
4634+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
4635+ nonempty (path));
4636 if ((!path) || (!*path))
4637 return 0;
4638
4639@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
4640 int tmp_len;
4641 char *concat_name;
4642
4643- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
4644- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
4645+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
4646+ nonempty (wrapper));
4647
4648 if ((wrapper == NULL) || (*wrapper == '\0'))
4649 return NULL;
4650@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
4651 {
4652 /* empty path: current directory */
4653 if (getcwd (tmp, LT_PATHMAX) == NULL)
4654- lt_fatal ("getcwd failed");
4655+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4656+ nonnull (strerror (errno)));
4657 tmp_len = strlen (tmp);
4658 concat_name =
4659 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4660@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
4661 }
4662 /* Relative path | not found in path: prepend cwd */
4663 if (getcwd (tmp, LT_PATHMAX) == NULL)
4664- lt_fatal ("getcwd failed");
4665+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4666+ nonnull (strerror (errno)));
4667 tmp_len = strlen (tmp);
4668 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4669 memcpy (concat_name, tmp, tmp_len);
4670@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
4671 int has_symlinks = 0;
4672 while (strlen (tmp_pathspec) && !has_symlinks)
4673 {
4674- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
4675- tmp_pathspec));
4676+ lt_debugprintf (__FILE__, __LINE__,
4677+ "checking path component for symlinks: %s\n",
4678+ tmp_pathspec);
4679 if (lstat (tmp_pathspec, &s) == 0)
4680 {
4681 if (S_ISLNK (s.st_mode) != 0)
4682@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
4683 }
4684 else
4685 {
4686- char *errstr = strerror (errno);
4687- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
4688+ lt_fatal (__FILE__, __LINE__,
4689+ "error accessing file \"%s\": %s",
4690+ tmp_pathspec, nonnull (strerror (errno)));
4691 }
4692 }
4693 XFREE (tmp_pathspec);
4694@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
4695 tmp_pathspec = realpath (pathspec, buf);
4696 if (tmp_pathspec == 0)
4697 {
4698- lt_fatal ("Could not follow symlinks for %s", pathspec);
4699+ lt_fatal (__FILE__, __LINE__,
4700+ "could not follow symlinks for %s", pathspec);
4701 }
4702 return xstrdup (tmp_pathspec);
4703 #endif
4704@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
4705 return str;
4706 }
4707
4708+void
4709+lt_debugprintf (const char *file, int line, const char *fmt, ...)
4710+{
4711+ va_list args;
4712+ if (lt_debug)
4713+ {
4714+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
4715+ va_start (args, fmt);
4716+ (void) vfprintf (stderr, fmt, args);
4717+ va_end (args);
4718+ }
4719+}
4720+
4721 static void
4722-lt_error_core (int exit_status, const char *mode,
4723+lt_error_core (int exit_status, const char *file,
4724+ int line, const char *mode,
4725 const char *message, va_list ap)
4726 {
4727- fprintf (stderr, "%s: %s: ", program_name, mode);
4728+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
4729 vfprintf (stderr, message, ap);
4730 fprintf (stderr, ".\n");
4731
4732@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
4733 }
4734
4735 void
4736-lt_fatal (const char *message, ...)
4737+lt_fatal (const char *file, int line, const char *message, ...)
4738 {
4739 va_list ap;
4740 va_start (ap, message);
4741- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
4742+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
4743 va_end (ap);
4744 }
4745
4746+static const char *
4747+nonnull (const char *s)
4748+{
4749+ return s ? s : "(null)";
4750+}
4751+
4752+static const char *
4753+nonempty (const char *s)
4754+{
4755+ return (s && !*s) ? "(empty)" : nonnull (s);
4756+}
4757+
4758 void
4759 lt_setenv (const char *name, const char *value)
4760 {
4761- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
4762- (name ? name : "<NULL>"),
4763- (value ? value : "<NULL>")));
4764+ lt_debugprintf (__FILE__, __LINE__,
4765+ "(lt_setenv) setting '%s' to '%s'\n",
4766+ nonnull (name), nonnull (value));
4767 {
4768 #ifdef HAVE_SETENV
4769 /* always make a copy, for consistency with !HAVE_SETENV */
4770@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
4771 void
4772 lt_update_exe_path (const char *name, const char *value)
4773 {
4774- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4775- (name ? name : "<NULL>"),
4776- (value ? value : "<NULL>")));
4777+ lt_debugprintf (__FILE__, __LINE__,
4778+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4779+ nonnull (name), nonnull (value));
4780
4781 if (name && *name && value && *value)
4782 {
4783@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
4784 void
4785 lt_update_lib_path (const char *name, const char *value)
4786 {
4787- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4788- (name ? name : "<NULL>"),
4789- (value ? value : "<NULL>")));
4790+ lt_debugprintf (__FILE__, __LINE__,
4791+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4792+ nonnull (name), nonnull (value));
4793
4794 if (name && *name && value && *value)
4795 {
4796@@ -4222,7 +5078,7 @@ EOF
4797 func_win32_import_lib_p ()
4798 {
4799 $opt_debug
4800- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
4801+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4802 *import*) : ;;
4803 *) false ;;
4804 esac
4805@@ -4401,9 +5257,9 @@ func_mode_link ()
4806 ;;
4807 *)
4808 if test "$prev" = dlfiles; then
4809- dlfiles="$dlfiles $arg"
4810+ func_append dlfiles " $arg"
4811 else
4812- dlprefiles="$dlprefiles $arg"
4813+ func_append dlprefiles " $arg"
4814 fi
4815 prev=
4816 continue
4817@@ -4427,7 +5283,7 @@ func_mode_link ()
4818 *-*-darwin*)
4819 case "$deplibs " in
4820 *" $qarg.ltframework "*) ;;
4821- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
4822+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
4823 ;;
4824 esac
4825 ;;
4826@@ -4446,7 +5302,7 @@ func_mode_link ()
4827 moreargs=
4828 for fil in `cat "$save_arg"`
4829 do
4830-# moreargs="$moreargs $fil"
4831+# func_append moreargs " $fil"
4832 arg=$fil
4833 # A libtool-controlled object.
4834
4835@@ -4475,7 +5331,7 @@ func_mode_link ()
4836
4837 if test "$prev" = dlfiles; then
4838 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
4839- dlfiles="$dlfiles $pic_object"
4840+ func_append dlfiles " $pic_object"
4841 prev=
4842 continue
4843 else
4844@@ -4487,7 +5343,7 @@ func_mode_link ()
4845 # CHECK ME: I think I busted this. -Ossama
4846 if test "$prev" = dlprefiles; then
4847 # Preload the old-style object.
4848- dlprefiles="$dlprefiles $pic_object"
4849+ func_append dlprefiles " $pic_object"
4850 prev=
4851 fi
4852
4853@@ -4557,12 +5413,12 @@ func_mode_link ()
4854 if test "$prev" = rpath; then
4855 case "$rpath " in
4856 *" $arg "*) ;;
4857- *) rpath="$rpath $arg" ;;
4858+ *) func_append rpath " $arg" ;;
4859 esac
4860 else
4861 case "$xrpath " in
4862 *" $arg "*) ;;
4863- *) xrpath="$xrpath $arg" ;;
4864+ *) func_append xrpath " $arg" ;;
4865 esac
4866 fi
4867 prev=
4868@@ -4574,28 +5430,28 @@ func_mode_link ()
4869 continue
4870 ;;
4871 weak)
4872- weak_libs="$weak_libs $arg"
4873+ func_append weak_libs " $arg"
4874 prev=
4875 continue
4876 ;;
4877 xcclinker)
4878- linker_flags="$linker_flags $qarg"
4879- compiler_flags="$compiler_flags $qarg"
4880+ func_append linker_flags " $qarg"
4881+ func_append compiler_flags " $qarg"
4882 prev=
4883 func_append compile_command " $qarg"
4884 func_append finalize_command " $qarg"
4885 continue
4886 ;;
4887 xcompiler)
4888- compiler_flags="$compiler_flags $qarg"
4889+ func_append compiler_flags " $qarg"
4890 prev=
4891 func_append compile_command " $qarg"
4892 func_append finalize_command " $qarg"
4893 continue
4894 ;;
4895 xlinker)
4896- linker_flags="$linker_flags $qarg"
4897- compiler_flags="$compiler_flags $wl$qarg"
4898+ func_append linker_flags " $qarg"
4899+ func_append compiler_flags " $wl$qarg"
4900 prev=
4901 func_append compile_command " $wl$qarg"
4902 func_append finalize_command " $wl$qarg"
4903@@ -4686,15 +5542,16 @@ func_mode_link ()
4904 ;;
4905
4906 -L*)
4907- func_stripname '-L' '' "$arg"
4908- dir=$func_stripname_result
4909- if test -z "$dir"; then
4910+ func_stripname "-L" '' "$arg"
4911+ if test -z "$func_stripname_result"; then
4912 if test "$#" -gt 0; then
4913 func_fatal_error "require no space between \`-L' and \`$1'"
4914 else
4915 func_fatal_error "need path for \`-L' option"
4916 fi
4917 fi
4918+ func_resolve_sysroot "$func_stripname_result"
4919+ dir=$func_resolve_sysroot_result
4920 # We need an absolute path.
4921 case $dir in
4922 [\\/]* | [A-Za-z]:[\\/]*) ;;
4923@@ -4706,10 +5563,16 @@ func_mode_link ()
4924 ;;
4925 esac
4926 case "$deplibs " in
4927- *" -L$dir "*) ;;
4928+ *" -L$dir "* | *" $arg "*)
4929+ # Will only happen for absolute or sysroot arguments
4930+ ;;
4931 *)
4932- deplibs="$deplibs -L$dir"
4933- lib_search_path="$lib_search_path $dir"
4934+ # Preserve sysroot, but never include relative directories
4935+ case $dir in
4936+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
4937+ *) func_append deplibs " -L$dir" ;;
4938+ esac
4939+ func_append lib_search_path " $dir"
4940 ;;
4941 esac
4942 case $host in
4943@@ -4718,12 +5581,12 @@ func_mode_link ()
4944 case :$dllsearchpath: in
4945 *":$dir:"*) ;;
4946 ::) dllsearchpath=$dir;;
4947- *) dllsearchpath="$dllsearchpath:$dir";;
4948+ *) func_append dllsearchpath ":$dir";;
4949 esac
4950 case :$dllsearchpath: in
4951 *":$testbindir:"*) ;;
4952 ::) dllsearchpath=$testbindir;;
4953- *) dllsearchpath="$dllsearchpath:$testbindir";;
4954+ *) func_append dllsearchpath ":$testbindir";;
4955 esac
4956 ;;
4957 esac
4958@@ -4747,7 +5610,7 @@ func_mode_link ()
4959 ;;
4960 *-*-rhapsody* | *-*-darwin1.[012])
4961 # Rhapsody C and math libraries are in the System framework
4962- deplibs="$deplibs System.ltframework"
4963+ func_append deplibs " System.ltframework"
4964 continue
4965 ;;
4966 *-*-sco3.2v5* | *-*-sco5v6*)
4967@@ -4758,9 +5621,6 @@ func_mode_link ()
4968 # Compiler inserts libc in the correct place for threads to work
4969 test "X$arg" = "X-lc" && continue
4970 ;;
4971- *-*-linux*)
4972- test "X$arg" = "X-lc" && continue
4973- ;;
4974 esac
4975 elif test "X$arg" = "X-lc_r"; then
4976 case $host in
4977@@ -4770,7 +5630,7 @@ func_mode_link ()
4978 ;;
4979 esac
4980 fi
4981- deplibs="$deplibs $arg"
4982+ func_append deplibs " $arg"
4983 continue
4984 ;;
4985
4986@@ -4782,8 +5642,8 @@ func_mode_link ()
4987 # Tru64 UNIX uses -model [arg] to determine the layout of C++
4988 # classes, name mangling, and exception handling.
4989 # Darwin uses the -arch flag to determine output architecture.
4990- -model|-arch|-isysroot)
4991- compiler_flags="$compiler_flags $arg"
4992+ -model|-arch|-isysroot|--sysroot)
4993+ func_append compiler_flags " $arg"
4994 func_append compile_command " $arg"
4995 func_append finalize_command " $arg"
4996 prev=xcompiler
4997@@ -4791,12 +5651,12 @@ func_mode_link ()
4998 ;;
4999
5000 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5001- compiler_flags="$compiler_flags $arg"
5002+ func_append compiler_flags " $arg"
5003 func_append compile_command " $arg"
5004 func_append finalize_command " $arg"
5005 case "$new_inherited_linker_flags " in
5006 *" $arg "*) ;;
5007- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5008+ * ) func_append new_inherited_linker_flags " $arg" ;;
5009 esac
5010 continue
5011 ;;
5012@@ -4863,13 +5723,17 @@ func_mode_link ()
5013 # We need an absolute path.
5014 case $dir in
5015 [\\/]* | [A-Za-z]:[\\/]*) ;;
5016+ =*)
5017+ func_stripname '=' '' "$dir"
5018+ dir=$lt_sysroot$func_stripname_result
5019+ ;;
5020 *)
5021 func_fatal_error "only absolute run-paths are allowed"
5022 ;;
5023 esac
5024 case "$xrpath " in
5025 *" $dir "*) ;;
5026- *) xrpath="$xrpath $dir" ;;
5027+ *) func_append xrpath " $dir" ;;
5028 esac
5029 continue
5030 ;;
5031@@ -4922,8 +5786,8 @@ func_mode_link ()
5032 for flag in $args; do
5033 IFS="$save_ifs"
5034 func_quote_for_eval "$flag"
5035- arg="$arg $func_quote_for_eval_result"
5036- compiler_flags="$compiler_flags $func_quote_for_eval_result"
5037+ func_append arg " $func_quote_for_eval_result"
5038+ func_append compiler_flags " $func_quote_for_eval_result"
5039 done
5040 IFS="$save_ifs"
5041 func_stripname ' ' '' "$arg"
5042@@ -4938,9 +5802,9 @@ func_mode_link ()
5043 for flag in $args; do
5044 IFS="$save_ifs"
5045 func_quote_for_eval "$flag"
5046- arg="$arg $wl$func_quote_for_eval_result"
5047- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5048- linker_flags="$linker_flags $func_quote_for_eval_result"
5049+ func_append arg " $wl$func_quote_for_eval_result"
5050+ func_append compiler_flags " $wl$func_quote_for_eval_result"
5051+ func_append linker_flags " $func_quote_for_eval_result"
5052 done
5053 IFS="$save_ifs"
5054 func_stripname ' ' '' "$arg"
5055@@ -4968,24 +5832,27 @@ func_mode_link ()
5056 arg="$func_quote_for_eval_result"
5057 ;;
5058
5059- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
5060- # -r[0-9][0-9]* specifies the processor on the SGI compiler
5061- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
5062- # +DA*, +DD* enable 64-bit mode on the HP compiler
5063- # -q* pass through compiler args for the IBM compiler
5064- # -m*, -t[45]*, -txscale* pass through architecture-specific
5065- # compiler args for GCC
5066- # -F/path gives path to uninstalled frameworks, gcc on darwin
5067- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
5068- # @file GCC response files
5069- # -tp=* Portland pgcc target processor selection
5070+ # Flags to be passed through unchanged, with rationale:
5071+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
5072+ # -r[0-9][0-9]* specify processor for the SGI compiler
5073+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
5074+ # +DA*, +DD* enable 64-bit mode for the HP compiler
5075+ # -q* compiler args for the IBM compiler
5076+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
5077+ # -F/path path to uninstalled frameworks, gcc on darwin
5078+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5079+ # @file GCC response files
5080+ # -tp=* Portland pgcc target processor selection
5081+ # --sysroot=* for sysroot support
5082+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5083 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5084- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5085+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5086+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5087 func_quote_for_eval "$arg"
5088 arg="$func_quote_for_eval_result"
5089 func_append compile_command " $arg"
5090 func_append finalize_command " $arg"
5091- compiler_flags="$compiler_flags $arg"
5092+ func_append compiler_flags " $arg"
5093 continue
5094 ;;
5095
5096@@ -4997,7 +5864,7 @@ func_mode_link ()
5097
5098 *.$objext)
5099 # A standard object.
5100- objs="$objs $arg"
5101+ func_append objs " $arg"
5102 ;;
5103
5104 *.lo)
5105@@ -5028,7 +5895,7 @@ func_mode_link ()
5106
5107 if test "$prev" = dlfiles; then
5108 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5109- dlfiles="$dlfiles $pic_object"
5110+ func_append dlfiles " $pic_object"
5111 prev=
5112 continue
5113 else
5114@@ -5040,7 +5907,7 @@ func_mode_link ()
5115 # CHECK ME: I think I busted this. -Ossama
5116 if test "$prev" = dlprefiles; then
5117 # Preload the old-style object.
5118- dlprefiles="$dlprefiles $pic_object"
5119+ func_append dlprefiles " $pic_object"
5120 prev=
5121 fi
5122
5123@@ -5085,24 +5952,25 @@ func_mode_link ()
5124
5125 *.$libext)
5126 # An archive.
5127- deplibs="$deplibs $arg"
5128- old_deplibs="$old_deplibs $arg"
5129+ func_append deplibs " $arg"
5130+ func_append old_deplibs " $arg"
5131 continue
5132 ;;
5133
5134 *.la)
5135 # A libtool-controlled library.
5136
5137+ func_resolve_sysroot "$arg"
5138 if test "$prev" = dlfiles; then
5139 # This library was specified with -dlopen.
5140- dlfiles="$dlfiles $arg"
5141+ func_append dlfiles " $func_resolve_sysroot_result"
5142 prev=
5143 elif test "$prev" = dlprefiles; then
5144 # The library was specified with -dlpreopen.
5145- dlprefiles="$dlprefiles $arg"
5146+ func_append dlprefiles " $func_resolve_sysroot_result"
5147 prev=
5148 else
5149- deplibs="$deplibs $arg"
5150+ func_append deplibs " $func_resolve_sysroot_result"
5151 fi
5152 continue
5153 ;;
5154@@ -5127,7 +5995,7 @@ func_mode_link ()
5155 func_fatal_help "the \`$prevarg' option requires an argument"
5156
5157 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
5158- eval "arg=\"$export_dynamic_flag_spec\""
5159+ eval arg=\"$export_dynamic_flag_spec\"
5160 func_append compile_command " $arg"
5161 func_append finalize_command " $arg"
5162 fi
5163@@ -5144,11 +6012,13 @@ func_mode_link ()
5164 else
5165 shlib_search_path=
5166 fi
5167- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
5168- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
5169+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
5170+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
5171
5172 func_dirname "$output" "/" ""
5173 output_objdir="$func_dirname_result$objdir"
5174+ func_to_tool_file "$output_objdir/"
5175+ tool_output_objdir=$func_to_tool_file_result
5176 # Create the object directory.
5177 func_mkdir_p "$output_objdir"
5178
5179@@ -5169,12 +6039,12 @@ func_mode_link ()
5180 # Find all interdependent deplibs by searching for libraries
5181 # that are linked more than once (e.g. -la -lb -la)
5182 for deplib in $deplibs; do
5183- if $opt_duplicate_deps ; then
5184+ if $opt_preserve_dup_deps ; then
5185 case "$libs " in
5186- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5187+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5188 esac
5189 fi
5190- libs="$libs $deplib"
5191+ func_append libs " $deplib"
5192 done
5193
5194 if test "$linkmode" = lib; then
5195@@ -5187,9 +6057,9 @@ func_mode_link ()
5196 if $opt_duplicate_compiler_generated_deps; then
5197 for pre_post_dep in $predeps $postdeps; do
5198 case "$pre_post_deps " in
5199- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
5200+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5201 esac
5202- pre_post_deps="$pre_post_deps $pre_post_dep"
5203+ func_append pre_post_deps " $pre_post_dep"
5204 done
5205 fi
5206 pre_post_deps=
5207@@ -5256,8 +6126,9 @@ func_mode_link ()
5208 for lib in $dlprefiles; do
5209 # Ignore non-libtool-libs
5210 dependency_libs=
5211+ func_resolve_sysroot "$lib"
5212 case $lib in
5213- *.la) func_source "$lib" ;;
5214+ *.la) func_source "$func_resolve_sysroot_result" ;;
5215 esac
5216
5217 # Collect preopened libtool deplibs, except any this library
5218@@ -5267,7 +6138,7 @@ func_mode_link ()
5219 deplib_base=$func_basename_result
5220 case " $weak_libs " in
5221 *" $deplib_base "*) ;;
5222- *) deplibs="$deplibs $deplib" ;;
5223+ *) func_append deplibs " $deplib" ;;
5224 esac
5225 done
5226 done
5227@@ -5288,11 +6159,11 @@ func_mode_link ()
5228 compile_deplibs="$deplib $compile_deplibs"
5229 finalize_deplibs="$deplib $finalize_deplibs"
5230 else
5231- compiler_flags="$compiler_flags $deplib"
5232+ func_append compiler_flags " $deplib"
5233 if test "$linkmode" = lib ; then
5234 case "$new_inherited_linker_flags " in
5235 *" $deplib "*) ;;
5236- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5237+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5238 esac
5239 fi
5240 fi
5241@@ -5377,7 +6248,7 @@ func_mode_link ()
5242 if test "$linkmode" = lib ; then
5243 case "$new_inherited_linker_flags " in
5244 *" $deplib "*) ;;
5245- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5246+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5247 esac
5248 fi
5249 fi
5250@@ -5390,7 +6261,8 @@ func_mode_link ()
5251 test "$pass" = conv && continue
5252 newdependency_libs="$deplib $newdependency_libs"
5253 func_stripname '-L' '' "$deplib"
5254- newlib_search_path="$newlib_search_path $func_stripname_result"
5255+ func_resolve_sysroot "$func_stripname_result"
5256+ func_append newlib_search_path " $func_resolve_sysroot_result"
5257 ;;
5258 prog)
5259 if test "$pass" = conv; then
5260@@ -5404,7 +6276,8 @@ func_mode_link ()
5261 finalize_deplibs="$deplib $finalize_deplibs"
5262 fi
5263 func_stripname '-L' '' "$deplib"
5264- newlib_search_path="$newlib_search_path $func_stripname_result"
5265+ func_resolve_sysroot "$func_stripname_result"
5266+ func_append newlib_search_path " $func_resolve_sysroot_result"
5267 ;;
5268 *)
5269 func_warning "\`-L' is ignored for archives/objects"
5270@@ -5415,17 +6288,21 @@ func_mode_link ()
5271 -R*)
5272 if test "$pass" = link; then
5273 func_stripname '-R' '' "$deplib"
5274- dir=$func_stripname_result
5275+ func_resolve_sysroot "$func_stripname_result"
5276+ dir=$func_resolve_sysroot_result
5277 # Make sure the xrpath contains only unique directories.
5278 case "$xrpath " in
5279 *" $dir "*) ;;
5280- *) xrpath="$xrpath $dir" ;;
5281+ *) func_append xrpath " $dir" ;;
5282 esac
5283 fi
5284 deplibs="$deplib $deplibs"
5285 continue
5286 ;;
5287- *.la) lib="$deplib" ;;
5288+ *.la)
5289+ func_resolve_sysroot "$deplib"
5290+ lib=$func_resolve_sysroot_result
5291+ ;;
5292 *.$libext)
5293 if test "$pass" = conv; then
5294 deplibs="$deplib $deplibs"
5295@@ -5488,11 +6365,11 @@ func_mode_link ()
5296 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
5297 # If there is no dlopen support or we're linking statically,
5298 # we need to preload.
5299- newdlprefiles="$newdlprefiles $deplib"
5300+ func_append newdlprefiles " $deplib"
5301 compile_deplibs="$deplib $compile_deplibs"
5302 finalize_deplibs="$deplib $finalize_deplibs"
5303 else
5304- newdlfiles="$newdlfiles $deplib"
5305+ func_append newdlfiles " $deplib"
5306 fi
5307 fi
5308 continue
5309@@ -5538,7 +6415,7 @@ func_mode_link ()
5310 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5311 case " $new_inherited_linker_flags " in
5312 *" $tmp_inherited_linker_flag "*) ;;
5313- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
5314+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5315 esac
5316 done
5317 fi
5318@@ -5546,8 +6423,8 @@ func_mode_link ()
5319 if test "$linkmode,$pass" = "lib,link" ||
5320 test "$linkmode,$pass" = "prog,scan" ||
5321 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
5322- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5323- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
5324+ test -n "$dlopen" && func_append dlfiles " $dlopen"
5325+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5326 fi
5327
5328 if test "$pass" = conv; then
5329@@ -5558,20 +6435,20 @@ func_mode_link ()
5330 func_fatal_error "cannot find name of link library for \`$lib'"
5331 fi
5332 # It is a libtool convenience library, so add in its objects.
5333- convenience="$convenience $ladir/$objdir/$old_library"
5334- old_convenience="$old_convenience $ladir/$objdir/$old_library"
5335+ func_append convenience " $ladir/$objdir/$old_library"
5336+ func_append old_convenience " $ladir/$objdir/$old_library"
5337 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5338 func_fatal_error "\`$lib' is not a convenience library"
5339 fi
5340 tmp_libs=
5341 for deplib in $dependency_libs; do
5342 deplibs="$deplib $deplibs"
5343- if $opt_duplicate_deps ; then
5344+ if $opt_preserve_dup_deps ; then
5345 case "$tmp_libs " in
5346- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5347+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5348 esac
5349 fi
5350- tmp_libs="$tmp_libs $deplib"
5351+ func_append tmp_libs " $deplib"
5352 done
5353 continue
5354 fi # $pass = conv
5355@@ -5579,9 +6456,15 @@ func_mode_link ()
5356
5357 # Get the name of the library we link against.
5358 linklib=
5359- for l in $old_library $library_names; do
5360- linklib="$l"
5361- done
5362+ if test -n "$old_library" &&
5363+ { test "$prefer_static_libs" = yes ||
5364+ test "$prefer_static_libs,$installed" = "built,no"; }; then
5365+ linklib=$old_library
5366+ else
5367+ for l in $old_library $library_names; do
5368+ linklib="$l"
5369+ done
5370+ fi
5371 if test -z "$linklib"; then
5372 func_fatal_error "cannot find name of link library for \`$lib'"
5373 fi
5374@@ -5598,9 +6481,9 @@ func_mode_link ()
5375 # statically, we need to preload. We also need to preload any
5376 # dependent libraries so libltdl's deplib preloader doesn't
5377 # bomb out in the load deplibs phase.
5378- dlprefiles="$dlprefiles $lib $dependency_libs"
5379+ func_append dlprefiles " $lib $dependency_libs"
5380 else
5381- newdlfiles="$newdlfiles $lib"
5382+ func_append newdlfiles " $lib"
5383 fi
5384 continue
5385 fi # $pass = dlopen
5386@@ -5622,14 +6505,14 @@ func_mode_link ()
5387
5388 # Find the relevant object directory and library name.
5389 if test "X$installed" = Xyes; then
5390- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5391+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5392 func_warning "library \`$lib' was moved."
5393 dir="$ladir"
5394 absdir="$abs_ladir"
5395 libdir="$abs_ladir"
5396 else
5397- dir="$libdir"
5398- absdir="$libdir"
5399+ dir="$lt_sysroot$libdir"
5400+ absdir="$lt_sysroot$libdir"
5401 fi
5402 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
5403 else
5404@@ -5637,12 +6520,12 @@ func_mode_link ()
5405 dir="$ladir"
5406 absdir="$abs_ladir"
5407 # Remove this search path later
5408- notinst_path="$notinst_path $abs_ladir"
5409+ func_append notinst_path " $abs_ladir"
5410 else
5411 dir="$ladir/$objdir"
5412 absdir="$abs_ladir/$objdir"
5413 # Remove this search path later
5414- notinst_path="$notinst_path $abs_ladir"
5415+ func_append notinst_path " $abs_ladir"
5416 fi
5417 fi # $installed = yes
5418 func_stripname 'lib' '.la' "$laname"
5419@@ -5653,20 +6536,46 @@ func_mode_link ()
5420 if test -z "$libdir" && test "$linkmode" = prog; then
5421 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
5422 fi
5423- # Prefer using a static library (so that no silly _DYNAMIC symbols
5424- # are required to link).
5425- if test -n "$old_library"; then
5426- newdlprefiles="$newdlprefiles $dir/$old_library"
5427- # Keep a list of preopened convenience libraries to check
5428- # that they are being used correctly in the link pass.
5429- test -z "$libdir" && \
5430- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5431- # Otherwise, use the dlname, so that lt_dlopen finds it.
5432- elif test -n "$dlname"; then
5433- newdlprefiles="$newdlprefiles $dir/$dlname"
5434- else
5435- newdlprefiles="$newdlprefiles $dir/$linklib"
5436- fi
5437+ case "$host" in
5438+ # special handling for platforms with PE-DLLs.
5439+ *cygwin* | *mingw* | *cegcc* )
5440+ # Linker will automatically link against shared library if both
5441+ # static and shared are present. Therefore, ensure we extract
5442+ # symbols from the import library if a shared library is present
5443+ # (otherwise, the dlopen module name will be incorrect). We do
5444+ # this by putting the import library name into $newdlprefiles.
5445+ # We recover the dlopen module name by 'saving' the la file
5446+ # name in a special purpose variable, and (later) extracting the
5447+ # dlname from the la file.
5448+ if test -n "$dlname"; then
5449+ func_tr_sh "$dir/$linklib"
5450+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
5451+ func_append newdlprefiles " $dir/$linklib"
5452+ else
5453+ func_append newdlprefiles " $dir/$old_library"
5454+ # Keep a list of preopened convenience libraries to check
5455+ # that they are being used correctly in the link pass.
5456+ test -z "$libdir" && \
5457+ func_append dlpreconveniencelibs " $dir/$old_library"
5458+ fi
5459+ ;;
5460+ * )
5461+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5462+ # are required to link).
5463+ if test -n "$old_library"; then
5464+ func_append newdlprefiles " $dir/$old_library"
5465+ # Keep a list of preopened convenience libraries to check
5466+ # that they are being used correctly in the link pass.
5467+ test -z "$libdir" && \
5468+ func_append dlpreconveniencelibs " $dir/$old_library"
5469+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5470+ elif test -n "$dlname"; then
5471+ func_append newdlprefiles " $dir/$dlname"
5472+ else
5473+ func_append newdlprefiles " $dir/$linklib"
5474+ fi
5475+ ;;
5476+ esac
5477 fi # $pass = dlpreopen
5478
5479 if test -z "$libdir"; then
5480@@ -5684,7 +6593,7 @@ func_mode_link ()
5481
5482
5483 if test "$linkmode" = prog && test "$pass" != link; then
5484- newlib_search_path="$newlib_search_path $ladir"
5485+ func_append newlib_search_path " $ladir"
5486 deplibs="$lib $deplibs"
5487
5488 linkalldeplibs=no
5489@@ -5697,7 +6606,8 @@ func_mode_link ()
5490 for deplib in $dependency_libs; do
5491 case $deplib in
5492 -L*) func_stripname '-L' '' "$deplib"
5493- newlib_search_path="$newlib_search_path $func_stripname_result"
5494+ func_resolve_sysroot "$func_stripname_result"
5495+ func_append newlib_search_path " $func_resolve_sysroot_result"
5496 ;;
5497 esac
5498 # Need to link against all dependency_libs?
5499@@ -5708,12 +6618,12 @@ func_mode_link ()
5500 # or/and link against static libraries
5501 newdependency_libs="$deplib $newdependency_libs"
5502 fi
5503- if $opt_duplicate_deps ; then
5504+ if $opt_preserve_dup_deps ; then
5505 case "$tmp_libs " in
5506- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5507+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5508 esac
5509 fi
5510- tmp_libs="$tmp_libs $deplib"
5511+ func_append tmp_libs " $deplib"
5512 done # for deplib
5513 continue
5514 fi # $linkmode = prog...
5515@@ -5728,7 +6638,7 @@ func_mode_link ()
5516 # Make sure the rpath contains only unique directories.
5517 case "$temp_rpath:" in
5518 *"$absdir:"*) ;;
5519- *) temp_rpath="$temp_rpath$absdir:" ;;
5520+ *) func_append temp_rpath "$absdir:" ;;
5521 esac
5522 fi
5523
5524@@ -5740,7 +6650,7 @@ func_mode_link ()
5525 *)
5526 case "$compile_rpath " in
5527 *" $absdir "*) ;;
5528- *) compile_rpath="$compile_rpath $absdir"
5529+ *) func_append compile_rpath " $absdir" ;;
5530 esac
5531 ;;
5532 esac
5533@@ -5749,7 +6659,7 @@ func_mode_link ()
5534 *)
5535 case "$finalize_rpath " in
5536 *" $libdir "*) ;;
5537- *) finalize_rpath="$finalize_rpath $libdir"
5538+ *) func_append finalize_rpath " $libdir" ;;
5539 esac
5540 ;;
5541 esac
5542@@ -5774,12 +6684,12 @@ func_mode_link ()
5543 case $host in
5544 *cygwin* | *mingw* | *cegcc*)
5545 # No point in relinking DLLs because paths are not encoded
5546- notinst_deplibs="$notinst_deplibs $lib"
5547+ func_append notinst_deplibs " $lib"
5548 need_relink=no
5549 ;;
5550 *)
5551 if test "$installed" = no; then
5552- notinst_deplibs="$notinst_deplibs $lib"
5553+ func_append notinst_deplibs " $lib"
5554 need_relink=yes
5555 fi
5556 ;;
5557@@ -5814,7 +6724,7 @@ func_mode_link ()
5558 *)
5559 case "$compile_rpath " in
5560 *" $absdir "*) ;;
5561- *) compile_rpath="$compile_rpath $absdir"
5562+ *) func_append compile_rpath " $absdir" ;;
5563 esac
5564 ;;
5565 esac
5566@@ -5823,7 +6733,7 @@ func_mode_link ()
5567 *)
5568 case "$finalize_rpath " in
5569 *" $libdir "*) ;;
5570- *) finalize_rpath="$finalize_rpath $libdir"
5571+ *) func_append finalize_rpath " $libdir" ;;
5572 esac
5573 ;;
5574 esac
5575@@ -5835,7 +6745,7 @@ func_mode_link ()
5576 shift
5577 realname="$1"
5578 shift
5579- eval "libname=\"$libname_spec\""
5580+ libname=`eval "\\$ECHO \"$libname_spec\""`
5581 # use dlname if we got it. it's perfectly good, no?
5582 if test -n "$dlname"; then
5583 soname="$dlname"
5584@@ -5848,7 +6758,7 @@ func_mode_link ()
5585 versuffix="-$major"
5586 ;;
5587 esac
5588- eval "soname=\"$soname_spec\""
5589+ eval soname=\"$soname_spec\"
5590 else
5591 soname="$realname"
5592 fi
5593@@ -5877,7 +6787,7 @@ func_mode_link ()
5594 linklib=$newlib
5595 fi # test -n "$old_archive_from_expsyms_cmds"
5596
5597- if test "$linkmode" = prog || test "$mode" != relink; then
5598+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
5599 add_shlibpath=
5600 add_dir=
5601 add=
5602@@ -5933,7 +6843,7 @@ func_mode_link ()
5603 if test -n "$inst_prefix_dir"; then
5604 case $libdir in
5605 [\\/]*)
5606- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5607+ func_append add_dir " -L$inst_prefix_dir$libdir"
5608 ;;
5609 esac
5610 fi
5611@@ -5955,7 +6865,7 @@ func_mode_link ()
5612 if test -n "$add_shlibpath"; then
5613 case :$compile_shlibpath: in
5614 *":$add_shlibpath:"*) ;;
5615- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
5616+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
5617 esac
5618 fi
5619 if test "$linkmode" = prog; then
5620@@ -5969,13 +6879,13 @@ func_mode_link ()
5621 test "$hardcode_shlibpath_var" = yes; then
5622 case :$finalize_shlibpath: in
5623 *":$libdir:"*) ;;
5624- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5625+ *) func_append finalize_shlibpath "$libdir:" ;;
5626 esac
5627 fi
5628 fi
5629 fi
5630
5631- if test "$linkmode" = prog || test "$mode" = relink; then
5632+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
5633 add_shlibpath=
5634 add_dir=
5635 add=
5636@@ -5989,7 +6899,7 @@ func_mode_link ()
5637 elif test "$hardcode_shlibpath_var" = yes; then
5638 case :$finalize_shlibpath: in
5639 *":$libdir:"*) ;;
5640- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5641+ *) func_append finalize_shlibpath "$libdir:" ;;
5642 esac
5643 add="-l$name"
5644 elif test "$hardcode_automatic" = yes; then
5645@@ -6001,12 +6911,12 @@ func_mode_link ()
5646 fi
5647 else
5648 # We cannot seem to hardcode it, guess we'll fake it.
5649- add_dir="-L$libdir"
5650+ add_dir="-L$lt_sysroot$libdir"
5651 # Try looking first in the location we're being installed to.
5652 if test -n "$inst_prefix_dir"; then
5653 case $libdir in
5654 [\\/]*)
5655- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5656+ func_append add_dir " -L$inst_prefix_dir$libdir"
5657 ;;
5658 esac
5659 fi
5660@@ -6083,27 +6993,33 @@ func_mode_link ()
5661 temp_xrpath=$func_stripname_result
5662 case " $xrpath " in
5663 *" $temp_xrpath "*) ;;
5664- *) xrpath="$xrpath $temp_xrpath";;
5665+ *) func_append xrpath " $temp_xrpath";;
5666 esac;;
5667- *) temp_deplibs="$temp_deplibs $libdir";;
5668+ *) func_append temp_deplibs " $libdir";;
5669 esac
5670 done
5671 dependency_libs="$temp_deplibs"
5672 fi
5673
5674- newlib_search_path="$newlib_search_path $absdir"
5675+ func_append newlib_search_path " $absdir"
5676 # Link against this library
5677 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
5678 # ... and its dependency_libs
5679 tmp_libs=
5680 for deplib in $dependency_libs; do
5681 newdependency_libs="$deplib $newdependency_libs"
5682- if $opt_duplicate_deps ; then
5683+ case $deplib in
5684+ -L*) func_stripname '-L' '' "$deplib"
5685+ func_resolve_sysroot "$func_stripname_result";;
5686+ *) func_resolve_sysroot "$deplib" ;;
5687+ esac
5688+ if $opt_preserve_dup_deps ; then
5689 case "$tmp_libs " in
5690- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5691+ *" $func_resolve_sysroot_result "*)
5692+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
5693 esac
5694 fi
5695- tmp_libs="$tmp_libs $deplib"
5696+ func_append tmp_libs " $func_resolve_sysroot_result"
5697 done
5698
5699 if test "$link_all_deplibs" != no; then
5700@@ -6113,8 +7029,10 @@ func_mode_link ()
5701 case $deplib in
5702 -L*) path="$deplib" ;;
5703 *.la)
5704+ func_resolve_sysroot "$deplib"
5705+ deplib=$func_resolve_sysroot_result
5706 func_dirname "$deplib" "" "."
5707- dir="$func_dirname_result"
5708+ dir=$func_dirname_result
5709 # We need an absolute path.
5710 case $dir in
5711 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
5712@@ -6130,7 +7048,7 @@ func_mode_link ()
5713 case $host in
5714 *-*-darwin*)
5715 depdepl=
5716- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5717+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5718 if test -n "$deplibrary_names" ; then
5719 for tmp in $deplibrary_names ; do
5720 depdepl=$tmp
5721@@ -6141,8 +7059,8 @@ func_mode_link ()
5722 if test -z "$darwin_install_name"; then
5723 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
5724 fi
5725- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5726- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
5727+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5728+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
5729 path=
5730 fi
5731 fi
5732@@ -6152,7 +7070,7 @@ func_mode_link ()
5733 ;;
5734 esac
5735 else
5736- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5737+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5738 test -z "$libdir" && \
5739 func_fatal_error "\`$deplib' is not a valid libtool archive"
5740 test "$absdir" != "$libdir" && \
5741@@ -6192,7 +7110,7 @@ func_mode_link ()
5742 for dir in $newlib_search_path; do
5743 case "$lib_search_path " in
5744 *" $dir "*) ;;
5745- *) lib_search_path="$lib_search_path $dir" ;;
5746+ *) func_append lib_search_path " $dir" ;;
5747 esac
5748 done
5749 newlib_search_path=
5750@@ -6205,7 +7123,7 @@ func_mode_link ()
5751 fi
5752 for var in $vars dependency_libs; do
5753 # Add libraries to $var in reverse order
5754- eval tmp_libs=\$$var
5755+ eval tmp_libs=\"\$$var\"
5756 new_libs=
5757 for deplib in $tmp_libs; do
5758 # FIXME: Pedantically, this is the right thing to do, so
5759@@ -6250,13 +7168,13 @@ func_mode_link ()
5760 -L*)
5761 case " $tmp_libs " in
5762 *" $deplib "*) ;;
5763- *) tmp_libs="$tmp_libs $deplib" ;;
5764+ *) func_append tmp_libs " $deplib" ;;
5765 esac
5766 ;;
5767- *) tmp_libs="$tmp_libs $deplib" ;;
5768+ *) func_append tmp_libs " $deplib" ;;
5769 esac
5770 done
5771- eval $var=\$tmp_libs
5772+ eval $var=\"$tmp_libs\"
5773 done # for var
5774 fi
5775 # Last step: remove runtime libs from dependency_libs
5776@@ -6269,7 +7187,7 @@ func_mode_link ()
5777 ;;
5778 esac
5779 if test -n "$i" ; then
5780- tmp_libs="$tmp_libs $i"
5781+ func_append tmp_libs " $i"
5782 fi
5783 done
5784 dependency_libs=$tmp_libs
5785@@ -6310,7 +7228,7 @@ func_mode_link ()
5786 # Now set the variables for building old libraries.
5787 build_libtool_libs=no
5788 oldlibs="$output"
5789- objs="$objs$old_deplibs"
5790+ func_append objs "$old_deplibs"
5791 ;;
5792
5793 lib)
5794@@ -6319,8 +7237,8 @@ func_mode_link ()
5795 lib*)
5796 func_stripname 'lib' '.la' "$outputname"
5797 name=$func_stripname_result
5798- eval "shared_ext=\"$shrext_cmds\""
5799- eval "libname=\"$libname_spec\""
5800+ eval shared_ext=\"$shrext_cmds\"
5801+ eval libname=\"$libname_spec\"
5802 ;;
5803 *)
5804 test "$module" = no && \
5805@@ -6330,8 +7248,8 @@ func_mode_link ()
5806 # Add the "lib" prefix for modules if required
5807 func_stripname '' '.la' "$outputname"
5808 name=$func_stripname_result
5809- eval "shared_ext=\"$shrext_cmds\""
5810- eval "libname=\"$libname_spec\""
5811+ eval shared_ext=\"$shrext_cmds\"
5812+ eval libname=\"$libname_spec\"
5813 else
5814 func_stripname '' '.la' "$outputname"
5815 libname=$func_stripname_result
5816@@ -6346,7 +7264,7 @@ func_mode_link ()
5817 echo
5818 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
5819 $ECHO "*** objects $objs is not portable!"
5820- libobjs="$libobjs $objs"
5821+ func_append libobjs " $objs"
5822 fi
5823 fi
5824
5825@@ -6544,7 +7462,7 @@ func_mode_link ()
5826 done
5827
5828 # Make executables depend on our current version.
5829- verstring="$verstring:${current}.0"
5830+ func_append verstring ":${current}.0"
5831 ;;
5832
5833 qnx)
5834@@ -6612,10 +7530,10 @@ func_mode_link ()
5835 fi
5836
5837 func_generate_dlsyms "$libname" "$libname" "yes"
5838- libobjs="$libobjs $symfileobj"
5839+ func_append libobjs " $symfileobj"
5840 test "X$libobjs" = "X " && libobjs=
5841
5842- if test "$mode" != relink; then
5843+ if test "$opt_mode" != relink; then
5844 # Remove our outputs, but don't remove object files since they
5845 # may have been created when compiling PIC objects.
5846 removelist=
5847@@ -6631,7 +7549,7 @@ func_mode_link ()
5848 continue
5849 fi
5850 fi
5851- removelist="$removelist $p"
5852+ func_append removelist " $p"
5853 ;;
5854 *) ;;
5855 esac
5856@@ -6642,7 +7560,7 @@ func_mode_link ()
5857
5858 # Now set the variables for building old libraries.
5859 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
5860- oldlibs="$oldlibs $output_objdir/$libname.$libext"
5861+ func_append oldlibs " $output_objdir/$libname.$libext"
5862
5863 # Transform .lo files to .o files.
5864 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
5865@@ -6659,10 +7577,11 @@ func_mode_link ()
5866 # If the user specified any rpath flags, then add them.
5867 temp_xrpath=
5868 for libdir in $xrpath; do
5869- temp_xrpath="$temp_xrpath -R$libdir"
5870+ func_replace_sysroot "$libdir"
5871+ func_append temp_xrpath " -R$func_replace_sysroot_result"
5872 case "$finalize_rpath " in
5873 *" $libdir "*) ;;
5874- *) finalize_rpath="$finalize_rpath $libdir" ;;
5875+ *) func_append finalize_rpath " $libdir" ;;
5876 esac
5877 done
5878 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
5879@@ -6676,7 +7595,7 @@ func_mode_link ()
5880 for lib in $old_dlfiles; do
5881 case " $dlprefiles $dlfiles " in
5882 *" $lib "*) ;;
5883- *) dlfiles="$dlfiles $lib" ;;
5884+ *) func_append dlfiles " $lib" ;;
5885 esac
5886 done
5887
5888@@ -6686,7 +7605,7 @@ func_mode_link ()
5889 for lib in $old_dlprefiles; do
5890 case "$dlprefiles " in
5891 *" $lib "*) ;;
5892- *) dlprefiles="$dlprefiles $lib" ;;
5893+ *) func_append dlprefiles " $lib" ;;
5894 esac
5895 done
5896
5897@@ -6698,7 +7617,7 @@ func_mode_link ()
5898 ;;
5899 *-*-rhapsody* | *-*-darwin1.[012])
5900 # Rhapsody C library is in the System framework
5901- deplibs="$deplibs System.ltframework"
5902+ func_append deplibs " System.ltframework"
5903 ;;
5904 *-*-netbsd*)
5905 # Don't link with libc until the a.out ld.so is fixed.
5906@@ -6715,7 +7634,7 @@ func_mode_link ()
5907 *)
5908 # Add libc to deplibs on all other systems if necessary.
5909 if test "$build_libtool_need_lc" = "yes"; then
5910- deplibs="$deplibs -lc"
5911+ func_append deplibs " -lc"
5912 fi
5913 ;;
5914 esac
5915@@ -6764,18 +7683,18 @@ EOF
5916 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5917 case " $predeps $postdeps " in
5918 *" $i "*)
5919- newdeplibs="$newdeplibs $i"
5920+ func_append newdeplibs " $i"
5921 i=""
5922 ;;
5923 esac
5924 fi
5925 if test -n "$i" ; then
5926- eval "libname=\"$libname_spec\""
5927- eval "deplib_matches=\"$library_names_spec\""
5928+ libname=`eval "\\$ECHO \"$libname_spec\""`
5929+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5930 set dummy $deplib_matches; shift
5931 deplib_match=$1
5932 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5933- newdeplibs="$newdeplibs $i"
5934+ func_append newdeplibs " $i"
5935 else
5936 droppeddeps=yes
5937 echo
5938@@ -6789,7 +7708,7 @@ EOF
5939 fi
5940 ;;
5941 *)
5942- newdeplibs="$newdeplibs $i"
5943+ func_append newdeplibs " $i"
5944 ;;
5945 esac
5946 done
5947@@ -6807,18 +7726,18 @@ EOF
5948 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5949 case " $predeps $postdeps " in
5950 *" $i "*)
5951- newdeplibs="$newdeplibs $i"
5952+ func_append newdeplibs " $i"
5953 i=""
5954 ;;
5955 esac
5956 fi
5957 if test -n "$i" ; then
5958- eval "libname=\"$libname_spec\""
5959- eval "deplib_matches=\"$library_names_spec\""
5960+ libname=`eval "\\$ECHO \"$libname_spec\""`
5961+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5962 set dummy $deplib_matches; shift
5963 deplib_match=$1
5964 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5965- newdeplibs="$newdeplibs $i"
5966+ func_append newdeplibs " $i"
5967 else
5968 droppeddeps=yes
5969 echo
5970@@ -6840,7 +7759,7 @@ EOF
5971 fi
5972 ;;
5973 *)
5974- newdeplibs="$newdeplibs $i"
5975+ func_append newdeplibs " $i"
5976 ;;
5977 esac
5978 done
5979@@ -6857,15 +7776,27 @@ EOF
5980 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5981 case " $predeps $postdeps " in
5982 *" $a_deplib "*)
5983- newdeplibs="$newdeplibs $a_deplib"
5984+ func_append newdeplibs " $a_deplib"
5985 a_deplib=""
5986 ;;
5987 esac
5988 fi
5989 if test -n "$a_deplib" ; then
5990- eval "libname=\"$libname_spec\""
5991+ libname=`eval "\\$ECHO \"$libname_spec\""`
5992+ if test -n "$file_magic_glob"; then
5993+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
5994+ else
5995+ libnameglob=$libname
5996+ fi
5997+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
5998 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
5999- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6000+ if test "$want_nocaseglob" = yes; then
6001+ shopt -s nocaseglob
6002+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6003+ $nocaseglob
6004+ else
6005+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6006+ fi
6007 for potent_lib in $potential_libs; do
6008 # Follow soft links.
6009 if ls -lLd "$potent_lib" 2>/dev/null |
6010@@ -6885,10 +7816,10 @@ EOF
6011 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6012 esac
6013 done
6014- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
6015+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
6016 $SED -e 10q |
6017 $EGREP "$file_magic_regex" > /dev/null; then
6018- newdeplibs="$newdeplibs $a_deplib"
6019+ func_append newdeplibs " $a_deplib"
6020 a_deplib=""
6021 break 2
6022 fi
6023@@ -6913,7 +7844,7 @@ EOF
6024 ;;
6025 *)
6026 # Add a -L argument.
6027- newdeplibs="$newdeplibs $a_deplib"
6028+ func_append newdeplibs " $a_deplib"
6029 ;;
6030 esac
6031 done # Gone through all deplibs.
6032@@ -6929,20 +7860,20 @@ EOF
6033 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6034 case " $predeps $postdeps " in
6035 *" $a_deplib "*)
6036- newdeplibs="$newdeplibs $a_deplib"
6037+ func_append newdeplibs " $a_deplib"
6038 a_deplib=""
6039 ;;
6040 esac
6041 fi
6042 if test -n "$a_deplib" ; then
6043- eval "libname=\"$libname_spec\""
6044+ libname=`eval "\\$ECHO \"$libname_spec\""`
6045 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6046 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6047 for potent_lib in $potential_libs; do
6048 potlib="$potent_lib" # see symlink-check above in file_magic test
6049 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6050 $EGREP "$match_pattern_regex" > /dev/null; then
6051- newdeplibs="$newdeplibs $a_deplib"
6052+ func_append newdeplibs " $a_deplib"
6053 a_deplib=""
6054 break 2
6055 fi
6056@@ -6967,7 +7898,7 @@ EOF
6057 ;;
6058 *)
6059 # Add a -L argument.
6060- newdeplibs="$newdeplibs $a_deplib"
6061+ func_append newdeplibs " $a_deplib"
6062 ;;
6063 esac
6064 done # Gone through all deplibs.
6065@@ -7071,7 +8002,7 @@ EOF
6066 *)
6067 case " $deplibs " in
6068 *" -L$path/$objdir "*)
6069- new_libs="$new_libs -L$path/$objdir" ;;
6070+ func_append new_libs " -L$path/$objdir" ;;
6071 esac
6072 ;;
6073 esac
6074@@ -7081,10 +8012,10 @@ EOF
6075 -L*)
6076 case " $new_libs " in
6077 *" $deplib "*) ;;
6078- *) new_libs="$new_libs $deplib" ;;
6079+ *) func_append new_libs " $deplib" ;;
6080 esac
6081 ;;
6082- *) new_libs="$new_libs $deplib" ;;
6083+ *) func_append new_libs " $deplib" ;;
6084 esac
6085 done
6086 deplibs="$new_libs"
6087@@ -7101,10 +8032,12 @@ EOF
6088 hardcode_libdirs=
6089 dep_rpath=
6090 rpath="$finalize_rpath"
6091- test "$mode" != relink && rpath="$compile_rpath$rpath"
6092+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
6093 for libdir in $rpath; do
6094 if test -n "$hardcode_libdir_flag_spec"; then
6095 if test -n "$hardcode_libdir_separator"; then
6096+ func_replace_sysroot "$libdir"
6097+ libdir=$func_replace_sysroot_result
6098 if test -z "$hardcode_libdirs"; then
6099 hardcode_libdirs="$libdir"
6100 else
6101@@ -7113,18 +8046,18 @@ EOF
6102 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6103 ;;
6104 *)
6105- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6106+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6107 ;;
6108 esac
6109 fi
6110 else
6111- eval "flag=\"$hardcode_libdir_flag_spec\""
6112- dep_rpath="$dep_rpath $flag"
6113+ eval flag=\"$hardcode_libdir_flag_spec\"
6114+ func_append dep_rpath " $flag"
6115 fi
6116 elif test -n "$runpath_var"; then
6117 case "$perm_rpath " in
6118 *" $libdir "*) ;;
6119- *) perm_rpath="$perm_rpath $libdir" ;;
6120+ *) func_apped perm_rpath " $libdir" ;;
6121 esac
6122 fi
6123 done
6124@@ -7133,40 +8066,38 @@ EOF
6125 test -n "$hardcode_libdirs"; then
6126 libdir="$hardcode_libdirs"
6127 if test -n "$hardcode_libdir_flag_spec_ld"; then
6128- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
6129+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
6130 else
6131- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
6132+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
6133 fi
6134 fi
6135 if test -n "$runpath_var" && test -n "$perm_rpath"; then
6136 # We should set the runpath_var.
6137 rpath=
6138 for dir in $perm_rpath; do
6139- rpath="$rpath$dir:"
6140+ func_append rpath "$dir:"
6141 done
6142- eval $runpath_var=\$rpath\$$runpath_var
6143- export $runpath_var
6144+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
6145 fi
6146 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
6147 fi
6148
6149 shlibpath="$finalize_shlibpath"
6150- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6151+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6152 if test -n "$shlibpath"; then
6153- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
6154- export $shlibpath_var
6155+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
6156 fi
6157
6158 # Get the real and link names of the library.
6159- eval "shared_ext=\"$shrext_cmds\""
6160- eval "library_names=\"$library_names_spec\""
6161+ eval shared_ext=\"$shrext_cmds\"
6162+ eval library_names=\"$library_names_spec\"
6163 set dummy $library_names
6164 shift
6165 realname="$1"
6166 shift
6167
6168 if test -n "$soname_spec"; then
6169- eval "soname=\"$soname_spec\""
6170+ eval soname=\"$soname_spec\"
6171 else
6172 soname="$realname"
6173 fi
6174@@ -7178,7 +8109,7 @@ EOF
6175 linknames=
6176 for link
6177 do
6178- linknames="$linknames $link"
6179+ func_append linknames " $link"
6180 done
6181
6182 # Use standard objects if they are pic
6183@@ -7189,7 +8120,7 @@ EOF
6184 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6185 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
6186 export_symbols="$output_objdir/$libname.uexp"
6187- delfiles="$delfiles $export_symbols"
6188+ func_append delfiles " $export_symbols"
6189 fi
6190
6191 orig_export_symbols=
6192@@ -7220,13 +8151,45 @@ EOF
6193 $opt_dry_run || $RM $export_symbols
6194 cmds=$export_symbols_cmds
6195 save_ifs="$IFS"; IFS='~'
6196- for cmd in $cmds; do
6197+ for cmd1 in $cmds; do
6198 IFS="$save_ifs"
6199- eval "cmd=\"$cmd\""
6200- func_len " $cmd"
6201- len=$func_len_result
6202- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6203+ # Take the normal branch if the nm_file_list_spec branch
6204+ # doesn't work or if tool conversion is not needed.
6205+ case $nm_file_list_spec~$to_tool_file_cmd in
6206+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
6207+ try_normal_branch=yes
6208+ eval cmd=\"$cmd1\"
6209+ func_len " $cmd"
6210+ len=$func_len_result
6211+ ;;
6212+ *)
6213+ try_normal_branch=no
6214+ ;;
6215+ esac
6216+ if test "$try_normal_branch" = yes \
6217+ && { test "$len" -lt "$max_cmd_len" \
6218+ || test "$max_cmd_len" -le -1; }
6219+ then
6220+ func_show_eval "$cmd" 'exit $?'
6221+ skipped_export=false
6222+ elif test -n "$nm_file_list_spec"; then
6223+ func_basename "$output"
6224+ output_la=$func_basename_result
6225+ save_libobjs=$libobjs
6226+ save_output=$output
6227+ output=${output_objdir}/${output_la}.nm
6228+ func_to_tool_file "$output"
6229+ libobjs=$nm_file_list_spec$func_to_tool_file_result
6230+ func_append delfiles " $output"
6231+ func_verbose "creating $NM input file list: $output"
6232+ for obj in $save_libobjs; do
6233+ func_to_tool_file "$obj"
6234+ $ECHO "$func_to_tool_file_result"
6235+ done > "$output"
6236+ eval cmd=\"$cmd1\"
6237 func_show_eval "$cmd" 'exit $?'
6238+ output=$save_output
6239+ libobjs=$save_libobjs
6240 skipped_export=false
6241 else
6242 # The command line is too long to execute in one step.
6243@@ -7248,7 +8211,7 @@ EOF
6244 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6245 tmp_export_symbols="$export_symbols"
6246 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6247- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6248+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6249 fi
6250
6251 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
6252@@ -7260,7 +8223,7 @@ EOF
6253 # global variables. join(1) would be nice here, but unfortunately
6254 # isn't a blessed tool.
6255 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6256- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6257+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6258 export_symbols=$output_objdir/$libname.def
6259 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6260 fi
6261@@ -7270,7 +8233,7 @@ EOF
6262 case " $convenience " in
6263 *" $test_deplib "*) ;;
6264 *)
6265- tmp_deplibs="$tmp_deplibs $test_deplib"
6266+ func_append tmp_deplibs " $test_deplib"
6267 ;;
6268 esac
6269 done
6270@@ -7286,43 +8249,43 @@ EOF
6271 fi
6272 if test -n "$whole_archive_flag_spec"; then
6273 save_libobjs=$libobjs
6274- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6275+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6276 test "X$libobjs" = "X " && libobjs=
6277 else
6278 gentop="$output_objdir/${outputname}x"
6279- generated="$generated $gentop"
6280+ func_append generated " $gentop"
6281
6282 func_extract_archives $gentop $convenience
6283- libobjs="$libobjs $func_extract_archives_result"
6284+ func_append libobjs " $func_extract_archives_result"
6285 test "X$libobjs" = "X " && libobjs=
6286 fi
6287 fi
6288
6289 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
6290- eval "flag=\"$thread_safe_flag_spec\""
6291- linker_flags="$linker_flags $flag"
6292+ eval flag=\"$thread_safe_flag_spec\"
6293+ func_append linker_flags " $flag"
6294 fi
6295
6296 # Make a backup of the uninstalled library when relinking
6297- if test "$mode" = relink; then
6298- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
6299+ if test "$opt_mode" = relink; then
6300+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
6301 fi
6302
6303 # Do each of the archive commands.
6304 if test "$module" = yes && test -n "$module_cmds" ; then
6305 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
6306- eval "test_cmds=\"$module_expsym_cmds\""
6307+ eval test_cmds=\"$module_expsym_cmds\"
6308 cmds=$module_expsym_cmds
6309 else
6310- eval "test_cmds=\"$module_cmds\""
6311+ eval test_cmds=\"$module_cmds\"
6312 cmds=$module_cmds
6313 fi
6314 else
6315 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
6316- eval "test_cmds=\"$archive_expsym_cmds\""
6317+ eval test_cmds=\"$archive_expsym_cmds\"
6318 cmds=$archive_expsym_cmds
6319 else
6320- eval "test_cmds=\"$archive_cmds\""
6321+ eval test_cmds=\"$archive_cmds\"
6322 cmds=$archive_cmds
6323 fi
6324 fi
6325@@ -7366,10 +8329,13 @@ EOF
6326 echo 'INPUT (' > $output
6327 for obj in $save_libobjs
6328 do
6329- $ECHO "$obj" >> $output
6330+ func_to_tool_file "$obj"
6331+ $ECHO "$func_to_tool_file_result" >> $output
6332 done
6333 echo ')' >> $output
6334- delfiles="$delfiles $output"
6335+ func_append delfiles " $output"
6336+ func_to_tool_file "$output"
6337+ output=$func_to_tool_file_result
6338 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
6339 output=${output_objdir}/${output_la}.lnk
6340 func_verbose "creating linker input file list: $output"
6341@@ -7383,15 +8349,17 @@ EOF
6342 fi
6343 for obj
6344 do
6345- $ECHO "$obj" >> $output
6346+ func_to_tool_file "$obj"
6347+ $ECHO "$func_to_tool_file_result" >> $output
6348 done
6349- delfiles="$delfiles $output"
6350- output=$firstobj\"$file_list_spec$output\"
6351+ func_append delfiles " $output"
6352+ func_to_tool_file "$output"
6353+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
6354 else
6355 if test -n "$save_libobjs"; then
6356 func_verbose "creating reloadable object files..."
6357 output=$output_objdir/$output_la-${k}.$objext
6358- eval "test_cmds=\"$reload_cmds\""
6359+ eval test_cmds=\"$reload_cmds\"
6360 func_len " $test_cmds"
6361 len0=$func_len_result
6362 len=$len0
6363@@ -7411,12 +8379,12 @@ EOF
6364 if test "$k" -eq 1 ; then
6365 # The first file doesn't have a previous command to add.
6366 reload_objs=$objlist
6367- eval "concat_cmds=\"$reload_cmds\""
6368+ eval concat_cmds=\"$reload_cmds\"
6369 else
6370 # All subsequent reloadable object files will link in
6371 # the last one created.
6372 reload_objs="$objlist $last_robj"
6373- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
6374+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
6375 fi
6376 last_robj=$output_objdir/$output_la-${k}.$objext
6377 func_arith $k + 1
6378@@ -7433,11 +8401,11 @@ EOF
6379 # files will link in the last one created.
6380 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6381 reload_objs="$objlist $last_robj"
6382- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
6383+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
6384 if test -n "$last_robj"; then
6385- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
6386+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
6387 fi
6388- delfiles="$delfiles $output"
6389+ func_append delfiles " $output"
6390
6391 else
6392 output=
6393@@ -7450,9 +8418,9 @@ EOF
6394 libobjs=$output
6395 # Append the command to create the export file.
6396 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6397- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
6398+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
6399 if test -n "$last_robj"; then
6400- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
6401+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
6402 fi
6403 fi
6404
6405@@ -7471,7 +8439,7 @@ EOF
6406 lt_exit=$?
6407
6408 # Restore the uninstalled library and exit
6409- if test "$mode" = relink; then
6410+ if test "$opt_mode" = relink; then
6411 ( cd "$output_objdir" && \
6412 $RM "${realname}T" && \
6413 $MV "${realname}U" "$realname" )
6414@@ -7492,7 +8460,7 @@ EOF
6415 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6416 tmp_export_symbols="$export_symbols"
6417 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6418- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6419+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6420 fi
6421
6422 if test -n "$orig_export_symbols"; then
6423@@ -7504,7 +8472,7 @@ EOF
6424 # global variables. join(1) would be nice here, but unfortunately
6425 # isn't a blessed tool.
6426 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6427- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6428+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6429 export_symbols=$output_objdir/$libname.def
6430 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6431 fi
6432@@ -7515,7 +8483,7 @@ EOF
6433 output=$save_output
6434
6435 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
6436- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6437+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6438 test "X$libobjs" = "X " && libobjs=
6439 fi
6440 # Expand the library linking commands again to reset the
6441@@ -7539,23 +8507,23 @@ EOF
6442
6443 if test -n "$delfiles"; then
6444 # Append the command to remove temporary files to $cmds.
6445- eval "cmds=\"\$cmds~\$RM $delfiles\""
6446+ eval cmds=\"\$cmds~\$RM $delfiles\"
6447 fi
6448
6449 # Add any objects from preloaded convenience libraries
6450 if test -n "$dlprefiles"; then
6451 gentop="$output_objdir/${outputname}x"
6452- generated="$generated $gentop"
6453+ func_append generated " $gentop"
6454
6455 func_extract_archives $gentop $dlprefiles
6456- libobjs="$libobjs $func_extract_archives_result"
6457+ func_append libobjs " $func_extract_archives_result"
6458 test "X$libobjs" = "X " && libobjs=
6459 fi
6460
6461 save_ifs="$IFS"; IFS='~'
6462 for cmd in $cmds; do
6463 IFS="$save_ifs"
6464- eval "cmd=\"$cmd\""
6465+ eval cmd=\"$cmd\"
6466 $opt_silent || {
6467 func_quote_for_expand "$cmd"
6468 eval "func_echo $func_quote_for_expand_result"
6469@@ -7564,7 +8532,7 @@ EOF
6470 lt_exit=$?
6471
6472 # Restore the uninstalled library and exit
6473- if test "$mode" = relink; then
6474+ if test "$opt_mode" = relink; then
6475 ( cd "$output_objdir" && \
6476 $RM "${realname}T" && \
6477 $MV "${realname}U" "$realname" )
6478@@ -7576,8 +8544,8 @@ EOF
6479 IFS="$save_ifs"
6480
6481 # Restore the uninstalled library and exit
6482- if test "$mode" = relink; then
6483- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
6484+ if test "$opt_mode" = relink; then
6485+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
6486
6487 if test -n "$convenience"; then
6488 if test -z "$whole_archive_flag_spec"; then
6489@@ -7656,17 +8624,20 @@ EOF
6490
6491 if test -n "$convenience"; then
6492 if test -n "$whole_archive_flag_spec"; then
6493- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
6494+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
6495 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
6496 else
6497 gentop="$output_objdir/${obj}x"
6498- generated="$generated $gentop"
6499+ func_append generated " $gentop"
6500
6501 func_extract_archives $gentop $convenience
6502 reload_conv_objs="$reload_objs $func_extract_archives_result"
6503 fi
6504 fi
6505
6506+ # If we're not building shared, we need to use non_pic_objs
6507+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
6508+
6509 # Create the old-style object.
6510 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
6511
6512@@ -7690,7 +8661,7 @@ EOF
6513 # Create an invalid libtool object if no PIC, so that we don't
6514 # accidentally link it into a program.
6515 # $show "echo timestamp > $libobj"
6516- # $opt_dry_run || echo timestamp > $libobj || exit $?
6517+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
6518 exit $EXIT_SUCCESS
6519 fi
6520
6521@@ -7740,8 +8711,8 @@ EOF
6522 if test "$tagname" = CXX ; then
6523 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
6524 10.[0123])
6525- compile_command="$compile_command ${wl}-bind_at_load"
6526- finalize_command="$finalize_command ${wl}-bind_at_load"
6527+ func_append compile_command " ${wl}-bind_at_load"
6528+ func_append finalize_command " ${wl}-bind_at_load"
6529 ;;
6530 esac
6531 fi
6532@@ -7761,7 +8732,7 @@ EOF
6533 *)
6534 case " $compile_deplibs " in
6535 *" -L$path/$objdir "*)
6536- new_libs="$new_libs -L$path/$objdir" ;;
6537+ func_append new_libs " -L$path/$objdir" ;;
6538 esac
6539 ;;
6540 esac
6541@@ -7771,17 +8742,17 @@ EOF
6542 -L*)
6543 case " $new_libs " in
6544 *" $deplib "*) ;;
6545- *) new_libs="$new_libs $deplib" ;;
6546+ *) func_append new_libs " $deplib" ;;
6547 esac
6548 ;;
6549- *) new_libs="$new_libs $deplib" ;;
6550+ *) func_append new_libs " $deplib" ;;
6551 esac
6552 done
6553 compile_deplibs="$new_libs"
6554
6555
6556- compile_command="$compile_command $compile_deplibs"
6557- finalize_command="$finalize_command $finalize_deplibs"
6558+ func_append compile_command " $compile_deplibs"
6559+ func_append finalize_command " $finalize_deplibs"
6560
6561 if test -n "$rpath$xrpath"; then
6562 # If the user specified any rpath flags, then add them.
6563@@ -7789,7 +8760,7 @@ EOF
6564 # This is the magic to use -rpath.
6565 case "$finalize_rpath " in
6566 *" $libdir "*) ;;
6567- *) finalize_rpath="$finalize_rpath $libdir" ;;
6568+ *) func_append finalize_rpath " $libdir" ;;
6569 esac
6570 done
6571 fi
6572@@ -7808,18 +8779,18 @@ EOF
6573 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6574 ;;
6575 *)
6576- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6577+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6578 ;;
6579 esac
6580 fi
6581 else
6582- eval "flag=\"$hardcode_libdir_flag_spec\""
6583- rpath="$rpath $flag"
6584+ eval flag=\"$hardcode_libdir_flag_spec\"
6585+ func_append rpath " $flag"
6586 fi
6587 elif test -n "$runpath_var"; then
6588 case "$perm_rpath " in
6589 *" $libdir "*) ;;
6590- *) perm_rpath="$perm_rpath $libdir" ;;
6591+ *) func_append perm_rpath " $libdir" ;;
6592 esac
6593 fi
6594 case $host in
6595@@ -7828,12 +8799,12 @@ EOF
6596 case :$dllsearchpath: in
6597 *":$libdir:"*) ;;
6598 ::) dllsearchpath=$libdir;;
6599- *) dllsearchpath="$dllsearchpath:$libdir";;
6600+ *) func_append dllsearchpath ":$libdir";;
6601 esac
6602 case :$dllsearchpath: in
6603 *":$testbindir:"*) ;;
6604 ::) dllsearchpath=$testbindir;;
6605- *) dllsearchpath="$dllsearchpath:$testbindir";;
6606+ *) func_append dllsearchpath ":$testbindir";;
6607 esac
6608 ;;
6609 esac
6610@@ -7842,7 +8813,7 @@ EOF
6611 if test -n "$hardcode_libdir_separator" &&
6612 test -n "$hardcode_libdirs"; then
6613 libdir="$hardcode_libdirs"
6614- eval "rpath=\" $hardcode_libdir_flag_spec\""
6615+ eval rpath=\" $hardcode_libdir_flag_spec\"
6616 fi
6617 compile_rpath="$rpath"
6618
6619@@ -7859,18 +8830,18 @@ EOF
6620 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6621 ;;
6622 *)
6623- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6624+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6625 ;;
6626 esac
6627 fi
6628 else
6629- eval "flag=\"$hardcode_libdir_flag_spec\""
6630- rpath="$rpath $flag"
6631+ eval flag=\"$hardcode_libdir_flag_spec\"
6632+ func_append rpath " $flag"
6633 fi
6634 elif test -n "$runpath_var"; then
6635 case "$finalize_perm_rpath " in
6636 *" $libdir "*) ;;
6637- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
6638+ *) func_append finalize_perm_rpath " $libdir" ;;
6639 esac
6640 fi
6641 done
6642@@ -7878,7 +8849,7 @@ EOF
6643 if test -n "$hardcode_libdir_separator" &&
6644 test -n "$hardcode_libdirs"; then
6645 libdir="$hardcode_libdirs"
6646- eval "rpath=\" $hardcode_libdir_flag_spec\""
6647+ eval rpath=\" $hardcode_libdir_flag_spec\"
6648 fi
6649 finalize_rpath="$rpath"
6650
6651@@ -7921,6 +8892,12 @@ EOF
6652 exit_status=0
6653 func_show_eval "$link_command" 'exit_status=$?'
6654
6655+ if test -n "$postlink_cmds"; then
6656+ func_to_tool_file "$output"
6657+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6658+ func_execute_cmds "$postlink_cmds" 'exit $?'
6659+ fi
6660+
6661 # Delete the generated files.
6662 if test -f "$output_objdir/${outputname}S.${objext}"; then
6663 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
6664@@ -7943,7 +8920,7 @@ EOF
6665 # We should set the runpath_var.
6666 rpath=
6667 for dir in $perm_rpath; do
6668- rpath="$rpath$dir:"
6669+ func_append rpath "$dir:"
6670 done
6671 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
6672 fi
6673@@ -7951,7 +8928,7 @@ EOF
6674 # We should set the runpath_var.
6675 rpath=
6676 for dir in $finalize_perm_rpath; do
6677- rpath="$rpath$dir:"
6678+ func_append rpath "$dir:"
6679 done
6680 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
6681 fi
6682@@ -7966,6 +8943,13 @@ EOF
6683 $opt_dry_run || $RM $output
6684 # Link the executable and exit
6685 func_show_eval "$link_command" 'exit $?'
6686+
6687+ if test -n "$postlink_cmds"; then
6688+ func_to_tool_file "$output"
6689+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6690+ func_execute_cmds "$postlink_cmds" 'exit $?'
6691+ fi
6692+
6693 exit $EXIT_SUCCESS
6694 fi
6695
6696@@ -7999,6 +8983,12 @@ EOF
6697
6698 func_show_eval "$link_command" 'exit $?'
6699
6700+ if test -n "$postlink_cmds"; then
6701+ func_to_tool_file "$output_objdir/$outputname"
6702+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6703+ func_execute_cmds "$postlink_cmds" 'exit $?'
6704+ fi
6705+
6706 # Now create the wrapper script.
6707 func_verbose "creating $output"
6708
6709@@ -8096,7 +9086,7 @@ EOF
6710 else
6711 oldobjs="$old_deplibs $non_pic_objects"
6712 if test "$preload" = yes && test -f "$symfileobj"; then
6713- oldobjs="$oldobjs $symfileobj"
6714+ func_append oldobjs " $symfileobj"
6715 fi
6716 fi
6717 addlibs="$old_convenience"
6718@@ -8104,10 +9094,10 @@ EOF
6719
6720 if test -n "$addlibs"; then
6721 gentop="$output_objdir/${outputname}x"
6722- generated="$generated $gentop"
6723+ func_append generated " $gentop"
6724
6725 func_extract_archives $gentop $addlibs
6726- oldobjs="$oldobjs $func_extract_archives_result"
6727+ func_append oldobjs " $func_extract_archives_result"
6728 fi
6729
6730 # Do each command in the archive commands.
6731@@ -8118,10 +9108,10 @@ EOF
6732 # Add any objects from preloaded convenience libraries
6733 if test -n "$dlprefiles"; then
6734 gentop="$output_objdir/${outputname}x"
6735- generated="$generated $gentop"
6736+ func_append generated " $gentop"
6737
6738 func_extract_archives $gentop $dlprefiles
6739- oldobjs="$oldobjs $func_extract_archives_result"
6740+ func_append oldobjs " $func_extract_archives_result"
6741 fi
6742
6743 # POSIX demands no paths to be encoded in archives. We have
6744@@ -8139,7 +9129,7 @@ EOF
6745 else
6746 echo "copying selected object files to avoid basename conflicts..."
6747 gentop="$output_objdir/${outputname}x"
6748- generated="$generated $gentop"
6749+ func_append generated " $gentop"
6750 func_mkdir_p "$gentop"
6751 save_oldobjs=$oldobjs
6752 oldobjs=
6753@@ -8163,18 +9153,28 @@ EOF
6754 esac
6755 done
6756 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
6757- oldobjs="$oldobjs $gentop/$newobj"
6758+ func_append oldobjs " $gentop/$newobj"
6759 ;;
6760- *) oldobjs="$oldobjs $obj" ;;
6761+ *) func_append oldobjs " $obj" ;;
6762 esac
6763 done
6764 fi
6765- eval "cmds=\"$old_archive_cmds\""
6766+ eval cmds=\"$old_archive_cmds\"
6767
6768 func_len " $cmds"
6769 len=$func_len_result
6770 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6771 cmds=$old_archive_cmds
6772+ elif test -n "$archiver_list_spec"; then
6773+ func_verbose "using command file archive linking..."
6774+ for obj in $oldobjs
6775+ do
6776+ func_to_tool_file "$obj"
6777+ $ECHO "$func_to_tool_file_result"
6778+ done > $output_objdir/$libname.libcmd
6779+ func_to_tool_file "$output_objdir/$libname.libcmd"
6780+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
6781+ cmds=$old_archive_cmds
6782 else
6783 # the command line is too long to link in one step, link in parts
6784 func_verbose "using piecewise archive linking..."
6785@@ -8189,7 +9189,7 @@ EOF
6786 do
6787 last_oldobj=$obj
6788 done
6789- eval "test_cmds=\"$old_archive_cmds\""
6790+ eval test_cmds=\"$old_archive_cmds\"
6791 func_len " $test_cmds"
6792 len0=$func_len_result
6793 len=$len0
6794@@ -8208,7 +9208,7 @@ EOF
6795 RANLIB=$save_RANLIB
6796 fi
6797 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6798- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
6799+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
6800 objlist=
6801 len=$len0
6802 fi
6803@@ -8216,9 +9216,9 @@ EOF
6804 RANLIB=$save_RANLIB
6805 oldobjs=$objlist
6806 if test "X$oldobjs" = "X" ; then
6807- eval "cmds=\"\$concat_cmds\""
6808+ eval cmds=\"\$concat_cmds\"
6809 else
6810- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
6811+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
6812 fi
6813 fi
6814 fi
6815@@ -8268,12 +9268,23 @@ EOF
6816 *.la)
6817 func_basename "$deplib"
6818 name="$func_basename_result"
6819- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
6820+ func_resolve_sysroot "$deplib"
6821+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6822 test -z "$libdir" && \
6823 func_fatal_error "\`$deplib' is not a valid libtool archive"
6824- newdependency_libs="$newdependency_libs $libdir/$name"
6825+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
6826+ ;;
6827+ -L*)
6828+ func_stripname -L '' "$deplib"
6829+ func_replace_sysroot "$func_stripname_result"
6830+ func_append newdependency_libs " -L$func_replace_sysroot_result"
6831 ;;
6832- *) newdependency_libs="$newdependency_libs $deplib" ;;
6833+ -R*)
6834+ func_stripname -R '' "$deplib"
6835+ func_replace_sysroot "$func_stripname_result"
6836+ func_append newdependency_libs " -R$func_replace_sysroot_result"
6837+ ;;
6838+ *) func_append newdependency_libs " $deplib" ;;
6839 esac
6840 done
6841 dependency_libs="$newdependency_libs"
6842@@ -8284,12 +9295,14 @@ EOF
6843 *.la)
6844 func_basename "$lib"
6845 name="$func_basename_result"
6846- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6847+ func_resolve_sysroot "$lib"
6848+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6849+
6850 test -z "$libdir" && \
6851 func_fatal_error "\`$lib' is not a valid libtool archive"
6852- newdlfiles="$newdlfiles $libdir/$name"
6853+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
6854 ;;
6855- *) newdlfiles="$newdlfiles $lib" ;;
6856+ *) func_append newdlfiles " $lib" ;;
6857 esac
6858 done
6859 dlfiles="$newdlfiles"
6860@@ -8303,10 +9316,11 @@ EOF
6861 # the library:
6862 func_basename "$lib"
6863 name="$func_basename_result"
6864- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6865+ func_resolve_sysroot "$lib"
6866+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6867 test -z "$libdir" && \
6868 func_fatal_error "\`$lib' is not a valid libtool archive"
6869- newdlprefiles="$newdlprefiles $libdir/$name"
6870+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
6871 ;;
6872 esac
6873 done
6874@@ -8318,7 +9332,7 @@ EOF
6875 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6876 *) abs=`pwd`"/$lib" ;;
6877 esac
6878- newdlfiles="$newdlfiles $abs"
6879+ func_append newdlfiles " $abs"
6880 done
6881 dlfiles="$newdlfiles"
6882 newdlprefiles=
6883@@ -8327,7 +9341,7 @@ EOF
6884 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6885 *) abs=`pwd`"/$lib" ;;
6886 esac
6887- newdlprefiles="$newdlprefiles $abs"
6888+ func_append newdlprefiles " $abs"
6889 done
6890 dlprefiles="$newdlprefiles"
6891 fi
6892@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
6893 exit $EXIT_SUCCESS
6894 }
6895
6896-{ test "$mode" = link || test "$mode" = relink; } &&
6897+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
6898 func_mode_link ${1+"$@"}
6899
6900
6901@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
6902 for arg
6903 do
6904 case $arg in
6905- -f) RM="$RM $arg"; rmforce=yes ;;
6906- -*) RM="$RM $arg" ;;
6907- *) files="$files $arg" ;;
6908+ -f) func_append RM " $arg"; rmforce=yes ;;
6909+ -*) func_append RM " $arg" ;;
6910+ *) func_append files " $arg" ;;
6911 esac
6912 done
6913
6914@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
6915
6916 rmdirs=
6917
6918- origobjdir="$objdir"
6919 for file in $files; do
6920 func_dirname "$file" "" "."
6921 dir="$func_dirname_result"
6922 if test "X$dir" = X.; then
6923- objdir="$origobjdir"
6924+ odir="$objdir"
6925 else
6926- objdir="$dir/$origobjdir"
6927+ odir="$dir/$objdir"
6928 fi
6929 func_basename "$file"
6930 name="$func_basename_result"
6931- test "$mode" = uninstall && objdir="$dir"
6932+ test "$opt_mode" = uninstall && odir="$dir"
6933
6934- # Remember objdir for removal later, being careful to avoid duplicates
6935- if test "$mode" = clean; then
6936+ # Remember odir for removal later, being careful to avoid duplicates
6937+ if test "$opt_mode" = clean; then
6938 case " $rmdirs " in
6939- *" $objdir "*) ;;
6940- *) rmdirs="$rmdirs $objdir" ;;
6941+ *" $odir "*) ;;
6942+ *) func_append rmdirs " $odir" ;;
6943 esac
6944 fi
6945
6946@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
6947
6948 # Delete the libtool libraries and symlinks.
6949 for n in $library_names; do
6950- rmfiles="$rmfiles $objdir/$n"
6951+ func_append rmfiles " $odir/$n"
6952 done
6953- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
6954+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
6955
6956- case "$mode" in
6957+ case "$opt_mode" in
6958 clean)
6959- case " $library_names " in
6960- # " " in the beginning catches empty $dlname
6961+ case " $library_names " in
6962 *" $dlname "*) ;;
6963- *) rmfiles="$rmfiles $objdir/$dlname" ;;
6964+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
6965 esac
6966- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
6967+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
6968 ;;
6969 uninstall)
6970 if test -n "$library_names"; then
6971@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
6972 # Add PIC object to the list of files to remove.
6973 if test -n "$pic_object" &&
6974 test "$pic_object" != none; then
6975- rmfiles="$rmfiles $dir/$pic_object"
6976+ func_append rmfiles " $dir/$pic_object"
6977 fi
6978
6979 # Add non-PIC object to the list of files to remove.
6980 if test -n "$non_pic_object" &&
6981 test "$non_pic_object" != none; then
6982- rmfiles="$rmfiles $dir/$non_pic_object"
6983+ func_append rmfiles " $dir/$non_pic_object"
6984 fi
6985 fi
6986 ;;
6987
6988 *)
6989- if test "$mode" = clean ; then
6990+ if test "$opt_mode" = clean ; then
6991 noexename=$name
6992 case $file in
6993 *.exe)
6994@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
6995 noexename=$func_stripname_result
6996 # $file with .exe has already been added to rmfiles,
6997 # add $file without .exe
6998- rmfiles="$rmfiles $file"
6999+ func_append rmfiles " $file"
7000 ;;
7001 esac
7002 # Do a test to see if this is a libtool program.
7003@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
7004 func_ltwrapper_scriptname "$file"
7005 relink_command=
7006 func_source $func_ltwrapper_scriptname_result
7007- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
7008+ func_append rmfiles " $func_ltwrapper_scriptname_result"
7009 else
7010 relink_command=
7011 func_source $dir/$noexename
7012@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
7013
7014 # note $name still contains .exe if it was in $file originally
7015 # as does the version of $file that was added into $rmfiles
7016- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
7017+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
7018 if test "$fast_install" = yes && test -n "$relink_command"; then
7019- rmfiles="$rmfiles $objdir/lt-$name"
7020+ func_append rmfiles " $odir/lt-$name"
7021 fi
7022 if test "X$noexename" != "X$name" ; then
7023- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
7024+ func_append rmfiles " $odir/lt-${noexename}.c"
7025 fi
7026 fi
7027 fi
7028@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
7029 esac
7030 func_show_eval "$RM $rmfiles" 'exit_status=1'
7031 done
7032- objdir="$origobjdir"
7033
7034 # Try to remove the ${objdir}s in the directories where we deleted files
7035 for dir in $rmdirs; do
7036@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
7037 exit $exit_status
7038 }
7039
7040-{ test "$mode" = uninstall || test "$mode" = clean; } &&
7041+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
7042 func_mode_uninstall ${1+"$@"}
7043
7044-test -z "$mode" && {
7045+test -z "$opt_mode" && {
7046 help="$generic_help"
7047 func_fatal_help "you must specify a MODE"
7048 }
7049
7050 test -z "$exec_cmd" && \
7051- func_fatal_help "invalid operation mode \`$mode'"
7052+ func_fatal_help "invalid operation mode \`$opt_mode'"
7053
7054 if test -n "$exec_cmd"; then
7055 eval exec "$exec_cmd"
7056Index: binutils-2.21.1/ltoptions.m4
7057===================================================================
7058--- binutils-2.21.1.orig/ltoptions.m4
7059+++ binutils-2.21.1/ltoptions.m4
7060@@ -8,7 +8,7 @@
7061 # unlimited permission to copy and/or distribute it, with or without
7062 # modifications, as long as this notice is preserved.
7063
7064-# serial 6 ltoptions.m4
7065+# serial 7 ltoptions.m4
7066
7067 # This is to help aclocal find these macros, as it can't see m4_define.
7068 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7069Index: binutils-2.21.1/ltversion.m4
7070===================================================================
7071--- binutils-2.21.1.orig/ltversion.m4
7072+++ binutils-2.21.1/ltversion.m4
7073@@ -7,17 +7,17 @@
7074 # unlimited permission to copy and/or distribute it, with or without
7075 # modifications, as long as this notice is preserved.
7076
7077-# Generated from ltversion.in.
7078+# @configure_input@
7079
7080-# serial 3134 ltversion.m4
7081+# serial 3293 ltversion.m4
7082 # This file is part of GNU Libtool
7083
7084-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
7085-m4_define([LT_PACKAGE_REVISION], [1.3134])
7086+m4_define([LT_PACKAGE_VERSION], [2.4])
7087+m4_define([LT_PACKAGE_REVISION], [1.3293])
7088
7089 AC_DEFUN([LTVERSION_VERSION],
7090-[macro_version='2.2.7a'
7091-macro_revision='1.3134'
7092+[macro_version='2.4'
7093+macro_revision='1.3293'
7094 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7095 _LT_DECL(, macro_revision, 0)
7096 ])
7097Index: binutils-2.21.1/lt~obsolete.m4
7098===================================================================
7099--- binutils-2.21.1.orig/lt~obsolete.m4
7100+++ binutils-2.21.1/lt~obsolete.m4
7101@@ -7,7 +7,7 @@
7102 # unlimited permission to copy and/or distribute it, with or without
7103 # modifications, as long as this notice is preserved.
7104
7105-# serial 4 lt~obsolete.m4
7106+# serial 5 lt~obsolete.m4
7107
7108 # These exist entirely to fool aclocal when bootstrapping libtool.
7109 #
7110Index: binutils-2.21.1/configure
7111===================================================================
7112--- binutils-2.21.1.orig/configure
7113+++ binutils-2.21.1/configure
7114@@ -2670,7 +2670,7 @@ host_libs="intl mmalloc libiberty opcode
7115 # binutils, gas and ld appear in that order because it makes sense to run
7116 # "make check" in that particular order.
7117 # If --enable-gold is used, "gold" may replace "ld".
7118-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
7119+host_tools="byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
7120
7121 # libgcj represents the runtime libraries only used by gcj.
7122 libgcj="target-libffi \
7123@@ -7597,7 +7597,7 @@ case " $build_configdirs " in
7124 # For an installed makeinfo, we require it to be from texinfo 4.7 or
7125 # higher, else we use the "missing" dummy.
7126 if ${MAKEINFO} --version \
7127- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
7128+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
7129 :
7130 else
7131 MAKEINFO="$MISSING makeinfo"
7132Index: binutils-2.21.1/bfd/configure
7133===================================================================
7134--- binutils-2.21.1.orig/bfd/configure
7135+++ binutils-2.21.1/bfd/configure
7136@@ -667,6 +667,9 @@ OTOOL
7137 LIPO
7138 NMEDIT
7139 DSYMUTIL
7140+MANIFEST_TOOL
7141+ac_ct_AR
7142+DLLTOOL
7143 OBJDUMP
7144 LN_S
7145 NM
7146@@ -779,6 +782,7 @@ enable_static
7147 with_pic
7148 enable_fast_install
7149 with_gnu_ld
7150+with_libtool_sysroot
7151 enable_libtool_lock
7152 enable_plugins
7153 enable_largefile
7154@@ -1453,6 +1457,8 @@ Optional Packages:
7155 --with-pic try to use only PIC/non-PIC objects [default=use
7156 both]
7157 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7158+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7159+ (or the compiler's sysroot if not specified).
7160 --with-mmap try using mmap for BFD input files if available
7161 --with-separate-debug-dir=DIR
7162 Look for global separate debug info in DIR
7163@@ -5383,8 +5389,8 @@ esac
7164
7165
7166
7167-macro_version='2.2.7a'
7168-macro_revision='1.3134'
7169+macro_version='2.4'
7170+macro_revision='1.3293'
7171
7172
7173
7174@@ -5424,7 +5430,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7175 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7176 $as_echo_n "checking how to print strings... " >&6; }
7177 # Test print first, because it will be a builtin if present.
7178-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7179+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7180 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7181 ECHO='print -r --'
7182 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7183@@ -6110,8 +6116,8 @@ $as_echo_n "checking whether the shell u
7184 # Try some XSI features
7185 xsi_shell=no
7186 ( _lt_dummy="a/b/c"
7187- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7188- = c,a/b,, \
7189+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7190+ = c,a/b,b/c, \
7191 && eval 'test $(( 1 + 1 )) -eq 2 \
7192 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7193 && xsi_shell=yes
7194@@ -6160,6 +6166,80 @@ esac
7195
7196
7197
7198+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7199+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7200+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7201+ $as_echo_n "(cached) " >&6
7202+else
7203+ case $host in
7204+ *-*-mingw* )
7205+ case $build in
7206+ *-*-mingw* ) # actually msys
7207+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7208+ ;;
7209+ *-*-cygwin* )
7210+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7211+ ;;
7212+ * ) # otherwise, assume *nix
7213+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7214+ ;;
7215+ esac
7216+ ;;
7217+ *-*-cygwin* )
7218+ case $build in
7219+ *-*-mingw* ) # actually msys
7220+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7221+ ;;
7222+ *-*-cygwin* )
7223+ lt_cv_to_host_file_cmd=func_convert_file_noop
7224+ ;;
7225+ * ) # otherwise, assume *nix
7226+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7227+ ;;
7228+ esac
7229+ ;;
7230+ * ) # unhandled hosts (and "normal" native builds)
7231+ lt_cv_to_host_file_cmd=func_convert_file_noop
7232+ ;;
7233+esac
7234+
7235+fi
7236+
7237+to_host_file_cmd=$lt_cv_to_host_file_cmd
7238+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7239+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7240+
7241+
7242+
7243+
7244+
7245+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7246+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7247+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7248+ $as_echo_n "(cached) " >&6
7249+else
7250+ #assume ordinary cross tools, or native build.
7251+lt_cv_to_tool_file_cmd=func_convert_file_noop
7252+case $host in
7253+ *-*-mingw* )
7254+ case $build in
7255+ *-*-mingw* ) # actually msys
7256+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7257+ ;;
7258+ esac
7259+ ;;
7260+esac
7261+
7262+fi
7263+
7264+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7265+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7266+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7267+
7268+
7269+
7270+
7271+
7272 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7273 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7274 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7275@@ -6176,6 +6256,11 @@ case $reload_flag in
7276 esac
7277 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7278 case $host_os in
7279+ cygwin* | mingw* | pw32* | cegcc*)
7280+ if test "$GCC" != yes; then
7281+ reload_cmds=false
7282+ fi
7283+ ;;
7284 darwin*)
7285 if test "$GCC" = yes; then
7286 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7287@@ -6344,7 +6429,8 @@ mingw* | pw32*)
7288 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7289 lt_cv_file_magic_cmd='func_win32_libid'
7290 else
7291- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7292+ # Keep this pattern in sync with the one in func_win32_libid.
7293+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7294 lt_cv_file_magic_cmd='$OBJDUMP -f'
7295 fi
7296 ;;
7297@@ -6498,6 +6584,21 @@ esac
7298 fi
7299 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7300 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7301+
7302+file_magic_glob=
7303+want_nocaseglob=no
7304+if test "$build" = "$host"; then
7305+ case $host_os in
7306+ mingw* | pw32*)
7307+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7308+ want_nocaseglob=yes
7309+ else
7310+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7311+ fi
7312+ ;;
7313+ esac
7314+fi
7315+
7316 file_magic_cmd=$lt_cv_file_magic_cmd
7317 deplibs_check_method=$lt_cv_deplibs_check_method
7318 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7319@@ -6513,9 +6614,162 @@ test -z "$deplibs_check_method" && depli
7320
7321
7322
7323+
7324+
7325+
7326+
7327+
7328+
7329+
7330+
7331+
7332+
7333 if test -n "$ac_tool_prefix"; then
7334- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
7335-set dummy ${ac_tool_prefix}ar; ac_word=$2
7336+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7337+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7338+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7339+$as_echo_n "checking for $ac_word... " >&6; }
7340+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7341+ $as_echo_n "(cached) " >&6
7342+else
7343+ if test -n "$DLLTOOL"; then
7344+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7345+else
7346+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7347+for as_dir in $PATH
7348+do
7349+ IFS=$as_save_IFS
7350+ test -z "$as_dir" && as_dir=.
7351+ for ac_exec_ext in '' $ac_executable_extensions; do
7352+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7353+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7354+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7355+ break 2
7356+ fi
7357+done
7358+ done
7359+IFS=$as_save_IFS
7360+
7361+fi
7362+fi
7363+DLLTOOL=$ac_cv_prog_DLLTOOL
7364+if test -n "$DLLTOOL"; then
7365+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7366+$as_echo "$DLLTOOL" >&6; }
7367+else
7368+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7369+$as_echo "no" >&6; }
7370+fi
7371+
7372+
7373+fi
7374+if test -z "$ac_cv_prog_DLLTOOL"; then
7375+ ac_ct_DLLTOOL=$DLLTOOL
7376+ # Extract the first word of "dlltool", so it can be a program name with args.
7377+set dummy dlltool; ac_word=$2
7378+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7379+$as_echo_n "checking for $ac_word... " >&6; }
7380+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7381+ $as_echo_n "(cached) " >&6
7382+else
7383+ if test -n "$ac_ct_DLLTOOL"; then
7384+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7385+else
7386+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7387+for as_dir in $PATH
7388+do
7389+ IFS=$as_save_IFS
7390+ test -z "$as_dir" && as_dir=.
7391+ for ac_exec_ext in '' $ac_executable_extensions; do
7392+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7393+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7394+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7395+ break 2
7396+ fi
7397+done
7398+ done
7399+IFS=$as_save_IFS
7400+
7401+fi
7402+fi
7403+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7404+if test -n "$ac_ct_DLLTOOL"; then
7405+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7406+$as_echo "$ac_ct_DLLTOOL" >&6; }
7407+else
7408+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7409+$as_echo "no" >&6; }
7410+fi
7411+
7412+ if test "x$ac_ct_DLLTOOL" = x; then
7413+ DLLTOOL="false"
7414+ else
7415+ case $cross_compiling:$ac_tool_warned in
7416+yes:)
7417+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7418+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7419+ac_tool_warned=yes ;;
7420+esac
7421+ DLLTOOL=$ac_ct_DLLTOOL
7422+ fi
7423+else
7424+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7425+fi
7426+
7427+test -z "$DLLTOOL" && DLLTOOL=dlltool
7428+
7429+
7430+
7431+
7432+
7433+
7434+
7435+
7436+
7437+
7438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7439+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7440+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7441+ $as_echo_n "(cached) " >&6
7442+else
7443+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7444+
7445+case $host_os in
7446+cygwin* | mingw* | pw32* | cegcc*)
7447+ # two different shell functions defined in ltmain.sh
7448+ # decide which to use based on capabilities of $DLLTOOL
7449+ case `$DLLTOOL --help 2>&1` in
7450+ *--identify-strict*)
7451+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7452+ ;;
7453+ *)
7454+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7455+ ;;
7456+ esac
7457+ ;;
7458+*)
7459+ # fallback: assume linklib IS sharedlib
7460+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7461+ ;;
7462+esac
7463+
7464+fi
7465+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7466+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7467+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7468+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7469+
7470+
7471+
7472+
7473+
7474+
7475+
7476+if test -n "$ac_tool_prefix"; then
7477+ for ac_prog in ar
7478+ do
7479+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7480+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7481 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7482 $as_echo_n "checking for $ac_word... " >&6; }
7483 if test "${ac_cv_prog_AR+set}" = set; then :
7484@@ -6531,7 +6785,7 @@ do
7485 test -z "$as_dir" && as_dir=.
7486 for ac_exec_ext in '' $ac_executable_extensions; do
7487 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7488- ac_cv_prog_AR="${ac_tool_prefix}ar"
7489+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
7490 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7491 break 2
7492 fi
7493@@ -6551,11 +6805,15 @@ $as_echo "no" >&6; }
7494 fi
7495
7496
7497+ test -n "$AR" && break
7498+ done
7499 fi
7500-if test -z "$ac_cv_prog_AR"; then
7501+if test -z "$AR"; then
7502 ac_ct_AR=$AR
7503- # Extract the first word of "ar", so it can be a program name with args.
7504-set dummy ar; ac_word=$2
7505+ for ac_prog in ar
7506+do
7507+ # Extract the first word of "$ac_prog", so it can be a program name with args.
7508+set dummy $ac_prog; ac_word=$2
7509 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7510 $as_echo_n "checking for $ac_word... " >&6; }
7511 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
7512@@ -6571,7 +6829,7 @@ do
7513 test -z "$as_dir" && as_dir=.
7514 for ac_exec_ext in '' $ac_executable_extensions; do
7515 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7516- ac_cv_prog_ac_ct_AR="ar"
7517+ ac_cv_prog_ac_ct_AR="$ac_prog"
7518 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7519 break 2
7520 fi
7521@@ -6590,6 +6848,10 @@ else
7522 $as_echo "no" >&6; }
7523 fi
7524
7525+
7526+ test -n "$ac_ct_AR" && break
7527+done
7528+
7529 if test "x$ac_ct_AR" = x; then
7530 AR="false"
7531 else
7532@@ -6601,16 +6863,72 @@ ac_tool_warned=yes ;;
7533 esac
7534 AR=$ac_ct_AR
7535 fi
7536-else
7537- AR="$ac_cv_prog_AR"
7538 fi
7539
7540-test -z "$AR" && AR=ar
7541-test -z "$AR_FLAGS" && AR_FLAGS=cru
7542+: ${AR=ar}
7543+: ${AR_FLAGS=cru}
7544+
7545+
7546+
7547+
7548+
7549+
7550+
7551+
7552+
7553+
7554
7555+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
7556+$as_echo_n "checking for archiver @FILE support... " >&6; }
7557+if test "${lt_cv_ar_at_file+set}" = set; then :
7558+ $as_echo_n "(cached) " >&6
7559+else
7560+ lt_cv_ar_at_file=no
7561+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7562+/* end confdefs.h. */
7563
7564+int
7565+main ()
7566+{
7567
7568+ ;
7569+ return 0;
7570+}
7571+_ACEOF
7572+if ac_fn_c_try_compile "$LINENO"; then :
7573+ echo conftest.$ac_objext > conftest.lst
7574+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
7575+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7576+ (eval $lt_ar_try) 2>&5
7577+ ac_status=$?
7578+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7579+ test $ac_status = 0; }
7580+ if test "$ac_status" -eq 0; then
7581+ # Ensure the archiver fails upon bogus file names.
7582+ rm -f conftest.$ac_objext libconftest.a
7583+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7584+ (eval $lt_ar_try) 2>&5
7585+ ac_status=$?
7586+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7587+ test $ac_status = 0; }
7588+ if test "$ac_status" -ne 0; then
7589+ lt_cv_ar_at_file=@
7590+ fi
7591+ fi
7592+ rm -f conftest.* libconftest.a
7593
7594+fi
7595+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7596+
7597+fi
7598+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
7599+$as_echo "$lt_cv_ar_at_file" >&6; }
7600+
7601+if test "x$lt_cv_ar_at_file" = xno; then
7602+ archiver_list_spec=
7603+else
7604+ archiver_list_spec=$lt_cv_ar_at_file
7605+fi
7606
7607
7608
7609@@ -6952,8 +7270,8 @@ esac
7610 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7611
7612 # Transform an extracted symbol line into symbol name and symbol address
7613-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
7614-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'"
7615+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
7616+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'"
7617
7618 # Handle CRLF in mingw tool chain
7619 opt_cr=
7620@@ -6989,6 +7307,7 @@ for ac_symprfx in "" "_"; do
7621 else
7622 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
7623 fi
7624+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
7625
7626 # Check to see that the pipe works correctly.
7627 pipe_works=no
7628@@ -7030,6 +7349,18 @@ _LT_EOF
7629 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
7630 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
7631 cat <<_LT_EOF > conftest.$ac_ext
7632+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
7633+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
7634+/* DATA imports from DLLs on WIN32 con't be const, because runtime
7635+ relocations are performed -- see ld's documentation on pseudo-relocs. */
7636+# define LT_DLSYM_CONST
7637+#elif defined(__osf__)
7638+/* This system does not cope well with relocations in const data. */
7639+# define LT_DLSYM_CONST
7640+#else
7641+# define LT_DLSYM_CONST const
7642+#endif
7643+
7644 #ifdef __cplusplus
7645 extern "C" {
7646 #endif
7647@@ -7041,7 +7372,7 @@ _LT_EOF
7648 cat <<_LT_EOF >> conftest.$ac_ext
7649
7650 /* The mapping between symbol names and symbols. */
7651-const struct {
7652+LT_DLSYM_CONST struct {
7653 const char *name;
7654 void *address;
7655 }
7656@@ -7067,8 +7398,8 @@ static const void *lt_preloaded_setup()
7657 _LT_EOF
7658 # Now try linking the two files.
7659 mv conftest.$ac_objext conftstm.$ac_objext
7660- lt_save_LIBS="$LIBS"
7661- lt_save_CFLAGS="$CFLAGS"
7662+ lt_globsym_save_LIBS=$LIBS
7663+ lt_globsym_save_CFLAGS=$CFLAGS
7664 LIBS="conftstm.$ac_objext"
7665 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
7666 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7667@@ -7078,8 +7409,8 @@ _LT_EOF
7668 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
7669 pipe_works=yes
7670 fi
7671- LIBS="$lt_save_LIBS"
7672- CFLAGS="$lt_save_CFLAGS"
7673+ LIBS=$lt_globsym_save_LIBS
7674+ CFLAGS=$lt_globsym_save_CFLAGS
7675 else
7676 echo "cannot find nm_test_func in $nlist" >&5
7677 fi
7678@@ -7116,6 +7447,20 @@ else
7679 $as_echo "ok" >&6; }
7680 fi
7681
7682+# Response file support.
7683+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
7684+ nm_file_list_spec='@'
7685+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
7686+ nm_file_list_spec='@'
7687+fi
7688+
7689+
7690+
7691+
7692+
7693+
7694+
7695+
7696
7697
7698
7699@@ -7135,6 +7480,41 @@ fi
7700
7701
7702
7703+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
7704+$as_echo_n "checking for sysroot... " >&6; }
7705+
7706+# Check whether --with-libtool-sysroot was given.
7707+if test "${with_libtool_sysroot+set}" = set; then :
7708+ withval=$with_libtool_sysroot;
7709+else
7710+ with_libtool_sysroot=no
7711+fi
7712+
7713+
7714+lt_sysroot=
7715+case ${with_libtool_sysroot} in #(
7716+ yes)
7717+ if test "$GCC" = yes; then
7718+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
7719+ fi
7720+ ;; #(
7721+ /*)
7722+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
7723+ ;; #(
7724+ no|'')
7725+ ;; #(
7726+ *)
7727+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
7728+$as_echo "${with_libtool_sysroot}" >&6; }
7729+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
7730+ ;;
7731+esac
7732+
7733+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
7734+$as_echo "${lt_sysroot:-no}" >&6; }
7735+
7736+
7737+
7738
7739
7740 # Check whether --enable-libtool-lock was given.
7741@@ -7330,6 +7710,123 @@ esac
7742
7743 need_locks="$enable_libtool_lock"
7744
7745+if test -n "$ac_tool_prefix"; then
7746+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
7747+set dummy ${ac_tool_prefix}mt; ac_word=$2
7748+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7749+$as_echo_n "checking for $ac_word... " >&6; }
7750+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
7751+ $as_echo_n "(cached) " >&6
7752+else
7753+ if test -n "$MANIFEST_TOOL"; then
7754+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
7755+else
7756+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7757+for as_dir in $PATH
7758+do
7759+ IFS=$as_save_IFS
7760+ test -z "$as_dir" && as_dir=.
7761+ for ac_exec_ext in '' $ac_executable_extensions; do
7762+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7763+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7764+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7765+ break 2
7766+ fi
7767+done
7768+ done
7769+IFS=$as_save_IFS
7770+
7771+fi
7772+fi
7773+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
7774+if test -n "$MANIFEST_TOOL"; then
7775+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
7776+$as_echo "$MANIFEST_TOOL" >&6; }
7777+else
7778+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7779+$as_echo "no" >&6; }
7780+fi
7781+
7782+
7783+fi
7784+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
7785+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
7786+ # Extract the first word of "mt", so it can be a program name with args.
7787+set dummy mt; ac_word=$2
7788+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7789+$as_echo_n "checking for $ac_word... " >&6; }
7790+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
7791+ $as_echo_n "(cached) " >&6
7792+else
7793+ if test -n "$ac_ct_MANIFEST_TOOL"; then
7794+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
7795+else
7796+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7797+for as_dir in $PATH
7798+do
7799+ IFS=$as_save_IFS
7800+ test -z "$as_dir" && as_dir=.
7801+ for ac_exec_ext in '' $ac_executable_extensions; do
7802+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7803+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7804+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7805+ break 2
7806+ fi
7807+done
7808+ done
7809+IFS=$as_save_IFS
7810+
7811+fi
7812+fi
7813+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
7814+if test -n "$ac_ct_MANIFEST_TOOL"; then
7815+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
7816+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
7817+else
7818+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7819+$as_echo "no" >&6; }
7820+fi
7821+
7822+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
7823+ MANIFEST_TOOL=":"
7824+ else
7825+ case $cross_compiling:$ac_tool_warned in
7826+yes:)
7827+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7828+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7829+ac_tool_warned=yes ;;
7830+esac
7831+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
7832+ fi
7833+else
7834+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
7835+fi
7836+
7837+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
7838+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
7839+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
7840+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
7841+ $as_echo_n "(cached) " >&6
7842+else
7843+ lt_cv_path_mainfest_tool=no
7844+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
7845+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
7846+ cat conftest.err >&5
7847+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
7848+ lt_cv_path_mainfest_tool=yes
7849+ fi
7850+ rm -f conftest*
7851+fi
7852+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
7853+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
7854+if test "x$lt_cv_path_mainfest_tool" != xyes; then
7855+ MANIFEST_TOOL=:
7856+fi
7857+
7858+
7859+
7860+
7861+
7862
7863 case $host_os in
7864 rhapsody* | darwin*)
7865@@ -7893,6 +8390,8 @@ _LT_EOF
7866 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
7867 echo "$AR cru libconftest.a conftest.o" >&5
7868 $AR cru libconftest.a conftest.o 2>&5
7869+ echo "$RANLIB libconftest.a" >&5
7870+ $RANLIB libconftest.a 2>&5
7871 cat > conftest.c << _LT_EOF
7872 int main() { return 0;}
7873 _LT_EOF
7874@@ -8057,7 +8556,8 @@ fi
7875 LIBTOOL_DEPS="$ltmain"
7876
7877 # Always use our own libtool.
7878-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
7879+LIBTOOL='$(SHELL) $(top_builddir)'
7880+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
7881
7882
7883
7884@@ -8146,7 +8646,7 @@ aix3*)
7885 esac
7886
7887 # Global variables:
7888-ofile=libtool
7889+ofile=${host_alias}-libtool
7890 can_build_shared=yes
7891
7892 # All known linkers require a `.a' archive for static linking (except MSVC,
7893@@ -8444,8 +8944,6 @@ fi
7894 lt_prog_compiler_pic=
7895 lt_prog_compiler_static=
7896
7897-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7898-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7899
7900 if test "$GCC" = yes; then
7901 lt_prog_compiler_wl='-Wl,'
7902@@ -8610,6 +9108,12 @@ $as_echo_n "checking for $compiler optio
7903 lt_prog_compiler_pic='--shared'
7904 lt_prog_compiler_static='--static'
7905 ;;
7906+ nagfor*)
7907+ # NAG Fortran compiler
7908+ lt_prog_compiler_wl='-Wl,-Wl,,'
7909+ lt_prog_compiler_pic='-PIC'
7910+ lt_prog_compiler_static='-Bstatic'
7911+ ;;
7912 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
7913 # Portland Group compilers (*not* the Pentium gcc compiler,
7914 # which looks to be a dead project)
7915@@ -8672,7 +9176,7 @@ $as_echo_n "checking for $compiler optio
7916 lt_prog_compiler_pic='-KPIC'
7917 lt_prog_compiler_static='-Bstatic'
7918 case $cc_basename in
7919- f77* | f90* | f95*)
7920+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
7921 lt_prog_compiler_wl='-Qoption ld ';;
7922 *)
7923 lt_prog_compiler_wl='-Wl,';;
7924@@ -8729,13 +9233,17 @@ case $host_os in
7925 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
7926 ;;
7927 esac
7928-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
7929-$as_echo "$lt_prog_compiler_pic" >&6; }
7930-
7931-
7932-
7933-
7934
7935+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7936+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7937+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
7938+ $as_echo_n "(cached) " >&6
7939+else
7940+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
7941+fi
7942+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
7943+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
7944+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
7945
7946 #
7947 # Check to make sure the PIC flag actually works.
7948@@ -8796,6 +9304,11 @@ fi
7949
7950
7951
7952+
7953+
7954+
7955+
7956+
7957 #
7958 # Check to make sure the static flag actually works.
7959 #
7960@@ -9146,7 +9659,8 @@ _LT_EOF
7961 allow_undefined_flag=unsupported
7962 always_export_symbols=no
7963 enable_shared_with_static_runtimes=yes
7964- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
7965+ 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'
7966+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
7967
7968 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
7969 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7970@@ -9194,7 +9708,7 @@ _LT_EOF
7971 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
7972 && test "$tmp_diet" = no
7973 then
7974- tmp_addflag=
7975+ tmp_addflag=' $pic_flag'
7976 tmp_sharedflag='-shared'
7977 case $cc_basename,$host_cpu in
7978 pgcc*) # Portland Group C compiler
7979@@ -9245,12 +9759,12 @@ _LT_EOF
7980 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
7981 hardcode_libdir_flag_spec=
7982 hardcode_libdir_flag_spec_ld='-rpath $libdir'
7983- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
7984+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
7985 if test "x$supports_anon_versioning" = xyes; then
7986 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
7987 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
7988 echo "local: *; };" >> $output_objdir/$libname.ver~
7989- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
7990+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
7991 fi
7992 ;;
7993 esac
7994@@ -9264,8 +9778,8 @@ _LT_EOF
7995 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
7996 wlarc=
7997 else
7998- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7999- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8000+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8001+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8002 fi
8003 ;;
8004
8005@@ -9283,8 +9797,8 @@ _LT_EOF
8006
8007 _LT_EOF
8008 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8009- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8010- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8011+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8012+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8013 else
8014 ld_shlibs=no
8015 fi
8016@@ -9330,8 +9844,8 @@ _LT_EOF
8017
8018 *)
8019 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8020- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8021- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8022+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8023+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8024 else
8025 ld_shlibs=no
8026 fi
8027@@ -9461,7 +9975,13 @@ _LT_EOF
8028 allow_undefined_flag='-berok'
8029 # Determine the default libpath from the value encoded in an
8030 # empty executable.
8031- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8032+ if test "${lt_cv_aix_libpath+set}" = set; then
8033+ aix_libpath=$lt_cv_aix_libpath
8034+else
8035+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8036+ $as_echo_n "(cached) " >&6
8037+else
8038+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8039 /* end confdefs.h. */
8040
8041 int
8042@@ -9474,22 +9994,29 @@ main ()
8043 _ACEOF
8044 if ac_fn_c_try_link "$LINENO"; then :
8045
8046-lt_aix_libpath_sed='
8047- /Import File Strings/,/^$/ {
8048- /^0/ {
8049- s/^0 *\(.*\)$/\1/
8050- p
8051- }
8052- }'
8053-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8054-# Check for a 64-bit object if we didn't find anything.
8055-if test -z "$aix_libpath"; then
8056- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8057-fi
8058+ lt_aix_libpath_sed='
8059+ /Import File Strings/,/^$/ {
8060+ /^0/ {
8061+ s/^0 *\([^ ]*\) *$/\1/
8062+ p
8063+ }
8064+ }'
8065+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8066+ # Check for a 64-bit object if we didn't find anything.
8067+ if test -z "$lt_cv_aix_libpath_"; then
8068+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8069+ fi
8070 fi
8071 rm -f core conftest.err conftest.$ac_objext \
8072 conftest$ac_exeext conftest.$ac_ext
8073-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8074+ if test -z "$lt_cv_aix_libpath_"; then
8075+ lt_cv_aix_libpath_="/usr/lib:/lib"
8076+ fi
8077+
8078+fi
8079+
8080+ aix_libpath=$lt_cv_aix_libpath_
8081+fi
8082
8083 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8084 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"
8085@@ -9501,7 +10028,13 @@ if test -z "$aix_libpath"; then aix_libp
8086 else
8087 # Determine the default libpath from the value encoded in an
8088 # empty executable.
8089- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8090+ if test "${lt_cv_aix_libpath+set}" = set; then
8091+ aix_libpath=$lt_cv_aix_libpath
8092+else
8093+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8094+ $as_echo_n "(cached) " >&6
8095+else
8096+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8097 /* end confdefs.h. */
8098
8099 int
8100@@ -9514,22 +10047,29 @@ main ()
8101 _ACEOF
8102 if ac_fn_c_try_link "$LINENO"; then :
8103
8104-lt_aix_libpath_sed='
8105- /Import File Strings/,/^$/ {
8106- /^0/ {
8107- s/^0 *\(.*\)$/\1/
8108- p
8109- }
8110- }'
8111-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8112-# Check for a 64-bit object if we didn't find anything.
8113-if test -z "$aix_libpath"; then
8114- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8115-fi
8116+ lt_aix_libpath_sed='
8117+ /Import File Strings/,/^$/ {
8118+ /^0/ {
8119+ s/^0 *\([^ ]*\) *$/\1/
8120+ p
8121+ }
8122+ }'
8123+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8124+ # Check for a 64-bit object if we didn't find anything.
8125+ if test -z "$lt_cv_aix_libpath_"; then
8126+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8127+ fi
8128 fi
8129 rm -f core conftest.err conftest.$ac_objext \
8130 conftest$ac_exeext conftest.$ac_ext
8131-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8132+ if test -z "$lt_cv_aix_libpath_"; then
8133+ lt_cv_aix_libpath_="/usr/lib:/lib"
8134+ fi
8135+
8136+fi
8137+
8138+ aix_libpath=$lt_cv_aix_libpath_
8139+fi
8140
8141 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8142 # Warning - without using the other run time loading flags,
8143@@ -9574,20 +10114,63 @@ if test -z "$aix_libpath"; then aix_libp
8144 # Microsoft Visual C++.
8145 # hardcode_libdir_flag_spec is actually meaningless, as there is
8146 # no search path for DLLs.
8147- hardcode_libdir_flag_spec=' '
8148- allow_undefined_flag=unsupported
8149- # Tell ltmain to make .lib files, not .a files.
8150- libext=lib
8151- # Tell ltmain to make .dll files, not .so files.
8152- shrext_cmds=".dll"
8153- # FIXME: Setting linknames here is a bad hack.
8154- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8155- # The linker will automatically build a .lib file if we build a DLL.
8156- old_archive_from_new_cmds='true'
8157- # FIXME: Should let the user specify the lib program.
8158- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8159- fix_srcfile_path='`cygpath -w "$srcfile"`'
8160- enable_shared_with_static_runtimes=yes
8161+ case $cc_basename in
8162+ cl*)
8163+ # Native MSVC
8164+ hardcode_libdir_flag_spec=' '
8165+ allow_undefined_flag=unsupported
8166+ always_export_symbols=yes
8167+ file_list_spec='@'
8168+ # Tell ltmain to make .lib files, not .a files.
8169+ libext=lib
8170+ # Tell ltmain to make .dll files, not .so files.
8171+ shrext_cmds=".dll"
8172+ # FIXME: Setting linknames here is a bad hack.
8173+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8174+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8175+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8176+ else
8177+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8178+ fi~
8179+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8180+ linknames='
8181+ # The linker will not automatically build a static lib if we build a DLL.
8182+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8183+ enable_shared_with_static_runtimes=yes
8184+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8185+ # Don't use ranlib
8186+ old_postinstall_cmds='chmod 644 $oldlib'
8187+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8188+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8189+ case $lt_outputfile in
8190+ *.exe|*.EXE) ;;
8191+ *)
8192+ lt_outputfile="$lt_outputfile.exe"
8193+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8194+ ;;
8195+ esac~
8196+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8197+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8198+ $RM "$lt_outputfile.manifest";
8199+ fi'
8200+ ;;
8201+ *)
8202+ # Assume MSVC wrapper
8203+ hardcode_libdir_flag_spec=' '
8204+ allow_undefined_flag=unsupported
8205+ # Tell ltmain to make .lib files, not .a files.
8206+ libext=lib
8207+ # Tell ltmain to make .dll files, not .so files.
8208+ shrext_cmds=".dll"
8209+ # FIXME: Setting linknames here is a bad hack.
8210+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8211+ # The linker will automatically build a .lib file if we build a DLL.
8212+ old_archive_from_new_cmds='true'
8213+ # FIXME: Should let the user specify the lib program.
8214+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8215+ enable_shared_with_static_runtimes=yes
8216+ ;;
8217+ esac
8218 ;;
8219
8220 darwin* | rhapsody*)
8221@@ -9652,7 +10235,7 @@ if test -z "$aix_libpath"; then aix_libp
8222
8223 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8224 freebsd* | dragonfly*)
8225- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8226+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8227 hardcode_libdir_flag_spec='-R$libdir'
8228 hardcode_direct=yes
8229 hardcode_shlibpath_var=no
8230@@ -9660,7 +10243,7 @@ if test -z "$aix_libpath"; then aix_libp
8231
8232 hpux9*)
8233 if test "$GCC" = yes; then
8234- 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'
8235+ 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'
8236 else
8237 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'
8238 fi
8239@@ -9676,7 +10259,7 @@ if test -z "$aix_libpath"; then aix_libp
8240
8241 hpux10*)
8242 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8243- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8244+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8245 else
8246 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8247 fi
8248@@ -9700,10 +10283,10 @@ if test -z "$aix_libpath"; then aix_libp
8249 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8250 ;;
8251 ia64*)
8252- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8253+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8254 ;;
8255 *)
8256- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8257+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8258 ;;
8259 esac
8260 else
8261@@ -9782,23 +10365,36 @@ fi
8262
8263 irix5* | irix6* | nonstopux*)
8264 if test "$GCC" = yes; then
8265- 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'
8266+ 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'
8267 # Try to use the -exported_symbol ld option, if it does not
8268 # work, assume that -exports_file does not work either and
8269 # implicitly export all symbols.
8270- save_LDFLAGS="$LDFLAGS"
8271- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8272- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8273+ # This should be the same for all languages, so no per-tag cache variable.
8274+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8275+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8276+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8277+ $as_echo_n "(cached) " >&6
8278+else
8279+ save_LDFLAGS="$LDFLAGS"
8280+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8281+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8282 /* end confdefs.h. */
8283-int foo(void) {}
8284+int foo (void) { return 0; }
8285 _ACEOF
8286 if ac_fn_c_try_link "$LINENO"; then :
8287- 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'
8288-
8289+ lt_cv_irix_exported_symbol=yes
8290+else
8291+ lt_cv_irix_exported_symbol=no
8292 fi
8293 rm -f core conftest.err conftest.$ac_objext \
8294 conftest$ac_exeext conftest.$ac_ext
8295- LDFLAGS="$save_LDFLAGS"
8296+ LDFLAGS="$save_LDFLAGS"
8297+fi
8298+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8299+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8300+ if test "$lt_cv_irix_exported_symbol" = yes; then
8301+ 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'
8302+ fi
8303 else
8304 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'
8305 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'
8306@@ -9883,7 +10479,7 @@ rm -f core conftest.err conftest.$ac_obj
8307 osf4* | osf5*) # as osf3* with the addition of -msym flag
8308 if test "$GCC" = yes; then
8309 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8310- 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'
8311+ 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'
8312 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8313 else
8314 allow_undefined_flag=' -expect_unresolved \*'
8315@@ -9902,9 +10498,9 @@ rm -f core conftest.err conftest.$ac_obj
8316 no_undefined_flag=' -z defs'
8317 if test "$GCC" = yes; then
8318 wlarc='${wl}'
8319- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8320+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8321 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8322- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8323+ $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'
8324 else
8325 case `$CC -V 2>&1` in
8326 *"Compilers 5.0"*)
8327@@ -10480,8 +11076,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8328 need_version=no
8329 need_lib_prefix=no
8330
8331- case $GCC,$host_os in
8332- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8333+ case $GCC,$cc_basename in
8334+ yes,*)
8335+ # gcc
8336 library_names_spec='$libname.dll.a'
8337 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8338 postinstall_cmds='base_file=`basename \${file}`~
8339@@ -10514,13 +11111,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8340 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8341 ;;
8342 esac
8343+ dynamic_linker='Win32 ld.exe'
8344+ ;;
8345+
8346+ *,cl*)
8347+ # Native MSVC
8348+ libname_spec='$name'
8349+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8350+ library_names_spec='${libname}.dll.lib'
8351+
8352+ case $build_os in
8353+ mingw*)
8354+ sys_lib_search_path_spec=
8355+ lt_save_ifs=$IFS
8356+ IFS=';'
8357+ for lt_path in $LIB
8358+ do
8359+ IFS=$lt_save_ifs
8360+ # Let DOS variable expansion print the short 8.3 style file name.
8361+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8362+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8363+ done
8364+ IFS=$lt_save_ifs
8365+ # Convert to MSYS style.
8366+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8367+ ;;
8368+ cygwin*)
8369+ # Convert to unix form, then to dos form, then back to unix form
8370+ # but this time dos style (no spaces!) so that the unix form looks
8371+ # like /cygdrive/c/PROGRA~1:/cygdr...
8372+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8373+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8374+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8375+ ;;
8376+ *)
8377+ sys_lib_search_path_spec="$LIB"
8378+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8379+ # It is most probably a Windows format PATH.
8380+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8381+ else
8382+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8383+ fi
8384+ # FIXME: find the short name or the path components, as spaces are
8385+ # common. (e.g. "Program Files" -> "PROGRA~1")
8386+ ;;
8387+ esac
8388+
8389+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8390+ postinstall_cmds='base_file=`basename \${file}`~
8391+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8392+ dldir=$destdir/`dirname \$dlpath`~
8393+ test -d \$dldir || mkdir -p \$dldir~
8394+ $install_prog $dir/$dlname \$dldir/$dlname'
8395+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8396+ dlpath=$dir/\$dldll~
8397+ $RM \$dlpath'
8398+ shlibpath_overrides_runpath=yes
8399+ dynamic_linker='Win32 link.exe'
8400 ;;
8401
8402 *)
8403+ # Assume MSVC wrapper
8404 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8405+ dynamic_linker='Win32 ld.exe'
8406 ;;
8407 esac
8408- dynamic_linker='Win32 ld.exe'
8409 # FIXME: first we should search . and the directory the executable is in
8410 shlibpath_var=PATH
8411 ;;
8412@@ -10616,7 +11271,7 @@ haiku*)
8413 soname_spec='${libname}${release}${shared_ext}$major'
8414 shlibpath_var=LIBRARY_PATH
8415 shlibpath_overrides_runpath=yes
8416- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8417+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8418 hardcode_into_libs=yes
8419 ;;
8420
8421@@ -11412,7 +12067,7 @@ else
8422 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8423 lt_status=$lt_dlunknown
8424 cat > conftest.$ac_ext <<_LT_EOF
8425-#line 11415 "configure"
8426+#line $LINENO "configure"
8427 #include "confdefs.h"
8428
8429 #if HAVE_DLFCN_H
8430@@ -11456,10 +12111,10 @@ else
8431 /* When -fvisbility=hidden is used, assume the code has been annotated
8432 correspondingly for the symbols needed. */
8433 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8434-void fnord () __attribute__((visibility("default")));
8435+int fnord () __attribute__((visibility("default")));
8436 #endif
8437
8438-void fnord () { int i=42; }
8439+int fnord () { return 42; }
8440 int main ()
8441 {
8442 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8443@@ -11518,7 +12173,7 @@ else
8444 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8445 lt_status=$lt_dlunknown
8446 cat > conftest.$ac_ext <<_LT_EOF
8447-#line 11521 "configure"
8448+#line $LINENO "configure"
8449 #include "confdefs.h"
8450
8451 #if HAVE_DLFCN_H
8452@@ -11562,10 +12217,10 @@ else
8453 /* When -fvisbility=hidden is used, assume the code has been annotated
8454 correspondingly for the symbols needed. */
8455 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8456-void fnord () __attribute__((visibility("default")));
8457+int fnord () __attribute__((visibility("default")));
8458 #endif
8459
8460-void fnord () { int i=42; }
8461+int fnord () { return 42; }
8462 int main ()
8463 {
8464 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8465@@ -15045,7 +15700,7 @@ SHARED_LDFLAGS=
8466 if test "$enable_shared" = "yes"; then
8467 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
8468 if test -n "$x"; then
8469- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
8470+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
8471 fi
8472
8473 # More hacks to build DLLs on Windows.
8474@@ -16619,13 +17274,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
8475 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
8476 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
8477 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
8478+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
8479+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
8480 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
8481 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
8482 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
8483 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
8484 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
8485+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
8486+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
8487+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
8488+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
8489 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
8490 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
8491+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
8492 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
8493 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
8494 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
8495@@ -16640,14 +17302,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
8496 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
8497 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
8498 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"`'
8499+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
8500+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
8501 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
8502 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
8503 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
8504-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8505 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
8506+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8507 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
8508 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
8509 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
8510+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
8511 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
8512 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
8513 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
8514@@ -16680,12 +17345,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
8515 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
8516 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
8517 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
8518-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
8519 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
8520 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
8521 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
8522 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
8523 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
8524+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
8525 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
8526 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
8527 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
8528@@ -16740,8 +17405,13 @@ reload_flag \
8529 OBJDUMP \
8530 deplibs_check_method \
8531 file_magic_cmd \
8532+file_magic_glob \
8533+want_nocaseglob \
8534+DLLTOOL \
8535+sharedlib_from_linklib_cmd \
8536 AR \
8537 AR_FLAGS \
8538+archiver_list_spec \
8539 STRIP \
8540 RANLIB \
8541 CC \
8542@@ -16751,12 +17421,14 @@ lt_cv_sys_global_symbol_pipe \
8543 lt_cv_sys_global_symbol_to_cdecl \
8544 lt_cv_sys_global_symbol_to_c_name_address \
8545 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
8546+nm_file_list_spec \
8547 lt_prog_compiler_no_builtin_flag \
8548-lt_prog_compiler_wl \
8549 lt_prog_compiler_pic \
8550+lt_prog_compiler_wl \
8551 lt_prog_compiler_static \
8552 lt_cv_prog_compiler_c_o \
8553 need_locks \
8554+MANIFEST_TOOL \
8555 DSYMUTIL \
8556 NMEDIT \
8557 LIPO \
8558@@ -16772,7 +17444,6 @@ no_undefined_flag \
8559 hardcode_libdir_flag_spec \
8560 hardcode_libdir_flag_spec_ld \
8561 hardcode_libdir_separator \
8562-fix_srcfile_path \
8563 exclude_expsyms \
8564 include_expsyms \
8565 file_list_spec \
8566@@ -16808,6 +17479,7 @@ module_cmds \
8567 module_expsym_cmds \
8568 export_symbols_cmds \
8569 prelink_cmds \
8570+postlink_cmds \
8571 postinstall_cmds \
8572 postuninstall_cmds \
8573 finish_cmds \
8574@@ -17587,7 +18259,8 @@ $as_echo X"$file" |
8575 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
8576 #
8577 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
8578-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
8579+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
8580+# Inc.
8581 # Written by Gordon Matzigkeit, 1996
8582 #
8583 # This file is part of GNU Libtool.
8584@@ -17690,19 +18363,42 @@ SP2NL=$lt_lt_SP2NL
8585 # turn newlines into spaces.
8586 NL2SP=$lt_lt_NL2SP
8587
8588+# convert \$build file names to \$host format.
8589+to_host_file_cmd=$lt_cv_to_host_file_cmd
8590+
8591+# convert \$build files to toolchain format.
8592+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
8593+
8594 # An object symbol dumper.
8595 OBJDUMP=$lt_OBJDUMP
8596
8597 # Method to check whether dependent libraries are shared objects.
8598 deplibs_check_method=$lt_deplibs_check_method
8599
8600-# Command to use when deplibs_check_method == "file_magic".
8601+# Command to use when deplibs_check_method = "file_magic".
8602 file_magic_cmd=$lt_file_magic_cmd
8603
8604+# How to find potential files when deplibs_check_method = "file_magic".
8605+file_magic_glob=$lt_file_magic_glob
8606+
8607+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
8608+want_nocaseglob=$lt_want_nocaseglob
8609+
8610+# DLL creation program.
8611+DLLTOOL=$lt_DLLTOOL
8612+
8613+# Command to associate shared and link libraries.
8614+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
8615+
8616 # The archiver.
8617 AR=$lt_AR
8618+
8619+# Flags to create an archive.
8620 AR_FLAGS=$lt_AR_FLAGS
8621
8622+# How to feed a file listing to the archiver.
8623+archiver_list_spec=$lt_archiver_list_spec
8624+
8625 # A symbol stripping program.
8626 STRIP=$lt_STRIP
8627
8628@@ -17732,6 +18428,12 @@ global_symbol_to_c_name_address=$lt_lt_c
8629 # Transform the output of nm in a C name address pair when lib prefix is needed.
8630 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
8631
8632+# Specify filename containing input files for \$NM.
8633+nm_file_list_spec=$lt_nm_file_list_spec
8634+
8635+# The root where to search for dependent libraries,and in which our libraries should be installed.
8636+lt_sysroot=$lt_sysroot
8637+
8638 # The name of the directory that contains temporary libtool files.
8639 objdir=$objdir
8640
8641@@ -17741,6 +18443,9 @@ MAGIC_CMD=$MAGIC_CMD
8642 # Must we lock files when doing compilation?
8643 need_locks=$lt_need_locks
8644
8645+# Manifest tool.
8646+MANIFEST_TOOL=$lt_MANIFEST_TOOL
8647+
8648 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
8649 DSYMUTIL=$lt_DSYMUTIL
8650
8651@@ -17855,12 +18560,12 @@ with_gcc=$GCC
8652 # Compiler flag to turn off builtin functions.
8653 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
8654
8655-# How to pass a linker flag through the compiler.
8656-wl=$lt_lt_prog_compiler_wl
8657-
8658 # Additional compiler flags for building library objects.
8659 pic_flag=$lt_lt_prog_compiler_pic
8660
8661+# How to pass a linker flag through the compiler.
8662+wl=$lt_lt_prog_compiler_wl
8663+
8664 # Compiler flag to prevent dynamic linking.
8665 link_static_flag=$lt_lt_prog_compiler_static
8666
8667@@ -17947,9 +18652,6 @@ inherit_rpath=$inherit_rpath
8668 # Whether libtool must link a program against all its dependency libraries.
8669 link_all_deplibs=$link_all_deplibs
8670
8671-# Fix the shell variable \$srcfile for the compiler.
8672-fix_srcfile_path=$lt_fix_srcfile_path
8673-
8674 # Set to "yes" if exported symbols are required.
8675 always_export_symbols=$always_export_symbols
8676
8677@@ -17965,6 +18667,9 @@ include_expsyms=$lt_include_expsyms
8678 # Commands necessary for linking programs (against libraries) with templates.
8679 prelink_cmds=$lt_prelink_cmds
8680
8681+# Commands necessary for finishing linking programs.
8682+postlink_cmds=$lt_postlink_cmds
8683+
8684 # Specify filename containing input files.
8685 file_list_spec=$lt_file_list_spec
8686
8687@@ -17997,210 +18702,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
8688 # if finds mixed CR/LF and LF-only lines. Since sed operates in
8689 # text mode, it properly converts lines to CR/LF. This bash problem
8690 # is reportedly fixed, but why not run on old versions too?
8691- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
8692- || (rm -f "$cfgfile"; exit 1)
8693-
8694- case $xsi_shell in
8695- yes)
8696- cat << \_LT_EOF >> "$cfgfile"
8697-
8698-# func_dirname file append nondir_replacement
8699-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8700-# otherwise set result to NONDIR_REPLACEMENT.
8701-func_dirname ()
8702-{
8703- case ${1} in
8704- */*) func_dirname_result="${1%/*}${2}" ;;
8705- * ) func_dirname_result="${3}" ;;
8706- esac
8707-}
8708-
8709-# func_basename file
8710-func_basename ()
8711-{
8712- func_basename_result="${1##*/}"
8713-}
8714-
8715-# func_dirname_and_basename file append nondir_replacement
8716-# perform func_basename and func_dirname in a single function
8717-# call:
8718-# dirname: Compute the dirname of FILE. If nonempty,
8719-# add APPEND to the result, otherwise set result
8720-# to NONDIR_REPLACEMENT.
8721-# value returned in "$func_dirname_result"
8722-# basename: Compute filename of FILE.
8723-# value retuned in "$func_basename_result"
8724-# Implementation must be kept synchronized with func_dirname
8725-# and func_basename. For efficiency, we do not delegate to
8726-# those functions but instead duplicate the functionality here.
8727-func_dirname_and_basename ()
8728-{
8729- case ${1} in
8730- */*) func_dirname_result="${1%/*}${2}" ;;
8731- * ) func_dirname_result="${3}" ;;
8732- esac
8733- func_basename_result="${1##*/}"
8734-}
8735-
8736-# func_stripname prefix suffix name
8737-# strip PREFIX and SUFFIX off of NAME.
8738-# PREFIX and SUFFIX must not contain globbing or regex special
8739-# characters, hashes, percent signs, but SUFFIX may contain a leading
8740-# dot (in which case that matches only a dot).
8741-func_stripname ()
8742-{
8743- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
8744- # positional parameters, so assign one to ordinary parameter first.
8745- func_stripname_result=${3}
8746- func_stripname_result=${func_stripname_result#"${1}"}
8747- func_stripname_result=${func_stripname_result%"${2}"}
8748-}
8749-
8750-# func_opt_split
8751-func_opt_split ()
8752-{
8753- func_opt_split_opt=${1%%=*}
8754- func_opt_split_arg=${1#*=}
8755-}
8756-
8757-# func_lo2o object
8758-func_lo2o ()
8759-{
8760- case ${1} in
8761- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
8762- *) func_lo2o_result=${1} ;;
8763- esac
8764-}
8765-
8766-# func_xform libobj-or-source
8767-func_xform ()
8768-{
8769- func_xform_result=${1%.*}.lo
8770-}
8771-
8772-# func_arith arithmetic-term...
8773-func_arith ()
8774-{
8775- func_arith_result=$(( $* ))
8776-}
8777-
8778-# func_len string
8779-# STRING may not start with a hyphen.
8780-func_len ()
8781-{
8782- func_len_result=${#1}
8783-}
8784-
8785-_LT_EOF
8786- ;;
8787- *) # Bourne compatible functions.
8788- cat << \_LT_EOF >> "$cfgfile"
8789-
8790-# func_dirname file append nondir_replacement
8791-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8792-# otherwise set result to NONDIR_REPLACEMENT.
8793-func_dirname ()
8794-{
8795- # Extract subdirectory from the argument.
8796- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
8797- if test "X$func_dirname_result" = "X${1}"; then
8798- func_dirname_result="${3}"
8799- else
8800- func_dirname_result="$func_dirname_result${2}"
8801- fi
8802-}
8803-
8804-# func_basename file
8805-func_basename ()
8806-{
8807- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
8808-}
8809-
8810-
8811-# func_stripname prefix suffix name
8812-# strip PREFIX and SUFFIX off of NAME.
8813-# PREFIX and SUFFIX must not contain globbing or regex special
8814-# characters, hashes, percent signs, but SUFFIX may contain a leading
8815-# dot (in which case that matches only a dot).
8816-# func_strip_suffix prefix name
8817-func_stripname ()
8818-{
8819- case ${2} in
8820- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8821- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8822- esac
8823-}
8824-
8825-# sed scripts:
8826-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
8827-my_sed_long_arg='1s/^-[^=]*=//'
8828-
8829-# func_opt_split
8830-func_opt_split ()
8831-{
8832- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
8833- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
8834-}
8835-
8836-# func_lo2o object
8837-func_lo2o ()
8838-{
8839- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
8840-}
8841-
8842-# func_xform libobj-or-source
8843-func_xform ()
8844-{
8845- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
8846-}
8847-
8848-# func_arith arithmetic-term...
8849-func_arith ()
8850-{
8851- func_arith_result=`expr "$@"`
8852-}
8853-
8854-# func_len string
8855-# STRING may not start with a hyphen.
8856-func_len ()
8857-{
8858- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
8859-}
8860-
8861-_LT_EOF
8862-esac
8863-
8864-case $lt_shell_append in
8865- yes)
8866- cat << \_LT_EOF >> "$cfgfile"
8867-
8868-# func_append var value
8869-# Append VALUE to the end of shell variable VAR.
8870-func_append ()
8871-{
8872- eval "$1+=\$2"
8873-}
8874-_LT_EOF
8875- ;;
8876- *)
8877- cat << \_LT_EOF >> "$cfgfile"
8878-
8879-# func_append var value
8880-# Append VALUE to the end of shell variable VAR.
8881-func_append ()
8882-{
8883- eval "$1=\$$1\$2"
8884-}
8885-
8886-_LT_EOF
8887- ;;
8888- esac
8889+ sed '$q' "$ltmain" >> "$cfgfile" \
8890+ || (rm -f "$cfgfile"; exit 1)
8891
8892+ if test x"$xsi_shell" = xyes; then
8893+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
8894+func_dirname ()\
8895+{\
8896+\ case ${1} in\
8897+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8898+\ * ) func_dirname_result="${3}" ;;\
8899+\ esac\
8900+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
8901+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8902+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8903+test 0 -eq $? || _lt_function_replace_fail=:
8904+
8905+
8906+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
8907+func_basename ()\
8908+{\
8909+\ func_basename_result="${1##*/}"\
8910+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
8911+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8912+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8913+test 0 -eq $? || _lt_function_replace_fail=:
8914+
8915+
8916+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
8917+func_dirname_and_basename ()\
8918+{\
8919+\ case ${1} in\
8920+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8921+\ * ) func_dirname_result="${3}" ;;\
8922+\ esac\
8923+\ func_basename_result="${1##*/}"\
8924+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
8925+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8926+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8927+test 0 -eq $? || _lt_function_replace_fail=:
8928+
8929+
8930+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
8931+func_stripname ()\
8932+{\
8933+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
8934+\ # positional parameters, so assign one to ordinary parameter first.\
8935+\ func_stripname_result=${3}\
8936+\ func_stripname_result=${func_stripname_result#"${1}"}\
8937+\ func_stripname_result=${func_stripname_result%"${2}"}\
8938+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
8939+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8940+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8941+test 0 -eq $? || _lt_function_replace_fail=:
8942+
8943+
8944+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
8945+func_split_long_opt ()\
8946+{\
8947+\ func_split_long_opt_name=${1%%=*}\
8948+\ func_split_long_opt_arg=${1#*=}\
8949+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
8950+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8951+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8952+test 0 -eq $? || _lt_function_replace_fail=:
8953+
8954+
8955+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
8956+func_split_short_opt ()\
8957+{\
8958+\ func_split_short_opt_arg=${1#??}\
8959+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
8960+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
8961+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8962+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8963+test 0 -eq $? || _lt_function_replace_fail=:
8964+
8965+
8966+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
8967+func_lo2o ()\
8968+{\
8969+\ case ${1} in\
8970+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
8971+\ *) func_lo2o_result=${1} ;;\
8972+\ esac\
8973+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
8974+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8975+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8976+test 0 -eq $? || _lt_function_replace_fail=:
8977+
8978+
8979+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
8980+func_xform ()\
8981+{\
8982+ func_xform_result=${1%.*}.lo\
8983+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
8984+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8985+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8986+test 0 -eq $? || _lt_function_replace_fail=:
8987+
8988+
8989+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
8990+func_arith ()\
8991+{\
8992+ func_arith_result=$(( $* ))\
8993+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
8994+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8995+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8996+test 0 -eq $? || _lt_function_replace_fail=:
8997+
8998+
8999+ sed -e '/^func_len ()$/,/^} # func_len /c\
9000+func_len ()\
9001+{\
9002+ func_len_result=${#1}\
9003+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
9004+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9005+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9006+test 0 -eq $? || _lt_function_replace_fail=:
9007+
9008+fi
9009+
9010+if test x"$lt_shell_append" = xyes; then
9011+ sed -e '/^func_append ()$/,/^} # func_append /c\
9012+func_append ()\
9013+{\
9014+ eval "${1}+=\\${2}"\
9015+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
9016+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9017+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9018+test 0 -eq $? || _lt_function_replace_fail=:
9019+
9020+
9021+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
9022+func_append_quoted ()\
9023+{\
9024+\ func_quote_for_eval "${2}"\
9025+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
9026+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
9027+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9028+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9029+test 0 -eq $? || _lt_function_replace_fail=:
9030+
9031+
9032+ # Save a `func_append' function call where possible by direct use of '+='
9033+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
9034+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9035+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9036+ test 0 -eq $? || _lt_function_replace_fail=:
9037+else
9038+ # Save a `func_append' function call even when '+=' is not available
9039+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
9040+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9041+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9042+ test 0 -eq $? || _lt_function_replace_fail=:
9043+fi
9044+
9045+if test x"$_lt_function_replace_fail" = x":"; then
9046+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
9047+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
9048+fi
9049
9050- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
9051- || (rm -f "$cfgfile"; exit 1)
9052
9053- mv -f "$cfgfile" "$ofile" ||
9054+ mv -f "$cfgfile" "$ofile" ||
9055 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
9056 chmod +x "$ofile"
9057
9058Index: binutils-2.21.1/opcodes/configure
9059===================================================================
9060--- binutils-2.21.1.orig/opcodes/configure
9061+++ binutils-2.21.1/opcodes/configure
9062@@ -647,6 +647,9 @@ OTOOL
9063 LIPO
9064 NMEDIT
9065 DSYMUTIL
9066+MANIFEST_TOOL
9067+ac_ct_AR
9068+DLLTOOL
9069 OBJDUMP
9070 LN_S
9071 NM
9072@@ -759,6 +762,7 @@ enable_static
9073 with_pic
9074 enable_fast_install
9075 with_gnu_ld
9076+with_libtool_sysroot
9077 enable_libtool_lock
9078 enable_targets
9079 enable_werror
9080@@ -1417,6 +1421,8 @@ Optional Packages:
9081 --with-pic try to use only PIC/non-PIC objects [default=use
9082 both]
9083 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
9084+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
9085+ (or the compiler's sysroot if not specified).
9086
9087 Some influential environment variables:
9088 CC C compiler command
9089@@ -5112,8 +5118,8 @@ esac
9090
9091
9092
9093-macro_version='2.2.7a'
9094-macro_revision='1.3134'
9095+macro_version='2.4'
9096+macro_revision='1.3293'
9097
9098
9099
9100@@ -5153,7 +5159,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
9101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
9102 $as_echo_n "checking how to print strings... " >&6; }
9103 # Test print first, because it will be a builtin if present.
9104-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
9105+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
9106 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
9107 ECHO='print -r --'
9108 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
9109@@ -5839,8 +5845,8 @@ $as_echo_n "checking whether the shell u
9110 # Try some XSI features
9111 xsi_shell=no
9112 ( _lt_dummy="a/b/c"
9113- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
9114- = c,a/b,, \
9115+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
9116+ = c,a/b,b/c, \
9117 && eval 'test $(( 1 + 1 )) -eq 2 \
9118 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
9119 && xsi_shell=yes
9120@@ -5889,6 +5895,80 @@ esac
9121
9122
9123
9124+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
9125+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
9126+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
9127+ $as_echo_n "(cached) " >&6
9128+else
9129+ case $host in
9130+ *-*-mingw* )
9131+ case $build in
9132+ *-*-mingw* ) # actually msys
9133+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
9134+ ;;
9135+ *-*-cygwin* )
9136+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
9137+ ;;
9138+ * ) # otherwise, assume *nix
9139+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
9140+ ;;
9141+ esac
9142+ ;;
9143+ *-*-cygwin* )
9144+ case $build in
9145+ *-*-mingw* ) # actually msys
9146+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
9147+ ;;
9148+ *-*-cygwin* )
9149+ lt_cv_to_host_file_cmd=func_convert_file_noop
9150+ ;;
9151+ * ) # otherwise, assume *nix
9152+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
9153+ ;;
9154+ esac
9155+ ;;
9156+ * ) # unhandled hosts (and "normal" native builds)
9157+ lt_cv_to_host_file_cmd=func_convert_file_noop
9158+ ;;
9159+esac
9160+
9161+fi
9162+
9163+to_host_file_cmd=$lt_cv_to_host_file_cmd
9164+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
9165+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
9166+
9167+
9168+
9169+
9170+
9171+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
9172+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
9173+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
9174+ $as_echo_n "(cached) " >&6
9175+else
9176+ #assume ordinary cross tools, or native build.
9177+lt_cv_to_tool_file_cmd=func_convert_file_noop
9178+case $host in
9179+ *-*-mingw* )
9180+ case $build in
9181+ *-*-mingw* ) # actually msys
9182+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
9183+ ;;
9184+ esac
9185+ ;;
9186+esac
9187+
9188+fi
9189+
9190+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9191+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
9192+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
9193+
9194+
9195+
9196+
9197+
9198 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
9199 $as_echo_n "checking for $LD option to reload object files... " >&6; }
9200 if test "${lt_cv_ld_reload_flag+set}" = set; then :
9201@@ -5905,6 +5985,11 @@ case $reload_flag in
9202 esac
9203 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9204 case $host_os in
9205+ cygwin* | mingw* | pw32* | cegcc*)
9206+ if test "$GCC" != yes; then
9207+ reload_cmds=false
9208+ fi
9209+ ;;
9210 darwin*)
9211 if test "$GCC" = yes; then
9212 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
9213@@ -6073,7 +6158,8 @@ mingw* | pw32*)
9214 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
9215 lt_cv_file_magic_cmd='func_win32_libid'
9216 else
9217- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
9218+ # Keep this pattern in sync with the one in func_win32_libid.
9219+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
9220 lt_cv_file_magic_cmd='$OBJDUMP -f'
9221 fi
9222 ;;
9223@@ -6227,6 +6313,21 @@ esac
9224 fi
9225 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
9226 $as_echo "$lt_cv_deplibs_check_method" >&6; }
9227+
9228+file_magic_glob=
9229+want_nocaseglob=no
9230+if test "$build" = "$host"; then
9231+ case $host_os in
9232+ mingw* | pw32*)
9233+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
9234+ want_nocaseglob=yes
9235+ else
9236+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
9237+ fi
9238+ ;;
9239+ esac
9240+fi
9241+
9242 file_magic_cmd=$lt_cv_file_magic_cmd
9243 deplibs_check_method=$lt_cv_deplibs_check_method
9244 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9245@@ -6242,9 +6343,162 @@ test -z "$deplibs_check_method" && depli
9246
9247
9248
9249+
9250+
9251+
9252+
9253+
9254+
9255+
9256+
9257+
9258+
9259 if test -n "$ac_tool_prefix"; then
9260- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9261-set dummy ${ac_tool_prefix}ar; ac_word=$2
9262+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
9263+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
9264+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9265+$as_echo_n "checking for $ac_word... " >&6; }
9266+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
9267+ $as_echo_n "(cached) " >&6
9268+else
9269+ if test -n "$DLLTOOL"; then
9270+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
9271+else
9272+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9273+for as_dir in $PATH
9274+do
9275+ IFS=$as_save_IFS
9276+ test -z "$as_dir" && as_dir=.
9277+ for ac_exec_ext in '' $ac_executable_extensions; do
9278+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9279+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
9280+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9281+ break 2
9282+ fi
9283+done
9284+ done
9285+IFS=$as_save_IFS
9286+
9287+fi
9288+fi
9289+DLLTOOL=$ac_cv_prog_DLLTOOL
9290+if test -n "$DLLTOOL"; then
9291+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
9292+$as_echo "$DLLTOOL" >&6; }
9293+else
9294+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9295+$as_echo "no" >&6; }
9296+fi
9297+
9298+
9299+fi
9300+if test -z "$ac_cv_prog_DLLTOOL"; then
9301+ ac_ct_DLLTOOL=$DLLTOOL
9302+ # Extract the first word of "dlltool", so it can be a program name with args.
9303+set dummy dlltool; ac_word=$2
9304+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9305+$as_echo_n "checking for $ac_word... " >&6; }
9306+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
9307+ $as_echo_n "(cached) " >&6
9308+else
9309+ if test -n "$ac_ct_DLLTOOL"; then
9310+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
9311+else
9312+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9313+for as_dir in $PATH
9314+do
9315+ IFS=$as_save_IFS
9316+ test -z "$as_dir" && as_dir=.
9317+ for ac_exec_ext in '' $ac_executable_extensions; do
9318+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9319+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
9320+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9321+ break 2
9322+ fi
9323+done
9324+ done
9325+IFS=$as_save_IFS
9326+
9327+fi
9328+fi
9329+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
9330+if test -n "$ac_ct_DLLTOOL"; then
9331+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
9332+$as_echo "$ac_ct_DLLTOOL" >&6; }
9333+else
9334+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9335+$as_echo "no" >&6; }
9336+fi
9337+
9338+ if test "x$ac_ct_DLLTOOL" = x; then
9339+ DLLTOOL="false"
9340+ else
9341+ case $cross_compiling:$ac_tool_warned in
9342+yes:)
9343+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9344+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9345+ac_tool_warned=yes ;;
9346+esac
9347+ DLLTOOL=$ac_ct_DLLTOOL
9348+ fi
9349+else
9350+ DLLTOOL="$ac_cv_prog_DLLTOOL"
9351+fi
9352+
9353+test -z "$DLLTOOL" && DLLTOOL=dlltool
9354+
9355+
9356+
9357+
9358+
9359+
9360+
9361+
9362+
9363+
9364+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
9365+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
9366+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
9367+ $as_echo_n "(cached) " >&6
9368+else
9369+ lt_cv_sharedlib_from_linklib_cmd='unknown'
9370+
9371+case $host_os in
9372+cygwin* | mingw* | pw32* | cegcc*)
9373+ # two different shell functions defined in ltmain.sh
9374+ # decide which to use based on capabilities of $DLLTOOL
9375+ case `$DLLTOOL --help 2>&1` in
9376+ *--identify-strict*)
9377+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
9378+ ;;
9379+ *)
9380+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
9381+ ;;
9382+ esac
9383+ ;;
9384+*)
9385+ # fallback: assume linklib IS sharedlib
9386+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
9387+ ;;
9388+esac
9389+
9390+fi
9391+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
9392+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
9393+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
9394+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
9395+
9396+
9397+
9398+
9399+
9400+
9401+
9402+if test -n "$ac_tool_prefix"; then
9403+ for ac_prog in ar
9404+ do
9405+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9406+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9408 $as_echo_n "checking for $ac_word... " >&6; }
9409 if test "${ac_cv_prog_AR+set}" = set; then :
9410@@ -6260,7 +6514,7 @@ do
9411 test -z "$as_dir" && as_dir=.
9412 for ac_exec_ext in '' $ac_executable_extensions; do
9413 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9414- ac_cv_prog_AR="${ac_tool_prefix}ar"
9415+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
9416 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9417 break 2
9418 fi
9419@@ -6280,11 +6534,15 @@ $as_echo "no" >&6; }
9420 fi
9421
9422
9423+ test -n "$AR" && break
9424+ done
9425 fi
9426-if test -z "$ac_cv_prog_AR"; then
9427+if test -z "$AR"; then
9428 ac_ct_AR=$AR
9429- # Extract the first word of "ar", so it can be a program name with args.
9430-set dummy ar; ac_word=$2
9431+ for ac_prog in ar
9432+do
9433+ # Extract the first word of "$ac_prog", so it can be a program name with args.
9434+set dummy $ac_prog; ac_word=$2
9435 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9436 $as_echo_n "checking for $ac_word... " >&6; }
9437 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
9438@@ -6300,7 +6558,7 @@ do
9439 test -z "$as_dir" && as_dir=.
9440 for ac_exec_ext in '' $ac_executable_extensions; do
9441 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9442- ac_cv_prog_ac_ct_AR="ar"
9443+ ac_cv_prog_ac_ct_AR="$ac_prog"
9444 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9445 break 2
9446 fi
9447@@ -6319,6 +6577,10 @@ else
9448 $as_echo "no" >&6; }
9449 fi
9450
9451+
9452+ test -n "$ac_ct_AR" && break
9453+done
9454+
9455 if test "x$ac_ct_AR" = x; then
9456 AR="false"
9457 else
9458@@ -6330,12 +6592,11 @@ ac_tool_warned=yes ;;
9459 esac
9460 AR=$ac_ct_AR
9461 fi
9462-else
9463- AR="$ac_cv_prog_AR"
9464 fi
9465
9466-test -z "$AR" && AR=ar
9467-test -z "$AR_FLAGS" && AR_FLAGS=cru
9468+: ${AR=ar}
9469+: ${AR_FLAGS=cru}
9470+
9471
9472
9473
9474@@ -6346,6 +6607,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
9475
9476
9477
9478+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
9479+$as_echo_n "checking for archiver @FILE support... " >&6; }
9480+if test "${lt_cv_ar_at_file+set}" = set; then :
9481+ $as_echo_n "(cached) " >&6
9482+else
9483+ lt_cv_ar_at_file=no
9484+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9485+/* end confdefs.h. */
9486+
9487+int
9488+main ()
9489+{
9490+
9491+ ;
9492+ return 0;
9493+}
9494+_ACEOF
9495+if ac_fn_c_try_compile "$LINENO"; then :
9496+ echo conftest.$ac_objext > conftest.lst
9497+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
9498+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9499+ (eval $lt_ar_try) 2>&5
9500+ ac_status=$?
9501+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9502+ test $ac_status = 0; }
9503+ if test "$ac_status" -eq 0; then
9504+ # Ensure the archiver fails upon bogus file names.
9505+ rm -f conftest.$ac_objext libconftest.a
9506+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9507+ (eval $lt_ar_try) 2>&5
9508+ ac_status=$?
9509+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9510+ test $ac_status = 0; }
9511+ if test "$ac_status" -ne 0; then
9512+ lt_cv_ar_at_file=@
9513+ fi
9514+ fi
9515+ rm -f conftest.* libconftest.a
9516+
9517+fi
9518+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9519+
9520+fi
9521+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
9522+$as_echo "$lt_cv_ar_at_file" >&6; }
9523+
9524+if test "x$lt_cv_ar_at_file" = xno; then
9525+ archiver_list_spec=
9526+else
9527+ archiver_list_spec=$lt_cv_ar_at_file
9528+fi
9529+
9530+
9531+
9532+
9533+
9534+
9535
9536 if test -n "$ac_tool_prefix"; then
9537 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9538@@ -6681,8 +6999,8 @@ esac
9539 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9540
9541 # Transform an extracted symbol line into symbol name and symbol address
9542-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9543-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'"
9544+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9545+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'"
9546
9547 # Handle CRLF in mingw tool chain
9548 opt_cr=
9549@@ -6718,6 +7036,7 @@ for ac_symprfx in "" "_"; do
9550 else
9551 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
9552 fi
9553+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
9554
9555 # Check to see that the pipe works correctly.
9556 pipe_works=no
9557@@ -6759,6 +7078,18 @@ _LT_EOF
9558 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
9559 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
9560 cat <<_LT_EOF > conftest.$ac_ext
9561+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
9562+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
9563+/* DATA imports from DLLs on WIN32 con't be const, because runtime
9564+ relocations are performed -- see ld's documentation on pseudo-relocs. */
9565+# define LT_DLSYM_CONST
9566+#elif defined(__osf__)
9567+/* This system does not cope well with relocations in const data. */
9568+# define LT_DLSYM_CONST
9569+#else
9570+# define LT_DLSYM_CONST const
9571+#endif
9572+
9573 #ifdef __cplusplus
9574 extern "C" {
9575 #endif
9576@@ -6770,7 +7101,7 @@ _LT_EOF
9577 cat <<_LT_EOF >> conftest.$ac_ext
9578
9579 /* The mapping between symbol names and symbols. */
9580-const struct {
9581+LT_DLSYM_CONST struct {
9582 const char *name;
9583 void *address;
9584 }
9585@@ -6796,8 +7127,8 @@ static const void *lt_preloaded_setup()
9586 _LT_EOF
9587 # Now try linking the two files.
9588 mv conftest.$ac_objext conftstm.$ac_objext
9589- lt_save_LIBS="$LIBS"
9590- lt_save_CFLAGS="$CFLAGS"
9591+ lt_globsym_save_LIBS=$LIBS
9592+ lt_globsym_save_CFLAGS=$CFLAGS
9593 LIBS="conftstm.$ac_objext"
9594 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
9595 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
9596@@ -6807,8 +7138,8 @@ _LT_EOF
9597 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
9598 pipe_works=yes
9599 fi
9600- LIBS="$lt_save_LIBS"
9601- CFLAGS="$lt_save_CFLAGS"
9602+ LIBS=$lt_globsym_save_LIBS
9603+ CFLAGS=$lt_globsym_save_CFLAGS
9604 else
9605 echo "cannot find nm_test_func in $nlist" >&5
9606 fi
9607@@ -6845,6 +7176,14 @@ else
9608 $as_echo "ok" >&6; }
9609 fi
9610
9611+# Response file support.
9612+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
9613+ nm_file_list_spec='@'
9614+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
9615+ nm_file_list_spec='@'
9616+fi
9617+
9618+
9619
9620
9621
9622@@ -6866,6 +7205,47 @@ fi
9623
9624
9625
9626+
9627+
9628+
9629+
9630+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
9631+$as_echo_n "checking for sysroot... " >&6; }
9632+
9633+# Check whether --with-libtool-sysroot was given.
9634+if test "${with_libtool_sysroot+set}" = set; then :
9635+ withval=$with_libtool_sysroot;
9636+else
9637+ with_libtool_sysroot=no
9638+fi
9639+
9640+
9641+lt_sysroot=
9642+case ${with_libtool_sysroot} in #(
9643+ yes)
9644+ if test "$GCC" = yes; then
9645+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
9646+ fi
9647+ ;; #(
9648+ /*)
9649+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
9650+ ;; #(
9651+ no|'')
9652+ ;; #(
9653+ *)
9654+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
9655+$as_echo "${with_libtool_sysroot}" >&6; }
9656+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
9657+ ;;
9658+esac
9659+
9660+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
9661+$as_echo "${lt_sysroot:-no}" >&6; }
9662+
9663+
9664+
9665+
9666+
9667 # Check whether --enable-libtool-lock was given.
9668 if test "${enable_libtool_lock+set}" = set; then :
9669 enableval=$enable_libtool_lock;
9670@@ -7059,6 +7439,123 @@ esac
9671
9672 need_locks="$enable_libtool_lock"
9673
9674+if test -n "$ac_tool_prefix"; then
9675+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
9676+set dummy ${ac_tool_prefix}mt; ac_word=$2
9677+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9678+$as_echo_n "checking for $ac_word... " >&6; }
9679+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
9680+ $as_echo_n "(cached) " >&6
9681+else
9682+ if test -n "$MANIFEST_TOOL"; then
9683+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
9684+else
9685+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9686+for as_dir in $PATH
9687+do
9688+ IFS=$as_save_IFS
9689+ test -z "$as_dir" && as_dir=.
9690+ for ac_exec_ext in '' $ac_executable_extensions; do
9691+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9692+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
9693+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9694+ break 2
9695+ fi
9696+done
9697+ done
9698+IFS=$as_save_IFS
9699+
9700+fi
9701+fi
9702+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
9703+if test -n "$MANIFEST_TOOL"; then
9704+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
9705+$as_echo "$MANIFEST_TOOL" >&6; }
9706+else
9707+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9708+$as_echo "no" >&6; }
9709+fi
9710+
9711+
9712+fi
9713+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
9714+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
9715+ # Extract the first word of "mt", so it can be a program name with args.
9716+set dummy mt; ac_word=$2
9717+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9718+$as_echo_n "checking for $ac_word... " >&6; }
9719+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
9720+ $as_echo_n "(cached) " >&6
9721+else
9722+ if test -n "$ac_ct_MANIFEST_TOOL"; then
9723+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
9724+else
9725+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9726+for as_dir in $PATH
9727+do
9728+ IFS=$as_save_IFS
9729+ test -z "$as_dir" && as_dir=.
9730+ for ac_exec_ext in '' $ac_executable_extensions; do
9731+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9732+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
9733+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9734+ break 2
9735+ fi
9736+done
9737+ done
9738+IFS=$as_save_IFS
9739+
9740+fi
9741+fi
9742+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
9743+if test -n "$ac_ct_MANIFEST_TOOL"; then
9744+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
9745+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
9746+else
9747+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9748+$as_echo "no" >&6; }
9749+fi
9750+
9751+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
9752+ MANIFEST_TOOL=":"
9753+ else
9754+ case $cross_compiling:$ac_tool_warned in
9755+yes:)
9756+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9757+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9758+ac_tool_warned=yes ;;
9759+esac
9760+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
9761+ fi
9762+else
9763+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
9764+fi
9765+
9766+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
9767+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
9768+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
9769+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
9770+ $as_echo_n "(cached) " >&6
9771+else
9772+ lt_cv_path_mainfest_tool=no
9773+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
9774+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
9775+ cat conftest.err >&5
9776+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
9777+ lt_cv_path_mainfest_tool=yes
9778+ fi
9779+ rm -f conftest*
9780+fi
9781+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
9782+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
9783+if test "x$lt_cv_path_mainfest_tool" != xyes; then
9784+ MANIFEST_TOOL=:
9785+fi
9786+
9787+
9788+
9789+
9790+
9791
9792 case $host_os in
9793 rhapsody* | darwin*)
9794@@ -7622,6 +8119,8 @@ _LT_EOF
9795 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
9796 echo "$AR cru libconftest.a conftest.o" >&5
9797 $AR cru libconftest.a conftest.o 2>&5
9798+ echo "$RANLIB libconftest.a" >&5
9799+ $RANLIB libconftest.a 2>&5
9800 cat > conftest.c << _LT_EOF
9801 int main() { return 0;}
9802 _LT_EOF
9803@@ -7787,7 +8286,8 @@ fi
9804 LIBTOOL_DEPS="$ltmain"
9805
9806 # Always use our own libtool.
9807-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
9808+LIBTOOL='$(SHELL) $(top_builddir)'
9809+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
9810
9811
9812
9813@@ -7876,7 +8376,7 @@ aix3*)
9814 esac
9815
9816 # Global variables:
9817-ofile=libtool
9818+ofile=${host_alias}-libtool
9819 can_build_shared=yes
9820
9821 # All known linkers require a `.a' archive for static linking (except MSVC,
9822@@ -8174,8 +8674,6 @@ fi
9823 lt_prog_compiler_pic=
9824 lt_prog_compiler_static=
9825
9826-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9827-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9828
9829 if test "$GCC" = yes; then
9830 lt_prog_compiler_wl='-Wl,'
9831@@ -8340,6 +8838,12 @@ $as_echo_n "checking for $compiler optio
9832 lt_prog_compiler_pic='--shared'
9833 lt_prog_compiler_static='--static'
9834 ;;
9835+ nagfor*)
9836+ # NAG Fortran compiler
9837+ lt_prog_compiler_wl='-Wl,-Wl,,'
9838+ lt_prog_compiler_pic='-PIC'
9839+ lt_prog_compiler_static='-Bstatic'
9840+ ;;
9841 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
9842 # Portland Group compilers (*not* the Pentium gcc compiler,
9843 # which looks to be a dead project)
9844@@ -8402,7 +8906,7 @@ $as_echo_n "checking for $compiler optio
9845 lt_prog_compiler_pic='-KPIC'
9846 lt_prog_compiler_static='-Bstatic'
9847 case $cc_basename in
9848- f77* | f90* | f95*)
9849+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
9850 lt_prog_compiler_wl='-Qoption ld ';;
9851 *)
9852 lt_prog_compiler_wl='-Wl,';;
9853@@ -8459,13 +8963,17 @@ case $host_os in
9854 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
9855 ;;
9856 esac
9857-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
9858-$as_echo "$lt_prog_compiler_pic" >&6; }
9859-
9860-
9861-
9862-
9863
9864+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9865+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9866+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
9867+ $as_echo_n "(cached) " >&6
9868+else
9869+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
9870+fi
9871+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
9872+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
9873+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
9874
9875 #
9876 # Check to make sure the PIC flag actually works.
9877@@ -8526,6 +9034,11 @@ fi
9878
9879
9880
9881+
9882+
9883+
9884+
9885+
9886 #
9887 # Check to make sure the static flag actually works.
9888 #
9889@@ -8876,7 +9389,8 @@ _LT_EOF
9890 allow_undefined_flag=unsupported
9891 always_export_symbols=no
9892 enable_shared_with_static_runtimes=yes
9893- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
9894+ 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'
9895+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9896
9897 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9898 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9899@@ -8924,7 +9438,7 @@ _LT_EOF
9900 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
9901 && test "$tmp_diet" = no
9902 then
9903- tmp_addflag=
9904+ tmp_addflag=' $pic_flag'
9905 tmp_sharedflag='-shared'
9906 case $cc_basename,$host_cpu in
9907 pgcc*) # Portland Group C compiler
9908@@ -8975,12 +9489,12 @@ _LT_EOF
9909 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
9910 hardcode_libdir_flag_spec=
9911 hardcode_libdir_flag_spec_ld='-rpath $libdir'
9912- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
9913+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
9914 if test "x$supports_anon_versioning" = xyes; then
9915 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
9916 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
9917 echo "local: *; };" >> $output_objdir/$libname.ver~
9918- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9919+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9920 fi
9921 ;;
9922 esac
9923@@ -8994,8 +9508,8 @@ _LT_EOF
9924 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9925 wlarc=
9926 else
9927- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9928- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9929+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9930+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9931 fi
9932 ;;
9933
9934@@ -9013,8 +9527,8 @@ _LT_EOF
9935
9936 _LT_EOF
9937 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
9938- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9939- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9940+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9941+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9942 else
9943 ld_shlibs=no
9944 fi
9945@@ -9060,8 +9574,8 @@ _LT_EOF
9946
9947 *)
9948 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
9949- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9950- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9951+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9952+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9953 else
9954 ld_shlibs=no
9955 fi
9956@@ -9191,7 +9705,13 @@ _LT_EOF
9957 allow_undefined_flag='-berok'
9958 # Determine the default libpath from the value encoded in an
9959 # empty executable.
9960- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9961+ if test "${lt_cv_aix_libpath+set}" = set; then
9962+ aix_libpath=$lt_cv_aix_libpath
9963+else
9964+ if test "${lt_cv_aix_libpath_+set}" = set; then :
9965+ $as_echo_n "(cached) " >&6
9966+else
9967+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9968 /* end confdefs.h. */
9969
9970 int
9971@@ -9204,22 +9724,29 @@ main ()
9972 _ACEOF
9973 if ac_fn_c_try_link "$LINENO"; then :
9974
9975-lt_aix_libpath_sed='
9976- /Import File Strings/,/^$/ {
9977- /^0/ {
9978- s/^0 *\(.*\)$/\1/
9979- p
9980- }
9981- }'
9982-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9983-# Check for a 64-bit object if we didn't find anything.
9984-if test -z "$aix_libpath"; then
9985- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9986-fi
9987+ lt_aix_libpath_sed='
9988+ /Import File Strings/,/^$/ {
9989+ /^0/ {
9990+ s/^0 *\([^ ]*\) *$/\1/
9991+ p
9992+ }
9993+ }'
9994+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9995+ # Check for a 64-bit object if we didn't find anything.
9996+ if test -z "$lt_cv_aix_libpath_"; then
9997+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9998+ fi
9999 fi
10000 rm -f core conftest.err conftest.$ac_objext \
10001 conftest$ac_exeext conftest.$ac_ext
10002-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10003+ if test -z "$lt_cv_aix_libpath_"; then
10004+ lt_cv_aix_libpath_="/usr/lib:/lib"
10005+ fi
10006+
10007+fi
10008+
10009+ aix_libpath=$lt_cv_aix_libpath_
10010+fi
10011
10012 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10013 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"
10014@@ -9231,7 +9758,13 @@ if test -z "$aix_libpath"; then aix_libp
10015 else
10016 # Determine the default libpath from the value encoded in an
10017 # empty executable.
10018- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10019+ if test "${lt_cv_aix_libpath+set}" = set; then
10020+ aix_libpath=$lt_cv_aix_libpath
10021+else
10022+ if test "${lt_cv_aix_libpath_+set}" = set; then :
10023+ $as_echo_n "(cached) " >&6
10024+else
10025+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10026 /* end confdefs.h. */
10027
10028 int
10029@@ -9244,22 +9777,29 @@ main ()
10030 _ACEOF
10031 if ac_fn_c_try_link "$LINENO"; then :
10032
10033-lt_aix_libpath_sed='
10034- /Import File Strings/,/^$/ {
10035- /^0/ {
10036- s/^0 *\(.*\)$/\1/
10037- p
10038- }
10039- }'
10040-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10041-# Check for a 64-bit object if we didn't find anything.
10042-if test -z "$aix_libpath"; then
10043- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10044-fi
10045+ lt_aix_libpath_sed='
10046+ /Import File Strings/,/^$/ {
10047+ /^0/ {
10048+ s/^0 *\([^ ]*\) *$/\1/
10049+ p
10050+ }
10051+ }'
10052+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10053+ # Check for a 64-bit object if we didn't find anything.
10054+ if test -z "$lt_cv_aix_libpath_"; then
10055+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10056+ fi
10057 fi
10058 rm -f core conftest.err conftest.$ac_objext \
10059 conftest$ac_exeext conftest.$ac_ext
10060-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10061+ if test -z "$lt_cv_aix_libpath_"; then
10062+ lt_cv_aix_libpath_="/usr/lib:/lib"
10063+ fi
10064+
10065+fi
10066+
10067+ aix_libpath=$lt_cv_aix_libpath_
10068+fi
10069
10070 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10071 # Warning - without using the other run time loading flags,
10072@@ -9304,20 +9844,63 @@ if test -z "$aix_libpath"; then aix_libp
10073 # Microsoft Visual C++.
10074 # hardcode_libdir_flag_spec is actually meaningless, as there is
10075 # no search path for DLLs.
10076- hardcode_libdir_flag_spec=' '
10077- allow_undefined_flag=unsupported
10078- # Tell ltmain to make .lib files, not .a files.
10079- libext=lib
10080- # Tell ltmain to make .dll files, not .so files.
10081- shrext_cmds=".dll"
10082- # FIXME: Setting linknames here is a bad hack.
10083- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10084- # The linker will automatically build a .lib file if we build a DLL.
10085- old_archive_from_new_cmds='true'
10086- # FIXME: Should let the user specify the lib program.
10087- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10088- fix_srcfile_path='`cygpath -w "$srcfile"`'
10089- enable_shared_with_static_runtimes=yes
10090+ case $cc_basename in
10091+ cl*)
10092+ # Native MSVC
10093+ hardcode_libdir_flag_spec=' '
10094+ allow_undefined_flag=unsupported
10095+ always_export_symbols=yes
10096+ file_list_spec='@'
10097+ # Tell ltmain to make .lib files, not .a files.
10098+ libext=lib
10099+ # Tell ltmain to make .dll files, not .so files.
10100+ shrext_cmds=".dll"
10101+ # FIXME: Setting linknames here is a bad hack.
10102+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
10103+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
10104+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
10105+ else
10106+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
10107+ fi~
10108+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
10109+ linknames='
10110+ # The linker will not automatically build a static lib if we build a DLL.
10111+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
10112+ enable_shared_with_static_runtimes=yes
10113+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
10114+ # Don't use ranlib
10115+ old_postinstall_cmds='chmod 644 $oldlib'
10116+ postlink_cmds='lt_outputfile="@OUTPUT@"~
10117+ lt_tool_outputfile="@TOOL_OUTPUT@"~
10118+ case $lt_outputfile in
10119+ *.exe|*.EXE) ;;
10120+ *)
10121+ lt_outputfile="$lt_outputfile.exe"
10122+ lt_tool_outputfile="$lt_tool_outputfile.exe"
10123+ ;;
10124+ esac~
10125+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
10126+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
10127+ $RM "$lt_outputfile.manifest";
10128+ fi'
10129+ ;;
10130+ *)
10131+ # Assume MSVC wrapper
10132+ hardcode_libdir_flag_spec=' '
10133+ allow_undefined_flag=unsupported
10134+ # Tell ltmain to make .lib files, not .a files.
10135+ libext=lib
10136+ # Tell ltmain to make .dll files, not .so files.
10137+ shrext_cmds=".dll"
10138+ # FIXME: Setting linknames here is a bad hack.
10139+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10140+ # The linker will automatically build a .lib file if we build a DLL.
10141+ old_archive_from_new_cmds='true'
10142+ # FIXME: Should let the user specify the lib program.
10143+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10144+ enable_shared_with_static_runtimes=yes
10145+ ;;
10146+ esac
10147 ;;
10148
10149 darwin* | rhapsody*)
10150@@ -9382,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libp
10151
10152 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
10153 freebsd* | dragonfly*)
10154- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
10155+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10156 hardcode_libdir_flag_spec='-R$libdir'
10157 hardcode_direct=yes
10158 hardcode_shlibpath_var=no
10159@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libp
10160
10161 hpux9*)
10162 if test "$GCC" = yes; then
10163- 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'
10164+ 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'
10165 else
10166 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'
10167 fi
10168@@ -9406,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libp
10169
10170 hpux10*)
10171 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
10172- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10173+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10174 else
10175 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10176 fi
10177@@ -9430,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libp
10178 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10179 ;;
10180 ia64*)
10181- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10182+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10183 ;;
10184 *)
10185- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10186+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10187 ;;
10188 esac
10189 else
10190@@ -9512,23 +10095,36 @@ fi
10191
10192 irix5* | irix6* | nonstopux*)
10193 if test "$GCC" = yes; then
10194- 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'
10195+ 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'
10196 # Try to use the -exported_symbol ld option, if it does not
10197 # work, assume that -exports_file does not work either and
10198 # implicitly export all symbols.
10199- save_LDFLAGS="$LDFLAGS"
10200- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10201- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10202+ # This should be the same for all languages, so no per-tag cache variable.
10203+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
10204+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
10205+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
10206+ $as_echo_n "(cached) " >&6
10207+else
10208+ save_LDFLAGS="$LDFLAGS"
10209+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10210+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10211 /* end confdefs.h. */
10212-int foo(void) {}
10213+int foo (void) { return 0; }
10214 _ACEOF
10215 if ac_fn_c_try_link "$LINENO"; then :
10216- 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'
10217-
10218+ lt_cv_irix_exported_symbol=yes
10219+else
10220+ lt_cv_irix_exported_symbol=no
10221 fi
10222 rm -f core conftest.err conftest.$ac_objext \
10223 conftest$ac_exeext conftest.$ac_ext
10224- LDFLAGS="$save_LDFLAGS"
10225+ LDFLAGS="$save_LDFLAGS"
10226+fi
10227+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
10228+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
10229+ if test "$lt_cv_irix_exported_symbol" = yes; then
10230+ 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'
10231+ fi
10232 else
10233 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'
10234 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'
10235@@ -9613,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_obj
10236 osf4* | osf5*) # as osf3* with the addition of -msym flag
10237 if test "$GCC" = yes; then
10238 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
10239- 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'
10240+ 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'
10241 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10242 else
10243 allow_undefined_flag=' -expect_unresolved \*'
10244@@ -9632,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_obj
10245 no_undefined_flag=' -z defs'
10246 if test "$GCC" = yes; then
10247 wlarc='${wl}'
10248- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10249+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10250 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
10251- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
10252+ $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'
10253 else
10254 case `$CC -V 2>&1` in
10255 *"Compilers 5.0"*)
10256@@ -10210,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10257 need_version=no
10258 need_lib_prefix=no
10259
10260- case $GCC,$host_os in
10261- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10262+ case $GCC,$cc_basename in
10263+ yes,*)
10264+ # gcc
10265 library_names_spec='$libname.dll.a'
10266 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10267 postinstall_cmds='base_file=`basename \${file}`~
10268@@ -10244,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
10269 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10270 ;;
10271 esac
10272+ dynamic_linker='Win32 ld.exe'
10273+ ;;
10274+
10275+ *,cl*)
10276+ # Native MSVC
10277+ libname_spec='$name'
10278+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10279+ library_names_spec='${libname}.dll.lib'
10280+
10281+ case $build_os in
10282+ mingw*)
10283+ sys_lib_search_path_spec=
10284+ lt_save_ifs=$IFS
10285+ IFS=';'
10286+ for lt_path in $LIB
10287+ do
10288+ IFS=$lt_save_ifs
10289+ # Let DOS variable expansion print the short 8.3 style file name.
10290+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10291+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10292+ done
10293+ IFS=$lt_save_ifs
10294+ # Convert to MSYS style.
10295+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
10296+ ;;
10297+ cygwin*)
10298+ # Convert to unix form, then to dos form, then back to unix form
10299+ # but this time dos style (no spaces!) so that the unix form looks
10300+ # like /cygdrive/c/PROGRA~1:/cygdr...
10301+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10302+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10303+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10304+ ;;
10305+ *)
10306+ sys_lib_search_path_spec="$LIB"
10307+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
10308+ # It is most probably a Windows format PATH.
10309+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10310+ else
10311+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10312+ fi
10313+ # FIXME: find the short name or the path components, as spaces are
10314+ # common. (e.g. "Program Files" -> "PROGRA~1")
10315+ ;;
10316+ esac
10317+
10318+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10319+ postinstall_cmds='base_file=`basename \${file}`~
10320+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10321+ dldir=$destdir/`dirname \$dlpath`~
10322+ test -d \$dldir || mkdir -p \$dldir~
10323+ $install_prog $dir/$dlname \$dldir/$dlname'
10324+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10325+ dlpath=$dir/\$dldll~
10326+ $RM \$dlpath'
10327+ shlibpath_overrides_runpath=yes
10328+ dynamic_linker='Win32 link.exe'
10329 ;;
10330
10331 *)
10332+ # Assume MSVC wrapper
10333 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
10334+ dynamic_linker='Win32 ld.exe'
10335 ;;
10336 esac
10337- dynamic_linker='Win32 ld.exe'
10338 # FIXME: first we should search . and the directory the executable is in
10339 shlibpath_var=PATH
10340 ;;
10341@@ -10346,7 +11001,7 @@ haiku*)
10342 soname_spec='${libname}${release}${shared_ext}$major'
10343 shlibpath_var=LIBRARY_PATH
10344 shlibpath_overrides_runpath=yes
10345- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10346+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10347 hardcode_into_libs=yes
10348 ;;
10349
10350@@ -11142,7 +11797,7 @@ else
10351 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10352 lt_status=$lt_dlunknown
10353 cat > conftest.$ac_ext <<_LT_EOF
10354-#line 11145 "configure"
10355+#line $LINENO "configure"
10356 #include "confdefs.h"
10357
10358 #if HAVE_DLFCN_H
10359@@ -11186,10 +11841,10 @@ else
10360 /* When -fvisbility=hidden is used, assume the code has been annotated
10361 correspondingly for the symbols needed. */
10362 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10363-void fnord () __attribute__((visibility("default")));
10364+int fnord () __attribute__((visibility("default")));
10365 #endif
10366
10367-void fnord () { int i=42; }
10368+int fnord () { return 42; }
10369 int main ()
10370 {
10371 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10372@@ -11248,7 +11903,7 @@ else
10373 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10374 lt_status=$lt_dlunknown
10375 cat > conftest.$ac_ext <<_LT_EOF
10376-#line 11251 "configure"
10377+#line $LINENO "configure"
10378 #include "confdefs.h"
10379
10380 #if HAVE_DLFCN_H
10381@@ -11292,10 +11947,10 @@ else
10382 /* When -fvisbility=hidden is used, assume the code has been annotated
10383 correspondingly for the symbols needed. */
10384 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10385-void fnord () __attribute__((visibility("default")));
10386+int fnord () __attribute__((visibility("default")));
10387 #endif
10388
10389-void fnord () { int i=42; }
10390+int fnord () { return 42; }
10391 int main ()
10392 {
10393 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10394@@ -12328,7 +12983,7 @@ if test "$enable_shared" = "yes"; then
10395 # since libbfd may not pull in the entirety of libiberty.
10396 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
10397 if test -n "$x"; then
10398- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
10399+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
10400 fi
10401
10402 case "${host}" in
10403@@ -13289,13 +13944,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
10404 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
10405 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
10406 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
10407+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
10408+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
10409 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
10410 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
10411 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
10412 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
10413 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
10414+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
10415+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
10416+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
10417+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
10418 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
10419 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
10420+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
10421 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
10422 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
10423 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
10424@@ -13310,14 +13972,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
10425 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
10426 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
10427 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"`'
10428+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
10429+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
10430 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
10431 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
10432 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
10433-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10434 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
10435+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10436 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
10437 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
10438 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
10439+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
10440 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
10441 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
10442 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
10443@@ -13350,12 +14015,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
10444 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
10445 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
10446 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
10447-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
10448 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
10449 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
10450 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
10451 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
10452 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
10453+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
10454 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
10455 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
10456 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
10457@@ -13410,8 +14075,13 @@ reload_flag \
10458 OBJDUMP \
10459 deplibs_check_method \
10460 file_magic_cmd \
10461+file_magic_glob \
10462+want_nocaseglob \
10463+DLLTOOL \
10464+sharedlib_from_linklib_cmd \
10465 AR \
10466 AR_FLAGS \
10467+archiver_list_spec \
10468 STRIP \
10469 RANLIB \
10470 CC \
10471@@ -13421,12 +14091,14 @@ lt_cv_sys_global_symbol_pipe \
10472 lt_cv_sys_global_symbol_to_cdecl \
10473 lt_cv_sys_global_symbol_to_c_name_address \
10474 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
10475+nm_file_list_spec \
10476 lt_prog_compiler_no_builtin_flag \
10477-lt_prog_compiler_wl \
10478 lt_prog_compiler_pic \
10479+lt_prog_compiler_wl \
10480 lt_prog_compiler_static \
10481 lt_cv_prog_compiler_c_o \
10482 need_locks \
10483+MANIFEST_TOOL \
10484 DSYMUTIL \
10485 NMEDIT \
10486 LIPO \
10487@@ -13442,7 +14114,6 @@ no_undefined_flag \
10488 hardcode_libdir_flag_spec \
10489 hardcode_libdir_flag_spec_ld \
10490 hardcode_libdir_separator \
10491-fix_srcfile_path \
10492 exclude_expsyms \
10493 include_expsyms \
10494 file_list_spec \
10495@@ -13478,6 +14149,7 @@ module_cmds \
10496 module_expsym_cmds \
10497 export_symbols_cmds \
10498 prelink_cmds \
10499+postlink_cmds \
10500 postinstall_cmds \
10501 postuninstall_cmds \
10502 finish_cmds \
10503@@ -14234,7 +14906,8 @@ $as_echo X"$file" |
10504 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
10505 #
10506 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10507-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10508+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10509+# Inc.
10510 # Written by Gordon Matzigkeit, 1996
10511 #
10512 # This file is part of GNU Libtool.
10513@@ -14337,19 +15010,42 @@ SP2NL=$lt_lt_SP2NL
10514 # turn newlines into spaces.
10515 NL2SP=$lt_lt_NL2SP
10516
10517+# convert \$build file names to \$host format.
10518+to_host_file_cmd=$lt_cv_to_host_file_cmd
10519+
10520+# convert \$build files to toolchain format.
10521+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10522+
10523 # An object symbol dumper.
10524 OBJDUMP=$lt_OBJDUMP
10525
10526 # Method to check whether dependent libraries are shared objects.
10527 deplibs_check_method=$lt_deplibs_check_method
10528
10529-# Command to use when deplibs_check_method == "file_magic".
10530+# Command to use when deplibs_check_method = "file_magic".
10531 file_magic_cmd=$lt_file_magic_cmd
10532
10533+# How to find potential files when deplibs_check_method = "file_magic".
10534+file_magic_glob=$lt_file_magic_glob
10535+
10536+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
10537+want_nocaseglob=$lt_want_nocaseglob
10538+
10539+# DLL creation program.
10540+DLLTOOL=$lt_DLLTOOL
10541+
10542+# Command to associate shared and link libraries.
10543+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
10544+
10545 # The archiver.
10546 AR=$lt_AR
10547+
10548+# Flags to create an archive.
10549 AR_FLAGS=$lt_AR_FLAGS
10550
10551+# How to feed a file listing to the archiver.
10552+archiver_list_spec=$lt_archiver_list_spec
10553+
10554 # A symbol stripping program.
10555 STRIP=$lt_STRIP
10556
10557@@ -14379,6 +15075,12 @@ global_symbol_to_c_name_address=$lt_lt_c
10558 # Transform the output of nm in a C name address pair when lib prefix is needed.
10559 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
10560
10561+# Specify filename containing input files for \$NM.
10562+nm_file_list_spec=$lt_nm_file_list_spec
10563+
10564+# The root where to search for dependent libraries,and in which our libraries should be installed.
10565+lt_sysroot=$lt_sysroot
10566+
10567 # The name of the directory that contains temporary libtool files.
10568 objdir=$objdir
10569
10570@@ -14388,6 +15090,9 @@ MAGIC_CMD=$MAGIC_CMD
10571 # Must we lock files when doing compilation?
10572 need_locks=$lt_need_locks
10573
10574+# Manifest tool.
10575+MANIFEST_TOOL=$lt_MANIFEST_TOOL
10576+
10577 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10578 DSYMUTIL=$lt_DSYMUTIL
10579
10580@@ -14502,12 +15207,12 @@ with_gcc=$GCC
10581 # Compiler flag to turn off builtin functions.
10582 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10583
10584-# How to pass a linker flag through the compiler.
10585-wl=$lt_lt_prog_compiler_wl
10586-
10587 # Additional compiler flags for building library objects.
10588 pic_flag=$lt_lt_prog_compiler_pic
10589
10590+# How to pass a linker flag through the compiler.
10591+wl=$lt_lt_prog_compiler_wl
10592+
10593 # Compiler flag to prevent dynamic linking.
10594 link_static_flag=$lt_lt_prog_compiler_static
10595
10596@@ -14594,9 +15299,6 @@ inherit_rpath=$inherit_rpath
10597 # Whether libtool must link a program against all its dependency libraries.
10598 link_all_deplibs=$link_all_deplibs
10599
10600-# Fix the shell variable \$srcfile for the compiler.
10601-fix_srcfile_path=$lt_fix_srcfile_path
10602-
10603 # Set to "yes" if exported symbols are required.
10604 always_export_symbols=$always_export_symbols
10605
10606@@ -14612,6 +15314,9 @@ include_expsyms=$lt_include_expsyms
10607 # Commands necessary for linking programs (against libraries) with templates.
10608 prelink_cmds=$lt_prelink_cmds
10609
10610+# Commands necessary for finishing linking programs.
10611+postlink_cmds=$lt_postlink_cmds
10612+
10613 # Specify filename containing input files.
10614 file_list_spec=$lt_file_list_spec
10615
10616@@ -14644,210 +15349,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10617 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10618 # text mode, it properly converts lines to CR/LF. This bash problem
10619 # is reportedly fixed, but why not run on old versions too?
10620- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10621- || (rm -f "$cfgfile"; exit 1)
10622-
10623- case $xsi_shell in
10624- yes)
10625- cat << \_LT_EOF >> "$cfgfile"
10626-
10627-# func_dirname file append nondir_replacement
10628-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10629-# otherwise set result to NONDIR_REPLACEMENT.
10630-func_dirname ()
10631-{
10632- case ${1} in
10633- */*) func_dirname_result="${1%/*}${2}" ;;
10634- * ) func_dirname_result="${3}" ;;
10635- esac
10636-}
10637-
10638-# func_basename file
10639-func_basename ()
10640-{
10641- func_basename_result="${1##*/}"
10642-}
10643-
10644-# func_dirname_and_basename file append nondir_replacement
10645-# perform func_basename and func_dirname in a single function
10646-# call:
10647-# dirname: Compute the dirname of FILE. If nonempty,
10648-# add APPEND to the result, otherwise set result
10649-# to NONDIR_REPLACEMENT.
10650-# value returned in "$func_dirname_result"
10651-# basename: Compute filename of FILE.
10652-# value retuned in "$func_basename_result"
10653-# Implementation must be kept synchronized with func_dirname
10654-# and func_basename. For efficiency, we do not delegate to
10655-# those functions but instead duplicate the functionality here.
10656-func_dirname_and_basename ()
10657-{
10658- case ${1} in
10659- */*) func_dirname_result="${1%/*}${2}" ;;
10660- * ) func_dirname_result="${3}" ;;
10661- esac
10662- func_basename_result="${1##*/}"
10663-}
10664-
10665-# func_stripname prefix suffix name
10666-# strip PREFIX and SUFFIX off of NAME.
10667-# PREFIX and SUFFIX must not contain globbing or regex special
10668-# characters, hashes, percent signs, but SUFFIX may contain a leading
10669-# dot (in which case that matches only a dot).
10670-func_stripname ()
10671-{
10672- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
10673- # positional parameters, so assign one to ordinary parameter first.
10674- func_stripname_result=${3}
10675- func_stripname_result=${func_stripname_result#"${1}"}
10676- func_stripname_result=${func_stripname_result%"${2}"}
10677-}
10678-
10679-# func_opt_split
10680-func_opt_split ()
10681-{
10682- func_opt_split_opt=${1%%=*}
10683- func_opt_split_arg=${1#*=}
10684-}
10685-
10686-# func_lo2o object
10687-func_lo2o ()
10688-{
10689- case ${1} in
10690- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
10691- *) func_lo2o_result=${1} ;;
10692- esac
10693-}
10694-
10695-# func_xform libobj-or-source
10696-func_xform ()
10697-{
10698- func_xform_result=${1%.*}.lo
10699-}
10700-
10701-# func_arith arithmetic-term...
10702-func_arith ()
10703-{
10704- func_arith_result=$(( $* ))
10705-}
10706-
10707-# func_len string
10708-# STRING may not start with a hyphen.
10709-func_len ()
10710-{
10711- func_len_result=${#1}
10712-}
10713-
10714-_LT_EOF
10715- ;;
10716- *) # Bourne compatible functions.
10717- cat << \_LT_EOF >> "$cfgfile"
10718-
10719-# func_dirname file append nondir_replacement
10720-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10721-# otherwise set result to NONDIR_REPLACEMENT.
10722-func_dirname ()
10723-{
10724- # Extract subdirectory from the argument.
10725- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10726- if test "X$func_dirname_result" = "X${1}"; then
10727- func_dirname_result="${3}"
10728- else
10729- func_dirname_result="$func_dirname_result${2}"
10730- fi
10731-}
10732-
10733-# func_basename file
10734-func_basename ()
10735-{
10736- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10737-}
10738-
10739-
10740-# func_stripname prefix suffix name
10741-# strip PREFIX and SUFFIX off of NAME.
10742-# PREFIX and SUFFIX must not contain globbing or regex special
10743-# characters, hashes, percent signs, but SUFFIX may contain a leading
10744-# dot (in which case that matches only a dot).
10745-# func_strip_suffix prefix name
10746-func_stripname ()
10747-{
10748- case ${2} in
10749- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10750- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10751- esac
10752-}
10753-
10754-# sed scripts:
10755-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10756-my_sed_long_arg='1s/^-[^=]*=//'
10757-
10758-# func_opt_split
10759-func_opt_split ()
10760-{
10761- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10762- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10763-}
10764-
10765-# func_lo2o object
10766-func_lo2o ()
10767-{
10768- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10769-}
10770-
10771-# func_xform libobj-or-source
10772-func_xform ()
10773-{
10774- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10775-}
10776-
10777-# func_arith arithmetic-term...
10778-func_arith ()
10779-{
10780- func_arith_result=`expr "$@"`
10781-}
10782-
10783-# func_len string
10784-# STRING may not start with a hyphen.
10785-func_len ()
10786-{
10787- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10788-}
10789-
10790-_LT_EOF
10791-esac
10792-
10793-case $lt_shell_append in
10794- yes)
10795- cat << \_LT_EOF >> "$cfgfile"
10796-
10797-# func_append var value
10798-# Append VALUE to the end of shell variable VAR.
10799-func_append ()
10800-{
10801- eval "$1+=\$2"
10802-}
10803-_LT_EOF
10804- ;;
10805- *)
10806- cat << \_LT_EOF >> "$cfgfile"
10807-
10808-# func_append var value
10809-# Append VALUE to the end of shell variable VAR.
10810-func_append ()
10811-{
10812- eval "$1=\$$1\$2"
10813-}
10814-
10815-_LT_EOF
10816- ;;
10817- esac
10818+ sed '$q' "$ltmain" >> "$cfgfile" \
10819+ || (rm -f "$cfgfile"; exit 1)
10820
10821+ if test x"$xsi_shell" = xyes; then
10822+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10823+func_dirname ()\
10824+{\
10825+\ case ${1} in\
10826+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10827+\ * ) func_dirname_result="${3}" ;;\
10828+\ esac\
10829+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10830+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10831+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10832+test 0 -eq $? || _lt_function_replace_fail=:
10833+
10834+
10835+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10836+func_basename ()\
10837+{\
10838+\ func_basename_result="${1##*/}"\
10839+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10840+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10841+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10842+test 0 -eq $? || _lt_function_replace_fail=:
10843+
10844+
10845+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10846+func_dirname_and_basename ()\
10847+{\
10848+\ case ${1} in\
10849+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10850+\ * ) func_dirname_result="${3}" ;;\
10851+\ esac\
10852+\ func_basename_result="${1##*/}"\
10853+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10854+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10855+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10856+test 0 -eq $? || _lt_function_replace_fail=:
10857+
10858+
10859+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10860+func_stripname ()\
10861+{\
10862+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10863+\ # positional parameters, so assign one to ordinary parameter first.\
10864+\ func_stripname_result=${3}\
10865+\ func_stripname_result=${func_stripname_result#"${1}"}\
10866+\ func_stripname_result=${func_stripname_result%"${2}"}\
10867+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10868+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10869+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10870+test 0 -eq $? || _lt_function_replace_fail=:
10871+
10872+
10873+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10874+func_split_long_opt ()\
10875+{\
10876+\ func_split_long_opt_name=${1%%=*}\
10877+\ func_split_long_opt_arg=${1#*=}\
10878+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10879+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10880+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10881+test 0 -eq $? || _lt_function_replace_fail=:
10882+
10883+
10884+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10885+func_split_short_opt ()\
10886+{\
10887+\ func_split_short_opt_arg=${1#??}\
10888+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10889+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10890+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10891+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10892+test 0 -eq $? || _lt_function_replace_fail=:
10893+
10894+
10895+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10896+func_lo2o ()\
10897+{\
10898+\ case ${1} in\
10899+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10900+\ *) func_lo2o_result=${1} ;;\
10901+\ esac\
10902+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10903+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10904+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10905+test 0 -eq $? || _lt_function_replace_fail=:
10906+
10907+
10908+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10909+func_xform ()\
10910+{\
10911+ func_xform_result=${1%.*}.lo\
10912+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10913+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10914+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10915+test 0 -eq $? || _lt_function_replace_fail=:
10916+
10917+
10918+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10919+func_arith ()\
10920+{\
10921+ func_arith_result=$(( $* ))\
10922+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10923+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10924+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10925+test 0 -eq $? || _lt_function_replace_fail=:
10926+
10927+
10928+ sed -e '/^func_len ()$/,/^} # func_len /c\
10929+func_len ()\
10930+{\
10931+ func_len_result=${#1}\
10932+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10933+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10934+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10935+test 0 -eq $? || _lt_function_replace_fail=:
10936+
10937+fi
10938+
10939+if test x"$lt_shell_append" = xyes; then
10940+ sed -e '/^func_append ()$/,/^} # func_append /c\
10941+func_append ()\
10942+{\
10943+ eval "${1}+=\\${2}"\
10944+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10945+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10946+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10947+test 0 -eq $? || _lt_function_replace_fail=:
10948+
10949+
10950+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10951+func_append_quoted ()\
10952+{\
10953+\ func_quote_for_eval "${2}"\
10954+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10955+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10956+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10957+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10958+test 0 -eq $? || _lt_function_replace_fail=:
10959+
10960+
10961+ # Save a `func_append' function call where possible by direct use of '+='
10962+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10963+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10964+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10965+ test 0 -eq $? || _lt_function_replace_fail=:
10966+else
10967+ # Save a `func_append' function call even when '+=' is not available
10968+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10969+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10970+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10971+ test 0 -eq $? || _lt_function_replace_fail=:
10972+fi
10973+
10974+if test x"$_lt_function_replace_fail" = x":"; then
10975+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10976+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10977+fi
10978
10979- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10980- || (rm -f "$cfgfile"; exit 1)
10981
10982- mv -f "$cfgfile" "$ofile" ||
10983+ mv -f "$cfgfile" "$ofile" ||
10984 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10985 chmod +x "$ofile"
10986
10987Index: binutils-2.21.1/binutils/configure
10988===================================================================
10989--- binutils-2.21.1.orig/binutils/configure
10990+++ binutils-2.21.1/binutils/configure
10991@@ -654,8 +654,11 @@ OTOOL
10992 LIPO
10993 NMEDIT
10994 DSYMUTIL
10995+MANIFEST_TOOL
10996 RANLIB
10997+ac_ct_AR
10998 AR
10999+DLLTOOL
11000 OBJDUMP
11001 LN_S
11002 NM
11003@@ -768,6 +771,7 @@ enable_static
11004 with_pic
11005 enable_fast_install
11006 with_gnu_ld
11007+with_libtool_sysroot
11008 enable_libtool_lock
11009 enable_targets
11010 enable_werror
11011@@ -1429,6 +1433,8 @@ Optional Packages:
11012 --with-pic try to use only PIC/non-PIC objects [default=use
11013 both]
11014 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
11015+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
11016+ (or the compiler's sysroot if not specified).
11017 --with-gnu-ld assume the C compiler uses GNU ld default=no
11018 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
11019 --without-libiconv-prefix don't search for libiconv in includedir and libdir
11020@@ -5146,8 +5152,8 @@ esac
11021
11022
11023
11024-macro_version='2.2.7a'
11025-macro_revision='1.3134'
11026+macro_version='2.4'
11027+macro_revision='1.3293'
11028
11029
11030
11031@@ -5187,7 +5193,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
11032 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
11033 $as_echo_n "checking how to print strings... " >&6; }
11034 # Test print first, because it will be a builtin if present.
11035-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
11036+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
11037 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
11038 ECHO='print -r --'
11039 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
11040@@ -5873,8 +5879,8 @@ $as_echo_n "checking whether the shell u
11041 # Try some XSI features
11042 xsi_shell=no
11043 ( _lt_dummy="a/b/c"
11044- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11045- = c,a/b,, \
11046+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11047+ = c,a/b,b/c, \
11048 && eval 'test $(( 1 + 1 )) -eq 2 \
11049 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11050 && xsi_shell=yes
11051@@ -5923,6 +5929,80 @@ esac
11052
11053
11054
11055+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
11056+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
11057+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
11058+ $as_echo_n "(cached) " >&6
11059+else
11060+ case $host in
11061+ *-*-mingw* )
11062+ case $build in
11063+ *-*-mingw* ) # actually msys
11064+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11065+ ;;
11066+ *-*-cygwin* )
11067+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11068+ ;;
11069+ * ) # otherwise, assume *nix
11070+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11071+ ;;
11072+ esac
11073+ ;;
11074+ *-*-cygwin* )
11075+ case $build in
11076+ *-*-mingw* ) # actually msys
11077+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
11078+ ;;
11079+ *-*-cygwin* )
11080+ lt_cv_to_host_file_cmd=func_convert_file_noop
11081+ ;;
11082+ * ) # otherwise, assume *nix
11083+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
11084+ ;;
11085+ esac
11086+ ;;
11087+ * ) # unhandled hosts (and "normal" native builds)
11088+ lt_cv_to_host_file_cmd=func_convert_file_noop
11089+ ;;
11090+esac
11091+
11092+fi
11093+
11094+to_host_file_cmd=$lt_cv_to_host_file_cmd
11095+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
11096+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
11097+
11098+
11099+
11100+
11101+
11102+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
11103+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
11104+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
11105+ $as_echo_n "(cached) " >&6
11106+else
11107+ #assume ordinary cross tools, or native build.
11108+lt_cv_to_tool_file_cmd=func_convert_file_noop
11109+case $host in
11110+ *-*-mingw* )
11111+ case $build in
11112+ *-*-mingw* ) # actually msys
11113+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
11114+ ;;
11115+ esac
11116+ ;;
11117+esac
11118+
11119+fi
11120+
11121+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
11122+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
11123+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
11124+
11125+
11126+
11127+
11128+
11129 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
11130 $as_echo_n "checking for $LD option to reload object files... " >&6; }
11131 if test "${lt_cv_ld_reload_flag+set}" = set; then :
11132@@ -5939,6 +6019,11 @@ case $reload_flag in
11133 esac
11134 reload_cmds='$LD$reload_flag -o $output$reload_objs'
11135 case $host_os in
11136+ cygwin* | mingw* | pw32* | cegcc*)
11137+ if test "$GCC" != yes; then
11138+ reload_cmds=false
11139+ fi
11140+ ;;
11141 darwin*)
11142 if test "$GCC" = yes; then
11143 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
11144@@ -6107,7 +6192,8 @@ mingw* | pw32*)
11145 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
11146 lt_cv_file_magic_cmd='func_win32_libid'
11147 else
11148- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
11149+ # Keep this pattern in sync with the one in func_win32_libid.
11150+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
11151 lt_cv_file_magic_cmd='$OBJDUMP -f'
11152 fi
11153 ;;
11154@@ -6261,6 +6347,21 @@ esac
11155 fi
11156 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
11157 $as_echo "$lt_cv_deplibs_check_method" >&6; }
11158+
11159+file_magic_glob=
11160+want_nocaseglob=no
11161+if test "$build" = "$host"; then
11162+ case $host_os in
11163+ mingw* | pw32*)
11164+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
11165+ want_nocaseglob=yes
11166+ else
11167+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
11168+ fi
11169+ ;;
11170+ esac
11171+fi
11172+
11173 file_magic_cmd=$lt_cv_file_magic_cmd
11174 deplibs_check_method=$lt_cv_deplibs_check_method
11175 test -z "$deplibs_check_method" && deplibs_check_method=unknown
11176@@ -6276,9 +6377,162 @@ test -z "$deplibs_check_method" && depli
11177
11178
11179
11180+
11181+
11182+
11183+
11184+
11185+
11186+
11187+
11188+
11189+
11190 if test -n "$ac_tool_prefix"; then
11191- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
11192-set dummy ${ac_tool_prefix}ar; ac_word=$2
11193+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
11194+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
11195+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11196+$as_echo_n "checking for $ac_word... " >&6; }
11197+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
11198+ $as_echo_n "(cached) " >&6
11199+else
11200+ if test -n "$DLLTOOL"; then
11201+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
11202+else
11203+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11204+for as_dir in $PATH
11205+do
11206+ IFS=$as_save_IFS
11207+ test -z "$as_dir" && as_dir=.
11208+ for ac_exec_ext in '' $ac_executable_extensions; do
11209+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11210+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
11211+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11212+ break 2
11213+ fi
11214+done
11215+ done
11216+IFS=$as_save_IFS
11217+
11218+fi
11219+fi
11220+DLLTOOL=$ac_cv_prog_DLLTOOL
11221+if test -n "$DLLTOOL"; then
11222+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
11223+$as_echo "$DLLTOOL" >&6; }
11224+else
11225+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11226+$as_echo "no" >&6; }
11227+fi
11228+
11229+
11230+fi
11231+if test -z "$ac_cv_prog_DLLTOOL"; then
11232+ ac_ct_DLLTOOL=$DLLTOOL
11233+ # Extract the first word of "dlltool", so it can be a program name with args.
11234+set dummy dlltool; ac_word=$2
11235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11236+$as_echo_n "checking for $ac_word... " >&6; }
11237+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
11238+ $as_echo_n "(cached) " >&6
11239+else
11240+ if test -n "$ac_ct_DLLTOOL"; then
11241+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
11242+else
11243+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11244+for as_dir in $PATH
11245+do
11246+ IFS=$as_save_IFS
11247+ test -z "$as_dir" && as_dir=.
11248+ for ac_exec_ext in '' $ac_executable_extensions; do
11249+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11250+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
11251+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11252+ break 2
11253+ fi
11254+done
11255+ done
11256+IFS=$as_save_IFS
11257+
11258+fi
11259+fi
11260+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
11261+if test -n "$ac_ct_DLLTOOL"; then
11262+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
11263+$as_echo "$ac_ct_DLLTOOL" >&6; }
11264+else
11265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11266+$as_echo "no" >&6; }
11267+fi
11268+
11269+ if test "x$ac_ct_DLLTOOL" = x; then
11270+ DLLTOOL="false"
11271+ else
11272+ case $cross_compiling:$ac_tool_warned in
11273+yes:)
11274+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11275+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11276+ac_tool_warned=yes ;;
11277+esac
11278+ DLLTOOL=$ac_ct_DLLTOOL
11279+ fi
11280+else
11281+ DLLTOOL="$ac_cv_prog_DLLTOOL"
11282+fi
11283+
11284+test -z "$DLLTOOL" && DLLTOOL=dlltool
11285+
11286+
11287+
11288+
11289+
11290+
11291+
11292+
11293+
11294+
11295+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
11296+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
11297+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
11298+ $as_echo_n "(cached) " >&6
11299+else
11300+ lt_cv_sharedlib_from_linklib_cmd='unknown'
11301+
11302+case $host_os in
11303+cygwin* | mingw* | pw32* | cegcc*)
11304+ # two different shell functions defined in ltmain.sh
11305+ # decide which to use based on capabilities of $DLLTOOL
11306+ case `$DLLTOOL --help 2>&1` in
11307+ *--identify-strict*)
11308+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
11309+ ;;
11310+ *)
11311+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
11312+ ;;
11313+ esac
11314+ ;;
11315+*)
11316+ # fallback: assume linklib IS sharedlib
11317+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
11318+ ;;
11319+esac
11320+
11321+fi
11322+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
11323+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
11324+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
11325+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
11326+
11327+
11328+
11329+
11330+
11331+
11332+
11333+if test -n "$ac_tool_prefix"; then
11334+ for ac_prog in ar
11335+ do
11336+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
11337+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
11338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11339 $as_echo_n "checking for $ac_word... " >&6; }
11340 if test "${ac_cv_prog_AR+set}" = set; then :
11341@@ -6294,7 +6548,7 @@ do
11342 test -z "$as_dir" && as_dir=.
11343 for ac_exec_ext in '' $ac_executable_extensions; do
11344 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11345- ac_cv_prog_AR="${ac_tool_prefix}ar"
11346+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
11347 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11348 break 2
11349 fi
11350@@ -6314,11 +6568,15 @@ $as_echo "no" >&6; }
11351 fi
11352
11353
11354+ test -n "$AR" && break
11355+ done
11356 fi
11357-if test -z "$ac_cv_prog_AR"; then
11358+if test -z "$AR"; then
11359 ac_ct_AR=$AR
11360- # Extract the first word of "ar", so it can be a program name with args.
11361-set dummy ar; ac_word=$2
11362+ for ac_prog in ar
11363+do
11364+ # Extract the first word of "$ac_prog", so it can be a program name with args.
11365+set dummy $ac_prog; ac_word=$2
11366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11367 $as_echo_n "checking for $ac_word... " >&6; }
11368 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
11369@@ -6334,7 +6592,7 @@ do
11370 test -z "$as_dir" && as_dir=.
11371 for ac_exec_ext in '' $ac_executable_extensions; do
11372 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11373- ac_cv_prog_ac_ct_AR="ar"
11374+ ac_cv_prog_ac_ct_AR="$ac_prog"
11375 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11376 break 2
11377 fi
11378@@ -6353,6 +6611,10 @@ else
11379 $as_echo "no" >&6; }
11380 fi
11381
11382+
11383+ test -n "$ac_ct_AR" && break
11384+done
11385+
11386 if test "x$ac_ct_AR" = x; then
11387 AR="false"
11388 else
11389@@ -6364,12 +6626,10 @@ ac_tool_warned=yes ;;
11390 esac
11391 AR=$ac_ct_AR
11392 fi
11393-else
11394- AR="$ac_cv_prog_AR"
11395 fi
11396
11397-test -z "$AR" && AR=ar
11398-test -z "$AR_FLAGS" && AR_FLAGS=cru
11399+: ${AR=ar}
11400+: ${AR_FLAGS=cru}
11401
11402
11403
11404@@ -6381,6 +6641,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
11405
11406
11407
11408+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
11409+$as_echo_n "checking for archiver @FILE support... " >&6; }
11410+if test "${lt_cv_ar_at_file+set}" = set; then :
11411+ $as_echo_n "(cached) " >&6
11412+else
11413+ lt_cv_ar_at_file=no
11414+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11415+/* end confdefs.h. */
11416+
11417+int
11418+main ()
11419+{
11420+
11421+ ;
11422+ return 0;
11423+}
11424+_ACEOF
11425+if ac_fn_c_try_compile "$LINENO"; then :
11426+ echo conftest.$ac_objext > conftest.lst
11427+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
11428+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11429+ (eval $lt_ar_try) 2>&5
11430+ ac_status=$?
11431+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11432+ test $ac_status = 0; }
11433+ if test "$ac_status" -eq 0; then
11434+ # Ensure the archiver fails upon bogus file names.
11435+ rm -f conftest.$ac_objext libconftest.a
11436+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11437+ (eval $lt_ar_try) 2>&5
11438+ ac_status=$?
11439+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11440+ test $ac_status = 0; }
11441+ if test "$ac_status" -ne 0; then
11442+ lt_cv_ar_at_file=@
11443+ fi
11444+ fi
11445+ rm -f conftest.* libconftest.a
11446+
11447+fi
11448+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11449+
11450+fi
11451+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
11452+$as_echo "$lt_cv_ar_at_file" >&6; }
11453+
11454+if test "x$lt_cv_ar_at_file" = xno; then
11455+ archiver_list_spec=
11456+else
11457+ archiver_list_spec=$lt_cv_ar_at_file
11458+fi
11459+
11460+
11461+
11462+
11463+
11464+
11465+
11466 if test -n "$ac_tool_prefix"; then
11467 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
11468 set dummy ${ac_tool_prefix}strip; ac_word=$2
11469@@ -6715,8 +7033,8 @@ esac
11470 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11471
11472 # Transform an extracted symbol line into symbol name and symbol address
11473-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11474-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'"
11475+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11476+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'"
11477
11478 # Handle CRLF in mingw tool chain
11479 opt_cr=
11480@@ -6752,6 +7070,7 @@ for ac_symprfx in "" "_"; do
11481 else
11482 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11483 fi
11484+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
11485
11486 # Check to see that the pipe works correctly.
11487 pipe_works=no
11488@@ -6793,6 +7112,18 @@ _LT_EOF
11489 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11490 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11491 cat <<_LT_EOF > conftest.$ac_ext
11492+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
11493+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
11494+/* DATA imports from DLLs on WIN32 con't be const, because runtime
11495+ relocations are performed -- see ld's documentation on pseudo-relocs. */
11496+# define LT_DLSYM_CONST
11497+#elif defined(__osf__)
11498+/* This system does not cope well with relocations in const data. */
11499+# define LT_DLSYM_CONST
11500+#else
11501+# define LT_DLSYM_CONST const
11502+#endif
11503+
11504 #ifdef __cplusplus
11505 extern "C" {
11506 #endif
11507@@ -6804,7 +7135,7 @@ _LT_EOF
11508 cat <<_LT_EOF >> conftest.$ac_ext
11509
11510 /* The mapping between symbol names and symbols. */
11511-const struct {
11512+LT_DLSYM_CONST struct {
11513 const char *name;
11514 void *address;
11515 }
11516@@ -6830,8 +7161,8 @@ static const void *lt_preloaded_setup()
11517 _LT_EOF
11518 # Now try linking the two files.
11519 mv conftest.$ac_objext conftstm.$ac_objext
11520- lt_save_LIBS="$LIBS"
11521- lt_save_CFLAGS="$CFLAGS"
11522+ lt_globsym_save_LIBS=$LIBS
11523+ lt_globsym_save_CFLAGS=$CFLAGS
11524 LIBS="conftstm.$ac_objext"
11525 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11526 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11527@@ -6841,8 +7172,8 @@ _LT_EOF
11528 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11529 pipe_works=yes
11530 fi
11531- LIBS="$lt_save_LIBS"
11532- CFLAGS="$lt_save_CFLAGS"
11533+ LIBS=$lt_globsym_save_LIBS
11534+ CFLAGS=$lt_globsym_save_CFLAGS
11535 else
11536 echo "cannot find nm_test_func in $nlist" >&5
11537 fi
11538@@ -6879,6 +7210,19 @@ else
11539 $as_echo "ok" >&6; }
11540 fi
11541
11542+# Response file support.
11543+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11544+ nm_file_list_spec='@'
11545+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11546+ nm_file_list_spec='@'
11547+fi
11548+
11549+
11550+
11551+
11552+
11553+
11554+
11555
11556
11557
11558@@ -6899,6 +7243,42 @@ fi
11559
11560
11561
11562+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11563+$as_echo_n "checking for sysroot... " >&6; }
11564+
11565+# Check whether --with-libtool-sysroot was given.
11566+if test "${with_libtool_sysroot+set}" = set; then :
11567+ withval=$with_libtool_sysroot;
11568+else
11569+ with_libtool_sysroot=no
11570+fi
11571+
11572+
11573+lt_sysroot=
11574+case ${with_libtool_sysroot} in #(
11575+ yes)
11576+ if test "$GCC" = yes; then
11577+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11578+ fi
11579+ ;; #(
11580+ /*)
11581+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11582+ ;; #(
11583+ no|'')
11584+ ;; #(
11585+ *)
11586+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11587+$as_echo "${with_libtool_sysroot}" >&6; }
11588+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
11589+ ;;
11590+esac
11591+
11592+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11593+$as_echo "${lt_sysroot:-no}" >&6; }
11594+
11595+
11596+
11597+
11598
11599 # Check whether --enable-libtool-lock was given.
11600 if test "${enable_libtool_lock+set}" = set; then :
11601@@ -7093,6 +7473,123 @@ esac
11602
11603 need_locks="$enable_libtool_lock"
11604
11605+if test -n "$ac_tool_prefix"; then
11606+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11607+set dummy ${ac_tool_prefix}mt; ac_word=$2
11608+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11609+$as_echo_n "checking for $ac_word... " >&6; }
11610+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
11611+ $as_echo_n "(cached) " >&6
11612+else
11613+ if test -n "$MANIFEST_TOOL"; then
11614+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11615+else
11616+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11617+for as_dir in $PATH
11618+do
11619+ IFS=$as_save_IFS
11620+ test -z "$as_dir" && as_dir=.
11621+ for ac_exec_ext in '' $ac_executable_extensions; do
11622+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11623+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11624+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11625+ break 2
11626+ fi
11627+done
11628+ done
11629+IFS=$as_save_IFS
11630+
11631+fi
11632+fi
11633+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11634+if test -n "$MANIFEST_TOOL"; then
11635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11636+$as_echo "$MANIFEST_TOOL" >&6; }
11637+else
11638+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11639+$as_echo "no" >&6; }
11640+fi
11641+
11642+
11643+fi
11644+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11645+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11646+ # Extract the first word of "mt", so it can be a program name with args.
11647+set dummy mt; ac_word=$2
11648+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11649+$as_echo_n "checking for $ac_word... " >&6; }
11650+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
11651+ $as_echo_n "(cached) " >&6
11652+else
11653+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11654+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11655+else
11656+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11657+for as_dir in $PATH
11658+do
11659+ IFS=$as_save_IFS
11660+ test -z "$as_dir" && as_dir=.
11661+ for ac_exec_ext in '' $ac_executable_extensions; do
11662+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11663+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11664+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11665+ break 2
11666+ fi
11667+done
11668+ done
11669+IFS=$as_save_IFS
11670+
11671+fi
11672+fi
11673+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11674+if test -n "$ac_ct_MANIFEST_TOOL"; then
11675+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11676+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11677+else
11678+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11679+$as_echo "no" >&6; }
11680+fi
11681+
11682+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11683+ MANIFEST_TOOL=":"
11684+ else
11685+ case $cross_compiling:$ac_tool_warned in
11686+yes:)
11687+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11688+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11689+ac_tool_warned=yes ;;
11690+esac
11691+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11692+ fi
11693+else
11694+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11695+fi
11696+
11697+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11698+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11699+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11700+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
11701+ $as_echo_n "(cached) " >&6
11702+else
11703+ lt_cv_path_mainfest_tool=no
11704+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11705+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11706+ cat conftest.err >&5
11707+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11708+ lt_cv_path_mainfest_tool=yes
11709+ fi
11710+ rm -f conftest*
11711+fi
11712+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11713+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11714+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11715+ MANIFEST_TOOL=:
11716+fi
11717+
11718+
11719+
11720+
11721+
11722
11723 case $host_os in
11724 rhapsody* | darwin*)
11725@@ -7656,6 +8153,8 @@ _LT_EOF
11726 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11727 echo "$AR cru libconftest.a conftest.o" >&5
11728 $AR cru libconftest.a conftest.o 2>&5
11729+ echo "$RANLIB libconftest.a" >&5
11730+ $RANLIB libconftest.a 2>&5
11731 cat > conftest.c << _LT_EOF
11732 int main() { return 0;}
11733 _LT_EOF
11734@@ -7851,7 +8350,8 @@ fi
11735 LIBTOOL_DEPS="$ltmain"
11736
11737 # Always use our own libtool.
11738-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11739+LIBTOOL='$(SHELL) $(top_builddir)'
11740+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
11741
11742
11743
11744@@ -7940,7 +8440,7 @@ aix3*)
11745 esac
11746
11747 # Global variables:
11748-ofile=libtool
11749+ofile=${host_alias}-libtool
11750 can_build_shared=yes
11751
11752 # All known linkers require a `.a' archive for static linking (except MSVC,
11753@@ -8238,8 +8738,6 @@ fi
11754 lt_prog_compiler_pic=
11755 lt_prog_compiler_static=
11756
11757-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11758-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11759
11760 if test "$GCC" = yes; then
11761 lt_prog_compiler_wl='-Wl,'
11762@@ -8404,6 +8902,12 @@ $as_echo_n "checking for $compiler optio
11763 lt_prog_compiler_pic='--shared'
11764 lt_prog_compiler_static='--static'
11765 ;;
11766+ nagfor*)
11767+ # NAG Fortran compiler
11768+ lt_prog_compiler_wl='-Wl,-Wl,,'
11769+ lt_prog_compiler_pic='-PIC'
11770+ lt_prog_compiler_static='-Bstatic'
11771+ ;;
11772 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11773 # Portland Group compilers (*not* the Pentium gcc compiler,
11774 # which looks to be a dead project)
11775@@ -8466,7 +8970,7 @@ $as_echo_n "checking for $compiler optio
11776 lt_prog_compiler_pic='-KPIC'
11777 lt_prog_compiler_static='-Bstatic'
11778 case $cc_basename in
11779- f77* | f90* | f95*)
11780+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11781 lt_prog_compiler_wl='-Qoption ld ';;
11782 *)
11783 lt_prog_compiler_wl='-Wl,';;
11784@@ -8523,13 +9027,17 @@ case $host_os in
11785 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11786 ;;
11787 esac
11788-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11789-$as_echo "$lt_prog_compiler_pic" >&6; }
11790-
11791-
11792-
11793-
11794
11795+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11796+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11797+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
11798+ $as_echo_n "(cached) " >&6
11799+else
11800+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11801+fi
11802+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11803+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11804+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11805
11806 #
11807 # Check to make sure the PIC flag actually works.
11808@@ -8590,6 +9098,11 @@ fi
11809
11810
11811
11812+
11813+
11814+
11815+
11816+
11817 #
11818 # Check to make sure the static flag actually works.
11819 #
11820@@ -8940,7 +9453,8 @@ _LT_EOF
11821 allow_undefined_flag=unsupported
11822 always_export_symbols=no
11823 enable_shared_with_static_runtimes=yes
11824- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11825+ 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'
11826+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11827
11828 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11829 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11830@@ -8988,7 +9502,7 @@ _LT_EOF
11831 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11832 && test "$tmp_diet" = no
11833 then
11834- tmp_addflag=
11835+ tmp_addflag=' $pic_flag'
11836 tmp_sharedflag='-shared'
11837 case $cc_basename,$host_cpu in
11838 pgcc*) # Portland Group C compiler
11839@@ -9039,12 +9553,12 @@ _LT_EOF
11840 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11841 hardcode_libdir_flag_spec=
11842 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11843- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11844+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11845 if test "x$supports_anon_versioning" = xyes; then
11846 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11847 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11848 echo "local: *; };" >> $output_objdir/$libname.ver~
11849- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11850+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11851 fi
11852 ;;
11853 esac
11854@@ -9058,8 +9572,8 @@ _LT_EOF
11855 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11856 wlarc=
11857 else
11858- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11859- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11860+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11861+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11862 fi
11863 ;;
11864
11865@@ -9077,8 +9591,8 @@ _LT_EOF
11866
11867 _LT_EOF
11868 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11869- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11870- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11871+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11872+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11873 else
11874 ld_shlibs=no
11875 fi
11876@@ -9124,8 +9638,8 @@ _LT_EOF
11877
11878 *)
11879 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11880- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11881- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11882+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11883+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11884 else
11885 ld_shlibs=no
11886 fi
11887@@ -9255,7 +9769,13 @@ _LT_EOF
11888 allow_undefined_flag='-berok'
11889 # Determine the default libpath from the value encoded in an
11890 # empty executable.
11891- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11892+ if test "${lt_cv_aix_libpath+set}" = set; then
11893+ aix_libpath=$lt_cv_aix_libpath
11894+else
11895+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11896+ $as_echo_n "(cached) " >&6
11897+else
11898+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11899 /* end confdefs.h. */
11900
11901 int
11902@@ -9268,22 +9788,29 @@ main ()
11903 _ACEOF
11904 if ac_fn_c_try_link "$LINENO"; then :
11905
11906-lt_aix_libpath_sed='
11907- /Import File Strings/,/^$/ {
11908- /^0/ {
11909- s/^0 *\(.*\)$/\1/
11910- p
11911- }
11912- }'
11913-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11914-# Check for a 64-bit object if we didn't find anything.
11915-if test -z "$aix_libpath"; then
11916- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11917-fi
11918+ lt_aix_libpath_sed='
11919+ /Import File Strings/,/^$/ {
11920+ /^0/ {
11921+ s/^0 *\([^ ]*\) *$/\1/
11922+ p
11923+ }
11924+ }'
11925+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11926+ # Check for a 64-bit object if we didn't find anything.
11927+ if test -z "$lt_cv_aix_libpath_"; then
11928+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11929+ fi
11930 fi
11931 rm -f core conftest.err conftest.$ac_objext \
11932 conftest$ac_exeext conftest.$ac_ext
11933-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11934+ if test -z "$lt_cv_aix_libpath_"; then
11935+ lt_cv_aix_libpath_="/usr/lib:/lib"
11936+ fi
11937+
11938+fi
11939+
11940+ aix_libpath=$lt_cv_aix_libpath_
11941+fi
11942
11943 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11944 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"
11945@@ -9295,7 +9822,13 @@ if test -z "$aix_libpath"; then aix_libp
11946 else
11947 # Determine the default libpath from the value encoded in an
11948 # empty executable.
11949- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11950+ if test "${lt_cv_aix_libpath+set}" = set; then
11951+ aix_libpath=$lt_cv_aix_libpath
11952+else
11953+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11954+ $as_echo_n "(cached) " >&6
11955+else
11956+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11957 /* end confdefs.h. */
11958
11959 int
11960@@ -9308,22 +9841,29 @@ main ()
11961 _ACEOF
11962 if ac_fn_c_try_link "$LINENO"; then :
11963
11964-lt_aix_libpath_sed='
11965- /Import File Strings/,/^$/ {
11966- /^0/ {
11967- s/^0 *\(.*\)$/\1/
11968- p
11969- }
11970- }'
11971-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11972-# Check for a 64-bit object if we didn't find anything.
11973-if test -z "$aix_libpath"; then
11974- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11975-fi
11976+ lt_aix_libpath_sed='
11977+ /Import File Strings/,/^$/ {
11978+ /^0/ {
11979+ s/^0 *\([^ ]*\) *$/\1/
11980+ p
11981+ }
11982+ }'
11983+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11984+ # Check for a 64-bit object if we didn't find anything.
11985+ if test -z "$lt_cv_aix_libpath_"; then
11986+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11987+ fi
11988 fi
11989 rm -f core conftest.err conftest.$ac_objext \
11990 conftest$ac_exeext conftest.$ac_ext
11991-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11992+ if test -z "$lt_cv_aix_libpath_"; then
11993+ lt_cv_aix_libpath_="/usr/lib:/lib"
11994+ fi
11995+
11996+fi
11997+
11998+ aix_libpath=$lt_cv_aix_libpath_
11999+fi
12000
12001 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
12002 # Warning - without using the other run time loading flags,
12003@@ -9368,20 +9908,63 @@ if test -z "$aix_libpath"; then aix_libp
12004 # Microsoft Visual C++.
12005 # hardcode_libdir_flag_spec is actually meaningless, as there is
12006 # no search path for DLLs.
12007- hardcode_libdir_flag_spec=' '
12008- allow_undefined_flag=unsupported
12009- # Tell ltmain to make .lib files, not .a files.
12010- libext=lib
12011- # Tell ltmain to make .dll files, not .so files.
12012- shrext_cmds=".dll"
12013- # FIXME: Setting linknames here is a bad hack.
12014- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12015- # The linker will automatically build a .lib file if we build a DLL.
12016- old_archive_from_new_cmds='true'
12017- # FIXME: Should let the user specify the lib program.
12018- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12019- fix_srcfile_path='`cygpath -w "$srcfile"`'
12020- enable_shared_with_static_runtimes=yes
12021+ case $cc_basename in
12022+ cl*)
12023+ # Native MSVC
12024+ hardcode_libdir_flag_spec=' '
12025+ allow_undefined_flag=unsupported
12026+ always_export_symbols=yes
12027+ file_list_spec='@'
12028+ # Tell ltmain to make .lib files, not .a files.
12029+ libext=lib
12030+ # Tell ltmain to make .dll files, not .so files.
12031+ shrext_cmds=".dll"
12032+ # FIXME: Setting linknames here is a bad hack.
12033+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12034+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12035+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12036+ else
12037+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12038+ fi~
12039+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12040+ linknames='
12041+ # The linker will not automatically build a static lib if we build a DLL.
12042+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
12043+ enable_shared_with_static_runtimes=yes
12044+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
12045+ # Don't use ranlib
12046+ old_postinstall_cmds='chmod 644 $oldlib'
12047+ postlink_cmds='lt_outputfile="@OUTPUT@"~
12048+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12049+ case $lt_outputfile in
12050+ *.exe|*.EXE) ;;
12051+ *)
12052+ lt_outputfile="$lt_outputfile.exe"
12053+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12054+ ;;
12055+ esac~
12056+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12057+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12058+ $RM "$lt_outputfile.manifest";
12059+ fi'
12060+ ;;
12061+ *)
12062+ # Assume MSVC wrapper
12063+ hardcode_libdir_flag_spec=' '
12064+ allow_undefined_flag=unsupported
12065+ # Tell ltmain to make .lib files, not .a files.
12066+ libext=lib
12067+ # Tell ltmain to make .dll files, not .so files.
12068+ shrext_cmds=".dll"
12069+ # FIXME: Setting linknames here is a bad hack.
12070+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12071+ # The linker will automatically build a .lib file if we build a DLL.
12072+ old_archive_from_new_cmds='true'
12073+ # FIXME: Should let the user specify the lib program.
12074+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12075+ enable_shared_with_static_runtimes=yes
12076+ ;;
12077+ esac
12078 ;;
12079
12080 darwin* | rhapsody*)
12081@@ -9446,7 +10029,7 @@ if test -z "$aix_libpath"; then aix_libp
12082
12083 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12084 freebsd* | dragonfly*)
12085- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
12086+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12087 hardcode_libdir_flag_spec='-R$libdir'
12088 hardcode_direct=yes
12089 hardcode_shlibpath_var=no
12090@@ -9454,7 +10037,7 @@ if test -z "$aix_libpath"; then aix_libp
12091
12092 hpux9*)
12093 if test "$GCC" = yes; then
12094- 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'
12095+ 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'
12096 else
12097 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'
12098 fi
12099@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libp
12100
12101 hpux10*)
12102 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
12103- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12104+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12105 else
12106 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12107 fi
12108@@ -9494,10 +10077,10 @@ if test -z "$aix_libpath"; then aix_libp
12109 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12110 ;;
12111 ia64*)
12112- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12113+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12114 ;;
12115 *)
12116- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12117+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12118 ;;
12119 esac
12120 else
12121@@ -9576,23 +10159,36 @@ fi
12122
12123 irix5* | irix6* | nonstopux*)
12124 if test "$GCC" = yes; then
12125- 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'
12126+ 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'
12127 # Try to use the -exported_symbol ld option, if it does not
12128 # work, assume that -exports_file does not work either and
12129 # implicitly export all symbols.
12130- save_LDFLAGS="$LDFLAGS"
12131- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12132- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12133+ # This should be the same for all languages, so no per-tag cache variable.
12134+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
12135+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
12136+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
12137+ $as_echo_n "(cached) " >&6
12138+else
12139+ save_LDFLAGS="$LDFLAGS"
12140+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12141+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12142 /* end confdefs.h. */
12143-int foo(void) {}
12144+int foo (void) { return 0; }
12145 _ACEOF
12146 if ac_fn_c_try_link "$LINENO"; then :
12147- 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'
12148-
12149+ lt_cv_irix_exported_symbol=yes
12150+else
12151+ lt_cv_irix_exported_symbol=no
12152 fi
12153 rm -f core conftest.err conftest.$ac_objext \
12154 conftest$ac_exeext conftest.$ac_ext
12155- LDFLAGS="$save_LDFLAGS"
12156+ LDFLAGS="$save_LDFLAGS"
12157+fi
12158+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
12159+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
12160+ if test "$lt_cv_irix_exported_symbol" = yes; then
12161+ 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'
12162+ fi
12163 else
12164 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'
12165 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'
12166@@ -9677,7 +10273,7 @@ rm -f core conftest.err conftest.$ac_obj
12167 osf4* | osf5*) # as osf3* with the addition of -msym flag
12168 if test "$GCC" = yes; then
12169 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
12170- 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'
12171+ 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'
12172 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12173 else
12174 allow_undefined_flag=' -expect_unresolved \*'
12175@@ -9696,9 +10292,9 @@ rm -f core conftest.err conftest.$ac_obj
12176 no_undefined_flag=' -z defs'
12177 if test "$GCC" = yes; then
12178 wlarc='${wl}'
12179- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12180+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12181 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12182- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
12183+ $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'
12184 else
12185 case `$CC -V 2>&1` in
12186 *"Compilers 5.0"*)
12187@@ -10274,8 +10870,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12188 need_version=no
12189 need_lib_prefix=no
12190
12191- case $GCC,$host_os in
12192- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12193+ case $GCC,$cc_basename in
12194+ yes,*)
12195+ # gcc
12196 library_names_spec='$libname.dll.a'
12197 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12198 postinstall_cmds='base_file=`basename \${file}`~
12199@@ -10308,13 +10905,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12200 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12201 ;;
12202 esac
12203+ dynamic_linker='Win32 ld.exe'
12204+ ;;
12205+
12206+ *,cl*)
12207+ # Native MSVC
12208+ libname_spec='$name'
12209+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12210+ library_names_spec='${libname}.dll.lib'
12211+
12212+ case $build_os in
12213+ mingw*)
12214+ sys_lib_search_path_spec=
12215+ lt_save_ifs=$IFS
12216+ IFS=';'
12217+ for lt_path in $LIB
12218+ do
12219+ IFS=$lt_save_ifs
12220+ # Let DOS variable expansion print the short 8.3 style file name.
12221+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12222+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12223+ done
12224+ IFS=$lt_save_ifs
12225+ # Convert to MSYS style.
12226+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12227+ ;;
12228+ cygwin*)
12229+ # Convert to unix form, then to dos form, then back to unix form
12230+ # but this time dos style (no spaces!) so that the unix form looks
12231+ # like /cygdrive/c/PROGRA~1:/cygdr...
12232+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12233+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12234+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12235+ ;;
12236+ *)
12237+ sys_lib_search_path_spec="$LIB"
12238+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12239+ # It is most probably a Windows format PATH.
12240+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12241+ else
12242+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12243+ fi
12244+ # FIXME: find the short name or the path components, as spaces are
12245+ # common. (e.g. "Program Files" -> "PROGRA~1")
12246+ ;;
12247+ esac
12248+
12249+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12250+ postinstall_cmds='base_file=`basename \${file}`~
12251+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12252+ dldir=$destdir/`dirname \$dlpath`~
12253+ test -d \$dldir || mkdir -p \$dldir~
12254+ $install_prog $dir/$dlname \$dldir/$dlname'
12255+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12256+ dlpath=$dir/\$dldll~
12257+ $RM \$dlpath'
12258+ shlibpath_overrides_runpath=yes
12259+ dynamic_linker='Win32 link.exe'
12260 ;;
12261
12262 *)
12263+ # Assume MSVC wrapper
12264 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12265+ dynamic_linker='Win32 ld.exe'
12266 ;;
12267 esac
12268- dynamic_linker='Win32 ld.exe'
12269 # FIXME: first we should search . and the directory the executable is in
12270 shlibpath_var=PATH
12271 ;;
12272@@ -10410,7 +11065,7 @@ haiku*)
12273 soname_spec='${libname}${release}${shared_ext}$major'
12274 shlibpath_var=LIBRARY_PATH
12275 shlibpath_overrides_runpath=yes
12276- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
12277+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
12278 hardcode_into_libs=yes
12279 ;;
12280
12281@@ -11206,7 +11861,7 @@ else
12282 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12283 lt_status=$lt_dlunknown
12284 cat > conftest.$ac_ext <<_LT_EOF
12285-#line 11209 "configure"
12286+#line $LINENO "configure"
12287 #include "confdefs.h"
12288
12289 #if HAVE_DLFCN_H
12290@@ -11250,10 +11905,10 @@ else
12291 /* When -fvisbility=hidden is used, assume the code has been annotated
12292 correspondingly for the symbols needed. */
12293 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12294-void fnord () __attribute__((visibility("default")));
12295+int fnord () __attribute__((visibility("default")));
12296 #endif
12297
12298-void fnord () { int i=42; }
12299+int fnord () { return 42; }
12300 int main ()
12301 {
12302 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12303@@ -11312,7 +11967,7 @@ else
12304 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12305 lt_status=$lt_dlunknown
12306 cat > conftest.$ac_ext <<_LT_EOF
12307-#line 11315 "configure"
12308+#line $LINENO "configure"
12309 #include "confdefs.h"
12310
12311 #if HAVE_DLFCN_H
12312@@ -11356,10 +12011,10 @@ else
12313 /* When -fvisbility=hidden is used, assume the code has been annotated
12314 correspondingly for the symbols needed. */
12315 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12316-void fnord () __attribute__((visibility("default")));
12317+int fnord () __attribute__((visibility("default")));
12318 #endif
12319
12320-void fnord () { int i=42; }
12321+int fnord () { return 42; }
12322 int main ()
12323 {
12324 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12325@@ -14754,13 +15409,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
12326 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12327 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12328 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
12329+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
12330+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
12331 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
12332 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
12333 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
12334 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
12335 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
12336+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
12337+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
12338+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
12339+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
12340 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
12341 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
12342+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
12343 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12344 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12345 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12346@@ -14775,14 +15437,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
12347 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12348 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12349 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"`'
12350+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
12351+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
12352 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
12353 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
12354 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
12355-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12356 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
12357+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12358 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
12359 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
12360 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
12361+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
12362 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12363 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12364 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12365@@ -14815,12 +15480,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
12366 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12367 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12368 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
12369-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
12370 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
12371 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
12372 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
12373 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
12374 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
12375+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
12376 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12377 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12378 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12379@@ -14875,8 +15540,13 @@ reload_flag \
12380 OBJDUMP \
12381 deplibs_check_method \
12382 file_magic_cmd \
12383+file_magic_glob \
12384+want_nocaseglob \
12385+DLLTOOL \
12386+sharedlib_from_linklib_cmd \
12387 AR \
12388 AR_FLAGS \
12389+archiver_list_spec \
12390 STRIP \
12391 RANLIB \
12392 CC \
12393@@ -14886,12 +15556,14 @@ lt_cv_sys_global_symbol_pipe \
12394 lt_cv_sys_global_symbol_to_cdecl \
12395 lt_cv_sys_global_symbol_to_c_name_address \
12396 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
12397+nm_file_list_spec \
12398 lt_prog_compiler_no_builtin_flag \
12399-lt_prog_compiler_wl \
12400 lt_prog_compiler_pic \
12401+lt_prog_compiler_wl \
12402 lt_prog_compiler_static \
12403 lt_cv_prog_compiler_c_o \
12404 need_locks \
12405+MANIFEST_TOOL \
12406 DSYMUTIL \
12407 NMEDIT \
12408 LIPO \
12409@@ -14907,7 +15579,6 @@ no_undefined_flag \
12410 hardcode_libdir_flag_spec \
12411 hardcode_libdir_flag_spec_ld \
12412 hardcode_libdir_separator \
12413-fix_srcfile_path \
12414 exclude_expsyms \
12415 include_expsyms \
12416 file_list_spec \
12417@@ -14943,6 +15614,7 @@ module_cmds \
12418 module_expsym_cmds \
12419 export_symbols_cmds \
12420 prelink_cmds \
12421+postlink_cmds \
12422 postinstall_cmds \
12423 postuninstall_cmds \
12424 finish_cmds \
12425@@ -15700,7 +16372,8 @@ $as_echo X"$file" |
12426 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12427 #
12428 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12429-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12430+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12431+# Inc.
12432 # Written by Gordon Matzigkeit, 1996
12433 #
12434 # This file is part of GNU Libtool.
12435@@ -15803,19 +16476,42 @@ SP2NL=$lt_lt_SP2NL
12436 # turn newlines into spaces.
12437 NL2SP=$lt_lt_NL2SP
12438
12439+# convert \$build file names to \$host format.
12440+to_host_file_cmd=$lt_cv_to_host_file_cmd
12441+
12442+# convert \$build files to toolchain format.
12443+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12444+
12445 # An object symbol dumper.
12446 OBJDUMP=$lt_OBJDUMP
12447
12448 # Method to check whether dependent libraries are shared objects.
12449 deplibs_check_method=$lt_deplibs_check_method
12450
12451-# Command to use when deplibs_check_method == "file_magic".
12452+# Command to use when deplibs_check_method = "file_magic".
12453 file_magic_cmd=$lt_file_magic_cmd
12454
12455+# How to find potential files when deplibs_check_method = "file_magic".
12456+file_magic_glob=$lt_file_magic_glob
12457+
12458+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
12459+want_nocaseglob=$lt_want_nocaseglob
12460+
12461+# DLL creation program.
12462+DLLTOOL=$lt_DLLTOOL
12463+
12464+# Command to associate shared and link libraries.
12465+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
12466+
12467 # The archiver.
12468 AR=$lt_AR
12469+
12470+# Flags to create an archive.
12471 AR_FLAGS=$lt_AR_FLAGS
12472
12473+# How to feed a file listing to the archiver.
12474+archiver_list_spec=$lt_archiver_list_spec
12475+
12476 # A symbol stripping program.
12477 STRIP=$lt_STRIP
12478
12479@@ -15845,6 +16541,12 @@ global_symbol_to_c_name_address=$lt_lt_c
12480 # Transform the output of nm in a C name address pair when lib prefix is needed.
12481 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12482
12483+# Specify filename containing input files for \$NM.
12484+nm_file_list_spec=$lt_nm_file_list_spec
12485+
12486+# The root where to search for dependent libraries,and in which our libraries should be installed.
12487+lt_sysroot=$lt_sysroot
12488+
12489 # The name of the directory that contains temporary libtool files.
12490 objdir=$objdir
12491
12492@@ -15854,6 +16556,9 @@ MAGIC_CMD=$MAGIC_CMD
12493 # Must we lock files when doing compilation?
12494 need_locks=$lt_need_locks
12495
12496+# Manifest tool.
12497+MANIFEST_TOOL=$lt_MANIFEST_TOOL
12498+
12499 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12500 DSYMUTIL=$lt_DSYMUTIL
12501
12502@@ -15968,12 +16673,12 @@ with_gcc=$GCC
12503 # Compiler flag to turn off builtin functions.
12504 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12505
12506-# How to pass a linker flag through the compiler.
12507-wl=$lt_lt_prog_compiler_wl
12508-
12509 # Additional compiler flags for building library objects.
12510 pic_flag=$lt_lt_prog_compiler_pic
12511
12512+# How to pass a linker flag through the compiler.
12513+wl=$lt_lt_prog_compiler_wl
12514+
12515 # Compiler flag to prevent dynamic linking.
12516 link_static_flag=$lt_lt_prog_compiler_static
12517
12518@@ -16060,9 +16765,6 @@ inherit_rpath=$inherit_rpath
12519 # Whether libtool must link a program against all its dependency libraries.
12520 link_all_deplibs=$link_all_deplibs
12521
12522-# Fix the shell variable \$srcfile for the compiler.
12523-fix_srcfile_path=$lt_fix_srcfile_path
12524-
12525 # Set to "yes" if exported symbols are required.
12526 always_export_symbols=$always_export_symbols
12527
12528@@ -16078,6 +16780,9 @@ include_expsyms=$lt_include_expsyms
12529 # Commands necessary for linking programs (against libraries) with templates.
12530 prelink_cmds=$lt_prelink_cmds
12531
12532+# Commands necessary for finishing linking programs.
12533+postlink_cmds=$lt_postlink_cmds
12534+
12535 # Specify filename containing input files.
12536 file_list_spec=$lt_file_list_spec
12537
12538@@ -16110,210 +16815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12539 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12540 # text mode, it properly converts lines to CR/LF. This bash problem
12541 # is reportedly fixed, but why not run on old versions too?
12542- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
12543- || (rm -f "$cfgfile"; exit 1)
12544-
12545- case $xsi_shell in
12546- yes)
12547- cat << \_LT_EOF >> "$cfgfile"
12548-
12549-# func_dirname file append nondir_replacement
12550-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12551-# otherwise set result to NONDIR_REPLACEMENT.
12552-func_dirname ()
12553-{
12554- case ${1} in
12555- */*) func_dirname_result="${1%/*}${2}" ;;
12556- * ) func_dirname_result="${3}" ;;
12557- esac
12558-}
12559-
12560-# func_basename file
12561-func_basename ()
12562-{
12563- func_basename_result="${1##*/}"
12564-}
12565-
12566-# func_dirname_and_basename file append nondir_replacement
12567-# perform func_basename and func_dirname in a single function
12568-# call:
12569-# dirname: Compute the dirname of FILE. If nonempty,
12570-# add APPEND to the result, otherwise set result
12571-# to NONDIR_REPLACEMENT.
12572-# value returned in "$func_dirname_result"
12573-# basename: Compute filename of FILE.
12574-# value retuned in "$func_basename_result"
12575-# Implementation must be kept synchronized with func_dirname
12576-# and func_basename. For efficiency, we do not delegate to
12577-# those functions but instead duplicate the functionality here.
12578-func_dirname_and_basename ()
12579-{
12580- case ${1} in
12581- */*) func_dirname_result="${1%/*}${2}" ;;
12582- * ) func_dirname_result="${3}" ;;
12583- esac
12584- func_basename_result="${1##*/}"
12585-}
12586-
12587-# func_stripname prefix suffix name
12588-# strip PREFIX and SUFFIX off of NAME.
12589-# PREFIX and SUFFIX must not contain globbing or regex special
12590-# characters, hashes, percent signs, but SUFFIX may contain a leading
12591-# dot (in which case that matches only a dot).
12592-func_stripname ()
12593-{
12594- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
12595- # positional parameters, so assign one to ordinary parameter first.
12596- func_stripname_result=${3}
12597- func_stripname_result=${func_stripname_result#"${1}"}
12598- func_stripname_result=${func_stripname_result%"${2}"}
12599-}
12600-
12601-# func_opt_split
12602-func_opt_split ()
12603-{
12604- func_opt_split_opt=${1%%=*}
12605- func_opt_split_arg=${1#*=}
12606-}
12607-
12608-# func_lo2o object
12609-func_lo2o ()
12610-{
12611- case ${1} in
12612- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
12613- *) func_lo2o_result=${1} ;;
12614- esac
12615-}
12616-
12617-# func_xform libobj-or-source
12618-func_xform ()
12619-{
12620- func_xform_result=${1%.*}.lo
12621-}
12622-
12623-# func_arith arithmetic-term...
12624-func_arith ()
12625-{
12626- func_arith_result=$(( $* ))
12627-}
12628-
12629-# func_len string
12630-# STRING may not start with a hyphen.
12631-func_len ()
12632-{
12633- func_len_result=${#1}
12634-}
12635-
12636-_LT_EOF
12637- ;;
12638- *) # Bourne compatible functions.
12639- cat << \_LT_EOF >> "$cfgfile"
12640-
12641-# func_dirname file append nondir_replacement
12642-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12643-# otherwise set result to NONDIR_REPLACEMENT.
12644-func_dirname ()
12645-{
12646- # Extract subdirectory from the argument.
12647- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12648- if test "X$func_dirname_result" = "X${1}"; then
12649- func_dirname_result="${3}"
12650- else
12651- func_dirname_result="$func_dirname_result${2}"
12652- fi
12653-}
12654-
12655-# func_basename file
12656-func_basename ()
12657-{
12658- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12659-}
12660-
12661-
12662-# func_stripname prefix suffix name
12663-# strip PREFIX and SUFFIX off of NAME.
12664-# PREFIX and SUFFIX must not contain globbing or regex special
12665-# characters, hashes, percent signs, but SUFFIX may contain a leading
12666-# dot (in which case that matches only a dot).
12667-# func_strip_suffix prefix name
12668-func_stripname ()
12669-{
12670- case ${2} in
12671- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12672- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12673- esac
12674-}
12675-
12676-# sed scripts:
12677-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12678-my_sed_long_arg='1s/^-[^=]*=//'
12679-
12680-# func_opt_split
12681-func_opt_split ()
12682-{
12683- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12684- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12685-}
12686-
12687-# func_lo2o object
12688-func_lo2o ()
12689-{
12690- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12691-}
12692-
12693-# func_xform libobj-or-source
12694-func_xform ()
12695-{
12696- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12697-}
12698-
12699-# func_arith arithmetic-term...
12700-func_arith ()
12701-{
12702- func_arith_result=`expr "$@"`
12703-}
12704-
12705-# func_len string
12706-# STRING may not start with a hyphen.
12707-func_len ()
12708-{
12709- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12710-}
12711-
12712-_LT_EOF
12713-esac
12714-
12715-case $lt_shell_append in
12716- yes)
12717- cat << \_LT_EOF >> "$cfgfile"
12718-
12719-# func_append var value
12720-# Append VALUE to the end of shell variable VAR.
12721-func_append ()
12722-{
12723- eval "$1+=\$2"
12724-}
12725-_LT_EOF
12726- ;;
12727- *)
12728- cat << \_LT_EOF >> "$cfgfile"
12729-
12730-# func_append var value
12731-# Append VALUE to the end of shell variable VAR.
12732-func_append ()
12733-{
12734- eval "$1=\$$1\$2"
12735-}
12736-
12737-_LT_EOF
12738- ;;
12739- esac
12740+ sed '$q' "$ltmain" >> "$cfgfile" \
12741+ || (rm -f "$cfgfile"; exit 1)
12742
12743+ if test x"$xsi_shell" = xyes; then
12744+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12745+func_dirname ()\
12746+{\
12747+\ case ${1} in\
12748+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12749+\ * ) func_dirname_result="${3}" ;;\
12750+\ esac\
12751+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12752+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12753+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12754+test 0 -eq $? || _lt_function_replace_fail=:
12755+
12756+
12757+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12758+func_basename ()\
12759+{\
12760+\ func_basename_result="${1##*/}"\
12761+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12762+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12764+test 0 -eq $? || _lt_function_replace_fail=:
12765+
12766+
12767+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12768+func_dirname_and_basename ()\
12769+{\
12770+\ case ${1} in\
12771+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12772+\ * ) func_dirname_result="${3}" ;;\
12773+\ esac\
12774+\ func_basename_result="${1##*/}"\
12775+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12776+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12777+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12778+test 0 -eq $? || _lt_function_replace_fail=:
12779+
12780+
12781+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12782+func_stripname ()\
12783+{\
12784+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12785+\ # positional parameters, so assign one to ordinary parameter first.\
12786+\ func_stripname_result=${3}\
12787+\ func_stripname_result=${func_stripname_result#"${1}"}\
12788+\ func_stripname_result=${func_stripname_result%"${2}"}\
12789+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12790+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12791+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12792+test 0 -eq $? || _lt_function_replace_fail=:
12793+
12794+
12795+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12796+func_split_long_opt ()\
12797+{\
12798+\ func_split_long_opt_name=${1%%=*}\
12799+\ func_split_long_opt_arg=${1#*=}\
12800+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12801+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12802+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12803+test 0 -eq $? || _lt_function_replace_fail=:
12804+
12805+
12806+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12807+func_split_short_opt ()\
12808+{\
12809+\ func_split_short_opt_arg=${1#??}\
12810+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12811+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12812+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12813+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12814+test 0 -eq $? || _lt_function_replace_fail=:
12815+
12816+
12817+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12818+func_lo2o ()\
12819+{\
12820+\ case ${1} in\
12821+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12822+\ *) func_lo2o_result=${1} ;;\
12823+\ esac\
12824+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
12825+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12826+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12827+test 0 -eq $? || _lt_function_replace_fail=:
12828+
12829+
12830+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
12831+func_xform ()\
12832+{\
12833+ func_xform_result=${1%.*}.lo\
12834+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
12835+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12836+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12837+test 0 -eq $? || _lt_function_replace_fail=:
12838+
12839+
12840+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12841+func_arith ()\
12842+{\
12843+ func_arith_result=$(( $* ))\
12844+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12845+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12846+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12847+test 0 -eq $? || _lt_function_replace_fail=:
12848+
12849+
12850+ sed -e '/^func_len ()$/,/^} # func_len /c\
12851+func_len ()\
12852+{\
12853+ func_len_result=${#1}\
12854+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12855+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12856+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12857+test 0 -eq $? || _lt_function_replace_fail=:
12858+
12859+fi
12860+
12861+if test x"$lt_shell_append" = xyes; then
12862+ sed -e '/^func_append ()$/,/^} # func_append /c\
12863+func_append ()\
12864+{\
12865+ eval "${1}+=\\${2}"\
12866+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12867+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12868+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12869+test 0 -eq $? || _lt_function_replace_fail=:
12870+
12871+
12872+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12873+func_append_quoted ()\
12874+{\
12875+\ func_quote_for_eval "${2}"\
12876+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
12877+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
12878+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12879+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12880+test 0 -eq $? || _lt_function_replace_fail=:
12881+
12882+
12883+ # Save a `func_append' function call where possible by direct use of '+='
12884+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12885+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12886+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12887+ test 0 -eq $? || _lt_function_replace_fail=:
12888+else
12889+ # Save a `func_append' function call even when '+=' is not available
12890+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12891+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12892+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12893+ test 0 -eq $? || _lt_function_replace_fail=:
12894+fi
12895+
12896+if test x"$_lt_function_replace_fail" = x":"; then
12897+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12898+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12899+fi
12900
12901- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12902- || (rm -f "$cfgfile"; exit 1)
12903
12904- mv -f "$cfgfile" "$ofile" ||
12905+ mv -f "$cfgfile" "$ofile" ||
12906 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12907 chmod +x "$ofile"
12908
12909Index: binutils-2.21.1/gas/configure
12910===================================================================
12911--- binutils-2.21.1.orig/gas/configure
12912+++ binutils-2.21.1/gas/configure
12913@@ -645,8 +645,11 @@ OTOOL
12914 LIPO
12915 NMEDIT
12916 DSYMUTIL
12917+MANIFEST_TOOL
12918 RANLIB
12919+ac_ct_AR
12920 AR
12921+DLLTOOL
12922 OBJDUMP
12923 LN_S
12924 NM
12925@@ -759,6 +762,7 @@ enable_static
12926 with_pic
12927 enable_fast_install
12928 with_gnu_ld
12929+with_libtool_sysroot
12930 enable_libtool_lock
12931 enable_targets
12932 enable_checking
12933@@ -1420,6 +1424,8 @@ Optional Packages:
12934 --with-pic try to use only PIC/non-PIC objects [default=use
12935 both]
12936 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
12937+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
12938+ (or the compiler's sysroot if not specified).
12939 --with-zlib include zlib support (auto/yes/no) default=auto
12940
12941 Some influential environment variables:
12942@@ -5135,8 +5141,8 @@ esac
12943
12944
12945
12946-macro_version='2.2.7a'
12947-macro_revision='1.3134'
12948+macro_version='2.4'
12949+macro_revision='1.3293'
12950
12951
12952
12953@@ -5176,7 +5182,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12954 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
12955 $as_echo_n "checking how to print strings... " >&6; }
12956 # Test print first, because it will be a builtin if present.
12957-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
12958+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
12959 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12960 ECHO='print -r --'
12961 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12962@@ -5862,8 +5868,8 @@ $as_echo_n "checking whether the shell u
12963 # Try some XSI features
12964 xsi_shell=no
12965 ( _lt_dummy="a/b/c"
12966- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
12967- = c,a/b,, \
12968+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
12969+ = c,a/b,b/c, \
12970 && eval 'test $(( 1 + 1 )) -eq 2 \
12971 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
12972 && xsi_shell=yes
12973@@ -5912,6 +5918,80 @@ esac
12974
12975
12976
12977+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
12978+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
12979+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
12980+ $as_echo_n "(cached) " >&6
12981+else
12982+ case $host in
12983+ *-*-mingw* )
12984+ case $build in
12985+ *-*-mingw* ) # actually msys
12986+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
12987+ ;;
12988+ *-*-cygwin* )
12989+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
12990+ ;;
12991+ * ) # otherwise, assume *nix
12992+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
12993+ ;;
12994+ esac
12995+ ;;
12996+ *-*-cygwin* )
12997+ case $build in
12998+ *-*-mingw* ) # actually msys
12999+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
13000+ ;;
13001+ *-*-cygwin* )
13002+ lt_cv_to_host_file_cmd=func_convert_file_noop
13003+ ;;
13004+ * ) # otherwise, assume *nix
13005+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
13006+ ;;
13007+ esac
13008+ ;;
13009+ * ) # unhandled hosts (and "normal" native builds)
13010+ lt_cv_to_host_file_cmd=func_convert_file_noop
13011+ ;;
13012+esac
13013+
13014+fi
13015+
13016+to_host_file_cmd=$lt_cv_to_host_file_cmd
13017+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
13018+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
13019+
13020+
13021+
13022+
13023+
13024+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
13025+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
13026+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
13027+ $as_echo_n "(cached) " >&6
13028+else
13029+ #assume ordinary cross tools, or native build.
13030+lt_cv_to_tool_file_cmd=func_convert_file_noop
13031+case $host in
13032+ *-*-mingw* )
13033+ case $build in
13034+ *-*-mingw* ) # actually msys
13035+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
13036+ ;;
13037+ esac
13038+ ;;
13039+esac
13040+
13041+fi
13042+
13043+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
13044+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
13045+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
13046+
13047+
13048+
13049+
13050+
13051 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13052 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13053 if test "${lt_cv_ld_reload_flag+set}" = set; then :
13054@@ -5928,6 +6008,11 @@ case $reload_flag in
13055 esac
13056 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13057 case $host_os in
13058+ cygwin* | mingw* | pw32* | cegcc*)
13059+ if test "$GCC" != yes; then
13060+ reload_cmds=false
13061+ fi
13062+ ;;
13063 darwin*)
13064 if test "$GCC" = yes; then
13065 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13066@@ -6096,7 +6181,8 @@ mingw* | pw32*)
13067 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13068 lt_cv_file_magic_cmd='func_win32_libid'
13069 else
13070- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
13071+ # Keep this pattern in sync with the one in func_win32_libid.
13072+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
13073 lt_cv_file_magic_cmd='$OBJDUMP -f'
13074 fi
13075 ;;
13076@@ -6250,6 +6336,21 @@ esac
13077 fi
13078 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13079 $as_echo "$lt_cv_deplibs_check_method" >&6; }
13080+
13081+file_magic_glob=
13082+want_nocaseglob=no
13083+if test "$build" = "$host"; then
13084+ case $host_os in
13085+ mingw* | pw32*)
13086+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
13087+ want_nocaseglob=yes
13088+ else
13089+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
13090+ fi
13091+ ;;
13092+ esac
13093+fi
13094+
13095 file_magic_cmd=$lt_cv_file_magic_cmd
13096 deplibs_check_method=$lt_cv_deplibs_check_method
13097 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13098@@ -6265,9 +6366,162 @@ test -z "$deplibs_check_method" && depli
13099
13100
13101
13102+
13103+
13104+
13105+
13106+
13107+
13108+
13109+
13110+
13111+
13112+if test -n "$ac_tool_prefix"; then
13113+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
13114+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
13115+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13116+$as_echo_n "checking for $ac_word... " >&6; }
13117+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
13118+ $as_echo_n "(cached) " >&6
13119+else
13120+ if test -n "$DLLTOOL"; then
13121+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
13122+else
13123+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13124+for as_dir in $PATH
13125+do
13126+ IFS=$as_save_IFS
13127+ test -z "$as_dir" && as_dir=.
13128+ for ac_exec_ext in '' $ac_executable_extensions; do
13129+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13130+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
13131+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13132+ break 2
13133+ fi
13134+done
13135+ done
13136+IFS=$as_save_IFS
13137+
13138+fi
13139+fi
13140+DLLTOOL=$ac_cv_prog_DLLTOOL
13141+if test -n "$DLLTOOL"; then
13142+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
13143+$as_echo "$DLLTOOL" >&6; }
13144+else
13145+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13146+$as_echo "no" >&6; }
13147+fi
13148+
13149+
13150+fi
13151+if test -z "$ac_cv_prog_DLLTOOL"; then
13152+ ac_ct_DLLTOOL=$DLLTOOL
13153+ # Extract the first word of "dlltool", so it can be a program name with args.
13154+set dummy dlltool; ac_word=$2
13155+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13156+$as_echo_n "checking for $ac_word... " >&6; }
13157+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
13158+ $as_echo_n "(cached) " >&6
13159+else
13160+ if test -n "$ac_ct_DLLTOOL"; then
13161+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
13162+else
13163+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13164+for as_dir in $PATH
13165+do
13166+ IFS=$as_save_IFS
13167+ test -z "$as_dir" && as_dir=.
13168+ for ac_exec_ext in '' $ac_executable_extensions; do
13169+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13170+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
13171+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13172+ break 2
13173+ fi
13174+done
13175+ done
13176+IFS=$as_save_IFS
13177+
13178+fi
13179+fi
13180+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
13181+if test -n "$ac_ct_DLLTOOL"; then
13182+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
13183+$as_echo "$ac_ct_DLLTOOL" >&6; }
13184+else
13185+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13186+$as_echo "no" >&6; }
13187+fi
13188+
13189+ if test "x$ac_ct_DLLTOOL" = x; then
13190+ DLLTOOL="false"
13191+ else
13192+ case $cross_compiling:$ac_tool_warned in
13193+yes:)
13194+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13195+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13196+ac_tool_warned=yes ;;
13197+esac
13198+ DLLTOOL=$ac_ct_DLLTOOL
13199+ fi
13200+else
13201+ DLLTOOL="$ac_cv_prog_DLLTOOL"
13202+fi
13203+
13204+test -z "$DLLTOOL" && DLLTOOL=dlltool
13205+
13206+
13207+
13208+
13209+
13210+
13211+
13212+
13213+
13214+
13215+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
13216+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
13217+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
13218+ $as_echo_n "(cached) " >&6
13219+else
13220+ lt_cv_sharedlib_from_linklib_cmd='unknown'
13221+
13222+case $host_os in
13223+cygwin* | mingw* | pw32* | cegcc*)
13224+ # two different shell functions defined in ltmain.sh
13225+ # decide which to use based on capabilities of $DLLTOOL
13226+ case `$DLLTOOL --help 2>&1` in
13227+ *--identify-strict*)
13228+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
13229+ ;;
13230+ *)
13231+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
13232+ ;;
13233+ esac
13234+ ;;
13235+*)
13236+ # fallback: assume linklib IS sharedlib
13237+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
13238+ ;;
13239+esac
13240+
13241+fi
13242+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
13243+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
13244+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
13245+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
13246+
13247+
13248+
13249+
13250+
13251+
13252+
13253 if test -n "$ac_tool_prefix"; then
13254- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
13255-set dummy ${ac_tool_prefix}ar; ac_word=$2
13256+ for ac_prog in ar
13257+ do
13258+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
13259+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
13260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13261 $as_echo_n "checking for $ac_word... " >&6; }
13262 if test "${ac_cv_prog_AR+set}" = set; then :
13263@@ -6283,7 +6537,7 @@ do
13264 test -z "$as_dir" && as_dir=.
13265 for ac_exec_ext in '' $ac_executable_extensions; do
13266 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13267- ac_cv_prog_AR="${ac_tool_prefix}ar"
13268+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
13269 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13270 break 2
13271 fi
13272@@ -6303,11 +6557,15 @@ $as_echo "no" >&6; }
13273 fi
13274
13275
13276+ test -n "$AR" && break
13277+ done
13278 fi
13279-if test -z "$ac_cv_prog_AR"; then
13280+if test -z "$AR"; then
13281 ac_ct_AR=$AR
13282- # Extract the first word of "ar", so it can be a program name with args.
13283-set dummy ar; ac_word=$2
13284+ for ac_prog in ar
13285+do
13286+ # Extract the first word of "$ac_prog", so it can be a program name with args.
13287+set dummy $ac_prog; ac_word=$2
13288 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13289 $as_echo_n "checking for $ac_word... " >&6; }
13290 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
13291@@ -6323,7 +6581,7 @@ do
13292 test -z "$as_dir" && as_dir=.
13293 for ac_exec_ext in '' $ac_executable_extensions; do
13294 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13295- ac_cv_prog_ac_ct_AR="ar"
13296+ ac_cv_prog_ac_ct_AR="$ac_prog"
13297 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13298 break 2
13299 fi
13300@@ -6342,6 +6600,10 @@ else
13301 $as_echo "no" >&6; }
13302 fi
13303
13304+
13305+ test -n "$ac_ct_AR" && break
13306+done
13307+
13308 if test "x$ac_ct_AR" = x; then
13309 AR="false"
13310 else
13311@@ -6353,16 +6615,72 @@ ac_tool_warned=yes ;;
13312 esac
13313 AR=$ac_ct_AR
13314 fi
13315-else
13316- AR="$ac_cv_prog_AR"
13317 fi
13318
13319-test -z "$AR" && AR=ar
13320-test -z "$AR_FLAGS" && AR_FLAGS=cru
13321+: ${AR=ar}
13322+: ${AR_FLAGS=cru}
13323+
13324+
13325+
13326+
13327+
13328+
13329+
13330+
13331+
13332+
13333+
13334+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13335+$as_echo_n "checking for archiver @FILE support... " >&6; }
13336+if test "${lt_cv_ar_at_file+set}" = set; then :
13337+ $as_echo_n "(cached) " >&6
13338+else
13339+ lt_cv_ar_at_file=no
13340+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13341+/* end confdefs.h. */
13342+
13343+int
13344+main ()
13345+{
13346
13347+ ;
13348+ return 0;
13349+}
13350+_ACEOF
13351+if ac_fn_c_try_compile "$LINENO"; then :
13352+ echo conftest.$ac_objext > conftest.lst
13353+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
13354+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13355+ (eval $lt_ar_try) 2>&5
13356+ ac_status=$?
13357+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13358+ test $ac_status = 0; }
13359+ if test "$ac_status" -eq 0; then
13360+ # Ensure the archiver fails upon bogus file names.
13361+ rm -f conftest.$ac_objext libconftest.a
13362+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13363+ (eval $lt_ar_try) 2>&5
13364+ ac_status=$?
13365+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13366+ test $ac_status = 0; }
13367+ if test "$ac_status" -ne 0; then
13368+ lt_cv_ar_at_file=@
13369+ fi
13370+ fi
13371+ rm -f conftest.* libconftest.a
13372
13373+fi
13374+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13375
13376+fi
13377+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13378+$as_echo "$lt_cv_ar_at_file" >&6; }
13379
13380+if test "x$lt_cv_ar_at_file" = xno; then
13381+ archiver_list_spec=
13382+else
13383+ archiver_list_spec=$lt_cv_ar_at_file
13384+fi
13385
13386
13387
13388@@ -6704,8 +7022,8 @@ esac
13389 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13390
13391 # Transform an extracted symbol line into symbol name and symbol address
13392-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13393-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'"
13394+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13395+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'"
13396
13397 # Handle CRLF in mingw tool chain
13398 opt_cr=
13399@@ -6741,6 +7059,7 @@ for ac_symprfx in "" "_"; do
13400 else
13401 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13402 fi
13403+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
13404
13405 # Check to see that the pipe works correctly.
13406 pipe_works=no
13407@@ -6782,6 +7101,18 @@ _LT_EOF
13408 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13409 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13410 cat <<_LT_EOF > conftest.$ac_ext
13411+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13412+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13413+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13414+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13415+# define LT_DLSYM_CONST
13416+#elif defined(__osf__)
13417+/* This system does not cope well with relocations in const data. */
13418+# define LT_DLSYM_CONST
13419+#else
13420+# define LT_DLSYM_CONST const
13421+#endif
13422+
13423 #ifdef __cplusplus
13424 extern "C" {
13425 #endif
13426@@ -6793,7 +7124,7 @@ _LT_EOF
13427 cat <<_LT_EOF >> conftest.$ac_ext
13428
13429 /* The mapping between symbol names and symbols. */
13430-const struct {
13431+LT_DLSYM_CONST struct {
13432 const char *name;
13433 void *address;
13434 }
13435@@ -6819,8 +7150,8 @@ static const void *lt_preloaded_setup()
13436 _LT_EOF
13437 # Now try linking the two files.
13438 mv conftest.$ac_objext conftstm.$ac_objext
13439- lt_save_LIBS="$LIBS"
13440- lt_save_CFLAGS="$CFLAGS"
13441+ lt_globsym_save_LIBS=$LIBS
13442+ lt_globsym_save_CFLAGS=$CFLAGS
13443 LIBS="conftstm.$ac_objext"
13444 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13445 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13446@@ -6830,8 +7161,8 @@ _LT_EOF
13447 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13448 pipe_works=yes
13449 fi
13450- LIBS="$lt_save_LIBS"
13451- CFLAGS="$lt_save_CFLAGS"
13452+ LIBS=$lt_globsym_save_LIBS
13453+ CFLAGS=$lt_globsym_save_CFLAGS
13454 else
13455 echo "cannot find nm_test_func in $nlist" >&5
13456 fi
13457@@ -6868,6 +7199,19 @@ else
13458 $as_echo "ok" >&6; }
13459 fi
13460
13461+# Response file support.
13462+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
13463+ nm_file_list_spec='@'
13464+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
13465+ nm_file_list_spec='@'
13466+fi
13467+
13468+
13469+
13470+
13471+
13472+
13473+
13474
13475
13476
13477@@ -6888,6 +7232,42 @@ fi
13478
13479
13480
13481+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
13482+$as_echo_n "checking for sysroot... " >&6; }
13483+
13484+# Check whether --with-libtool-sysroot was given.
13485+if test "${with_libtool_sysroot+set}" = set; then :
13486+ withval=$with_libtool_sysroot;
13487+else
13488+ with_libtool_sysroot=no
13489+fi
13490+
13491+
13492+lt_sysroot=
13493+case ${with_libtool_sysroot} in #(
13494+ yes)
13495+ if test "$GCC" = yes; then
13496+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
13497+ fi
13498+ ;; #(
13499+ /*)
13500+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
13501+ ;; #(
13502+ no|'')
13503+ ;; #(
13504+ *)
13505+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
13506+$as_echo "${with_libtool_sysroot}" >&6; }
13507+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
13508+ ;;
13509+esac
13510+
13511+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
13512+$as_echo "${lt_sysroot:-no}" >&6; }
13513+
13514+
13515+
13516+
13517
13518 # Check whether --enable-libtool-lock was given.
13519 if test "${enable_libtool_lock+set}" = set; then :
13520@@ -7082,6 +7462,123 @@ esac
13521
13522 need_locks="$enable_libtool_lock"
13523
13524+if test -n "$ac_tool_prefix"; then
13525+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
13526+set dummy ${ac_tool_prefix}mt; ac_word=$2
13527+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13528+$as_echo_n "checking for $ac_word... " >&6; }
13529+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
13530+ $as_echo_n "(cached) " >&6
13531+else
13532+ if test -n "$MANIFEST_TOOL"; then
13533+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
13534+else
13535+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13536+for as_dir in $PATH
13537+do
13538+ IFS=$as_save_IFS
13539+ test -z "$as_dir" && as_dir=.
13540+ for ac_exec_ext in '' $ac_executable_extensions; do
13541+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13542+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
13543+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13544+ break 2
13545+ fi
13546+done
13547+ done
13548+IFS=$as_save_IFS
13549+
13550+fi
13551+fi
13552+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
13553+if test -n "$MANIFEST_TOOL"; then
13554+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
13555+$as_echo "$MANIFEST_TOOL" >&6; }
13556+else
13557+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13558+$as_echo "no" >&6; }
13559+fi
13560+
13561+
13562+fi
13563+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
13564+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
13565+ # Extract the first word of "mt", so it can be a program name with args.
13566+set dummy mt; ac_word=$2
13567+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13568+$as_echo_n "checking for $ac_word... " >&6; }
13569+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
13570+ $as_echo_n "(cached) " >&6
13571+else
13572+ if test -n "$ac_ct_MANIFEST_TOOL"; then
13573+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
13574+else
13575+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13576+for as_dir in $PATH
13577+do
13578+ IFS=$as_save_IFS
13579+ test -z "$as_dir" && as_dir=.
13580+ for ac_exec_ext in '' $ac_executable_extensions; do
13581+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13582+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
13583+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13584+ break 2
13585+ fi
13586+done
13587+ done
13588+IFS=$as_save_IFS
13589+
13590+fi
13591+fi
13592+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
13593+if test -n "$ac_ct_MANIFEST_TOOL"; then
13594+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
13595+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
13596+else
13597+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13598+$as_echo "no" >&6; }
13599+fi
13600+
13601+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
13602+ MANIFEST_TOOL=":"
13603+ else
13604+ case $cross_compiling:$ac_tool_warned in
13605+yes:)
13606+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13607+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13608+ac_tool_warned=yes ;;
13609+esac
13610+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
13611+ fi
13612+else
13613+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
13614+fi
13615+
13616+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
13617+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
13618+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
13619+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
13620+ $as_echo_n "(cached) " >&6
13621+else
13622+ lt_cv_path_mainfest_tool=no
13623+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
13624+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
13625+ cat conftest.err >&5
13626+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
13627+ lt_cv_path_mainfest_tool=yes
13628+ fi
13629+ rm -f conftest*
13630+fi
13631+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
13632+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
13633+if test "x$lt_cv_path_mainfest_tool" != xyes; then
13634+ MANIFEST_TOOL=:
13635+fi
13636+
13637+
13638+
13639+
13640+
13641
13642 case $host_os in
13643 rhapsody* | darwin*)
13644@@ -7645,6 +8142,8 @@ _LT_EOF
13645 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13646 echo "$AR cru libconftest.a conftest.o" >&5
13647 $AR cru libconftest.a conftest.o 2>&5
13648+ echo "$RANLIB libconftest.a" >&5
13649+ $RANLIB libconftest.a 2>&5
13650 cat > conftest.c << _LT_EOF
13651 int main() { return 0;}
13652 _LT_EOF
13653@@ -7840,7 +8339,8 @@ fi
13654 LIBTOOL_DEPS="$ltmain"
13655
13656 # Always use our own libtool.
13657-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
13658+LIBTOOL='$(SHELL) $(top_builddir)'
13659+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
13660
13661
13662
13663@@ -7929,7 +8429,7 @@ aix3*)
13664 esac
13665
13666 # Global variables:
13667-ofile=libtool
13668+ofile=${host_alias}-libtool
13669 can_build_shared=yes
13670
13671 # All known linkers require a `.a' archive for static linking (except MSVC,
13672@@ -8227,8 +8727,6 @@ fi
13673 lt_prog_compiler_pic=
13674 lt_prog_compiler_static=
13675
13676-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13677-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13678
13679 if test "$GCC" = yes; then
13680 lt_prog_compiler_wl='-Wl,'
13681@@ -8393,6 +8891,12 @@ $as_echo_n "checking for $compiler optio
13682 lt_prog_compiler_pic='--shared'
13683 lt_prog_compiler_static='--static'
13684 ;;
13685+ nagfor*)
13686+ # NAG Fortran compiler
13687+ lt_prog_compiler_wl='-Wl,-Wl,,'
13688+ lt_prog_compiler_pic='-PIC'
13689+ lt_prog_compiler_static='-Bstatic'
13690+ ;;
13691 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13692 # Portland Group compilers (*not* the Pentium gcc compiler,
13693 # which looks to be a dead project)
13694@@ -8455,7 +8959,7 @@ $as_echo_n "checking for $compiler optio
13695 lt_prog_compiler_pic='-KPIC'
13696 lt_prog_compiler_static='-Bstatic'
13697 case $cc_basename in
13698- f77* | f90* | f95*)
13699+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
13700 lt_prog_compiler_wl='-Qoption ld ';;
13701 *)
13702 lt_prog_compiler_wl='-Wl,';;
13703@@ -8512,13 +9016,17 @@ case $host_os in
13704 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13705 ;;
13706 esac
13707-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
13708-$as_echo "$lt_prog_compiler_pic" >&6; }
13709-
13710-
13711-
13712-
13713
13714+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13715+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13716+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
13717+ $as_echo_n "(cached) " >&6
13718+else
13719+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
13720+fi
13721+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
13722+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
13723+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
13724
13725 #
13726 # Check to make sure the PIC flag actually works.
13727@@ -8579,6 +9087,11 @@ fi
13728
13729
13730
13731+
13732+
13733+
13734+
13735+
13736 #
13737 # Check to make sure the static flag actually works.
13738 #
13739@@ -8929,7 +9442,8 @@ _LT_EOF
13740 allow_undefined_flag=unsupported
13741 always_export_symbols=no
13742 enable_shared_with_static_runtimes=yes
13743- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13744+ 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'
13745+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
13746
13747 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13748 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13749@@ -8977,7 +9491,7 @@ _LT_EOF
13750 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
13751 && test "$tmp_diet" = no
13752 then
13753- tmp_addflag=
13754+ tmp_addflag=' $pic_flag'
13755 tmp_sharedflag='-shared'
13756 case $cc_basename,$host_cpu in
13757 pgcc*) # Portland Group C compiler
13758@@ -9028,12 +9542,12 @@ _LT_EOF
13759 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13760 hardcode_libdir_flag_spec=
13761 hardcode_libdir_flag_spec_ld='-rpath $libdir'
13762- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
13763+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
13764 if test "x$supports_anon_versioning" = xyes; then
13765 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
13766 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
13767 echo "local: *; };" >> $output_objdir/$libname.ver~
13768- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13769+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13770 fi
13771 ;;
13772 esac
13773@@ -9047,8 +9561,8 @@ _LT_EOF
13774 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13775 wlarc=
13776 else
13777- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13778- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13779+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13780+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13781 fi
13782 ;;
13783
13784@@ -9066,8 +9580,8 @@ _LT_EOF
13785
13786 _LT_EOF
13787 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13788- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13789- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13790+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13791+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13792 else
13793 ld_shlibs=no
13794 fi
13795@@ -9113,8 +9627,8 @@ _LT_EOF
13796
13797 *)
13798 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13799- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13800- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13801+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13802+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13803 else
13804 ld_shlibs=no
13805 fi
13806@@ -9244,7 +9758,13 @@ _LT_EOF
13807 allow_undefined_flag='-berok'
13808 # Determine the default libpath from the value encoded in an
13809 # empty executable.
13810- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13811+ if test "${lt_cv_aix_libpath+set}" = set; then
13812+ aix_libpath=$lt_cv_aix_libpath
13813+else
13814+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13815+ $as_echo_n "(cached) " >&6
13816+else
13817+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13818 /* end confdefs.h. */
13819
13820 int
13821@@ -9257,22 +9777,29 @@ main ()
13822 _ACEOF
13823 if ac_fn_c_try_link "$LINENO"; then :
13824
13825-lt_aix_libpath_sed='
13826- /Import File Strings/,/^$/ {
13827- /^0/ {
13828- s/^0 *\(.*\)$/\1/
13829- p
13830- }
13831- }'
13832-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13833-# Check for a 64-bit object if we didn't find anything.
13834-if test -z "$aix_libpath"; then
13835- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13836-fi
13837+ lt_aix_libpath_sed='
13838+ /Import File Strings/,/^$/ {
13839+ /^0/ {
13840+ s/^0 *\([^ ]*\) *$/\1/
13841+ p
13842+ }
13843+ }'
13844+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13845+ # Check for a 64-bit object if we didn't find anything.
13846+ if test -z "$lt_cv_aix_libpath_"; then
13847+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13848+ fi
13849 fi
13850 rm -f core conftest.err conftest.$ac_objext \
13851 conftest$ac_exeext conftest.$ac_ext
13852-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13853+ if test -z "$lt_cv_aix_libpath_"; then
13854+ lt_cv_aix_libpath_="/usr/lib:/lib"
13855+ fi
13856+
13857+fi
13858+
13859+ aix_libpath=$lt_cv_aix_libpath_
13860+fi
13861
13862 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13863 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"
13864@@ -9284,7 +9811,13 @@ if test -z "$aix_libpath"; then aix_libp
13865 else
13866 # Determine the default libpath from the value encoded in an
13867 # empty executable.
13868- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13869+ if test "${lt_cv_aix_libpath+set}" = set; then
13870+ aix_libpath=$lt_cv_aix_libpath
13871+else
13872+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13873+ $as_echo_n "(cached) " >&6
13874+else
13875+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13876 /* end confdefs.h. */
13877
13878 int
13879@@ -9297,22 +9830,29 @@ main ()
13880 _ACEOF
13881 if ac_fn_c_try_link "$LINENO"; then :
13882
13883-lt_aix_libpath_sed='
13884- /Import File Strings/,/^$/ {
13885- /^0/ {
13886- s/^0 *\(.*\)$/\1/
13887- p
13888- }
13889- }'
13890-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13891-# Check for a 64-bit object if we didn't find anything.
13892-if test -z "$aix_libpath"; then
13893- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13894-fi
13895+ lt_aix_libpath_sed='
13896+ /Import File Strings/,/^$/ {
13897+ /^0/ {
13898+ s/^0 *\([^ ]*\) *$/\1/
13899+ p
13900+ }
13901+ }'
13902+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13903+ # Check for a 64-bit object if we didn't find anything.
13904+ if test -z "$lt_cv_aix_libpath_"; then
13905+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13906+ fi
13907 fi
13908 rm -f core conftest.err conftest.$ac_objext \
13909 conftest$ac_exeext conftest.$ac_ext
13910-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13911+ if test -z "$lt_cv_aix_libpath_"; then
13912+ lt_cv_aix_libpath_="/usr/lib:/lib"
13913+ fi
13914+
13915+fi
13916+
13917+ aix_libpath=$lt_cv_aix_libpath_
13918+fi
13919
13920 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13921 # Warning - without using the other run time loading flags,
13922@@ -9357,20 +9897,63 @@ if test -z "$aix_libpath"; then aix_libp
13923 # Microsoft Visual C++.
13924 # hardcode_libdir_flag_spec is actually meaningless, as there is
13925 # no search path for DLLs.
13926- hardcode_libdir_flag_spec=' '
13927- allow_undefined_flag=unsupported
13928- # Tell ltmain to make .lib files, not .a files.
13929- libext=lib
13930- # Tell ltmain to make .dll files, not .so files.
13931- shrext_cmds=".dll"
13932- # FIXME: Setting linknames here is a bad hack.
13933- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
13934- # The linker will automatically build a .lib file if we build a DLL.
13935- old_archive_from_new_cmds='true'
13936- # FIXME: Should let the user specify the lib program.
13937- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
13938- fix_srcfile_path='`cygpath -w "$srcfile"`'
13939- enable_shared_with_static_runtimes=yes
13940+ case $cc_basename in
13941+ cl*)
13942+ # Native MSVC
13943+ hardcode_libdir_flag_spec=' '
13944+ allow_undefined_flag=unsupported
13945+ always_export_symbols=yes
13946+ file_list_spec='@'
13947+ # Tell ltmain to make .lib files, not .a files.
13948+ libext=lib
13949+ # Tell ltmain to make .dll files, not .so files.
13950+ shrext_cmds=".dll"
13951+ # FIXME: Setting linknames here is a bad hack.
13952+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
13953+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
13954+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
13955+ else
13956+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
13957+ fi~
13958+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
13959+ linknames='
13960+ # The linker will not automatically build a static lib if we build a DLL.
13961+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
13962+ enable_shared_with_static_runtimes=yes
13963+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13964+ # Don't use ranlib
13965+ old_postinstall_cmds='chmod 644 $oldlib'
13966+ postlink_cmds='lt_outputfile="@OUTPUT@"~
13967+ lt_tool_outputfile="@TOOL_OUTPUT@"~
13968+ case $lt_outputfile in
13969+ *.exe|*.EXE) ;;
13970+ *)
13971+ lt_outputfile="$lt_outputfile.exe"
13972+ lt_tool_outputfile="$lt_tool_outputfile.exe"
13973+ ;;
13974+ esac~
13975+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
13976+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
13977+ $RM "$lt_outputfile.manifest";
13978+ fi'
13979+ ;;
13980+ *)
13981+ # Assume MSVC wrapper
13982+ hardcode_libdir_flag_spec=' '
13983+ allow_undefined_flag=unsupported
13984+ # Tell ltmain to make .lib files, not .a files.
13985+ libext=lib
13986+ # Tell ltmain to make .dll files, not .so files.
13987+ shrext_cmds=".dll"
13988+ # FIXME: Setting linknames here is a bad hack.
13989+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
13990+ # The linker will automatically build a .lib file if we build a DLL.
13991+ old_archive_from_new_cmds='true'
13992+ # FIXME: Should let the user specify the lib program.
13993+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
13994+ enable_shared_with_static_runtimes=yes
13995+ ;;
13996+ esac
13997 ;;
13998
13999 darwin* | rhapsody*)
14000@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libp
14001
14002 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14003 freebsd* | dragonfly*)
14004- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14005+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14006 hardcode_libdir_flag_spec='-R$libdir'
14007 hardcode_direct=yes
14008 hardcode_shlibpath_var=no
14009@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libp
14010
14011 hpux9*)
14012 if test "$GCC" = yes; then
14013- 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'
14014+ 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'
14015 else
14016 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'
14017 fi
14018@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libp
14019
14020 hpux10*)
14021 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
14022- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14023+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14024 else
14025 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14026 fi
14027@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libp
14028 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14029 ;;
14030 ia64*)
14031- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14032+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14033 ;;
14034 *)
14035- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14036+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14037 ;;
14038 esac
14039 else
14040@@ -9565,23 +10148,36 @@ fi
14041
14042 irix5* | irix6* | nonstopux*)
14043 if test "$GCC" = yes; then
14044- 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'
14045+ 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'
14046 # Try to use the -exported_symbol ld option, if it does not
14047 # work, assume that -exports_file does not work either and
14048 # implicitly export all symbols.
14049- save_LDFLAGS="$LDFLAGS"
14050- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14051- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14052+ # This should be the same for all languages, so no per-tag cache variable.
14053+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
14054+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
14055+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
14056+ $as_echo_n "(cached) " >&6
14057+else
14058+ save_LDFLAGS="$LDFLAGS"
14059+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14060+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14061 /* end confdefs.h. */
14062-int foo(void) {}
14063+int foo (void) { return 0; }
14064 _ACEOF
14065 if ac_fn_c_try_link "$LINENO"; then :
14066- 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'
14067-
14068+ lt_cv_irix_exported_symbol=yes
14069+else
14070+ lt_cv_irix_exported_symbol=no
14071 fi
14072 rm -f core conftest.err conftest.$ac_objext \
14073 conftest$ac_exeext conftest.$ac_ext
14074- LDFLAGS="$save_LDFLAGS"
14075+ LDFLAGS="$save_LDFLAGS"
14076+fi
14077+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
14078+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
14079+ if test "$lt_cv_irix_exported_symbol" = yes; then
14080+ 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'
14081+ fi
14082 else
14083 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'
14084 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'
14085@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_obj
14086 osf4* | osf5*) # as osf3* with the addition of -msym flag
14087 if test "$GCC" = yes; then
14088 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
14089- 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'
14090+ 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'
14091 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14092 else
14093 allow_undefined_flag=' -expect_unresolved \*'
14094@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_obj
14095 no_undefined_flag=' -z defs'
14096 if test "$GCC" = yes; then
14097 wlarc='${wl}'
14098- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14099+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14100 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
14101- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
14102+ $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'
14103 else
14104 case `$CC -V 2>&1` in
14105 *"Compilers 5.0"*)
14106@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14107 need_version=no
14108 need_lib_prefix=no
14109
14110- case $GCC,$host_os in
14111- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
14112+ case $GCC,$cc_basename in
14113+ yes,*)
14114+ # gcc
14115 library_names_spec='$libname.dll.a'
14116 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14117 postinstall_cmds='base_file=`basename \${file}`~
14118@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14119 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14120 ;;
14121 esac
14122+ dynamic_linker='Win32 ld.exe'
14123+ ;;
14124+
14125+ *,cl*)
14126+ # Native MSVC
14127+ libname_spec='$name'
14128+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14129+ library_names_spec='${libname}.dll.lib'
14130+
14131+ case $build_os in
14132+ mingw*)
14133+ sys_lib_search_path_spec=
14134+ lt_save_ifs=$IFS
14135+ IFS=';'
14136+ for lt_path in $LIB
14137+ do
14138+ IFS=$lt_save_ifs
14139+ # Let DOS variable expansion print the short 8.3 style file name.
14140+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
14141+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
14142+ done
14143+ IFS=$lt_save_ifs
14144+ # Convert to MSYS style.
14145+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
14146+ ;;
14147+ cygwin*)
14148+ # Convert to unix form, then to dos form, then back to unix form
14149+ # but this time dos style (no spaces!) so that the unix form looks
14150+ # like /cygdrive/c/PROGRA~1:/cygdr...
14151+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
14152+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
14153+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14154+ ;;
14155+ *)
14156+ sys_lib_search_path_spec="$LIB"
14157+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
14158+ # It is most probably a Windows format PATH.
14159+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
14160+ else
14161+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14162+ fi
14163+ # FIXME: find the short name or the path components, as spaces are
14164+ # common. (e.g. "Program Files" -> "PROGRA~1")
14165+ ;;
14166+ esac
14167+
14168+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
14169+ postinstall_cmds='base_file=`basename \${file}`~
14170+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
14171+ dldir=$destdir/`dirname \$dlpath`~
14172+ test -d \$dldir || mkdir -p \$dldir~
14173+ $install_prog $dir/$dlname \$dldir/$dlname'
14174+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14175+ dlpath=$dir/\$dldll~
14176+ $RM \$dlpath'
14177+ shlibpath_overrides_runpath=yes
14178+ dynamic_linker='Win32 link.exe'
14179 ;;
14180
14181 *)
14182+ # Assume MSVC wrapper
14183 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
14184+ dynamic_linker='Win32 ld.exe'
14185 ;;
14186 esac
14187- dynamic_linker='Win32 ld.exe'
14188 # FIXME: first we should search . and the directory the executable is in
14189 shlibpath_var=PATH
14190 ;;
14191@@ -10399,7 +11054,7 @@ haiku*)
14192 soname_spec='${libname}${release}${shared_ext}$major'
14193 shlibpath_var=LIBRARY_PATH
14194 shlibpath_overrides_runpath=yes
14195- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
14196+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
14197 hardcode_into_libs=yes
14198 ;;
14199
14200@@ -11195,7 +11850,7 @@ else
14201 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14202 lt_status=$lt_dlunknown
14203 cat > conftest.$ac_ext <<_LT_EOF
14204-#line 11198 "configure"
14205+#line $LINENO "configure"
14206 #include "confdefs.h"
14207
14208 #if HAVE_DLFCN_H
14209@@ -11239,10 +11894,10 @@ else
14210 /* When -fvisbility=hidden is used, assume the code has been annotated
14211 correspondingly for the symbols needed. */
14212 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14213-void fnord () __attribute__((visibility("default")));
14214+int fnord () __attribute__((visibility("default")));
14215 #endif
14216
14217-void fnord () { int i=42; }
14218+int fnord () { return 42; }
14219 int main ()
14220 {
14221 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14222@@ -11301,7 +11956,7 @@ else
14223 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14224 lt_status=$lt_dlunknown
14225 cat > conftest.$ac_ext <<_LT_EOF
14226-#line 11304 "configure"
14227+#line $LINENO "configure"
14228 #include "confdefs.h"
14229
14230 #if HAVE_DLFCN_H
14231@@ -11345,10 +12000,10 @@ else
14232 /* When -fvisbility=hidden is used, assume the code has been annotated
14233 correspondingly for the symbols needed. */
14234 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14235-void fnord () __attribute__((visibility("default")));
14236+int fnord () __attribute__((visibility("default")));
14237 #endif
14238
14239-void fnord () { int i=42; }
14240+int fnord () { return 42; }
14241 int main ()
14242 {
14243 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14244@@ -14941,13 +15596,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
14245 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
14246 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
14247 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
14248+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
14249+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
14250 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
14251 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
14252 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
14253 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
14254 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
14255+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
14256+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
14257+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
14258+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
14259 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
14260 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
14261+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
14262 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
14263 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
14264 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
14265@@ -14962,14 +15624,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
14266 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
14267 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
14268 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"`'
14269+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
14270+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
14271 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
14272 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
14273 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
14274-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14275 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
14276+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14277 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
14278 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
14279 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
14280+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
14281 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
14282 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
14283 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
14284@@ -15002,12 +15667,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
14285 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
14286 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
14287 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
14288-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
14289 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
14290 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
14291 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
14292 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
14293 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
14294+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
14295 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
14296 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
14297 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
14298@@ -15062,8 +15727,13 @@ reload_flag \
14299 OBJDUMP \
14300 deplibs_check_method \
14301 file_magic_cmd \
14302+file_magic_glob \
14303+want_nocaseglob \
14304+DLLTOOL \
14305+sharedlib_from_linklib_cmd \
14306 AR \
14307 AR_FLAGS \
14308+archiver_list_spec \
14309 STRIP \
14310 RANLIB \
14311 CC \
14312@@ -15073,12 +15743,14 @@ lt_cv_sys_global_symbol_pipe \
14313 lt_cv_sys_global_symbol_to_cdecl \
14314 lt_cv_sys_global_symbol_to_c_name_address \
14315 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
14316+nm_file_list_spec \
14317 lt_prog_compiler_no_builtin_flag \
14318-lt_prog_compiler_wl \
14319 lt_prog_compiler_pic \
14320+lt_prog_compiler_wl \
14321 lt_prog_compiler_static \
14322 lt_cv_prog_compiler_c_o \
14323 need_locks \
14324+MANIFEST_TOOL \
14325 DSYMUTIL \
14326 NMEDIT \
14327 LIPO \
14328@@ -15094,7 +15766,6 @@ no_undefined_flag \
14329 hardcode_libdir_flag_spec \
14330 hardcode_libdir_flag_spec_ld \
14331 hardcode_libdir_separator \
14332-fix_srcfile_path \
14333 exclude_expsyms \
14334 include_expsyms \
14335 file_list_spec \
14336@@ -15130,6 +15801,7 @@ module_cmds \
14337 module_expsym_cmds \
14338 export_symbols_cmds \
14339 prelink_cmds \
14340+postlink_cmds \
14341 postinstall_cmds \
14342 postuninstall_cmds \
14343 finish_cmds \
14344@@ -15894,7 +16566,8 @@ $as_echo X"$file" |
14345 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
14346 #
14347 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14348-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
14349+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
14350+# Inc.
14351 # Written by Gordon Matzigkeit, 1996
14352 #
14353 # This file is part of GNU Libtool.
14354@@ -15997,19 +16670,42 @@ SP2NL=$lt_lt_SP2NL
14355 # turn newlines into spaces.
14356 NL2SP=$lt_lt_NL2SP
14357
14358+# convert \$build file names to \$host format.
14359+to_host_file_cmd=$lt_cv_to_host_file_cmd
14360+
14361+# convert \$build files to toolchain format.
14362+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14363+
14364 # An object symbol dumper.
14365 OBJDUMP=$lt_OBJDUMP
14366
14367 # Method to check whether dependent libraries are shared objects.
14368 deplibs_check_method=$lt_deplibs_check_method
14369
14370-# Command to use when deplibs_check_method == "file_magic".
14371+# Command to use when deplibs_check_method = "file_magic".
14372 file_magic_cmd=$lt_file_magic_cmd
14373
14374+# How to find potential files when deplibs_check_method = "file_magic".
14375+file_magic_glob=$lt_file_magic_glob
14376+
14377+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
14378+want_nocaseglob=$lt_want_nocaseglob
14379+
14380+# DLL creation program.
14381+DLLTOOL=$lt_DLLTOOL
14382+
14383+# Command to associate shared and link libraries.
14384+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
14385+
14386 # The archiver.
14387 AR=$lt_AR
14388+
14389+# Flags to create an archive.
14390 AR_FLAGS=$lt_AR_FLAGS
14391
14392+# How to feed a file listing to the archiver.
14393+archiver_list_spec=$lt_archiver_list_spec
14394+
14395 # A symbol stripping program.
14396 STRIP=$lt_STRIP
14397
14398@@ -16039,6 +16735,12 @@ global_symbol_to_c_name_address=$lt_lt_c
14399 # Transform the output of nm in a C name address pair when lib prefix is needed.
14400 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
14401
14402+# Specify filename containing input files for \$NM.
14403+nm_file_list_spec=$lt_nm_file_list_spec
14404+
14405+# The root where to search for dependent libraries,and in which our libraries should be installed.
14406+lt_sysroot=$lt_sysroot
14407+
14408 # The name of the directory that contains temporary libtool files.
14409 objdir=$objdir
14410
14411@@ -16048,6 +16750,9 @@ MAGIC_CMD=$MAGIC_CMD
14412 # Must we lock files when doing compilation?
14413 need_locks=$lt_need_locks
14414
14415+# Manifest tool.
14416+MANIFEST_TOOL=$lt_MANIFEST_TOOL
14417+
14418 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
14419 DSYMUTIL=$lt_DSYMUTIL
14420
14421@@ -16162,12 +16867,12 @@ with_gcc=$GCC
14422 # Compiler flag to turn off builtin functions.
14423 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
14424
14425-# How to pass a linker flag through the compiler.
14426-wl=$lt_lt_prog_compiler_wl
14427-
14428 # Additional compiler flags for building library objects.
14429 pic_flag=$lt_lt_prog_compiler_pic
14430
14431+# How to pass a linker flag through the compiler.
14432+wl=$lt_lt_prog_compiler_wl
14433+
14434 # Compiler flag to prevent dynamic linking.
14435 link_static_flag=$lt_lt_prog_compiler_static
14436
14437@@ -16254,9 +16959,6 @@ inherit_rpath=$inherit_rpath
14438 # Whether libtool must link a program against all its dependency libraries.
14439 link_all_deplibs=$link_all_deplibs
14440
14441-# Fix the shell variable \$srcfile for the compiler.
14442-fix_srcfile_path=$lt_fix_srcfile_path
14443-
14444 # Set to "yes" if exported symbols are required.
14445 always_export_symbols=$always_export_symbols
14446
14447@@ -16272,6 +16974,9 @@ include_expsyms=$lt_include_expsyms
14448 # Commands necessary for linking programs (against libraries) with templates.
14449 prelink_cmds=$lt_prelink_cmds
14450
14451+# Commands necessary for finishing linking programs.
14452+postlink_cmds=$lt_postlink_cmds
14453+
14454 # Specify filename containing input files.
14455 file_list_spec=$lt_file_list_spec
14456
14457@@ -16304,210 +17009,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
14458 # if finds mixed CR/LF and LF-only lines. Since sed operates in
14459 # text mode, it properly converts lines to CR/LF. This bash problem
14460 # is reportedly fixed, but why not run on old versions too?
14461- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
14462- || (rm -f "$cfgfile"; exit 1)
14463-
14464- case $xsi_shell in
14465- yes)
14466- cat << \_LT_EOF >> "$cfgfile"
14467-
14468-# func_dirname file append nondir_replacement
14469-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14470-# otherwise set result to NONDIR_REPLACEMENT.
14471-func_dirname ()
14472-{
14473- case ${1} in
14474- */*) func_dirname_result="${1%/*}${2}" ;;
14475- * ) func_dirname_result="${3}" ;;
14476- esac
14477-}
14478-
14479-# func_basename file
14480-func_basename ()
14481-{
14482- func_basename_result="${1##*/}"
14483-}
14484-
14485-# func_dirname_and_basename file append nondir_replacement
14486-# perform func_basename and func_dirname in a single function
14487-# call:
14488-# dirname: Compute the dirname of FILE. If nonempty,
14489-# add APPEND to the result, otherwise set result
14490-# to NONDIR_REPLACEMENT.
14491-# value returned in "$func_dirname_result"
14492-# basename: Compute filename of FILE.
14493-# value retuned in "$func_basename_result"
14494-# Implementation must be kept synchronized with func_dirname
14495-# and func_basename. For efficiency, we do not delegate to
14496-# those functions but instead duplicate the functionality here.
14497-func_dirname_and_basename ()
14498-{
14499- case ${1} in
14500- */*) func_dirname_result="${1%/*}${2}" ;;
14501- * ) func_dirname_result="${3}" ;;
14502- esac
14503- func_basename_result="${1##*/}"
14504-}
14505-
14506-# func_stripname prefix suffix name
14507-# strip PREFIX and SUFFIX off of NAME.
14508-# PREFIX and SUFFIX must not contain globbing or regex special
14509-# characters, hashes, percent signs, but SUFFIX may contain a leading
14510-# dot (in which case that matches only a dot).
14511-func_stripname ()
14512-{
14513- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
14514- # positional parameters, so assign one to ordinary parameter first.
14515- func_stripname_result=${3}
14516- func_stripname_result=${func_stripname_result#"${1}"}
14517- func_stripname_result=${func_stripname_result%"${2}"}
14518-}
14519-
14520-# func_opt_split
14521-func_opt_split ()
14522-{
14523- func_opt_split_opt=${1%%=*}
14524- func_opt_split_arg=${1#*=}
14525-}
14526-
14527-# func_lo2o object
14528-func_lo2o ()
14529-{
14530- case ${1} in
14531- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
14532- *) func_lo2o_result=${1} ;;
14533- esac
14534-}
14535-
14536-# func_xform libobj-or-source
14537-func_xform ()
14538-{
14539- func_xform_result=${1%.*}.lo
14540-}
14541-
14542-# func_arith arithmetic-term...
14543-func_arith ()
14544-{
14545- func_arith_result=$(( $* ))
14546-}
14547-
14548-# func_len string
14549-# STRING may not start with a hyphen.
14550-func_len ()
14551-{
14552- func_len_result=${#1}
14553-}
14554-
14555-_LT_EOF
14556- ;;
14557- *) # Bourne compatible functions.
14558- cat << \_LT_EOF >> "$cfgfile"
14559-
14560-# func_dirname file append nondir_replacement
14561-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14562-# otherwise set result to NONDIR_REPLACEMENT.
14563-func_dirname ()
14564-{
14565- # Extract subdirectory from the argument.
14566- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
14567- if test "X$func_dirname_result" = "X${1}"; then
14568- func_dirname_result="${3}"
14569- else
14570- func_dirname_result="$func_dirname_result${2}"
14571- fi
14572-}
14573-
14574-# func_basename file
14575-func_basename ()
14576-{
14577- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
14578-}
14579-
14580-
14581-# func_stripname prefix suffix name
14582-# strip PREFIX and SUFFIX off of NAME.
14583-# PREFIX and SUFFIX must not contain globbing or regex special
14584-# characters, hashes, percent signs, but SUFFIX may contain a leading
14585-# dot (in which case that matches only a dot).
14586-# func_strip_suffix prefix name
14587-func_stripname ()
14588-{
14589- case ${2} in
14590- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
14591- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
14592- esac
14593-}
14594-
14595-# sed scripts:
14596-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
14597-my_sed_long_arg='1s/^-[^=]*=//'
14598-
14599-# func_opt_split
14600-func_opt_split ()
14601-{
14602- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
14603- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
14604-}
14605-
14606-# func_lo2o object
14607-func_lo2o ()
14608-{
14609- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
14610-}
14611-
14612-# func_xform libobj-or-source
14613-func_xform ()
14614-{
14615- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
14616-}
14617-
14618-# func_arith arithmetic-term...
14619-func_arith ()
14620-{
14621- func_arith_result=`expr "$@"`
14622-}
14623-
14624-# func_len string
14625-# STRING may not start with a hyphen.
14626-func_len ()
14627-{
14628- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
14629-}
14630-
14631-_LT_EOF
14632-esac
14633-
14634-case $lt_shell_append in
14635- yes)
14636- cat << \_LT_EOF >> "$cfgfile"
14637-
14638-# func_append var value
14639-# Append VALUE to the end of shell variable VAR.
14640-func_append ()
14641-{
14642- eval "$1+=\$2"
14643-}
14644-_LT_EOF
14645- ;;
14646- *)
14647- cat << \_LT_EOF >> "$cfgfile"
14648-
14649-# func_append var value
14650-# Append VALUE to the end of shell variable VAR.
14651-func_append ()
14652-{
14653- eval "$1=\$$1\$2"
14654-}
14655-
14656-_LT_EOF
14657- ;;
14658- esac
14659+ sed '$q' "$ltmain" >> "$cfgfile" \
14660+ || (rm -f "$cfgfile"; exit 1)
14661
14662+ if test x"$xsi_shell" = xyes; then
14663+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
14664+func_dirname ()\
14665+{\
14666+\ case ${1} in\
14667+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14668+\ * ) func_dirname_result="${3}" ;;\
14669+\ esac\
14670+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
14671+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14672+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14673+test 0 -eq $? || _lt_function_replace_fail=:
14674+
14675+
14676+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
14677+func_basename ()\
14678+{\
14679+\ func_basename_result="${1##*/}"\
14680+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
14681+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14682+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14683+test 0 -eq $? || _lt_function_replace_fail=:
14684+
14685+
14686+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
14687+func_dirname_and_basename ()\
14688+{\
14689+\ case ${1} in\
14690+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14691+\ * ) func_dirname_result="${3}" ;;\
14692+\ esac\
14693+\ func_basename_result="${1##*/}"\
14694+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
14695+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14696+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14697+test 0 -eq $? || _lt_function_replace_fail=:
14698+
14699+
14700+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
14701+func_stripname ()\
14702+{\
14703+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
14704+\ # positional parameters, so assign one to ordinary parameter first.\
14705+\ func_stripname_result=${3}\
14706+\ func_stripname_result=${func_stripname_result#"${1}"}\
14707+\ func_stripname_result=${func_stripname_result%"${2}"}\
14708+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
14709+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14710+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14711+test 0 -eq $? || _lt_function_replace_fail=:
14712+
14713+
14714+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
14715+func_split_long_opt ()\
14716+{\
14717+\ func_split_long_opt_name=${1%%=*}\
14718+\ func_split_long_opt_arg=${1#*=}\
14719+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
14720+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14721+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14722+test 0 -eq $? || _lt_function_replace_fail=:
14723+
14724+
14725+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
14726+func_split_short_opt ()\
14727+{\
14728+\ func_split_short_opt_arg=${1#??}\
14729+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
14730+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
14731+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14732+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14733+test 0 -eq $? || _lt_function_replace_fail=:
14734+
14735+
14736+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
14737+func_lo2o ()\
14738+{\
14739+\ case ${1} in\
14740+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
14741+\ *) func_lo2o_result=${1} ;;\
14742+\ esac\
14743+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
14744+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14745+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14746+test 0 -eq $? || _lt_function_replace_fail=:
14747+
14748+
14749+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
14750+func_xform ()\
14751+{\
14752+ func_xform_result=${1%.*}.lo\
14753+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
14754+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14755+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14756+test 0 -eq $? || _lt_function_replace_fail=:
14757+
14758+
14759+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
14760+func_arith ()\
14761+{\
14762+ func_arith_result=$(( $* ))\
14763+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
14764+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14765+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14766+test 0 -eq $? || _lt_function_replace_fail=:
14767+
14768+
14769+ sed -e '/^func_len ()$/,/^} # func_len /c\
14770+func_len ()\
14771+{\
14772+ func_len_result=${#1}\
14773+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
14774+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14775+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14776+test 0 -eq $? || _lt_function_replace_fail=:
14777+
14778+fi
14779+
14780+if test x"$lt_shell_append" = xyes; then
14781+ sed -e '/^func_append ()$/,/^} # func_append /c\
14782+func_append ()\
14783+{\
14784+ eval "${1}+=\\${2}"\
14785+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
14786+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14787+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14788+test 0 -eq $? || _lt_function_replace_fail=:
14789+
14790+
14791+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
14792+func_append_quoted ()\
14793+{\
14794+\ func_quote_for_eval "${2}"\
14795+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
14796+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
14797+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14798+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14799+test 0 -eq $? || _lt_function_replace_fail=:
14800+
14801+
14802+ # Save a `func_append' function call where possible by direct use of '+='
14803+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
14804+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14805+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14806+ test 0 -eq $? || _lt_function_replace_fail=:
14807+else
14808+ # Save a `func_append' function call even when '+=' is not available
14809+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
14810+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14811+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14812+ test 0 -eq $? || _lt_function_replace_fail=:
14813+fi
14814+
14815+if test x"$_lt_function_replace_fail" = x":"; then
14816+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
14817+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
14818+fi
14819
14820- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
14821- || (rm -f "$cfgfile"; exit 1)
14822
14823- mv -f "$cfgfile" "$ofile" ||
14824+ mv -f "$cfgfile" "$ofile" ||
14825 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
14826 chmod +x "$ofile"
14827
14828Index: binutils-2.21.1/gprof/configure
14829===================================================================
14830--- binutils-2.21.1.orig/gprof/configure
14831+++ binutils-2.21.1/gprof/configure
14832@@ -629,8 +629,11 @@ OTOOL
14833 LIPO
14834 NMEDIT
14835 DSYMUTIL
14836+MANIFEST_TOOL
14837 RANLIB
14838+ac_ct_AR
14839 AR
14840+DLLTOOL
14841 OBJDUMP
14842 LN_S
14843 NM
14844@@ -743,6 +746,7 @@ enable_static
14845 with_pic
14846 enable_fast_install
14847 with_gnu_ld
14848+with_libtool_sysroot
14849 enable_libtool_lock
14850 enable_nls
14851 enable_maintainer_mode
14852@@ -1397,6 +1401,8 @@ Optional Packages:
14853 --with-pic try to use only PIC/non-PIC objects [default=use
14854 both]
14855 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
14856+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
14857+ (or the compiler's sysroot if not specified).
14858
14859 Some influential environment variables:
14860 CC C compiler command
14861@@ -5065,8 +5071,8 @@ esac
14862
14863
14864
14865-macro_version='2.2.7a'
14866-macro_revision='1.3134'
14867+macro_version='2.4'
14868+macro_revision='1.3293'
14869
14870
14871
14872@@ -5106,7 +5112,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
14873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
14874 $as_echo_n "checking how to print strings... " >&6; }
14875 # Test print first, because it will be a builtin if present.
14876-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
14877+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
14878 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
14879 ECHO='print -r --'
14880 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
14881@@ -5792,8 +5798,8 @@ $as_echo_n "checking whether the shell u
14882 # Try some XSI features
14883 xsi_shell=no
14884 ( _lt_dummy="a/b/c"
14885- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
14886- = c,a/b,, \
14887+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
14888+ = c,a/b,b/c, \
14889 && eval 'test $(( 1 + 1 )) -eq 2 \
14890 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
14891 && xsi_shell=yes
14892@@ -5842,6 +5848,80 @@ esac
14893
14894
14895
14896+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
14897+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
14898+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
14899+ $as_echo_n "(cached) " >&6
14900+else
14901+ case $host in
14902+ *-*-mingw* )
14903+ case $build in
14904+ *-*-mingw* ) # actually msys
14905+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
14906+ ;;
14907+ *-*-cygwin* )
14908+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
14909+ ;;
14910+ * ) # otherwise, assume *nix
14911+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
14912+ ;;
14913+ esac
14914+ ;;
14915+ *-*-cygwin* )
14916+ case $build in
14917+ *-*-mingw* ) # actually msys
14918+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
14919+ ;;
14920+ *-*-cygwin* )
14921+ lt_cv_to_host_file_cmd=func_convert_file_noop
14922+ ;;
14923+ * ) # otherwise, assume *nix
14924+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
14925+ ;;
14926+ esac
14927+ ;;
14928+ * ) # unhandled hosts (and "normal" native builds)
14929+ lt_cv_to_host_file_cmd=func_convert_file_noop
14930+ ;;
14931+esac
14932+
14933+fi
14934+
14935+to_host_file_cmd=$lt_cv_to_host_file_cmd
14936+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
14937+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
14938+
14939+
14940+
14941+
14942+
14943+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
14944+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
14945+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
14946+ $as_echo_n "(cached) " >&6
14947+else
14948+ #assume ordinary cross tools, or native build.
14949+lt_cv_to_tool_file_cmd=func_convert_file_noop
14950+case $host in
14951+ *-*-mingw* )
14952+ case $build in
14953+ *-*-mingw* ) # actually msys
14954+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
14955+ ;;
14956+ esac
14957+ ;;
14958+esac
14959+
14960+fi
14961+
14962+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14963+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
14964+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
14965+
14966+
14967+
14968+
14969+
14970 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
14971 $as_echo_n "checking for $LD option to reload object files... " >&6; }
14972 if test "${lt_cv_ld_reload_flag+set}" = set; then :
14973@@ -5858,6 +5938,11 @@ case $reload_flag in
14974 esac
14975 reload_cmds='$LD$reload_flag -o $output$reload_objs'
14976 case $host_os in
14977+ cygwin* | mingw* | pw32* | cegcc*)
14978+ if test "$GCC" != yes; then
14979+ reload_cmds=false
14980+ fi
14981+ ;;
14982 darwin*)
14983 if test "$GCC" = yes; then
14984 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
14985@@ -6026,7 +6111,8 @@ mingw* | pw32*)
14986 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
14987 lt_cv_file_magic_cmd='func_win32_libid'
14988 else
14989- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
14990+ # Keep this pattern in sync with the one in func_win32_libid.
14991+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
14992 lt_cv_file_magic_cmd='$OBJDUMP -f'
14993 fi
14994 ;;
14995@@ -6185,6 +6271,21 @@ esac
14996 fi
14997 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
14998 $as_echo "$lt_cv_deplibs_check_method" >&6; }
14999+
15000+file_magic_glob=
15001+want_nocaseglob=no
15002+if test "$build" = "$host"; then
15003+ case $host_os in
15004+ mingw* | pw32*)
15005+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
15006+ want_nocaseglob=yes
15007+ else
15008+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
15009+ fi
15010+ ;;
15011+ esac
15012+fi
15013+
15014 file_magic_cmd=$lt_cv_file_magic_cmd
15015 deplibs_check_method=$lt_cv_deplibs_check_method
15016 test -z "$deplibs_check_method" && deplibs_check_method=unknown
15017@@ -6200,9 +6301,162 @@ test -z "$deplibs_check_method" && depli
15018
15019
15020
15021+
15022+
15023+
15024+
15025+
15026+
15027+
15028+
15029+
15030+
15031 if test -n "$ac_tool_prefix"; then
15032- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
15033-set dummy ${ac_tool_prefix}ar; ac_word=$2
15034+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
15035+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
15036+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15037+$as_echo_n "checking for $ac_word... " >&6; }
15038+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
15039+ $as_echo_n "(cached) " >&6
15040+else
15041+ if test -n "$DLLTOOL"; then
15042+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
15043+else
15044+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15045+for as_dir in $PATH
15046+do
15047+ IFS=$as_save_IFS
15048+ test -z "$as_dir" && as_dir=.
15049+ for ac_exec_ext in '' $ac_executable_extensions; do
15050+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15051+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
15052+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15053+ break 2
15054+ fi
15055+done
15056+ done
15057+IFS=$as_save_IFS
15058+
15059+fi
15060+fi
15061+DLLTOOL=$ac_cv_prog_DLLTOOL
15062+if test -n "$DLLTOOL"; then
15063+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
15064+$as_echo "$DLLTOOL" >&6; }
15065+else
15066+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15067+$as_echo "no" >&6; }
15068+fi
15069+
15070+
15071+fi
15072+if test -z "$ac_cv_prog_DLLTOOL"; then
15073+ ac_ct_DLLTOOL=$DLLTOOL
15074+ # Extract the first word of "dlltool", so it can be a program name with args.
15075+set dummy dlltool; ac_word=$2
15076+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15077+$as_echo_n "checking for $ac_word... " >&6; }
15078+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
15079+ $as_echo_n "(cached) " >&6
15080+else
15081+ if test -n "$ac_ct_DLLTOOL"; then
15082+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
15083+else
15084+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15085+for as_dir in $PATH
15086+do
15087+ IFS=$as_save_IFS
15088+ test -z "$as_dir" && as_dir=.
15089+ for ac_exec_ext in '' $ac_executable_extensions; do
15090+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15091+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
15092+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15093+ break 2
15094+ fi
15095+done
15096+ done
15097+IFS=$as_save_IFS
15098+
15099+fi
15100+fi
15101+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
15102+if test -n "$ac_ct_DLLTOOL"; then
15103+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
15104+$as_echo "$ac_ct_DLLTOOL" >&6; }
15105+else
15106+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15107+$as_echo "no" >&6; }
15108+fi
15109+
15110+ if test "x$ac_ct_DLLTOOL" = x; then
15111+ DLLTOOL="false"
15112+ else
15113+ case $cross_compiling:$ac_tool_warned in
15114+yes:)
15115+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15116+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15117+ac_tool_warned=yes ;;
15118+esac
15119+ DLLTOOL=$ac_ct_DLLTOOL
15120+ fi
15121+else
15122+ DLLTOOL="$ac_cv_prog_DLLTOOL"
15123+fi
15124+
15125+test -z "$DLLTOOL" && DLLTOOL=dlltool
15126+
15127+
15128+
15129+
15130+
15131+
15132+
15133+
15134+
15135+
15136+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
15137+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
15138+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
15139+ $as_echo_n "(cached) " >&6
15140+else
15141+ lt_cv_sharedlib_from_linklib_cmd='unknown'
15142+
15143+case $host_os in
15144+cygwin* | mingw* | pw32* | cegcc*)
15145+ # two different shell functions defined in ltmain.sh
15146+ # decide which to use based on capabilities of $DLLTOOL
15147+ case `$DLLTOOL --help 2>&1` in
15148+ *--identify-strict*)
15149+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
15150+ ;;
15151+ *)
15152+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
15153+ ;;
15154+ esac
15155+ ;;
15156+*)
15157+ # fallback: assume linklib IS sharedlib
15158+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
15159+ ;;
15160+esac
15161+
15162+fi
15163+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
15164+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
15165+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
15166+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
15167+
15168+
15169+
15170+
15171+
15172+
15173+
15174+if test -n "$ac_tool_prefix"; then
15175+ for ac_prog in ar
15176+ do
15177+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
15178+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
15179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15180 $as_echo_n "checking for $ac_word... " >&6; }
15181 if test "${ac_cv_prog_AR+set}" = set; then :
15182@@ -6218,7 +6472,7 @@ do
15183 test -z "$as_dir" && as_dir=.
15184 for ac_exec_ext in '' $ac_executable_extensions; do
15185 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15186- ac_cv_prog_AR="${ac_tool_prefix}ar"
15187+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
15188 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15189 break 2
15190 fi
15191@@ -6238,11 +6492,15 @@ $as_echo "no" >&6; }
15192 fi
15193
15194
15195+ test -n "$AR" && break
15196+ done
15197 fi
15198-if test -z "$ac_cv_prog_AR"; then
15199+if test -z "$AR"; then
15200 ac_ct_AR=$AR
15201- # Extract the first word of "ar", so it can be a program name with args.
15202-set dummy ar; ac_word=$2
15203+ for ac_prog in ar
15204+do
15205+ # Extract the first word of "$ac_prog", so it can be a program name with args.
15206+set dummy $ac_prog; ac_word=$2
15207 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15208 $as_echo_n "checking for $ac_word... " >&6; }
15209 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
15210@@ -6258,7 +6516,7 @@ do
15211 test -z "$as_dir" && as_dir=.
15212 for ac_exec_ext in '' $ac_executable_extensions; do
15213 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15214- ac_cv_prog_ac_ct_AR="ar"
15215+ ac_cv_prog_ac_ct_AR="$ac_prog"
15216 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15217 break 2
15218 fi
15219@@ -6277,6 +6535,10 @@ else
15220 $as_echo "no" >&6; }
15221 fi
15222
15223+
15224+ test -n "$ac_ct_AR" && break
15225+done
15226+
15227 if test "x$ac_ct_AR" = x; then
15228 AR="false"
15229 else
15230@@ -6288,12 +6550,10 @@ ac_tool_warned=yes ;;
15231 esac
15232 AR=$ac_ct_AR
15233 fi
15234-else
15235- AR="$ac_cv_prog_AR"
15236 fi
15237
15238-test -z "$AR" && AR=ar
15239-test -z "$AR_FLAGS" && AR_FLAGS=cru
15240+: ${AR=ar}
15241+: ${AR_FLAGS=cru}
15242
15243
15244
15245@@ -6305,6 +6565,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
15246
15247
15248
15249+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
15250+$as_echo_n "checking for archiver @FILE support... " >&6; }
15251+if test "${lt_cv_ar_at_file+set}" = set; then :
15252+ $as_echo_n "(cached) " >&6
15253+else
15254+ lt_cv_ar_at_file=no
15255+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15256+/* end confdefs.h. */
15257+
15258+int
15259+main ()
15260+{
15261+
15262+ ;
15263+ return 0;
15264+}
15265+_ACEOF
15266+if ac_fn_c_try_compile "$LINENO"; then :
15267+ echo conftest.$ac_objext > conftest.lst
15268+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
15269+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15270+ (eval $lt_ar_try) 2>&5
15271+ ac_status=$?
15272+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15273+ test $ac_status = 0; }
15274+ if test "$ac_status" -eq 0; then
15275+ # Ensure the archiver fails upon bogus file names.
15276+ rm -f conftest.$ac_objext libconftest.a
15277+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15278+ (eval $lt_ar_try) 2>&5
15279+ ac_status=$?
15280+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15281+ test $ac_status = 0; }
15282+ if test "$ac_status" -ne 0; then
15283+ lt_cv_ar_at_file=@
15284+ fi
15285+ fi
15286+ rm -f conftest.* libconftest.a
15287+
15288+fi
15289+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15290+
15291+fi
15292+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
15293+$as_echo "$lt_cv_ar_at_file" >&6; }
15294+
15295+if test "x$lt_cv_ar_at_file" = xno; then
15296+ archiver_list_spec=
15297+else
15298+ archiver_list_spec=$lt_cv_ar_at_file
15299+fi
15300+
15301+
15302+
15303+
15304+
15305+
15306+
15307 if test -n "$ac_tool_prefix"; then
15308 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
15309 set dummy ${ac_tool_prefix}strip; ac_word=$2
15310@@ -6639,8 +6957,8 @@ esac
15311 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15312
15313 # Transform an extracted symbol line into symbol name and symbol address
15314-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15315-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'"
15316+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15317+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'"
15318
15319 # Handle CRLF in mingw tool chain
15320 opt_cr=
15321@@ -6676,6 +6994,7 @@ for ac_symprfx in "" "_"; do
15322 else
15323 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
15324 fi
15325+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
15326
15327 # Check to see that the pipe works correctly.
15328 pipe_works=no
15329@@ -6717,6 +7036,18 @@ _LT_EOF
15330 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
15331 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
15332 cat <<_LT_EOF > conftest.$ac_ext
15333+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
15334+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
15335+/* DATA imports from DLLs on WIN32 con't be const, because runtime
15336+ relocations are performed -- see ld's documentation on pseudo-relocs. */
15337+# define LT_DLSYM_CONST
15338+#elif defined(__osf__)
15339+/* This system does not cope well with relocations in const data. */
15340+# define LT_DLSYM_CONST
15341+#else
15342+# define LT_DLSYM_CONST const
15343+#endif
15344+
15345 #ifdef __cplusplus
15346 extern "C" {
15347 #endif
15348@@ -6728,7 +7059,7 @@ _LT_EOF
15349 cat <<_LT_EOF >> conftest.$ac_ext
15350
15351 /* The mapping between symbol names and symbols. */
15352-const struct {
15353+LT_DLSYM_CONST struct {
15354 const char *name;
15355 void *address;
15356 }
15357@@ -6754,8 +7085,8 @@ static const void *lt_preloaded_setup()
15358 _LT_EOF
15359 # Now try linking the two files.
15360 mv conftest.$ac_objext conftstm.$ac_objext
15361- lt_save_LIBS="$LIBS"
15362- lt_save_CFLAGS="$CFLAGS"
15363+ lt_globsym_save_LIBS=$LIBS
15364+ lt_globsym_save_CFLAGS=$CFLAGS
15365 LIBS="conftstm.$ac_objext"
15366 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
15367 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
15368@@ -6765,8 +7096,8 @@ _LT_EOF
15369 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
15370 pipe_works=yes
15371 fi
15372- LIBS="$lt_save_LIBS"
15373- CFLAGS="$lt_save_CFLAGS"
15374+ LIBS=$lt_globsym_save_LIBS
15375+ CFLAGS=$lt_globsym_save_CFLAGS
15376 else
15377 echo "cannot find nm_test_func in $nlist" >&5
15378 fi
15379@@ -6803,6 +7134,19 @@ else
15380 $as_echo "ok" >&6; }
15381 fi
15382
15383+# Response file support.
15384+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
15385+ nm_file_list_spec='@'
15386+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
15387+ nm_file_list_spec='@'
15388+fi
15389+
15390+
15391+
15392+
15393+
15394+
15395+
15396
15397
15398
15399@@ -6823,6 +7167,42 @@ fi
15400
15401
15402
15403+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
15404+$as_echo_n "checking for sysroot... " >&6; }
15405+
15406+# Check whether --with-libtool-sysroot was given.
15407+if test "${with_libtool_sysroot+set}" = set; then :
15408+ withval=$with_libtool_sysroot;
15409+else
15410+ with_libtool_sysroot=no
15411+fi
15412+
15413+
15414+lt_sysroot=
15415+case ${with_libtool_sysroot} in #(
15416+ yes)
15417+ if test "$GCC" = yes; then
15418+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
15419+ fi
15420+ ;; #(
15421+ /*)
15422+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
15423+ ;; #(
15424+ no|'')
15425+ ;; #(
15426+ *)
15427+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
15428+$as_echo "${with_libtool_sysroot}" >&6; }
15429+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
15430+ ;;
15431+esac
15432+
15433+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
15434+$as_echo "${lt_sysroot:-no}" >&6; }
15435+
15436+
15437+
15438+
15439
15440 # Check whether --enable-libtool-lock was given.
15441 if test "${enable_libtool_lock+set}" = set; then :
15442@@ -7017,6 +7397,123 @@ esac
15443
15444 need_locks="$enable_libtool_lock"
15445
15446+if test -n "$ac_tool_prefix"; then
15447+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
15448+set dummy ${ac_tool_prefix}mt; ac_word=$2
15449+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15450+$as_echo_n "checking for $ac_word... " >&6; }
15451+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
15452+ $as_echo_n "(cached) " >&6
15453+else
15454+ if test -n "$MANIFEST_TOOL"; then
15455+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
15456+else
15457+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15458+for as_dir in $PATH
15459+do
15460+ IFS=$as_save_IFS
15461+ test -z "$as_dir" && as_dir=.
15462+ for ac_exec_ext in '' $ac_executable_extensions; do
15463+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15464+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
15465+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15466+ break 2
15467+ fi
15468+done
15469+ done
15470+IFS=$as_save_IFS
15471+
15472+fi
15473+fi
15474+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
15475+if test -n "$MANIFEST_TOOL"; then
15476+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
15477+$as_echo "$MANIFEST_TOOL" >&6; }
15478+else
15479+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15480+$as_echo "no" >&6; }
15481+fi
15482+
15483+
15484+fi
15485+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
15486+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
15487+ # Extract the first word of "mt", so it can be a program name with args.
15488+set dummy mt; ac_word=$2
15489+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15490+$as_echo_n "checking for $ac_word... " >&6; }
15491+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
15492+ $as_echo_n "(cached) " >&6
15493+else
15494+ if test -n "$ac_ct_MANIFEST_TOOL"; then
15495+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
15496+else
15497+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15498+for as_dir in $PATH
15499+do
15500+ IFS=$as_save_IFS
15501+ test -z "$as_dir" && as_dir=.
15502+ for ac_exec_ext in '' $ac_executable_extensions; do
15503+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15504+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
15505+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15506+ break 2
15507+ fi
15508+done
15509+ done
15510+IFS=$as_save_IFS
15511+
15512+fi
15513+fi
15514+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
15515+if test -n "$ac_ct_MANIFEST_TOOL"; then
15516+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
15517+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
15518+else
15519+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15520+$as_echo "no" >&6; }
15521+fi
15522+
15523+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
15524+ MANIFEST_TOOL=":"
15525+ else
15526+ case $cross_compiling:$ac_tool_warned in
15527+yes:)
15528+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15529+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15530+ac_tool_warned=yes ;;
15531+esac
15532+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
15533+ fi
15534+else
15535+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
15536+fi
15537+
15538+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
15539+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
15540+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
15541+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
15542+ $as_echo_n "(cached) " >&6
15543+else
15544+ lt_cv_path_mainfest_tool=no
15545+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
15546+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
15547+ cat conftest.err >&5
15548+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
15549+ lt_cv_path_mainfest_tool=yes
15550+ fi
15551+ rm -f conftest*
15552+fi
15553+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
15554+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
15555+if test "x$lt_cv_path_mainfest_tool" != xyes; then
15556+ MANIFEST_TOOL=:
15557+fi
15558+
15559+
15560+
15561+
15562+
15563
15564 case $host_os in
15565 rhapsody* | darwin*)
15566@@ -7580,6 +8077,8 @@ _LT_EOF
15567 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
15568 echo "$AR cru libconftest.a conftest.o" >&5
15569 $AR cru libconftest.a conftest.o 2>&5
15570+ echo "$RANLIB libconftest.a" >&5
15571+ $RANLIB libconftest.a 2>&5
15572 cat > conftest.c << _LT_EOF
15573 int main() { return 0;}
15574 _LT_EOF
15575@@ -7775,7 +8274,8 @@ fi
15576 LIBTOOL_DEPS="$ltmain"
15577
15578 # Always use our own libtool.
15579-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
15580+LIBTOOL='$(SHELL) $(top_builddir)'
15581+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
15582
15583
15584
15585@@ -7864,7 +8364,7 @@ aix3*)
15586 esac
15587
15588 # Global variables:
15589-ofile=libtool
15590+ofile=${host_alias}-libtool
15591 can_build_shared=yes
15592
15593 # All known linkers require a `.a' archive for static linking (except MSVC,
15594@@ -8162,8 +8662,6 @@ fi
15595 lt_prog_compiler_pic=
15596 lt_prog_compiler_static=
15597
15598-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15599-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15600
15601 if test "$GCC" = yes; then
15602 lt_prog_compiler_wl='-Wl,'
15603@@ -8328,6 +8826,12 @@ $as_echo_n "checking for $compiler optio
15604 lt_prog_compiler_pic='--shared'
15605 lt_prog_compiler_static='--static'
15606 ;;
15607+ nagfor*)
15608+ # NAG Fortran compiler
15609+ lt_prog_compiler_wl='-Wl,-Wl,,'
15610+ lt_prog_compiler_pic='-PIC'
15611+ lt_prog_compiler_static='-Bstatic'
15612+ ;;
15613 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
15614 # Portland Group compilers (*not* the Pentium gcc compiler,
15615 # which looks to be a dead project)
15616@@ -8390,7 +8894,7 @@ $as_echo_n "checking for $compiler optio
15617 lt_prog_compiler_pic='-KPIC'
15618 lt_prog_compiler_static='-Bstatic'
15619 case $cc_basename in
15620- f77* | f90* | f95*)
15621+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
15622 lt_prog_compiler_wl='-Qoption ld ';;
15623 *)
15624 lt_prog_compiler_wl='-Wl,';;
15625@@ -8447,13 +8951,17 @@ case $host_os in
15626 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
15627 ;;
15628 esac
15629-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
15630-$as_echo "$lt_prog_compiler_pic" >&6; }
15631-
15632-
15633-
15634-
15635
15636+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15637+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15638+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
15639+ $as_echo_n "(cached) " >&6
15640+else
15641+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
15642+fi
15643+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
15644+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
15645+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
15646
15647 #
15648 # Check to make sure the PIC flag actually works.
15649@@ -8514,6 +9022,11 @@ fi
15650
15651
15652
15653+
15654+
15655+
15656+
15657+
15658 #
15659 # Check to make sure the static flag actually works.
15660 #
15661@@ -8864,7 +9377,8 @@ _LT_EOF
15662 allow_undefined_flag=unsupported
15663 always_export_symbols=no
15664 enable_shared_with_static_runtimes=yes
15665- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15666+ 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'
15667+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
15668
15669 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
15670 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15671@@ -8912,7 +9426,7 @@ _LT_EOF
15672 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
15673 && test "$tmp_diet" = no
15674 then
15675- tmp_addflag=
15676+ tmp_addflag=' $pic_flag'
15677 tmp_sharedflag='-shared'
15678 case $cc_basename,$host_cpu in
15679 pgcc*) # Portland Group C compiler
15680@@ -8963,12 +9477,12 @@ _LT_EOF
15681 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
15682 hardcode_libdir_flag_spec=
15683 hardcode_libdir_flag_spec_ld='-rpath $libdir'
15684- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
15685+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
15686 if test "x$supports_anon_versioning" = xyes; then
15687 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
15688 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
15689 echo "local: *; };" >> $output_objdir/$libname.ver~
15690- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15691+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15692 fi
15693 ;;
15694 esac
15695@@ -8982,8 +9496,8 @@ _LT_EOF
15696 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15697 wlarc=
15698 else
15699- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15700- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15701+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15702+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15703 fi
15704 ;;
15705
15706@@ -9001,8 +9515,8 @@ _LT_EOF
15707
15708 _LT_EOF
15709 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15710- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15711- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15712+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15713+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15714 else
15715 ld_shlibs=no
15716 fi
15717@@ -9048,8 +9562,8 @@ _LT_EOF
15718
15719 *)
15720 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15721- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15722- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15723+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15724+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15725 else
15726 ld_shlibs=no
15727 fi
15728@@ -9179,7 +9693,13 @@ _LT_EOF
15729 allow_undefined_flag='-berok'
15730 # Determine the default libpath from the value encoded in an
15731 # empty executable.
15732- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15733+ if test "${lt_cv_aix_libpath+set}" = set; then
15734+ aix_libpath=$lt_cv_aix_libpath
15735+else
15736+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15737+ $as_echo_n "(cached) " >&6
15738+else
15739+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15740 /* end confdefs.h. */
15741
15742 int
15743@@ -9192,22 +9712,29 @@ main ()
15744 _ACEOF
15745 if ac_fn_c_try_link "$LINENO"; then :
15746
15747-lt_aix_libpath_sed='
15748- /Import File Strings/,/^$/ {
15749- /^0/ {
15750- s/^0 *\(.*\)$/\1/
15751- p
15752- }
15753- }'
15754-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15755-# Check for a 64-bit object if we didn't find anything.
15756-if test -z "$aix_libpath"; then
15757- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15758-fi
15759+ lt_aix_libpath_sed='
15760+ /Import File Strings/,/^$/ {
15761+ /^0/ {
15762+ s/^0 *\([^ ]*\) *$/\1/
15763+ p
15764+ }
15765+ }'
15766+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15767+ # Check for a 64-bit object if we didn't find anything.
15768+ if test -z "$lt_cv_aix_libpath_"; then
15769+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15770+ fi
15771 fi
15772 rm -f core conftest.err conftest.$ac_objext \
15773 conftest$ac_exeext conftest.$ac_ext
15774-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15775+ if test -z "$lt_cv_aix_libpath_"; then
15776+ lt_cv_aix_libpath_="/usr/lib:/lib"
15777+ fi
15778+
15779+fi
15780+
15781+ aix_libpath=$lt_cv_aix_libpath_
15782+fi
15783
15784 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15785 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"
15786@@ -9219,7 +9746,13 @@ if test -z "$aix_libpath"; then aix_libp
15787 else
15788 # Determine the default libpath from the value encoded in an
15789 # empty executable.
15790- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15791+ if test "${lt_cv_aix_libpath+set}" = set; then
15792+ aix_libpath=$lt_cv_aix_libpath
15793+else
15794+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15795+ $as_echo_n "(cached) " >&6
15796+else
15797+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15798 /* end confdefs.h. */
15799
15800 int
15801@@ -9232,22 +9765,29 @@ main ()
15802 _ACEOF
15803 if ac_fn_c_try_link "$LINENO"; then :
15804
15805-lt_aix_libpath_sed='
15806- /Import File Strings/,/^$/ {
15807- /^0/ {
15808- s/^0 *\(.*\)$/\1/
15809- p
15810- }
15811- }'
15812-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15813-# Check for a 64-bit object if we didn't find anything.
15814-if test -z "$aix_libpath"; then
15815- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15816-fi
15817+ lt_aix_libpath_sed='
15818+ /Import File Strings/,/^$/ {
15819+ /^0/ {
15820+ s/^0 *\([^ ]*\) *$/\1/
15821+ p
15822+ }
15823+ }'
15824+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15825+ # Check for a 64-bit object if we didn't find anything.
15826+ if test -z "$lt_cv_aix_libpath_"; then
15827+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15828+ fi
15829 fi
15830 rm -f core conftest.err conftest.$ac_objext \
15831 conftest$ac_exeext conftest.$ac_ext
15832-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15833+ if test -z "$lt_cv_aix_libpath_"; then
15834+ lt_cv_aix_libpath_="/usr/lib:/lib"
15835+ fi
15836+
15837+fi
15838+
15839+ aix_libpath=$lt_cv_aix_libpath_
15840+fi
15841
15842 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15843 # Warning - without using the other run time loading flags,
15844@@ -9292,20 +9832,63 @@ if test -z "$aix_libpath"; then aix_libp
15845 # Microsoft Visual C++.
15846 # hardcode_libdir_flag_spec is actually meaningless, as there is
15847 # no search path for DLLs.
15848- hardcode_libdir_flag_spec=' '
15849- allow_undefined_flag=unsupported
15850- # Tell ltmain to make .lib files, not .a files.
15851- libext=lib
15852- # Tell ltmain to make .dll files, not .so files.
15853- shrext_cmds=".dll"
15854- # FIXME: Setting linknames here is a bad hack.
15855- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15856- # The linker will automatically build a .lib file if we build a DLL.
15857- old_archive_from_new_cmds='true'
15858- # FIXME: Should let the user specify the lib program.
15859- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15860- fix_srcfile_path='`cygpath -w "$srcfile"`'
15861- enable_shared_with_static_runtimes=yes
15862+ case $cc_basename in
15863+ cl*)
15864+ # Native MSVC
15865+ hardcode_libdir_flag_spec=' '
15866+ allow_undefined_flag=unsupported
15867+ always_export_symbols=yes
15868+ file_list_spec='@'
15869+ # Tell ltmain to make .lib files, not .a files.
15870+ libext=lib
15871+ # Tell ltmain to make .dll files, not .so files.
15872+ shrext_cmds=".dll"
15873+ # FIXME: Setting linknames here is a bad hack.
15874+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
15875+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
15876+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
15877+ else
15878+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
15879+ fi~
15880+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
15881+ linknames='
15882+ # The linker will not automatically build a static lib if we build a DLL.
15883+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
15884+ enable_shared_with_static_runtimes=yes
15885+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15886+ # Don't use ranlib
15887+ old_postinstall_cmds='chmod 644 $oldlib'
15888+ postlink_cmds='lt_outputfile="@OUTPUT@"~
15889+ lt_tool_outputfile="@TOOL_OUTPUT@"~
15890+ case $lt_outputfile in
15891+ *.exe|*.EXE) ;;
15892+ *)
15893+ lt_outputfile="$lt_outputfile.exe"
15894+ lt_tool_outputfile="$lt_tool_outputfile.exe"
15895+ ;;
15896+ esac~
15897+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
15898+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
15899+ $RM "$lt_outputfile.manifest";
15900+ fi'
15901+ ;;
15902+ *)
15903+ # Assume MSVC wrapper
15904+ hardcode_libdir_flag_spec=' '
15905+ allow_undefined_flag=unsupported
15906+ # Tell ltmain to make .lib files, not .a files.
15907+ libext=lib
15908+ # Tell ltmain to make .dll files, not .so files.
15909+ shrext_cmds=".dll"
15910+ # FIXME: Setting linknames here is a bad hack.
15911+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15912+ # The linker will automatically build a .lib file if we build a DLL.
15913+ old_archive_from_new_cmds='true'
15914+ # FIXME: Should let the user specify the lib program.
15915+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15916+ enable_shared_with_static_runtimes=yes
15917+ ;;
15918+ esac
15919 ;;
15920
15921 darwin* | rhapsody*)
15922@@ -9370,7 +9953,7 @@ if test -z "$aix_libpath"; then aix_libp
15923
15924 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15925 freebsd* | dragonfly*)
15926- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
15927+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
15928 hardcode_libdir_flag_spec='-R$libdir'
15929 hardcode_direct=yes
15930 hardcode_shlibpath_var=no
15931@@ -9378,7 +9961,7 @@ if test -z "$aix_libpath"; then aix_libp
15932
15933 hpux9*)
15934 if test "$GCC" = yes; then
15935- 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'
15936+ 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'
15937 else
15938 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'
15939 fi
15940@@ -9394,7 +9977,7 @@ if test -z "$aix_libpath"; then aix_libp
15941
15942 hpux10*)
15943 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
15944- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15945+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15946 else
15947 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
15948 fi
15949@@ -9418,10 +10001,10 @@ if test -z "$aix_libpath"; then aix_libp
15950 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
15951 ;;
15952 ia64*)
15953- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15954+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15955 ;;
15956 *)
15957- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15958+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15959 ;;
15960 esac
15961 else
15962@@ -9500,23 +10083,36 @@ fi
15963
15964 irix5* | irix6* | nonstopux*)
15965 if test "$GCC" = yes; then
15966- 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'
15967+ 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'
15968 # Try to use the -exported_symbol ld option, if it does not
15969 # work, assume that -exports_file does not work either and
15970 # implicitly export all symbols.
15971- save_LDFLAGS="$LDFLAGS"
15972- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
15973- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15974+ # This should be the same for all languages, so no per-tag cache variable.
15975+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
15976+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
15977+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
15978+ $as_echo_n "(cached) " >&6
15979+else
15980+ save_LDFLAGS="$LDFLAGS"
15981+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
15982+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15983 /* end confdefs.h. */
15984-int foo(void) {}
15985+int foo (void) { return 0; }
15986 _ACEOF
15987 if ac_fn_c_try_link "$LINENO"; then :
15988- 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'
15989-
15990+ lt_cv_irix_exported_symbol=yes
15991+else
15992+ lt_cv_irix_exported_symbol=no
15993 fi
15994 rm -f core conftest.err conftest.$ac_objext \
15995 conftest$ac_exeext conftest.$ac_ext
15996- LDFLAGS="$save_LDFLAGS"
15997+ LDFLAGS="$save_LDFLAGS"
15998+fi
15999+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
16000+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
16001+ if test "$lt_cv_irix_exported_symbol" = yes; then
16002+ 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'
16003+ fi
16004 else
16005 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'
16006 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'
16007@@ -9601,7 +10197,7 @@ rm -f core conftest.err conftest.$ac_obj
16008 osf4* | osf5*) # as osf3* with the addition of -msym flag
16009 if test "$GCC" = yes; then
16010 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
16011- 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'
16012+ 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'
16013 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
16014 else
16015 allow_undefined_flag=' -expect_unresolved \*'
16016@@ -9620,9 +10216,9 @@ rm -f core conftest.err conftest.$ac_obj
16017 no_undefined_flag=' -z defs'
16018 if test "$GCC" = yes; then
16019 wlarc='${wl}'
16020- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16021+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16022 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
16023- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
16024+ $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'
16025 else
16026 case `$CC -V 2>&1` in
16027 *"Compilers 5.0"*)
16028@@ -10198,8 +10794,9 @@ cygwin* | mingw* | pw32* | cegcc*)
16029 need_version=no
16030 need_lib_prefix=no
16031
16032- case $GCC,$host_os in
16033- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
16034+ case $GCC,$cc_basename in
16035+ yes,*)
16036+ # gcc
16037 library_names_spec='$libname.dll.a'
16038 # DLL is installed to $(libdir)/../bin by postinstall_cmds
16039 postinstall_cmds='base_file=`basename \${file}`~
16040@@ -10232,13 +10829,71 @@ cygwin* | mingw* | pw32* | cegcc*)
16041 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16042 ;;
16043 esac
16044+ dynamic_linker='Win32 ld.exe'
16045+ ;;
16046+
16047+ *,cl*)
16048+ # Native MSVC
16049+ libname_spec='$name'
16050+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16051+ library_names_spec='${libname}.dll.lib'
16052+
16053+ case $build_os in
16054+ mingw*)
16055+ sys_lib_search_path_spec=
16056+ lt_save_ifs=$IFS
16057+ IFS=';'
16058+ for lt_path in $LIB
16059+ do
16060+ IFS=$lt_save_ifs
16061+ # Let DOS variable expansion print the short 8.3 style file name.
16062+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
16063+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
16064+ done
16065+ IFS=$lt_save_ifs
16066+ # Convert to MSYS style.
16067+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
16068+ ;;
16069+ cygwin*)
16070+ # Convert to unix form, then to dos form, then back to unix form
16071+ # but this time dos style (no spaces!) so that the unix form looks
16072+ # like /cygdrive/c/PROGRA~1:/cygdr...
16073+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
16074+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
16075+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16076+ ;;
16077+ *)
16078+ sys_lib_search_path_spec="$LIB"
16079+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
16080+ # It is most probably a Windows format PATH.
16081+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
16082+ else
16083+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16084+ fi
16085+ # FIXME: find the short name or the path components, as spaces are
16086+ # common. (e.g. "Program Files" -> "PROGRA~1")
16087+ ;;
16088+ esac
16089+
16090+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
16091+ postinstall_cmds='base_file=`basename \${file}`~
16092+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
16093+ dldir=$destdir/`dirname \$dlpath`~
16094+ test -d \$dldir || mkdir -p \$dldir~
16095+ $install_prog $dir/$dlname \$dldir/$dlname'
16096+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
16097+ dlpath=$dir/\$dldll~
16098+ $RM \$dlpath'
16099+ shlibpath_overrides_runpath=yes
16100+ dynamic_linker='Win32 link.exe'
16101 ;;
16102
16103 *)
16104+ # Assume MSVC wrapper
16105 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
16106+ dynamic_linker='Win32 ld.exe'
16107 ;;
16108 esac
16109- dynamic_linker='Win32 ld.exe'
16110 # FIXME: first we should search . and the directory the executable is in
16111 shlibpath_var=PATH
16112 ;;
16113@@ -10334,7 +10989,7 @@ haiku*)
16114 soname_spec='${libname}${release}${shared_ext}$major'
16115 shlibpath_var=LIBRARY_PATH
16116 shlibpath_overrides_runpath=yes
16117- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
16118+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
16119 hardcode_into_libs=yes
16120 ;;
16121
16122@@ -11130,7 +11785,7 @@ else
16123 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16124 lt_status=$lt_dlunknown
16125 cat > conftest.$ac_ext <<_LT_EOF
16126-#line 11128 "configure"
16127+#line $LINENO "configure"
16128 #include "confdefs.h"
16129
16130 #if HAVE_DLFCN_H
16131@@ -11174,10 +11829,10 @@ else
16132 /* When -fvisbility=hidden is used, assume the code has been annotated
16133 correspondingly for the symbols needed. */
16134 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16135-void fnord () __attribute__((visibility("default")));
16136+int fnord () __attribute__((visibility("default")));
16137 #endif
16138
16139-void fnord () { int i=42; }
16140+int fnord () { return 42; }
16141 int main ()
16142 {
16143 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16144@@ -11236,7 +11891,7 @@ else
16145 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16146 lt_status=$lt_dlunknown
16147 cat > conftest.$ac_ext <<_LT_EOF
16148-#line 11234 "configure"
16149+#line $LINENO "configure"
16150 #include "confdefs.h"
16151
16152 #if HAVE_DLFCN_H
16153@@ -11280,10 +11935,10 @@ else
16154 /* When -fvisbility=hidden is used, assume the code has been annotated
16155 correspondingly for the symbols needed. */
16156 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16157-void fnord () __attribute__((visibility("default")));
16158+int fnord () __attribute__((visibility("default")));
16159 #endif
16160
16161-void fnord () { int i=42; }
16162+int fnord () { return 42; }
16163 int main ()
16164 {
16165 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16166@@ -12825,13 +13480,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
16167 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
16168 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
16169 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
16170+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
16171+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
16172 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
16173 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
16174 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
16175 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
16176 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
16177+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
16178+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
16179+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
16180+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
16181 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
16182 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
16183+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
16184 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
16185 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
16186 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16187@@ -12846,14 +13508,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
16188 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
16189 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
16190 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"`'
16191+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
16192+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
16193 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
16194 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
16195 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
16196-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16197 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
16198+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16199 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
16200 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
16201 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
16202+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
16203 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
16204 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
16205 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
16206@@ -12886,12 +13551,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
16207 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
16208 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
16209 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
16210-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
16211 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
16212 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
16213 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
16214 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
16215 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
16216+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
16217 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
16218 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
16219 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
16220@@ -12946,8 +13611,13 @@ reload_flag \
16221 OBJDUMP \
16222 deplibs_check_method \
16223 file_magic_cmd \
16224+file_magic_glob \
16225+want_nocaseglob \
16226+DLLTOOL \
16227+sharedlib_from_linklib_cmd \
16228 AR \
16229 AR_FLAGS \
16230+archiver_list_spec \
16231 STRIP \
16232 RANLIB \
16233 CC \
16234@@ -12957,12 +13627,14 @@ lt_cv_sys_global_symbol_pipe \
16235 lt_cv_sys_global_symbol_to_cdecl \
16236 lt_cv_sys_global_symbol_to_c_name_address \
16237 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
16238+nm_file_list_spec \
16239 lt_prog_compiler_no_builtin_flag \
16240-lt_prog_compiler_wl \
16241 lt_prog_compiler_pic \
16242+lt_prog_compiler_wl \
16243 lt_prog_compiler_static \
16244 lt_cv_prog_compiler_c_o \
16245 need_locks \
16246+MANIFEST_TOOL \
16247 DSYMUTIL \
16248 NMEDIT \
16249 LIPO \
16250@@ -12978,7 +13650,6 @@ no_undefined_flag \
16251 hardcode_libdir_flag_spec \
16252 hardcode_libdir_flag_spec_ld \
16253 hardcode_libdir_separator \
16254-fix_srcfile_path \
16255 exclude_expsyms \
16256 include_expsyms \
16257 file_list_spec \
16258@@ -13014,6 +13685,7 @@ module_cmds \
16259 module_expsym_cmds \
16260 export_symbols_cmds \
16261 prelink_cmds \
16262+postlink_cmds \
16263 postinstall_cmds \
16264 postuninstall_cmds \
16265 finish_cmds \
16266@@ -13770,7 +14442,8 @@ $as_echo X"$file" |
16267 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
16268 #
16269 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
16270-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
16271+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
16272+# Inc.
16273 # Written by Gordon Matzigkeit, 1996
16274 #
16275 # This file is part of GNU Libtool.
16276@@ -13873,19 +14546,42 @@ SP2NL=$lt_lt_SP2NL
16277 # turn newlines into spaces.
16278 NL2SP=$lt_lt_NL2SP
16279
16280+# convert \$build file names to \$host format.
16281+to_host_file_cmd=$lt_cv_to_host_file_cmd
16282+
16283+# convert \$build files to toolchain format.
16284+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16285+
16286 # An object symbol dumper.
16287 OBJDUMP=$lt_OBJDUMP
16288
16289 # Method to check whether dependent libraries are shared objects.
16290 deplibs_check_method=$lt_deplibs_check_method
16291
16292-# Command to use when deplibs_check_method == "file_magic".
16293+# Command to use when deplibs_check_method = "file_magic".
16294 file_magic_cmd=$lt_file_magic_cmd
16295
16296+# How to find potential files when deplibs_check_method = "file_magic".
16297+file_magic_glob=$lt_file_magic_glob
16298+
16299+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
16300+want_nocaseglob=$lt_want_nocaseglob
16301+
16302+# DLL creation program.
16303+DLLTOOL=$lt_DLLTOOL
16304+
16305+# Command to associate shared and link libraries.
16306+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
16307+
16308 # The archiver.
16309 AR=$lt_AR
16310+
16311+# Flags to create an archive.
16312 AR_FLAGS=$lt_AR_FLAGS
16313
16314+# How to feed a file listing to the archiver.
16315+archiver_list_spec=$lt_archiver_list_spec
16316+
16317 # A symbol stripping program.
16318 STRIP=$lt_STRIP
16319
16320@@ -13915,6 +14611,12 @@ global_symbol_to_c_name_address=$lt_lt_c
16321 # Transform the output of nm in a C name address pair when lib prefix is needed.
16322 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
16323
16324+# Specify filename containing input files for \$NM.
16325+nm_file_list_spec=$lt_nm_file_list_spec
16326+
16327+# The root where to search for dependent libraries,and in which our libraries should be installed.
16328+lt_sysroot=$lt_sysroot
16329+
16330 # The name of the directory that contains temporary libtool files.
16331 objdir=$objdir
16332
16333@@ -13924,6 +14626,9 @@ MAGIC_CMD=$MAGIC_CMD
16334 # Must we lock files when doing compilation?
16335 need_locks=$lt_need_locks
16336
16337+# Manifest tool.
16338+MANIFEST_TOOL=$lt_MANIFEST_TOOL
16339+
16340 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
16341 DSYMUTIL=$lt_DSYMUTIL
16342
16343@@ -14038,12 +14743,12 @@ with_gcc=$GCC
16344 # Compiler flag to turn off builtin functions.
16345 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
16346
16347-# How to pass a linker flag through the compiler.
16348-wl=$lt_lt_prog_compiler_wl
16349-
16350 # Additional compiler flags for building library objects.
16351 pic_flag=$lt_lt_prog_compiler_pic
16352
16353+# How to pass a linker flag through the compiler.
16354+wl=$lt_lt_prog_compiler_wl
16355+
16356 # Compiler flag to prevent dynamic linking.
16357 link_static_flag=$lt_lt_prog_compiler_static
16358
16359@@ -14130,9 +14835,6 @@ inherit_rpath=$inherit_rpath
16360 # Whether libtool must link a program against all its dependency libraries.
16361 link_all_deplibs=$link_all_deplibs
16362
16363-# Fix the shell variable \$srcfile for the compiler.
16364-fix_srcfile_path=$lt_fix_srcfile_path
16365-
16366 # Set to "yes" if exported symbols are required.
16367 always_export_symbols=$always_export_symbols
16368
16369@@ -14148,6 +14850,9 @@ include_expsyms=$lt_include_expsyms
16370 # Commands necessary for linking programs (against libraries) with templates.
16371 prelink_cmds=$lt_prelink_cmds
16372
16373+# Commands necessary for finishing linking programs.
16374+postlink_cmds=$lt_postlink_cmds
16375+
16376 # Specify filename containing input files.
16377 file_list_spec=$lt_file_list_spec
16378
16379@@ -14180,210 +14885,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
16380 # if finds mixed CR/LF and LF-only lines. Since sed operates in
16381 # text mode, it properly converts lines to CR/LF. This bash problem
16382 # is reportedly fixed, but why not run on old versions too?
16383- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
16384- || (rm -f "$cfgfile"; exit 1)
16385-
16386- case $xsi_shell in
16387- yes)
16388- cat << \_LT_EOF >> "$cfgfile"
16389-
16390-# func_dirname file append nondir_replacement
16391-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16392-# otherwise set result to NONDIR_REPLACEMENT.
16393-func_dirname ()
16394-{
16395- case ${1} in
16396- */*) func_dirname_result="${1%/*}${2}" ;;
16397- * ) func_dirname_result="${3}" ;;
16398- esac
16399-}
16400-
16401-# func_basename file
16402-func_basename ()
16403-{
16404- func_basename_result="${1##*/}"
16405-}
16406-
16407-# func_dirname_and_basename file append nondir_replacement
16408-# perform func_basename and func_dirname in a single function
16409-# call:
16410-# dirname: Compute the dirname of FILE. If nonempty,
16411-# add APPEND to the result, otherwise set result
16412-# to NONDIR_REPLACEMENT.
16413-# value returned in "$func_dirname_result"
16414-# basename: Compute filename of FILE.
16415-# value retuned in "$func_basename_result"
16416-# Implementation must be kept synchronized with func_dirname
16417-# and func_basename. For efficiency, we do not delegate to
16418-# those functions but instead duplicate the functionality here.
16419-func_dirname_and_basename ()
16420-{
16421- case ${1} in
16422- */*) func_dirname_result="${1%/*}${2}" ;;
16423- * ) func_dirname_result="${3}" ;;
16424- esac
16425- func_basename_result="${1##*/}"
16426-}
16427-
16428-# func_stripname prefix suffix name
16429-# strip PREFIX and SUFFIX off of NAME.
16430-# PREFIX and SUFFIX must not contain globbing or regex special
16431-# characters, hashes, percent signs, but SUFFIX may contain a leading
16432-# dot (in which case that matches only a dot).
16433-func_stripname ()
16434-{
16435- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
16436- # positional parameters, so assign one to ordinary parameter first.
16437- func_stripname_result=${3}
16438- func_stripname_result=${func_stripname_result#"${1}"}
16439- func_stripname_result=${func_stripname_result%"${2}"}
16440-}
16441-
16442-# func_opt_split
16443-func_opt_split ()
16444-{
16445- func_opt_split_opt=${1%%=*}
16446- func_opt_split_arg=${1#*=}
16447-}
16448-
16449-# func_lo2o object
16450-func_lo2o ()
16451-{
16452- case ${1} in
16453- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
16454- *) func_lo2o_result=${1} ;;
16455- esac
16456-}
16457-
16458-# func_xform libobj-or-source
16459-func_xform ()
16460-{
16461- func_xform_result=${1%.*}.lo
16462-}
16463-
16464-# func_arith arithmetic-term...
16465-func_arith ()
16466-{
16467- func_arith_result=$(( $* ))
16468-}
16469-
16470-# func_len string
16471-# STRING may not start with a hyphen.
16472-func_len ()
16473-{
16474- func_len_result=${#1}
16475-}
16476-
16477-_LT_EOF
16478- ;;
16479- *) # Bourne compatible functions.
16480- cat << \_LT_EOF >> "$cfgfile"
16481-
16482-# func_dirname file append nondir_replacement
16483-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16484-# otherwise set result to NONDIR_REPLACEMENT.
16485-func_dirname ()
16486-{
16487- # Extract subdirectory from the argument.
16488- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
16489- if test "X$func_dirname_result" = "X${1}"; then
16490- func_dirname_result="${3}"
16491- else
16492- func_dirname_result="$func_dirname_result${2}"
16493- fi
16494-}
16495-
16496-# func_basename file
16497-func_basename ()
16498-{
16499- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
16500-}
16501-
16502-
16503-# func_stripname prefix suffix name
16504-# strip PREFIX and SUFFIX off of NAME.
16505-# PREFIX and SUFFIX must not contain globbing or regex special
16506-# characters, hashes, percent signs, but SUFFIX may contain a leading
16507-# dot (in which case that matches only a dot).
16508-# func_strip_suffix prefix name
16509-func_stripname ()
16510-{
16511- case ${2} in
16512- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
16513- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
16514- esac
16515-}
16516-
16517-# sed scripts:
16518-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
16519-my_sed_long_arg='1s/^-[^=]*=//'
16520-
16521-# func_opt_split
16522-func_opt_split ()
16523-{
16524- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
16525- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
16526-}
16527-
16528-# func_lo2o object
16529-func_lo2o ()
16530-{
16531- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
16532-}
16533-
16534-# func_xform libobj-or-source
16535-func_xform ()
16536-{
16537- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
16538-}
16539-
16540-# func_arith arithmetic-term...
16541-func_arith ()
16542-{
16543- func_arith_result=`expr "$@"`
16544-}
16545-
16546-# func_len string
16547-# STRING may not start with a hyphen.
16548-func_len ()
16549-{
16550- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
16551-}
16552-
16553-_LT_EOF
16554-esac
16555-
16556-case $lt_shell_append in
16557- yes)
16558- cat << \_LT_EOF >> "$cfgfile"
16559-
16560-# func_append var value
16561-# Append VALUE to the end of shell variable VAR.
16562-func_append ()
16563-{
16564- eval "$1+=\$2"
16565-}
16566-_LT_EOF
16567- ;;
16568- *)
16569- cat << \_LT_EOF >> "$cfgfile"
16570-
16571-# func_append var value
16572-# Append VALUE to the end of shell variable VAR.
16573-func_append ()
16574-{
16575- eval "$1=\$$1\$2"
16576-}
16577-
16578-_LT_EOF
16579- ;;
16580- esac
16581+ sed '$q' "$ltmain" >> "$cfgfile" \
16582+ || (rm -f "$cfgfile"; exit 1)
16583
16584+ if test x"$xsi_shell" = xyes; then
16585+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
16586+func_dirname ()\
16587+{\
16588+\ case ${1} in\
16589+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16590+\ * ) func_dirname_result="${3}" ;;\
16591+\ esac\
16592+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
16593+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16594+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16595+test 0 -eq $? || _lt_function_replace_fail=:
16596+
16597+
16598+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
16599+func_basename ()\
16600+{\
16601+\ func_basename_result="${1##*/}"\
16602+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
16603+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16604+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16605+test 0 -eq $? || _lt_function_replace_fail=:
16606+
16607+
16608+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
16609+func_dirname_and_basename ()\
16610+{\
16611+\ case ${1} in\
16612+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16613+\ * ) func_dirname_result="${3}" ;;\
16614+\ esac\
16615+\ func_basename_result="${1##*/}"\
16616+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
16617+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16618+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16619+test 0 -eq $? || _lt_function_replace_fail=:
16620+
16621+
16622+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
16623+func_stripname ()\
16624+{\
16625+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
16626+\ # positional parameters, so assign one to ordinary parameter first.\
16627+\ func_stripname_result=${3}\
16628+\ func_stripname_result=${func_stripname_result#"${1}"}\
16629+\ func_stripname_result=${func_stripname_result%"${2}"}\
16630+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
16631+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16632+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16633+test 0 -eq $? || _lt_function_replace_fail=:
16634+
16635+
16636+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
16637+func_split_long_opt ()\
16638+{\
16639+\ func_split_long_opt_name=${1%%=*}\
16640+\ func_split_long_opt_arg=${1#*=}\
16641+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
16642+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16643+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16644+test 0 -eq $? || _lt_function_replace_fail=:
16645+
16646+
16647+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
16648+func_split_short_opt ()\
16649+{\
16650+\ func_split_short_opt_arg=${1#??}\
16651+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
16652+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
16653+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16654+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16655+test 0 -eq $? || _lt_function_replace_fail=:
16656+
16657+
16658+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
16659+func_lo2o ()\
16660+{\
16661+\ case ${1} in\
16662+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
16663+\ *) func_lo2o_result=${1} ;;\
16664+\ esac\
16665+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
16666+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16667+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16668+test 0 -eq $? || _lt_function_replace_fail=:
16669+
16670+
16671+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
16672+func_xform ()\
16673+{\
16674+ func_xform_result=${1%.*}.lo\
16675+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
16676+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16677+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16678+test 0 -eq $? || _lt_function_replace_fail=:
16679+
16680+
16681+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
16682+func_arith ()\
16683+{\
16684+ func_arith_result=$(( $* ))\
16685+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
16686+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16687+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16688+test 0 -eq $? || _lt_function_replace_fail=:
16689+
16690+
16691+ sed -e '/^func_len ()$/,/^} # func_len /c\
16692+func_len ()\
16693+{\
16694+ func_len_result=${#1}\
16695+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
16696+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16697+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16698+test 0 -eq $? || _lt_function_replace_fail=:
16699+
16700+fi
16701+
16702+if test x"$lt_shell_append" = xyes; then
16703+ sed -e '/^func_append ()$/,/^} # func_append /c\
16704+func_append ()\
16705+{\
16706+ eval "${1}+=\\${2}"\
16707+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
16708+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16709+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16710+test 0 -eq $? || _lt_function_replace_fail=:
16711+
16712+
16713+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
16714+func_append_quoted ()\
16715+{\
16716+\ func_quote_for_eval "${2}"\
16717+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
16718+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
16719+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16720+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16721+test 0 -eq $? || _lt_function_replace_fail=:
16722+
16723+
16724+ # Save a `func_append' function call where possible by direct use of '+='
16725+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
16726+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16727+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16728+ test 0 -eq $? || _lt_function_replace_fail=:
16729+else
16730+ # Save a `func_append' function call even when '+=' is not available
16731+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
16732+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16733+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16734+ test 0 -eq $? || _lt_function_replace_fail=:
16735+fi
16736+
16737+if test x"$_lt_function_replace_fail" = x":"; then
16738+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
16739+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
16740+fi
16741
16742- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
16743- || (rm -f "$cfgfile"; exit 1)
16744
16745- mv -f "$cfgfile" "$ofile" ||
16746+ mv -f "$cfgfile" "$ofile" ||
16747 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
16748 chmod +x "$ofile"
16749
16750Index: binutils-2.21.1/ld/configure
16751===================================================================
16752--- binutils-2.21.1.orig/ld/configure
16753+++ binutils-2.21.1/ld/configure
16754@@ -644,8 +644,11 @@ OTOOL
16755 LIPO
16756 NMEDIT
16757 DSYMUTIL
16758+MANIFEST_TOOL
16759 RANLIB
16760+ac_ct_AR
16761 AR
16762+DLLTOOL
16763 OBJDUMP
16764 LN_S
16765 NM
16766@@ -783,6 +786,7 @@ enable_static
16767 with_pic
16768 enable_fast_install
16769 with_gnu_ld
16770+with_libtool_sysroot
16771 enable_libtool_lock
16772 enable_nls
16773 '
16774@@ -1447,6 +1451,8 @@ Optional Packages:
16775 --with-pic try to use only PIC/non-PIC objects [default=use
16776 both]
16777 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
16778+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
16779+ (or the compiler's sysroot if not specified).
16780
16781 Some influential environment variables:
16782 CC C compiler command
16783@@ -6081,8 +6087,8 @@ esac
16784
16785
16786
16787-macro_version='2.2.7a'
16788-macro_revision='1.3134'
16789+macro_version='2.4'
16790+macro_revision='1.3293'
16791
16792
16793
16794@@ -6122,7 +6128,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16795 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16796 $as_echo_n "checking how to print strings... " >&6; }
16797 # Test print first, because it will be a builtin if present.
16798-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
16799+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
16800 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16801 ECHO='print -r --'
16802 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16803@@ -6808,8 +6814,8 @@ $as_echo_n "checking whether the shell u
16804 # Try some XSI features
16805 xsi_shell=no
16806 ( _lt_dummy="a/b/c"
16807- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
16808- = c,a/b,, \
16809+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
16810+ = c,a/b,b/c, \
16811 && eval 'test $(( 1 + 1 )) -eq 2 \
16812 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16813 && xsi_shell=yes
16814@@ -6858,6 +6864,80 @@ esac
16815
16816
16817
16818+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
16819+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
16820+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
16821+ $as_echo_n "(cached) " >&6
16822+else
16823+ case $host in
16824+ *-*-mingw* )
16825+ case $build in
16826+ *-*-mingw* ) # actually msys
16827+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
16828+ ;;
16829+ *-*-cygwin* )
16830+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
16831+ ;;
16832+ * ) # otherwise, assume *nix
16833+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
16834+ ;;
16835+ esac
16836+ ;;
16837+ *-*-cygwin* )
16838+ case $build in
16839+ *-*-mingw* ) # actually msys
16840+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
16841+ ;;
16842+ *-*-cygwin* )
16843+ lt_cv_to_host_file_cmd=func_convert_file_noop
16844+ ;;
16845+ * ) # otherwise, assume *nix
16846+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
16847+ ;;
16848+ esac
16849+ ;;
16850+ * ) # unhandled hosts (and "normal" native builds)
16851+ lt_cv_to_host_file_cmd=func_convert_file_noop
16852+ ;;
16853+esac
16854+
16855+fi
16856+
16857+to_host_file_cmd=$lt_cv_to_host_file_cmd
16858+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
16859+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
16860+
16861+
16862+
16863+
16864+
16865+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
16866+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
16867+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
16868+ $as_echo_n "(cached) " >&6
16869+else
16870+ #assume ordinary cross tools, or native build.
16871+lt_cv_to_tool_file_cmd=func_convert_file_noop
16872+case $host in
16873+ *-*-mingw* )
16874+ case $build in
16875+ *-*-mingw* ) # actually msys
16876+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
16877+ ;;
16878+ esac
16879+ ;;
16880+esac
16881+
16882+fi
16883+
16884+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16885+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
16886+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
16887+
16888+
16889+
16890+
16891+
16892 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16893 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16894 if test "${lt_cv_ld_reload_flag+set}" = set; then :
16895@@ -6874,6 +6954,11 @@ case $reload_flag in
16896 esac
16897 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16898 case $host_os in
16899+ cygwin* | mingw* | pw32* | cegcc*)
16900+ if test "$GCC" != yes; then
16901+ reload_cmds=false
16902+ fi
16903+ ;;
16904 darwin*)
16905 if test "$GCC" = yes; then
16906 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16907@@ -7042,7 +7127,8 @@ mingw* | pw32*)
16908 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16909 lt_cv_file_magic_cmd='func_win32_libid'
16910 else
16911- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
16912+ # Keep this pattern in sync with the one in func_win32_libid.
16913+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
16914 lt_cv_file_magic_cmd='$OBJDUMP -f'
16915 fi
16916 ;;
16917@@ -7196,6 +7282,21 @@ esac
16918 fi
16919 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16920 $as_echo "$lt_cv_deplibs_check_method" >&6; }
16921+
16922+file_magic_glob=
16923+want_nocaseglob=no
16924+if test "$build" = "$host"; then
16925+ case $host_os in
16926+ mingw* | pw32*)
16927+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
16928+ want_nocaseglob=yes
16929+ else
16930+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
16931+ fi
16932+ ;;
16933+ esac
16934+fi
16935+
16936 file_magic_cmd=$lt_cv_file_magic_cmd
16937 deplibs_check_method=$lt_cv_deplibs_check_method
16938 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16939@@ -7211,9 +7312,162 @@ test -z "$deplibs_check_method" && depli
16940
16941
16942
16943+
16944+
16945+
16946+
16947+
16948+
16949+
16950+
16951+
16952+
16953 if test -n "$ac_tool_prefix"; then
16954- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
16955-set dummy ${ac_tool_prefix}ar; ac_word=$2
16956+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
16957+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
16958+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16959+$as_echo_n "checking for $ac_word... " >&6; }
16960+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
16961+ $as_echo_n "(cached) " >&6
16962+else
16963+ if test -n "$DLLTOOL"; then
16964+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
16965+else
16966+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16967+for as_dir in $PATH
16968+do
16969+ IFS=$as_save_IFS
16970+ test -z "$as_dir" && as_dir=.
16971+ for ac_exec_ext in '' $ac_executable_extensions; do
16972+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16973+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
16974+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16975+ break 2
16976+ fi
16977+done
16978+ done
16979+IFS=$as_save_IFS
16980+
16981+fi
16982+fi
16983+DLLTOOL=$ac_cv_prog_DLLTOOL
16984+if test -n "$DLLTOOL"; then
16985+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
16986+$as_echo "$DLLTOOL" >&6; }
16987+else
16988+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16989+$as_echo "no" >&6; }
16990+fi
16991+
16992+
16993+fi
16994+if test -z "$ac_cv_prog_DLLTOOL"; then
16995+ ac_ct_DLLTOOL=$DLLTOOL
16996+ # Extract the first word of "dlltool", so it can be a program name with args.
16997+set dummy dlltool; ac_word=$2
16998+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16999+$as_echo_n "checking for $ac_word... " >&6; }
17000+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17001+ $as_echo_n "(cached) " >&6
17002+else
17003+ if test -n "$ac_ct_DLLTOOL"; then
17004+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17005+else
17006+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17007+for as_dir in $PATH
17008+do
17009+ IFS=$as_save_IFS
17010+ test -z "$as_dir" && as_dir=.
17011+ for ac_exec_ext in '' $ac_executable_extensions; do
17012+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17013+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17014+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17015+ break 2
17016+ fi
17017+done
17018+ done
17019+IFS=$as_save_IFS
17020+
17021+fi
17022+fi
17023+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17024+if test -n "$ac_ct_DLLTOOL"; then
17025+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17026+$as_echo "$ac_ct_DLLTOOL" >&6; }
17027+else
17028+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17029+$as_echo "no" >&6; }
17030+fi
17031+
17032+ if test "x$ac_ct_DLLTOOL" = x; then
17033+ DLLTOOL="false"
17034+ else
17035+ case $cross_compiling:$ac_tool_warned in
17036+yes:)
17037+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17038+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17039+ac_tool_warned=yes ;;
17040+esac
17041+ DLLTOOL=$ac_ct_DLLTOOL
17042+ fi
17043+else
17044+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17045+fi
17046+
17047+test -z "$DLLTOOL" && DLLTOOL=dlltool
17048+
17049+
17050+
17051+
17052+
17053+
17054+
17055+
17056+
17057+
17058+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17059+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17060+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17061+ $as_echo_n "(cached) " >&6
17062+else
17063+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17064+
17065+case $host_os in
17066+cygwin* | mingw* | pw32* | cegcc*)
17067+ # two different shell functions defined in ltmain.sh
17068+ # decide which to use based on capabilities of $DLLTOOL
17069+ case `$DLLTOOL --help 2>&1` in
17070+ *--identify-strict*)
17071+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17072+ ;;
17073+ *)
17074+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17075+ ;;
17076+ esac
17077+ ;;
17078+*)
17079+ # fallback: assume linklib IS sharedlib
17080+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17081+ ;;
17082+esac
17083+
17084+fi
17085+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17086+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17087+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17088+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17089+
17090+
17091+
17092+
17093+
17094+
17095+
17096+if test -n "$ac_tool_prefix"; then
17097+ for ac_prog in ar
17098+ do
17099+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17100+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17102 $as_echo_n "checking for $ac_word... " >&6; }
17103 if test "${ac_cv_prog_AR+set}" = set; then :
17104@@ -7229,7 +7483,7 @@ do
17105 test -z "$as_dir" && as_dir=.
17106 for ac_exec_ext in '' $ac_executable_extensions; do
17107 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17108- ac_cv_prog_AR="${ac_tool_prefix}ar"
17109+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17110 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17111 break 2
17112 fi
17113@@ -7249,11 +7503,15 @@ $as_echo "no" >&6; }
17114 fi
17115
17116
17117+ test -n "$AR" && break
17118+ done
17119 fi
17120-if test -z "$ac_cv_prog_AR"; then
17121+if test -z "$AR"; then
17122 ac_ct_AR=$AR
17123- # Extract the first word of "ar", so it can be a program name with args.
17124-set dummy ar; ac_word=$2
17125+ for ac_prog in ar
17126+do
17127+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17128+set dummy $ac_prog; ac_word=$2
17129 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17130 $as_echo_n "checking for $ac_word... " >&6; }
17131 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17132@@ -7269,7 +7527,7 @@ do
17133 test -z "$as_dir" && as_dir=.
17134 for ac_exec_ext in '' $ac_executable_extensions; do
17135 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17136- ac_cv_prog_ac_ct_AR="ar"
17137+ ac_cv_prog_ac_ct_AR="$ac_prog"
17138 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17139 break 2
17140 fi
17141@@ -7288,6 +7546,10 @@ else
17142 $as_echo "no" >&6; }
17143 fi
17144
17145+
17146+ test -n "$ac_ct_AR" && break
17147+done
17148+
17149 if test "x$ac_ct_AR" = x; then
17150 AR="false"
17151 else
17152@@ -7299,12 +7561,10 @@ ac_tool_warned=yes ;;
17153 esac
17154 AR=$ac_ct_AR
17155 fi
17156-else
17157- AR="$ac_cv_prog_AR"
17158 fi
17159
17160-test -z "$AR" && AR=ar
17161-test -z "$AR_FLAGS" && AR_FLAGS=cru
17162+: ${AR=ar}
17163+: ${AR_FLAGS=cru}
17164
17165
17166
17167@@ -7316,6 +7576,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
17168
17169
17170
17171+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17172+$as_echo_n "checking for archiver @FILE support... " >&6; }
17173+if test "${lt_cv_ar_at_file+set}" = set; then :
17174+ $as_echo_n "(cached) " >&6
17175+else
17176+ lt_cv_ar_at_file=no
17177+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17178+/* end confdefs.h. */
17179+
17180+int
17181+main ()
17182+{
17183+
17184+ ;
17185+ return 0;
17186+}
17187+_ACEOF
17188+if ac_fn_c_try_compile "$LINENO"; then :
17189+ echo conftest.$ac_objext > conftest.lst
17190+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17191+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17192+ (eval $lt_ar_try) 2>&5
17193+ ac_status=$?
17194+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17195+ test $ac_status = 0; }
17196+ if test "$ac_status" -eq 0; then
17197+ # Ensure the archiver fails upon bogus file names.
17198+ rm -f conftest.$ac_objext libconftest.a
17199+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17200+ (eval $lt_ar_try) 2>&5
17201+ ac_status=$?
17202+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17203+ test $ac_status = 0; }
17204+ if test "$ac_status" -ne 0; then
17205+ lt_cv_ar_at_file=@
17206+ fi
17207+ fi
17208+ rm -f conftest.* libconftest.a
17209+
17210+fi
17211+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17212+
17213+fi
17214+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17215+$as_echo "$lt_cv_ar_at_file" >&6; }
17216+
17217+if test "x$lt_cv_ar_at_file" = xno; then
17218+ archiver_list_spec=
17219+else
17220+ archiver_list_spec=$lt_cv_ar_at_file
17221+fi
17222+
17223+
17224+
17225+
17226+
17227+
17228+
17229 if test -n "$ac_tool_prefix"; then
17230 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
17231 set dummy ${ac_tool_prefix}strip; ac_word=$2
17232@@ -7650,8 +7968,8 @@ esac
17233 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17234
17235 # Transform an extracted symbol line into symbol name and symbol address
17236-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17237-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'"
17238+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17239+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'"
17240
17241 # Handle CRLF in mingw tool chain
17242 opt_cr=
17243@@ -7687,6 +8005,7 @@ for ac_symprfx in "" "_"; do
17244 else
17245 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17246 fi
17247+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17248
17249 # Check to see that the pipe works correctly.
17250 pipe_works=no
17251@@ -7728,6 +8047,18 @@ _LT_EOF
17252 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17253 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17254 cat <<_LT_EOF > conftest.$ac_ext
17255+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17256+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17257+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17258+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17259+# define LT_DLSYM_CONST
17260+#elif defined(__osf__)
17261+/* This system does not cope well with relocations in const data. */
17262+# define LT_DLSYM_CONST
17263+#else
17264+# define LT_DLSYM_CONST const
17265+#endif
17266+
17267 #ifdef __cplusplus
17268 extern "C" {
17269 #endif
17270@@ -7739,7 +8070,7 @@ _LT_EOF
17271 cat <<_LT_EOF >> conftest.$ac_ext
17272
17273 /* The mapping between symbol names and symbols. */
17274-const struct {
17275+LT_DLSYM_CONST struct {
17276 const char *name;
17277 void *address;
17278 }
17279@@ -7765,8 +8096,8 @@ static const void *lt_preloaded_setup()
17280 _LT_EOF
17281 # Now try linking the two files.
17282 mv conftest.$ac_objext conftstm.$ac_objext
17283- lt_save_LIBS="$LIBS"
17284- lt_save_CFLAGS="$CFLAGS"
17285+ lt_globsym_save_LIBS=$LIBS
17286+ lt_globsym_save_CFLAGS=$CFLAGS
17287 LIBS="conftstm.$ac_objext"
17288 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17289 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17290@@ -7776,8 +8107,8 @@ _LT_EOF
17291 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17292 pipe_works=yes
17293 fi
17294- LIBS="$lt_save_LIBS"
17295- CFLAGS="$lt_save_CFLAGS"
17296+ LIBS=$lt_globsym_save_LIBS
17297+ CFLAGS=$lt_globsym_save_CFLAGS
17298 else
17299 echo "cannot find nm_test_func in $nlist" >&5
17300 fi
17301@@ -7814,6 +8145,21 @@ else
17302 $as_echo "ok" >&6; }
17303 fi
17304
17305+# Response file support.
17306+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17307+ nm_file_list_spec='@'
17308+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17309+ nm_file_list_spec='@'
17310+fi
17311+
17312+
17313+
17314+
17315+
17316+
17317+
17318+
17319+
17320
17321
17322
17323@@ -7832,6 +8178,40 @@ fi
17324
17325
17326
17327+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17328+$as_echo_n "checking for sysroot... " >&6; }
17329+
17330+# Check whether --with-libtool-sysroot was given.
17331+if test "${with_libtool_sysroot+set}" = set; then :
17332+ withval=$with_libtool_sysroot;
17333+else
17334+ with_libtool_sysroot=no
17335+fi
17336+
17337+
17338+lt_sysroot=
17339+case ${with_libtool_sysroot} in #(
17340+ yes)
17341+ if test "$GCC" = yes; then
17342+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17343+ fi
17344+ ;; #(
17345+ /*)
17346+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17347+ ;; #(
17348+ no|'')
17349+ ;; #(
17350+ *)
17351+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17352+$as_echo "${with_libtool_sysroot}" >&6; }
17353+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17354+ ;;
17355+esac
17356+
17357+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17358+$as_echo "${lt_sysroot:-no}" >&6; }
17359+
17360+
17361
17362
17363
17364@@ -8022,11 +8402,128 @@ sparc*-*solaris*)
17365 ;;
17366 esac
17367 fi
17368- rm -rf conftest*
17369- ;;
17370+ rm -rf conftest*
17371+ ;;
17372+esac
17373+
17374+need_locks="$enable_libtool_lock"
17375+
17376+if test -n "$ac_tool_prefix"; then
17377+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17378+set dummy ${ac_tool_prefix}mt; ac_word=$2
17379+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17380+$as_echo_n "checking for $ac_word... " >&6; }
17381+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17382+ $as_echo_n "(cached) " >&6
17383+else
17384+ if test -n "$MANIFEST_TOOL"; then
17385+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17386+else
17387+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17388+for as_dir in $PATH
17389+do
17390+ IFS=$as_save_IFS
17391+ test -z "$as_dir" && as_dir=.
17392+ for ac_exec_ext in '' $ac_executable_extensions; do
17393+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17394+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17395+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17396+ break 2
17397+ fi
17398+done
17399+ done
17400+IFS=$as_save_IFS
17401+
17402+fi
17403+fi
17404+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17405+if test -n "$MANIFEST_TOOL"; then
17406+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17407+$as_echo "$MANIFEST_TOOL" >&6; }
17408+else
17409+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17410+$as_echo "no" >&6; }
17411+fi
17412+
17413+
17414+fi
17415+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17416+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17417+ # Extract the first word of "mt", so it can be a program name with args.
17418+set dummy mt; ac_word=$2
17419+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17420+$as_echo_n "checking for $ac_word... " >&6; }
17421+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17422+ $as_echo_n "(cached) " >&6
17423+else
17424+ if test -n "$ac_ct_MANIFEST_TOOL"; then
17425+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
17426+else
17427+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17428+for as_dir in $PATH
17429+do
17430+ IFS=$as_save_IFS
17431+ test -z "$as_dir" && as_dir=.
17432+ for ac_exec_ext in '' $ac_executable_extensions; do
17433+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17434+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17435+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17436+ break 2
17437+ fi
17438+done
17439+ done
17440+IFS=$as_save_IFS
17441+
17442+fi
17443+fi
17444+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
17445+if test -n "$ac_ct_MANIFEST_TOOL"; then
17446+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
17447+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
17448+else
17449+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17450+$as_echo "no" >&6; }
17451+fi
17452+
17453+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
17454+ MANIFEST_TOOL=":"
17455+ else
17456+ case $cross_compiling:$ac_tool_warned in
17457+yes:)
17458+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17459+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17460+ac_tool_warned=yes ;;
17461 esac
17462+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
17463+ fi
17464+else
17465+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
17466+fi
17467+
17468+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
17469+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
17470+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
17471+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
17472+ $as_echo_n "(cached) " >&6
17473+else
17474+ lt_cv_path_mainfest_tool=no
17475+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
17476+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
17477+ cat conftest.err >&5
17478+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
17479+ lt_cv_path_mainfest_tool=yes
17480+ fi
17481+ rm -f conftest*
17482+fi
17483+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
17484+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
17485+if test "x$lt_cv_path_mainfest_tool" != xyes; then
17486+ MANIFEST_TOOL=:
17487+fi
17488+
17489+
17490+
17491
17492-need_locks="$enable_libtool_lock"
17493
17494
17495 case $host_os in
17496@@ -8591,6 +9088,8 @@ _LT_EOF
17497 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17498 echo "$AR cru libconftest.a conftest.o" >&5
17499 $AR cru libconftest.a conftest.o 2>&5
17500+ echo "$RANLIB libconftest.a" >&5
17501+ $RANLIB libconftest.a 2>&5
17502 cat > conftest.c << _LT_EOF
17503 int main() { return 0;}
17504 _LT_EOF
17505@@ -8787,7 +9286,8 @@ fi
17506 LIBTOOL_DEPS="$ltmain"
17507
17508 # Always use our own libtool.
17509-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
17510+LIBTOOL='$(SHELL) $(top_builddir)'
17511+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
17512
17513
17514
17515@@ -8876,7 +9376,7 @@ aix3*)
17516 esac
17517
17518 # Global variables:
17519-ofile=libtool
17520+ofile=${host_alias}-libtool
17521 can_build_shared=yes
17522
17523 # All known linkers require a `.a' archive for static linking (except MSVC,
17524@@ -9174,8 +9674,6 @@ fi
17525 lt_prog_compiler_pic=
17526 lt_prog_compiler_static=
17527
17528-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17529-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17530
17531 if test "$GCC" = yes; then
17532 lt_prog_compiler_wl='-Wl,'
17533@@ -9340,6 +9838,12 @@ $as_echo_n "checking for $compiler optio
17534 lt_prog_compiler_pic='--shared'
17535 lt_prog_compiler_static='--static'
17536 ;;
17537+ nagfor*)
17538+ # NAG Fortran compiler
17539+ lt_prog_compiler_wl='-Wl,-Wl,,'
17540+ lt_prog_compiler_pic='-PIC'
17541+ lt_prog_compiler_static='-Bstatic'
17542+ ;;
17543 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17544 # Portland Group compilers (*not* the Pentium gcc compiler,
17545 # which looks to be a dead project)
17546@@ -9402,7 +9906,7 @@ $as_echo_n "checking for $compiler optio
17547 lt_prog_compiler_pic='-KPIC'
17548 lt_prog_compiler_static='-Bstatic'
17549 case $cc_basename in
17550- f77* | f90* | f95*)
17551+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
17552 lt_prog_compiler_wl='-Qoption ld ';;
17553 *)
17554 lt_prog_compiler_wl='-Wl,';;
17555@@ -9459,13 +9963,17 @@ case $host_os in
17556 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17557 ;;
17558 esac
17559-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
17560-$as_echo "$lt_prog_compiler_pic" >&6; }
17561-
17562-
17563-
17564-
17565
17566+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17567+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17568+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
17569+ $as_echo_n "(cached) " >&6
17570+else
17571+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
17572+fi
17573+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
17574+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
17575+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
17576
17577 #
17578 # Check to make sure the PIC flag actually works.
17579@@ -9526,6 +10034,11 @@ fi
17580
17581
17582
17583+
17584+
17585+
17586+
17587+
17588 #
17589 # Check to make sure the static flag actually works.
17590 #
17591@@ -9876,7 +10389,8 @@ _LT_EOF
17592 allow_undefined_flag=unsupported
17593 always_export_symbols=no
17594 enable_shared_with_static_runtimes=yes
17595- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17596+ 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'
17597+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
17598
17599 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17600 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17601@@ -9924,7 +10438,7 @@ _LT_EOF
17602 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
17603 && test "$tmp_diet" = no
17604 then
17605- tmp_addflag=
17606+ tmp_addflag=' $pic_flag'
17607 tmp_sharedflag='-shared'
17608 case $cc_basename,$host_cpu in
17609 pgcc*) # Portland Group C compiler
17610@@ -9975,12 +10489,12 @@ _LT_EOF
17611 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17612 hardcode_libdir_flag_spec=
17613 hardcode_libdir_flag_spec_ld='-rpath $libdir'
17614- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
17615+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
17616 if test "x$supports_anon_versioning" = xyes; then
17617 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
17618 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
17619 echo "local: *; };" >> $output_objdir/$libname.ver~
17620- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17621+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17622 fi
17623 ;;
17624 esac
17625@@ -9994,8 +10508,8 @@ _LT_EOF
17626 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17627 wlarc=
17628 else
17629- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17630- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17631+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17632+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17633 fi
17634 ;;
17635
17636@@ -10013,8 +10527,8 @@ _LT_EOF
17637
17638 _LT_EOF
17639 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17640- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17641- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17642+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17643+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17644 else
17645 ld_shlibs=no
17646 fi
17647@@ -10060,8 +10574,8 @@ _LT_EOF
17648
17649 *)
17650 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17651- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17652- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17653+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17654+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17655 else
17656 ld_shlibs=no
17657 fi
17658@@ -10191,7 +10705,13 @@ _LT_EOF
17659 allow_undefined_flag='-berok'
17660 # Determine the default libpath from the value encoded in an
17661 # empty executable.
17662- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17663+ if test "${lt_cv_aix_libpath+set}" = set; then
17664+ aix_libpath=$lt_cv_aix_libpath
17665+else
17666+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17667+ $as_echo_n "(cached) " >&6
17668+else
17669+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17670 /* end confdefs.h. */
17671
17672 int
17673@@ -10204,22 +10724,29 @@ main ()
17674 _ACEOF
17675 if ac_fn_c_try_link "$LINENO"; then :
17676
17677-lt_aix_libpath_sed='
17678- /Import File Strings/,/^$/ {
17679- /^0/ {
17680- s/^0 *\(.*\)$/\1/
17681- p
17682- }
17683- }'
17684-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17685-# Check for a 64-bit object if we didn't find anything.
17686-if test -z "$aix_libpath"; then
17687- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17688-fi
17689+ lt_aix_libpath_sed='
17690+ /Import File Strings/,/^$/ {
17691+ /^0/ {
17692+ s/^0 *\([^ ]*\) *$/\1/
17693+ p
17694+ }
17695+ }'
17696+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17697+ # Check for a 64-bit object if we didn't find anything.
17698+ if test -z "$lt_cv_aix_libpath_"; then
17699+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17700+ fi
17701 fi
17702 rm -f core conftest.err conftest.$ac_objext \
17703 conftest$ac_exeext conftest.$ac_ext
17704-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17705+ if test -z "$lt_cv_aix_libpath_"; then
17706+ lt_cv_aix_libpath_="/usr/lib:/lib"
17707+ fi
17708+
17709+fi
17710+
17711+ aix_libpath=$lt_cv_aix_libpath_
17712+fi
17713
17714 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17715 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"
17716@@ -10231,7 +10758,13 @@ if test -z "$aix_libpath"; then aix_libp
17717 else
17718 # Determine the default libpath from the value encoded in an
17719 # empty executable.
17720- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17721+ if test "${lt_cv_aix_libpath+set}" = set; then
17722+ aix_libpath=$lt_cv_aix_libpath
17723+else
17724+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17725+ $as_echo_n "(cached) " >&6
17726+else
17727+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17728 /* end confdefs.h. */
17729
17730 int
17731@@ -10244,22 +10777,29 @@ main ()
17732 _ACEOF
17733 if ac_fn_c_try_link "$LINENO"; then :
17734
17735-lt_aix_libpath_sed='
17736- /Import File Strings/,/^$/ {
17737- /^0/ {
17738- s/^0 *\(.*\)$/\1/
17739- p
17740- }
17741- }'
17742-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17743-# Check for a 64-bit object if we didn't find anything.
17744-if test -z "$aix_libpath"; then
17745- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17746-fi
17747+ lt_aix_libpath_sed='
17748+ /Import File Strings/,/^$/ {
17749+ /^0/ {
17750+ s/^0 *\([^ ]*\) *$/\1/
17751+ p
17752+ }
17753+ }'
17754+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17755+ # Check for a 64-bit object if we didn't find anything.
17756+ if test -z "$lt_cv_aix_libpath_"; then
17757+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17758+ fi
17759 fi
17760 rm -f core conftest.err conftest.$ac_objext \
17761 conftest$ac_exeext conftest.$ac_ext
17762-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17763+ if test -z "$lt_cv_aix_libpath_"; then
17764+ lt_cv_aix_libpath_="/usr/lib:/lib"
17765+ fi
17766+
17767+fi
17768+
17769+ aix_libpath=$lt_cv_aix_libpath_
17770+fi
17771
17772 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17773 # Warning - without using the other run time loading flags,
17774@@ -10304,20 +10844,63 @@ if test -z "$aix_libpath"; then aix_libp
17775 # Microsoft Visual C++.
17776 # hardcode_libdir_flag_spec is actually meaningless, as there is
17777 # no search path for DLLs.
17778- hardcode_libdir_flag_spec=' '
17779- allow_undefined_flag=unsupported
17780- # Tell ltmain to make .lib files, not .a files.
17781- libext=lib
17782- # Tell ltmain to make .dll files, not .so files.
17783- shrext_cmds=".dll"
17784- # FIXME: Setting linknames here is a bad hack.
17785- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17786- # The linker will automatically build a .lib file if we build a DLL.
17787- old_archive_from_new_cmds='true'
17788- # FIXME: Should let the user specify the lib program.
17789- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17790- fix_srcfile_path='`cygpath -w "$srcfile"`'
17791- enable_shared_with_static_runtimes=yes
17792+ case $cc_basename in
17793+ cl*)
17794+ # Native MSVC
17795+ hardcode_libdir_flag_spec=' '
17796+ allow_undefined_flag=unsupported
17797+ always_export_symbols=yes
17798+ file_list_spec='@'
17799+ # Tell ltmain to make .lib files, not .a files.
17800+ libext=lib
17801+ # Tell ltmain to make .dll files, not .so files.
17802+ shrext_cmds=".dll"
17803+ # FIXME: Setting linknames here is a bad hack.
17804+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
17805+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
17806+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
17807+ else
17808+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
17809+ fi~
17810+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
17811+ linknames='
17812+ # The linker will not automatically build a static lib if we build a DLL.
17813+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
17814+ enable_shared_with_static_runtimes=yes
17815+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17816+ # Don't use ranlib
17817+ old_postinstall_cmds='chmod 644 $oldlib'
17818+ postlink_cmds='lt_outputfile="@OUTPUT@"~
17819+ lt_tool_outputfile="@TOOL_OUTPUT@"~
17820+ case $lt_outputfile in
17821+ *.exe|*.EXE) ;;
17822+ *)
17823+ lt_outputfile="$lt_outputfile.exe"
17824+ lt_tool_outputfile="$lt_tool_outputfile.exe"
17825+ ;;
17826+ esac~
17827+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
17828+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
17829+ $RM "$lt_outputfile.manifest";
17830+ fi'
17831+ ;;
17832+ *)
17833+ # Assume MSVC wrapper
17834+ hardcode_libdir_flag_spec=' '
17835+ allow_undefined_flag=unsupported
17836+ # Tell ltmain to make .lib files, not .a files.
17837+ libext=lib
17838+ # Tell ltmain to make .dll files, not .so files.
17839+ shrext_cmds=".dll"
17840+ # FIXME: Setting linknames here is a bad hack.
17841+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17842+ # The linker will automatically build a .lib file if we build a DLL.
17843+ old_archive_from_new_cmds='true'
17844+ # FIXME: Should let the user specify the lib program.
17845+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17846+ enable_shared_with_static_runtimes=yes
17847+ ;;
17848+ esac
17849 ;;
17850
17851 darwin* | rhapsody*)
17852@@ -10382,7 +10965,7 @@ if test -z "$aix_libpath"; then aix_libp
17853
17854 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17855 freebsd* | dragonfly*)
17856- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
17857+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17858 hardcode_libdir_flag_spec='-R$libdir'
17859 hardcode_direct=yes
17860 hardcode_shlibpath_var=no
17861@@ -10390,7 +10973,7 @@ if test -z "$aix_libpath"; then aix_libp
17862
17863 hpux9*)
17864 if test "$GCC" = yes; then
17865- 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'
17866+ 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'
17867 else
17868 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'
17869 fi
17870@@ -10406,7 +10989,7 @@ if test -z "$aix_libpath"; then aix_libp
17871
17872 hpux10*)
17873 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
17874- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17875+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17876 else
17877 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17878 fi
17879@@ -10430,10 +11013,10 @@ if test -z "$aix_libpath"; then aix_libp
17880 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17881 ;;
17882 ia64*)
17883- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17884+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17885 ;;
17886 *)
17887- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17888+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17889 ;;
17890 esac
17891 else
17892@@ -10512,23 +11095,36 @@ fi
17893
17894 irix5* | irix6* | nonstopux*)
17895 if test "$GCC" = yes; then
17896- 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'
17897+ 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'
17898 # Try to use the -exported_symbol ld option, if it does not
17899 # work, assume that -exports_file does not work either and
17900 # implicitly export all symbols.
17901- save_LDFLAGS="$LDFLAGS"
17902- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17903- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17904+ # This should be the same for all languages, so no per-tag cache variable.
17905+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
17906+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
17907+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
17908+ $as_echo_n "(cached) " >&6
17909+else
17910+ save_LDFLAGS="$LDFLAGS"
17911+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17912+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17913 /* end confdefs.h. */
17914-int foo(void) {}
17915+int foo (void) { return 0; }
17916 _ACEOF
17917 if ac_fn_c_try_link "$LINENO"; then :
17918- 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'
17919-
17920+ lt_cv_irix_exported_symbol=yes
17921+else
17922+ lt_cv_irix_exported_symbol=no
17923 fi
17924 rm -f core conftest.err conftest.$ac_objext \
17925 conftest$ac_exeext conftest.$ac_ext
17926- LDFLAGS="$save_LDFLAGS"
17927+ LDFLAGS="$save_LDFLAGS"
17928+fi
17929+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
17930+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
17931+ if test "$lt_cv_irix_exported_symbol" = yes; then
17932+ 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'
17933+ fi
17934 else
17935 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'
17936 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'
17937@@ -10613,7 +11209,7 @@ rm -f core conftest.err conftest.$ac_obj
17938 osf4* | osf5*) # as osf3* with the addition of -msym flag
17939 if test "$GCC" = yes; then
17940 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
17941- 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'
17942+ 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'
17943 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17944 else
17945 allow_undefined_flag=' -expect_unresolved \*'
17946@@ -10632,9 +11228,9 @@ rm -f core conftest.err conftest.$ac_obj
17947 no_undefined_flag=' -z defs'
17948 if test "$GCC" = yes; then
17949 wlarc='${wl}'
17950- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17951+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17952 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
17953- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
17954+ $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'
17955 else
17956 case `$CC -V 2>&1` in
17957 *"Compilers 5.0"*)
17958@@ -11210,8 +11806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17959 need_version=no
17960 need_lib_prefix=no
17961
17962- case $GCC,$host_os in
17963- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
17964+ case $GCC,$cc_basename in
17965+ yes,*)
17966+ # gcc
17967 library_names_spec='$libname.dll.a'
17968 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17969 postinstall_cmds='base_file=`basename \${file}`~
17970@@ -11244,13 +11841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17971 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17972 ;;
17973 esac
17974+ dynamic_linker='Win32 ld.exe'
17975+ ;;
17976+
17977+ *,cl*)
17978+ # Native MSVC
17979+ libname_spec='$name'
17980+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17981+ library_names_spec='${libname}.dll.lib'
17982+
17983+ case $build_os in
17984+ mingw*)
17985+ sys_lib_search_path_spec=
17986+ lt_save_ifs=$IFS
17987+ IFS=';'
17988+ for lt_path in $LIB
17989+ do
17990+ IFS=$lt_save_ifs
17991+ # Let DOS variable expansion print the short 8.3 style file name.
17992+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
17993+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
17994+ done
17995+ IFS=$lt_save_ifs
17996+ # Convert to MSYS style.
17997+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
17998+ ;;
17999+ cygwin*)
18000+ # Convert to unix form, then to dos form, then back to unix form
18001+ # but this time dos style (no spaces!) so that the unix form looks
18002+ # like /cygdrive/c/PROGRA~1:/cygdr...
18003+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18004+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18005+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18006+ ;;
18007+ *)
18008+ sys_lib_search_path_spec="$LIB"
18009+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18010+ # It is most probably a Windows format PATH.
18011+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18012+ else
18013+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18014+ fi
18015+ # FIXME: find the short name or the path components, as spaces are
18016+ # common. (e.g. "Program Files" -> "PROGRA~1")
18017+ ;;
18018+ esac
18019+
18020+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18021+ postinstall_cmds='base_file=`basename \${file}`~
18022+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18023+ dldir=$destdir/`dirname \$dlpath`~
18024+ test -d \$dldir || mkdir -p \$dldir~
18025+ $install_prog $dir/$dlname \$dldir/$dlname'
18026+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18027+ dlpath=$dir/\$dldll~
18028+ $RM \$dlpath'
18029+ shlibpath_overrides_runpath=yes
18030+ dynamic_linker='Win32 link.exe'
18031 ;;
18032
18033 *)
18034+ # Assume MSVC wrapper
18035 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18036+ dynamic_linker='Win32 ld.exe'
18037 ;;
18038 esac
18039- dynamic_linker='Win32 ld.exe'
18040 # FIXME: first we should search . and the directory the executable is in
18041 shlibpath_var=PATH
18042 ;;
18043@@ -11346,7 +12001,7 @@ haiku*)
18044 soname_spec='${libname}${release}${shared_ext}$major'
18045 shlibpath_var=LIBRARY_PATH
18046 shlibpath_overrides_runpath=yes
18047- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18048+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18049 hardcode_into_libs=yes
18050 ;;
18051
18052@@ -12142,7 +12797,7 @@ else
18053 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18054 lt_status=$lt_dlunknown
18055 cat > conftest.$ac_ext <<_LT_EOF
18056-#line 12145 "configure"
18057+#line $LINENO "configure"
18058 #include "confdefs.h"
18059
18060 #if HAVE_DLFCN_H
18061@@ -12186,10 +12841,10 @@ else
18062 /* When -fvisbility=hidden is used, assume the code has been annotated
18063 correspondingly for the symbols needed. */
18064 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18065-void fnord () __attribute__((visibility("default")));
18066+int fnord () __attribute__((visibility("default")));
18067 #endif
18068
18069-void fnord () { int i=42; }
18070+int fnord () { return 42; }
18071 int main ()
18072 {
18073 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18074@@ -12248,7 +12903,7 @@ else
18075 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18076 lt_status=$lt_dlunknown
18077 cat > conftest.$ac_ext <<_LT_EOF
18078-#line 12251 "configure"
18079+#line $LINENO "configure"
18080 #include "confdefs.h"
18081
18082 #if HAVE_DLFCN_H
18083@@ -12292,10 +12947,10 @@ else
18084 /* When -fvisbility=hidden is used, assume the code has been annotated
18085 correspondingly for the symbols needed. */
18086 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18087-void fnord () __attribute__((visibility("default")));
18088+int fnord () __attribute__((visibility("default")));
18089 #endif
18090
18091-void fnord () { int i=42; }
18092+int fnord () { return 42; }
18093 int main ()
18094 {
18095 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18096@@ -17606,13 +18261,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18097 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18098 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18099 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18100+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18101+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18102 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18103 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18104 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18105 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18106 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18107+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18108+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18109+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18110+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18111 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18112 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18113+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18114 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18115 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18116 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18117@@ -17627,14 +18289,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18118 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18119 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18120 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"`'
18121+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18122+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18123 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18124 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18125 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18126-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18127 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18128+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18129 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18130 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18131 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18132+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18133 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18134 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18135 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18136@@ -17667,12 +18332,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18137 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18138 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18139 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18140-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18141 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18142 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18143 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18144 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18145 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18146+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18147 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18148 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18149 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18150@@ -17782,8 +18447,13 @@ reload_flag \
18151 OBJDUMP \
18152 deplibs_check_method \
18153 file_magic_cmd \
18154+file_magic_glob \
18155+want_nocaseglob \
18156+DLLTOOL \
18157+sharedlib_from_linklib_cmd \
18158 AR \
18159 AR_FLAGS \
18160+archiver_list_spec \
18161 STRIP \
18162 RANLIB \
18163 CC \
18164@@ -17793,12 +18463,14 @@ lt_cv_sys_global_symbol_pipe \
18165 lt_cv_sys_global_symbol_to_cdecl \
18166 lt_cv_sys_global_symbol_to_c_name_address \
18167 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18168+nm_file_list_spec \
18169 lt_prog_compiler_no_builtin_flag \
18170-lt_prog_compiler_wl \
18171 lt_prog_compiler_pic \
18172+lt_prog_compiler_wl \
18173 lt_prog_compiler_static \
18174 lt_cv_prog_compiler_c_o \
18175 need_locks \
18176+MANIFEST_TOOL \
18177 DSYMUTIL \
18178 NMEDIT \
18179 LIPO \
18180@@ -17814,7 +18486,6 @@ no_undefined_flag \
18181 hardcode_libdir_flag_spec \
18182 hardcode_libdir_flag_spec_ld \
18183 hardcode_libdir_separator \
18184-fix_srcfile_path \
18185 exclude_expsyms \
18186 include_expsyms \
18187 file_list_spec \
18188@@ -17883,6 +18554,7 @@ module_cmds \
18189 module_expsym_cmds \
18190 export_symbols_cmds \
18191 prelink_cmds \
18192+postlink_cmds \
18193 postinstall_cmds \
18194 postuninstall_cmds \
18195 finish_cmds \
18196@@ -18690,7 +19362,8 @@ $as_echo X"$file" |
18197 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18198 #
18199 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18200-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18201+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18202+# Inc.
18203 # Written by Gordon Matzigkeit, 1996
18204 #
18205 # This file is part of GNU Libtool.
18206@@ -18793,19 +19466,42 @@ SP2NL=$lt_lt_SP2NL
18207 # turn newlines into spaces.
18208 NL2SP=$lt_lt_NL2SP
18209
18210+# convert \$build file names to \$host format.
18211+to_host_file_cmd=$lt_cv_to_host_file_cmd
18212+
18213+# convert \$build files to toolchain format.
18214+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18215+
18216 # An object symbol dumper.
18217 OBJDUMP=$lt_OBJDUMP
18218
18219 # Method to check whether dependent libraries are shared objects.
18220 deplibs_check_method=$lt_deplibs_check_method
18221
18222-# Command to use when deplibs_check_method == "file_magic".
18223+# Command to use when deplibs_check_method = "file_magic".
18224 file_magic_cmd=$lt_file_magic_cmd
18225
18226+# How to find potential files when deplibs_check_method = "file_magic".
18227+file_magic_glob=$lt_file_magic_glob
18228+
18229+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18230+want_nocaseglob=$lt_want_nocaseglob
18231+
18232+# DLL creation program.
18233+DLLTOOL=$lt_DLLTOOL
18234+
18235+# Command to associate shared and link libraries.
18236+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18237+
18238 # The archiver.
18239 AR=$lt_AR
18240+
18241+# Flags to create an archive.
18242 AR_FLAGS=$lt_AR_FLAGS
18243
18244+# How to feed a file listing to the archiver.
18245+archiver_list_spec=$lt_archiver_list_spec
18246+
18247 # A symbol stripping program.
18248 STRIP=$lt_STRIP
18249
18250@@ -18835,6 +19531,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18251 # Transform the output of nm in a C name address pair when lib prefix is needed.
18252 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18253
18254+# Specify filename containing input files for \$NM.
18255+nm_file_list_spec=$lt_nm_file_list_spec
18256+
18257+# The root where to search for dependent libraries,and in which our libraries should be installed.
18258+lt_sysroot=$lt_sysroot
18259+
18260 # The name of the directory that contains temporary libtool files.
18261 objdir=$objdir
18262
18263@@ -18844,6 +19546,9 @@ MAGIC_CMD=$MAGIC_CMD
18264 # Must we lock files when doing compilation?
18265 need_locks=$lt_need_locks
18266
18267+# Manifest tool.
18268+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18269+
18270 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18271 DSYMUTIL=$lt_DSYMUTIL
18272
18273@@ -18958,12 +19663,12 @@ with_gcc=$GCC
18274 # Compiler flag to turn off builtin functions.
18275 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18276
18277-# How to pass a linker flag through the compiler.
18278-wl=$lt_lt_prog_compiler_wl
18279-
18280 # Additional compiler flags for building library objects.
18281 pic_flag=$lt_lt_prog_compiler_pic
18282
18283+# How to pass a linker flag through the compiler.
18284+wl=$lt_lt_prog_compiler_wl
18285+
18286 # Compiler flag to prevent dynamic linking.
18287 link_static_flag=$lt_lt_prog_compiler_static
18288
18289@@ -19050,9 +19755,6 @@ inherit_rpath=$inherit_rpath
18290 # Whether libtool must link a program against all its dependency libraries.
18291 link_all_deplibs=$link_all_deplibs
18292
18293-# Fix the shell variable \$srcfile for the compiler.
18294-fix_srcfile_path=$lt_fix_srcfile_path
18295-
18296 # Set to "yes" if exported symbols are required.
18297 always_export_symbols=$always_export_symbols
18298
18299@@ -19068,6 +19770,9 @@ include_expsyms=$lt_include_expsyms
18300 # Commands necessary for linking programs (against libraries) with templates.
18301 prelink_cmds=$lt_prelink_cmds
18302
18303+# Commands necessary for finishing linking programs.
18304+postlink_cmds=$lt_postlink_cmds
18305+
18306 # Specify filename containing input files.
18307 file_list_spec=$lt_file_list_spec
18308
18309@@ -19114,210 +19819,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18310 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18311 # text mode, it properly converts lines to CR/LF. This bash problem
18312 # is reportedly fixed, but why not run on old versions too?
18313- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18314- || (rm -f "$cfgfile"; exit 1)
18315-
18316- case $xsi_shell in
18317- yes)
18318- cat << \_LT_EOF >> "$cfgfile"
18319-
18320-# func_dirname file append nondir_replacement
18321-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18322-# otherwise set result to NONDIR_REPLACEMENT.
18323-func_dirname ()
18324-{
18325- case ${1} in
18326- */*) func_dirname_result="${1%/*}${2}" ;;
18327- * ) func_dirname_result="${3}" ;;
18328- esac
18329-}
18330-
18331-# func_basename file
18332-func_basename ()
18333-{
18334- func_basename_result="${1##*/}"
18335-}
18336-
18337-# func_dirname_and_basename file append nondir_replacement
18338-# perform func_basename and func_dirname in a single function
18339-# call:
18340-# dirname: Compute the dirname of FILE. If nonempty,
18341-# add APPEND to the result, otherwise set result
18342-# to NONDIR_REPLACEMENT.
18343-# value returned in "$func_dirname_result"
18344-# basename: Compute filename of FILE.
18345-# value retuned in "$func_basename_result"
18346-# Implementation must be kept synchronized with func_dirname
18347-# and func_basename. For efficiency, we do not delegate to
18348-# those functions but instead duplicate the functionality here.
18349-func_dirname_and_basename ()
18350-{
18351- case ${1} in
18352- */*) func_dirname_result="${1%/*}${2}" ;;
18353- * ) func_dirname_result="${3}" ;;
18354- esac
18355- func_basename_result="${1##*/}"
18356-}
18357-
18358-# func_stripname prefix suffix name
18359-# strip PREFIX and SUFFIX off of NAME.
18360-# PREFIX and SUFFIX must not contain globbing or regex special
18361-# characters, hashes, percent signs, but SUFFIX may contain a leading
18362-# dot (in which case that matches only a dot).
18363-func_stripname ()
18364-{
18365- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18366- # positional parameters, so assign one to ordinary parameter first.
18367- func_stripname_result=${3}
18368- func_stripname_result=${func_stripname_result#"${1}"}
18369- func_stripname_result=${func_stripname_result%"${2}"}
18370-}
18371-
18372-# func_opt_split
18373-func_opt_split ()
18374-{
18375- func_opt_split_opt=${1%%=*}
18376- func_opt_split_arg=${1#*=}
18377-}
18378-
18379-# func_lo2o object
18380-func_lo2o ()
18381-{
18382- case ${1} in
18383- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18384- *) func_lo2o_result=${1} ;;
18385- esac
18386-}
18387-
18388-# func_xform libobj-or-source
18389-func_xform ()
18390-{
18391- func_xform_result=${1%.*}.lo
18392-}
18393-
18394-# func_arith arithmetic-term...
18395-func_arith ()
18396-{
18397- func_arith_result=$(( $* ))
18398-}
18399-
18400-# func_len string
18401-# STRING may not start with a hyphen.
18402-func_len ()
18403-{
18404- func_len_result=${#1}
18405-}
18406-
18407-_LT_EOF
18408- ;;
18409- *) # Bourne compatible functions.
18410- cat << \_LT_EOF >> "$cfgfile"
18411-
18412-# func_dirname file append nondir_replacement
18413-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18414-# otherwise set result to NONDIR_REPLACEMENT.
18415-func_dirname ()
18416-{
18417- # Extract subdirectory from the argument.
18418- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18419- if test "X$func_dirname_result" = "X${1}"; then
18420- func_dirname_result="${3}"
18421- else
18422- func_dirname_result="$func_dirname_result${2}"
18423- fi
18424-}
18425-
18426-# func_basename file
18427-func_basename ()
18428-{
18429- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18430-}
18431-
18432-
18433-# func_stripname prefix suffix name
18434-# strip PREFIX and SUFFIX off of NAME.
18435-# PREFIX and SUFFIX must not contain globbing or regex special
18436-# characters, hashes, percent signs, but SUFFIX may contain a leading
18437-# dot (in which case that matches only a dot).
18438-# func_strip_suffix prefix name
18439-func_stripname ()
18440-{
18441- case ${2} in
18442- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18443- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18444- esac
18445-}
18446-
18447-# sed scripts:
18448-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18449-my_sed_long_arg='1s/^-[^=]*=//'
18450-
18451-# func_opt_split
18452-func_opt_split ()
18453-{
18454- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18455- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18456-}
18457-
18458-# func_lo2o object
18459-func_lo2o ()
18460-{
18461- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18462-}
18463-
18464-# func_xform libobj-or-source
18465-func_xform ()
18466-{
18467- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18468-}
18469-
18470-# func_arith arithmetic-term...
18471-func_arith ()
18472-{
18473- func_arith_result=`expr "$@"`
18474-}
18475-
18476-# func_len string
18477-# STRING may not start with a hyphen.
18478-func_len ()
18479-{
18480- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
18481-}
18482-
18483-_LT_EOF
18484-esac
18485-
18486-case $lt_shell_append in
18487- yes)
18488- cat << \_LT_EOF >> "$cfgfile"
18489-
18490-# func_append var value
18491-# Append VALUE to the end of shell variable VAR.
18492-func_append ()
18493-{
18494- eval "$1+=\$2"
18495-}
18496-_LT_EOF
18497- ;;
18498- *)
18499- cat << \_LT_EOF >> "$cfgfile"
18500-
18501-# func_append var value
18502-# Append VALUE to the end of shell variable VAR.
18503-func_append ()
18504-{
18505- eval "$1=\$$1\$2"
18506-}
18507-
18508-_LT_EOF
18509- ;;
18510- esac
18511+ sed '$q' "$ltmain" >> "$cfgfile" \
18512+ || (rm -f "$cfgfile"; exit 1)
18513
18514+ if test x"$xsi_shell" = xyes; then
18515+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
18516+func_dirname ()\
18517+{\
18518+\ case ${1} in\
18519+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18520+\ * ) func_dirname_result="${3}" ;;\
18521+\ esac\
18522+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
18523+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18524+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18525+test 0 -eq $? || _lt_function_replace_fail=:
18526+
18527+
18528+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
18529+func_basename ()\
18530+{\
18531+\ func_basename_result="${1##*/}"\
18532+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
18533+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18534+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18535+test 0 -eq $? || _lt_function_replace_fail=:
18536+
18537+
18538+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
18539+func_dirname_and_basename ()\
18540+{\
18541+\ case ${1} in\
18542+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18543+\ * ) func_dirname_result="${3}" ;;\
18544+\ esac\
18545+\ func_basename_result="${1##*/}"\
18546+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
18547+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18548+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18549+test 0 -eq $? || _lt_function_replace_fail=:
18550+
18551+
18552+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
18553+func_stripname ()\
18554+{\
18555+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
18556+\ # positional parameters, so assign one to ordinary parameter first.\
18557+\ func_stripname_result=${3}\
18558+\ func_stripname_result=${func_stripname_result#"${1}"}\
18559+\ func_stripname_result=${func_stripname_result%"${2}"}\
18560+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
18561+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18562+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18563+test 0 -eq $? || _lt_function_replace_fail=:
18564+
18565+
18566+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
18567+func_split_long_opt ()\
18568+{\
18569+\ func_split_long_opt_name=${1%%=*}\
18570+\ func_split_long_opt_arg=${1#*=}\
18571+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
18572+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18573+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18574+test 0 -eq $? || _lt_function_replace_fail=:
18575+
18576+
18577+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
18578+func_split_short_opt ()\
18579+{\
18580+\ func_split_short_opt_arg=${1#??}\
18581+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
18582+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
18583+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18584+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18585+test 0 -eq $? || _lt_function_replace_fail=:
18586+
18587+
18588+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
18589+func_lo2o ()\
18590+{\
18591+\ case ${1} in\
18592+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
18593+\ *) func_lo2o_result=${1} ;;\
18594+\ esac\
18595+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
18596+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18597+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18598+test 0 -eq $? || _lt_function_replace_fail=:
18599+
18600+
18601+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
18602+func_xform ()\
18603+{\
18604+ func_xform_result=${1%.*}.lo\
18605+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
18606+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18607+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18608+test 0 -eq $? || _lt_function_replace_fail=:
18609+
18610+
18611+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
18612+func_arith ()\
18613+{\
18614+ func_arith_result=$(( $* ))\
18615+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
18616+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18617+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18618+test 0 -eq $? || _lt_function_replace_fail=:
18619+
18620+
18621+ sed -e '/^func_len ()$/,/^} # func_len /c\
18622+func_len ()\
18623+{\
18624+ func_len_result=${#1}\
18625+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
18626+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18627+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18628+test 0 -eq $? || _lt_function_replace_fail=:
18629+
18630+fi
18631+
18632+if test x"$lt_shell_append" = xyes; then
18633+ sed -e '/^func_append ()$/,/^} # func_append /c\
18634+func_append ()\
18635+{\
18636+ eval "${1}+=\\${2}"\
18637+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
18638+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18639+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18640+test 0 -eq $? || _lt_function_replace_fail=:
18641+
18642+
18643+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
18644+func_append_quoted ()\
18645+{\
18646+\ func_quote_for_eval "${2}"\
18647+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
18648+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
18649+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18650+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18651+test 0 -eq $? || _lt_function_replace_fail=:
18652+
18653+
18654+ # Save a `func_append' function call where possible by direct use of '+='
18655+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
18656+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18657+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18658+ test 0 -eq $? || _lt_function_replace_fail=:
18659+else
18660+ # Save a `func_append' function call even when '+=' is not available
18661+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
18662+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18663+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18664+ test 0 -eq $? || _lt_function_replace_fail=:
18665+fi
18666+
18667+if test x"$_lt_function_replace_fail" = x":"; then
18668+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
18669+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
18670+fi
18671
18672- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
18673- || (rm -f "$cfgfile"; exit 1)
18674
18675- mv -f "$cfgfile" "$ofile" ||
18676+ mv -f "$cfgfile" "$ofile" ||
18677 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
18678 chmod +x "$ofile"
18679
18680Index: binutils-2.21.1/bfd/configure.in
18681===================================================================
18682--- binutils-2.21.1.orig/bfd/configure.in
18683+++ binutils-2.21.1/bfd/configure.in
18684@@ -536,7 +536,7 @@ changequote(,)dnl
18685 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18686 changequote([,])dnl
18687 if test -n "$x"; then
18688- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18689+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18690 fi
18691
18692 # More hacks to build DLLs on Windows.
18693Index: binutils-2.21.1/opcodes/configure.in
18694===================================================================
18695--- binutils-2.21.1.orig/opcodes/configure.in
18696+++ binutils-2.21.1/opcodes/configure.in
18697@@ -134,7 +134,7 @@ changequote(,)dnl
18698 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18699 changequote([,])dnl
18700 if test -n "$x"; then
18701- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18702+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18703 fi
18704
18705 case "${host}" in
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-08 01:12:27 +0000