summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-12-22 10:10:33 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-21 01:36:15 -0800
commitc15f20a124cdc4966014ff624a06ab5a325042cd (patch)
tree57d055a81d601db5be854abd53d1094bed817fdb /meta/recipes-devtools
parent6656381714c5956f71ca634f5a5f4aa4661bbf7e (diff)
downloadpoky-c15f20a124cdc4966014ff624a06ab5a325042cd.tar.gz
binutils: upgrade to 2.21 and add libtool sysroot support
* Upgraded binutils to v2.21 * Incorporated libtool sysroot patches from OE * Removed patches no longer needed or obsoleted by OE patches Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch18
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch67
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch29
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch37
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-001_ld_makefile_patch.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-006_better_file_error.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-012_check_ldrunpath_length.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch)19
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-gas-needs-libm.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/binutils-x86_64_i386_biarch.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/libiberty_path_fix.patch (renamed from meta/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch18675
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb)2
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.21.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.20.1.bb)1
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.21.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb)2
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.21.bb (renamed from meta/recipes-devtools/binutils/binutils_2.20.1.bb)20
18 files changed, 18732 insertions, 138 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
deleted file mode 100644
index dfe9b18e17..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Adds support for Freescale Power architecture e300c2 and e300c3 cores.
2http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
3
4Leon Woestenberg <leonw@mailcan.com>
5
6Index: binutils-2.19.51.0.3/opcodes/ppc-dis.c
7===================================================================
8--- binutils-2.19.51.0.3.orig/opcodes/ppc-dis.c 2009-04-16 00:38:45.000000000 -0700
9+++ binutils-2.19.51.0.3/opcodes/ppc-dis.c 2009-04-16 00:43:56.000000000 -0700
10@@ -132,6 +132,8 @@
11 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7 | PPC_OPCODE_ALTIVEC
12 | PPC_OPCODE_VSX),
13 0 },
14+ { "pmr", (PPC_OPCODE_PMR),
15+ 0 },
16 { "ppc", (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
17 0 },
18 { "ppc32", (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch
deleted file mode 100644
index 61517d1d4c..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1This is because libdir has a trailing slash which breaks the comparision.
2
3RP 2/1/10
4
5Index: binutils-2.20.1/ltmain.sh
6===================================================================
7--- binutils-2.20.1.orig/ltmain.sh 2009-09-01 00:59:32.000000000 +0800
8+++ binutils-2.20.1/ltmain.sh 2010-07-29 09:41:14.000000000 +0800
9@@ -2156,8 +2156,12 @@
10 dir="$dir$objdir"
11
12 if test -n "$relink_command"; then
13+ # Strip any trailing slash from the destination.
14+ func_stripname '' '/' "$libdir"
15+ destlibdir=$func_stripname_result
16+
17 # Determine the prefix the user has applied to our future dir.
18- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
19+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"`
20
21 # Don't allow the user to place us outside of our expected
22 # location b/c this prevents finding dependent libraries that
23@@ -5570,8 +5574,14 @@
24 absdir="$abs_ladir"
25 libdir="$abs_ladir"
26 else
27- dir="$libdir"
28- absdir="$libdir"
29+ # Adding 'libdir' from the .la file to our library search paths
30+ # breaks crosscompilation horribly. We cheat here and don't add
31+ # it, instead adding the path where we found the .la. -CL
32+ dir="$abs_ladir"
33+ absdir="$abs_ladir"
34+ libdir="$abs_ladir"
35+ #dir="$libdir"
36+ #absdir="$libdir"
37 fi
38 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
39 else
40@@ -5942,8 +5952,6 @@
41 add="$libdir/$linklib"
42 fi
43 else
44- # We cannot seem to hardcode it, guess we'll fake it.
45- add_dir="-L$libdir"
46 # Try looking first in the location we're being installed to.
47 if test -n "$inst_prefix_dir"; then
48 case $libdir in
49@@ -6089,7 +6097,17 @@
50 fi
51 ;;
52 *)
53- path="-L$absdir/$objdir"
54+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
55+ # preferring $objdir. RP 31/04/2008
56+ if test -f "$absdir/$objdir/$depdepl" ; then
57+ depdepl="$absdir/$objdir/$depdepl"
58+ path="-L$absdir/$objdir"
59+ elif test -f "$absdir/$depdepl" ; then
60+ depdepl="$absdir/$depdepl"
61+ path="-L$absdir"
62+ else
63+ path="-L$absdir/$objdir"
64+ fi
65 ;;
66 esac
67 else
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
deleted file mode 100644
index c71f0ad4db..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1# "-fPIE" always triggers segmentation fault in ld.so.1 on mips platform,
2# which was first saw on dbus-daemon. Below borrow the binutils fix from
3# binutils bugzilla:
4#
5# http://sourceware.org/bugzilla/show_bug.cgi?id=10858
6#
7# Its commit message says:
8# * elfxx-mips.c (mips_elf_create_dynamic_relocation): Use section
9# sym dynindx for relocs against defined syms in PIEs.
10#
11# It's in upstream CVS now (rev 1.267), but not in current release
12#
13# By Kevin Tian <kevin.tian@intel.com>, 2010-07-15
14
15diff --git a/elfxx-mips.c b/elfxx-mips.c
16index 3a1c8ba..f6c2c1c 100644
17--- binutils-2.20.1.orig/bfd/elfxx-mips.c
18+++ binutils-2.20.1/bfd/elfxx-mips.c
19@@ -5688,9 +5688,7 @@ mips_elf_create_dynamic_relocation (bfd *output_bfd,
20
21 /* We must now calculate the dynamic symbol table index to use
22 in the relocation. */
23- if (h != NULL
24- && (!h->root.def_regular
25- || (info->shared && !info->symbolic && !h->root.forced_local)))
26+ if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
27 {
28 indx = h->root.dynindx;
29 if (SGI_COMPAT (output_bfd))
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch
index 2623301da0..2623301da0 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch
new file mode 100644
index 0000000000..adcabb4f66
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch
@@ -0,0 +1,37 @@
1http://sourceware.org/bugzilla/show_bug.cgi?id=10340
2
3Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
4
5Always try to prepend the sysroot prefix to absolute filenames first.
6
7Index: binutils-2.21/ld/ldfile.c
8===================================================================
9--- binutils-2.21.orig/ld/ldfile.c
10+++ binutils-2.21/ld/ldfile.c
11@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc
12 directory first. */
13 if (! entry->is_archive)
14 {
15- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
16+ /* For absolute pathnames, try to always open the file in the
17+ sysroot first. If this fails, try to open the file at the
18+ given location. */
19+ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
20+ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
21 {
22 char *name = concat (ld_sysroot, entry->filename,
23 (const char *) NULL);
24 if (ldfile_try_open_bfd (name, entry))
25 {
26 entry->filename = name;
27+ entry->sysrooted = TRUE;
28 return TRUE;
29 }
30 free (name);
31 }
32- else if (ldfile_try_open_bfd (entry->filename, entry))
33+
34+ if (ldfile_try_open_bfd (entry->filename, entry))
35 {
36 entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
37 && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch
index c2f19276f8..c2f19276f8 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch
index 8de04e0fe0..8de04e0fe0 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-001_ld_makefile_patch.patch
index 04a7e61e25..04a7e61e25 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-001_ld_makefile_patch.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-006_better_file_error.patch
index f337611edf..f337611edf 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-006_better_file_error.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-012_check_ldrunpath_length.patch
index 498651a90c..b6f5a25ceb 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -24,10 +24,11 @@ esac
24exit 0 24exit 0
25 25
26@DPATCH@ 26@DPATCH@
27diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em 27Index: src/ld/emultempl/elf32.em
28--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 28===================================================================
29+++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 29--- src.orig/ld/emultempl/elf32.em 2009-09-23 06:54:28.000000000 -0700
30@@ -692,6 +692,8 @@ 30+++ src/ld/emultempl/elf32.em 2009-10-06 10:58:16.883414592 -0700
31@@ -1237,6 +1237,8 @@ fragment <<EOF
31 && command_line.rpath == NULL) 32 && command_line.rpath == NULL)
32 { 33 {
33 lib_path = (const char *) getenv ("LD_RUN_PATH"); 34 lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -36,12 +37,12 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/
36 if (gld${EMULATION_NAME}_search_needed (lib_path, &n, 37 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
37 force)) 38 force))
38 break; 39 break;
39@@ -871,6 +873,8 @@ 40@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation (
40 rpath = command_line.rpath; 41 rpath = command_line.rpath;
41 if (rpath == NULL) 42 if (rpath == NULL)
42 rpath = (const char *) getenv ("LD_RUN_PATH"); 43 rpath = (const char *) getenv ("LD_RUN_PATH");
43+ if ((rpath) && (strlen (rpath) == 0)) 44+ if ((rpath) && (strlen (rpath) == 0))
44+ rpath = NULL; 45+ rpath = NULL;
45 if (! (bfd_elf_size_dynamic_sections 46
46 (output_bfd, command_line.soname, rpath, 47 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
47 command_line.filter_shlib, 48 {
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-gas-needs-libm.patch
index db838cf20c..db838cf20c 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-gas-needs-libm.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-x86_64_i386_biarch.patch
index 4cd9e22438..4cd9e22438 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-x86_64_i386_biarch.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch b/meta/recipes-devtools/binutils/binutils-2.21/libiberty_path_fix.patch
index 36a14d7a18..36a14d7a18 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/libiberty_path_fix.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch
new file mode 100644
index 0000000000..7b4d3903dc
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch
@@ -0,0 +1,18675 @@
1Index: binutils-2.21/libtool.m4
2===================================================================
3--- binutils-2.21.orig/libtool.m4
4+++ binutils-2.21/libtool.m4
5@@ -1,7 +1,8 @@
6 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
7 #
8 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
11+# Inc.
12 # Written by Gordon Matzigkeit, 1996
13 #
14 # This file is free software; the Free Software Foundation gives
15@@ -10,7 +11,8 @@
16
17 m4_define([_LT_COPYING], [dnl
18 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
19-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
21+# Inc.
22 # Written by Gordon Matzigkeit, 1996
23 #
24 # This file is part of GNU Libtool.
25@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
26 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
27 ])
28
29-# serial 56 LT_INIT
30+# serial 57 LT_INIT
31
32
33 # LT_PREREQ(VERSION)
34@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
35 LIBTOOL_DEPS="$ltmain"
36
37 # Always use our own libtool.
38-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
39+LIBTOOL='$(SHELL) $(top_builddir)'
40+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
41 AC_SUBST(LIBTOOL)dnl
42
43 _LT_SETUP
44@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
45 dnl
46 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
47 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
48+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
49 m4_require([_LT_CMD_RELOAD])dnl
50 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
51+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
52 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
53 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
54+m4_require([_LT_WITH_SYSROOT])dnl
55
56 _LT_CONFIG_LIBTOOL_INIT([
57 # See if we are running on zsh, and set the options which allow our
58@@ -199,7 +205,7 @@ aix3*)
59 esac
60
61 # Global variables:
62-ofile=libtool
63+ofile=${host_alias}-libtool
64 can_build_shared=yes
65
66 # All known linkers require a `.a' archive for static linking (except MSVC,
67@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
68 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
69 configured by $[0], generated by m4_PACKAGE_STRING.
70
71-Copyright (C) 2009 Free Software Foundation, Inc.
72+Copyright (C) 2010 Free Software Foundation, Inc.
73 This config.lt script is free software; the Free Software Foundation
74 gives unlimited permision to copy, distribute and modify it."
75
76@@ -746,15 +752,12 @@ _LT_EOF
77 # if finds mixed CR/LF and LF-only lines. Since sed operates in
78 # text mode, it properly converts lines to CR/LF. This bash problem
79 # is reportedly fixed, but why not run on old versions too?
80- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
81- || (rm -f "$cfgfile"; exit 1)
82+ sed '$q' "$ltmain" >> "$cfgfile" \
83+ || (rm -f "$cfgfile"; exit 1)
84
85- _LT_PROG_XSI_SHELLFNS
86+ _LT_PROG_REPLACE_SHELLFNS
87
88- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
89- || (rm -f "$cfgfile"; exit 1)
90-
91- mv -f "$cfgfile" "$ofile" ||
92+ mv -f "$cfgfile" "$ofile" ||
93 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
94 chmod +x "$ofile"
95 ],
96@@ -980,6 +983,8 @@ _LT_EOF
97 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
98 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
99 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
100+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
101+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
102 cat > conftest.c << _LT_EOF
103 int main() { return 0;}
104 _LT_EOF
105@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
106 fi
107 ])
108
109-# _LT_SYS_MODULE_PATH_AIX
110-# -----------------------
111+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
112+# ----------------------------------
113 # Links a minimal program and checks the executable
114 # for the system default hardcoded library path. In most cases,
115 # this is /usr/lib:/lib, but when the MPI compilers are used
116 # the location of the communication and MPI libs are included too.
117 # If we don't find anything, use the default library path according
118 # to the aix ld manual.
119+# Store the results from the different compilers for each TAGNAME.
120+# Allow to override them for all tags through lt_cv_aix_libpath.
121 m4_defun([_LT_SYS_MODULE_PATH_AIX],
122 [m4_require([_LT_DECL_SED])dnl
123-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
124-lt_aix_libpath_sed='
125- /Import File Strings/,/^$/ {
126- /^0/ {
127- s/^0 *\(.*\)$/\1/
128- p
129- }
130- }'
131-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
132-# Check for a 64-bit object if we didn't find anything.
133-if test -z "$aix_libpath"; then
134- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
135-fi],[])
136-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
137+if test "${lt_cv_aix_libpath+set}" = set; then
138+ aix_libpath=$lt_cv_aix_libpath
139+else
140+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
141+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
142+ lt_aix_libpath_sed='[
143+ /Import File Strings/,/^$/ {
144+ /^0/ {
145+ s/^0 *\([^ ]*\) *$/\1/
146+ p
147+ }
148+ }]'
149+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
150+ # Check for a 64-bit object if we didn't find anything.
151+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
152+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
153+ fi],[])
154+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
155+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
156+ fi
157+ ])
158+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
159+fi
160 ])# _LT_SYS_MODULE_PATH_AIX
161
162
163@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
164
165 AC_MSG_CHECKING([how to print strings])
166 # Test print first, because it will be a builtin if present.
167-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
168+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
169 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
170 ECHO='print -r --'
171 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
172@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
173 ])# _LT_PROG_ECHO_BACKSLASH
174
175
176+# _LT_WITH_SYSROOT
177+# ----------------
178+AC_DEFUN([_LT_WITH_SYSROOT],
179+[AC_MSG_CHECKING([for sysroot])
180+AC_ARG_WITH([libtool-sysroot],
181+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
182+ (or the compiler's sysroot if not specified).],
183+[], [with_libtool_sysroot=no])
184+
185+dnl lt_sysroot will always be passed unquoted. We quote it here
186+dnl in case the user passed a directory name.
187+lt_sysroot=
188+case ${with_libtool_sysroot} in #(
189+ yes)
190+ if test "$GCC" = yes; then
191+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
192+ fi
193+ ;; #(
194+ /*)
195+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
196+ ;; #(
197+ no|'')
198+ ;; #(
199+ *)
200+ AC_MSG_RESULT([${with_libtool_sysroot}])
201+ AC_MSG_ERROR([The sysroot must be an absolute path.])
202+ ;;
203+esac
204+
205+ AC_MSG_RESULT([${lt_sysroot:-no}])
206+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
207+[dependent libraries, and in which our libraries should be installed.])])
208+
209 # _LT_ENABLE_LOCK
210 # ---------------
211 m4_defun([_LT_ENABLE_LOCK],
212@@ -1307,14 +1356,47 @@ need_locks="$enable_libtool_lock"
213 ])# _LT_ENABLE_LOCK
214
215
216+# _LT_PROG_AR
217+# -----------
218+m4_defun([_LT_PROG_AR],
219+[AC_CHECK_TOOLS(AR, [ar], false)
220+: ${AR=ar}
221+: ${AR_FLAGS=cru}
222+_LT_DECL([], [AR], [1], [The archiver])
223+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
224+
225+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
226+ [lt_cv_ar_at_file=no
227+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
228+ [echo conftest.$ac_objext > conftest.lst
229+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
230+ AC_TRY_EVAL([lt_ar_try])
231+ if test "$ac_status" -eq 0; then
232+ # Ensure the archiver fails upon bogus file names.
233+ rm -f conftest.$ac_objext libconftest.a
234+ AC_TRY_EVAL([lt_ar_try])
235+ if test "$ac_status" -ne 0; then
236+ lt_cv_ar_at_file=@
237+ fi
238+ fi
239+ rm -f conftest.* libconftest.a
240+ ])
241+ ])
242+
243+if test "x$lt_cv_ar_at_file" = xno; then
244+ archiver_list_spec=
245+else
246+ archiver_list_spec=$lt_cv_ar_at_file
247+fi
248+_LT_DECL([], [archiver_list_spec], [1],
249+ [How to feed a file listing to the archiver])
250+])# _LT_PROG_AR
251+
252+
253 # _LT_CMD_OLD_ARCHIVE
254 # -------------------
255 m4_defun([_LT_CMD_OLD_ARCHIVE],
256-[AC_CHECK_TOOL(AR, ar, false)
257-test -z "$AR" && AR=ar
258-test -z "$AR_FLAGS" && AR_FLAGS=cru
259-_LT_DECL([], [AR], [1], [The archiver])
260-_LT_DECL([], [AR_FLAGS], [1])
261+[_LT_PROG_AR
262
263 AC_CHECK_TOOL(STRIP, strip, :)
264 test -z "$STRIP" && STRIP=:
265@@ -1610,7 +1692,7 @@ else
266 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
267 lt_status=$lt_dlunknown
268 cat > conftest.$ac_ext <<_LT_EOF
269-[#line __oline__ "configure"
270+[#line $LINENO "configure"
271 #include "confdefs.h"
272
273 #if HAVE_DLFCN_H
274@@ -1654,10 +1736,10 @@ else
275 /* When -fvisbility=hidden is used, assume the code has been annotated
276 correspondingly for the symbols needed. */
277 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
278-void fnord () __attribute__((visibility("default")));
279+int fnord () __attribute__((visibility("default")));
280 #endif
281
282-void fnord () { int i=42; }
283+int fnord () { return 42; }
284 int main ()
285 {
286 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
287@@ -2197,8 +2279,9 @@ cygwin* | mingw* | pw32* | cegcc*)
288 need_version=no
289 need_lib_prefix=no
290
291- case $GCC,$host_os in
292- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
293+ case $GCC,$cc_basename in
294+ yes,*)
295+ # gcc
296 library_names_spec='$libname.dll.a'
297 # DLL is installed to $(libdir)/../bin by postinstall_cmds
298 postinstall_cmds='base_file=`basename \${file}`~
299@@ -2231,13 +2314,71 @@ m4_if([$1], [],[
300 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
301 ;;
302 esac
303+ dynamic_linker='Win32 ld.exe'
304+ ;;
305+
306+ *,cl*)
307+ # Native MSVC
308+ libname_spec='$name'
309+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
310+ library_names_spec='${libname}.dll.lib'
311+
312+ case $build_os in
313+ mingw*)
314+ sys_lib_search_path_spec=
315+ lt_save_ifs=$IFS
316+ IFS=';'
317+ for lt_path in $LIB
318+ do
319+ IFS=$lt_save_ifs
320+ # Let DOS variable expansion print the short 8.3 style file name.
321+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
322+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
323+ done
324+ IFS=$lt_save_ifs
325+ # Convert to MSYS style.
326+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
327+ ;;
328+ cygwin*)
329+ # Convert to unix form, then to dos form, then back to unix form
330+ # but this time dos style (no spaces!) so that the unix form looks
331+ # like /cygdrive/c/PROGRA~1:/cygdr...
332+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
333+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
334+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
335+ ;;
336+ *)
337+ sys_lib_search_path_spec="$LIB"
338+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
339+ # It is most probably a Windows format PATH.
340+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
341+ else
342+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
343+ fi
344+ # FIXME: find the short name or the path components, as spaces are
345+ # common. (e.g. "Program Files" -> "PROGRA~1")
346+ ;;
347+ esac
348+
349+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
350+ postinstall_cmds='base_file=`basename \${file}`~
351+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
352+ dldir=$destdir/`dirname \$dlpath`~
353+ test -d \$dldir || mkdir -p \$dldir~
354+ $install_prog $dir/$dlname \$dldir/$dlname'
355+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
356+ dlpath=$dir/\$dldll~
357+ $RM \$dlpath'
358+ shlibpath_overrides_runpath=yes
359+ dynamic_linker='Win32 link.exe'
360 ;;
361
362 *)
363+ # Assume MSVC wrapper
364 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
365+ dynamic_linker='Win32 ld.exe'
366 ;;
367 esac
368- dynamic_linker='Win32 ld.exe'
369 # FIXME: first we should search . and the directory the executable is in
370 shlibpath_var=PATH
371 ;;
372@@ -2333,7 +2474,7 @@ haiku*)
373 soname_spec='${libname}${release}${shared_ext}$major'
374 shlibpath_var=LIBRARY_PATH
375 shlibpath_overrides_runpath=yes
376- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
377+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
378 hardcode_into_libs=yes
379 ;;
380
381@@ -2941,6 +3082,11 @@ case $reload_flag in
382 esac
383 reload_cmds='$LD$reload_flag -o $output$reload_objs'
384 case $host_os in
385+ cygwin* | mingw* | pw32* | cegcc*)
386+ if test "$GCC" != yes; then
387+ reload_cmds=false
388+ fi
389+ ;;
390 darwin*)
391 if test "$GCC" = yes; then
392 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
393@@ -3007,7 +3153,8 @@ mingw* | pw32*)
394 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
395 lt_cv_file_magic_cmd='func_win32_libid'
396 else
397- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
398+ # Keep this pattern in sync with the one in func_win32_libid.
399+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
400 lt_cv_file_magic_cmd='$OBJDUMP -f'
401 fi
402 ;;
403@@ -3158,6 +3305,21 @@ tpf*)
404 ;;
405 esac
406 ])
407+
408+file_magic_glob=
409+want_nocaseglob=no
410+if test "$build" = "$host"; then
411+ case $host_os in
412+ mingw* | pw32*)
413+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
414+ want_nocaseglob=yes
415+ else
416+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
417+ fi
418+ ;;
419+ esac
420+fi
421+
422 file_magic_cmd=$lt_cv_file_magic_cmd
423 deplibs_check_method=$lt_cv_deplibs_check_method
424 test -z "$deplibs_check_method" && deplibs_check_method=unknown
425@@ -3165,7 +3327,11 @@ test -z "$deplibs_check_method" && depli
426 _LT_DECL([], [deplibs_check_method], [1],
427 [Method to check whether dependent libraries are shared objects])
428 _LT_DECL([], [file_magic_cmd], [1],
429- [Command to use when deplibs_check_method == "file_magic"])
430+ [Command to use when deplibs_check_method = "file_magic"])
431+_LT_DECL([], [file_magic_glob], [1],
432+ [How to find potential files when deplibs_check_method = "file_magic"])
433+_LT_DECL([], [want_nocaseglob], [1],
434+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
435 ])# _LT_CHECK_MAGIC_METHOD
436
437
438@@ -3268,6 +3434,67 @@ dnl aclocal-1.4 backwards compatibility:
439 dnl AC_DEFUN([AM_PROG_NM], [])
440 dnl AC_DEFUN([AC_PROG_NM], [])
441
442+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
443+# --------------------------------
444+# how to determine the name of the shared library
445+# associated with a specific link library.
446+# -- PORTME fill in with the dynamic library characteristics
447+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
448+[m4_require([_LT_DECL_EGREP])
449+m4_require([_LT_DECL_OBJDUMP])
450+m4_require([_LT_DECL_DLLTOOL])
451+AC_CACHE_CHECK([how to associate runtime and link libraries],
452+lt_cv_sharedlib_from_linklib_cmd,
453+[lt_cv_sharedlib_from_linklib_cmd='unknown'
454+
455+case $host_os in
456+cygwin* | mingw* | pw32* | cegcc*)
457+ # two different shell functions defined in ltmain.sh
458+ # decide which to use based on capabilities of $DLLTOOL
459+ case `$DLLTOOL --help 2>&1` in
460+ *--identify-strict*)
461+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
462+ ;;
463+ *)
464+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
465+ ;;
466+ esac
467+ ;;
468+*)
469+ # fallback: assume linklib IS sharedlib
470+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
471+ ;;
472+esac
473+])
474+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
475+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
476+
477+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
478+ [Command to associate shared and link libraries])
479+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
480+
481+
482+# _LT_PATH_MANIFEST_TOOL
483+# ----------------------
484+# locate the manifest tool
485+m4_defun([_LT_PATH_MANIFEST_TOOL],
486+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
487+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
488+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
489+ [lt_cv_path_mainfest_tool=no
490+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
491+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
492+ cat conftest.err >&AS_MESSAGE_LOG_FD
493+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
494+ lt_cv_path_mainfest_tool=yes
495+ fi
496+ rm -f conftest*])
497+if test "x$lt_cv_path_mainfest_tool" != xyes; then
498+ MANIFEST_TOOL=:
499+fi
500+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
501+])# _LT_PATH_MANIFEST_TOOL
502+
503
504 # LT_LIB_M
505 # --------
506@@ -3394,8 +3621,8 @@ esac
507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
508
509 # Transform an extracted symbol line into symbol name and symbol address
510-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
511-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
512+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
513+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
514
515 # Handle CRLF in mingw tool chain
516 opt_cr=
517@@ -3431,6 +3658,7 @@ for ac_symprfx in "" "_"; do
518 else
519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
520 fi
521+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
522
523 # Check to see that the pipe works correctly.
524 pipe_works=no
525@@ -3464,6 +3692,18 @@ _LT_EOF
526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
528 cat <<_LT_EOF > conftest.$ac_ext
529+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
530+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
531+/* DATA imports from DLLs on WIN32 con't be const, because runtime
532+ relocations are performed -- see ld's documentation on pseudo-relocs. */
533+# define LT@&t@_DLSYM_CONST
534+#elif defined(__osf__)
535+/* This system does not cope well with relocations in const data. */
536+# define LT@&t@_DLSYM_CONST
537+#else
538+# define LT@&t@_DLSYM_CONST const
539+#endif
540+
541 #ifdef __cplusplus
542 extern "C" {
543 #endif
544@@ -3475,7 +3715,7 @@ _LT_EOF
545 cat <<_LT_EOF >> conftest.$ac_ext
546
547 /* The mapping between symbol names and symbols. */
548-const struct {
549+LT@&t@_DLSYM_CONST struct {
550 const char *name;
551 void *address;
552 }
553@@ -3501,15 +3741,15 @@ static const void *lt_preloaded_setup()
554 _LT_EOF
555 # Now try linking the two files.
556 mv conftest.$ac_objext conftstm.$ac_objext
557- lt_save_LIBS="$LIBS"
558- lt_save_CFLAGS="$CFLAGS"
559+ lt_globsym_save_LIBS=$LIBS
560+ lt_globsym_save_CFLAGS=$CFLAGS
561 LIBS="conftstm.$ac_objext"
562 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
563 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
564 pipe_works=yes
565 fi
566- LIBS="$lt_save_LIBS"
567- CFLAGS="$lt_save_CFLAGS"
568+ LIBS=$lt_globsym_save_LIBS
569+ CFLAGS=$lt_globsym_save_CFLAGS
570 else
571 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
572 fi
573@@ -3542,6 +3782,13 @@ else
574 AC_MSG_RESULT(ok)
575 fi
576
577+# Response file support.
578+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
579+ nm_file_list_spec='@'
580+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
581+ nm_file_list_spec='@'
582+fi
583+
584 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
585 [Take the output of nm and produce a listing of raw symbols and C names])
586 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
587@@ -3552,6 +3799,8 @@ _LT_DECL([global_symbol_to_c_name_addres
588 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
589 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
590 [Transform the output of nm in a C name address pair when lib prefix is needed])
591+_LT_DECL([], [nm_file_list_spec], [1],
592+ [Specify filename containing input files for $NM])
593 ]) # _LT_CMD_GLOBAL_SYMBOLS
594
595
596@@ -3563,7 +3812,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
597 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
598 _LT_TAGVAR(lt_prog_compiler_static, $1)=
599
600-AC_MSG_CHECKING([for $compiler option to produce PIC])
601 m4_if([$1], [CXX], [
602 # C++ specific cases for pic, static, wl, etc.
603 if test "$GXX" = yes; then
604@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [
605 ;;
606 esac
607 ;;
608+ mingw* | cygwin* | os2* | pw32* | cegcc*)
609+ # This hack is so that the source file can tell whether it is being
610+ # built for inclusion in a dll (and should export symbols for example).
611+ m4_if([$1], [GCJ], [],
612+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
613+ ;;
614 dgux*)
615 case $cc_basename in
616 ec++*)
617@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [
618 ;;
619 solaris*)
620 case $cc_basename in
621- CC*)
622+ CC* | sunCC*)
623 # Sun C++ 4.2, 5.x and Centerline C++
624 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
625 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
626@@ -4042,6 +4296,12 @@ m4_if([$1], [CXX], [
627 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
628 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
629 ;;
630+ nagfor*)
631+ # NAG Fortran compiler
632+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
633+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
634+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
635+ ;;
636 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
637 # Portland Group compilers (*not* the Pentium gcc compiler,
638 # which looks to be a dead project)
639@@ -4104,7 +4364,7 @@ m4_if([$1], [CXX], [
640 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
641 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
642 case $cc_basename in
643- f77* | f90* | f95*)
644+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
645 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
646 *)
647 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
648@@ -4161,9 +4421,11 @@ case $host_os in
649 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
650 ;;
651 esac
652-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
653-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
654- [How to pass a linker flag through the compiler])
655+
656+AC_CACHE_CHECK([for $compiler option to produce PIC],
657+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
658+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
659+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
660
661 #
662 # Check to make sure the PIC flag actually works.
663@@ -4182,6 +4444,8 @@ fi
664 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
665 [Additional compiler flags for building library objects])
666
667+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
668+ [How to pass a linker flag through the compiler])
669 #
670 # Check to make sure the static flag actually works.
671 #
672@@ -4202,6 +4466,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
673 m4_defun([_LT_LINKER_SHLIBS],
674 [AC_REQUIRE([LT_PATH_LD])dnl
675 AC_REQUIRE([LT_PATH_NM])dnl
676+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
677 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
678 m4_require([_LT_DECL_EGREP])dnl
679 m4_require([_LT_DECL_SED])dnl
680@@ -4210,6 +4475,7 @@ m4_require([_LT_TAG_COMPILER])dnl
681 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
682 m4_if([$1], [CXX], [
683 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
684+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
685 case $host_os in
686 aix[[4-9]]*)
687 # If we're using GNU nm, then we don't want the "-C" option.
688@@ -4224,15 +4490,20 @@ m4_if([$1], [CXX], [
689 ;;
690 pw32*)
691 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
692- ;;
693+ ;;
694 cygwin* | mingw* | cegcc*)
695- _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'
696- ;;
697+ case $cc_basename in
698+ cl*) ;;
699+ *)
700+ _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'
701+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
702+ ;;
703+ esac
704+ ;;
705 *)
706 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
707- ;;
708+ ;;
709 esac
710- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
711 ], [
712 runpath_var=
713 _LT_TAGVAR(allow_undefined_flag, $1)=
714@@ -4400,7 +4671,8 @@ _LT_EOF
715 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
716 _LT_TAGVAR(always_export_symbols, $1)=no
717 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
718- _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'
719+ _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'
720+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
721
722 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
723 _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'
724@@ -4448,7 +4720,7 @@ _LT_EOF
725 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
726 && test "$tmp_diet" = no
727 then
728- tmp_addflag=
729+ tmp_addflag=' $pic_flag'
730 tmp_sharedflag='-shared'
731 case $cc_basename,$host_cpu in
732 pgcc*) # Portland Group C compiler
733@@ -4499,12 +4771,12 @@ _LT_EOF
734 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
735 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
736 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
737- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
738+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
739 if test "x$supports_anon_versioning" = xyes; then
740 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
741 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
742 echo "local: *; };" >> $output_objdir/$libname.ver~
743- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
744+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
745 fi
746 ;;
747 esac
748@@ -4518,8 +4790,8 @@ _LT_EOF
749 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
750 wlarc=
751 else
752- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
753- _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'
754+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
755+ _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'
756 fi
757 ;;
758
759@@ -4537,8 +4809,8 @@ _LT_EOF
760
761 _LT_EOF
762 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
763- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
764- _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'
765+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
766+ _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'
767 else
768 _LT_TAGVAR(ld_shlibs, $1)=no
769 fi
770@@ -4584,8 +4856,8 @@ _LT_EOF
771
772 *)
773 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
774- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
775- _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'
776+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
777+ _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'
778 else
779 _LT_TAGVAR(ld_shlibs, $1)=no
780 fi
781@@ -4715,7 +4987,7 @@ _LT_EOF
782 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
783 # Determine the default libpath from the value encoded in an
784 # empty executable.
785- _LT_SYS_MODULE_PATH_AIX
786+ _LT_SYS_MODULE_PATH_AIX([$1])
787 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
788 _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"
789 else
790@@ -4726,7 +4998,7 @@ _LT_EOF
791 else
792 # Determine the default libpath from the value encoded in an
793 # empty executable.
794- _LT_SYS_MODULE_PATH_AIX
795+ _LT_SYS_MODULE_PATH_AIX([$1])
796 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
797 # Warning - without using the other run time loading flags,
798 # -berok will link without error, but may produce a broken library.
799@@ -4770,20 +5042,63 @@ _LT_EOF
800 # Microsoft Visual C++.
801 # hardcode_libdir_flag_spec is actually meaningless, as there is
802 # no search path for DLLs.
803- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
804- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
805- # Tell ltmain to make .lib files, not .a files.
806- libext=lib
807- # Tell ltmain to make .dll files, not .so files.
808- shrext_cmds=".dll"
809- # FIXME: Setting linknames here is a bad hack.
810- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
811- # The linker will automatically build a .lib file if we build a DLL.
812- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
813- # FIXME: Should let the user specify the lib program.
814- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
815- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
816- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
817+ case $cc_basename in
818+ cl*)
819+ # Native MSVC
820+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
821+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
822+ _LT_TAGVAR(always_export_symbols, $1)=yes
823+ _LT_TAGVAR(file_list_spec, $1)='@'
824+ # Tell ltmain to make .lib files, not .a files.
825+ libext=lib
826+ # Tell ltmain to make .dll files, not .so files.
827+ shrext_cmds=".dll"
828+ # FIXME: Setting linknames here is a bad hack.
829+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
830+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
831+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
832+ else
833+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
834+ fi~
835+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
836+ linknames='
837+ # The linker will not automatically build a static lib if we build a DLL.
838+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
839+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
840+ _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'
841+ # Don't use ranlib
842+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
843+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
844+ lt_tool_outputfile="@TOOL_OUTPUT@"~
845+ case $lt_outputfile in
846+ *.exe|*.EXE) ;;
847+ *)
848+ lt_outputfile="$lt_outputfile.exe"
849+ lt_tool_outputfile="$lt_tool_outputfile.exe"
850+ ;;
851+ esac~
852+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
853+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
854+ $RM "$lt_outputfile.manifest";
855+ fi'
856+ ;;
857+ *)
858+ # Assume MSVC wrapper
859+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
860+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
861+ # Tell ltmain to make .lib files, not .a files.
862+ libext=lib
863+ # Tell ltmain to make .dll files, not .so files.
864+ shrext_cmds=".dll"
865+ # FIXME: Setting linknames here is a bad hack.
866+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
867+ # The linker will automatically build a .lib file if we build a DLL.
868+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
869+ # FIXME: Should let the user specify the lib program.
870+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
871+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
872+ ;;
873+ esac
874 ;;
875
876 darwin* | rhapsody*)
877@@ -4821,7 +5136,7 @@ _LT_EOF
878
879 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
880 freebsd* | dragonfly*)
881- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
882+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
883 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
884 _LT_TAGVAR(hardcode_direct, $1)=yes
885 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
886@@ -4829,7 +5144,7 @@ _LT_EOF
887
888 hpux9*)
889 if test "$GCC" = yes; then
890- _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'
891+ _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'
892 else
893 _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'
894 fi
895@@ -4845,7 +5160,7 @@ _LT_EOF
896
897 hpux10*)
898 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
899- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
900+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
901 else
902 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
903 fi
904@@ -4869,10 +5184,10 @@ _LT_EOF
905 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
906 ;;
907 ia64*)
908- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
909+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
910 ;;
911 *)
912- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
913+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
914 ;;
915 esac
916 else
917@@ -4919,16 +5234,31 @@ _LT_EOF
918
919 irix5* | irix6* | nonstopux*)
920 if test "$GCC" = yes; then
921- _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'
922+ _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'
923 # Try to use the -exported_symbol ld option, if it does not
924 # work, assume that -exports_file does not work either and
925 # implicitly export all symbols.
926- save_LDFLAGS="$LDFLAGS"
927- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
928- AC_LINK_IFELSE(int foo(void) {},
929- _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'
930- )
931- LDFLAGS="$save_LDFLAGS"
932+ # This should be the same for all languages, so no per-tag cache variable.
933+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
934+ [lt_cv_irix_exported_symbol],
935+ [save_LDFLAGS="$LDFLAGS"
936+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
937+ AC_LINK_IFELSE(
938+ [AC_LANG_SOURCE(
939+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
940+ [C++], [[int foo (void) { return 0; }]],
941+ [Fortran 77], [[
942+ subroutine foo
943+ end]],
944+ [Fortran], [[
945+ subroutine foo
946+ end]])])],
947+ [lt_cv_irix_exported_symbol=yes],
948+ [lt_cv_irix_exported_symbol=no])
949+ LDFLAGS="$save_LDFLAGS"])
950+ if test "$lt_cv_irix_exported_symbol" = yes; then
951+ _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'
952+ fi
953 else
954 _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'
955 _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'
956@@ -5013,7 +5343,7 @@ _LT_EOF
957 osf4* | osf5*) # as osf3* with the addition of -msym flag
958 if test "$GCC" = yes; then
959 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
960- _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'
961+ _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'
962 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
963 else
964 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
965@@ -5032,9 +5362,9 @@ _LT_EOF
966 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
967 if test "$GCC" = yes; then
968 wlarc='${wl}'
969- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
970+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
971 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
972- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
973+ $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'
974 else
975 case `$CC -V 2>&1` in
976 *"Compilers 5.0"*)
977@@ -5306,8 +5636,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
978 to runtime path list])
979 _LT_TAGDECL([], [link_all_deplibs], [0],
980 [Whether libtool must link a program against all its dependency libraries])
981-_LT_TAGDECL([], [fix_srcfile_path], [1],
982- [Fix the shell variable $srcfile for the compiler])
983 _LT_TAGDECL([], [always_export_symbols], [0],
984 [Set to "yes" if exported symbols are required])
985 _LT_TAGDECL([], [export_symbols_cmds], [2],
986@@ -5318,6 +5646,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
987 [Symbols that must always be exported])
988 _LT_TAGDECL([], [prelink_cmds], [2],
989 [Commands necessary for linking programs (against libraries) with templates])
990+_LT_TAGDECL([], [postlink_cmds], [2],
991+ [Commands necessary for finishing linking programs])
992 _LT_TAGDECL([], [file_list_spec], [1],
993 [Specify filename containing input files])
994 dnl FIXME: Not yet implemented
995@@ -5419,6 +5749,7 @@ CC="$lt_save_CC"
996 m4_defun([_LT_LANG_CXX_CONFIG],
997 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
998 m4_require([_LT_DECL_EGREP])dnl
999+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1000 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1001 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1002 (test "X$CXX" != "Xg++"))) ; then
1003@@ -5480,6 +5811,7 @@ if test "$_lt_caught_CXX_error" != yes;
1004
1005 # Allow CC to be a program name with arguments.
1006 lt_save_CC=$CC
1007+ lt_save_CFLAGS=$CFLAGS
1008 lt_save_LD=$LD
1009 lt_save_GCC=$GCC
1010 GCC=$GXX
1011@@ -5497,6 +5829,7 @@ if test "$_lt_caught_CXX_error" != yes;
1012 fi
1013 test -z "${LDCXX+set}" || LD=$LDCXX
1014 CC=${CXX-"c++"}
1015+ CFLAGS=$CXXFLAGS
1016 compiler=$CC
1017 _LT_TAGVAR(compiler, $1)=$CC
1018 _LT_CC_BASENAME([$compiler])
1019@@ -5518,8 +5851,8 @@ if test "$_lt_caught_CXX_error" != yes;
1020 # Check if GNU C++ uses GNU ld as the underlying linker, since the
1021 # archiving commands below assume that GNU ld is being used.
1022 if test "$with_gnu_ld" = yes; then
1023- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1024- _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'
1025+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1026+ _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'
1027
1028 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1029 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1030@@ -5660,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes;
1031 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
1032 # Determine the default libpath from the value encoded in an empty
1033 # executable.
1034- _LT_SYS_MODULE_PATH_AIX
1035+ _LT_SYS_MODULE_PATH_AIX([$1])
1036 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1037
1038 _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"
1039@@ -5672,7 +6005,7 @@ if test "$_lt_caught_CXX_error" != yes;
1040 else
1041 # Determine the default libpath from the value encoded in an
1042 # empty executable.
1043- _LT_SYS_MODULE_PATH_AIX
1044+ _LT_SYS_MODULE_PATH_AIX([$1])
1045 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1046 # Warning - without using the other run time loading flags,
1047 # -berok will link without error, but may produce a broken library.
1048@@ -5714,29 +6047,75 @@ if test "$_lt_caught_CXX_error" != yes;
1049 ;;
1050
1051 cygwin* | mingw* | pw32* | cegcc*)
1052- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1053- # as there is no search path for DLLs.
1054- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1055- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1056- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1057- _LT_TAGVAR(always_export_symbols, $1)=no
1058- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1059-
1060- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1061- _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'
1062- # If the export-symbols file already is a .def file (1st line
1063- # is EXPORTS), use it as is; otherwise, prepend...
1064- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1065- cp $export_symbols $output_objdir/$soname.def;
1066- else
1067- echo EXPORTS > $output_objdir/$soname.def;
1068- cat $export_symbols >> $output_objdir/$soname.def;
1069- fi~
1070- $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'
1071- else
1072- _LT_TAGVAR(ld_shlibs, $1)=no
1073- fi
1074- ;;
1075+ case $GXX,$cc_basename in
1076+ ,cl* | no,cl*)
1077+ # Native MSVC
1078+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1079+ # no search path for DLLs.
1080+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1081+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1082+ _LT_TAGVAR(always_export_symbols, $1)=yes
1083+ _LT_TAGVAR(file_list_spec, $1)='@'
1084+ # Tell ltmain to make .lib files, not .a files.
1085+ libext=lib
1086+ # Tell ltmain to make .dll files, not .so files.
1087+ shrext_cmds=".dll"
1088+ # FIXME: Setting linknames here is a bad hack.
1089+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1090+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1091+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1092+ else
1093+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1094+ fi~
1095+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1096+ linknames='
1097+ # The linker will not automatically build a static lib if we build a DLL.
1098+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1099+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1100+ # Don't use ranlib
1101+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1102+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
1103+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1104+ case $lt_outputfile in
1105+ *.exe|*.EXE) ;;
1106+ *)
1107+ lt_outputfile="$lt_outputfile.exe"
1108+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1109+ ;;
1110+ esac~
1111+ func_to_tool_file "$lt_outputfile"~
1112+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1113+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1114+ $RM "$lt_outputfile.manifest";
1115+ fi'
1116+ ;;
1117+ *)
1118+ # g++
1119+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1120+ # as there is no search path for DLLs.
1121+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1122+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1123+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1124+ _LT_TAGVAR(always_export_symbols, $1)=no
1125+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1126+
1127+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1128+ _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'
1129+ # If the export-symbols file already is a .def file (1st line
1130+ # is EXPORTS), use it as is; otherwise, prepend...
1131+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1132+ cp $export_symbols $output_objdir/$soname.def;
1133+ else
1134+ echo EXPORTS > $output_objdir/$soname.def;
1135+ cat $export_symbols >> $output_objdir/$soname.def;
1136+ fi~
1137+ $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'
1138+ else
1139+ _LT_TAGVAR(ld_shlibs, $1)=no
1140+ fi
1141+ ;;
1142+ esac
1143+ ;;
1144 darwin* | rhapsody*)
1145 _LT_DARWIN_LINKER_FEATURES($1)
1146 ;;
1147@@ -5811,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes;
1148 ;;
1149 *)
1150 if test "$GXX" = yes; then
1151- _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'
1152+ _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'
1153 else
1154 # FIXME: insert proper C++ library support
1155 _LT_TAGVAR(ld_shlibs, $1)=no
1156@@ -5882,10 +6261,10 @@ if test "$_lt_caught_CXX_error" != yes;
1157 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1158 ;;
1159 ia64*)
1160- _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'
1161+ _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'
1162 ;;
1163 *)
1164- _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'
1165+ _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'
1166 ;;
1167 esac
1168 fi
1169@@ -5926,9 +6305,9 @@ if test "$_lt_caught_CXX_error" != yes;
1170 *)
1171 if test "$GXX" = yes; then
1172 if test "$with_gnu_ld" = no; then
1173- _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'
1174+ _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'
1175 else
1176- _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'
1177+ _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'
1178 fi
1179 fi
1180 _LT_TAGVAR(link_all_deplibs, $1)=yes
1181@@ -5998,20 +6377,20 @@ if test "$_lt_caught_CXX_error" != yes;
1182 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1183 rm -rf $tpldir~
1184 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1185- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1186+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1187 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1188 rm -rf $tpldir~
1189 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1190- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1191+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1192 $RANLIB $oldlib'
1193 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1194 rm -rf $tpldir~
1195 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1196- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1197+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1198 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1199 rm -rf $tpldir~
1200 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1201- $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'
1202+ $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'
1203 ;;
1204 *) # Version 6 and above use weak symbols
1205 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1206@@ -6206,7 +6585,7 @@ if test "$_lt_caught_CXX_error" != yes;
1207 _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'
1208 ;;
1209 *)
1210- _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'
1211+ _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'
1212 ;;
1213 esac
1214
1215@@ -6252,7 +6631,7 @@ if test "$_lt_caught_CXX_error" != yes;
1216
1217 solaris*)
1218 case $cc_basename in
1219- CC*)
1220+ CC* | sunCC*)
1221 # Sun C++ 4.2, 5.x and Centerline C++
1222 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1223 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1224@@ -6293,9 +6672,9 @@ if test "$_lt_caught_CXX_error" != yes;
1225 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1226 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
1227 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
1228- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1229+ _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'
1230 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1231- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1232+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1233
1234 # Commands to make compiler produce verbose output that lists
1235 # what "hidden" libraries, object files and flags are used when
1236@@ -6424,6 +6803,7 @@ if test "$_lt_caught_CXX_error" != yes;
1237 fi # test -n "$compiler"
1238
1239 CC=$lt_save_CC
1240+ CFLAGS=$lt_save_CFLAGS
1241 LDCXX=$LD
1242 LD=$lt_save_LD
1243 GCC=$lt_save_GCC
1244@@ -6438,6 +6818,29 @@ AC_LANG_POP
1245 ])# _LT_LANG_CXX_CONFIG
1246
1247
1248+# _LT_FUNC_STRIPNAME_CNF
1249+# ----------------------
1250+# func_stripname_cnf prefix suffix name
1251+# strip PREFIX and SUFFIX off of NAME.
1252+# PREFIX and SUFFIX must not contain globbing or regex special
1253+# characters, hashes, percent signs, but SUFFIX may contain a leading
1254+# dot (in which case that matches only a dot).
1255+#
1256+# This function is identical to the (non-XSI) version of func_stripname,
1257+# except this one can be used by m4 code that may be executed by configure,
1258+# rather than the libtool script.
1259+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
1260+AC_REQUIRE([_LT_DECL_SED])
1261+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
1262+func_stripname_cnf ()
1263+{
1264+ case ${2} in
1265+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1266+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1267+ esac
1268+} # func_stripname_cnf
1269+])# _LT_FUNC_STRIPNAME_CNF
1270+
1271 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
1272 # ---------------------------------
1273 # Figure out "hidden" library dependencies from verbose
1274@@ -6446,6 +6849,7 @@ AC_LANG_POP
1275 # objects, libraries and library flags.
1276 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
1277 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1278+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
1279 # Dependencies to place before and after the object being linked:
1280 _LT_TAGVAR(predep_objects, $1)=
1281 _LT_TAGVAR(postdep_objects, $1)=
1282@@ -6496,6 +6900,13 @@ public class foo {
1283 };
1284 _LT_EOF
1285 ])
1286+
1287+_lt_libdeps_save_CFLAGS=$CFLAGS
1288+case "$CC $CFLAGS " in #(
1289+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1290+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1291+esac
1292+
1293 dnl Parse the compiler output and extract the necessary
1294 dnl objects, libraries and library flags.
1295 if AC_TRY_EVAL(ac_compile); then
1296@@ -6507,7 +6918,7 @@ if AC_TRY_EVAL(ac_compile); then
1297 pre_test_object_deps_done=no
1298
1299 for p in `eval "$output_verbose_link_cmd"`; do
1300- case $p in
1301+ case ${prev}${p} in
1302
1303 -L* | -R* | -l*)
1304 # Some compilers place space between "-{L,R}" and the path.
1305@@ -6516,13 +6927,22 @@ if AC_TRY_EVAL(ac_compile); then
1306 test $p = "-R"; then
1307 prev=$p
1308 continue
1309- else
1310- prev=
1311 fi
1312
1313+ # Expand the sysroot to ease extracting the directories later.
1314+ if test -z "$prev"; then
1315+ case $p in
1316+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
1317+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
1318+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
1319+ esac
1320+ fi
1321+ case $p in
1322+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
1323+ esac
1324 if test "$pre_test_object_deps_done" = no; then
1325- case $p in
1326- -L* | -R*)
1327+ case ${prev} in
1328+ -L | -R)
1329 # Internal compiler library paths should come after those
1330 # provided the user. The postdeps already come after the
1331 # user supplied libs so there is no need to process them.
1332@@ -6542,8 +6962,10 @@ if AC_TRY_EVAL(ac_compile); then
1333 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
1334 fi
1335 fi
1336+ prev=
1337 ;;
1338
1339+ *.lto.$objext) ;; # Ignore GCC LTO objects
1340 *.$objext)
1341 # This assumes that the test object file only shows up
1342 # once in the compiler output.
1343@@ -6579,6 +7001,7 @@ else
1344 fi
1345
1346 $RM -f confest.$objext
1347+CFLAGS=$_lt_libdeps_save_CFLAGS
1348
1349 # PORTME: override above test on systems where it is broken
1350 m4_if([$1], [CXX],
1351@@ -6615,7 +7038,7 @@ linux*)
1352
1353 solaris*)
1354 case $cc_basename in
1355- CC*)
1356+ CC* | sunCC*)
1357 # The more standards-conforming stlport4 library is
1358 # incompatible with the Cstd library. Avoid specifying
1359 # it if it's in CXXFLAGS. Ignore libCrun as
1360@@ -6728,7 +7151,9 @@ if test "$_lt_disable_F77" != yes; then
1361 # Allow CC to be a program name with arguments.
1362 lt_save_CC="$CC"
1363 lt_save_GCC=$GCC
1364+ lt_save_CFLAGS=$CFLAGS
1365 CC=${F77-"f77"}
1366+ CFLAGS=$FFLAGS
1367 compiler=$CC
1368 _LT_TAGVAR(compiler, $1)=$CC
1369 _LT_CC_BASENAME([$compiler])
1370@@ -6782,6 +7207,7 @@ if test "$_lt_disable_F77" != yes; then
1371
1372 GCC=$lt_save_GCC
1373 CC="$lt_save_CC"
1374+ CFLAGS="$lt_save_CFLAGS"
1375 fi # test "$_lt_disable_F77" != yes
1376
1377 AC_LANG_POP
1378@@ -6858,7 +7284,9 @@ if test "$_lt_disable_FC" != yes; then
1379 # Allow CC to be a program name with arguments.
1380 lt_save_CC="$CC"
1381 lt_save_GCC=$GCC
1382+ lt_save_CFLAGS=$CFLAGS
1383 CC=${FC-"f95"}
1384+ CFLAGS=$FCFLAGS
1385 compiler=$CC
1386 GCC=$ac_cv_fc_compiler_gnu
1387
1388@@ -6914,7 +7342,8 @@ if test "$_lt_disable_FC" != yes; then
1389 fi # test -n "$compiler"
1390
1391 GCC=$lt_save_GCC
1392- CC="$lt_save_CC"
1393+ CC=$lt_save_CC
1394+ CFLAGS=$lt_save_CFLAGS
1395 fi # test "$_lt_disable_FC" != yes
1396
1397 AC_LANG_POP
1398@@ -6951,10 +7380,12 @@ _LT_COMPILER_BOILERPLATE
1399 _LT_LINKER_BOILERPLATE
1400
1401 # Allow CC to be a program name with arguments.
1402-lt_save_CC="$CC"
1403+lt_save_CC=$CC
1404+lt_save_CFLAGS=$CFLAGS
1405 lt_save_GCC=$GCC
1406 GCC=yes
1407 CC=${GCJ-"gcj"}
1408+CFLAGS=$GCJFLAGS
1409 compiler=$CC
1410 _LT_TAGVAR(compiler, $1)=$CC
1411 _LT_TAGVAR(LD, $1)="$LD"
1412@@ -6985,7 +7416,8 @@ fi
1413 AC_LANG_RESTORE
1414
1415 GCC=$lt_save_GCC
1416-CC="$lt_save_CC"
1417+CC=$lt_save_CC
1418+CFLAGS=$lt_save_CFLAGS
1419 ])# _LT_LANG_GCJ_CONFIG
1420
1421
1422@@ -7020,9 +7452,11 @@ _LT_LINKER_BOILERPLATE
1423
1424 # Allow CC to be a program name with arguments.
1425 lt_save_CC="$CC"
1426+lt_save_CFLAGS=$CFLAGS
1427 lt_save_GCC=$GCC
1428 GCC=
1429 CC=${RC-"windres"}
1430+CFLAGS=
1431 compiler=$CC
1432 _LT_TAGVAR(compiler, $1)=$CC
1433 _LT_CC_BASENAME([$compiler])
1434@@ -7035,7 +7469,8 @@ fi
1435
1436 GCC=$lt_save_GCC
1437 AC_LANG_RESTORE
1438-CC="$lt_save_CC"
1439+CC=$lt_save_CC
1440+CFLAGS=$lt_save_CFLAGS
1441 ])# _LT_LANG_RC_CONFIG
1442
1443
1444@@ -7094,6 +7529,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
1445 AC_SUBST([OBJDUMP])
1446 ])
1447
1448+# _LT_DECL_DLLTOOL
1449+# ----------------
1450+# Ensure DLLTOOL variable is set.
1451+m4_defun([_LT_DECL_DLLTOOL],
1452+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1453+test -z "$DLLTOOL" && DLLTOOL=dlltool
1454+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
1455+AC_SUBST([DLLTOOL])
1456+])
1457
1458 # _LT_DECL_SED
1459 # ------------
1460@@ -7187,8 +7631,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
1461 # Try some XSI features
1462 xsi_shell=no
1463 ( _lt_dummy="a/b/c"
1464- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
1465- = c,a/b,, \
1466+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
1467+ = c,a/b,b/c, \
1468 && eval 'test $(( 1 + 1 )) -eq 2 \
1469 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
1470 && xsi_shell=yes
1471@@ -7227,206 +7671,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
1472 ])# _LT_CHECK_SHELL_FEATURES
1473
1474
1475-# _LT_PROG_XSI_SHELLFNS
1476-# ---------------------
1477-# Bourne and XSI compatible variants of some useful shell functions.
1478-m4_defun([_LT_PROG_XSI_SHELLFNS],
1479-[case $xsi_shell in
1480- yes)
1481- cat << \_LT_EOF >> "$cfgfile"
1482-
1483-# func_dirname file append nondir_replacement
1484-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1485-# otherwise set result to NONDIR_REPLACEMENT.
1486-func_dirname ()
1487-{
1488- case ${1} in
1489- */*) func_dirname_result="${1%/*}${2}" ;;
1490- * ) func_dirname_result="${3}" ;;
1491- esac
1492-}
1493-
1494-# func_basename file
1495-func_basename ()
1496-{
1497- func_basename_result="${1##*/}"
1498-}
1499-
1500-# func_dirname_and_basename file append nondir_replacement
1501-# perform func_basename and func_dirname in a single function
1502-# call:
1503-# dirname: Compute the dirname of FILE. If nonempty,
1504-# add APPEND to the result, otherwise set result
1505-# to NONDIR_REPLACEMENT.
1506-# value returned in "$func_dirname_result"
1507-# basename: Compute filename of FILE.
1508-# value retuned in "$func_basename_result"
1509-# Implementation must be kept synchronized with func_dirname
1510-# and func_basename. For efficiency, we do not delegate to
1511-# those functions but instead duplicate the functionality here.
1512-func_dirname_and_basename ()
1513-{
1514- case ${1} in
1515- */*) func_dirname_result="${1%/*}${2}" ;;
1516- * ) func_dirname_result="${3}" ;;
1517- esac
1518- func_basename_result="${1##*/}"
1519-}
1520-
1521-# func_stripname prefix suffix name
1522-# strip PREFIX and SUFFIX off of NAME.
1523-# PREFIX and SUFFIX must not contain globbing or regex special
1524-# characters, hashes, percent signs, but SUFFIX may contain a leading
1525-# dot (in which case that matches only a dot).
1526-func_stripname ()
1527-{
1528- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1529- # positional parameters, so assign one to ordinary parameter first.
1530- func_stripname_result=${3}
1531- func_stripname_result=${func_stripname_result#"${1}"}
1532- func_stripname_result=${func_stripname_result%"${2}"}
1533-}
1534-
1535-# func_opt_split
1536-func_opt_split ()
1537-{
1538- func_opt_split_opt=${1%%=*}
1539- func_opt_split_arg=${1#*=}
1540-}
1541-
1542-# func_lo2o object
1543-func_lo2o ()
1544-{
1545- case ${1} in
1546- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1547- *) func_lo2o_result=${1} ;;
1548- esac
1549-}
1550-
1551-# func_xform libobj-or-source
1552-func_xform ()
1553-{
1554- func_xform_result=${1%.*}.lo
1555-}
1556-
1557-# func_arith arithmetic-term...
1558-func_arith ()
1559-{
1560- func_arith_result=$(( $[*] ))
1561-}
1562-
1563-# func_len string
1564-# STRING may not start with a hyphen.
1565-func_len ()
1566-{
1567- func_len_result=${#1}
1568-}
1569-
1570-_LT_EOF
1571- ;;
1572- *) # Bourne compatible functions.
1573- cat << \_LT_EOF >> "$cfgfile"
1574-
1575-# func_dirname file append nondir_replacement
1576-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1577-# otherwise set result to NONDIR_REPLACEMENT.
1578-func_dirname ()
1579-{
1580- # Extract subdirectory from the argument.
1581- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1582- if test "X$func_dirname_result" = "X${1}"; then
1583- func_dirname_result="${3}"
1584- else
1585- func_dirname_result="$func_dirname_result${2}"
1586- fi
1587-}
1588-
1589-# func_basename file
1590-func_basename ()
1591-{
1592- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1593-}
1594+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
1595+# ------------------------------------------------------
1596+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
1597+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
1598+m4_defun([_LT_PROG_FUNCTION_REPLACE],
1599+[dnl {
1600+sed -e '/^$1 ()$/,/^} # $1 /c\
1601+$1 ()\
1602+{\
1603+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
1604+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
1605+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1606+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1607+test 0 -eq $? || _lt_function_replace_fail=:
1608+])
1609
1610-dnl func_dirname_and_basename
1611-dnl A portable version of this function is already defined in general.m4sh
1612-dnl so there is no need for it here.
1613
1614-# func_stripname prefix suffix name
1615-# strip PREFIX and SUFFIX off of NAME.
1616-# PREFIX and SUFFIX must not contain globbing or regex special
1617-# characters, hashes, percent signs, but SUFFIX may contain a leading
1618-# dot (in which case that matches only a dot).
1619-# func_strip_suffix prefix name
1620-func_stripname ()
1621-{
1622- case ${2} in
1623- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1624- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1625- esac
1626-}
1627+# _LT_PROG_REPLACE_SHELLFNS
1628+# -------------------------
1629+# Replace existing portable implementations of several shell functions with
1630+# equivalent extended shell implementations where those features are available..
1631+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
1632+[if test x"$xsi_shell" = xyes; then
1633+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
1634+ case ${1} in
1635+ */*) func_dirname_result="${1%/*}${2}" ;;
1636+ * ) func_dirname_result="${3}" ;;
1637+ esac])
1638+
1639+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
1640+ func_basename_result="${1##*/}"])
1641+
1642+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
1643+ case ${1} in
1644+ */*) func_dirname_result="${1%/*}${2}" ;;
1645+ * ) func_dirname_result="${3}" ;;
1646+ esac
1647+ func_basename_result="${1##*/}"])
1648
1649-# sed scripts:
1650-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
1651-my_sed_long_arg='1s/^-[[^=]]*=//'
1652+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
1653+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1654+ # positional parameters, so assign one to ordinary parameter first.
1655+ func_stripname_result=${3}
1656+ func_stripname_result=${func_stripname_result#"${1}"}
1657+ func_stripname_result=${func_stripname_result%"${2}"}])
1658+
1659+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
1660+ func_split_long_opt_name=${1%%=*}
1661+ func_split_long_opt_arg=${1#*=}])
1662+
1663+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
1664+ func_split_short_opt_arg=${1#??}
1665+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
1666+
1667+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
1668+ case ${1} in
1669+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1670+ *) func_lo2o_result=${1} ;;
1671+ esac])
1672
1673-# func_opt_split
1674-func_opt_split ()
1675-{
1676- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1677- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1678-}
1679+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
1680
1681-# func_lo2o object
1682-func_lo2o ()
1683-{
1684- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1685-}
1686+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
1687
1688-# func_xform libobj-or-source
1689-func_xform ()
1690-{
1691- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
1692-}
1693+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
1694+fi
1695
1696-# func_arith arithmetic-term...
1697-func_arith ()
1698-{
1699- func_arith_result=`expr "$[@]"`
1700-}
1701+if test x"$lt_shell_append" = xyes; then
1702+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
1703
1704-# func_len string
1705-# STRING may not start with a hyphen.
1706-func_len ()
1707-{
1708- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
1709-}
1710+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
1711+ func_quote_for_eval "${2}"
1712+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
1713+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
1714+
1715+ # Save a `func_append' function call where possible by direct use of '+='
1716+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1717+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1718+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1719+ test 0 -eq $? || _lt_function_replace_fail=:
1720+else
1721+ # Save a `func_append' function call even when '+=' is not available
1722+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1723+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1724+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1725+ test 0 -eq $? || _lt_function_replace_fail=:
1726+fi
1727
1728-_LT_EOF
1729-esac
1730+if test x"$_lt_function_replace_fail" = x":"; then
1731+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
1732+fi
1733+])
1734
1735-case $lt_shell_append in
1736- yes)
1737- cat << \_LT_EOF >> "$cfgfile"
1738-
1739-# func_append var value
1740-# Append VALUE to the end of shell variable VAR.
1741-func_append ()
1742-{
1743- eval "$[1]+=\$[2]"
1744-}
1745-_LT_EOF
1746+# _LT_PATH_CONVERSION_FUNCTIONS
1747+# -----------------------------
1748+# Determine which file name conversion functions should be used by
1749+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
1750+# for certain cross-compile configurations and native mingw.
1751+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
1752+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1753+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1754+AC_MSG_CHECKING([how to convert $build file names to $host format])
1755+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
1756+[case $host in
1757+ *-*-mingw* )
1758+ case $build in
1759+ *-*-mingw* ) # actually msys
1760+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
1761+ ;;
1762+ *-*-cygwin* )
1763+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
1764+ ;;
1765+ * ) # otherwise, assume *nix
1766+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
1767+ ;;
1768+ esac
1769 ;;
1770- *)
1771- cat << \_LT_EOF >> "$cfgfile"
1772-
1773-# func_append var value
1774-# Append VALUE to the end of shell variable VAR.
1775-func_append ()
1776-{
1777- eval "$[1]=\$$[1]\$[2]"
1778-}
1779-
1780-_LT_EOF
1781+ *-*-cygwin* )
1782+ case $build in
1783+ *-*-mingw* ) # actually msys
1784+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
1785+ ;;
1786+ *-*-cygwin* )
1787+ lt_cv_to_host_file_cmd=func_convert_file_noop
1788+ ;;
1789+ * ) # otherwise, assume *nix
1790+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
1791+ ;;
1792+ esac
1793 ;;
1794- esac
1795+ * ) # unhandled hosts (and "normal" native builds)
1796+ lt_cv_to_host_file_cmd=func_convert_file_noop
1797+ ;;
1798+esac
1799+])
1800+to_host_file_cmd=$lt_cv_to_host_file_cmd
1801+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
1802+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
1803+ [0], [convert $build file names to $host format])dnl
1804+
1805+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
1806+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
1807+[#assume ordinary cross tools, or native build.
1808+lt_cv_to_tool_file_cmd=func_convert_file_noop
1809+case $host in
1810+ *-*-mingw* )
1811+ case $build in
1812+ *-*-mingw* ) # actually msys
1813+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
1814+ ;;
1815+ esac
1816+ ;;
1817+esac
1818 ])
1819+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1820+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
1821+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
1822+ [0], [convert $build files to toolchain format])dnl
1823+])# _LT_PATH_CONVERSION_FUNCTIONS
1824Index: binutils-2.21/ltmain.sh
1825===================================================================
1826--- binutils-2.21.orig/ltmain.sh
1827+++ binutils-2.21/ltmain.sh
1828@@ -1,10 +1,9 @@
1829-# Generated from ltmain.m4sh.
1830
1831-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
1832+# libtool (GNU libtool) 2.4
1833 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1834
1835 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
1836-# 2007, 2008, 2009 Free Software Foundation, Inc.
1837+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
1838 # This is free software; see the source for copying conditions. There is NO
1839 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1840
1841@@ -38,7 +37,6 @@
1842 # -n, --dry-run display commands without modifying any files
1843 # --features display basic configuration information and exit
1844 # --mode=MODE use operation mode MODE
1845-# --no-finish let install mode avoid finish commands
1846 # --preserve-dup-deps don't remove duplicate dependency libraries
1847 # --quiet, --silent don't print informational messages
1848 # --no-quiet, --no-silent
1849@@ -71,17 +69,19 @@
1850 # compiler: $LTCC
1851 # compiler flags: $LTCFLAGS
1852 # linker: $LD (gnu? $with_gnu_ld)
1853-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
1854+# $progname: (GNU libtool) 2.4
1855 # automake: $automake_version
1856 # autoconf: $autoconf_version
1857 #
1858 # Report bugs to <bug-libtool@gnu.org>.
1859+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
1860+# General help using GNU software: <http://www.gnu.org/gethelp/>.
1861
1862 PROGRAM=libtool
1863 PACKAGE=libtool
1864-VERSION=2.2.7a
1865-TIMESTAMP=" 1.3134 2009-11-29"
1866-package_revision=1.3134
1867+VERSION=2.4
1868+TIMESTAMP=""
1869+package_revision=1.3293
1870
1871 # Be Bourne compatible
1872 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1873@@ -106,9 +106,6 @@ _LTECHO_EOF'
1874 }
1875
1876 # NLS nuisances: We save the old values to restore during execute mode.
1877-# Only set LANG and LC_ALL to C if already set.
1878-# These must not be set unconditionally because not all systems understand
1879-# e.g. LANG=C (notably SCO).
1880 lt_user_locale=
1881 lt_safe_locale=
1882 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
1883@@ -121,15 +118,13 @@ do
1884 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
1885 fi"
1886 done
1887+LC_ALL=C
1888+LANGUAGE=C
1889+export LANGUAGE LC_ALL
1890
1891 $lt_unset CDPATH
1892
1893
1894-
1895-
1896-
1897-
1898-
1899 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
1900 # is ksh but when the shell is invoked as "sh" and the current value of
1901 # the _XPG environment variable is not equal to 1 (one), the special
1902@@ -140,7 +135,7 @@ progpath="$0"
1903
1904
1905 : ${CP="cp -f"}
1906-: ${ECHO=$as_echo}
1907+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
1908 : ${EGREP="/bin/grep -E"}
1909 : ${FGREP="/bin/grep -F"}
1910 : ${GREP="/bin/grep"}
1911@@ -149,7 +144,7 @@ progpath="$0"
1912 : ${MKDIR="mkdir"}
1913 : ${MV="mv -f"}
1914 : ${RM="rm -f"}
1915-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
1916+: ${SED="/bin/sed"}
1917 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
1918 : ${Xsed="$SED -e 1s/^X//"}
1919
1920@@ -169,6 +164,27 @@ IFS=" $lt_nl"
1921 dirname="s,/[^/]*$,,"
1922 basename="s,^.*/,,"
1923
1924+# func_dirname file append nondir_replacement
1925+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1926+# otherwise set result to NONDIR_REPLACEMENT.
1927+func_dirname ()
1928+{
1929+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1930+ if test "X$func_dirname_result" = "X${1}"; then
1931+ func_dirname_result="${3}"
1932+ else
1933+ func_dirname_result="$func_dirname_result${2}"
1934+ fi
1935+} # func_dirname may be replaced by extended shell implementation
1936+
1937+
1938+# func_basename file
1939+func_basename ()
1940+{
1941+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1942+} # func_basename may be replaced by extended shell implementation
1943+
1944+
1945 # func_dirname_and_basename file append nondir_replacement
1946 # perform func_basename and func_dirname in a single function
1947 # call:
1948@@ -183,17 +199,31 @@ basename="s,^.*/,,"
1949 # those functions but instead duplicate the functionality here.
1950 func_dirname_and_basename ()
1951 {
1952- # Extract subdirectory from the argument.
1953- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1954- if test "X$func_dirname_result" = "X${1}"; then
1955- func_dirname_result="${3}"
1956- else
1957- func_dirname_result="$func_dirname_result${2}"
1958- fi
1959- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1960-}
1961+ # Extract subdirectory from the argument.
1962+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1963+ if test "X$func_dirname_result" = "X${1}"; then
1964+ func_dirname_result="${3}"
1965+ else
1966+ func_dirname_result="$func_dirname_result${2}"
1967+ fi
1968+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1969+} # func_dirname_and_basename may be replaced by extended shell implementation
1970+
1971+
1972+# func_stripname prefix suffix name
1973+# strip PREFIX and SUFFIX off of NAME.
1974+# PREFIX and SUFFIX must not contain globbing or regex special
1975+# characters, hashes, percent signs, but SUFFIX may contain a leading
1976+# dot (in which case that matches only a dot).
1977+# func_strip_suffix prefix name
1978+func_stripname ()
1979+{
1980+ case ${2} in
1981+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1982+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1983+ esac
1984+} # func_stripname may be replaced by extended shell implementation
1985
1986-# Generated shell functions inserted here.
1987
1988 # These SED scripts presuppose an absolute path with a trailing slash.
1989 pathcar='s,^/\([^/]*\).*$,\1,'
1990@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
1991 # Same as above, but do not quote variable references.
1992 double_quote_subst='s/\(["`\\]\)/\\\1/g'
1993
1994+# Sed substitution that turns a string into a regex matching for the
1995+# string literally.
1996+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
1997+
1998+# Sed substitution that converts a w32 file name or path
1999+# which contains forward slashes, into one that contains
2000+# (escaped) backslashes. A very naive implementation.
2001+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2002+
2003 # Re-`\' parameter expansions in output of double_quote_subst that were
2004 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
2005 # in input to double_quote_subst, that '$' was protected from expansion.
2006@@ -404,7 +443,7 @@ opt_warning=:
2007 # name if it has been set yet.
2008 func_echo ()
2009 {
2010- $ECHO "$progname${mode+: }$mode: $*"
2011+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
2012 }
2013
2014 # func_verbose arg...
2015@@ -430,14 +469,14 @@ func_echo_all ()
2016 # Echo program name prefixed message to standard error.
2017 func_error ()
2018 {
2019- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
2020+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
2021 }
2022
2023 # func_warning arg...
2024 # Echo program name prefixed warning message to standard error.
2025 func_warning ()
2026 {
2027- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
2028+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
2029
2030 # bash bug again:
2031 :
2032@@ -656,19 +695,35 @@ func_show_eval_locale ()
2033 fi
2034 }
2035
2036-
2037-
2038+# func_tr_sh
2039+# Turn $1 into a string suitable for a shell variable name.
2040+# Result is stored in $func_tr_sh_result. All characters
2041+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
2042+# if $1 begins with a digit, a '_' is prepended as well.
2043+func_tr_sh ()
2044+{
2045+ case $1 in
2046+ [0-9]* | *[!a-zA-Z0-9_]*)
2047+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
2048+ ;;
2049+ * )
2050+ func_tr_sh_result=$1
2051+ ;;
2052+ esac
2053+}
2054
2055
2056 # func_version
2057 # Echo version message to standard output and exit.
2058 func_version ()
2059 {
2060+ $opt_debug
2061+
2062 $SED -n '/(C)/!b go
2063 :more
2064 /\./!{
2065 N
2066- s/\n# //
2067+ s/\n# / /
2068 b more
2069 }
2070 :go
2071@@ -685,7 +740,9 @@ func_version ()
2072 # Echo short help message to standard output and exit.
2073 func_usage ()
2074 {
2075- $SED -n '/^# Usage:/,/^# *-h/ {
2076+ $opt_debug
2077+
2078+ $SED -n '/^# Usage:/,/^# *.*--help/ {
2079 s/^# //
2080 s/^# *$//
2081 s/\$progname/'$progname'/
2082@@ -701,7 +758,10 @@ func_usage ()
2083 # unless 'noexit' is passed as argument.
2084 func_help ()
2085 {
2086+ $opt_debug
2087+
2088 $SED -n '/^# Usage:/,/# Report bugs to/ {
2089+ :print
2090 s/^# //
2091 s/^# *$//
2092 s*\$progname*'$progname'*
2093@@ -714,7 +774,11 @@ func_help ()
2094 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
2095 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
2096 p
2097- }' < "$progpath"
2098+ d
2099+ }
2100+ /^# .* home page:/b print
2101+ /^# General help using/b print
2102+ ' < "$progpath"
2103 ret=$?
2104 if test -z "$1"; then
2105 exit $ret
2106@@ -726,12 +790,39 @@ func_help ()
2107 # exit_cmd.
2108 func_missing_arg ()
2109 {
2110- func_error "missing argument for $1"
2111+ $opt_debug
2112+
2113+ func_error "missing argument for $1."
2114 exit_cmd=exit
2115 }
2116
2117-exit_cmd=:
2118
2119+# func_split_short_opt shortopt
2120+# Set func_split_short_opt_name and func_split_short_opt_arg shell
2121+# variables after splitting SHORTOPT after the 2nd character.
2122+func_split_short_opt ()
2123+{
2124+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
2125+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
2126+
2127+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
2128+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
2129+} # func_split_short_opt may be replaced by extended shell implementation
2130+
2131+
2132+# func_split_long_opt longopt
2133+# Set func_split_long_opt_name and func_split_long_opt_arg shell
2134+# variables after splitting LONGOPT at the `=' sign.
2135+func_split_long_opt ()
2136+{
2137+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
2138+ my_sed_long_arg='1s/^--[^=]*=//'
2139+
2140+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
2141+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
2142+} # func_split_long_opt may be replaced by extended shell implementation
2143+
2144+exit_cmd=:
2145
2146
2147
2148@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
2149 magic_exe="%%%MAGIC EXE variable%%%"
2150
2151 # Global variables.
2152-# $mode is unset
2153 nonopt=
2154-execute_dlfiles=
2155 preserve_args=
2156 lo2o="s/\\.lo\$/.${objext}/"
2157 o2lo="s/\\.${objext}\$/.lo/"
2158 extracted_archives=
2159 extracted_serial=0
2160
2161-opt_dry_run=false
2162-opt_finish=:
2163-opt_duplicate_deps=false
2164-opt_silent=false
2165-opt_debug=:
2166-
2167 # If this variable is set in any of the actions, the command in it
2168 # will be execed at the end. This prevents here-documents from being
2169 # left over by shells.
2170 exec_cmd=
2171
2172+# func_append var value
2173+# Append VALUE to the end of shell variable VAR.
2174+func_append ()
2175+{
2176+ eval "${1}=\$${1}\${2}"
2177+} # func_append may be replaced by extended shell implementation
2178+
2179+# func_append_quoted var value
2180+# Quote VALUE and append to the end of shell variable VAR, separated
2181+# by a space.
2182+func_append_quoted ()
2183+{
2184+ func_quote_for_eval "${2}"
2185+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
2186+} # func_append_quoted may be replaced by extended shell implementation
2187+
2188+
2189+# func_arith arithmetic-term...
2190+func_arith ()
2191+{
2192+ func_arith_result=`expr "${@}"`
2193+} # func_arith may be replaced by extended shell implementation
2194+
2195+
2196+# func_len string
2197+# STRING may not start with a hyphen.
2198+func_len ()
2199+{
2200+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
2201+} # func_len may be replaced by extended shell implementation
2202+
2203+
2204+# func_lo2o object
2205+func_lo2o ()
2206+{
2207+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2208+} # func_lo2o may be replaced by extended shell implementation
2209+
2210+
2211+# func_xform libobj-or-source
2212+func_xform ()
2213+{
2214+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
2215+} # func_xform may be replaced by extended shell implementation
2216+
2217+
2218 # func_fatal_configuration arg...
2219 # Echo program name prefixed message to standard error, followed by
2220 # a configuration failure hint, and exit.
2221@@ -850,130 +979,204 @@ func_enable_tag ()
2222 esac
2223 }
2224
2225-# Parse options once, thoroughly. This comes as soon as possible in
2226-# the script to make things like `libtool --version' happen quickly.
2227+# func_check_version_match
2228+# Ensure that we are using m4 macros, and libtool script from the same
2229+# release of libtool.
2230+func_check_version_match ()
2231 {
2232+ if test "$package_revision" != "$macro_revision"; then
2233+ if test "$VERSION" != "$macro_version"; then
2234+ if test -z "$macro_version"; then
2235+ cat >&2 <<_LT_EOF
2236+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2237+$progname: definition of this LT_INIT comes from an older release.
2238+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2239+$progname: and run autoconf again.
2240+_LT_EOF
2241+ else
2242+ cat >&2 <<_LT_EOF
2243+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2244+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2245+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2246+$progname: and run autoconf again.
2247+_LT_EOF
2248+ fi
2249+ else
2250+ cat >&2 <<_LT_EOF
2251+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2252+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2253+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2254+$progname: of $PACKAGE $VERSION and run autoconf again.
2255+_LT_EOF
2256+ fi
2257+
2258+ exit $EXIT_MISMATCH
2259+ fi
2260+}
2261+
2262+
2263+# Shorthand for --mode=foo, only valid as the first argument
2264+case $1 in
2265+clean|clea|cle|cl)
2266+ shift; set dummy --mode clean ${1+"$@"}; shift
2267+ ;;
2268+compile|compil|compi|comp|com|co|c)
2269+ shift; set dummy --mode compile ${1+"$@"}; shift
2270+ ;;
2271+execute|execut|execu|exec|exe|ex|e)
2272+ shift; set dummy --mode execute ${1+"$@"}; shift
2273+ ;;
2274+finish|finis|fini|fin|fi|f)
2275+ shift; set dummy --mode finish ${1+"$@"}; shift
2276+ ;;
2277+install|instal|insta|inst|ins|in|i)
2278+ shift; set dummy --mode install ${1+"$@"}; shift
2279+ ;;
2280+link|lin|li|l)
2281+ shift; set dummy --mode link ${1+"$@"}; shift
2282+ ;;
2283+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2284+ shift; set dummy --mode uninstall ${1+"$@"}; shift
2285+ ;;
2286+esac
2287
2288- # Shorthand for --mode=foo, only valid as the first argument
2289- case $1 in
2290- clean|clea|cle|cl)
2291- shift; set dummy --mode clean ${1+"$@"}; shift
2292- ;;
2293- compile|compil|compi|comp|com|co|c)
2294- shift; set dummy --mode compile ${1+"$@"}; shift
2295- ;;
2296- execute|execut|execu|exec|exe|ex|e)
2297- shift; set dummy --mode execute ${1+"$@"}; shift
2298- ;;
2299- finish|finis|fini|fin|fi|f)
2300- shift; set dummy --mode finish ${1+"$@"}; shift
2301- ;;
2302- install|instal|insta|inst|ins|in|i)
2303- shift; set dummy --mode install ${1+"$@"}; shift
2304- ;;
2305- link|lin|li|l)
2306- shift; set dummy --mode link ${1+"$@"}; shift
2307- ;;
2308- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2309- shift; set dummy --mode uninstall ${1+"$@"}; shift
2310- ;;
2311- esac
2312
2313- # Parse non-mode specific arguments:
2314- while test "$#" -gt 0; do
2315+
2316+# Option defaults:
2317+opt_debug=:
2318+opt_dry_run=false
2319+opt_config=false
2320+opt_preserve_dup_deps=false
2321+opt_features=false
2322+opt_finish=false
2323+opt_help=false
2324+opt_help_all=false
2325+opt_silent=:
2326+opt_verbose=:
2327+opt_silent=false
2328+opt_verbose=false
2329+
2330+
2331+# Parse options once, thoroughly. This comes as soon as possible in the
2332+# script to make things like `--version' happen as quickly as we can.
2333+{
2334+ # this just eases exit handling
2335+ while test $# -gt 0; do
2336 opt="$1"
2337 shift
2338-
2339 case $opt in
2340- --config) func_config ;;
2341-
2342- --debug) preserve_args="$preserve_args $opt"
2343+ --debug|-x) opt_debug='set -x'
2344 func_echo "enabling shell trace mode"
2345- opt_debug='set -x'
2346 $opt_debug
2347 ;;
2348-
2349- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
2350- execute_dlfiles="$execute_dlfiles $1"
2351- shift
2352+ --dry-run|--dryrun|-n)
2353+ opt_dry_run=:
2354 ;;
2355-
2356- --dry-run | -n) opt_dry_run=: ;;
2357- --features) func_features ;;
2358- --finish) mode="finish" ;;
2359- --no-finish) opt_finish=false ;;
2360-
2361- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
2362- case $1 in
2363- # Valid mode arguments:
2364- clean) ;;
2365- compile) ;;
2366- execute) ;;
2367- finish) ;;
2368- install) ;;
2369- link) ;;
2370- relink) ;;
2371- uninstall) ;;
2372-
2373- # Catch anything else as an error
2374- *) func_error "invalid argument for $opt"
2375- exit_cmd=exit
2376- break
2377- ;;
2378- esac
2379-
2380- mode="$1"
2381+ --config)
2382+ opt_config=:
2383+func_config
2384+ ;;
2385+ --dlopen|-dlopen)
2386+ optarg="$1"
2387+ opt_dlopen="${opt_dlopen+$opt_dlopen
2388+}$optarg"
2389 shift
2390 ;;
2391-
2392 --preserve-dup-deps)
2393- opt_duplicate_deps=: ;;
2394-
2395- --quiet|--silent) preserve_args="$preserve_args $opt"
2396- opt_silent=:
2397- opt_verbose=false
2398+ opt_preserve_dup_deps=:
2399 ;;
2400-
2401- --no-quiet|--no-silent)
2402- preserve_args="$preserve_args $opt"
2403- opt_silent=false
2404+ --features)
2405+ opt_features=:
2406+func_features
2407 ;;
2408-
2409- --verbose| -v) preserve_args="$preserve_args $opt"
2410+ --finish)
2411+ opt_finish=:
2412+set dummy --mode finish ${1+"$@"}; shift
2413+ ;;
2414+ --help)
2415+ opt_help=:
2416+ ;;
2417+ --help-all)
2418+ opt_help_all=:
2419+opt_help=': help-all'
2420+ ;;
2421+ --mode)
2422+ test $# = 0 && func_missing_arg $opt && break
2423+ optarg="$1"
2424+ opt_mode="$optarg"
2425+case $optarg in
2426+ # Valid mode arguments:
2427+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
2428+
2429+ # Catch anything else as an error
2430+ *) func_error "invalid argument for $opt"
2431+ exit_cmd=exit
2432+ break
2433+ ;;
2434+esac
2435+ shift
2436+ ;;
2437+ --no-silent|--no-quiet)
2438 opt_silent=false
2439- opt_verbose=:
2440+func_append preserve_args " $opt"
2441 ;;
2442-
2443- --no-verbose) preserve_args="$preserve_args $opt"
2444+ --no-verbose)
2445 opt_verbose=false
2446+func_append preserve_args " $opt"
2447 ;;
2448-
2449- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
2450- preserve_args="$preserve_args $opt $1"
2451- func_enable_tag "$1" # tagname is set here
2452+ --silent|--quiet)
2453+ opt_silent=:
2454+func_append preserve_args " $opt"
2455+ opt_verbose=false
2456+ ;;
2457+ --verbose|-v)
2458+ opt_verbose=:
2459+func_append preserve_args " $opt"
2460+opt_silent=false
2461+ ;;
2462+ --tag)
2463+ test $# = 0 && func_missing_arg $opt && break
2464+ optarg="$1"
2465+ opt_tag="$optarg"
2466+func_append preserve_args " $opt $optarg"
2467+func_enable_tag "$optarg"
2468 shift
2469 ;;
2470
2471+ -\?|-h) func_usage ;;
2472+ --help) func_help ;;
2473+ --version) func_version ;;
2474+
2475 # Separate optargs to long options:
2476- -dlopen=*|--mode=*|--tag=*)
2477- func_opt_split "$opt"
2478- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
2479+ --*=*)
2480+ func_split_long_opt "$opt"
2481+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
2482 shift
2483 ;;
2484
2485- -\?|-h) func_usage ;;
2486- --help) opt_help=: ;;
2487- --help-all) opt_help=': help-all' ;;
2488- --version) func_version ;;
2489-
2490- -*) func_fatal_help "unrecognized option \`$opt'" ;;
2491-
2492- *) nonopt="$opt"
2493- break
2494+ # Separate non-argument short options:
2495+ -\?*|-h*|-n*|-v*)
2496+ func_split_short_opt "$opt"
2497+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
2498+ shift
2499 ;;
2500+
2501+ --) break ;;
2502+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
2503+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
2504 esac
2505 done
2506
2507+ # Validate options:
2508+
2509+ # save first non-option argument
2510+ if test "$#" -gt 0; then
2511+ nonopt="$opt"
2512+ shift
2513+ fi
2514+
2515+ # preserve --debug
2516+ test "$opt_debug" = : || func_append preserve_args " --debug"
2517
2518 case $host in
2519 *cygwin* | *mingw* | *pw32* | *cegcc*)
2520@@ -981,82 +1184,44 @@ func_enable_tag ()
2521 opt_duplicate_compiler_generated_deps=:
2522 ;;
2523 *)
2524- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
2525+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
2526 ;;
2527 esac
2528
2529- # Having warned about all mis-specified options, bail out if
2530- # anything was wrong.
2531- $exit_cmd $EXIT_FAILURE
2532-}
2533+ $opt_help || {
2534+ # Sanity checks first:
2535+ func_check_version_match
2536
2537-# func_check_version_match
2538-# Ensure that we are using m4 macros, and libtool script from the same
2539-# release of libtool.
2540-func_check_version_match ()
2541-{
2542- if test "$package_revision" != "$macro_revision"; then
2543- if test "$VERSION" != "$macro_version"; then
2544- if test -z "$macro_version"; then
2545- cat >&2 <<_LT_EOF
2546-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2547-$progname: definition of this LT_INIT comes from an older release.
2548-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2549-$progname: and run autoconf again.
2550-_LT_EOF
2551- else
2552- cat >&2 <<_LT_EOF
2553-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2554-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2555-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2556-$progname: and run autoconf again.
2557-_LT_EOF
2558- fi
2559- else
2560- cat >&2 <<_LT_EOF
2561-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2562-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2563-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2564-$progname: of $PACKAGE $VERSION and run autoconf again.
2565-_LT_EOF
2566+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2567+ func_fatal_configuration "not configured to build any kind of library"
2568 fi
2569
2570- exit $EXIT_MISMATCH
2571- fi
2572-}
2573-
2574+ # Darwin sucks
2575+ eval std_shrext=\"$shrext_cmds\"
2576
2577-## ----------- ##
2578-## Main. ##
2579-## ----------- ##
2580-
2581-$opt_help || {
2582- # Sanity checks first:
2583- func_check_version_match
2584-
2585- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2586- func_fatal_configuration "not configured to build any kind of library"
2587- fi
2588+ # Only execute mode is allowed to have -dlopen flags.
2589+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
2590+ func_error "unrecognized option \`-dlopen'"
2591+ $ECHO "$help" 1>&2
2592+ exit $EXIT_FAILURE
2593+ fi
2594
2595- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
2596+ # Change the help message to a mode-specific one.
2597+ generic_help="$help"
2598+ help="Try \`$progname --help --mode=$opt_mode' for more information."
2599+ }
2600
2601
2602- # Darwin sucks
2603- eval "std_shrext=\"$shrext_cmds\""
2604+ # Bail if the options were screwed
2605+ $exit_cmd $EXIT_FAILURE
2606+}
2607
2608
2609- # Only execute mode is allowed to have -dlopen flags.
2610- if test -n "$execute_dlfiles" && test "$mode" != execute; then
2611- func_error "unrecognized option \`-dlopen'"
2612- $ECHO "$help" 1>&2
2613- exit $EXIT_FAILURE
2614- fi
2615
2616- # Change the help message to a mode-specific one.
2617- generic_help="$help"
2618- help="Try \`$progname --help --mode=$mode' for more information."
2619-}
2620
2621+## ----------- ##
2622+## Main. ##
2623+## ----------- ##
2624
2625 # func_lalib_p file
2626 # True iff FILE is a libtool `.la' library or `.lo' object file.
2627@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
2628 # temporary ltwrapper_script.
2629 func_ltwrapper_scriptname ()
2630 {
2631- func_ltwrapper_scriptname_result=""
2632- if func_ltwrapper_executable_p "$1"; then
2633- func_dirname_and_basename "$1" "" "."
2634- func_stripname '' '.exe' "$func_basename_result"
2635- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2636- fi
2637+ func_dirname_and_basename "$1" "" "."
2638+ func_stripname '' '.exe' "$func_basename_result"
2639+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2640 }
2641
2642 # func_ltwrapper_p file
2643@@ -1149,7 +1311,7 @@ func_execute_cmds ()
2644 save_ifs=$IFS; IFS='~'
2645 for cmd in $1; do
2646 IFS=$save_ifs
2647- eval "cmd=\"$cmd\""
2648+ eval cmd=\"$cmd\"
2649 func_show_eval "$cmd" "${2-:}"
2650 done
2651 IFS=$save_ifs
2652@@ -1172,6 +1334,37 @@ func_source ()
2653 }
2654
2655
2656+# func_resolve_sysroot PATH
2657+# Replace a leading = in PATH with a sysroot. Store the result into
2658+# func_resolve_sysroot_result
2659+func_resolve_sysroot ()
2660+{
2661+ func_resolve_sysroot_result=$1
2662+ case $func_resolve_sysroot_result in
2663+ =*)
2664+ func_stripname '=' '' "$func_resolve_sysroot_result"
2665+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
2666+ ;;
2667+ esac
2668+}
2669+
2670+# func_replace_sysroot PATH
2671+# If PATH begins with the sysroot, replace it with = and
2672+# store the result into func_replace_sysroot_result.
2673+func_replace_sysroot ()
2674+{
2675+ case "$lt_sysroot:$1" in
2676+ ?*:"$lt_sysroot"*)
2677+ func_stripname "$lt_sysroot" '' "$1"
2678+ func_replace_sysroot_result="=$func_stripname_result"
2679+ ;;
2680+ *)
2681+ # Including no sysroot.
2682+ func_replace_sysroot_result=$1
2683+ ;;
2684+ esac
2685+}
2686+
2687 # func_infer_tag arg
2688 # Infer tagged configuration to use if any are available and
2689 # if one wasn't chosen via the "--tag" command line option.
2690@@ -1184,8 +1377,7 @@ func_infer_tag ()
2691 if test -n "$available_tags" && test -z "$tagname"; then
2692 CC_quoted=
2693 for arg in $CC; do
2694- func_quote_for_eval "$arg"
2695- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2696+ func_append_quoted CC_quoted "$arg"
2697 done
2698 CC_expanded=`func_echo_all $CC`
2699 CC_quoted_expanded=`func_echo_all $CC_quoted`
2700@@ -1204,8 +1396,7 @@ func_infer_tag ()
2701 CC_quoted=
2702 for arg in $CC; do
2703 # Double-quote args containing other shell metacharacters.
2704- func_quote_for_eval "$arg"
2705- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2706+ func_append_quoted CC_quoted "$arg"
2707 done
2708 CC_expanded=`func_echo_all $CC`
2709 CC_quoted_expanded=`func_echo_all $CC_quoted`
2710@@ -1274,6 +1465,486 @@ EOF
2711 }
2712 }
2713
2714+
2715+##################################################
2716+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
2717+##################################################
2718+
2719+# func_convert_core_file_wine_to_w32 ARG
2720+# Helper function used by file name conversion functions when $build is *nix,
2721+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
2722+# correctly configured wine environment available, with the winepath program
2723+# in $build's $PATH.
2724+#
2725+# ARG is the $build file name to be converted to w32 format.
2726+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
2727+# be empty on error (or when ARG is empty)
2728+func_convert_core_file_wine_to_w32 ()
2729+{
2730+ $opt_debug
2731+ func_convert_core_file_wine_to_w32_result="$1"
2732+ if test -n "$1"; then
2733+ # Unfortunately, winepath does not exit with a non-zero error code, so we
2734+ # are forced to check the contents of stdout. On the other hand, if the
2735+ # command is not found, the shell will set an exit code of 127 and print
2736+ # *an error message* to stdout. So we must check for both error code of
2737+ # zero AND non-empty stdout, which explains the odd construction:
2738+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
2739+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
2740+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
2741+ $SED -e "$lt_sed_naive_backslashify"`
2742+ else
2743+ func_convert_core_file_wine_to_w32_result=
2744+ fi
2745+ fi
2746+}
2747+# end: func_convert_core_file_wine_to_w32
2748+
2749+
2750+# func_convert_core_path_wine_to_w32 ARG
2751+# Helper function used by path conversion functions when $build is *nix, and
2752+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
2753+# configured wine environment available, with the winepath program in $build's
2754+# $PATH. Assumes ARG has no leading or trailing path separator characters.
2755+#
2756+# ARG is path to be converted from $build format to win32.
2757+# Result is available in $func_convert_core_path_wine_to_w32_result.
2758+# Unconvertible file (directory) names in ARG are skipped; if no directory names
2759+# are convertible, then the result may be empty.
2760+func_convert_core_path_wine_to_w32 ()
2761+{
2762+ $opt_debug
2763+ # unfortunately, winepath doesn't convert paths, only file names
2764+ func_convert_core_path_wine_to_w32_result=""
2765+ if test -n "$1"; then
2766+ oldIFS=$IFS
2767+ IFS=:
2768+ for func_convert_core_path_wine_to_w32_f in $1; do
2769+ IFS=$oldIFS
2770+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
2771+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
2772+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
2773+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
2774+ else
2775+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
2776+ fi
2777+ fi
2778+ done
2779+ IFS=$oldIFS
2780+ fi
2781+}
2782+# end: func_convert_core_path_wine_to_w32
2783+
2784+
2785+# func_cygpath ARGS...
2786+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
2787+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
2788+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
2789+# (2), returns the Cygwin file name or path in func_cygpath_result (input
2790+# file name or path is assumed to be in w32 format, as previously converted
2791+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
2792+# or path in func_cygpath_result (input file name or path is assumed to be in
2793+# Cygwin format). Returns an empty string on error.
2794+#
2795+# ARGS are passed to cygpath, with the last one being the file name or path to
2796+# be converted.
2797+#
2798+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
2799+# environment variable; do not put it in $PATH.
2800+func_cygpath ()
2801+{
2802+ $opt_debug
2803+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
2804+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
2805+ if test "$?" -ne 0; then
2806+ # on failure, ensure result is empty
2807+ func_cygpath_result=
2808+ fi
2809+ else
2810+ func_cygpath_result=
2811+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
2812+ fi
2813+}
2814+#end: func_cygpath
2815+
2816+
2817+# func_convert_core_msys_to_w32 ARG
2818+# Convert file name or path ARG from MSYS format to w32 format. Return
2819+# result in func_convert_core_msys_to_w32_result.
2820+func_convert_core_msys_to_w32 ()
2821+{
2822+ $opt_debug
2823+ # awkward: cmd appends spaces to result
2824+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
2825+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2826+}
2827+#end: func_convert_core_msys_to_w32
2828+
2829+
2830+# func_convert_file_check ARG1 ARG2
2831+# Verify that ARG1 (a file name in $build format) was converted to $host
2832+# format in ARG2. Otherwise, emit an error message, but continue (resetting
2833+# func_to_host_file_result to ARG1).
2834+func_convert_file_check ()
2835+{
2836+ $opt_debug
2837+ if test -z "$2" && test -n "$1" ; then
2838+ func_error "Could not determine host file name corresponding to"
2839+ func_error " \`$1'"
2840+ func_error "Continuing, but uninstalled executables may not work."
2841+ # Fallback:
2842+ func_to_host_file_result="$1"
2843+ fi
2844+}
2845+# end func_convert_file_check
2846+
2847+
2848+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
2849+# Verify that FROM_PATH (a path in $build format) was converted to $host
2850+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
2851+# func_to_host_file_result to a simplistic fallback value (see below).
2852+func_convert_path_check ()
2853+{
2854+ $opt_debug
2855+ if test -z "$4" && test -n "$3"; then
2856+ func_error "Could not determine the host path corresponding to"
2857+ func_error " \`$3'"
2858+ func_error "Continuing, but uninstalled executables may not work."
2859+ # Fallback. This is a deliberately simplistic "conversion" and
2860+ # should not be "improved". See libtool.info.
2861+ if test "x$1" != "x$2"; then
2862+ lt_replace_pathsep_chars="s|$1|$2|g"
2863+ func_to_host_path_result=`echo "$3" |
2864+ $SED -e "$lt_replace_pathsep_chars"`
2865+ else
2866+ func_to_host_path_result="$3"
2867+ fi
2868+ fi
2869+}
2870+# end func_convert_path_check
2871+
2872+
2873+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
2874+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
2875+# and appending REPL if ORIG matches BACKPAT.
2876+func_convert_path_front_back_pathsep ()
2877+{
2878+ $opt_debug
2879+ case $4 in
2880+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
2881+ ;;
2882+ esac
2883+ case $4 in
2884+ $2 ) func_append func_to_host_path_result "$3"
2885+ ;;
2886+ esac
2887+}
2888+# end func_convert_path_front_back_pathsep
2889+
2890+
2891+##################################################
2892+# $build to $host FILE NAME CONVERSION FUNCTIONS #
2893+##################################################
2894+# invoked via `$to_host_file_cmd ARG'
2895+#
2896+# In each case, ARG is the path to be converted from $build to $host format.
2897+# Result will be available in $func_to_host_file_result.
2898+
2899+
2900+# func_to_host_file ARG
2901+# Converts the file name ARG from $build format to $host format. Return result
2902+# in func_to_host_file_result.
2903+func_to_host_file ()
2904+{
2905+ $opt_debug
2906+ $to_host_file_cmd "$1"
2907+}
2908+# end func_to_host_file
2909+
2910+
2911+# func_to_tool_file ARG LAZY
2912+# converts the file name ARG from $build format to toolchain format. Return
2913+# result in func_to_tool_file_result. If the conversion in use is listed
2914+# in (the comma separated) LAZY, no conversion takes place.
2915+func_to_tool_file ()
2916+{
2917+ $opt_debug
2918+ case ,$2, in
2919+ *,"$to_tool_file_cmd",*)
2920+ func_to_tool_file_result=$1
2921+ ;;
2922+ *)
2923+ $to_tool_file_cmd "$1"
2924+ func_to_tool_file_result=$func_to_host_file_result
2925+ ;;
2926+ esac
2927+}
2928+# end func_to_tool_file
2929+
2930+
2931+# func_convert_file_noop ARG
2932+# Copy ARG to func_to_host_file_result.
2933+func_convert_file_noop ()
2934+{
2935+ func_to_host_file_result="$1"
2936+}
2937+# end func_convert_file_noop
2938+
2939+
2940+# func_convert_file_msys_to_w32 ARG
2941+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
2942+# conversion to w32 is not available inside the cwrapper. Returns result in
2943+# func_to_host_file_result.
2944+func_convert_file_msys_to_w32 ()
2945+{
2946+ $opt_debug
2947+ func_to_host_file_result="$1"
2948+ if test -n "$1"; then
2949+ func_convert_core_msys_to_w32 "$1"
2950+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
2951+ fi
2952+ func_convert_file_check "$1" "$func_to_host_file_result"
2953+}
2954+# end func_convert_file_msys_to_w32
2955+
2956+
2957+# func_convert_file_cygwin_to_w32 ARG
2958+# Convert file name ARG from Cygwin to w32 format. Returns result in
2959+# func_to_host_file_result.
2960+func_convert_file_cygwin_to_w32 ()
2961+{
2962+ $opt_debug
2963+ func_to_host_file_result="$1"
2964+ if test -n "$1"; then
2965+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
2966+ # LT_CYGPATH in this case.
2967+ func_to_host_file_result=`cygpath -m "$1"`
2968+ fi
2969+ func_convert_file_check "$1" "$func_to_host_file_result"
2970+}
2971+# end func_convert_file_cygwin_to_w32
2972+
2973+
2974+# func_convert_file_nix_to_w32 ARG
2975+# Convert file name ARG from *nix to w32 format. Requires a wine environment
2976+# and a working winepath. Returns result in func_to_host_file_result.
2977+func_convert_file_nix_to_w32 ()
2978+{
2979+ $opt_debug
2980+ func_to_host_file_result="$1"
2981+ if test -n "$1"; then
2982+ func_convert_core_file_wine_to_w32 "$1"
2983+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
2984+ fi
2985+ func_convert_file_check "$1" "$func_to_host_file_result"
2986+}
2987+# end func_convert_file_nix_to_w32
2988+
2989+
2990+# func_convert_file_msys_to_cygwin ARG
2991+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
2992+# Returns result in func_to_host_file_result.
2993+func_convert_file_msys_to_cygwin ()
2994+{
2995+ $opt_debug
2996+ func_to_host_file_result="$1"
2997+ if test -n "$1"; then
2998+ func_convert_core_msys_to_w32 "$1"
2999+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
3000+ func_to_host_file_result="$func_cygpath_result"
3001+ fi
3002+ func_convert_file_check "$1" "$func_to_host_file_result"
3003+}
3004+# end func_convert_file_msys_to_cygwin
3005+
3006+
3007+# func_convert_file_nix_to_cygwin ARG
3008+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
3009+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
3010+# in func_to_host_file_result.
3011+func_convert_file_nix_to_cygwin ()
3012+{
3013+ $opt_debug
3014+ func_to_host_file_result="$1"
3015+ if test -n "$1"; then
3016+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
3017+ func_convert_core_file_wine_to_w32 "$1"
3018+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
3019+ func_to_host_file_result="$func_cygpath_result"
3020+ fi
3021+ func_convert_file_check "$1" "$func_to_host_file_result"
3022+}
3023+# end func_convert_file_nix_to_cygwin
3024+
3025+
3026+#############################################
3027+# $build to $host PATH CONVERSION FUNCTIONS #
3028+#############################################
3029+# invoked via `$to_host_path_cmd ARG'
3030+#
3031+# In each case, ARG is the path to be converted from $build to $host format.
3032+# The result will be available in $func_to_host_path_result.
3033+#
3034+# Path separators are also converted from $build format to $host format. If
3035+# ARG begins or ends with a path separator character, it is preserved (but
3036+# converted to $host format) on output.
3037+#
3038+# All path conversion functions are named using the following convention:
3039+# file name conversion function : func_convert_file_X_to_Y ()
3040+# path conversion function : func_convert_path_X_to_Y ()
3041+# where, for any given $build/$host combination the 'X_to_Y' value is the
3042+# same. If conversion functions are added for new $build/$host combinations,
3043+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
3044+# will break.
3045+
3046+
3047+# func_init_to_host_path_cmd
3048+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
3049+# appropriate value, based on the value of $to_host_file_cmd.
3050+to_host_path_cmd=
3051+func_init_to_host_path_cmd ()
3052+{
3053+ $opt_debug
3054+ if test -z "$to_host_path_cmd"; then
3055+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
3056+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
3057+ fi
3058+}
3059+
3060+
3061+# func_to_host_path ARG
3062+# Converts the path ARG from $build format to $host format. Return result
3063+# in func_to_host_path_result.
3064+func_to_host_path ()
3065+{
3066+ $opt_debug
3067+ func_init_to_host_path_cmd
3068+ $to_host_path_cmd "$1"
3069+}
3070+# end func_to_host_path
3071+
3072+
3073+# func_convert_path_noop ARG
3074+# Copy ARG to func_to_host_path_result.
3075+func_convert_path_noop ()
3076+{
3077+ func_to_host_path_result="$1"
3078+}
3079+# end func_convert_path_noop
3080+
3081+
3082+# func_convert_path_msys_to_w32 ARG
3083+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
3084+# conversion to w32 is not available inside the cwrapper. Returns result in
3085+# func_to_host_path_result.
3086+func_convert_path_msys_to_w32 ()
3087+{
3088+ $opt_debug
3089+ func_to_host_path_result="$1"
3090+ if test -n "$1"; then
3091+ # Remove leading and trailing path separator characters from ARG. MSYS
3092+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
3093+ # and winepath ignores them completely.
3094+ func_stripname : : "$1"
3095+ func_to_host_path_tmp1=$func_stripname_result
3096+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3097+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
3098+ func_convert_path_check : ";" \
3099+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3100+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3101+ fi
3102+}
3103+# end func_convert_path_msys_to_w32
3104+
3105+
3106+# func_convert_path_cygwin_to_w32 ARG
3107+# Convert path ARG from Cygwin to w32 format. Returns result in
3108+# func_to_host_file_result.
3109+func_convert_path_cygwin_to_w32 ()
3110+{
3111+ $opt_debug
3112+ func_to_host_path_result="$1"
3113+ if test -n "$1"; then
3114+ # See func_convert_path_msys_to_w32:
3115+ func_stripname : : "$1"
3116+ func_to_host_path_tmp1=$func_stripname_result
3117+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
3118+ func_convert_path_check : ";" \
3119+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3120+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3121+ fi
3122+}
3123+# end func_convert_path_cygwin_to_w32
3124+
3125+
3126+# func_convert_path_nix_to_w32 ARG
3127+# Convert path ARG from *nix to w32 format. Requires a wine environment and
3128+# a working winepath. Returns result in func_to_host_file_result.
3129+func_convert_path_nix_to_w32 ()
3130+{
3131+ $opt_debug
3132+ func_to_host_path_result="$1"
3133+ if test -n "$1"; then
3134+ # See func_convert_path_msys_to_w32:
3135+ func_stripname : : "$1"
3136+ func_to_host_path_tmp1=$func_stripname_result
3137+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3138+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
3139+ func_convert_path_check : ";" \
3140+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3141+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3142+ fi
3143+}
3144+# end func_convert_path_nix_to_w32
3145+
3146+
3147+# func_convert_path_msys_to_cygwin ARG
3148+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3149+# Returns result in func_to_host_file_result.
3150+func_convert_path_msys_to_cygwin ()
3151+{
3152+ $opt_debug
3153+ func_to_host_path_result="$1"
3154+ if test -n "$1"; then
3155+ # See func_convert_path_msys_to_w32:
3156+ func_stripname : : "$1"
3157+ func_to_host_path_tmp1=$func_stripname_result
3158+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3159+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
3160+ func_to_host_path_result="$func_cygpath_result"
3161+ func_convert_path_check : : \
3162+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3163+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3164+ fi
3165+}
3166+# end func_convert_path_msys_to_cygwin
3167+
3168+
3169+# func_convert_path_nix_to_cygwin ARG
3170+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
3171+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
3172+# func_to_host_file_result.
3173+func_convert_path_nix_to_cygwin ()
3174+{
3175+ $opt_debug
3176+ func_to_host_path_result="$1"
3177+ if test -n "$1"; then
3178+ # Remove leading and trailing path separator characters from
3179+ # ARG. msys behavior is inconsistent here, cygpath turns them
3180+ # into '.;' and ';.', and winepath ignores them completely.
3181+ func_stripname : : "$1"
3182+ func_to_host_path_tmp1=$func_stripname_result
3183+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3184+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
3185+ func_to_host_path_result="$func_cygpath_result"
3186+ func_convert_path_check : : \
3187+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3188+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3189+ fi
3190+}
3191+# end func_convert_path_nix_to_cygwin
3192+
3193+
3194 # func_mode_compile arg...
3195 func_mode_compile ()
3196 {
3197@@ -1314,12 +1985,12 @@ func_mode_compile ()
3198 ;;
3199
3200 -pie | -fpie | -fPIE)
3201- pie_flag="$pie_flag $arg"
3202+ func_append pie_flag " $arg"
3203 continue
3204 ;;
3205
3206 -shared | -static | -prefer-pic | -prefer-non-pic)
3207- later="$later $arg"
3208+ func_append later " $arg"
3209 continue
3210 ;;
3211
3212@@ -1340,15 +2011,14 @@ func_mode_compile ()
3213 save_ifs="$IFS"; IFS=','
3214 for arg in $args; do
3215 IFS="$save_ifs"
3216- func_quote_for_eval "$arg"
3217- lastarg="$lastarg $func_quote_for_eval_result"
3218+ func_append_quoted lastarg "$arg"
3219 done
3220 IFS="$save_ifs"
3221 func_stripname ' ' '' "$lastarg"
3222 lastarg=$func_stripname_result
3223
3224 # Add the arguments to base_compile.
3225- base_compile="$base_compile $lastarg"
3226+ func_append base_compile " $lastarg"
3227 continue
3228 ;;
3229
3230@@ -1364,8 +2034,7 @@ func_mode_compile ()
3231 esac # case $arg_mode
3232
3233 # Aesthetically quote the previous argument.
3234- func_quote_for_eval "$lastarg"
3235- base_compile="$base_compile $func_quote_for_eval_result"
3236+ func_append_quoted base_compile "$lastarg"
3237 done # for arg
3238
3239 case $arg_mode in
3240@@ -1496,17 +2165,16 @@ compiler."
3241 $opt_dry_run || $RM $removelist
3242 exit $EXIT_FAILURE
3243 fi
3244- removelist="$removelist $output_obj"
3245+ func_append removelist " $output_obj"
3246 $ECHO "$srcfile" > "$lockfile"
3247 fi
3248
3249 $opt_dry_run || $RM $removelist
3250- removelist="$removelist $lockfile"
3251+ func_append removelist " $lockfile"
3252 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
3253
3254- if test -n "$fix_srcfile_path"; then
3255- eval "srcfile=\"$fix_srcfile_path\""
3256- fi
3257+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3258+ srcfile=$func_to_tool_file_result
3259 func_quote_for_eval "$srcfile"
3260 qsrcfile=$func_quote_for_eval_result
3261
3262@@ -1526,7 +2194,7 @@ compiler."
3263
3264 if test -z "$output_obj"; then
3265 # Place PIC objects in $objdir
3266- command="$command -o $lobj"
3267+ func_append command " -o $lobj"
3268 fi
3269
3270 func_show_eval_locale "$command" \
3271@@ -1573,11 +2241,11 @@ compiler."
3272 command="$base_compile $qsrcfile $pic_flag"
3273 fi
3274 if test "$compiler_c_o" = yes; then
3275- command="$command -o $obj"
3276+ func_append command " -o $obj"
3277 fi
3278
3279 # Suppress compiler output if we already did a PIC compilation.
3280- command="$command$suppress_output"
3281+ func_append command "$suppress_output"
3282 func_show_eval_locale "$command" \
3283 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
3284
3285@@ -1622,13 +2290,13 @@ compiler."
3286 }
3287
3288 $opt_help || {
3289- test "$mode" = compile && func_mode_compile ${1+"$@"}
3290+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
3291 }
3292
3293 func_mode_help ()
3294 {
3295 # We need to display help for each of the modes.
3296- case $mode in
3297+ case $opt_mode in
3298 "")
3299 # Generic help is extracted from the usage comments
3300 # at the start of this file.
3301@@ -1659,8 +2327,8 @@ This mode accepts the following addition
3302
3303 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
3304 -no-suppress do not suppress compiler output for multiple passes
3305- -prefer-pic try to building PIC objects only
3306- -prefer-non-pic try to building non-PIC objects only
3307+ -prefer-pic try to build PIC objects only
3308+ -prefer-non-pic try to build non-PIC objects only
3309 -shared do not build a \`.o' file suitable for static linking
3310 -static only build a \`.o' file suitable for static linking
3311 -Wc,FLAG pass FLAG directly to the compiler
3312@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
3313 ;;
3314
3315 *)
3316- func_fatal_help "invalid operation mode \`$mode'"
3317+ func_fatal_help "invalid operation mode \`$opt_mode'"
3318 ;;
3319 esac
3320
3321@@ -1819,13 +2487,13 @@ if $opt_help; then
3322 else
3323 {
3324 func_help noexit
3325- for mode in compile link execute install finish uninstall clean; do
3326+ for opt_mode in compile link execute install finish uninstall clean; do
3327 func_mode_help
3328 done
3329 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
3330 {
3331 func_help noexit
3332- for mode in compile link execute install finish uninstall clean; do
3333+ for opt_mode in compile link execute install finish uninstall clean; do
3334 echo
3335 func_mode_help
3336 done
3337@@ -1854,13 +2522,16 @@ func_mode_execute ()
3338 func_fatal_help "you must specify a COMMAND"
3339
3340 # Handle -dlopen flags immediately.
3341- for file in $execute_dlfiles; do
3342+ for file in $opt_dlopen; do
3343 test -f "$file" \
3344 || func_fatal_help "\`$file' is not a file"
3345
3346 dir=
3347 case $file in
3348 *.la)
3349+ func_resolve_sysroot "$file"
3350+ file=$func_resolve_sysroot_result
3351+
3352 # Check to see that this really is a libtool archive.
3353 func_lalib_unsafe_p "$file" \
3354 || func_fatal_help "\`$lib' is not a valid libtool archive"
3355@@ -1882,7 +2553,7 @@ func_mode_execute ()
3356 dir="$func_dirname_result"
3357
3358 if test -f "$dir/$objdir/$dlname"; then
3359- dir="$dir/$objdir"
3360+ func_append dir "/$objdir"
3361 else
3362 if test ! -f "$dir/$dlname"; then
3363 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
3364@@ -1907,10 +2578,10 @@ func_mode_execute ()
3365 test -n "$absdir" && dir="$absdir"
3366
3367 # Now add the directory to shlibpath_var.
3368- if eval test -z \"\$$shlibpath_var\"; then
3369- eval $shlibpath_var=\$dir
3370+ if eval "test -z \"\$$shlibpath_var\""; then
3371+ eval "$shlibpath_var=\"\$dir\""
3372 else
3373- eval $shlibpath_var=\$dir:\$$shlibpath_var
3374+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
3375 fi
3376 done
3377
3378@@ -1939,8 +2610,7 @@ func_mode_execute ()
3379 ;;
3380 esac
3381 # Quote arguments (to preserve shell metacharacters).
3382- func_quote_for_eval "$file"
3383- args="$args $func_quote_for_eval_result"
3384+ func_append_quoted args "$file"
3385 done
3386
3387 if test "X$opt_dry_run" = Xfalse; then
3388@@ -1972,22 +2642,59 @@ func_mode_execute ()
3389 fi
3390 }
3391
3392-test "$mode" = execute && func_mode_execute ${1+"$@"}
3393+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
3394
3395
3396 # func_mode_finish arg...
3397 func_mode_finish ()
3398 {
3399 $opt_debug
3400- libdirs="$nonopt"
3401+ libs=
3402+ libdirs=
3403 admincmds=
3404
3405- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3406- for dir
3407- do
3408- libdirs="$libdirs $dir"
3409- done
3410+ for opt in "$nonopt" ${1+"$@"}
3411+ do
3412+ if test -d "$opt"; then
3413+ func_append libdirs " $opt"
3414+
3415+ elif test -f "$opt"; then
3416+ if func_lalib_unsafe_p "$opt"; then
3417+ func_append libs " $opt"
3418+ else
3419+ func_warning "\`$opt' is not a valid libtool archive"
3420+ fi
3421+
3422+ else
3423+ func_fatal_error "invalid argument \`$opt'"
3424+ fi
3425+ done
3426+
3427+ if test -n "$libs"; then
3428+ if test -n "$lt_sysroot"; then
3429+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
3430+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
3431+ else
3432+ sysroot_cmd=
3433+ fi
3434+
3435+ # Remove sysroot references
3436+ if $opt_dry_run; then
3437+ for lib in $libs; do
3438+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
3439+ done
3440+ else
3441+ tmpdir=`func_mktempdir`
3442+ for lib in $libs; do
3443+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
3444+ > $tmpdir/tmp-la
3445+ mv -f $tmpdir/tmp-la $lib
3446+ done
3447+ ${RM}r "$tmpdir"
3448+ fi
3449+ fi
3450
3451+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3452 for libdir in $libdirs; do
3453 if test -n "$finish_cmds"; then
3454 # Do each command in the finish commands.
3455@@ -1997,7 +2704,7 @@ func_mode_finish ()
3456 if test -n "$finish_eval"; then
3457 # Do the single finish_eval.
3458 eval cmds=\"$finish_eval\"
3459- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
3460+ $opt_dry_run || eval "$cmds" || func_append admincmds "
3461 $cmds"
3462 fi
3463 done
3464@@ -2006,53 +2713,55 @@ func_mode_finish ()
3465 # Exit here if they wanted silent mode.
3466 $opt_silent && exit $EXIT_SUCCESS
3467
3468- echo "----------------------------------------------------------------------"
3469- echo "Libraries have been installed in:"
3470- for libdir in $libdirs; do
3471- $ECHO " $libdir"
3472- done
3473- echo
3474- echo "If you ever happen to want to link against installed libraries"
3475- echo "in a given directory, LIBDIR, you must either use libtool, and"
3476- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3477- echo "flag during linking and do at least one of the following:"
3478- if test -n "$shlibpath_var"; then
3479- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3480- echo " during execution"
3481- fi
3482- if test -n "$runpath_var"; then
3483- echo " - add LIBDIR to the \`$runpath_var' environment variable"
3484- echo " during linking"
3485- fi
3486- if test -n "$hardcode_libdir_flag_spec"; then
3487- libdir=LIBDIR
3488- eval "flag=\"$hardcode_libdir_flag_spec\""
3489+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3490+ echo "----------------------------------------------------------------------"
3491+ echo "Libraries have been installed in:"
3492+ for libdir in $libdirs; do
3493+ $ECHO " $libdir"
3494+ done
3495+ echo
3496+ echo "If you ever happen to want to link against installed libraries"
3497+ echo "in a given directory, LIBDIR, you must either use libtool, and"
3498+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3499+ echo "flag during linking and do at least one of the following:"
3500+ if test -n "$shlibpath_var"; then
3501+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3502+ echo " during execution"
3503+ fi
3504+ if test -n "$runpath_var"; then
3505+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
3506+ echo " during linking"
3507+ fi
3508+ if test -n "$hardcode_libdir_flag_spec"; then
3509+ libdir=LIBDIR
3510+ eval flag=\"$hardcode_libdir_flag_spec\"
3511
3512- $ECHO " - use the \`$flag' linker flag"
3513- fi
3514- if test -n "$admincmds"; then
3515- $ECHO " - have your system administrator run these commands:$admincmds"
3516- fi
3517- if test -f /etc/ld.so.conf; then
3518- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3519- fi
3520- echo
3521+ $ECHO " - use the \`$flag' linker flag"
3522+ fi
3523+ if test -n "$admincmds"; then
3524+ $ECHO " - have your system administrator run these commands:$admincmds"
3525+ fi
3526+ if test -f /etc/ld.so.conf; then
3527+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3528+ fi
3529+ echo
3530
3531- echo "See any operating system documentation about shared libraries for"
3532- case $host in
3533- solaris2.[6789]|solaris2.1[0-9])
3534- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3535- echo "pages."
3536- ;;
3537- *)
3538- echo "more information, such as the ld(1) and ld.so(8) manual pages."
3539- ;;
3540- esac
3541- echo "----------------------------------------------------------------------"
3542+ echo "See any operating system documentation about shared libraries for"
3543+ case $host in
3544+ solaris2.[6789]|solaris2.1[0-9])
3545+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3546+ echo "pages."
3547+ ;;
3548+ *)
3549+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
3550+ ;;
3551+ esac
3552+ echo "----------------------------------------------------------------------"
3553+ fi
3554 exit $EXIT_SUCCESS
3555 }
3556
3557-test "$mode" = finish && func_mode_finish ${1+"$@"}
3558+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
3559
3560
3561 # func_mode_install arg...
3562@@ -2077,7 +2786,7 @@ func_mode_install ()
3563 # The real first argument should be the name of the installation program.
3564 # Aesthetically quote it.
3565 func_quote_for_eval "$arg"
3566- install_prog="$install_prog$func_quote_for_eval_result"
3567+ func_append install_prog "$func_quote_for_eval_result"
3568 install_shared_prog=$install_prog
3569 case " $install_prog " in
3570 *[\\\ /]cp\ *) install_cp=: ;;
3571@@ -2097,7 +2806,7 @@ func_mode_install ()
3572 do
3573 arg2=
3574 if test -n "$dest"; then
3575- files="$files $dest"
3576+ func_append files " $dest"
3577 dest=$arg
3578 continue
3579 fi
3580@@ -2135,11 +2844,11 @@ func_mode_install ()
3581
3582 # Aesthetically quote the argument.
3583 func_quote_for_eval "$arg"
3584- install_prog="$install_prog $func_quote_for_eval_result"
3585+ func_append install_prog " $func_quote_for_eval_result"
3586 if test -n "$arg2"; then
3587 func_quote_for_eval "$arg2"
3588 fi
3589- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
3590+ func_append install_shared_prog " $func_quote_for_eval_result"
3591 done
3592
3593 test -z "$install_prog" && \
3594@@ -2151,7 +2860,7 @@ func_mode_install ()
3595 if test -n "$install_override_mode" && $no_mode; then
3596 if $install_cp; then :; else
3597 func_quote_for_eval "$install_override_mode"
3598- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
3599+ func_append install_shared_prog " -m $func_quote_for_eval_result"
3600 fi
3601 fi
3602
3603@@ -2209,10 +2918,13 @@ func_mode_install ()
3604 case $file in
3605 *.$libext)
3606 # Do the static libraries later.
3607- staticlibs="$staticlibs $file"
3608+ func_append staticlibs " $file"
3609 ;;
3610
3611 *.la)
3612+ func_resolve_sysroot "$file"
3613+ file=$func_resolve_sysroot_result
3614+
3615 # Check to see that this really is a libtool archive.
3616 func_lalib_unsafe_p "$file" \
3617 || func_fatal_help "\`$file' is not a valid libtool archive"
3618@@ -2226,23 +2938,30 @@ func_mode_install ()
3619 if test "X$destdir" = "X$libdir"; then
3620 case "$current_libdirs " in
3621 *" $libdir "*) ;;
3622- *) current_libdirs="$current_libdirs $libdir" ;;
3623+ *) func_append current_libdirs " $libdir" ;;
3624 esac
3625 else
3626 # Note the libdir as a future libdir.
3627 case "$future_libdirs " in
3628 *" $libdir "*) ;;
3629- *) future_libdirs="$future_libdirs $libdir" ;;
3630+ *) func_append future_libdirs " $libdir" ;;
3631 esac
3632 fi
3633
3634 func_dirname "$file" "/" ""
3635 dir="$func_dirname_result"
3636- dir="$dir$objdir"
3637+ func_append dir "$objdir"
3638
3639 if test -n "$relink_command"; then
3640+ # Strip any trailing slash from the destination.
3641+ func_stripname '' '/' "$libdir"
3642+ destlibdir=$func_stripname_result
3643+
3644+ func_stripname '' '/' "$destdir"
3645+ s_destdir=$func_stripname_result
3646+
3647 # Determine the prefix the user has applied to our future dir.
3648- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
3649+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
3650
3651 # Don't allow the user to place us outside of our expected
3652 # location b/c this prevents finding dependent libraries that
3653@@ -2315,7 +3034,7 @@ func_mode_install ()
3654 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3655
3656 # Maybe install the static library, too.
3657- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3658+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
3659 ;;
3660
3661 *.lo)
3662@@ -2503,7 +3222,7 @@ func_mode_install ()
3663 test -n "$future_libdirs" && \
3664 func_warning "remember to run \`$progname --finish$future_libdirs'"
3665
3666- if test -n "$current_libdirs" && $opt_finish; then
3667+ if test -n "$current_libdirs"; then
3668 # Maybe just do a dry run.
3669 $opt_dry_run && current_libdirs=" -n$current_libdirs"
3670 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
3671@@ -2512,7 +3231,7 @@ func_mode_install ()
3672 fi
3673 }
3674
3675-test "$mode" = install && func_mode_install ${1+"$@"}
3676+test "$opt_mode" = install && func_mode_install ${1+"$@"}
3677
3678
3679 # func_generate_dlsyms outputname originator pic_p
3680@@ -2559,6 +3278,18 @@ extern \"C\" {
3681 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3682 #endif
3683
3684+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3685+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3686+/* DATA imports from DLLs on WIN32 con't be const, because runtime
3687+ relocations are performed -- see ld's documentation on pseudo-relocs. */
3688+# define LT_DLSYM_CONST
3689+#elif defined(__osf__)
3690+/* This system does not cope well with relocations in const data. */
3691+# define LT_DLSYM_CONST
3692+#else
3693+# define LT_DLSYM_CONST const
3694+#endif
3695+
3696 /* External symbol declarations for the compiler. */\
3697 "
3698
3699@@ -2570,21 +3301,22 @@ extern \"C\" {
3700 # Add our own program objects to the symbol list.
3701 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3702 for progfile in $progfiles; do
3703- func_verbose "extracting global C symbols from \`$progfile'"
3704- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3705+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3706+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3707+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
3708 done
3709
3710 if test -n "$exclude_expsyms"; then
3711 $opt_dry_run || {
3712- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
3713- $MV "$nlist"T "$nlist"
3714+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
3715+ eval '$MV "$nlist"T "$nlist"'
3716 }
3717 fi
3718
3719 if test -n "$export_symbols_regex"; then
3720 $opt_dry_run || {
3721- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
3722- $MV "$nlist"T "$nlist"
3723+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
3724+ eval '$MV "$nlist"T "$nlist"'
3725 }
3726 fi
3727
3728@@ -2593,23 +3325,23 @@ extern \"C\" {
3729 export_symbols="$output_objdir/$outputname.exp"
3730 $opt_dry_run || {
3731 $RM $export_symbols
3732- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
3733+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
3734 case $host in
3735 *cygwin* | *mingw* | *cegcc* )
3736- echo EXPORTS > "$output_objdir/$outputname.def"
3737- cat "$export_symbols" >> "$output_objdir/$outputname.def"
3738+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3739+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
3740 ;;
3741 esac
3742 }
3743 else
3744 $opt_dry_run || {
3745- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
3746- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
3747- $MV "$nlist"T "$nlist"
3748+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
3749+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
3750+ eval '$MV "$nlist"T "$nlist"'
3751 case $host in
3752 *cygwin* | *mingw* | *cegcc* )
3753- echo EXPORTS > "$output_objdir/$outputname.def"
3754- cat "$nlist" >> "$output_objdir/$outputname.def"
3755+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3756+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
3757 ;;
3758 esac
3759 }
3760@@ -2620,10 +3352,52 @@ extern \"C\" {
3761 func_verbose "extracting global C symbols from \`$dlprefile'"
3762 func_basename "$dlprefile"
3763 name="$func_basename_result"
3764- $opt_dry_run || {
3765- $ECHO ": $name " >> "$nlist"
3766- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3767- }
3768+ case $host in
3769+ *cygwin* | *mingw* | *cegcc* )
3770+ # if an import library, we need to obtain dlname
3771+ if func_win32_import_lib_p "$dlprefile"; then
3772+ func_tr_sh "$dlprefile"
3773+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
3774+ dlprefile_dlbasename=""
3775+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3776+ # Use subshell, to avoid clobbering current variable values
3777+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3778+ if test -n "$dlprefile_dlname" ; then
3779+ func_basename "$dlprefile_dlname"
3780+ dlprefile_dlbasename="$func_basename_result"
3781+ else
3782+ # no lafile. user explicitly requested -dlpreopen <import library>.
3783+ $sharedlib_from_linklib_cmd "$dlprefile"
3784+ dlprefile_dlbasename=$sharedlib_from_linklib_result
3785+ fi
3786+ fi
3787+ $opt_dry_run || {
3788+ if test -n "$dlprefile_dlbasename" ; then
3789+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3790+ else
3791+ func_warning "Could not compute DLL name from $name"
3792+ eval '$ECHO ": $name " >> "$nlist"'
3793+ fi
3794+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3795+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3796+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3797+ }
3798+ else # not an import lib
3799+ $opt_dry_run || {
3800+ eval '$ECHO ": $name " >> "$nlist"'
3801+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3802+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3803+ }
3804+ fi
3805+ ;;
3806+ *)
3807+ $opt_dry_run || {
3808+ eval '$ECHO ": $name " >> "$nlist"'
3809+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3810+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3811+ }
3812+ ;;
3813+ esac
3814 done
3815
3816 $opt_dry_run || {
3817@@ -2661,26 +3435,9 @@ typedef struct {
3818 const char *name;
3819 void *address;
3820 } lt_dlsymlist;
3821-"
3822- case $host in
3823- *cygwin* | *mingw* | *cegcc* )
3824- echo >> "$output_objdir/$my_dlsyms" "\
3825-/* DATA imports from DLLs on WIN32 con't be const, because
3826- runtime relocations are performed -- see ld's documentation
3827- on pseudo-relocs. */"
3828- lt_dlsym_const= ;;
3829- *osf5*)
3830- echo >> "$output_objdir/$my_dlsyms" "\
3831-/* This system does not cope well with relocations in const data */"
3832- lt_dlsym_const= ;;
3833- *)
3834- lt_dlsym_const=const ;;
3835- esac
3836-
3837- echo >> "$output_objdir/$my_dlsyms" "\
3838-extern $lt_dlsym_const lt_dlsymlist
3839+extern LT_DLSYM_CONST lt_dlsymlist
3840 lt_${my_prefix}_LTX_preloaded_symbols[];
3841-$lt_dlsym_const lt_dlsymlist
3842+LT_DLSYM_CONST lt_dlsymlist
3843 lt_${my_prefix}_LTX_preloaded_symbols[] =
3844 {\
3845 { \"$my_originator\", (void *) 0 },"
3846@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
3847 for arg in $LTCFLAGS; do
3848 case $arg in
3849 -pie | -fpie | -fPIE) ;;
3850- *) symtab_cflags="$symtab_cflags $arg" ;;
3851+ *) func_append symtab_cflags " $arg" ;;
3852 esac
3853 done
3854
3855@@ -2796,9 +3553,11 @@ func_win32_libid ()
3856 win32_libid_type="x86 archive import"
3857 ;;
3858 *ar\ archive*) # could be an import, or static
3859- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
3860- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3861- win32_nmres=`$NM -f posix -A "$1" |
3862+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3863+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3864+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3865+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3866+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
3867 $SED -n -e '
3868 1,100{
3869 / I /{
3870@@ -2827,6 +3586,131 @@ func_win32_libid ()
3871 $ECHO "$win32_libid_type"
3872 }
3873
3874+# func_cygming_dll_for_implib ARG
3875+#
3876+# Platform-specific function to extract the
3877+# name of the DLL associated with the specified
3878+# import library ARG.
3879+# Invoked by eval'ing the libtool variable
3880+# $sharedlib_from_linklib_cmd
3881+# Result is available in the variable
3882+# $sharedlib_from_linklib_result
3883+func_cygming_dll_for_implib ()
3884+{
3885+ $opt_debug
3886+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3887+}
3888+
3889+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3890+#
3891+# The is the core of a fallback implementation of a
3892+# platform-specific function to extract the name of the
3893+# DLL associated with the specified import library LIBNAME.
3894+#
3895+# SECTION_NAME is either .idata$6 or .idata$7, depending
3896+# on the platform and compiler that created the implib.
3897+#
3898+# Echos the name of the DLL associated with the
3899+# specified import library.
3900+func_cygming_dll_for_implib_fallback_core ()
3901+{
3902+ $opt_debug
3903+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3904+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3905+ $SED '/^Contents of section '"$match_literal"':/{
3906+ # Place marker at beginning of archive member dllname section
3907+ s/.*/====MARK====/
3908+ p
3909+ d
3910+ }
3911+ # These lines can sometimes be longer than 43 characters, but
3912+ # are always uninteresting
3913+ /:[ ]*file format pe[i]\{,1\}-/d
3914+ /^In archive [^:]*:/d
3915+ # Ensure marker is printed
3916+ /^====MARK====/p
3917+ # Remove all lines with less than 43 characters
3918+ /^.\{43\}/!d
3919+ # From remaining lines, remove first 43 characters
3920+ s/^.\{43\}//' |
3921+ $SED -n '
3922+ # Join marker and all lines until next marker into a single line
3923+ /^====MARK====/ b para
3924+ H
3925+ $ b para
3926+ b
3927+ :para
3928+ x
3929+ s/\n//g
3930+ # Remove the marker
3931+ s/^====MARK====//
3932+ # Remove trailing dots and whitespace
3933+ s/[\. \t]*$//
3934+ # Print
3935+ /./p' |
3936+ # we now have a list, one entry per line, of the stringified
3937+ # contents of the appropriate section of all members of the
3938+ # archive which possess that section. Heuristic: eliminate
3939+ # all those which have a first or second character that is
3940+ # a '.' (that is, objdump's representation of an unprintable
3941+ # character.) This should work for all archives with less than
3942+ # 0x302f exports -- but will fail for DLLs whose name actually
3943+ # begins with a literal '.' or a single character followed by
3944+ # a '.'.
3945+ #
3946+ # Of those that remain, print the first one.
3947+ $SED -e '/^\./d;/^.\./d;q'
3948+}
3949+
3950+# func_cygming_gnu_implib_p ARG
3951+# This predicate returns with zero status (TRUE) if
3952+# ARG is a GNU/binutils-style import library. Returns
3953+# with nonzero status (FALSE) otherwise.
3954+func_cygming_gnu_implib_p ()
3955+{
3956+ $opt_debug
3957+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3958+ 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)$'`
3959+ test -n "$func_cygming_gnu_implib_tmp"
3960+}
3961+
3962+# func_cygming_ms_implib_p ARG
3963+# This predicate returns with zero status (TRUE) if
3964+# ARG is an MS-style import library. Returns
3965+# with nonzero status (FALSE) otherwise.
3966+func_cygming_ms_implib_p ()
3967+{
3968+ $opt_debug
3969+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3970+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3971+ test -n "$func_cygming_ms_implib_tmp"
3972+}
3973+
3974+# func_cygming_dll_for_implib_fallback ARG
3975+# Platform-specific function to extract the
3976+# name of the DLL associated with the specified
3977+# import library ARG.
3978+#
3979+# This fallback implementation is for use when $DLLTOOL
3980+# does not support the --identify-strict option.
3981+# Invoked by eval'ing the libtool variable
3982+# $sharedlib_from_linklib_cmd
3983+# Result is available in the variable
3984+# $sharedlib_from_linklib_result
3985+func_cygming_dll_for_implib_fallback ()
3986+{
3987+ $opt_debug
3988+ if func_cygming_gnu_implib_p "$1" ; then
3989+ # binutils import library
3990+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3991+ elif func_cygming_ms_implib_p "$1" ; then
3992+ # ms-generated import library
3993+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
3994+ else
3995+ # unknown
3996+ sharedlib_from_linklib_result=""
3997+ fi
3998+}
3999
4000
4001 # func_extract_an_archive dir oldlib
4002@@ -2917,7 +3801,7 @@ func_extract_archives ()
4003 darwin_file=
4004 darwin_files=
4005 for darwin_file in $darwin_filelist; do
4006- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
4007+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
4008 $LIPO -create -output "$darwin_file" $darwin_files
4009 done # $darwin_filelist
4010 $RM -rf unfat-$$
4011@@ -2932,7 +3816,7 @@ func_extract_archives ()
4012 func_extract_an_archive "$my_xdir" "$my_xabs"
4013 ;;
4014 esac
4015- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4016+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
4017 done
4018
4019 func_extract_archives_result="$my_oldobjs"
4020@@ -3014,7 +3898,110 @@ func_fallback_echo ()
4021 _LTECHO_EOF'
4022 }
4023 ECHO=\"$qECHO\"
4024- fi\
4025+ fi
4026+
4027+# Very basic option parsing. These options are (a) specific to
4028+# the libtool wrapper, (b) are identical between the wrapper
4029+# /script/ and the wrapper /executable/ which is used only on
4030+# windows platforms, and (c) all begin with the string "--lt-"
4031+# (application programs are unlikely to have options which match
4032+# this pattern).
4033+#
4034+# There are only two supported options: --lt-debug and
4035+# --lt-dump-script. There is, deliberately, no --lt-help.
4036+#
4037+# The first argument to this parsing function should be the
4038+# script's $0 value, followed by "$@".
4039+lt_option_debug=
4040+func_parse_lt_options ()
4041+{
4042+ lt_script_arg0=\$0
4043+ shift
4044+ for lt_opt
4045+ do
4046+ case \"\$lt_opt\" in
4047+ --lt-debug) lt_option_debug=1 ;;
4048+ --lt-dump-script)
4049+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
4050+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
4051+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
4052+ cat \"\$lt_dump_D/\$lt_dump_F\"
4053+ exit 0
4054+ ;;
4055+ --lt-*)
4056+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
4057+ exit 1
4058+ ;;
4059+ esac
4060+ done
4061+
4062+ # Print the debug banner immediately:
4063+ if test -n \"\$lt_option_debug\"; then
4064+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
4065+ fi
4066+}
4067+
4068+# Used when --lt-debug. Prints its arguments to stdout
4069+# (redirection is the responsibility of the caller)
4070+func_lt_dump_args ()
4071+{
4072+ lt_dump_args_N=1;
4073+ for lt_arg
4074+ do
4075+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
4076+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
4077+ done
4078+}
4079+
4080+# Core function for launching the target application
4081+func_exec_program_core ()
4082+{
4083+"
4084+ case $host in
4085+ # Backslashes separate directories on plain windows
4086+ *-*-mingw | *-*-os2* | *-cegcc*)
4087+ $ECHO "\
4088+ if test -n \"\$lt_option_debug\"; then
4089+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
4090+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4091+ fi
4092+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4093+"
4094+ ;;
4095+
4096+ *)
4097+ $ECHO "\
4098+ if test -n \"\$lt_option_debug\"; then
4099+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
4100+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4101+ fi
4102+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
4103+"
4104+ ;;
4105+ esac
4106+ $ECHO "\
4107+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4108+ exit 1
4109+}
4110+
4111+# A function to encapsulate launching the target application
4112+# Strips options in the --lt-* namespace from \$@ and
4113+# launches target application with the remaining arguments.
4114+func_exec_program ()
4115+{
4116+ for lt_wr_arg
4117+ do
4118+ case \$lt_wr_arg in
4119+ --lt-*) ;;
4120+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
4121+ esac
4122+ shift
4123+ done
4124+ func_exec_program_core \${1+\"\$@\"}
4125+}
4126+
4127+ # Parse options
4128+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
4129
4130 # Find the directory that this script lives in.
4131 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
4132@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
4133
4134 # relink executable if necessary
4135 if test -n \"\$relink_command\"; then
4136- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
4137+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
4138 else
4139 $ECHO \"\$relink_command_output\" >&2
4140 $RM \"\$progdir/\$file\"
4141@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
4142
4143 if test -f \"\$progdir/\$program\"; then"
4144
4145+ # fixup the dll searchpath if we need to.
4146+ #
4147+ # Fix the DLL searchpath if we need to. Do this before prepending
4148+ # to shlibpath, because on Windows, both are PATH and uninstalled
4149+ # libraries must come first.
4150+ if test -n "$dllsearchpath"; then
4151+ $ECHO "\
4152+ # Add the dll search path components to the executable PATH
4153+ PATH=$dllsearchpath:\$PATH
4154+"
4155+ fi
4156+
4157 # Export our shlibpath_var if we have one.
4158 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4159 $ECHO "\
4160@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
4161 "
4162 fi
4163
4164- # fixup the dll searchpath if we need to.
4165- if test -n "$dllsearchpath"; then
4166- $ECHO "\
4167- # Add the dll search path components to the executable PATH
4168- PATH=$dllsearchpath:\$PATH
4169-"
4170- fi
4171-
4172 $ECHO "\
4173 if test \"\$libtool_execute_magic\" != \"$magic\"; then
4174 # Run the actual program with our arguments.
4175-"
4176- case $host in
4177- # Backslashes separate directories on plain windows
4178- *-*-mingw | *-*-os2* | *-cegcc*)
4179- $ECHO "\
4180- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4181-"
4182- ;;
4183-
4184- *)
4185- $ECHO "\
4186- exec \"\$progdir/\$program\" \${1+\"\$@\"}
4187-"
4188- ;;
4189- esac
4190- $ECHO "\
4191- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4192- exit 1
4193+ func_exec_program \${1+\"\$@\"}
4194 fi
4195 else
4196 # The program doesn't exist.
4197@@ -3158,166 +4132,6 @@ fi\
4198 }
4199
4200
4201-# func_to_host_path arg
4202-#
4203-# Convert paths to host format when used with build tools.
4204-# Intended for use with "native" mingw (where libtool itself
4205-# is running under the msys shell), or in the following cross-
4206-# build environments:
4207-# $build $host
4208-# mingw (msys) mingw [e.g. native]
4209-# cygwin mingw
4210-# *nix + wine mingw
4211-# where wine is equipped with the `winepath' executable.
4212-# In the native mingw case, the (msys) shell automatically
4213-# converts paths for any non-msys applications it launches,
4214-# but that facility isn't available from inside the cwrapper.
4215-# Similar accommodations are necessary for $host mingw and
4216-# $build cygwin. Calling this function does no harm for other
4217-# $host/$build combinations not listed above.
4218-#
4219-# ARG is the path (on $build) that should be converted to
4220-# the proper representation for $host. The result is stored
4221-# in $func_to_host_path_result.
4222-func_to_host_path ()
4223-{
4224- func_to_host_path_result="$1"
4225- if test -n "$1"; then
4226- case $host in
4227- *mingw* )
4228- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4229- case $build in
4230- *mingw* ) # actually, msys
4231- # awkward: cmd appends spaces to result
4232- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
4233- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4234- ;;
4235- *cygwin* )
4236- func_to_host_path_result=`cygpath -w "$1" |
4237- $SED -e "$lt_sed_naive_backslashify"`
4238- ;;
4239- * )
4240- # Unfortunately, winepath does not exit with a non-zero
4241- # error code, so we are forced to check the contents of
4242- # stdout. On the other hand, if the command is not
4243- # found, the shell will set an exit code of 127 and print
4244- # *an error message* to stdout. So we must check for both
4245- # error code of zero AND non-empty stdout, which explains
4246- # the odd construction:
4247- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
4248- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
4249- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
4250- $SED -e "$lt_sed_naive_backslashify"`
4251- else
4252- # Allow warning below.
4253- func_to_host_path_result=
4254- fi
4255- ;;
4256- esac
4257- if test -z "$func_to_host_path_result" ; then
4258- func_error "Could not determine host path corresponding to"
4259- func_error " \`$1'"
4260- func_error "Continuing, but uninstalled executables may not work."
4261- # Fallback:
4262- func_to_host_path_result="$1"
4263- fi
4264- ;;
4265- esac
4266- fi
4267-}
4268-# end: func_to_host_path
4269-
4270-# func_to_host_pathlist arg
4271-#
4272-# Convert pathlists to host format when used with build tools.
4273-# See func_to_host_path(), above. This function supports the
4274-# following $build/$host combinations (but does no harm for
4275-# combinations not listed here):
4276-# $build $host
4277-# mingw (msys) mingw [e.g. native]
4278-# cygwin mingw
4279-# *nix + wine mingw
4280-#
4281-# Path separators are also converted from $build format to
4282-# $host format. If ARG begins or ends with a path separator
4283-# character, it is preserved (but converted to $host format)
4284-# on output.
4285-#
4286-# ARG is a pathlist (on $build) that should be converted to
4287-# the proper representation on $host. The result is stored
4288-# in $func_to_host_pathlist_result.
4289-func_to_host_pathlist ()
4290-{
4291- func_to_host_pathlist_result="$1"
4292- if test -n "$1"; then
4293- case $host in
4294- *mingw* )
4295- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4296- # Remove leading and trailing path separator characters from
4297- # ARG. msys behavior is inconsistent here, cygpath turns them
4298- # into '.;' and ';.', and winepath ignores them completely.
4299- func_stripname : : "$1"
4300- func_to_host_pathlist_tmp1=$func_stripname_result
4301- case $build in
4302- *mingw* ) # Actually, msys.
4303- # Awkward: cmd appends spaces to result.
4304- func_to_host_pathlist_result=`
4305- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
4306- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4307- ;;
4308- *cygwin* )
4309- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
4310- $SED -e "$lt_sed_naive_backslashify"`
4311- ;;
4312- * )
4313- # unfortunately, winepath doesn't convert pathlists
4314- func_to_host_pathlist_result=""
4315- func_to_host_pathlist_oldIFS=$IFS
4316- IFS=:
4317- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
4318- IFS=$func_to_host_pathlist_oldIFS
4319- if test -n "$func_to_host_pathlist_f" ; then
4320- func_to_host_path "$func_to_host_pathlist_f"
4321- if test -n "$func_to_host_path_result" ; then
4322- if test -z "$func_to_host_pathlist_result" ; then
4323- func_to_host_pathlist_result="$func_to_host_path_result"
4324- else
4325- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
4326- fi
4327- fi
4328- fi
4329- done
4330- IFS=$func_to_host_pathlist_oldIFS
4331- ;;
4332- esac
4333- if test -z "$func_to_host_pathlist_result"; then
4334- func_error "Could not determine the host path(s) corresponding to"
4335- func_error " \`$1'"
4336- func_error "Continuing, but uninstalled executables may not work."
4337- # Fallback. This may break if $1 contains DOS-style drive
4338- # specifications. The fix is not to complicate the expression
4339- # below, but for the user to provide a working wine installation
4340- # with winepath so that path translation in the cross-to-mingw
4341- # case works properly.
4342- lt_replace_pathsep_nix_to_dos="s|:|;|g"
4343- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
4344- $SED -e "$lt_replace_pathsep_nix_to_dos"`
4345- fi
4346- # Now, add the leading and trailing path separators back
4347- case "$1" in
4348- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
4349- ;;
4350- esac
4351- case "$1" in
4352- *: ) func_append func_to_host_pathlist_result ";"
4353- ;;
4354- esac
4355- ;;
4356- esac
4357- fi
4358-}
4359-# end: func_to_host_pathlist
4360-
4361 # func_emit_cwrapperexe_src
4362 # emit the source code for a wrapper executable on stdout
4363 # Must ONLY be called from within func_mode_link because
4364@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
4365
4366 This wrapper executable should never be moved out of the build directory.
4367 If it is, it will not operate correctly.
4368-
4369- Currently, it simply execs the wrapper *script* "$SHELL $output",
4370- but could eventually absorb all of the scripts functionality and
4371- exec $objdir/$outputname directly.
4372 */
4373 EOF
4374 cat <<"EOF"
4375@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
4376 if (stale) { free ((void *) stale); stale = 0; } \
4377 } while (0)
4378
4379-#undef LTWRAPPER_DEBUGPRINTF
4380-#if defined LT_DEBUGWRAPPER
4381-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
4382-static void
4383-ltwrapper_debugprintf (const char *fmt, ...)
4384-{
4385- va_list args;
4386- va_start (args, fmt);
4387- (void) vfprintf (stderr, fmt, args);
4388- va_end (args);
4389-}
4390+#if defined(LT_DEBUGWRAPPER)
4391+static int lt_debug = 1;
4392 #else
4393-# define LTWRAPPER_DEBUGPRINTF(args)
4394+static int lt_debug = 0;
4395 #endif
4396
4397-const char *program_name = NULL;
4398+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
4399
4400 void *xmalloc (size_t num);
4401 char *xstrdup (const char *string);
4402@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
4403 int make_executable (const char *path);
4404 int check_executable (const char *path);
4405 char *strendzap (char *str, const char *pat);
4406-void lt_fatal (const char *message, ...);
4407+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
4408+void lt_fatal (const char *file, int line, const char *message, ...);
4409+static const char *nonnull (const char *s);
4410+static const char *nonempty (const char *s);
4411 void lt_setenv (const char *name, const char *value);
4412 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
4413 void lt_update_exe_path (const char *name, const char *value);
4414@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
4415 EOF
4416
4417 cat <<EOF
4418-const char * MAGIC_EXE = "$magic_exe";
4419+volatile const char * MAGIC_EXE = "$magic_exe";
4420 const char * LIB_PATH_VARNAME = "$shlibpath_var";
4421 EOF
4422
4423 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4424- func_to_host_pathlist "$temp_rpath"
4425+ func_to_host_path "$temp_rpath"
4426 cat <<EOF
4427-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4428+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
4429 EOF
4430 else
4431 cat <<"EOF"
4432@@ -3513,10 +4317,10 @@ EOF
4433 fi
4434
4435 if test -n "$dllsearchpath"; then
4436- func_to_host_pathlist "$dllsearchpath:"
4437+ func_to_host_path "$dllsearchpath:"
4438 cat <<EOF
4439 const char * EXE_PATH_VARNAME = "PATH";
4440-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4441+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
4442 EOF
4443 else
4444 cat <<"EOF"
4445@@ -3539,12 +4343,10 @@ EOF
4446 cat <<"EOF"
4447
4448 #define LTWRAPPER_OPTION_PREFIX "--lt-"
4449-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
4450
4451-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
4452 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
4453-
4454 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
4455+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
4456
4457 int
4458 main (int argc, char *argv[])
4459@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
4460 int i;
4461
4462 program_name = (char *) xstrdup (base_name (argv[0]));
4463- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
4464- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
4465+ newargz = XMALLOC (char *, argc + 1);
4466
4467- /* very simple arg parsing; don't want to rely on getopt */
4468+ /* very simple arg parsing; don't want to rely on getopt
4469+ * also, copy all non cwrapper options to newargz, except
4470+ * argz[0], which is handled differently
4471+ */
4472+ newargc=0;
4473 for (i = 1; i < argc; i++)
4474 {
4475 if (strcmp (argv[i], dumpscript_opt) == 0)
4476@@ -3581,21 +4386,54 @@ EOF
4477 lt_dump_script (stdout);
4478 return 0;
4479 }
4480+ if (strcmp (argv[i], debug_opt) == 0)
4481+ {
4482+ lt_debug = 1;
4483+ continue;
4484+ }
4485+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
4486+ {
4487+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4488+ namespace, but it is not one of the ones we know about and
4489+ have already dealt with, above (inluding dump-script), then
4490+ report an error. Otherwise, targets might begin to believe
4491+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4492+ namespace. The first time any user complains about this, we'll
4493+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4494+ or a configure.ac-settable value.
4495+ */
4496+ lt_fatal (__FILE__, __LINE__,
4497+ "unrecognized %s option: '%s'",
4498+ ltwrapper_option_prefix, argv[i]);
4499+ }
4500+ /* otherwise ... */
4501+ newargz[++newargc] = xstrdup (argv[i]);
4502 }
4503+ newargz[++newargc] = NULL;
4504+
4505+EOF
4506+ cat <<EOF
4507+ /* The GNU banner must be the first non-error debug message */
4508+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
4509+EOF
4510+ cat <<"EOF"
4511+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
4512+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
4513
4514- newargz = XMALLOC (char *, argc + 1);
4515 tmp_pathspec = find_executable (argv[0]);
4516 if (tmp_pathspec == NULL)
4517- lt_fatal ("Couldn't find %s", argv[0]);
4518- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
4519- tmp_pathspec));
4520+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
4521+ lt_debugprintf (__FILE__, __LINE__,
4522+ "(main) found exe (before symlink chase) at: %s\n",
4523+ tmp_pathspec);
4524
4525 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
4526- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
4527- actual_cwrapper_path));
4528+ lt_debugprintf (__FILE__, __LINE__,
4529+ "(main) found exe (after symlink chase) at: %s\n",
4530+ actual_cwrapper_path);
4531 XFREE (tmp_pathspec);
4532
4533- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
4534+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
4535 strendzap (actual_cwrapper_path, actual_cwrapper_name);
4536
4537 /* wrapper name transforms */
4538@@ -3613,8 +4451,9 @@ EOF
4539 target_name = tmp_pathspec;
4540 tmp_pathspec = 0;
4541
4542- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
4543- target_name));
4544+ lt_debugprintf (__FILE__, __LINE__,
4545+ "(main) libtool target name: %s\n",
4546+ target_name);
4547 EOF
4548
4549 cat <<EOF
4550@@ -3664,35 +4503,19 @@ EOF
4551
4552 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4553 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4554- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4555+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4556+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4557+ because on Windows, both *_VARNAMEs are PATH but uninstalled
4558+ libraries must come first. */
4559 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4560+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4561
4562- newargc=0;
4563- for (i = 1; i < argc; i++)
4564- {
4565- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
4566- {
4567- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4568- namespace, but it is not one of the ones we know about and
4569- have already dealt with, above (inluding dump-script), then
4570- report an error. Otherwise, targets might begin to believe
4571- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4572- namespace. The first time any user complains about this, we'll
4573- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4574- or a configure.ac-settable value.
4575- */
4576- lt_fatal ("Unrecognized option in %s namespace: '%s'",
4577- ltwrapper_option_prefix, argv[i]);
4578- }
4579- /* otherwise ... */
4580- newargz[++newargc] = xstrdup (argv[i]);
4581- }
4582- newargz[++newargc] = NULL;
4583-
4584- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
4585+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4586+ nonnull (lt_argv_zero));
4587 for (i = 0; i < newargc; i++)
4588 {
4589- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
4590+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
4591+ i, nonnull (newargz[i]));
4592 }
4593
4594 EOF
4595@@ -3706,7 +4529,9 @@ EOF
4596 if (rval == -1)
4597 {
4598 /* failed to start process */
4599- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
4600+ lt_debugprintf (__FILE__, __LINE__,
4601+ "(main) failed to launch target \"%s\": %s\n",
4602+ lt_argv_zero, nonnull (strerror (errno)));
4603 return 127;
4604 }
4605 return rval;
4606@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
4607 {
4608 void *p = (void *) malloc (num);
4609 if (!p)
4610- lt_fatal ("Memory exhausted");
4611+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
4612
4613 return p;
4614 }
4615@@ -3762,8 +4587,8 @@ check_executable (const char *path)
4616 {
4617 struct stat st;
4618
4619- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
4620- path ? (*path ? path : "EMPTY!") : "NULL!"));
4621+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
4622+ nonempty (path));
4623 if ((!path) || (!*path))
4624 return 0;
4625
4626@@ -3780,8 +4605,8 @@ make_executable (const char *path)
4627 int rval = 0;
4628 struct stat st;
4629
4630- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
4631- path ? (*path ? path : "EMPTY!") : "NULL!"));
4632+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
4633+ nonempty (path));
4634 if ((!path) || (!*path))
4635 return 0;
4636
4637@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
4638 int tmp_len;
4639 char *concat_name;
4640
4641- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
4642- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
4643+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
4644+ nonempty (wrapper));
4645
4646 if ((wrapper == NULL) || (*wrapper == '\0'))
4647 return NULL;
4648@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
4649 {
4650 /* empty path: current directory */
4651 if (getcwd (tmp, LT_PATHMAX) == NULL)
4652- lt_fatal ("getcwd failed");
4653+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4654+ nonnull (strerror (errno)));
4655 tmp_len = strlen (tmp);
4656 concat_name =
4657 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4658@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
4659 }
4660 /* Relative path | not found in path: prepend cwd */
4661 if (getcwd (tmp, LT_PATHMAX) == NULL)
4662- lt_fatal ("getcwd failed");
4663+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4664+ nonnull (strerror (errno)));
4665 tmp_len = strlen (tmp);
4666 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4667 memcpy (concat_name, tmp, tmp_len);
4668@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
4669 int has_symlinks = 0;
4670 while (strlen (tmp_pathspec) && !has_symlinks)
4671 {
4672- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
4673- tmp_pathspec));
4674+ lt_debugprintf (__FILE__, __LINE__,
4675+ "checking path component for symlinks: %s\n",
4676+ tmp_pathspec);
4677 if (lstat (tmp_pathspec, &s) == 0)
4678 {
4679 if (S_ISLNK (s.st_mode) != 0)
4680@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
4681 }
4682 else
4683 {
4684- char *errstr = strerror (errno);
4685- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
4686+ lt_fatal (__FILE__, __LINE__,
4687+ "error accessing file \"%s\": %s",
4688+ tmp_pathspec, nonnull (strerror (errno)));
4689 }
4690 }
4691 XFREE (tmp_pathspec);
4692@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
4693 tmp_pathspec = realpath (pathspec, buf);
4694 if (tmp_pathspec == 0)
4695 {
4696- lt_fatal ("Could not follow symlinks for %s", pathspec);
4697+ lt_fatal (__FILE__, __LINE__,
4698+ "could not follow symlinks for %s", pathspec);
4699 }
4700 return xstrdup (tmp_pathspec);
4701 #endif
4702@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
4703 return str;
4704 }
4705
4706+void
4707+lt_debugprintf (const char *file, int line, const char *fmt, ...)
4708+{
4709+ va_list args;
4710+ if (lt_debug)
4711+ {
4712+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
4713+ va_start (args, fmt);
4714+ (void) vfprintf (stderr, fmt, args);
4715+ va_end (args);
4716+ }
4717+}
4718+
4719 static void
4720-lt_error_core (int exit_status, const char *mode,
4721+lt_error_core (int exit_status, const char *file,
4722+ int line, const char *mode,
4723 const char *message, va_list ap)
4724 {
4725- fprintf (stderr, "%s: %s: ", program_name, mode);
4726+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
4727 vfprintf (stderr, message, ap);
4728 fprintf (stderr, ".\n");
4729
4730@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
4731 }
4732
4733 void
4734-lt_fatal (const char *message, ...)
4735+lt_fatal (const char *file, int line, const char *message, ...)
4736 {
4737 va_list ap;
4738 va_start (ap, message);
4739- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
4740+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
4741 va_end (ap);
4742 }
4743
4744+static const char *
4745+nonnull (const char *s)
4746+{
4747+ return s ? s : "(null)";
4748+}
4749+
4750+static const char *
4751+nonempty (const char *s)
4752+{
4753+ return (s && !*s) ? "(empty)" : nonnull (s);
4754+}
4755+
4756 void
4757 lt_setenv (const char *name, const char *value)
4758 {
4759- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
4760- (name ? name : "<NULL>"),
4761- (value ? value : "<NULL>")));
4762+ lt_debugprintf (__FILE__, __LINE__,
4763+ "(lt_setenv) setting '%s' to '%s'\n",
4764+ nonnull (name), nonnull (value));
4765 {
4766 #ifdef HAVE_SETENV
4767 /* always make a copy, for consistency with !HAVE_SETENV */
4768@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
4769 void
4770 lt_update_exe_path (const char *name, const char *value)
4771 {
4772- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4773- (name ? name : "<NULL>"),
4774- (value ? value : "<NULL>")));
4775+ lt_debugprintf (__FILE__, __LINE__,
4776+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4777+ nonnull (name), nonnull (value));
4778
4779 if (name && *name && value && *value)
4780 {
4781@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
4782 void
4783 lt_update_lib_path (const char *name, const char *value)
4784 {
4785- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4786- (name ? name : "<NULL>"),
4787- (value ? value : "<NULL>")));
4788+ lt_debugprintf (__FILE__, __LINE__,
4789+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4790+ nonnull (name), nonnull (value));
4791
4792 if (name && *name && value && *value)
4793 {
4794@@ -4222,7 +5078,7 @@ EOF
4795 func_win32_import_lib_p ()
4796 {
4797 $opt_debug
4798- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
4799+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4800 *import*) : ;;
4801 *) false ;;
4802 esac
4803@@ -4401,9 +5257,9 @@ func_mode_link ()
4804 ;;
4805 *)
4806 if test "$prev" = dlfiles; then
4807- dlfiles="$dlfiles $arg"
4808+ func_append dlfiles " $arg"
4809 else
4810- dlprefiles="$dlprefiles $arg"
4811+ func_append dlprefiles " $arg"
4812 fi
4813 prev=
4814 continue
4815@@ -4427,7 +5283,7 @@ func_mode_link ()
4816 *-*-darwin*)
4817 case "$deplibs " in
4818 *" $qarg.ltframework "*) ;;
4819- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
4820+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
4821 ;;
4822 esac
4823 ;;
4824@@ -4446,7 +5302,7 @@ func_mode_link ()
4825 moreargs=
4826 for fil in `cat "$save_arg"`
4827 do
4828-# moreargs="$moreargs $fil"
4829+# func_append moreargs " $fil"
4830 arg=$fil
4831 # A libtool-controlled object.
4832
4833@@ -4475,7 +5331,7 @@ func_mode_link ()
4834
4835 if test "$prev" = dlfiles; then
4836 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
4837- dlfiles="$dlfiles $pic_object"
4838+ func_append dlfiles " $pic_object"
4839 prev=
4840 continue
4841 else
4842@@ -4487,7 +5343,7 @@ func_mode_link ()
4843 # CHECK ME: I think I busted this. -Ossama
4844 if test "$prev" = dlprefiles; then
4845 # Preload the old-style object.
4846- dlprefiles="$dlprefiles $pic_object"
4847+ func_append dlprefiles " $pic_object"
4848 prev=
4849 fi
4850
4851@@ -4557,12 +5413,12 @@ func_mode_link ()
4852 if test "$prev" = rpath; then
4853 case "$rpath " in
4854 *" $arg "*) ;;
4855- *) rpath="$rpath $arg" ;;
4856+ *) func_append rpath " $arg" ;;
4857 esac
4858 else
4859 case "$xrpath " in
4860 *" $arg "*) ;;
4861- *) xrpath="$xrpath $arg" ;;
4862+ *) func_append xrpath " $arg" ;;
4863 esac
4864 fi
4865 prev=
4866@@ -4574,28 +5430,28 @@ func_mode_link ()
4867 continue
4868 ;;
4869 weak)
4870- weak_libs="$weak_libs $arg"
4871+ func_append weak_libs " $arg"
4872 prev=
4873 continue
4874 ;;
4875 xcclinker)
4876- linker_flags="$linker_flags $qarg"
4877- compiler_flags="$compiler_flags $qarg"
4878+ func_append linker_flags " $qarg"
4879+ func_append compiler_flags " $qarg"
4880 prev=
4881 func_append compile_command " $qarg"
4882 func_append finalize_command " $qarg"
4883 continue
4884 ;;
4885 xcompiler)
4886- compiler_flags="$compiler_flags $qarg"
4887+ func_append compiler_flags " $qarg"
4888 prev=
4889 func_append compile_command " $qarg"
4890 func_append finalize_command " $qarg"
4891 continue
4892 ;;
4893 xlinker)
4894- linker_flags="$linker_flags $qarg"
4895- compiler_flags="$compiler_flags $wl$qarg"
4896+ func_append linker_flags " $qarg"
4897+ func_append compiler_flags " $wl$qarg"
4898 prev=
4899 func_append compile_command " $wl$qarg"
4900 func_append finalize_command " $wl$qarg"
4901@@ -4686,15 +5542,16 @@ func_mode_link ()
4902 ;;
4903
4904 -L*)
4905- func_stripname '-L' '' "$arg"
4906- dir=$func_stripname_result
4907- if test -z "$dir"; then
4908+ func_stripname "-L" '' "$arg"
4909+ if test -z "$func_stripname_result"; then
4910 if test "$#" -gt 0; then
4911 func_fatal_error "require no space between \`-L' and \`$1'"
4912 else
4913 func_fatal_error "need path for \`-L' option"
4914 fi
4915 fi
4916+ func_resolve_sysroot "$func_stripname_result"
4917+ dir=$func_resolve_sysroot_result
4918 # We need an absolute path.
4919 case $dir in
4920 [\\/]* | [A-Za-z]:[\\/]*) ;;
4921@@ -4706,10 +5563,16 @@ func_mode_link ()
4922 ;;
4923 esac
4924 case "$deplibs " in
4925- *" -L$dir "*) ;;
4926+ *" -L$dir "* | *" $arg "*)
4927+ # Will only happen for absolute or sysroot arguments
4928+ ;;
4929 *)
4930- deplibs="$deplibs -L$dir"
4931- lib_search_path="$lib_search_path $dir"
4932+ # Preserve sysroot, but never include relative directories
4933+ case $dir in
4934+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
4935+ *) func_append deplibs " -L$dir" ;;
4936+ esac
4937+ func_append lib_search_path " $dir"
4938 ;;
4939 esac
4940 case $host in
4941@@ -4718,12 +5581,12 @@ func_mode_link ()
4942 case :$dllsearchpath: in
4943 *":$dir:"*) ;;
4944 ::) dllsearchpath=$dir;;
4945- *) dllsearchpath="$dllsearchpath:$dir";;
4946+ *) func_append dllsearchpath ":$dir";;
4947 esac
4948 case :$dllsearchpath: in
4949 *":$testbindir:"*) ;;
4950 ::) dllsearchpath=$testbindir;;
4951- *) dllsearchpath="$dllsearchpath:$testbindir";;
4952+ *) func_append dllsearchpath ":$testbindir";;
4953 esac
4954 ;;
4955 esac
4956@@ -4747,7 +5610,7 @@ func_mode_link ()
4957 ;;
4958 *-*-rhapsody* | *-*-darwin1.[012])
4959 # Rhapsody C and math libraries are in the System framework
4960- deplibs="$deplibs System.ltframework"
4961+ func_append deplibs " System.ltframework"
4962 continue
4963 ;;
4964 *-*-sco3.2v5* | *-*-sco5v6*)
4965@@ -4758,9 +5621,6 @@ func_mode_link ()
4966 # Compiler inserts libc in the correct place for threads to work
4967 test "X$arg" = "X-lc" && continue
4968 ;;
4969- *-*-linux*)
4970- test "X$arg" = "X-lc" && continue
4971- ;;
4972 esac
4973 elif test "X$arg" = "X-lc_r"; then
4974 case $host in
4975@@ -4770,7 +5630,7 @@ func_mode_link ()
4976 ;;
4977 esac
4978 fi
4979- deplibs="$deplibs $arg"
4980+ func_append deplibs " $arg"
4981 continue
4982 ;;
4983
4984@@ -4782,8 +5642,8 @@ func_mode_link ()
4985 # Tru64 UNIX uses -model [arg] to determine the layout of C++
4986 # classes, name mangling, and exception handling.
4987 # Darwin uses the -arch flag to determine output architecture.
4988- -model|-arch|-isysroot)
4989- compiler_flags="$compiler_flags $arg"
4990+ -model|-arch|-isysroot|--sysroot)
4991+ func_append compiler_flags " $arg"
4992 func_append compile_command " $arg"
4993 func_append finalize_command " $arg"
4994 prev=xcompiler
4995@@ -4791,12 +5651,12 @@ func_mode_link ()
4996 ;;
4997
4998 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
4999- compiler_flags="$compiler_flags $arg"
5000+ func_append compiler_flags " $arg"
5001 func_append compile_command " $arg"
5002 func_append finalize_command " $arg"
5003 case "$new_inherited_linker_flags " in
5004 *" $arg "*) ;;
5005- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5006+ * ) func_append new_inherited_linker_flags " $arg" ;;
5007 esac
5008 continue
5009 ;;
5010@@ -4863,13 +5723,17 @@ func_mode_link ()
5011 # We need an absolute path.
5012 case $dir in
5013 [\\/]* | [A-Za-z]:[\\/]*) ;;
5014+ =*)
5015+ func_stripname '=' '' "$dir"
5016+ dir=$lt_sysroot$func_stripname_result
5017+ ;;
5018 *)
5019 func_fatal_error "only absolute run-paths are allowed"
5020 ;;
5021 esac
5022 case "$xrpath " in
5023 *" $dir "*) ;;
5024- *) xrpath="$xrpath $dir" ;;
5025+ *) func_append xrpath " $dir" ;;
5026 esac
5027 continue
5028 ;;
5029@@ -4922,8 +5786,8 @@ func_mode_link ()
5030 for flag in $args; do
5031 IFS="$save_ifs"
5032 func_quote_for_eval "$flag"
5033- arg="$arg $func_quote_for_eval_result"
5034- compiler_flags="$compiler_flags $func_quote_for_eval_result"
5035+ func_append arg " $func_quote_for_eval_result"
5036+ func_append compiler_flags " $func_quote_for_eval_result"
5037 done
5038 IFS="$save_ifs"
5039 func_stripname ' ' '' "$arg"
5040@@ -4938,9 +5802,9 @@ func_mode_link ()
5041 for flag in $args; do
5042 IFS="$save_ifs"
5043 func_quote_for_eval "$flag"
5044- arg="$arg $wl$func_quote_for_eval_result"
5045- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5046- linker_flags="$linker_flags $func_quote_for_eval_result"
5047+ func_append arg " $wl$func_quote_for_eval_result"
5048+ func_append compiler_flags " $wl$func_quote_for_eval_result"
5049+ func_append linker_flags " $func_quote_for_eval_result"
5050 done
5051 IFS="$save_ifs"
5052 func_stripname ' ' '' "$arg"
5053@@ -4968,24 +5832,27 @@ func_mode_link ()
5054 arg="$func_quote_for_eval_result"
5055 ;;
5056
5057- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
5058- # -r[0-9][0-9]* specifies the processor on the SGI compiler
5059- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
5060- # +DA*, +DD* enable 64-bit mode on the HP compiler
5061- # -q* pass through compiler args for the IBM compiler
5062- # -m*, -t[45]*, -txscale* pass through architecture-specific
5063- # compiler args for GCC
5064- # -F/path gives path to uninstalled frameworks, gcc on darwin
5065- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
5066- # @file GCC response files
5067- # -tp=* Portland pgcc target processor selection
5068+ # Flags to be passed through unchanged, with rationale:
5069+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
5070+ # -r[0-9][0-9]* specify processor for the SGI compiler
5071+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
5072+ # +DA*, +DD* enable 64-bit mode for the HP compiler
5073+ # -q* compiler args for the IBM compiler
5074+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
5075+ # -F/path path to uninstalled frameworks, gcc on darwin
5076+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5077+ # @file GCC response files
5078+ # -tp=* Portland pgcc target processor selection
5079+ # --sysroot=* for sysroot support
5080+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5081 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5082- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5083+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5084+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5085 func_quote_for_eval "$arg"
5086 arg="$func_quote_for_eval_result"
5087 func_append compile_command " $arg"
5088 func_append finalize_command " $arg"
5089- compiler_flags="$compiler_flags $arg"
5090+ func_append compiler_flags " $arg"
5091 continue
5092 ;;
5093
5094@@ -4997,7 +5864,7 @@ func_mode_link ()
5095
5096 *.$objext)
5097 # A standard object.
5098- objs="$objs $arg"
5099+ func_append objs " $arg"
5100 ;;
5101
5102 *.lo)
5103@@ -5028,7 +5895,7 @@ func_mode_link ()
5104
5105 if test "$prev" = dlfiles; then
5106 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5107- dlfiles="$dlfiles $pic_object"
5108+ func_append dlfiles " $pic_object"
5109 prev=
5110 continue
5111 else
5112@@ -5040,7 +5907,7 @@ func_mode_link ()
5113 # CHECK ME: I think I busted this. -Ossama
5114 if test "$prev" = dlprefiles; then
5115 # Preload the old-style object.
5116- dlprefiles="$dlprefiles $pic_object"
5117+ func_append dlprefiles " $pic_object"
5118 prev=
5119 fi
5120
5121@@ -5085,24 +5952,25 @@ func_mode_link ()
5122
5123 *.$libext)
5124 # An archive.
5125- deplibs="$deplibs $arg"
5126- old_deplibs="$old_deplibs $arg"
5127+ func_append deplibs " $arg"
5128+ func_append old_deplibs " $arg"
5129 continue
5130 ;;
5131
5132 *.la)
5133 # A libtool-controlled library.
5134
5135+ func_resolve_sysroot "$arg"
5136 if test "$prev" = dlfiles; then
5137 # This library was specified with -dlopen.
5138- dlfiles="$dlfiles $arg"
5139+ func_append dlfiles " $func_resolve_sysroot_result"
5140 prev=
5141 elif test "$prev" = dlprefiles; then
5142 # The library was specified with -dlpreopen.
5143- dlprefiles="$dlprefiles $arg"
5144+ func_append dlprefiles " $func_resolve_sysroot_result"
5145 prev=
5146 else
5147- deplibs="$deplibs $arg"
5148+ func_append deplibs " $func_resolve_sysroot_result"
5149 fi
5150 continue
5151 ;;
5152@@ -5127,7 +5995,7 @@ func_mode_link ()
5153 func_fatal_help "the \`$prevarg' option requires an argument"
5154
5155 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
5156- eval "arg=\"$export_dynamic_flag_spec\""
5157+ eval arg=\"$export_dynamic_flag_spec\"
5158 func_append compile_command " $arg"
5159 func_append finalize_command " $arg"
5160 fi
5161@@ -5144,11 +6012,13 @@ func_mode_link ()
5162 else
5163 shlib_search_path=
5164 fi
5165- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
5166- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
5167+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
5168+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
5169
5170 func_dirname "$output" "/" ""
5171 output_objdir="$func_dirname_result$objdir"
5172+ func_to_tool_file "$output_objdir/"
5173+ tool_output_objdir=$func_to_tool_file_result
5174 # Create the object directory.
5175 func_mkdir_p "$output_objdir"
5176
5177@@ -5169,12 +6039,12 @@ func_mode_link ()
5178 # Find all interdependent deplibs by searching for libraries
5179 # that are linked more than once (e.g. -la -lb -la)
5180 for deplib in $deplibs; do
5181- if $opt_duplicate_deps ; then
5182+ if $opt_preserve_dup_deps ; then
5183 case "$libs " in
5184- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5185+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5186 esac
5187 fi
5188- libs="$libs $deplib"
5189+ func_append libs " $deplib"
5190 done
5191
5192 if test "$linkmode" = lib; then
5193@@ -5187,9 +6057,9 @@ func_mode_link ()
5194 if $opt_duplicate_compiler_generated_deps; then
5195 for pre_post_dep in $predeps $postdeps; do
5196 case "$pre_post_deps " in
5197- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
5198+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5199 esac
5200- pre_post_deps="$pre_post_deps $pre_post_dep"
5201+ func_append pre_post_deps " $pre_post_dep"
5202 done
5203 fi
5204 pre_post_deps=
5205@@ -5256,8 +6126,9 @@ func_mode_link ()
5206 for lib in $dlprefiles; do
5207 # Ignore non-libtool-libs
5208 dependency_libs=
5209+ func_resolve_sysroot "$lib"
5210 case $lib in
5211- *.la) func_source "$lib" ;;
5212+ *.la) func_source "$func_resolve_sysroot_result" ;;
5213 esac
5214
5215 # Collect preopened libtool deplibs, except any this library
5216@@ -5267,7 +6138,7 @@ func_mode_link ()
5217 deplib_base=$func_basename_result
5218 case " $weak_libs " in
5219 *" $deplib_base "*) ;;
5220- *) deplibs="$deplibs $deplib" ;;
5221+ *) func_append deplibs " $deplib" ;;
5222 esac
5223 done
5224 done
5225@@ -5288,11 +6159,11 @@ func_mode_link ()
5226 compile_deplibs="$deplib $compile_deplibs"
5227 finalize_deplibs="$deplib $finalize_deplibs"
5228 else
5229- compiler_flags="$compiler_flags $deplib"
5230+ func_append compiler_flags " $deplib"
5231 if test "$linkmode" = lib ; then
5232 case "$new_inherited_linker_flags " in
5233 *" $deplib "*) ;;
5234- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5235+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5236 esac
5237 fi
5238 fi
5239@@ -5377,7 +6248,7 @@ func_mode_link ()
5240 if test "$linkmode" = lib ; then
5241 case "$new_inherited_linker_flags " in
5242 *" $deplib "*) ;;
5243- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5244+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5245 esac
5246 fi
5247 fi
5248@@ -5390,7 +6261,8 @@ func_mode_link ()
5249 test "$pass" = conv && continue
5250 newdependency_libs="$deplib $newdependency_libs"
5251 func_stripname '-L' '' "$deplib"
5252- newlib_search_path="$newlib_search_path $func_stripname_result"
5253+ func_resolve_sysroot "$func_stripname_result"
5254+ func_append newlib_search_path " $func_resolve_sysroot_result"
5255 ;;
5256 prog)
5257 if test "$pass" = conv; then
5258@@ -5404,7 +6276,8 @@ func_mode_link ()
5259 finalize_deplibs="$deplib $finalize_deplibs"
5260 fi
5261 func_stripname '-L' '' "$deplib"
5262- newlib_search_path="$newlib_search_path $func_stripname_result"
5263+ func_resolve_sysroot "$func_stripname_result"
5264+ func_append newlib_search_path " $func_resolve_sysroot_result"
5265 ;;
5266 *)
5267 func_warning "\`-L' is ignored for archives/objects"
5268@@ -5415,17 +6288,21 @@ func_mode_link ()
5269 -R*)
5270 if test "$pass" = link; then
5271 func_stripname '-R' '' "$deplib"
5272- dir=$func_stripname_result
5273+ func_resolve_sysroot "$func_stripname_result"
5274+ dir=$func_resolve_sysroot_result
5275 # Make sure the xrpath contains only unique directories.
5276 case "$xrpath " in
5277 *" $dir "*) ;;
5278- *) xrpath="$xrpath $dir" ;;
5279+ *) func_append xrpath " $dir" ;;
5280 esac
5281 fi
5282 deplibs="$deplib $deplibs"
5283 continue
5284 ;;
5285- *.la) lib="$deplib" ;;
5286+ *.la)
5287+ func_resolve_sysroot "$deplib"
5288+ lib=$func_resolve_sysroot_result
5289+ ;;
5290 *.$libext)
5291 if test "$pass" = conv; then
5292 deplibs="$deplib $deplibs"
5293@@ -5488,11 +6365,11 @@ func_mode_link ()
5294 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
5295 # If there is no dlopen support or we're linking statically,
5296 # we need to preload.
5297- newdlprefiles="$newdlprefiles $deplib"
5298+ func_append newdlprefiles " $deplib"
5299 compile_deplibs="$deplib $compile_deplibs"
5300 finalize_deplibs="$deplib $finalize_deplibs"
5301 else
5302- newdlfiles="$newdlfiles $deplib"
5303+ func_append newdlfiles " $deplib"
5304 fi
5305 fi
5306 continue
5307@@ -5538,7 +6415,7 @@ func_mode_link ()
5308 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5309 case " $new_inherited_linker_flags " in
5310 *" $tmp_inherited_linker_flag "*) ;;
5311- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
5312+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5313 esac
5314 done
5315 fi
5316@@ -5546,8 +6423,8 @@ func_mode_link ()
5317 if test "$linkmode,$pass" = "lib,link" ||
5318 test "$linkmode,$pass" = "prog,scan" ||
5319 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
5320- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5321- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
5322+ test -n "$dlopen" && func_append dlfiles " $dlopen"
5323+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5324 fi
5325
5326 if test "$pass" = conv; then
5327@@ -5558,20 +6435,20 @@ func_mode_link ()
5328 func_fatal_error "cannot find name of link library for \`$lib'"
5329 fi
5330 # It is a libtool convenience library, so add in its objects.
5331- convenience="$convenience $ladir/$objdir/$old_library"
5332- old_convenience="$old_convenience $ladir/$objdir/$old_library"
5333+ func_append convenience " $ladir/$objdir/$old_library"
5334+ func_append old_convenience " $ladir/$objdir/$old_library"
5335 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5336 func_fatal_error "\`$lib' is not a convenience library"
5337 fi
5338 tmp_libs=
5339 for deplib in $dependency_libs; do
5340 deplibs="$deplib $deplibs"
5341- if $opt_duplicate_deps ; then
5342+ if $opt_preserve_dup_deps ; then
5343 case "$tmp_libs " in
5344- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5345+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5346 esac
5347 fi
5348- tmp_libs="$tmp_libs $deplib"
5349+ func_append tmp_libs " $deplib"
5350 done
5351 continue
5352 fi # $pass = conv
5353@@ -5579,9 +6456,15 @@ func_mode_link ()
5354
5355 # Get the name of the library we link against.
5356 linklib=
5357- for l in $old_library $library_names; do
5358- linklib="$l"
5359- done
5360+ if test -n "$old_library" &&
5361+ { test "$prefer_static_libs" = yes ||
5362+ test "$prefer_static_libs,$installed" = "built,no"; }; then
5363+ linklib=$old_library
5364+ else
5365+ for l in $old_library $library_names; do
5366+ linklib="$l"
5367+ done
5368+ fi
5369 if test -z "$linklib"; then
5370 func_fatal_error "cannot find name of link library for \`$lib'"
5371 fi
5372@@ -5598,9 +6481,9 @@ func_mode_link ()
5373 # statically, we need to preload. We also need to preload any
5374 # dependent libraries so libltdl's deplib preloader doesn't
5375 # bomb out in the load deplibs phase.
5376- dlprefiles="$dlprefiles $lib $dependency_libs"
5377+ func_append dlprefiles " $lib $dependency_libs"
5378 else
5379- newdlfiles="$newdlfiles $lib"
5380+ func_append newdlfiles " $lib"
5381 fi
5382 continue
5383 fi # $pass = dlopen
5384@@ -5622,14 +6505,14 @@ func_mode_link ()
5385
5386 # Find the relevant object directory and library name.
5387 if test "X$installed" = Xyes; then
5388- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5389+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5390 func_warning "library \`$lib' was moved."
5391 dir="$ladir"
5392 absdir="$abs_ladir"
5393 libdir="$abs_ladir"
5394 else
5395- dir="$libdir"
5396- absdir="$libdir"
5397+ dir="$lt_sysroot$libdir"
5398+ absdir="$lt_sysroot$libdir"
5399 fi
5400 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
5401 else
5402@@ -5637,12 +6520,12 @@ func_mode_link ()
5403 dir="$ladir"
5404 absdir="$abs_ladir"
5405 # Remove this search path later
5406- notinst_path="$notinst_path $abs_ladir"
5407+ func_append notinst_path " $abs_ladir"
5408 else
5409 dir="$ladir/$objdir"
5410 absdir="$abs_ladir/$objdir"
5411 # Remove this search path later
5412- notinst_path="$notinst_path $abs_ladir"
5413+ func_append notinst_path " $abs_ladir"
5414 fi
5415 fi # $installed = yes
5416 func_stripname 'lib' '.la' "$laname"
5417@@ -5653,20 +6536,46 @@ func_mode_link ()
5418 if test -z "$libdir" && test "$linkmode" = prog; then
5419 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
5420 fi
5421- # Prefer using a static library (so that no silly _DYNAMIC symbols
5422- # are required to link).
5423- if test -n "$old_library"; then
5424- newdlprefiles="$newdlprefiles $dir/$old_library"
5425- # Keep a list of preopened convenience libraries to check
5426- # that they are being used correctly in the link pass.
5427- test -z "$libdir" && \
5428- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5429- # Otherwise, use the dlname, so that lt_dlopen finds it.
5430- elif test -n "$dlname"; then
5431- newdlprefiles="$newdlprefiles $dir/$dlname"
5432- else
5433- newdlprefiles="$newdlprefiles $dir/$linklib"
5434- fi
5435+ case "$host" in
5436+ # special handling for platforms with PE-DLLs.
5437+ *cygwin* | *mingw* | *cegcc* )
5438+ # Linker will automatically link against shared library if both
5439+ # static and shared are present. Therefore, ensure we extract
5440+ # symbols from the import library if a shared library is present
5441+ # (otherwise, the dlopen module name will be incorrect). We do
5442+ # this by putting the import library name into $newdlprefiles.
5443+ # We recover the dlopen module name by 'saving' the la file
5444+ # name in a special purpose variable, and (later) extracting the
5445+ # dlname from the la file.
5446+ if test -n "$dlname"; then
5447+ func_tr_sh "$dir/$linklib"
5448+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
5449+ func_append newdlprefiles " $dir/$linklib"
5450+ else
5451+ func_append newdlprefiles " $dir/$old_library"
5452+ # Keep a list of preopened convenience libraries to check
5453+ # that they are being used correctly in the link pass.
5454+ test -z "$libdir" && \
5455+ func_append dlpreconveniencelibs " $dir/$old_library"
5456+ fi
5457+ ;;
5458+ * )
5459+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5460+ # are required to link).
5461+ if test -n "$old_library"; then
5462+ func_append newdlprefiles " $dir/$old_library"
5463+ # Keep a list of preopened convenience libraries to check
5464+ # that they are being used correctly in the link pass.
5465+ test -z "$libdir" && \
5466+ func_append dlpreconveniencelibs " $dir/$old_library"
5467+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5468+ elif test -n "$dlname"; then
5469+ func_append newdlprefiles " $dir/$dlname"
5470+ else
5471+ func_append newdlprefiles " $dir/$linklib"
5472+ fi
5473+ ;;
5474+ esac
5475 fi # $pass = dlpreopen
5476
5477 if test -z "$libdir"; then
5478@@ -5684,7 +6593,7 @@ func_mode_link ()
5479
5480
5481 if test "$linkmode" = prog && test "$pass" != link; then
5482- newlib_search_path="$newlib_search_path $ladir"
5483+ func_append newlib_search_path " $ladir"
5484 deplibs="$lib $deplibs"
5485
5486 linkalldeplibs=no
5487@@ -5697,7 +6606,8 @@ func_mode_link ()
5488 for deplib in $dependency_libs; do
5489 case $deplib in
5490 -L*) func_stripname '-L' '' "$deplib"
5491- newlib_search_path="$newlib_search_path $func_stripname_result"
5492+ func_resolve_sysroot "$func_stripname_result"
5493+ func_append newlib_search_path " $func_resolve_sysroot_result"
5494 ;;
5495 esac
5496 # Need to link against all dependency_libs?
5497@@ -5708,12 +6618,12 @@ func_mode_link ()
5498 # or/and link against static libraries
5499 newdependency_libs="$deplib $newdependency_libs"
5500 fi
5501- if $opt_duplicate_deps ; then
5502+ if $opt_preserve_dup_deps ; then
5503 case "$tmp_libs " in
5504- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5505+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5506 esac
5507 fi
5508- tmp_libs="$tmp_libs $deplib"
5509+ func_append tmp_libs " $deplib"
5510 done # for deplib
5511 continue
5512 fi # $linkmode = prog...
5513@@ -5728,7 +6638,7 @@ func_mode_link ()
5514 # Make sure the rpath contains only unique directories.
5515 case "$temp_rpath:" in
5516 *"$absdir:"*) ;;
5517- *) temp_rpath="$temp_rpath$absdir:" ;;
5518+ *) func_append temp_rpath "$absdir:" ;;
5519 esac
5520 fi
5521
5522@@ -5740,7 +6650,7 @@ func_mode_link ()
5523 *)
5524 case "$compile_rpath " in
5525 *" $absdir "*) ;;
5526- *) compile_rpath="$compile_rpath $absdir"
5527+ *) func_append compile_rpath " $absdir" ;;
5528 esac
5529 ;;
5530 esac
5531@@ -5749,7 +6659,7 @@ func_mode_link ()
5532 *)
5533 case "$finalize_rpath " in
5534 *" $libdir "*) ;;
5535- *) finalize_rpath="$finalize_rpath $libdir"
5536+ *) func_append finalize_rpath " $libdir" ;;
5537 esac
5538 ;;
5539 esac
5540@@ -5774,12 +6684,12 @@ func_mode_link ()
5541 case $host in
5542 *cygwin* | *mingw* | *cegcc*)
5543 # No point in relinking DLLs because paths are not encoded
5544- notinst_deplibs="$notinst_deplibs $lib"
5545+ func_append notinst_deplibs " $lib"
5546 need_relink=no
5547 ;;
5548 *)
5549 if test "$installed" = no; then
5550- notinst_deplibs="$notinst_deplibs $lib"
5551+ func_append notinst_deplibs " $lib"
5552 need_relink=yes
5553 fi
5554 ;;
5555@@ -5814,7 +6724,7 @@ func_mode_link ()
5556 *)
5557 case "$compile_rpath " in
5558 *" $absdir "*) ;;
5559- *) compile_rpath="$compile_rpath $absdir"
5560+ *) func_append compile_rpath " $absdir" ;;
5561 esac
5562 ;;
5563 esac
5564@@ -5823,7 +6733,7 @@ func_mode_link ()
5565 *)
5566 case "$finalize_rpath " in
5567 *" $libdir "*) ;;
5568- *) finalize_rpath="$finalize_rpath $libdir"
5569+ *) func_append finalize_rpath " $libdir" ;;
5570 esac
5571 ;;
5572 esac
5573@@ -5835,7 +6745,7 @@ func_mode_link ()
5574 shift
5575 realname="$1"
5576 shift
5577- eval "libname=\"$libname_spec\""
5578+ libname=`eval "\\$ECHO \"$libname_spec\""`
5579 # use dlname if we got it. it's perfectly good, no?
5580 if test -n "$dlname"; then
5581 soname="$dlname"
5582@@ -5848,7 +6758,7 @@ func_mode_link ()
5583 versuffix="-$major"
5584 ;;
5585 esac
5586- eval "soname=\"$soname_spec\""
5587+ eval soname=\"$soname_spec\"
5588 else
5589 soname="$realname"
5590 fi
5591@@ -5877,7 +6787,7 @@ func_mode_link ()
5592 linklib=$newlib
5593 fi # test -n "$old_archive_from_expsyms_cmds"
5594
5595- if test "$linkmode" = prog || test "$mode" != relink; then
5596+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
5597 add_shlibpath=
5598 add_dir=
5599 add=
5600@@ -5933,7 +6843,7 @@ func_mode_link ()
5601 if test -n "$inst_prefix_dir"; then
5602 case $libdir in
5603 [\\/]*)
5604- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5605+ func_append add_dir " -L$inst_prefix_dir$libdir"
5606 ;;
5607 esac
5608 fi
5609@@ -5955,7 +6865,7 @@ func_mode_link ()
5610 if test -n "$add_shlibpath"; then
5611 case :$compile_shlibpath: in
5612 *":$add_shlibpath:"*) ;;
5613- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
5614+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
5615 esac
5616 fi
5617 if test "$linkmode" = prog; then
5618@@ -5969,13 +6879,13 @@ func_mode_link ()
5619 test "$hardcode_shlibpath_var" = yes; then
5620 case :$finalize_shlibpath: in
5621 *":$libdir:"*) ;;
5622- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5623+ *) func_append finalize_shlibpath "$libdir:" ;;
5624 esac
5625 fi
5626 fi
5627 fi
5628
5629- if test "$linkmode" = prog || test "$mode" = relink; then
5630+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
5631 add_shlibpath=
5632 add_dir=
5633 add=
5634@@ -5989,7 +6899,7 @@ func_mode_link ()
5635 elif test "$hardcode_shlibpath_var" = yes; then
5636 case :$finalize_shlibpath: in
5637 *":$libdir:"*) ;;
5638- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5639+ *) func_append finalize_shlibpath "$libdir:" ;;
5640 esac
5641 add="-l$name"
5642 elif test "$hardcode_automatic" = yes; then
5643@@ -6001,12 +6911,12 @@ func_mode_link ()
5644 fi
5645 else
5646 # We cannot seem to hardcode it, guess we'll fake it.
5647- add_dir="-L$libdir"
5648+ add_dir="-L$lt_sysroot$libdir"
5649 # Try looking first in the location we're being installed to.
5650 if test -n "$inst_prefix_dir"; then
5651 case $libdir in
5652 [\\/]*)
5653- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5654+ func_append add_dir " -L$inst_prefix_dir$libdir"
5655 ;;
5656 esac
5657 fi
5658@@ -6083,27 +6993,33 @@ func_mode_link ()
5659 temp_xrpath=$func_stripname_result
5660 case " $xrpath " in
5661 *" $temp_xrpath "*) ;;
5662- *) xrpath="$xrpath $temp_xrpath";;
5663+ *) func_append xrpath " $temp_xrpath";;
5664 esac;;
5665- *) temp_deplibs="$temp_deplibs $libdir";;
5666+ *) func_append temp_deplibs " $libdir";;
5667 esac
5668 done
5669 dependency_libs="$temp_deplibs"
5670 fi
5671
5672- newlib_search_path="$newlib_search_path $absdir"
5673+ func_append newlib_search_path " $absdir"
5674 # Link against this library
5675 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
5676 # ... and its dependency_libs
5677 tmp_libs=
5678 for deplib in $dependency_libs; do
5679 newdependency_libs="$deplib $newdependency_libs"
5680- if $opt_duplicate_deps ; then
5681+ case $deplib in
5682+ -L*) func_stripname '-L' '' "$deplib"
5683+ func_resolve_sysroot "$func_stripname_result";;
5684+ *) func_resolve_sysroot "$deplib" ;;
5685+ esac
5686+ if $opt_preserve_dup_deps ; then
5687 case "$tmp_libs " in
5688- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5689+ *" $func_resolve_sysroot_result "*)
5690+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
5691 esac
5692 fi
5693- tmp_libs="$tmp_libs $deplib"
5694+ func_append tmp_libs " $func_resolve_sysroot_result"
5695 done
5696
5697 if test "$link_all_deplibs" != no; then
5698@@ -6113,8 +7029,10 @@ func_mode_link ()
5699 case $deplib in
5700 -L*) path="$deplib" ;;
5701 *.la)
5702+ func_resolve_sysroot "$deplib"
5703+ deplib=$func_resolve_sysroot_result
5704 func_dirname "$deplib" "" "."
5705- dir="$func_dirname_result"
5706+ dir=$func_dirname_result
5707 # We need an absolute path.
5708 case $dir in
5709 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
5710@@ -6130,7 +7048,7 @@ func_mode_link ()
5711 case $host in
5712 *-*-darwin*)
5713 depdepl=
5714- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5715+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5716 if test -n "$deplibrary_names" ; then
5717 for tmp in $deplibrary_names ; do
5718 depdepl=$tmp
5719@@ -6141,8 +7059,8 @@ func_mode_link ()
5720 if test -z "$darwin_install_name"; then
5721 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
5722 fi
5723- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5724- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
5725+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5726+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
5727 path=
5728 fi
5729 fi
5730@@ -6152,7 +7070,7 @@ func_mode_link ()
5731 ;;
5732 esac
5733 else
5734- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5735+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5736 test -z "$libdir" && \
5737 func_fatal_error "\`$deplib' is not a valid libtool archive"
5738 test "$absdir" != "$libdir" && \
5739@@ -6192,7 +7110,7 @@ func_mode_link ()
5740 for dir in $newlib_search_path; do
5741 case "$lib_search_path " in
5742 *" $dir "*) ;;
5743- *) lib_search_path="$lib_search_path $dir" ;;
5744+ *) func_append lib_search_path " $dir" ;;
5745 esac
5746 done
5747 newlib_search_path=
5748@@ -6205,7 +7123,7 @@ func_mode_link ()
5749 fi
5750 for var in $vars dependency_libs; do
5751 # Add libraries to $var in reverse order
5752- eval tmp_libs=\$$var
5753+ eval tmp_libs=\"\$$var\"
5754 new_libs=
5755 for deplib in $tmp_libs; do
5756 # FIXME: Pedantically, this is the right thing to do, so
5757@@ -6250,13 +7168,13 @@ func_mode_link ()
5758 -L*)
5759 case " $tmp_libs " in
5760 *" $deplib "*) ;;
5761- *) tmp_libs="$tmp_libs $deplib" ;;
5762+ *) func_append tmp_libs " $deplib" ;;
5763 esac
5764 ;;
5765- *) tmp_libs="$tmp_libs $deplib" ;;
5766+ *) func_append tmp_libs " $deplib" ;;
5767 esac
5768 done
5769- eval $var=\$tmp_libs
5770+ eval $var=\"$tmp_libs\"
5771 done # for var
5772 fi
5773 # Last step: remove runtime libs from dependency_libs
5774@@ -6269,7 +7187,7 @@ func_mode_link ()
5775 ;;
5776 esac
5777 if test -n "$i" ; then
5778- tmp_libs="$tmp_libs $i"
5779+ func_append tmp_libs " $i"
5780 fi
5781 done
5782 dependency_libs=$tmp_libs
5783@@ -6310,7 +7228,7 @@ func_mode_link ()
5784 # Now set the variables for building old libraries.
5785 build_libtool_libs=no
5786 oldlibs="$output"
5787- objs="$objs$old_deplibs"
5788+ func_append objs "$old_deplibs"
5789 ;;
5790
5791 lib)
5792@@ -6319,8 +7237,8 @@ func_mode_link ()
5793 lib*)
5794 func_stripname 'lib' '.la' "$outputname"
5795 name=$func_stripname_result
5796- eval "shared_ext=\"$shrext_cmds\""
5797- eval "libname=\"$libname_spec\""
5798+ eval shared_ext=\"$shrext_cmds\"
5799+ eval libname=\"$libname_spec\"
5800 ;;
5801 *)
5802 test "$module" = no && \
5803@@ -6330,8 +7248,8 @@ func_mode_link ()
5804 # Add the "lib" prefix for modules if required
5805 func_stripname '' '.la' "$outputname"
5806 name=$func_stripname_result
5807- eval "shared_ext=\"$shrext_cmds\""
5808- eval "libname=\"$libname_spec\""
5809+ eval shared_ext=\"$shrext_cmds\"
5810+ eval libname=\"$libname_spec\"
5811 else
5812 func_stripname '' '.la' "$outputname"
5813 libname=$func_stripname_result
5814@@ -6346,7 +7264,7 @@ func_mode_link ()
5815 echo
5816 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
5817 $ECHO "*** objects $objs is not portable!"
5818- libobjs="$libobjs $objs"
5819+ func_append libobjs " $objs"
5820 fi
5821 fi
5822
5823@@ -6544,7 +7462,7 @@ func_mode_link ()
5824 done
5825
5826 # Make executables depend on our current version.
5827- verstring="$verstring:${current}.0"
5828+ func_append verstring ":${current}.0"
5829 ;;
5830
5831 qnx)
5832@@ -6612,10 +7530,10 @@ func_mode_link ()
5833 fi
5834
5835 func_generate_dlsyms "$libname" "$libname" "yes"
5836- libobjs="$libobjs $symfileobj"
5837+ func_append libobjs " $symfileobj"
5838 test "X$libobjs" = "X " && libobjs=
5839
5840- if test "$mode" != relink; then
5841+ if test "$opt_mode" != relink; then
5842 # Remove our outputs, but don't remove object files since they
5843 # may have been created when compiling PIC objects.
5844 removelist=
5845@@ -6631,7 +7549,7 @@ func_mode_link ()
5846 continue
5847 fi
5848 fi
5849- removelist="$removelist $p"
5850+ func_append removelist " $p"
5851 ;;
5852 *) ;;
5853 esac
5854@@ -6642,7 +7560,7 @@ func_mode_link ()
5855
5856 # Now set the variables for building old libraries.
5857 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
5858- oldlibs="$oldlibs $output_objdir/$libname.$libext"
5859+ func_append oldlibs " $output_objdir/$libname.$libext"
5860
5861 # Transform .lo files to .o files.
5862 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
5863@@ -6659,10 +7577,11 @@ func_mode_link ()
5864 # If the user specified any rpath flags, then add them.
5865 temp_xrpath=
5866 for libdir in $xrpath; do
5867- temp_xrpath="$temp_xrpath -R$libdir"
5868+ func_replace_sysroot "$libdir"
5869+ func_append temp_xrpath " -R$func_replace_sysroot_result"
5870 case "$finalize_rpath " in
5871 *" $libdir "*) ;;
5872- *) finalize_rpath="$finalize_rpath $libdir" ;;
5873+ *) func_append finalize_rpath " $libdir" ;;
5874 esac
5875 done
5876 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
5877@@ -6676,7 +7595,7 @@ func_mode_link ()
5878 for lib in $old_dlfiles; do
5879 case " $dlprefiles $dlfiles " in
5880 *" $lib "*) ;;
5881- *) dlfiles="$dlfiles $lib" ;;
5882+ *) func_append dlfiles " $lib" ;;
5883 esac
5884 done
5885
5886@@ -6686,7 +7605,7 @@ func_mode_link ()
5887 for lib in $old_dlprefiles; do
5888 case "$dlprefiles " in
5889 *" $lib "*) ;;
5890- *) dlprefiles="$dlprefiles $lib" ;;
5891+ *) func_append dlprefiles " $lib" ;;
5892 esac
5893 done
5894
5895@@ -6698,7 +7617,7 @@ func_mode_link ()
5896 ;;
5897 *-*-rhapsody* | *-*-darwin1.[012])
5898 # Rhapsody C library is in the System framework
5899- deplibs="$deplibs System.ltframework"
5900+ func_append deplibs " System.ltframework"
5901 ;;
5902 *-*-netbsd*)
5903 # Don't link with libc until the a.out ld.so is fixed.
5904@@ -6715,7 +7634,7 @@ func_mode_link ()
5905 *)
5906 # Add libc to deplibs on all other systems if necessary.
5907 if test "$build_libtool_need_lc" = "yes"; then
5908- deplibs="$deplibs -lc"
5909+ func_append deplibs " -lc"
5910 fi
5911 ;;
5912 esac
5913@@ -6764,18 +7683,18 @@ EOF
5914 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5915 case " $predeps $postdeps " in
5916 *" $i "*)
5917- newdeplibs="$newdeplibs $i"
5918+ func_append newdeplibs " $i"
5919 i=""
5920 ;;
5921 esac
5922 fi
5923 if test -n "$i" ; then
5924- eval "libname=\"$libname_spec\""
5925- eval "deplib_matches=\"$library_names_spec\""
5926+ libname=`eval "\\$ECHO \"$libname_spec\""`
5927+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5928 set dummy $deplib_matches; shift
5929 deplib_match=$1
5930 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5931- newdeplibs="$newdeplibs $i"
5932+ func_append newdeplibs " $i"
5933 else
5934 droppeddeps=yes
5935 echo
5936@@ -6789,7 +7708,7 @@ EOF
5937 fi
5938 ;;
5939 *)
5940- newdeplibs="$newdeplibs $i"
5941+ func_append newdeplibs " $i"
5942 ;;
5943 esac
5944 done
5945@@ -6807,18 +7726,18 @@ EOF
5946 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5947 case " $predeps $postdeps " in
5948 *" $i "*)
5949- newdeplibs="$newdeplibs $i"
5950+ func_append newdeplibs " $i"
5951 i=""
5952 ;;
5953 esac
5954 fi
5955 if test -n "$i" ; then
5956- eval "libname=\"$libname_spec\""
5957- eval "deplib_matches=\"$library_names_spec\""
5958+ libname=`eval "\\$ECHO \"$libname_spec\""`
5959+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5960 set dummy $deplib_matches; shift
5961 deplib_match=$1
5962 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5963- newdeplibs="$newdeplibs $i"
5964+ func_append newdeplibs " $i"
5965 else
5966 droppeddeps=yes
5967 echo
5968@@ -6840,7 +7759,7 @@ EOF
5969 fi
5970 ;;
5971 *)
5972- newdeplibs="$newdeplibs $i"
5973+ func_append newdeplibs " $i"
5974 ;;
5975 esac
5976 done
5977@@ -6857,15 +7776,27 @@ EOF
5978 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5979 case " $predeps $postdeps " in
5980 *" $a_deplib "*)
5981- newdeplibs="$newdeplibs $a_deplib"
5982+ func_append newdeplibs " $a_deplib"
5983 a_deplib=""
5984 ;;
5985 esac
5986 fi
5987 if test -n "$a_deplib" ; then
5988- eval "libname=\"$libname_spec\""
5989+ libname=`eval "\\$ECHO \"$libname_spec\""`
5990+ if test -n "$file_magic_glob"; then
5991+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
5992+ else
5993+ libnameglob=$libname
5994+ fi
5995+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
5996 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
5997- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
5998+ if test "$want_nocaseglob" = yes; then
5999+ shopt -s nocaseglob
6000+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6001+ $nocaseglob
6002+ else
6003+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6004+ fi
6005 for potent_lib in $potential_libs; do
6006 # Follow soft links.
6007 if ls -lLd "$potent_lib" 2>/dev/null |
6008@@ -6885,10 +7816,10 @@ EOF
6009 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6010 esac
6011 done
6012- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
6013+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
6014 $SED -e 10q |
6015 $EGREP "$file_magic_regex" > /dev/null; then
6016- newdeplibs="$newdeplibs $a_deplib"
6017+ func_append newdeplibs " $a_deplib"
6018 a_deplib=""
6019 break 2
6020 fi
6021@@ -6913,7 +7844,7 @@ EOF
6022 ;;
6023 *)
6024 # Add a -L argument.
6025- newdeplibs="$newdeplibs $a_deplib"
6026+ func_append newdeplibs " $a_deplib"
6027 ;;
6028 esac
6029 done # Gone through all deplibs.
6030@@ -6929,20 +7860,20 @@ EOF
6031 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6032 case " $predeps $postdeps " in
6033 *" $a_deplib "*)
6034- newdeplibs="$newdeplibs $a_deplib"
6035+ func_append newdeplibs " $a_deplib"
6036 a_deplib=""
6037 ;;
6038 esac
6039 fi
6040 if test -n "$a_deplib" ; then
6041- eval "libname=\"$libname_spec\""
6042+ libname=`eval "\\$ECHO \"$libname_spec\""`
6043 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6044 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6045 for potent_lib in $potential_libs; do
6046 potlib="$potent_lib" # see symlink-check above in file_magic test
6047 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6048 $EGREP "$match_pattern_regex" > /dev/null; then
6049- newdeplibs="$newdeplibs $a_deplib"
6050+ func_append newdeplibs " $a_deplib"
6051 a_deplib=""
6052 break 2
6053 fi
6054@@ -6967,7 +7898,7 @@ EOF
6055 ;;
6056 *)
6057 # Add a -L argument.
6058- newdeplibs="$newdeplibs $a_deplib"
6059+ func_append newdeplibs " $a_deplib"
6060 ;;
6061 esac
6062 done # Gone through all deplibs.
6063@@ -7071,7 +8002,7 @@ EOF
6064 *)
6065 case " $deplibs " in
6066 *" -L$path/$objdir "*)
6067- new_libs="$new_libs -L$path/$objdir" ;;
6068+ func_append new_libs " -L$path/$objdir" ;;
6069 esac
6070 ;;
6071 esac
6072@@ -7081,10 +8012,10 @@ EOF
6073 -L*)
6074 case " $new_libs " in
6075 *" $deplib "*) ;;
6076- *) new_libs="$new_libs $deplib" ;;
6077+ *) func_append new_libs " $deplib" ;;
6078 esac
6079 ;;
6080- *) new_libs="$new_libs $deplib" ;;
6081+ *) func_append new_libs " $deplib" ;;
6082 esac
6083 done
6084 deplibs="$new_libs"
6085@@ -7101,10 +8032,12 @@ EOF
6086 hardcode_libdirs=
6087 dep_rpath=
6088 rpath="$finalize_rpath"
6089- test "$mode" != relink && rpath="$compile_rpath$rpath"
6090+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
6091 for libdir in $rpath; do
6092 if test -n "$hardcode_libdir_flag_spec"; then
6093 if test -n "$hardcode_libdir_separator"; then
6094+ func_replace_sysroot "$libdir"
6095+ libdir=$func_replace_sysroot_result
6096 if test -z "$hardcode_libdirs"; then
6097 hardcode_libdirs="$libdir"
6098 else
6099@@ -7113,18 +8046,18 @@ EOF
6100 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6101 ;;
6102 *)
6103- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6104+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6105 ;;
6106 esac
6107 fi
6108 else
6109- eval "flag=\"$hardcode_libdir_flag_spec\""
6110- dep_rpath="$dep_rpath $flag"
6111+ eval flag=\"$hardcode_libdir_flag_spec\"
6112+ func_append dep_rpath " $flag"
6113 fi
6114 elif test -n "$runpath_var"; then
6115 case "$perm_rpath " in
6116 *" $libdir "*) ;;
6117- *) perm_rpath="$perm_rpath $libdir" ;;
6118+ *) func_apped perm_rpath " $libdir" ;;
6119 esac
6120 fi
6121 done
6122@@ -7133,40 +8066,38 @@ EOF
6123 test -n "$hardcode_libdirs"; then
6124 libdir="$hardcode_libdirs"
6125 if test -n "$hardcode_libdir_flag_spec_ld"; then
6126- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
6127+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
6128 else
6129- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
6130+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
6131 fi
6132 fi
6133 if test -n "$runpath_var" && test -n "$perm_rpath"; then
6134 # We should set the runpath_var.
6135 rpath=
6136 for dir in $perm_rpath; do
6137- rpath="$rpath$dir:"
6138+ func_append rpath "$dir:"
6139 done
6140- eval $runpath_var=\$rpath\$$runpath_var
6141- export $runpath_var
6142+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
6143 fi
6144 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
6145 fi
6146
6147 shlibpath="$finalize_shlibpath"
6148- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6149+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6150 if test -n "$shlibpath"; then
6151- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
6152- export $shlibpath_var
6153+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
6154 fi
6155
6156 # Get the real and link names of the library.
6157- eval "shared_ext=\"$shrext_cmds\""
6158- eval "library_names=\"$library_names_spec\""
6159+ eval shared_ext=\"$shrext_cmds\"
6160+ eval library_names=\"$library_names_spec\"
6161 set dummy $library_names
6162 shift
6163 realname="$1"
6164 shift
6165
6166 if test -n "$soname_spec"; then
6167- eval "soname=\"$soname_spec\""
6168+ eval soname=\"$soname_spec\"
6169 else
6170 soname="$realname"
6171 fi
6172@@ -7178,7 +8109,7 @@ EOF
6173 linknames=
6174 for link
6175 do
6176- linknames="$linknames $link"
6177+ func_append linknames " $link"
6178 done
6179
6180 # Use standard objects if they are pic
6181@@ -7189,7 +8120,7 @@ EOF
6182 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6183 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
6184 export_symbols="$output_objdir/$libname.uexp"
6185- delfiles="$delfiles $export_symbols"
6186+ func_append delfiles " $export_symbols"
6187 fi
6188
6189 orig_export_symbols=
6190@@ -7220,13 +8151,45 @@ EOF
6191 $opt_dry_run || $RM $export_symbols
6192 cmds=$export_symbols_cmds
6193 save_ifs="$IFS"; IFS='~'
6194- for cmd in $cmds; do
6195+ for cmd1 in $cmds; do
6196 IFS="$save_ifs"
6197- eval "cmd=\"$cmd\""
6198- func_len " $cmd"
6199- len=$func_len_result
6200- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6201+ # Take the normal branch if the nm_file_list_spec branch
6202+ # doesn't work or if tool conversion is not needed.
6203+ case $nm_file_list_spec~$to_tool_file_cmd in
6204+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
6205+ try_normal_branch=yes
6206+ eval cmd=\"$cmd1\"
6207+ func_len " $cmd"
6208+ len=$func_len_result
6209+ ;;
6210+ *)
6211+ try_normal_branch=no
6212+ ;;
6213+ esac
6214+ if test "$try_normal_branch" = yes \
6215+ && { test "$len" -lt "$max_cmd_len" \
6216+ || test "$max_cmd_len" -le -1; }
6217+ then
6218+ func_show_eval "$cmd" 'exit $?'
6219+ skipped_export=false
6220+ elif test -n "$nm_file_list_spec"; then
6221+ func_basename "$output"
6222+ output_la=$func_basename_result
6223+ save_libobjs=$libobjs
6224+ save_output=$output
6225+ output=${output_objdir}/${output_la}.nm
6226+ func_to_tool_file "$output"
6227+ libobjs=$nm_file_list_spec$func_to_tool_file_result
6228+ func_append delfiles " $output"
6229+ func_verbose "creating $NM input file list: $output"
6230+ for obj in $save_libobjs; do
6231+ func_to_tool_file "$obj"
6232+ $ECHO "$func_to_tool_file_result"
6233+ done > "$output"
6234+ eval cmd=\"$cmd1\"
6235 func_show_eval "$cmd" 'exit $?'
6236+ output=$save_output
6237+ libobjs=$save_libobjs
6238 skipped_export=false
6239 else
6240 # The command line is too long to execute in one step.
6241@@ -7248,7 +8211,7 @@ EOF
6242 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6243 tmp_export_symbols="$export_symbols"
6244 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6245- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6246+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6247 fi
6248
6249 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
6250@@ -7260,7 +8223,7 @@ EOF
6251 # global variables. join(1) would be nice here, but unfortunately
6252 # isn't a blessed tool.
6253 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6254- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6255+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6256 export_symbols=$output_objdir/$libname.def
6257 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6258 fi
6259@@ -7270,7 +8233,7 @@ EOF
6260 case " $convenience " in
6261 *" $test_deplib "*) ;;
6262 *)
6263- tmp_deplibs="$tmp_deplibs $test_deplib"
6264+ func_append tmp_deplibs " $test_deplib"
6265 ;;
6266 esac
6267 done
6268@@ -7286,43 +8249,43 @@ EOF
6269 fi
6270 if test -n "$whole_archive_flag_spec"; then
6271 save_libobjs=$libobjs
6272- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6273+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6274 test "X$libobjs" = "X " && libobjs=
6275 else
6276 gentop="$output_objdir/${outputname}x"
6277- generated="$generated $gentop"
6278+ func_append generated " $gentop"
6279
6280 func_extract_archives $gentop $convenience
6281- libobjs="$libobjs $func_extract_archives_result"
6282+ func_append libobjs " $func_extract_archives_result"
6283 test "X$libobjs" = "X " && libobjs=
6284 fi
6285 fi
6286
6287 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
6288- eval "flag=\"$thread_safe_flag_spec\""
6289- linker_flags="$linker_flags $flag"
6290+ eval flag=\"$thread_safe_flag_spec\"
6291+ func_append linker_flags " $flag"
6292 fi
6293
6294 # Make a backup of the uninstalled library when relinking
6295- if test "$mode" = relink; then
6296- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
6297+ if test "$opt_mode" = relink; then
6298+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
6299 fi
6300
6301 # Do each of the archive commands.
6302 if test "$module" = yes && test -n "$module_cmds" ; then
6303 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
6304- eval "test_cmds=\"$module_expsym_cmds\""
6305+ eval test_cmds=\"$module_expsym_cmds\"
6306 cmds=$module_expsym_cmds
6307 else
6308- eval "test_cmds=\"$module_cmds\""
6309+ eval test_cmds=\"$module_cmds\"
6310 cmds=$module_cmds
6311 fi
6312 else
6313 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
6314- eval "test_cmds=\"$archive_expsym_cmds\""
6315+ eval test_cmds=\"$archive_expsym_cmds\"
6316 cmds=$archive_expsym_cmds
6317 else
6318- eval "test_cmds=\"$archive_cmds\""
6319+ eval test_cmds=\"$archive_cmds\"
6320 cmds=$archive_cmds
6321 fi
6322 fi
6323@@ -7366,10 +8329,13 @@ EOF
6324 echo 'INPUT (' > $output
6325 for obj in $save_libobjs
6326 do
6327- $ECHO "$obj" >> $output
6328+ func_to_tool_file "$obj"
6329+ $ECHO "$func_to_tool_file_result" >> $output
6330 done
6331 echo ')' >> $output
6332- delfiles="$delfiles $output"
6333+ func_append delfiles " $output"
6334+ func_to_tool_file "$output"
6335+ output=$func_to_tool_file_result
6336 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
6337 output=${output_objdir}/${output_la}.lnk
6338 func_verbose "creating linker input file list: $output"
6339@@ -7383,15 +8349,17 @@ EOF
6340 fi
6341 for obj
6342 do
6343- $ECHO "$obj" >> $output
6344+ func_to_tool_file "$obj"
6345+ $ECHO "$func_to_tool_file_result" >> $output
6346 done
6347- delfiles="$delfiles $output"
6348- output=$firstobj\"$file_list_spec$output\"
6349+ func_append delfiles " $output"
6350+ func_to_tool_file "$output"
6351+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
6352 else
6353 if test -n "$save_libobjs"; then
6354 func_verbose "creating reloadable object files..."
6355 output=$output_objdir/$output_la-${k}.$objext
6356- eval "test_cmds=\"$reload_cmds\""
6357+ eval test_cmds=\"$reload_cmds\"
6358 func_len " $test_cmds"
6359 len0=$func_len_result
6360 len=$len0
6361@@ -7411,12 +8379,12 @@ EOF
6362 if test "$k" -eq 1 ; then
6363 # The first file doesn't have a previous command to add.
6364 reload_objs=$objlist
6365- eval "concat_cmds=\"$reload_cmds\""
6366+ eval concat_cmds=\"$reload_cmds\"
6367 else
6368 # All subsequent reloadable object files will link in
6369 # the last one created.
6370 reload_objs="$objlist $last_robj"
6371- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
6372+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
6373 fi
6374 last_robj=$output_objdir/$output_la-${k}.$objext
6375 func_arith $k + 1
6376@@ -7433,11 +8401,11 @@ EOF
6377 # files will link in the last one created.
6378 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6379 reload_objs="$objlist $last_robj"
6380- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
6381+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
6382 if test -n "$last_robj"; then
6383- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
6384+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
6385 fi
6386- delfiles="$delfiles $output"
6387+ func_append delfiles " $output"
6388
6389 else
6390 output=
6391@@ -7450,9 +8418,9 @@ EOF
6392 libobjs=$output
6393 # Append the command to create the export file.
6394 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6395- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
6396+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
6397 if test -n "$last_robj"; then
6398- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
6399+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
6400 fi
6401 fi
6402
6403@@ -7471,7 +8439,7 @@ EOF
6404 lt_exit=$?
6405
6406 # Restore the uninstalled library and exit
6407- if test "$mode" = relink; then
6408+ if test "$opt_mode" = relink; then
6409 ( cd "$output_objdir" && \
6410 $RM "${realname}T" && \
6411 $MV "${realname}U" "$realname" )
6412@@ -7492,7 +8460,7 @@ EOF
6413 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6414 tmp_export_symbols="$export_symbols"
6415 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6416- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6417+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6418 fi
6419
6420 if test -n "$orig_export_symbols"; then
6421@@ -7504,7 +8472,7 @@ EOF
6422 # global variables. join(1) would be nice here, but unfortunately
6423 # isn't a blessed tool.
6424 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6425- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6426+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6427 export_symbols=$output_objdir/$libname.def
6428 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6429 fi
6430@@ -7515,7 +8483,7 @@ EOF
6431 output=$save_output
6432
6433 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
6434- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6435+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6436 test "X$libobjs" = "X " && libobjs=
6437 fi
6438 # Expand the library linking commands again to reset the
6439@@ -7539,23 +8507,23 @@ EOF
6440
6441 if test -n "$delfiles"; then
6442 # Append the command to remove temporary files to $cmds.
6443- eval "cmds=\"\$cmds~\$RM $delfiles\""
6444+ eval cmds=\"\$cmds~\$RM $delfiles\"
6445 fi
6446
6447 # Add any objects from preloaded convenience libraries
6448 if test -n "$dlprefiles"; then
6449 gentop="$output_objdir/${outputname}x"
6450- generated="$generated $gentop"
6451+ func_append generated " $gentop"
6452
6453 func_extract_archives $gentop $dlprefiles
6454- libobjs="$libobjs $func_extract_archives_result"
6455+ func_append libobjs " $func_extract_archives_result"
6456 test "X$libobjs" = "X " && libobjs=
6457 fi
6458
6459 save_ifs="$IFS"; IFS='~'
6460 for cmd in $cmds; do
6461 IFS="$save_ifs"
6462- eval "cmd=\"$cmd\""
6463+ eval cmd=\"$cmd\"
6464 $opt_silent || {
6465 func_quote_for_expand "$cmd"
6466 eval "func_echo $func_quote_for_expand_result"
6467@@ -7564,7 +8532,7 @@ EOF
6468 lt_exit=$?
6469
6470 # Restore the uninstalled library and exit
6471- if test "$mode" = relink; then
6472+ if test "$opt_mode" = relink; then
6473 ( cd "$output_objdir" && \
6474 $RM "${realname}T" && \
6475 $MV "${realname}U" "$realname" )
6476@@ -7576,8 +8544,8 @@ EOF
6477 IFS="$save_ifs"
6478
6479 # Restore the uninstalled library and exit
6480- if test "$mode" = relink; then
6481- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
6482+ if test "$opt_mode" = relink; then
6483+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
6484
6485 if test -n "$convenience"; then
6486 if test -z "$whole_archive_flag_spec"; then
6487@@ -7656,17 +8624,20 @@ EOF
6488
6489 if test -n "$convenience"; then
6490 if test -n "$whole_archive_flag_spec"; then
6491- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
6492+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
6493 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
6494 else
6495 gentop="$output_objdir/${obj}x"
6496- generated="$generated $gentop"
6497+ func_append generated " $gentop"
6498
6499 func_extract_archives $gentop $convenience
6500 reload_conv_objs="$reload_objs $func_extract_archives_result"
6501 fi
6502 fi
6503
6504+ # If we're not building shared, we need to use non_pic_objs
6505+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
6506+
6507 # Create the old-style object.
6508 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
6509
6510@@ -7690,7 +8661,7 @@ EOF
6511 # Create an invalid libtool object if no PIC, so that we don't
6512 # accidentally link it into a program.
6513 # $show "echo timestamp > $libobj"
6514- # $opt_dry_run || echo timestamp > $libobj || exit $?
6515+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
6516 exit $EXIT_SUCCESS
6517 fi
6518
6519@@ -7740,8 +8711,8 @@ EOF
6520 if test "$tagname" = CXX ; then
6521 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
6522 10.[0123])
6523- compile_command="$compile_command ${wl}-bind_at_load"
6524- finalize_command="$finalize_command ${wl}-bind_at_load"
6525+ func_append compile_command " ${wl}-bind_at_load"
6526+ func_append finalize_command " ${wl}-bind_at_load"
6527 ;;
6528 esac
6529 fi
6530@@ -7761,7 +8732,7 @@ EOF
6531 *)
6532 case " $compile_deplibs " in
6533 *" -L$path/$objdir "*)
6534- new_libs="$new_libs -L$path/$objdir" ;;
6535+ func_append new_libs " -L$path/$objdir" ;;
6536 esac
6537 ;;
6538 esac
6539@@ -7771,17 +8742,17 @@ EOF
6540 -L*)
6541 case " $new_libs " in
6542 *" $deplib "*) ;;
6543- *) new_libs="$new_libs $deplib" ;;
6544+ *) func_append new_libs " $deplib" ;;
6545 esac
6546 ;;
6547- *) new_libs="$new_libs $deplib" ;;
6548+ *) func_append new_libs " $deplib" ;;
6549 esac
6550 done
6551 compile_deplibs="$new_libs"
6552
6553
6554- compile_command="$compile_command $compile_deplibs"
6555- finalize_command="$finalize_command $finalize_deplibs"
6556+ func_append compile_command " $compile_deplibs"
6557+ func_append finalize_command " $finalize_deplibs"
6558
6559 if test -n "$rpath$xrpath"; then
6560 # If the user specified any rpath flags, then add them.
6561@@ -7789,7 +8760,7 @@ EOF
6562 # This is the magic to use -rpath.
6563 case "$finalize_rpath " in
6564 *" $libdir "*) ;;
6565- *) finalize_rpath="$finalize_rpath $libdir" ;;
6566+ *) func_append finalize_rpath " $libdir" ;;
6567 esac
6568 done
6569 fi
6570@@ -7808,18 +8779,18 @@ EOF
6571 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6572 ;;
6573 *)
6574- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6575+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6576 ;;
6577 esac
6578 fi
6579 else
6580- eval "flag=\"$hardcode_libdir_flag_spec\""
6581- rpath="$rpath $flag"
6582+ eval flag=\"$hardcode_libdir_flag_spec\"
6583+ func_append rpath " $flag"
6584 fi
6585 elif test -n "$runpath_var"; then
6586 case "$perm_rpath " in
6587 *" $libdir "*) ;;
6588- *) perm_rpath="$perm_rpath $libdir" ;;
6589+ *) func_append perm_rpath " $libdir" ;;
6590 esac
6591 fi
6592 case $host in
6593@@ -7828,12 +8799,12 @@ EOF
6594 case :$dllsearchpath: in
6595 *":$libdir:"*) ;;
6596 ::) dllsearchpath=$libdir;;
6597- *) dllsearchpath="$dllsearchpath:$libdir";;
6598+ *) func_append dllsearchpath ":$libdir";;
6599 esac
6600 case :$dllsearchpath: in
6601 *":$testbindir:"*) ;;
6602 ::) dllsearchpath=$testbindir;;
6603- *) dllsearchpath="$dllsearchpath:$testbindir";;
6604+ *) func_append dllsearchpath ":$testbindir";;
6605 esac
6606 ;;
6607 esac
6608@@ -7842,7 +8813,7 @@ EOF
6609 if test -n "$hardcode_libdir_separator" &&
6610 test -n "$hardcode_libdirs"; then
6611 libdir="$hardcode_libdirs"
6612- eval "rpath=\" $hardcode_libdir_flag_spec\""
6613+ eval rpath=\" $hardcode_libdir_flag_spec\"
6614 fi
6615 compile_rpath="$rpath"
6616
6617@@ -7859,18 +8830,18 @@ EOF
6618 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6619 ;;
6620 *)
6621- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6622+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6623 ;;
6624 esac
6625 fi
6626 else
6627- eval "flag=\"$hardcode_libdir_flag_spec\""
6628- rpath="$rpath $flag"
6629+ eval flag=\"$hardcode_libdir_flag_spec\"
6630+ func_append rpath " $flag"
6631 fi
6632 elif test -n "$runpath_var"; then
6633 case "$finalize_perm_rpath " in
6634 *" $libdir "*) ;;
6635- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
6636+ *) func_append finalize_perm_rpath " $libdir" ;;
6637 esac
6638 fi
6639 done
6640@@ -7878,7 +8849,7 @@ EOF
6641 if test -n "$hardcode_libdir_separator" &&
6642 test -n "$hardcode_libdirs"; then
6643 libdir="$hardcode_libdirs"
6644- eval "rpath=\" $hardcode_libdir_flag_spec\""
6645+ eval rpath=\" $hardcode_libdir_flag_spec\"
6646 fi
6647 finalize_rpath="$rpath"
6648
6649@@ -7921,6 +8892,12 @@ EOF
6650 exit_status=0
6651 func_show_eval "$link_command" 'exit_status=$?'
6652
6653+ if test -n "$postlink_cmds"; then
6654+ func_to_tool_file "$output"
6655+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6656+ func_execute_cmds "$postlink_cmds" 'exit $?'
6657+ fi
6658+
6659 # Delete the generated files.
6660 if test -f "$output_objdir/${outputname}S.${objext}"; then
6661 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
6662@@ -7943,7 +8920,7 @@ EOF
6663 # We should set the runpath_var.
6664 rpath=
6665 for dir in $perm_rpath; do
6666- rpath="$rpath$dir:"
6667+ func_append rpath "$dir:"
6668 done
6669 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
6670 fi
6671@@ -7951,7 +8928,7 @@ EOF
6672 # We should set the runpath_var.
6673 rpath=
6674 for dir in $finalize_perm_rpath; do
6675- rpath="$rpath$dir:"
6676+ func_append rpath "$dir:"
6677 done
6678 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
6679 fi
6680@@ -7966,6 +8943,13 @@ EOF
6681 $opt_dry_run || $RM $output
6682 # Link the executable and exit
6683 func_show_eval "$link_command" 'exit $?'
6684+
6685+ if test -n "$postlink_cmds"; then
6686+ func_to_tool_file "$output"
6687+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6688+ func_execute_cmds "$postlink_cmds" 'exit $?'
6689+ fi
6690+
6691 exit $EXIT_SUCCESS
6692 fi
6693
6694@@ -7999,6 +8983,12 @@ EOF
6695
6696 func_show_eval "$link_command" 'exit $?'
6697
6698+ if test -n "$postlink_cmds"; then
6699+ func_to_tool_file "$output_objdir/$outputname"
6700+ 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'`
6701+ func_execute_cmds "$postlink_cmds" 'exit $?'
6702+ fi
6703+
6704 # Now create the wrapper script.
6705 func_verbose "creating $output"
6706
6707@@ -8096,7 +9086,7 @@ EOF
6708 else
6709 oldobjs="$old_deplibs $non_pic_objects"
6710 if test "$preload" = yes && test -f "$symfileobj"; then
6711- oldobjs="$oldobjs $symfileobj"
6712+ func_append oldobjs " $symfileobj"
6713 fi
6714 fi
6715 addlibs="$old_convenience"
6716@@ -8104,10 +9094,10 @@ EOF
6717
6718 if test -n "$addlibs"; then
6719 gentop="$output_objdir/${outputname}x"
6720- generated="$generated $gentop"
6721+ func_append generated " $gentop"
6722
6723 func_extract_archives $gentop $addlibs
6724- oldobjs="$oldobjs $func_extract_archives_result"
6725+ func_append oldobjs " $func_extract_archives_result"
6726 fi
6727
6728 # Do each command in the archive commands.
6729@@ -8118,10 +9108,10 @@ EOF
6730 # Add any objects from preloaded convenience libraries
6731 if test -n "$dlprefiles"; then
6732 gentop="$output_objdir/${outputname}x"
6733- generated="$generated $gentop"
6734+ func_append generated " $gentop"
6735
6736 func_extract_archives $gentop $dlprefiles
6737- oldobjs="$oldobjs $func_extract_archives_result"
6738+ func_append oldobjs " $func_extract_archives_result"
6739 fi
6740
6741 # POSIX demands no paths to be encoded in archives. We have
6742@@ -8139,7 +9129,7 @@ EOF
6743 else
6744 echo "copying selected object files to avoid basename conflicts..."
6745 gentop="$output_objdir/${outputname}x"
6746- generated="$generated $gentop"
6747+ func_append generated " $gentop"
6748 func_mkdir_p "$gentop"
6749 save_oldobjs=$oldobjs
6750 oldobjs=
6751@@ -8163,18 +9153,28 @@ EOF
6752 esac
6753 done
6754 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
6755- oldobjs="$oldobjs $gentop/$newobj"
6756+ func_append oldobjs " $gentop/$newobj"
6757 ;;
6758- *) oldobjs="$oldobjs $obj" ;;
6759+ *) func_append oldobjs " $obj" ;;
6760 esac
6761 done
6762 fi
6763- eval "cmds=\"$old_archive_cmds\""
6764+ eval cmds=\"$old_archive_cmds\"
6765
6766 func_len " $cmds"
6767 len=$func_len_result
6768 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6769 cmds=$old_archive_cmds
6770+ elif test -n "$archiver_list_spec"; then
6771+ func_verbose "using command file archive linking..."
6772+ for obj in $oldobjs
6773+ do
6774+ func_to_tool_file "$obj"
6775+ $ECHO "$func_to_tool_file_result"
6776+ done > $output_objdir/$libname.libcmd
6777+ func_to_tool_file "$output_objdir/$libname.libcmd"
6778+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
6779+ cmds=$old_archive_cmds
6780 else
6781 # the command line is too long to link in one step, link in parts
6782 func_verbose "using piecewise archive linking..."
6783@@ -8189,7 +9189,7 @@ EOF
6784 do
6785 last_oldobj=$obj
6786 done
6787- eval "test_cmds=\"$old_archive_cmds\""
6788+ eval test_cmds=\"$old_archive_cmds\"
6789 func_len " $test_cmds"
6790 len0=$func_len_result
6791 len=$len0
6792@@ -8208,7 +9208,7 @@ EOF
6793 RANLIB=$save_RANLIB
6794 fi
6795 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6796- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
6797+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
6798 objlist=
6799 len=$len0
6800 fi
6801@@ -8216,9 +9216,9 @@ EOF
6802 RANLIB=$save_RANLIB
6803 oldobjs=$objlist
6804 if test "X$oldobjs" = "X" ; then
6805- eval "cmds=\"\$concat_cmds\""
6806+ eval cmds=\"\$concat_cmds\"
6807 else
6808- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
6809+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
6810 fi
6811 fi
6812 fi
6813@@ -8268,12 +9268,23 @@ EOF
6814 *.la)
6815 func_basename "$deplib"
6816 name="$func_basename_result"
6817- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
6818+ func_resolve_sysroot "$deplib"
6819+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6820 test -z "$libdir" && \
6821 func_fatal_error "\`$deplib' is not a valid libtool archive"
6822- newdependency_libs="$newdependency_libs $libdir/$name"
6823+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
6824+ ;;
6825+ -L*)
6826+ func_stripname -L '' "$deplib"
6827+ func_replace_sysroot "$func_stripname_result"
6828+ func_append newdependency_libs " -L$func_replace_sysroot_result"
6829 ;;
6830- *) newdependency_libs="$newdependency_libs $deplib" ;;
6831+ -R*)
6832+ func_stripname -R '' "$deplib"
6833+ func_replace_sysroot "$func_stripname_result"
6834+ func_append newdependency_libs " -R$func_replace_sysroot_result"
6835+ ;;
6836+ *) func_append newdependency_libs " $deplib" ;;
6837 esac
6838 done
6839 dependency_libs="$newdependency_libs"
6840@@ -8284,12 +9295,14 @@ EOF
6841 *.la)
6842 func_basename "$lib"
6843 name="$func_basename_result"
6844- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6845+ func_resolve_sysroot "$lib"
6846+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6847+
6848 test -z "$libdir" && \
6849 func_fatal_error "\`$lib' is not a valid libtool archive"
6850- newdlfiles="$newdlfiles $libdir/$name"
6851+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
6852 ;;
6853- *) newdlfiles="$newdlfiles $lib" ;;
6854+ *) func_append newdlfiles " $lib" ;;
6855 esac
6856 done
6857 dlfiles="$newdlfiles"
6858@@ -8303,10 +9316,11 @@ EOF
6859 # the library:
6860 func_basename "$lib"
6861 name="$func_basename_result"
6862- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6863+ func_resolve_sysroot "$lib"
6864+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6865 test -z "$libdir" && \
6866 func_fatal_error "\`$lib' is not a valid libtool archive"
6867- newdlprefiles="$newdlprefiles $libdir/$name"
6868+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
6869 ;;
6870 esac
6871 done
6872@@ -8318,7 +9332,7 @@ EOF
6873 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6874 *) abs=`pwd`"/$lib" ;;
6875 esac
6876- newdlfiles="$newdlfiles $abs"
6877+ func_append newdlfiles " $abs"
6878 done
6879 dlfiles="$newdlfiles"
6880 newdlprefiles=
6881@@ -8327,7 +9341,7 @@ EOF
6882 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6883 *) abs=`pwd`"/$lib" ;;
6884 esac
6885- newdlprefiles="$newdlprefiles $abs"
6886+ func_append newdlprefiles " $abs"
6887 done
6888 dlprefiles="$newdlprefiles"
6889 fi
6890@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
6891 exit $EXIT_SUCCESS
6892 }
6893
6894-{ test "$mode" = link || test "$mode" = relink; } &&
6895+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
6896 func_mode_link ${1+"$@"}
6897
6898
6899@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
6900 for arg
6901 do
6902 case $arg in
6903- -f) RM="$RM $arg"; rmforce=yes ;;
6904- -*) RM="$RM $arg" ;;
6905- *) files="$files $arg" ;;
6906+ -f) func_append RM " $arg"; rmforce=yes ;;
6907+ -*) func_append RM " $arg" ;;
6908+ *) func_append files " $arg" ;;
6909 esac
6910 done
6911
6912@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
6913
6914 rmdirs=
6915
6916- origobjdir="$objdir"
6917 for file in $files; do
6918 func_dirname "$file" "" "."
6919 dir="$func_dirname_result"
6920 if test "X$dir" = X.; then
6921- objdir="$origobjdir"
6922+ odir="$objdir"
6923 else
6924- objdir="$dir/$origobjdir"
6925+ odir="$dir/$objdir"
6926 fi
6927 func_basename "$file"
6928 name="$func_basename_result"
6929- test "$mode" = uninstall && objdir="$dir"
6930+ test "$opt_mode" = uninstall && odir="$dir"
6931
6932- # Remember objdir for removal later, being careful to avoid duplicates
6933- if test "$mode" = clean; then
6934+ # Remember odir for removal later, being careful to avoid duplicates
6935+ if test "$opt_mode" = clean; then
6936 case " $rmdirs " in
6937- *" $objdir "*) ;;
6938- *) rmdirs="$rmdirs $objdir" ;;
6939+ *" $odir "*) ;;
6940+ *) func_append rmdirs " $odir" ;;
6941 esac
6942 fi
6943
6944@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
6945
6946 # Delete the libtool libraries and symlinks.
6947 for n in $library_names; do
6948- rmfiles="$rmfiles $objdir/$n"
6949+ func_append rmfiles " $odir/$n"
6950 done
6951- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
6952+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
6953
6954- case "$mode" in
6955+ case "$opt_mode" in
6956 clean)
6957- case " $library_names " in
6958- # " " in the beginning catches empty $dlname
6959+ case " $library_names " in
6960 *" $dlname "*) ;;
6961- *) rmfiles="$rmfiles $objdir/$dlname" ;;
6962+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
6963 esac
6964- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
6965+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
6966 ;;
6967 uninstall)
6968 if test -n "$library_names"; then
6969@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
6970 # Add PIC object to the list of files to remove.
6971 if test -n "$pic_object" &&
6972 test "$pic_object" != none; then
6973- rmfiles="$rmfiles $dir/$pic_object"
6974+ func_append rmfiles " $dir/$pic_object"
6975 fi
6976
6977 # Add non-PIC object to the list of files to remove.
6978 if test -n "$non_pic_object" &&
6979 test "$non_pic_object" != none; then
6980- rmfiles="$rmfiles $dir/$non_pic_object"
6981+ func_append rmfiles " $dir/$non_pic_object"
6982 fi
6983 fi
6984 ;;
6985
6986 *)
6987- if test "$mode" = clean ; then
6988+ if test "$opt_mode" = clean ; then
6989 noexename=$name
6990 case $file in
6991 *.exe)
6992@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
6993 noexename=$func_stripname_result
6994 # $file with .exe has already been added to rmfiles,
6995 # add $file without .exe
6996- rmfiles="$rmfiles $file"
6997+ func_append rmfiles " $file"
6998 ;;
6999 esac
7000 # Do a test to see if this is a libtool program.
7001@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
7002 func_ltwrapper_scriptname "$file"
7003 relink_command=
7004 func_source $func_ltwrapper_scriptname_result
7005- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
7006+ func_append rmfiles " $func_ltwrapper_scriptname_result"
7007 else
7008 relink_command=
7009 func_source $dir/$noexename
7010@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
7011
7012 # note $name still contains .exe if it was in $file originally
7013 # as does the version of $file that was added into $rmfiles
7014- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
7015+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
7016 if test "$fast_install" = yes && test -n "$relink_command"; then
7017- rmfiles="$rmfiles $objdir/lt-$name"
7018+ func_append rmfiles " $odir/lt-$name"
7019 fi
7020 if test "X$noexename" != "X$name" ; then
7021- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
7022+ func_append rmfiles " $odir/lt-${noexename}.c"
7023 fi
7024 fi
7025 fi
7026@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
7027 esac
7028 func_show_eval "$RM $rmfiles" 'exit_status=1'
7029 done
7030- objdir="$origobjdir"
7031
7032 # Try to remove the ${objdir}s in the directories where we deleted files
7033 for dir in $rmdirs; do
7034@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
7035 exit $exit_status
7036 }
7037
7038-{ test "$mode" = uninstall || test "$mode" = clean; } &&
7039+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
7040 func_mode_uninstall ${1+"$@"}
7041
7042-test -z "$mode" && {
7043+test -z "$opt_mode" && {
7044 help="$generic_help"
7045 func_fatal_help "you must specify a MODE"
7046 }
7047
7048 test -z "$exec_cmd" && \
7049- func_fatal_help "invalid operation mode \`$mode'"
7050+ func_fatal_help "invalid operation mode \`$opt_mode'"
7051
7052 if test -n "$exec_cmd"; then
7053 eval exec "$exec_cmd"
7054Index: binutils-2.21/ltoptions.m4
7055===================================================================
7056--- binutils-2.21.orig/ltoptions.m4
7057+++ binutils-2.21/ltoptions.m4
7058@@ -8,7 +8,7 @@
7059 # unlimited permission to copy and/or distribute it, with or without
7060 # modifications, as long as this notice is preserved.
7061
7062-# serial 6 ltoptions.m4
7063+# serial 7 ltoptions.m4
7064
7065 # This is to help aclocal find these macros, as it can't see m4_define.
7066 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7067Index: binutils-2.21/ltversion.m4
7068===================================================================
7069--- binutils-2.21.orig/ltversion.m4
7070+++ binutils-2.21/ltversion.m4
7071@@ -7,17 +7,17 @@
7072 # unlimited permission to copy and/or distribute it, with or without
7073 # modifications, as long as this notice is preserved.
7074
7075-# Generated from ltversion.in.
7076+# @configure_input@
7077
7078-# serial 3134 ltversion.m4
7079+# serial 3293 ltversion.m4
7080 # This file is part of GNU Libtool
7081
7082-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
7083-m4_define([LT_PACKAGE_REVISION], [1.3134])
7084+m4_define([LT_PACKAGE_VERSION], [2.4])
7085+m4_define([LT_PACKAGE_REVISION], [1.3293])
7086
7087 AC_DEFUN([LTVERSION_VERSION],
7088-[macro_version='2.2.7a'
7089-macro_revision='1.3134'
7090+[macro_version='2.4'
7091+macro_revision='1.3293'
7092 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7093 _LT_DECL(, macro_revision, 0)
7094 ])
7095Index: binutils-2.21/lt~obsolete.m4
7096===================================================================
7097--- binutils-2.21.orig/lt~obsolete.m4
7098+++ binutils-2.21/lt~obsolete.m4
7099@@ -7,7 +7,7 @@
7100 # unlimited permission to copy and/or distribute it, with or without
7101 # modifications, as long as this notice is preserved.
7102
7103-# serial 4 lt~obsolete.m4
7104+# serial 5 lt~obsolete.m4
7105
7106 # These exist entirely to fool aclocal when bootstrapping libtool.
7107 #
7108Index: binutils-2.21/configure
7109===================================================================
7110--- binutils-2.21.orig/configure
7111+++ binutils-2.21/configure
7112@@ -2670,7 +2670,7 @@ host_libs="intl mmalloc libiberty opcode
7113 # binutils, gas and ld appear in that order because it makes sense to run
7114 # "make check" in that particular order.
7115 # If --enable-gold is used, "gold" may replace "ld".
7116-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"
7117+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"
7118
7119 # libgcj represents the runtime libraries only used by gcj.
7120 libgcj="target-libffi \
7121@@ -3148,7 +3148,7 @@ case "${target}" in
7122 am33_2.0-*-linux*)
7123 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
7124 ;;
7125- sh*-*-linux*)
7126+ sh-*-linux*)
7127 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
7128 ;;
7129 sh*-*-pe|mips*-*-pe|*arm-wince-pe)
7130@@ -3487,7 +3487,7 @@ case "${target}" in
7131 romp-*-*)
7132 noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
7133 ;;
7134- sh*-*-* | sh64-*-*)
7135+ sh-*-* | sh64-*-*)
7136 case "${host}" in
7137 i[3456789]86-*-vsta) ;; # don't add gprof back in
7138 i[3456789]86-*-go32*) ;; # don't add gprof back in
7139@@ -7597,7 +7597,7 @@ case " $build_configdirs " in
7140 # For an installed makeinfo, we require it to be from texinfo 4.7 or
7141 # higher, else we use the "missing" dummy.
7142 if ${MAKEINFO} --version \
7143- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
7144+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
7145 :
7146 else
7147 MAKEINFO="$MISSING makeinfo"
7148Index: binutils-2.21/bfd/configure
7149===================================================================
7150--- binutils-2.21.orig/bfd/configure
7151+++ binutils-2.21/bfd/configure
7152@@ -667,6 +667,9 @@ OTOOL
7153 LIPO
7154 NMEDIT
7155 DSYMUTIL
7156+MANIFEST_TOOL
7157+ac_ct_AR
7158+DLLTOOL
7159 OBJDUMP
7160 LN_S
7161 NM
7162@@ -779,6 +782,7 @@ enable_static
7163 with_pic
7164 enable_fast_install
7165 with_gnu_ld
7166+with_libtool_sysroot
7167 enable_libtool_lock
7168 enable_plugins
7169 enable_largefile
7170@@ -1453,6 +1457,8 @@ Optional Packages:
7171 --with-pic try to use only PIC/non-PIC objects [default=use
7172 both]
7173 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7174+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7175+ (or the compiler's sysroot if not specified).
7176 --with-mmap try using mmap for BFD input files if available
7177 --with-separate-debug-dir=DIR
7178 Look for global separate debug info in DIR
7179@@ -5383,8 +5389,8 @@ esac
7180
7181
7182
7183-macro_version='2.2.7a'
7184-macro_revision='1.3134'
7185+macro_version='2.4'
7186+macro_revision='1.3293'
7187
7188
7189
7190@@ -5424,7 +5430,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7192 $as_echo_n "checking how to print strings... " >&6; }
7193 # Test print first, because it will be a builtin if present.
7194-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7195+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7196 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7197 ECHO='print -r --'
7198 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7199@@ -6110,8 +6116,8 @@ $as_echo_n "checking whether the shell u
7200 # Try some XSI features
7201 xsi_shell=no
7202 ( _lt_dummy="a/b/c"
7203- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7204- = c,a/b,, \
7205+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7206+ = c,a/b,b/c, \
7207 && eval 'test $(( 1 + 1 )) -eq 2 \
7208 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7209 && xsi_shell=yes
7210@@ -6160,6 +6166,80 @@ esac
7211
7212
7213
7214+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7215+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7216+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7217+ $as_echo_n "(cached) " >&6
7218+else
7219+ case $host in
7220+ *-*-mingw* )
7221+ case $build in
7222+ *-*-mingw* ) # actually msys
7223+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7224+ ;;
7225+ *-*-cygwin* )
7226+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7227+ ;;
7228+ * ) # otherwise, assume *nix
7229+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7230+ ;;
7231+ esac
7232+ ;;
7233+ *-*-cygwin* )
7234+ case $build in
7235+ *-*-mingw* ) # actually msys
7236+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7237+ ;;
7238+ *-*-cygwin* )
7239+ lt_cv_to_host_file_cmd=func_convert_file_noop
7240+ ;;
7241+ * ) # otherwise, assume *nix
7242+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7243+ ;;
7244+ esac
7245+ ;;
7246+ * ) # unhandled hosts (and "normal" native builds)
7247+ lt_cv_to_host_file_cmd=func_convert_file_noop
7248+ ;;
7249+esac
7250+
7251+fi
7252+
7253+to_host_file_cmd=$lt_cv_to_host_file_cmd
7254+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7255+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7256+
7257+
7258+
7259+
7260+
7261+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7262+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7263+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7264+ $as_echo_n "(cached) " >&6
7265+else
7266+ #assume ordinary cross tools, or native build.
7267+lt_cv_to_tool_file_cmd=func_convert_file_noop
7268+case $host in
7269+ *-*-mingw* )
7270+ case $build in
7271+ *-*-mingw* ) # actually msys
7272+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7273+ ;;
7274+ esac
7275+ ;;
7276+esac
7277+
7278+fi
7279+
7280+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7281+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7282+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7283+
7284+
7285+
7286+
7287+
7288 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7289 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7290 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7291@@ -6176,6 +6256,11 @@ case $reload_flag in
7292 esac
7293 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7294 case $host_os in
7295+ cygwin* | mingw* | pw32* | cegcc*)
7296+ if test "$GCC" != yes; then
7297+ reload_cmds=false
7298+ fi
7299+ ;;
7300 darwin*)
7301 if test "$GCC" = yes; then
7302 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7303@@ -6344,7 +6429,8 @@ mingw* | pw32*)
7304 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7305 lt_cv_file_magic_cmd='func_win32_libid'
7306 else
7307- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7308+ # Keep this pattern in sync with the one in func_win32_libid.
7309+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7310 lt_cv_file_magic_cmd='$OBJDUMP -f'
7311 fi
7312 ;;
7313@@ -6498,6 +6584,21 @@ esac
7314 fi
7315 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7316 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7317+
7318+file_magic_glob=
7319+want_nocaseglob=no
7320+if test "$build" = "$host"; then
7321+ case $host_os in
7322+ mingw* | pw32*)
7323+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7324+ want_nocaseglob=yes
7325+ else
7326+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7327+ fi
7328+ ;;
7329+ esac
7330+fi
7331+
7332 file_magic_cmd=$lt_cv_file_magic_cmd
7333 deplibs_check_method=$lt_cv_deplibs_check_method
7334 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7335@@ -6513,9 +6614,162 @@ test -z "$deplibs_check_method" && depli
7336
7337
7338
7339+
7340+
7341+
7342+
7343+
7344+
7345+
7346+
7347+
7348+
7349 if test -n "$ac_tool_prefix"; then
7350- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
7351-set dummy ${ac_tool_prefix}ar; ac_word=$2
7352+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7353+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7354+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7355+$as_echo_n "checking for $ac_word... " >&6; }
7356+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7357+ $as_echo_n "(cached) " >&6
7358+else
7359+ if test -n "$DLLTOOL"; then
7360+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7361+else
7362+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7363+for as_dir in $PATH
7364+do
7365+ IFS=$as_save_IFS
7366+ test -z "$as_dir" && as_dir=.
7367+ for ac_exec_ext in '' $ac_executable_extensions; do
7368+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7369+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7370+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7371+ break 2
7372+ fi
7373+done
7374+ done
7375+IFS=$as_save_IFS
7376+
7377+fi
7378+fi
7379+DLLTOOL=$ac_cv_prog_DLLTOOL
7380+if test -n "$DLLTOOL"; then
7381+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7382+$as_echo "$DLLTOOL" >&6; }
7383+else
7384+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7385+$as_echo "no" >&6; }
7386+fi
7387+
7388+
7389+fi
7390+if test -z "$ac_cv_prog_DLLTOOL"; then
7391+ ac_ct_DLLTOOL=$DLLTOOL
7392+ # Extract the first word of "dlltool", so it can be a program name with args.
7393+set dummy dlltool; ac_word=$2
7394+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7395+$as_echo_n "checking for $ac_word... " >&6; }
7396+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7397+ $as_echo_n "(cached) " >&6
7398+else
7399+ if test -n "$ac_ct_DLLTOOL"; then
7400+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7401+else
7402+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7403+for as_dir in $PATH
7404+do
7405+ IFS=$as_save_IFS
7406+ test -z "$as_dir" && as_dir=.
7407+ for ac_exec_ext in '' $ac_executable_extensions; do
7408+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7409+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7410+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7411+ break 2
7412+ fi
7413+done
7414+ done
7415+IFS=$as_save_IFS
7416+
7417+fi
7418+fi
7419+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7420+if test -n "$ac_ct_DLLTOOL"; then
7421+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7422+$as_echo "$ac_ct_DLLTOOL" >&6; }
7423+else
7424+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7425+$as_echo "no" >&6; }
7426+fi
7427+
7428+ if test "x$ac_ct_DLLTOOL" = x; then
7429+ DLLTOOL="false"
7430+ else
7431+ case $cross_compiling:$ac_tool_warned in
7432+yes:)
7433+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7434+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7435+ac_tool_warned=yes ;;
7436+esac
7437+ DLLTOOL=$ac_ct_DLLTOOL
7438+ fi
7439+else
7440+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7441+fi
7442+
7443+test -z "$DLLTOOL" && DLLTOOL=dlltool
7444+
7445+
7446+
7447+
7448+
7449+
7450+
7451+
7452+
7453+
7454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7455+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7456+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7457+ $as_echo_n "(cached) " >&6
7458+else
7459+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7460+
7461+case $host_os in
7462+cygwin* | mingw* | pw32* | cegcc*)
7463+ # two different shell functions defined in ltmain.sh
7464+ # decide which to use based on capabilities of $DLLTOOL
7465+ case `$DLLTOOL --help 2>&1` in
7466+ *--identify-strict*)
7467+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7468+ ;;
7469+ *)
7470+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7471+ ;;
7472+ esac
7473+ ;;
7474+*)
7475+ # fallback: assume linklib IS sharedlib
7476+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7477+ ;;
7478+esac
7479+
7480+fi
7481+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7482+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7483+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7484+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7485+
7486+
7487+
7488+
7489+
7490+
7491+
7492+if test -n "$ac_tool_prefix"; then
7493+ for ac_prog in ar
7494+ do
7495+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7496+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7497 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7498 $as_echo_n "checking for $ac_word... " >&6; }
7499 if test "${ac_cv_prog_AR+set}" = set; then :
7500@@ -6531,7 +6785,7 @@ do
7501 test -z "$as_dir" && as_dir=.
7502 for ac_exec_ext in '' $ac_executable_extensions; do
7503 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7504- ac_cv_prog_AR="${ac_tool_prefix}ar"
7505+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
7506 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7507 break 2
7508 fi
7509@@ -6551,11 +6805,15 @@ $as_echo "no" >&6; }
7510 fi
7511
7512
7513+ test -n "$AR" && break
7514+ done
7515 fi
7516-if test -z "$ac_cv_prog_AR"; then
7517+if test -z "$AR"; then
7518 ac_ct_AR=$AR
7519- # Extract the first word of "ar", so it can be a program name with args.
7520-set dummy ar; ac_word=$2
7521+ for ac_prog in ar
7522+do
7523+ # Extract the first word of "$ac_prog", so it can be a program name with args.
7524+set dummy $ac_prog; ac_word=$2
7525 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7526 $as_echo_n "checking for $ac_word... " >&6; }
7527 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
7528@@ -6571,7 +6829,7 @@ do
7529 test -z "$as_dir" && as_dir=.
7530 for ac_exec_ext in '' $ac_executable_extensions; do
7531 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7532- ac_cv_prog_ac_ct_AR="ar"
7533+ ac_cv_prog_ac_ct_AR="$ac_prog"
7534 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7535 break 2
7536 fi
7537@@ -6590,6 +6848,10 @@ else
7538 $as_echo "no" >&6; }
7539 fi
7540
7541+
7542+ test -n "$ac_ct_AR" && break
7543+done
7544+
7545 if test "x$ac_ct_AR" = x; then
7546 AR="false"
7547 else
7548@@ -6601,16 +6863,72 @@ ac_tool_warned=yes ;;
7549 esac
7550 AR=$ac_ct_AR
7551 fi
7552-else
7553- AR="$ac_cv_prog_AR"
7554 fi
7555
7556-test -z "$AR" && AR=ar
7557-test -z "$AR_FLAGS" && AR_FLAGS=cru
7558+: ${AR=ar}
7559+: ${AR_FLAGS=cru}
7560+
7561+
7562+
7563+
7564+
7565+
7566+
7567+
7568+
7569+
7570
7571+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
7572+$as_echo_n "checking for archiver @FILE support... " >&6; }
7573+if test "${lt_cv_ar_at_file+set}" = set; then :
7574+ $as_echo_n "(cached) " >&6
7575+else
7576+ lt_cv_ar_at_file=no
7577+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7578+/* end confdefs.h. */
7579
7580+int
7581+main ()
7582+{
7583
7584+ ;
7585+ return 0;
7586+}
7587+_ACEOF
7588+if ac_fn_c_try_compile "$LINENO"; then :
7589+ echo conftest.$ac_objext > conftest.lst
7590+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
7591+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7592+ (eval $lt_ar_try) 2>&5
7593+ ac_status=$?
7594+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7595+ test $ac_status = 0; }
7596+ if test "$ac_status" -eq 0; then
7597+ # Ensure the archiver fails upon bogus file names.
7598+ rm -f conftest.$ac_objext libconftest.a
7599+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7600+ (eval $lt_ar_try) 2>&5
7601+ ac_status=$?
7602+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7603+ test $ac_status = 0; }
7604+ if test "$ac_status" -ne 0; then
7605+ lt_cv_ar_at_file=@
7606+ fi
7607+ fi
7608+ rm -f conftest.* libconftest.a
7609
7610+fi
7611+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7612+
7613+fi
7614+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
7615+$as_echo "$lt_cv_ar_at_file" >&6; }
7616+
7617+if test "x$lt_cv_ar_at_file" = xno; then
7618+ archiver_list_spec=
7619+else
7620+ archiver_list_spec=$lt_cv_ar_at_file
7621+fi
7622
7623
7624
7625@@ -6952,8 +7270,8 @@ esac
7626 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7627
7628 # Transform an extracted symbol line into symbol name and symbol address
7629-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
7630-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'"
7631+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
7632+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'"
7633
7634 # Handle CRLF in mingw tool chain
7635 opt_cr=
7636@@ -6989,6 +7307,7 @@ for ac_symprfx in "" "_"; do
7637 else
7638 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
7639 fi
7640+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
7641
7642 # Check to see that the pipe works correctly.
7643 pipe_works=no
7644@@ -7030,6 +7349,18 @@ _LT_EOF
7645 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
7646 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
7647 cat <<_LT_EOF > conftest.$ac_ext
7648+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
7649+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
7650+/* DATA imports from DLLs on WIN32 con't be const, because runtime
7651+ relocations are performed -- see ld's documentation on pseudo-relocs. */
7652+# define LT_DLSYM_CONST
7653+#elif defined(__osf__)
7654+/* This system does not cope well with relocations in const data. */
7655+# define LT_DLSYM_CONST
7656+#else
7657+# define LT_DLSYM_CONST const
7658+#endif
7659+
7660 #ifdef __cplusplus
7661 extern "C" {
7662 #endif
7663@@ -7041,7 +7372,7 @@ _LT_EOF
7664 cat <<_LT_EOF >> conftest.$ac_ext
7665
7666 /* The mapping between symbol names and symbols. */
7667-const struct {
7668+LT_DLSYM_CONST struct {
7669 const char *name;
7670 void *address;
7671 }
7672@@ -7067,8 +7398,8 @@ static const void *lt_preloaded_setup()
7673 _LT_EOF
7674 # Now try linking the two files.
7675 mv conftest.$ac_objext conftstm.$ac_objext
7676- lt_save_LIBS="$LIBS"
7677- lt_save_CFLAGS="$CFLAGS"
7678+ lt_globsym_save_LIBS=$LIBS
7679+ lt_globsym_save_CFLAGS=$CFLAGS
7680 LIBS="conftstm.$ac_objext"
7681 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
7682 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7683@@ -7078,8 +7409,8 @@ _LT_EOF
7684 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
7685 pipe_works=yes
7686 fi
7687- LIBS="$lt_save_LIBS"
7688- CFLAGS="$lt_save_CFLAGS"
7689+ LIBS=$lt_globsym_save_LIBS
7690+ CFLAGS=$lt_globsym_save_CFLAGS
7691 else
7692 echo "cannot find nm_test_func in $nlist" >&5
7693 fi
7694@@ -7116,6 +7447,20 @@ else
7695 $as_echo "ok" >&6; }
7696 fi
7697
7698+# Response file support.
7699+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
7700+ nm_file_list_spec='@'
7701+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
7702+ nm_file_list_spec='@'
7703+fi
7704+
7705+
7706+
7707+
7708+
7709+
7710+
7711+
7712
7713
7714
7715@@ -7135,6 +7480,41 @@ fi
7716
7717
7718
7719+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
7720+$as_echo_n "checking for sysroot... " >&6; }
7721+
7722+# Check whether --with-libtool-sysroot was given.
7723+if test "${with_libtool_sysroot+set}" = set; then :
7724+ withval=$with_libtool_sysroot;
7725+else
7726+ with_libtool_sysroot=no
7727+fi
7728+
7729+
7730+lt_sysroot=
7731+case ${with_libtool_sysroot} in #(
7732+ yes)
7733+ if test "$GCC" = yes; then
7734+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
7735+ fi
7736+ ;; #(
7737+ /*)
7738+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
7739+ ;; #(
7740+ no|'')
7741+ ;; #(
7742+ *)
7743+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
7744+$as_echo "${with_libtool_sysroot}" >&6; }
7745+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
7746+ ;;
7747+esac
7748+
7749+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
7750+$as_echo "${lt_sysroot:-no}" >&6; }
7751+
7752+
7753+
7754
7755
7756 # Check whether --enable-libtool-lock was given.
7757@@ -7330,6 +7710,123 @@ esac
7758
7759 need_locks="$enable_libtool_lock"
7760
7761+if test -n "$ac_tool_prefix"; then
7762+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
7763+set dummy ${ac_tool_prefix}mt; ac_word=$2
7764+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7765+$as_echo_n "checking for $ac_word... " >&6; }
7766+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
7767+ $as_echo_n "(cached) " >&6
7768+else
7769+ if test -n "$MANIFEST_TOOL"; then
7770+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
7771+else
7772+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7773+for as_dir in $PATH
7774+do
7775+ IFS=$as_save_IFS
7776+ test -z "$as_dir" && as_dir=.
7777+ for ac_exec_ext in '' $ac_executable_extensions; do
7778+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7779+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7780+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7781+ break 2
7782+ fi
7783+done
7784+ done
7785+IFS=$as_save_IFS
7786+
7787+fi
7788+fi
7789+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
7790+if test -n "$MANIFEST_TOOL"; then
7791+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
7792+$as_echo "$MANIFEST_TOOL" >&6; }
7793+else
7794+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7795+$as_echo "no" >&6; }
7796+fi
7797+
7798+
7799+fi
7800+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
7801+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
7802+ # Extract the first word of "mt", so it can be a program name with args.
7803+set dummy mt; ac_word=$2
7804+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7805+$as_echo_n "checking for $ac_word... " >&6; }
7806+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
7807+ $as_echo_n "(cached) " >&6
7808+else
7809+ if test -n "$ac_ct_MANIFEST_TOOL"; then
7810+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
7811+else
7812+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7813+for as_dir in $PATH
7814+do
7815+ IFS=$as_save_IFS
7816+ test -z "$as_dir" && as_dir=.
7817+ for ac_exec_ext in '' $ac_executable_extensions; do
7818+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7819+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7820+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7821+ break 2
7822+ fi
7823+done
7824+ done
7825+IFS=$as_save_IFS
7826+
7827+fi
7828+fi
7829+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
7830+if test -n "$ac_ct_MANIFEST_TOOL"; then
7831+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
7832+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
7833+else
7834+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7835+$as_echo "no" >&6; }
7836+fi
7837+
7838+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
7839+ MANIFEST_TOOL=":"
7840+ else
7841+ case $cross_compiling:$ac_tool_warned in
7842+yes:)
7843+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7844+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7845+ac_tool_warned=yes ;;
7846+esac
7847+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
7848+ fi
7849+else
7850+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
7851+fi
7852+
7853+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
7854+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
7855+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
7856+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
7857+ $as_echo_n "(cached) " >&6
7858+else
7859+ lt_cv_path_mainfest_tool=no
7860+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
7861+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
7862+ cat conftest.err >&5
7863+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
7864+ lt_cv_path_mainfest_tool=yes
7865+ fi
7866+ rm -f conftest*
7867+fi
7868+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
7869+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
7870+if test "x$lt_cv_path_mainfest_tool" != xyes; then
7871+ MANIFEST_TOOL=:
7872+fi
7873+
7874+
7875+
7876+
7877+
7878
7879 case $host_os in
7880 rhapsody* | darwin*)
7881@@ -7893,6 +8390,8 @@ _LT_EOF
7882 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
7883 echo "$AR cru libconftest.a conftest.o" >&5
7884 $AR cru libconftest.a conftest.o 2>&5
7885+ echo "$RANLIB libconftest.a" >&5
7886+ $RANLIB libconftest.a 2>&5
7887 cat > conftest.c << _LT_EOF
7888 int main() { return 0;}
7889 _LT_EOF
7890@@ -8057,7 +8556,8 @@ fi
7891 LIBTOOL_DEPS="$ltmain"
7892
7893 # Always use our own libtool.
7894-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
7895+LIBTOOL='$(SHELL) $(top_builddir)'
7896+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
7897
7898
7899
7900@@ -8146,7 +8646,7 @@ aix3*)
7901 esac
7902
7903 # Global variables:
7904-ofile=libtool
7905+ofile=${host_alias}-libtool
7906 can_build_shared=yes
7907
7908 # All known linkers require a `.a' archive for static linking (except MSVC,
7909@@ -8444,8 +8944,6 @@ fi
7910 lt_prog_compiler_pic=
7911 lt_prog_compiler_static=
7912
7913-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7914-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7915
7916 if test "$GCC" = yes; then
7917 lt_prog_compiler_wl='-Wl,'
7918@@ -8610,6 +9108,12 @@ $as_echo_n "checking for $compiler optio
7919 lt_prog_compiler_pic='--shared'
7920 lt_prog_compiler_static='--static'
7921 ;;
7922+ nagfor*)
7923+ # NAG Fortran compiler
7924+ lt_prog_compiler_wl='-Wl,-Wl,,'
7925+ lt_prog_compiler_pic='-PIC'
7926+ lt_prog_compiler_static='-Bstatic'
7927+ ;;
7928 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
7929 # Portland Group compilers (*not* the Pentium gcc compiler,
7930 # which looks to be a dead project)
7931@@ -8672,7 +9176,7 @@ $as_echo_n "checking for $compiler optio
7932 lt_prog_compiler_pic='-KPIC'
7933 lt_prog_compiler_static='-Bstatic'
7934 case $cc_basename in
7935- f77* | f90* | f95*)
7936+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
7937 lt_prog_compiler_wl='-Qoption ld ';;
7938 *)
7939 lt_prog_compiler_wl='-Wl,';;
7940@@ -8729,13 +9233,17 @@ case $host_os in
7941 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
7942 ;;
7943 esac
7944-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
7945-$as_echo "$lt_prog_compiler_pic" >&6; }
7946-
7947-
7948-
7949-
7950
7951+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7952+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7953+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
7954+ $as_echo_n "(cached) " >&6
7955+else
7956+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
7957+fi
7958+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
7959+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
7960+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
7961
7962 #
7963 # Check to make sure the PIC flag actually works.
7964@@ -8796,6 +9304,11 @@ fi
7965
7966
7967
7968+
7969+
7970+
7971+
7972+
7973 #
7974 # Check to make sure the static flag actually works.
7975 #
7976@@ -9146,7 +9659,8 @@ _LT_EOF
7977 allow_undefined_flag=unsupported
7978 always_export_symbols=no
7979 enable_shared_with_static_runtimes=yes
7980- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
7981+ 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'
7982+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
7983
7984 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
7985 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7986@@ -9194,7 +9708,7 @@ _LT_EOF
7987 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
7988 && test "$tmp_diet" = no
7989 then
7990- tmp_addflag=
7991+ tmp_addflag=' $pic_flag'
7992 tmp_sharedflag='-shared'
7993 case $cc_basename,$host_cpu in
7994 pgcc*) # Portland Group C compiler
7995@@ -9245,12 +9759,12 @@ _LT_EOF
7996 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
7997 hardcode_libdir_flag_spec=
7998 hardcode_libdir_flag_spec_ld='-rpath $libdir'
7999- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8000+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8001 if test "x$supports_anon_versioning" = xyes; then
8002 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8003 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8004 echo "local: *; };" >> $output_objdir/$libname.ver~
8005- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8006+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8007 fi
8008 ;;
8009 esac
8010@@ -9264,8 +9778,8 @@ _LT_EOF
8011 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8012 wlarc=
8013 else
8014- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8015- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8016+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8017+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8018 fi
8019 ;;
8020
8021@@ -9283,8 +9797,8 @@ _LT_EOF
8022
8023 _LT_EOF
8024 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8025- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8026- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8027+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8028+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8029 else
8030 ld_shlibs=no
8031 fi
8032@@ -9330,8 +9844,8 @@ _LT_EOF
8033
8034 *)
8035 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8036- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8037- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8038+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8039+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8040 else
8041 ld_shlibs=no
8042 fi
8043@@ -9461,7 +9975,13 @@ _LT_EOF
8044 allow_undefined_flag='-berok'
8045 # Determine the default libpath from the value encoded in an
8046 # empty executable.
8047- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8048+ if test "${lt_cv_aix_libpath+set}" = set; then
8049+ aix_libpath=$lt_cv_aix_libpath
8050+else
8051+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8052+ $as_echo_n "(cached) " >&6
8053+else
8054+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8055 /* end confdefs.h. */
8056
8057 int
8058@@ -9474,22 +9994,29 @@ main ()
8059 _ACEOF
8060 if ac_fn_c_try_link "$LINENO"; then :
8061
8062-lt_aix_libpath_sed='
8063- /Import File Strings/,/^$/ {
8064- /^0/ {
8065- s/^0 *\(.*\)$/\1/
8066- p
8067- }
8068- }'
8069-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8070-# Check for a 64-bit object if we didn't find anything.
8071-if test -z "$aix_libpath"; then
8072- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8073-fi
8074+ lt_aix_libpath_sed='
8075+ /Import File Strings/,/^$/ {
8076+ /^0/ {
8077+ s/^0 *\([^ ]*\) *$/\1/
8078+ p
8079+ }
8080+ }'
8081+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8082+ # Check for a 64-bit object if we didn't find anything.
8083+ if test -z "$lt_cv_aix_libpath_"; then
8084+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8085+ fi
8086 fi
8087 rm -f core conftest.err conftest.$ac_objext \
8088 conftest$ac_exeext conftest.$ac_ext
8089-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8090+ if test -z "$lt_cv_aix_libpath_"; then
8091+ lt_cv_aix_libpath_="/usr/lib:/lib"
8092+ fi
8093+
8094+fi
8095+
8096+ aix_libpath=$lt_cv_aix_libpath_
8097+fi
8098
8099 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8100 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"
8101@@ -9501,7 +10028,13 @@ if test -z "$aix_libpath"; then aix_libp
8102 else
8103 # Determine the default libpath from the value encoded in an
8104 # empty executable.
8105- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8106+ if test "${lt_cv_aix_libpath+set}" = set; then
8107+ aix_libpath=$lt_cv_aix_libpath
8108+else
8109+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8110+ $as_echo_n "(cached) " >&6
8111+else
8112+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8113 /* end confdefs.h. */
8114
8115 int
8116@@ -9514,22 +10047,29 @@ main ()
8117 _ACEOF
8118 if ac_fn_c_try_link "$LINENO"; then :
8119
8120-lt_aix_libpath_sed='
8121- /Import File Strings/,/^$/ {
8122- /^0/ {
8123- s/^0 *\(.*\)$/\1/
8124- p
8125- }
8126- }'
8127-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8128-# Check for a 64-bit object if we didn't find anything.
8129-if test -z "$aix_libpath"; then
8130- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8131-fi
8132+ lt_aix_libpath_sed='
8133+ /Import File Strings/,/^$/ {
8134+ /^0/ {
8135+ s/^0 *\([^ ]*\) *$/\1/
8136+ p
8137+ }
8138+ }'
8139+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8140+ # Check for a 64-bit object if we didn't find anything.
8141+ if test -z "$lt_cv_aix_libpath_"; then
8142+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8143+ fi
8144 fi
8145 rm -f core conftest.err conftest.$ac_objext \
8146 conftest$ac_exeext conftest.$ac_ext
8147-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8148+ if test -z "$lt_cv_aix_libpath_"; then
8149+ lt_cv_aix_libpath_="/usr/lib:/lib"
8150+ fi
8151+
8152+fi
8153+
8154+ aix_libpath=$lt_cv_aix_libpath_
8155+fi
8156
8157 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8158 # Warning - without using the other run time loading flags,
8159@@ -9574,20 +10114,63 @@ if test -z "$aix_libpath"; then aix_libp
8160 # Microsoft Visual C++.
8161 # hardcode_libdir_flag_spec is actually meaningless, as there is
8162 # no search path for DLLs.
8163- hardcode_libdir_flag_spec=' '
8164- allow_undefined_flag=unsupported
8165- # Tell ltmain to make .lib files, not .a files.
8166- libext=lib
8167- # Tell ltmain to make .dll files, not .so files.
8168- shrext_cmds=".dll"
8169- # FIXME: Setting linknames here is a bad hack.
8170- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8171- # The linker will automatically build a .lib file if we build a DLL.
8172- old_archive_from_new_cmds='true'
8173- # FIXME: Should let the user specify the lib program.
8174- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8175- fix_srcfile_path='`cygpath -w "$srcfile"`'
8176- enable_shared_with_static_runtimes=yes
8177+ case $cc_basename in
8178+ cl*)
8179+ # Native MSVC
8180+ hardcode_libdir_flag_spec=' '
8181+ allow_undefined_flag=unsupported
8182+ always_export_symbols=yes
8183+ file_list_spec='@'
8184+ # Tell ltmain to make .lib files, not .a files.
8185+ libext=lib
8186+ # Tell ltmain to make .dll files, not .so files.
8187+ shrext_cmds=".dll"
8188+ # FIXME: Setting linknames here is a bad hack.
8189+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8190+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8191+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8192+ else
8193+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8194+ fi~
8195+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8196+ linknames='
8197+ # The linker will not automatically build a static lib if we build a DLL.
8198+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8199+ enable_shared_with_static_runtimes=yes
8200+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8201+ # Don't use ranlib
8202+ old_postinstall_cmds='chmod 644 $oldlib'
8203+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8204+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8205+ case $lt_outputfile in
8206+ *.exe|*.EXE) ;;
8207+ *)
8208+ lt_outputfile="$lt_outputfile.exe"
8209+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8210+ ;;
8211+ esac~
8212+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8213+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8214+ $RM "$lt_outputfile.manifest";
8215+ fi'
8216+ ;;
8217+ *)
8218+ # Assume MSVC wrapper
8219+ hardcode_libdir_flag_spec=' '
8220+ allow_undefined_flag=unsupported
8221+ # Tell ltmain to make .lib files, not .a files.
8222+ libext=lib
8223+ # Tell ltmain to make .dll files, not .so files.
8224+ shrext_cmds=".dll"
8225+ # FIXME: Setting linknames here is a bad hack.
8226+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8227+ # The linker will automatically build a .lib file if we build a DLL.
8228+ old_archive_from_new_cmds='true'
8229+ # FIXME: Should let the user specify the lib program.
8230+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8231+ enable_shared_with_static_runtimes=yes
8232+ ;;
8233+ esac
8234 ;;
8235
8236 darwin* | rhapsody*)
8237@@ -9652,7 +10235,7 @@ if test -z "$aix_libpath"; then aix_libp
8238
8239 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8240 freebsd* | dragonfly*)
8241- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8242+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8243 hardcode_libdir_flag_spec='-R$libdir'
8244 hardcode_direct=yes
8245 hardcode_shlibpath_var=no
8246@@ -9660,7 +10243,7 @@ if test -z "$aix_libpath"; then aix_libp
8247
8248 hpux9*)
8249 if test "$GCC" = yes; then
8250- 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'
8251+ 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'
8252 else
8253 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'
8254 fi
8255@@ -9676,7 +10259,7 @@ if test -z "$aix_libpath"; then aix_libp
8256
8257 hpux10*)
8258 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8259- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8260+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8261 else
8262 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8263 fi
8264@@ -9700,10 +10283,10 @@ if test -z "$aix_libpath"; then aix_libp
8265 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8266 ;;
8267 ia64*)
8268- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8269+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8270 ;;
8271 *)
8272- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8273+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8274 ;;
8275 esac
8276 else
8277@@ -9782,23 +10365,36 @@ fi
8278
8279 irix5* | irix6* | nonstopux*)
8280 if test "$GCC" = yes; then
8281- 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'
8282+ 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'
8283 # Try to use the -exported_symbol ld option, if it does not
8284 # work, assume that -exports_file does not work either and
8285 # implicitly export all symbols.
8286- save_LDFLAGS="$LDFLAGS"
8287- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8288- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8289+ # This should be the same for all languages, so no per-tag cache variable.
8290+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8291+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8292+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8293+ $as_echo_n "(cached) " >&6
8294+else
8295+ save_LDFLAGS="$LDFLAGS"
8296+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8297+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8298 /* end confdefs.h. */
8299-int foo(void) {}
8300+int foo (void) { return 0; }
8301 _ACEOF
8302 if ac_fn_c_try_link "$LINENO"; then :
8303- 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'
8304-
8305+ lt_cv_irix_exported_symbol=yes
8306+else
8307+ lt_cv_irix_exported_symbol=no
8308 fi
8309 rm -f core conftest.err conftest.$ac_objext \
8310 conftest$ac_exeext conftest.$ac_ext
8311- LDFLAGS="$save_LDFLAGS"
8312+ LDFLAGS="$save_LDFLAGS"
8313+fi
8314+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8315+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8316+ if test "$lt_cv_irix_exported_symbol" = yes; then
8317+ 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'
8318+ fi
8319 else
8320 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'
8321 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'
8322@@ -9883,7 +10479,7 @@ rm -f core conftest.err conftest.$ac_obj
8323 osf4* | osf5*) # as osf3* with the addition of -msym flag
8324 if test "$GCC" = yes; then
8325 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8326- 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'
8327+ 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'
8328 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8329 else
8330 allow_undefined_flag=' -expect_unresolved \*'
8331@@ -9902,9 +10498,9 @@ rm -f core conftest.err conftest.$ac_obj
8332 no_undefined_flag=' -z defs'
8333 if test "$GCC" = yes; then
8334 wlarc='${wl}'
8335- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8336+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8337 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8338- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8339+ $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'
8340 else
8341 case `$CC -V 2>&1` in
8342 *"Compilers 5.0"*)
8343@@ -10480,8 +11076,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8344 need_version=no
8345 need_lib_prefix=no
8346
8347- case $GCC,$host_os in
8348- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8349+ case $GCC,$cc_basename in
8350+ yes,*)
8351+ # gcc
8352 library_names_spec='$libname.dll.a'
8353 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8354 postinstall_cmds='base_file=`basename \${file}`~
8355@@ -10514,13 +11111,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8356 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8357 ;;
8358 esac
8359+ dynamic_linker='Win32 ld.exe'
8360+ ;;
8361+
8362+ *,cl*)
8363+ # Native MSVC
8364+ libname_spec='$name'
8365+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8366+ library_names_spec='${libname}.dll.lib'
8367+
8368+ case $build_os in
8369+ mingw*)
8370+ sys_lib_search_path_spec=
8371+ lt_save_ifs=$IFS
8372+ IFS=';'
8373+ for lt_path in $LIB
8374+ do
8375+ IFS=$lt_save_ifs
8376+ # Let DOS variable expansion print the short 8.3 style file name.
8377+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8378+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8379+ done
8380+ IFS=$lt_save_ifs
8381+ # Convert to MSYS style.
8382+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8383+ ;;
8384+ cygwin*)
8385+ # Convert to unix form, then to dos form, then back to unix form
8386+ # but this time dos style (no spaces!) so that the unix form looks
8387+ # like /cygdrive/c/PROGRA~1:/cygdr...
8388+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8389+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8390+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8391+ ;;
8392+ *)
8393+ sys_lib_search_path_spec="$LIB"
8394+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8395+ # It is most probably a Windows format PATH.
8396+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8397+ else
8398+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8399+ fi
8400+ # FIXME: find the short name or the path components, as spaces are
8401+ # common. (e.g. "Program Files" -> "PROGRA~1")
8402+ ;;
8403+ esac
8404+
8405+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8406+ postinstall_cmds='base_file=`basename \${file}`~
8407+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8408+ dldir=$destdir/`dirname \$dlpath`~
8409+ test -d \$dldir || mkdir -p \$dldir~
8410+ $install_prog $dir/$dlname \$dldir/$dlname'
8411+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8412+ dlpath=$dir/\$dldll~
8413+ $RM \$dlpath'
8414+ shlibpath_overrides_runpath=yes
8415+ dynamic_linker='Win32 link.exe'
8416 ;;
8417
8418 *)
8419+ # Assume MSVC wrapper
8420 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8421+ dynamic_linker='Win32 ld.exe'
8422 ;;
8423 esac
8424- dynamic_linker='Win32 ld.exe'
8425 # FIXME: first we should search . and the directory the executable is in
8426 shlibpath_var=PATH
8427 ;;
8428@@ -10616,7 +11271,7 @@ haiku*)
8429 soname_spec='${libname}${release}${shared_ext}$major'
8430 shlibpath_var=LIBRARY_PATH
8431 shlibpath_overrides_runpath=yes
8432- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8433+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8434 hardcode_into_libs=yes
8435 ;;
8436
8437@@ -11412,7 +12067,7 @@ else
8438 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8439 lt_status=$lt_dlunknown
8440 cat > conftest.$ac_ext <<_LT_EOF
8441-#line 11415 "configure"
8442+#line $LINENO "configure"
8443 #include "confdefs.h"
8444
8445 #if HAVE_DLFCN_H
8446@@ -11456,10 +12111,10 @@ else
8447 /* When -fvisbility=hidden is used, assume the code has been annotated
8448 correspondingly for the symbols needed. */
8449 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8450-void fnord () __attribute__((visibility("default")));
8451+int fnord () __attribute__((visibility("default")));
8452 #endif
8453
8454-void fnord () { int i=42; }
8455+int fnord () { return 42; }
8456 int main ()
8457 {
8458 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8459@@ -11518,7 +12173,7 @@ else
8460 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8461 lt_status=$lt_dlunknown
8462 cat > conftest.$ac_ext <<_LT_EOF
8463-#line 11521 "configure"
8464+#line $LINENO "configure"
8465 #include "confdefs.h"
8466
8467 #if HAVE_DLFCN_H
8468@@ -11562,10 +12217,10 @@ else
8469 /* When -fvisbility=hidden is used, assume the code has been annotated
8470 correspondingly for the symbols needed. */
8471 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8472-void fnord () __attribute__((visibility("default")));
8473+int fnord () __attribute__((visibility("default")));
8474 #endif
8475
8476-void fnord () { int i=42; }
8477+int fnord () { return 42; }
8478 int main ()
8479 {
8480 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8481@@ -16473,13 +17128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
8482 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
8483 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
8484 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
8485+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
8486+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
8487 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
8488 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
8489 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
8490 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
8491 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
8492+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
8493+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
8494+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
8495+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
8496 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
8497 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
8498+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
8499 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
8500 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
8501 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
8502@@ -16494,14 +17156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
8503 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
8504 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
8505 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"`'
8506+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
8507+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
8508 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
8509 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
8510 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
8511-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8512 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
8513+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8514 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
8515 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
8516 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
8517+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
8518 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
8519 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
8520 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
8521@@ -16534,12 +17199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
8522 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
8523 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
8524 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
8525-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
8526 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
8527 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
8528 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
8529 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
8530 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
8531+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
8532 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
8533 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
8534 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
8535@@ -16594,8 +17259,13 @@ reload_flag \
8536 OBJDUMP \
8537 deplibs_check_method \
8538 file_magic_cmd \
8539+file_magic_glob \
8540+want_nocaseglob \
8541+DLLTOOL \
8542+sharedlib_from_linklib_cmd \
8543 AR \
8544 AR_FLAGS \
8545+archiver_list_spec \
8546 STRIP \
8547 RANLIB \
8548 CC \
8549@@ -16605,12 +17275,14 @@ lt_cv_sys_global_symbol_pipe \
8550 lt_cv_sys_global_symbol_to_cdecl \
8551 lt_cv_sys_global_symbol_to_c_name_address \
8552 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
8553+nm_file_list_spec \
8554 lt_prog_compiler_no_builtin_flag \
8555-lt_prog_compiler_wl \
8556 lt_prog_compiler_pic \
8557+lt_prog_compiler_wl \
8558 lt_prog_compiler_static \
8559 lt_cv_prog_compiler_c_o \
8560 need_locks \
8561+MANIFEST_TOOL \
8562 DSYMUTIL \
8563 NMEDIT \
8564 LIPO \
8565@@ -16626,7 +17298,6 @@ no_undefined_flag \
8566 hardcode_libdir_flag_spec \
8567 hardcode_libdir_flag_spec_ld \
8568 hardcode_libdir_separator \
8569-fix_srcfile_path \
8570 exclude_expsyms \
8571 include_expsyms \
8572 file_list_spec \
8573@@ -16662,6 +17333,7 @@ module_cmds \
8574 module_expsym_cmds \
8575 export_symbols_cmds \
8576 prelink_cmds \
8577+postlink_cmds \
8578 postinstall_cmds \
8579 postuninstall_cmds \
8580 finish_cmds \
8581@@ -17441,7 +18113,8 @@ $as_echo X"$file" |
8582 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
8583 #
8584 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
8585-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
8586+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
8587+# Inc.
8588 # Written by Gordon Matzigkeit, 1996
8589 #
8590 # This file is part of GNU Libtool.
8591@@ -17544,19 +18217,42 @@ SP2NL=$lt_lt_SP2NL
8592 # turn newlines into spaces.
8593 NL2SP=$lt_lt_NL2SP
8594
8595+# convert \$build file names to \$host format.
8596+to_host_file_cmd=$lt_cv_to_host_file_cmd
8597+
8598+# convert \$build files to toolchain format.
8599+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
8600+
8601 # An object symbol dumper.
8602 OBJDUMP=$lt_OBJDUMP
8603
8604 # Method to check whether dependent libraries are shared objects.
8605 deplibs_check_method=$lt_deplibs_check_method
8606
8607-# Command to use when deplibs_check_method == "file_magic".
8608+# Command to use when deplibs_check_method = "file_magic".
8609 file_magic_cmd=$lt_file_magic_cmd
8610
8611+# How to find potential files when deplibs_check_method = "file_magic".
8612+file_magic_glob=$lt_file_magic_glob
8613+
8614+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
8615+want_nocaseglob=$lt_want_nocaseglob
8616+
8617+# DLL creation program.
8618+DLLTOOL=$lt_DLLTOOL
8619+
8620+# Command to associate shared and link libraries.
8621+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
8622+
8623 # The archiver.
8624 AR=$lt_AR
8625+
8626+# Flags to create an archive.
8627 AR_FLAGS=$lt_AR_FLAGS
8628
8629+# How to feed a file listing to the archiver.
8630+archiver_list_spec=$lt_archiver_list_spec
8631+
8632 # A symbol stripping program.
8633 STRIP=$lt_STRIP
8634
8635@@ -17586,6 +18282,12 @@ global_symbol_to_c_name_address=$lt_lt_c
8636 # Transform the output of nm in a C name address pair when lib prefix is needed.
8637 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
8638
8639+# Specify filename containing input files for \$NM.
8640+nm_file_list_spec=$lt_nm_file_list_spec
8641+
8642+# The root where to search for dependent libraries,and in which our libraries should be installed.
8643+lt_sysroot=$lt_sysroot
8644+
8645 # The name of the directory that contains temporary libtool files.
8646 objdir=$objdir
8647
8648@@ -17595,6 +18297,9 @@ MAGIC_CMD=$MAGIC_CMD
8649 # Must we lock files when doing compilation?
8650 need_locks=$lt_need_locks
8651
8652+# Manifest tool.
8653+MANIFEST_TOOL=$lt_MANIFEST_TOOL
8654+
8655 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
8656 DSYMUTIL=$lt_DSYMUTIL
8657
8658@@ -17709,12 +18414,12 @@ with_gcc=$GCC
8659 # Compiler flag to turn off builtin functions.
8660 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
8661
8662-# How to pass a linker flag through the compiler.
8663-wl=$lt_lt_prog_compiler_wl
8664-
8665 # Additional compiler flags for building library objects.
8666 pic_flag=$lt_lt_prog_compiler_pic
8667
8668+# How to pass a linker flag through the compiler.
8669+wl=$lt_lt_prog_compiler_wl
8670+
8671 # Compiler flag to prevent dynamic linking.
8672 link_static_flag=$lt_lt_prog_compiler_static
8673
8674@@ -17801,9 +18506,6 @@ inherit_rpath=$inherit_rpath
8675 # Whether libtool must link a program against all its dependency libraries.
8676 link_all_deplibs=$link_all_deplibs
8677
8678-# Fix the shell variable \$srcfile for the compiler.
8679-fix_srcfile_path=$lt_fix_srcfile_path
8680-
8681 # Set to "yes" if exported symbols are required.
8682 always_export_symbols=$always_export_symbols
8683
8684@@ -17819,6 +18521,9 @@ include_expsyms=$lt_include_expsyms
8685 # Commands necessary for linking programs (against libraries) with templates.
8686 prelink_cmds=$lt_prelink_cmds
8687
8688+# Commands necessary for finishing linking programs.
8689+postlink_cmds=$lt_postlink_cmds
8690+
8691 # Specify filename containing input files.
8692 file_list_spec=$lt_file_list_spec
8693
8694@@ -17851,210 +18556,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
8695 # if finds mixed CR/LF and LF-only lines. Since sed operates in
8696 # text mode, it properly converts lines to CR/LF. This bash problem
8697 # is reportedly fixed, but why not run on old versions too?
8698- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
8699- || (rm -f "$cfgfile"; exit 1)
8700-
8701- case $xsi_shell in
8702- yes)
8703- cat << \_LT_EOF >> "$cfgfile"
8704-
8705-# func_dirname file append nondir_replacement
8706-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8707-# otherwise set result to NONDIR_REPLACEMENT.
8708-func_dirname ()
8709-{
8710- case ${1} in
8711- */*) func_dirname_result="${1%/*}${2}" ;;
8712- * ) func_dirname_result="${3}" ;;
8713- esac
8714-}
8715-
8716-# func_basename file
8717-func_basename ()
8718-{
8719- func_basename_result="${1##*/}"
8720-}
8721-
8722-# func_dirname_and_basename file append nondir_replacement
8723-# perform func_basename and func_dirname in a single function
8724-# call:
8725-# dirname: Compute the dirname of FILE. If nonempty,
8726-# add APPEND to the result, otherwise set result
8727-# to NONDIR_REPLACEMENT.
8728-# value returned in "$func_dirname_result"
8729-# basename: Compute filename of FILE.
8730-# value retuned in "$func_basename_result"
8731-# Implementation must be kept synchronized with func_dirname
8732-# and func_basename. For efficiency, we do not delegate to
8733-# those functions but instead duplicate the functionality here.
8734-func_dirname_and_basename ()
8735-{
8736- case ${1} in
8737- */*) func_dirname_result="${1%/*}${2}" ;;
8738- * ) func_dirname_result="${3}" ;;
8739- esac
8740- func_basename_result="${1##*/}"
8741-}
8742-
8743-# func_stripname prefix suffix name
8744-# strip PREFIX and SUFFIX off of NAME.
8745-# PREFIX and SUFFIX must not contain globbing or regex special
8746-# characters, hashes, percent signs, but SUFFIX may contain a leading
8747-# dot (in which case that matches only a dot).
8748-func_stripname ()
8749-{
8750- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
8751- # positional parameters, so assign one to ordinary parameter first.
8752- func_stripname_result=${3}
8753- func_stripname_result=${func_stripname_result#"${1}"}
8754- func_stripname_result=${func_stripname_result%"${2}"}
8755-}
8756-
8757-# func_opt_split
8758-func_opt_split ()
8759-{
8760- func_opt_split_opt=${1%%=*}
8761- func_opt_split_arg=${1#*=}
8762-}
8763-
8764-# func_lo2o object
8765-func_lo2o ()
8766-{
8767- case ${1} in
8768- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
8769- *) func_lo2o_result=${1} ;;
8770- esac
8771-}
8772-
8773-# func_xform libobj-or-source
8774-func_xform ()
8775-{
8776- func_xform_result=${1%.*}.lo
8777-}
8778-
8779-# func_arith arithmetic-term...
8780-func_arith ()
8781-{
8782- func_arith_result=$(( $* ))
8783-}
8784-
8785-# func_len string
8786-# STRING may not start with a hyphen.
8787-func_len ()
8788-{
8789- func_len_result=${#1}
8790-}
8791-
8792-_LT_EOF
8793- ;;
8794- *) # Bourne compatible functions.
8795- cat << \_LT_EOF >> "$cfgfile"
8796-
8797-# func_dirname file append nondir_replacement
8798-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8799-# otherwise set result to NONDIR_REPLACEMENT.
8800-func_dirname ()
8801-{
8802- # Extract subdirectory from the argument.
8803- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
8804- if test "X$func_dirname_result" = "X${1}"; then
8805- func_dirname_result="${3}"
8806- else
8807- func_dirname_result="$func_dirname_result${2}"
8808- fi
8809-}
8810-
8811-# func_basename file
8812-func_basename ()
8813-{
8814- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
8815-}
8816-
8817-
8818-# func_stripname prefix suffix name
8819-# strip PREFIX and SUFFIX off of NAME.
8820-# PREFIX and SUFFIX must not contain globbing or regex special
8821-# characters, hashes, percent signs, but SUFFIX may contain a leading
8822-# dot (in which case that matches only a dot).
8823-# func_strip_suffix prefix name
8824-func_stripname ()
8825-{
8826- case ${2} in
8827- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8828- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8829- esac
8830-}
8831-
8832-# sed scripts:
8833-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
8834-my_sed_long_arg='1s/^-[^=]*=//'
8835-
8836-# func_opt_split
8837-func_opt_split ()
8838-{
8839- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
8840- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
8841-}
8842-
8843-# func_lo2o object
8844-func_lo2o ()
8845-{
8846- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
8847-}
8848-
8849-# func_xform libobj-or-source
8850-func_xform ()
8851-{
8852- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
8853-}
8854-
8855-# func_arith arithmetic-term...
8856-func_arith ()
8857-{
8858- func_arith_result=`expr "$@"`
8859-}
8860-
8861-# func_len string
8862-# STRING may not start with a hyphen.
8863-func_len ()
8864-{
8865- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
8866-}
8867-
8868-_LT_EOF
8869-esac
8870-
8871-case $lt_shell_append in
8872- yes)
8873- cat << \_LT_EOF >> "$cfgfile"
8874-
8875-# func_append var value
8876-# Append VALUE to the end of shell variable VAR.
8877-func_append ()
8878-{
8879- eval "$1+=\$2"
8880-}
8881-_LT_EOF
8882- ;;
8883- *)
8884- cat << \_LT_EOF >> "$cfgfile"
8885-
8886-# func_append var value
8887-# Append VALUE to the end of shell variable VAR.
8888-func_append ()
8889-{
8890- eval "$1=\$$1\$2"
8891-}
8892-
8893-_LT_EOF
8894- ;;
8895- esac
8896+ sed '$q' "$ltmain" >> "$cfgfile" \
8897+ || (rm -f "$cfgfile"; exit 1)
8898
8899+ if test x"$xsi_shell" = xyes; then
8900+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
8901+func_dirname ()\
8902+{\
8903+\ case ${1} in\
8904+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8905+\ * ) func_dirname_result="${3}" ;;\
8906+\ esac\
8907+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
8908+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8909+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8910+test 0 -eq $? || _lt_function_replace_fail=:
8911+
8912+
8913+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
8914+func_basename ()\
8915+{\
8916+\ func_basename_result="${1##*/}"\
8917+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
8918+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8919+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8920+test 0 -eq $? || _lt_function_replace_fail=:
8921+
8922+
8923+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
8924+func_dirname_and_basename ()\
8925+{\
8926+\ case ${1} in\
8927+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8928+\ * ) func_dirname_result="${3}" ;;\
8929+\ esac\
8930+\ func_basename_result="${1##*/}"\
8931+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
8932+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8933+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8934+test 0 -eq $? || _lt_function_replace_fail=:
8935+
8936+
8937+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
8938+func_stripname ()\
8939+{\
8940+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
8941+\ # positional parameters, so assign one to ordinary parameter first.\
8942+\ func_stripname_result=${3}\
8943+\ func_stripname_result=${func_stripname_result#"${1}"}\
8944+\ func_stripname_result=${func_stripname_result%"${2}"}\
8945+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
8946+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8947+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8948+test 0 -eq $? || _lt_function_replace_fail=:
8949+
8950+
8951+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
8952+func_split_long_opt ()\
8953+{\
8954+\ func_split_long_opt_name=${1%%=*}\
8955+\ func_split_long_opt_arg=${1#*=}\
8956+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
8957+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8958+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8959+test 0 -eq $? || _lt_function_replace_fail=:
8960+
8961+
8962+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
8963+func_split_short_opt ()\
8964+{\
8965+\ func_split_short_opt_arg=${1#??}\
8966+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
8967+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
8968+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8969+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8970+test 0 -eq $? || _lt_function_replace_fail=:
8971+
8972+
8973+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
8974+func_lo2o ()\
8975+{\
8976+\ case ${1} in\
8977+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
8978+\ *) func_lo2o_result=${1} ;;\
8979+\ esac\
8980+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
8981+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8982+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8983+test 0 -eq $? || _lt_function_replace_fail=:
8984+
8985+
8986+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
8987+func_xform ()\
8988+{\
8989+ func_xform_result=${1%.*}.lo\
8990+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
8991+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8992+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8993+test 0 -eq $? || _lt_function_replace_fail=:
8994+
8995+
8996+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
8997+func_arith ()\
8998+{\
8999+ func_arith_result=$(( $* ))\
9000+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
9001+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9002+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9003+test 0 -eq $? || _lt_function_replace_fail=:
9004+
9005+
9006+ sed -e '/^func_len ()$/,/^} # func_len /c\
9007+func_len ()\
9008+{\
9009+ func_len_result=${#1}\
9010+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
9011+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9012+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9013+test 0 -eq $? || _lt_function_replace_fail=:
9014+
9015+fi
9016+
9017+if test x"$lt_shell_append" = xyes; then
9018+ sed -e '/^func_append ()$/,/^} # func_append /c\
9019+func_append ()\
9020+{\
9021+ eval "${1}+=\\${2}"\
9022+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
9023+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9024+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9025+test 0 -eq $? || _lt_function_replace_fail=:
9026+
9027+
9028+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
9029+func_append_quoted ()\
9030+{\
9031+\ func_quote_for_eval "${2}"\
9032+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
9033+} # Extended-shell func_append_quoted implementation' "$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+
9038+
9039+ # Save a `func_append' function call where possible by direct use of '+='
9040+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
9041+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9042+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9043+ test 0 -eq $? || _lt_function_replace_fail=:
9044+else
9045+ # Save a `func_append' function call even when '+=' is not available
9046+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
9047+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9048+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9049+ test 0 -eq $? || _lt_function_replace_fail=:
9050+fi
9051+
9052+if test x"$_lt_function_replace_fail" = x":"; then
9053+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
9054+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
9055+fi
9056
9057- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
9058- || (rm -f "$cfgfile"; exit 1)
9059
9060- mv -f "$cfgfile" "$ofile" ||
9061+ mv -f "$cfgfile" "$ofile" ||
9062 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
9063 chmod +x "$ofile"
9064
9065Index: binutils-2.21/opcodes/configure
9066===================================================================
9067--- binutils-2.21.orig/opcodes/configure
9068+++ binutils-2.21/opcodes/configure
9069@@ -647,6 +647,9 @@ OTOOL
9070 LIPO
9071 NMEDIT
9072 DSYMUTIL
9073+MANIFEST_TOOL
9074+ac_ct_AR
9075+DLLTOOL
9076 OBJDUMP
9077 LN_S
9078 NM
9079@@ -759,6 +762,7 @@ enable_static
9080 with_pic
9081 enable_fast_install
9082 with_gnu_ld
9083+with_libtool_sysroot
9084 enable_libtool_lock
9085 enable_targets
9086 enable_werror
9087@@ -1417,6 +1421,8 @@ Optional Packages:
9088 --with-pic try to use only PIC/non-PIC objects [default=use
9089 both]
9090 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
9091+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
9092+ (or the compiler's sysroot if not specified).
9093
9094 Some influential environment variables:
9095 CC C compiler command
9096@@ -5112,8 +5118,8 @@ esac
9097
9098
9099
9100-macro_version='2.2.7a'
9101-macro_revision='1.3134'
9102+macro_version='2.4'
9103+macro_revision='1.3293'
9104
9105
9106
9107@@ -5153,7 +5159,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
9108 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
9109 $as_echo_n "checking how to print strings... " >&6; }
9110 # Test print first, because it will be a builtin if present.
9111-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
9112+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
9113 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
9114 ECHO='print -r --'
9115 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
9116@@ -5839,8 +5845,8 @@ $as_echo_n "checking whether the shell u
9117 # Try some XSI features
9118 xsi_shell=no
9119 ( _lt_dummy="a/b/c"
9120- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
9121- = c,a/b,, \
9122+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
9123+ = c,a/b,b/c, \
9124 && eval 'test $(( 1 + 1 )) -eq 2 \
9125 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
9126 && xsi_shell=yes
9127@@ -5889,6 +5895,80 @@ esac
9128
9129
9130
9131+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
9132+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
9133+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
9134+ $as_echo_n "(cached) " >&6
9135+else
9136+ case $host in
9137+ *-*-mingw* )
9138+ case $build in
9139+ *-*-mingw* ) # actually msys
9140+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
9141+ ;;
9142+ *-*-cygwin* )
9143+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
9144+ ;;
9145+ * ) # otherwise, assume *nix
9146+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
9147+ ;;
9148+ esac
9149+ ;;
9150+ *-*-cygwin* )
9151+ case $build in
9152+ *-*-mingw* ) # actually msys
9153+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
9154+ ;;
9155+ *-*-cygwin* )
9156+ lt_cv_to_host_file_cmd=func_convert_file_noop
9157+ ;;
9158+ * ) # otherwise, assume *nix
9159+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
9160+ ;;
9161+ esac
9162+ ;;
9163+ * ) # unhandled hosts (and "normal" native builds)
9164+ lt_cv_to_host_file_cmd=func_convert_file_noop
9165+ ;;
9166+esac
9167+
9168+fi
9169+
9170+to_host_file_cmd=$lt_cv_to_host_file_cmd
9171+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
9172+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
9173+
9174+
9175+
9176+
9177+
9178+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
9179+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
9180+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
9181+ $as_echo_n "(cached) " >&6
9182+else
9183+ #assume ordinary cross tools, or native build.
9184+lt_cv_to_tool_file_cmd=func_convert_file_noop
9185+case $host in
9186+ *-*-mingw* )
9187+ case $build in
9188+ *-*-mingw* ) # actually msys
9189+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
9190+ ;;
9191+ esac
9192+ ;;
9193+esac
9194+
9195+fi
9196+
9197+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9198+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
9199+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
9200+
9201+
9202+
9203+
9204+
9205 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
9206 $as_echo_n "checking for $LD option to reload object files... " >&6; }
9207 if test "${lt_cv_ld_reload_flag+set}" = set; then :
9208@@ -5905,6 +5985,11 @@ case $reload_flag in
9209 esac
9210 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9211 case $host_os in
9212+ cygwin* | mingw* | pw32* | cegcc*)
9213+ if test "$GCC" != yes; then
9214+ reload_cmds=false
9215+ fi
9216+ ;;
9217 darwin*)
9218 if test "$GCC" = yes; then
9219 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
9220@@ -6073,7 +6158,8 @@ mingw* | pw32*)
9221 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
9222 lt_cv_file_magic_cmd='func_win32_libid'
9223 else
9224- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
9225+ # Keep this pattern in sync with the one in func_win32_libid.
9226+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
9227 lt_cv_file_magic_cmd='$OBJDUMP -f'
9228 fi
9229 ;;
9230@@ -6227,6 +6313,21 @@ esac
9231 fi
9232 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
9233 $as_echo "$lt_cv_deplibs_check_method" >&6; }
9234+
9235+file_magic_glob=
9236+want_nocaseglob=no
9237+if test "$build" = "$host"; then
9238+ case $host_os in
9239+ mingw* | pw32*)
9240+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
9241+ want_nocaseglob=yes
9242+ else
9243+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
9244+ fi
9245+ ;;
9246+ esac
9247+fi
9248+
9249 file_magic_cmd=$lt_cv_file_magic_cmd
9250 deplibs_check_method=$lt_cv_deplibs_check_method
9251 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9252@@ -6242,9 +6343,162 @@ test -z "$deplibs_check_method" && depli
9253
9254
9255
9256+
9257+
9258+
9259+
9260+
9261+
9262+
9263+
9264+
9265+
9266 if test -n "$ac_tool_prefix"; then
9267- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9268-set dummy ${ac_tool_prefix}ar; ac_word=$2
9269+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
9270+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
9271+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9272+$as_echo_n "checking for $ac_word... " >&6; }
9273+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
9274+ $as_echo_n "(cached) " >&6
9275+else
9276+ if test -n "$DLLTOOL"; then
9277+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
9278+else
9279+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9280+for as_dir in $PATH
9281+do
9282+ IFS=$as_save_IFS
9283+ test -z "$as_dir" && as_dir=.
9284+ for ac_exec_ext in '' $ac_executable_extensions; do
9285+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9286+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
9287+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9288+ break 2
9289+ fi
9290+done
9291+ done
9292+IFS=$as_save_IFS
9293+
9294+fi
9295+fi
9296+DLLTOOL=$ac_cv_prog_DLLTOOL
9297+if test -n "$DLLTOOL"; then
9298+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
9299+$as_echo "$DLLTOOL" >&6; }
9300+else
9301+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9302+$as_echo "no" >&6; }
9303+fi
9304+
9305+
9306+fi
9307+if test -z "$ac_cv_prog_DLLTOOL"; then
9308+ ac_ct_DLLTOOL=$DLLTOOL
9309+ # Extract the first word of "dlltool", so it can be a program name with args.
9310+set dummy dlltool; ac_word=$2
9311+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9312+$as_echo_n "checking for $ac_word... " >&6; }
9313+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
9314+ $as_echo_n "(cached) " >&6
9315+else
9316+ if test -n "$ac_ct_DLLTOOL"; then
9317+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
9318+else
9319+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9320+for as_dir in $PATH
9321+do
9322+ IFS=$as_save_IFS
9323+ test -z "$as_dir" && as_dir=.
9324+ for ac_exec_ext in '' $ac_executable_extensions; do
9325+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9326+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
9327+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9328+ break 2
9329+ fi
9330+done
9331+ done
9332+IFS=$as_save_IFS
9333+
9334+fi
9335+fi
9336+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
9337+if test -n "$ac_ct_DLLTOOL"; then
9338+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
9339+$as_echo "$ac_ct_DLLTOOL" >&6; }
9340+else
9341+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9342+$as_echo "no" >&6; }
9343+fi
9344+
9345+ if test "x$ac_ct_DLLTOOL" = x; then
9346+ DLLTOOL="false"
9347+ else
9348+ case $cross_compiling:$ac_tool_warned in
9349+yes:)
9350+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9351+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9352+ac_tool_warned=yes ;;
9353+esac
9354+ DLLTOOL=$ac_ct_DLLTOOL
9355+ fi
9356+else
9357+ DLLTOOL="$ac_cv_prog_DLLTOOL"
9358+fi
9359+
9360+test -z "$DLLTOOL" && DLLTOOL=dlltool
9361+
9362+
9363+
9364+
9365+
9366+
9367+
9368+
9369+
9370+
9371+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
9372+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
9373+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
9374+ $as_echo_n "(cached) " >&6
9375+else
9376+ lt_cv_sharedlib_from_linklib_cmd='unknown'
9377+
9378+case $host_os in
9379+cygwin* | mingw* | pw32* | cegcc*)
9380+ # two different shell functions defined in ltmain.sh
9381+ # decide which to use based on capabilities of $DLLTOOL
9382+ case `$DLLTOOL --help 2>&1` in
9383+ *--identify-strict*)
9384+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
9385+ ;;
9386+ *)
9387+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
9388+ ;;
9389+ esac
9390+ ;;
9391+*)
9392+ # fallback: assume linklib IS sharedlib
9393+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
9394+ ;;
9395+esac
9396+
9397+fi
9398+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
9399+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
9400+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
9401+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
9402+
9403+
9404+
9405+
9406+
9407+
9408+
9409+if test -n "$ac_tool_prefix"; then
9410+ for ac_prog in ar
9411+ do
9412+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9413+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9415 $as_echo_n "checking for $ac_word... " >&6; }
9416 if test "${ac_cv_prog_AR+set}" = set; then :
9417@@ -6260,7 +6514,7 @@ do
9418 test -z "$as_dir" && as_dir=.
9419 for ac_exec_ext in '' $ac_executable_extensions; do
9420 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9421- ac_cv_prog_AR="${ac_tool_prefix}ar"
9422+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
9423 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9424 break 2
9425 fi
9426@@ -6280,11 +6534,15 @@ $as_echo "no" >&6; }
9427 fi
9428
9429
9430+ test -n "$AR" && break
9431+ done
9432 fi
9433-if test -z "$ac_cv_prog_AR"; then
9434+if test -z "$AR"; then
9435 ac_ct_AR=$AR
9436- # Extract the first word of "ar", so it can be a program name with args.
9437-set dummy ar; ac_word=$2
9438+ for ac_prog in ar
9439+do
9440+ # Extract the first word of "$ac_prog", so it can be a program name with args.
9441+set dummy $ac_prog; ac_word=$2
9442 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9443 $as_echo_n "checking for $ac_word... " >&6; }
9444 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
9445@@ -6300,7 +6558,7 @@ do
9446 test -z "$as_dir" && as_dir=.
9447 for ac_exec_ext in '' $ac_executable_extensions; do
9448 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9449- ac_cv_prog_ac_ct_AR="ar"
9450+ ac_cv_prog_ac_ct_AR="$ac_prog"
9451 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9452 break 2
9453 fi
9454@@ -6319,6 +6577,10 @@ else
9455 $as_echo "no" >&6; }
9456 fi
9457
9458+
9459+ test -n "$ac_ct_AR" && break
9460+done
9461+
9462 if test "x$ac_ct_AR" = x; then
9463 AR="false"
9464 else
9465@@ -6330,12 +6592,11 @@ ac_tool_warned=yes ;;
9466 esac
9467 AR=$ac_ct_AR
9468 fi
9469-else
9470- AR="$ac_cv_prog_AR"
9471 fi
9472
9473-test -z "$AR" && AR=ar
9474-test -z "$AR_FLAGS" && AR_FLAGS=cru
9475+: ${AR=ar}
9476+: ${AR_FLAGS=cru}
9477+
9478
9479
9480
9481@@ -6346,6 +6607,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
9482
9483
9484
9485+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
9486+$as_echo_n "checking for archiver @FILE support... " >&6; }
9487+if test "${lt_cv_ar_at_file+set}" = set; then :
9488+ $as_echo_n "(cached) " >&6
9489+else
9490+ lt_cv_ar_at_file=no
9491+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9492+/* end confdefs.h. */
9493+
9494+int
9495+main ()
9496+{
9497+
9498+ ;
9499+ return 0;
9500+}
9501+_ACEOF
9502+if ac_fn_c_try_compile "$LINENO"; then :
9503+ echo conftest.$ac_objext > conftest.lst
9504+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
9505+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9506+ (eval $lt_ar_try) 2>&5
9507+ ac_status=$?
9508+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9509+ test $ac_status = 0; }
9510+ if test "$ac_status" -eq 0; then
9511+ # Ensure the archiver fails upon bogus file names.
9512+ rm -f conftest.$ac_objext libconftest.a
9513+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9514+ (eval $lt_ar_try) 2>&5
9515+ ac_status=$?
9516+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9517+ test $ac_status = 0; }
9518+ if test "$ac_status" -ne 0; then
9519+ lt_cv_ar_at_file=@
9520+ fi
9521+ fi
9522+ rm -f conftest.* libconftest.a
9523+
9524+fi
9525+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9526+
9527+fi
9528+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
9529+$as_echo "$lt_cv_ar_at_file" >&6; }
9530+
9531+if test "x$lt_cv_ar_at_file" = xno; then
9532+ archiver_list_spec=
9533+else
9534+ archiver_list_spec=$lt_cv_ar_at_file
9535+fi
9536+
9537+
9538+
9539+
9540+
9541+
9542
9543 if test -n "$ac_tool_prefix"; then
9544 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9545@@ -6681,8 +6999,8 @@ esac
9546 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9547
9548 # Transform an extracted symbol line into symbol name and symbol address
9549-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9550-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'"
9551+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9552+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'"
9553
9554 # Handle CRLF in mingw tool chain
9555 opt_cr=
9556@@ -6718,6 +7036,7 @@ for ac_symprfx in "" "_"; do
9557 else
9558 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
9559 fi
9560+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
9561
9562 # Check to see that the pipe works correctly.
9563 pipe_works=no
9564@@ -6759,6 +7078,18 @@ _LT_EOF
9565 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
9566 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
9567 cat <<_LT_EOF > conftest.$ac_ext
9568+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
9569+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
9570+/* DATA imports from DLLs on WIN32 con't be const, because runtime
9571+ relocations are performed -- see ld's documentation on pseudo-relocs. */
9572+# define LT_DLSYM_CONST
9573+#elif defined(__osf__)
9574+/* This system does not cope well with relocations in const data. */
9575+# define LT_DLSYM_CONST
9576+#else
9577+# define LT_DLSYM_CONST const
9578+#endif
9579+
9580 #ifdef __cplusplus
9581 extern "C" {
9582 #endif
9583@@ -6770,7 +7101,7 @@ _LT_EOF
9584 cat <<_LT_EOF >> conftest.$ac_ext
9585
9586 /* The mapping between symbol names and symbols. */
9587-const struct {
9588+LT_DLSYM_CONST struct {
9589 const char *name;
9590 void *address;
9591 }
9592@@ -6796,8 +7127,8 @@ static const void *lt_preloaded_setup()
9593 _LT_EOF
9594 # Now try linking the two files.
9595 mv conftest.$ac_objext conftstm.$ac_objext
9596- lt_save_LIBS="$LIBS"
9597- lt_save_CFLAGS="$CFLAGS"
9598+ lt_globsym_save_LIBS=$LIBS
9599+ lt_globsym_save_CFLAGS=$CFLAGS
9600 LIBS="conftstm.$ac_objext"
9601 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
9602 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
9603@@ -6807,8 +7138,8 @@ _LT_EOF
9604 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
9605 pipe_works=yes
9606 fi
9607- LIBS="$lt_save_LIBS"
9608- CFLAGS="$lt_save_CFLAGS"
9609+ LIBS=$lt_globsym_save_LIBS
9610+ CFLAGS=$lt_globsym_save_CFLAGS
9611 else
9612 echo "cannot find nm_test_func in $nlist" >&5
9613 fi
9614@@ -6845,6 +7176,14 @@ else
9615 $as_echo "ok" >&6; }
9616 fi
9617
9618+# Response file support.
9619+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
9620+ nm_file_list_spec='@'
9621+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
9622+ nm_file_list_spec='@'
9623+fi
9624+
9625+
9626
9627
9628
9629@@ -6866,6 +7205,47 @@ fi
9630
9631
9632
9633+
9634+
9635+
9636+
9637+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
9638+$as_echo_n "checking for sysroot... " >&6; }
9639+
9640+# Check whether --with-libtool-sysroot was given.
9641+if test "${with_libtool_sysroot+set}" = set; then :
9642+ withval=$with_libtool_sysroot;
9643+else
9644+ with_libtool_sysroot=no
9645+fi
9646+
9647+
9648+lt_sysroot=
9649+case ${with_libtool_sysroot} in #(
9650+ yes)
9651+ if test "$GCC" = yes; then
9652+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
9653+ fi
9654+ ;; #(
9655+ /*)
9656+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
9657+ ;; #(
9658+ no|'')
9659+ ;; #(
9660+ *)
9661+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
9662+$as_echo "${with_libtool_sysroot}" >&6; }
9663+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
9664+ ;;
9665+esac
9666+
9667+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
9668+$as_echo "${lt_sysroot:-no}" >&6; }
9669+
9670+
9671+
9672+
9673+
9674 # Check whether --enable-libtool-lock was given.
9675 if test "${enable_libtool_lock+set}" = set; then :
9676 enableval=$enable_libtool_lock;
9677@@ -7059,6 +7439,123 @@ esac
9678
9679 need_locks="$enable_libtool_lock"
9680
9681+if test -n "$ac_tool_prefix"; then
9682+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
9683+set dummy ${ac_tool_prefix}mt; ac_word=$2
9684+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9685+$as_echo_n "checking for $ac_word... " >&6; }
9686+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
9687+ $as_echo_n "(cached) " >&6
9688+else
9689+ if test -n "$MANIFEST_TOOL"; then
9690+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
9691+else
9692+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9693+for as_dir in $PATH
9694+do
9695+ IFS=$as_save_IFS
9696+ test -z "$as_dir" && as_dir=.
9697+ for ac_exec_ext in '' $ac_executable_extensions; do
9698+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9699+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
9700+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9701+ break 2
9702+ fi
9703+done
9704+ done
9705+IFS=$as_save_IFS
9706+
9707+fi
9708+fi
9709+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
9710+if test -n "$MANIFEST_TOOL"; then
9711+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
9712+$as_echo "$MANIFEST_TOOL" >&6; }
9713+else
9714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9715+$as_echo "no" >&6; }
9716+fi
9717+
9718+
9719+fi
9720+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
9721+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
9722+ # Extract the first word of "mt", so it can be a program name with args.
9723+set dummy mt; ac_word=$2
9724+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9725+$as_echo_n "checking for $ac_word... " >&6; }
9726+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
9727+ $as_echo_n "(cached) " >&6
9728+else
9729+ if test -n "$ac_ct_MANIFEST_TOOL"; then
9730+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
9731+else
9732+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9733+for as_dir in $PATH
9734+do
9735+ IFS=$as_save_IFS
9736+ test -z "$as_dir" && as_dir=.
9737+ for ac_exec_ext in '' $ac_executable_extensions; do
9738+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9739+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
9740+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9741+ break 2
9742+ fi
9743+done
9744+ done
9745+IFS=$as_save_IFS
9746+
9747+fi
9748+fi
9749+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
9750+if test -n "$ac_ct_MANIFEST_TOOL"; then
9751+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
9752+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
9753+else
9754+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9755+$as_echo "no" >&6; }
9756+fi
9757+
9758+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
9759+ MANIFEST_TOOL=":"
9760+ else
9761+ case $cross_compiling:$ac_tool_warned in
9762+yes:)
9763+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9764+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9765+ac_tool_warned=yes ;;
9766+esac
9767+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
9768+ fi
9769+else
9770+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
9771+fi
9772+
9773+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
9774+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
9775+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
9776+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
9777+ $as_echo_n "(cached) " >&6
9778+else
9779+ lt_cv_path_mainfest_tool=no
9780+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
9781+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
9782+ cat conftest.err >&5
9783+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
9784+ lt_cv_path_mainfest_tool=yes
9785+ fi
9786+ rm -f conftest*
9787+fi
9788+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
9789+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
9790+if test "x$lt_cv_path_mainfest_tool" != xyes; then
9791+ MANIFEST_TOOL=:
9792+fi
9793+
9794+
9795+
9796+
9797+
9798
9799 case $host_os in
9800 rhapsody* | darwin*)
9801@@ -7622,6 +8119,8 @@ _LT_EOF
9802 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
9803 echo "$AR cru libconftest.a conftest.o" >&5
9804 $AR cru libconftest.a conftest.o 2>&5
9805+ echo "$RANLIB libconftest.a" >&5
9806+ $RANLIB libconftest.a 2>&5
9807 cat > conftest.c << _LT_EOF
9808 int main() { return 0;}
9809 _LT_EOF
9810@@ -7787,7 +8286,8 @@ fi
9811 LIBTOOL_DEPS="$ltmain"
9812
9813 # Always use our own libtool.
9814-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
9815+LIBTOOL='$(SHELL) $(top_builddir)'
9816+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
9817
9818
9819
9820@@ -7876,7 +8376,7 @@ aix3*)
9821 esac
9822
9823 # Global variables:
9824-ofile=libtool
9825+ofile=${host_alias}-libtool
9826 can_build_shared=yes
9827
9828 # All known linkers require a `.a' archive for static linking (except MSVC,
9829@@ -8174,8 +8674,6 @@ fi
9830 lt_prog_compiler_pic=
9831 lt_prog_compiler_static=
9832
9833-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9834-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9835
9836 if test "$GCC" = yes; then
9837 lt_prog_compiler_wl='-Wl,'
9838@@ -8340,6 +8838,12 @@ $as_echo_n "checking for $compiler optio
9839 lt_prog_compiler_pic='--shared'
9840 lt_prog_compiler_static='--static'
9841 ;;
9842+ nagfor*)
9843+ # NAG Fortran compiler
9844+ lt_prog_compiler_wl='-Wl,-Wl,,'
9845+ lt_prog_compiler_pic='-PIC'
9846+ lt_prog_compiler_static='-Bstatic'
9847+ ;;
9848 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
9849 # Portland Group compilers (*not* the Pentium gcc compiler,
9850 # which looks to be a dead project)
9851@@ -8402,7 +8906,7 @@ $as_echo_n "checking for $compiler optio
9852 lt_prog_compiler_pic='-KPIC'
9853 lt_prog_compiler_static='-Bstatic'
9854 case $cc_basename in
9855- f77* | f90* | f95*)
9856+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
9857 lt_prog_compiler_wl='-Qoption ld ';;
9858 *)
9859 lt_prog_compiler_wl='-Wl,';;
9860@@ -8459,13 +8963,17 @@ case $host_os in
9861 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
9862 ;;
9863 esac
9864-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
9865-$as_echo "$lt_prog_compiler_pic" >&6; }
9866-
9867-
9868-
9869-
9870
9871+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9872+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9873+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
9874+ $as_echo_n "(cached) " >&6
9875+else
9876+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
9877+fi
9878+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
9879+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
9880+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
9881
9882 #
9883 # Check to make sure the PIC flag actually works.
9884@@ -8526,6 +9034,11 @@ fi
9885
9886
9887
9888+
9889+
9890+
9891+
9892+
9893 #
9894 # Check to make sure the static flag actually works.
9895 #
9896@@ -8876,7 +9389,8 @@ _LT_EOF
9897 allow_undefined_flag=unsupported
9898 always_export_symbols=no
9899 enable_shared_with_static_runtimes=yes
9900- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
9901+ 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'
9902+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9903
9904 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9905 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9906@@ -8924,7 +9438,7 @@ _LT_EOF
9907 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
9908 && test "$tmp_diet" = no
9909 then
9910- tmp_addflag=
9911+ tmp_addflag=' $pic_flag'
9912 tmp_sharedflag='-shared'
9913 case $cc_basename,$host_cpu in
9914 pgcc*) # Portland Group C compiler
9915@@ -8975,12 +9489,12 @@ _LT_EOF
9916 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
9917 hardcode_libdir_flag_spec=
9918 hardcode_libdir_flag_spec_ld='-rpath $libdir'
9919- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
9920+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
9921 if test "x$supports_anon_versioning" = xyes; then
9922 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
9923 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
9924 echo "local: *; };" >> $output_objdir/$libname.ver~
9925- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9926+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9927 fi
9928 ;;
9929 esac
9930@@ -8994,8 +9508,8 @@ _LT_EOF
9931 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9932 wlarc=
9933 else
9934- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9935- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9936+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9937+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9938 fi
9939 ;;
9940
9941@@ -9013,8 +9527,8 @@ _LT_EOF
9942
9943 _LT_EOF
9944 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
9945- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9946- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9947+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9948+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9949 else
9950 ld_shlibs=no
9951 fi
9952@@ -9060,8 +9574,8 @@ _LT_EOF
9953
9954 *)
9955 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
9956- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9957- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9958+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9959+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9960 else
9961 ld_shlibs=no
9962 fi
9963@@ -9191,7 +9705,13 @@ _LT_EOF
9964 allow_undefined_flag='-berok'
9965 # Determine the default libpath from the value encoded in an
9966 # empty executable.
9967- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9968+ if test "${lt_cv_aix_libpath+set}" = set; then
9969+ aix_libpath=$lt_cv_aix_libpath
9970+else
9971+ if test "${lt_cv_aix_libpath_+set}" = set; then :
9972+ $as_echo_n "(cached) " >&6
9973+else
9974+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9975 /* end confdefs.h. */
9976
9977 int
9978@@ -9204,22 +9724,29 @@ main ()
9979 _ACEOF
9980 if ac_fn_c_try_link "$LINENO"; then :
9981
9982-lt_aix_libpath_sed='
9983- /Import File Strings/,/^$/ {
9984- /^0/ {
9985- s/^0 *\(.*\)$/\1/
9986- p
9987- }
9988- }'
9989-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9990-# Check for a 64-bit object if we didn't find anything.
9991-if test -z "$aix_libpath"; then
9992- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9993-fi
9994+ lt_aix_libpath_sed='
9995+ /Import File Strings/,/^$/ {
9996+ /^0/ {
9997+ s/^0 *\([^ ]*\) *$/\1/
9998+ p
9999+ }
10000+ }'
10001+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10002+ # Check for a 64-bit object if we didn't find anything.
10003+ if test -z "$lt_cv_aix_libpath_"; then
10004+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10005+ fi
10006 fi
10007 rm -f core conftest.err conftest.$ac_objext \
10008 conftest$ac_exeext conftest.$ac_ext
10009-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10010+ if test -z "$lt_cv_aix_libpath_"; then
10011+ lt_cv_aix_libpath_="/usr/lib:/lib"
10012+ fi
10013+
10014+fi
10015+
10016+ aix_libpath=$lt_cv_aix_libpath_
10017+fi
10018
10019 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10020 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"
10021@@ -9231,7 +9758,13 @@ if test -z "$aix_libpath"; then aix_libp
10022 else
10023 # Determine the default libpath from the value encoded in an
10024 # empty executable.
10025- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10026+ if test "${lt_cv_aix_libpath+set}" = set; then
10027+ aix_libpath=$lt_cv_aix_libpath
10028+else
10029+ if test "${lt_cv_aix_libpath_+set}" = set; then :
10030+ $as_echo_n "(cached) " >&6
10031+else
10032+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10033 /* end confdefs.h. */
10034
10035 int
10036@@ -9244,22 +9777,29 @@ main ()
10037 _ACEOF
10038 if ac_fn_c_try_link "$LINENO"; then :
10039
10040-lt_aix_libpath_sed='
10041- /Import File Strings/,/^$/ {
10042- /^0/ {
10043- s/^0 *\(.*\)$/\1/
10044- p
10045- }
10046- }'
10047-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10048-# Check for a 64-bit object if we didn't find anything.
10049-if test -z "$aix_libpath"; then
10050- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10051-fi
10052+ lt_aix_libpath_sed='
10053+ /Import File Strings/,/^$/ {
10054+ /^0/ {
10055+ s/^0 *\([^ ]*\) *$/\1/
10056+ p
10057+ }
10058+ }'
10059+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10060+ # Check for a 64-bit object if we didn't find anything.
10061+ if test -z "$lt_cv_aix_libpath_"; then
10062+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10063+ fi
10064 fi
10065 rm -f core conftest.err conftest.$ac_objext \
10066 conftest$ac_exeext conftest.$ac_ext
10067-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10068+ if test -z "$lt_cv_aix_libpath_"; then
10069+ lt_cv_aix_libpath_="/usr/lib:/lib"
10070+ fi
10071+
10072+fi
10073+
10074+ aix_libpath=$lt_cv_aix_libpath_
10075+fi
10076
10077 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10078 # Warning - without using the other run time loading flags,
10079@@ -9304,20 +9844,63 @@ if test -z "$aix_libpath"; then aix_libp
10080 # Microsoft Visual C++.
10081 # hardcode_libdir_flag_spec is actually meaningless, as there is
10082 # no search path for DLLs.
10083- hardcode_libdir_flag_spec=' '
10084- allow_undefined_flag=unsupported
10085- # Tell ltmain to make .lib files, not .a files.
10086- libext=lib
10087- # Tell ltmain to make .dll files, not .so files.
10088- shrext_cmds=".dll"
10089- # FIXME: Setting linknames here is a bad hack.
10090- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10091- # The linker will automatically build a .lib file if we build a DLL.
10092- old_archive_from_new_cmds='true'
10093- # FIXME: Should let the user specify the lib program.
10094- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10095- fix_srcfile_path='`cygpath -w "$srcfile"`'
10096- enable_shared_with_static_runtimes=yes
10097+ case $cc_basename in
10098+ cl*)
10099+ # Native MSVC
10100+ hardcode_libdir_flag_spec=' '
10101+ allow_undefined_flag=unsupported
10102+ always_export_symbols=yes
10103+ file_list_spec='@'
10104+ # Tell ltmain to make .lib files, not .a files.
10105+ libext=lib
10106+ # Tell ltmain to make .dll files, not .so files.
10107+ shrext_cmds=".dll"
10108+ # FIXME: Setting linknames here is a bad hack.
10109+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
10110+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
10111+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
10112+ else
10113+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
10114+ fi~
10115+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
10116+ linknames='
10117+ # The linker will not automatically build a static lib if we build a DLL.
10118+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
10119+ enable_shared_with_static_runtimes=yes
10120+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
10121+ # Don't use ranlib
10122+ old_postinstall_cmds='chmod 644 $oldlib'
10123+ postlink_cmds='lt_outputfile="@OUTPUT@"~
10124+ lt_tool_outputfile="@TOOL_OUTPUT@"~
10125+ case $lt_outputfile in
10126+ *.exe|*.EXE) ;;
10127+ *)
10128+ lt_outputfile="$lt_outputfile.exe"
10129+ lt_tool_outputfile="$lt_tool_outputfile.exe"
10130+ ;;
10131+ esac~
10132+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
10133+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
10134+ $RM "$lt_outputfile.manifest";
10135+ fi'
10136+ ;;
10137+ *)
10138+ # Assume MSVC wrapper
10139+ hardcode_libdir_flag_spec=' '
10140+ allow_undefined_flag=unsupported
10141+ # Tell ltmain to make .lib files, not .a files.
10142+ libext=lib
10143+ # Tell ltmain to make .dll files, not .so files.
10144+ shrext_cmds=".dll"
10145+ # FIXME: Setting linknames here is a bad hack.
10146+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10147+ # The linker will automatically build a .lib file if we build a DLL.
10148+ old_archive_from_new_cmds='true'
10149+ # FIXME: Should let the user specify the lib program.
10150+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10151+ enable_shared_with_static_runtimes=yes
10152+ ;;
10153+ esac
10154 ;;
10155
10156 darwin* | rhapsody*)
10157@@ -9382,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libp
10158
10159 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
10160 freebsd* | dragonfly*)
10161- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
10162+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10163 hardcode_libdir_flag_spec='-R$libdir'
10164 hardcode_direct=yes
10165 hardcode_shlibpath_var=no
10166@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libp
10167
10168 hpux9*)
10169 if test "$GCC" = yes; then
10170- 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'
10171+ 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'
10172 else
10173 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'
10174 fi
10175@@ -9406,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libp
10176
10177 hpux10*)
10178 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
10179- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10180+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10181 else
10182 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10183 fi
10184@@ -9430,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libp
10185 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10186 ;;
10187 ia64*)
10188- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10189+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10190 ;;
10191 *)
10192- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10193+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10194 ;;
10195 esac
10196 else
10197@@ -9512,23 +10095,36 @@ fi
10198
10199 irix5* | irix6* | nonstopux*)
10200 if test "$GCC" = yes; then
10201- 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'
10202+ 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'
10203 # Try to use the -exported_symbol ld option, if it does not
10204 # work, assume that -exports_file does not work either and
10205 # implicitly export all symbols.
10206- save_LDFLAGS="$LDFLAGS"
10207- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10208- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10209+ # This should be the same for all languages, so no per-tag cache variable.
10210+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
10211+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
10212+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
10213+ $as_echo_n "(cached) " >&6
10214+else
10215+ save_LDFLAGS="$LDFLAGS"
10216+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10217+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10218 /* end confdefs.h. */
10219-int foo(void) {}
10220+int foo (void) { return 0; }
10221 _ACEOF
10222 if ac_fn_c_try_link "$LINENO"; then :
10223- 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'
10224-
10225+ lt_cv_irix_exported_symbol=yes
10226+else
10227+ lt_cv_irix_exported_symbol=no
10228 fi
10229 rm -f core conftest.err conftest.$ac_objext \
10230 conftest$ac_exeext conftest.$ac_ext
10231- LDFLAGS="$save_LDFLAGS"
10232+ LDFLAGS="$save_LDFLAGS"
10233+fi
10234+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
10235+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
10236+ if test "$lt_cv_irix_exported_symbol" = yes; then
10237+ 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'
10238+ fi
10239 else
10240 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'
10241 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'
10242@@ -9613,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_obj
10243 osf4* | osf5*) # as osf3* with the addition of -msym flag
10244 if test "$GCC" = yes; then
10245 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
10246- 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'
10247+ 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'
10248 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10249 else
10250 allow_undefined_flag=' -expect_unresolved \*'
10251@@ -9632,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_obj
10252 no_undefined_flag=' -z defs'
10253 if test "$GCC" = yes; then
10254 wlarc='${wl}'
10255- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10256+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10257 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
10258- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
10259+ $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'
10260 else
10261 case `$CC -V 2>&1` in
10262 *"Compilers 5.0"*)
10263@@ -10210,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10264 need_version=no
10265 need_lib_prefix=no
10266
10267- case $GCC,$host_os in
10268- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10269+ case $GCC,$cc_basename in
10270+ yes,*)
10271+ # gcc
10272 library_names_spec='$libname.dll.a'
10273 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10274 postinstall_cmds='base_file=`basename \${file}`~
10275@@ -10244,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
10276 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10277 ;;
10278 esac
10279+ dynamic_linker='Win32 ld.exe'
10280+ ;;
10281+
10282+ *,cl*)
10283+ # Native MSVC
10284+ libname_spec='$name'
10285+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10286+ library_names_spec='${libname}.dll.lib'
10287+
10288+ case $build_os in
10289+ mingw*)
10290+ sys_lib_search_path_spec=
10291+ lt_save_ifs=$IFS
10292+ IFS=';'
10293+ for lt_path in $LIB
10294+ do
10295+ IFS=$lt_save_ifs
10296+ # Let DOS variable expansion print the short 8.3 style file name.
10297+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10298+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10299+ done
10300+ IFS=$lt_save_ifs
10301+ # Convert to MSYS style.
10302+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
10303+ ;;
10304+ cygwin*)
10305+ # Convert to unix form, then to dos form, then back to unix form
10306+ # but this time dos style (no spaces!) so that the unix form looks
10307+ # like /cygdrive/c/PROGRA~1:/cygdr...
10308+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10309+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10310+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10311+ ;;
10312+ *)
10313+ sys_lib_search_path_spec="$LIB"
10314+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
10315+ # It is most probably a Windows format PATH.
10316+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10317+ else
10318+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10319+ fi
10320+ # FIXME: find the short name or the path components, as spaces are
10321+ # common. (e.g. "Program Files" -> "PROGRA~1")
10322+ ;;
10323+ esac
10324+
10325+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10326+ postinstall_cmds='base_file=`basename \${file}`~
10327+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10328+ dldir=$destdir/`dirname \$dlpath`~
10329+ test -d \$dldir || mkdir -p \$dldir~
10330+ $install_prog $dir/$dlname \$dldir/$dlname'
10331+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10332+ dlpath=$dir/\$dldll~
10333+ $RM \$dlpath'
10334+ shlibpath_overrides_runpath=yes
10335+ dynamic_linker='Win32 link.exe'
10336 ;;
10337
10338 *)
10339+ # Assume MSVC wrapper
10340 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
10341+ dynamic_linker='Win32 ld.exe'
10342 ;;
10343 esac
10344- dynamic_linker='Win32 ld.exe'
10345 # FIXME: first we should search . and the directory the executable is in
10346 shlibpath_var=PATH
10347 ;;
10348@@ -10346,7 +11001,7 @@ haiku*)
10349 soname_spec='${libname}${release}${shared_ext}$major'
10350 shlibpath_var=LIBRARY_PATH
10351 shlibpath_overrides_runpath=yes
10352- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10353+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10354 hardcode_into_libs=yes
10355 ;;
10356
10357@@ -11142,7 +11797,7 @@ else
10358 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10359 lt_status=$lt_dlunknown
10360 cat > conftest.$ac_ext <<_LT_EOF
10361-#line 11145 "configure"
10362+#line $LINENO "configure"
10363 #include "confdefs.h"
10364
10365 #if HAVE_DLFCN_H
10366@@ -11186,10 +11841,10 @@ else
10367 /* When -fvisbility=hidden is used, assume the code has been annotated
10368 correspondingly for the symbols needed. */
10369 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10370-void fnord () __attribute__((visibility("default")));
10371+int fnord () __attribute__((visibility("default")));
10372 #endif
10373
10374-void fnord () { int i=42; }
10375+int fnord () { return 42; }
10376 int main ()
10377 {
10378 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10379@@ -11248,7 +11903,7 @@ else
10380 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10381 lt_status=$lt_dlunknown
10382 cat > conftest.$ac_ext <<_LT_EOF
10383-#line 11251 "configure"
10384+#line $LINENO "configure"
10385 #include "confdefs.h"
10386
10387 #if HAVE_DLFCN_H
10388@@ -11292,10 +11947,10 @@ else
10389 /* When -fvisbility=hidden is used, assume the code has been annotated
10390 correspondingly for the symbols needed. */
10391 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10392-void fnord () __attribute__((visibility("default")));
10393+int fnord () __attribute__((visibility("default")));
10394 #endif
10395
10396-void fnord () { int i=42; }
10397+int fnord () { return 42; }
10398 int main ()
10399 {
10400 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10401@@ -13289,13 +13944,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
10402 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
10403 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
10404 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
10405+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
10406+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
10407 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
10408 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
10409 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
10410 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
10411 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
10412+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
10413+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
10414+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
10415+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
10416 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
10417 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
10418+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
10419 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
10420 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
10421 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
10422@@ -13310,14 +13972,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
10423 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
10424 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
10425 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"`'
10426+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
10427+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
10428 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
10429 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
10430 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
10431-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10432 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
10433+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10434 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
10435 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
10436 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
10437+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
10438 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
10439 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
10440 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
10441@@ -13350,12 +14015,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
10442 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
10443 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
10444 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
10445-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
10446 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
10447 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
10448 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
10449 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
10450 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
10451+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
10452 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
10453 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
10454 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
10455@@ -13410,8 +14075,13 @@ reload_flag \
10456 OBJDUMP \
10457 deplibs_check_method \
10458 file_magic_cmd \
10459+file_magic_glob \
10460+want_nocaseglob \
10461+DLLTOOL \
10462+sharedlib_from_linklib_cmd \
10463 AR \
10464 AR_FLAGS \
10465+archiver_list_spec \
10466 STRIP \
10467 RANLIB \
10468 CC \
10469@@ -13421,12 +14091,14 @@ lt_cv_sys_global_symbol_pipe \
10470 lt_cv_sys_global_symbol_to_cdecl \
10471 lt_cv_sys_global_symbol_to_c_name_address \
10472 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
10473+nm_file_list_spec \
10474 lt_prog_compiler_no_builtin_flag \
10475-lt_prog_compiler_wl \
10476 lt_prog_compiler_pic \
10477+lt_prog_compiler_wl \
10478 lt_prog_compiler_static \
10479 lt_cv_prog_compiler_c_o \
10480 need_locks \
10481+MANIFEST_TOOL \
10482 DSYMUTIL \
10483 NMEDIT \
10484 LIPO \
10485@@ -13442,7 +14114,6 @@ no_undefined_flag \
10486 hardcode_libdir_flag_spec \
10487 hardcode_libdir_flag_spec_ld \
10488 hardcode_libdir_separator \
10489-fix_srcfile_path \
10490 exclude_expsyms \
10491 include_expsyms \
10492 file_list_spec \
10493@@ -13478,6 +14149,7 @@ module_cmds \
10494 module_expsym_cmds \
10495 export_symbols_cmds \
10496 prelink_cmds \
10497+postlink_cmds \
10498 postinstall_cmds \
10499 postuninstall_cmds \
10500 finish_cmds \
10501@@ -14234,7 +14906,8 @@ $as_echo X"$file" |
10502 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
10503 #
10504 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10505-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10506+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10507+# Inc.
10508 # Written by Gordon Matzigkeit, 1996
10509 #
10510 # This file is part of GNU Libtool.
10511@@ -14337,19 +15010,42 @@ SP2NL=$lt_lt_SP2NL
10512 # turn newlines into spaces.
10513 NL2SP=$lt_lt_NL2SP
10514
10515+# convert \$build file names to \$host format.
10516+to_host_file_cmd=$lt_cv_to_host_file_cmd
10517+
10518+# convert \$build files to toolchain format.
10519+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10520+
10521 # An object symbol dumper.
10522 OBJDUMP=$lt_OBJDUMP
10523
10524 # Method to check whether dependent libraries are shared objects.
10525 deplibs_check_method=$lt_deplibs_check_method
10526
10527-# Command to use when deplibs_check_method == "file_magic".
10528+# Command to use when deplibs_check_method = "file_magic".
10529 file_magic_cmd=$lt_file_magic_cmd
10530
10531+# How to find potential files when deplibs_check_method = "file_magic".
10532+file_magic_glob=$lt_file_magic_glob
10533+
10534+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
10535+want_nocaseglob=$lt_want_nocaseglob
10536+
10537+# DLL creation program.
10538+DLLTOOL=$lt_DLLTOOL
10539+
10540+# Command to associate shared and link libraries.
10541+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
10542+
10543 # The archiver.
10544 AR=$lt_AR
10545+
10546+# Flags to create an archive.
10547 AR_FLAGS=$lt_AR_FLAGS
10548
10549+# How to feed a file listing to the archiver.
10550+archiver_list_spec=$lt_archiver_list_spec
10551+
10552 # A symbol stripping program.
10553 STRIP=$lt_STRIP
10554
10555@@ -14379,6 +15075,12 @@ global_symbol_to_c_name_address=$lt_lt_c
10556 # Transform the output of nm in a C name address pair when lib prefix is needed.
10557 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
10558
10559+# Specify filename containing input files for \$NM.
10560+nm_file_list_spec=$lt_nm_file_list_spec
10561+
10562+# The root where to search for dependent libraries,and in which our libraries should be installed.
10563+lt_sysroot=$lt_sysroot
10564+
10565 # The name of the directory that contains temporary libtool files.
10566 objdir=$objdir
10567
10568@@ -14388,6 +15090,9 @@ MAGIC_CMD=$MAGIC_CMD
10569 # Must we lock files when doing compilation?
10570 need_locks=$lt_need_locks
10571
10572+# Manifest tool.
10573+MANIFEST_TOOL=$lt_MANIFEST_TOOL
10574+
10575 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10576 DSYMUTIL=$lt_DSYMUTIL
10577
10578@@ -14502,12 +15207,12 @@ with_gcc=$GCC
10579 # Compiler flag to turn off builtin functions.
10580 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10581
10582-# How to pass a linker flag through the compiler.
10583-wl=$lt_lt_prog_compiler_wl
10584-
10585 # Additional compiler flags for building library objects.
10586 pic_flag=$lt_lt_prog_compiler_pic
10587
10588+# How to pass a linker flag through the compiler.
10589+wl=$lt_lt_prog_compiler_wl
10590+
10591 # Compiler flag to prevent dynamic linking.
10592 link_static_flag=$lt_lt_prog_compiler_static
10593
10594@@ -14594,9 +15299,6 @@ inherit_rpath=$inherit_rpath
10595 # Whether libtool must link a program against all its dependency libraries.
10596 link_all_deplibs=$link_all_deplibs
10597
10598-# Fix the shell variable \$srcfile for the compiler.
10599-fix_srcfile_path=$lt_fix_srcfile_path
10600-
10601 # Set to "yes" if exported symbols are required.
10602 always_export_symbols=$always_export_symbols
10603
10604@@ -14612,6 +15314,9 @@ include_expsyms=$lt_include_expsyms
10605 # Commands necessary for linking programs (against libraries) with templates.
10606 prelink_cmds=$lt_prelink_cmds
10607
10608+# Commands necessary for finishing linking programs.
10609+postlink_cmds=$lt_postlink_cmds
10610+
10611 # Specify filename containing input files.
10612 file_list_spec=$lt_file_list_spec
10613
10614@@ -14644,210 +15349,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10615 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10616 # text mode, it properly converts lines to CR/LF. This bash problem
10617 # is reportedly fixed, but why not run on old versions too?
10618- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10619- || (rm -f "$cfgfile"; exit 1)
10620-
10621- case $xsi_shell in
10622- yes)
10623- cat << \_LT_EOF >> "$cfgfile"
10624-
10625-# func_dirname file append nondir_replacement
10626-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10627-# otherwise set result to NONDIR_REPLACEMENT.
10628-func_dirname ()
10629-{
10630- case ${1} in
10631- */*) func_dirname_result="${1%/*}${2}" ;;
10632- * ) func_dirname_result="${3}" ;;
10633- esac
10634-}
10635-
10636-# func_basename file
10637-func_basename ()
10638-{
10639- func_basename_result="${1##*/}"
10640-}
10641-
10642-# func_dirname_and_basename file append nondir_replacement
10643-# perform func_basename and func_dirname in a single function
10644-# call:
10645-# dirname: Compute the dirname of FILE. If nonempty,
10646-# add APPEND to the result, otherwise set result
10647-# to NONDIR_REPLACEMENT.
10648-# value returned in "$func_dirname_result"
10649-# basename: Compute filename of FILE.
10650-# value retuned in "$func_basename_result"
10651-# Implementation must be kept synchronized with func_dirname
10652-# and func_basename. For efficiency, we do not delegate to
10653-# those functions but instead duplicate the functionality here.
10654-func_dirname_and_basename ()
10655-{
10656- case ${1} in
10657- */*) func_dirname_result="${1%/*}${2}" ;;
10658- * ) func_dirname_result="${3}" ;;
10659- esac
10660- func_basename_result="${1##*/}"
10661-}
10662-
10663-# func_stripname prefix suffix name
10664-# strip PREFIX and SUFFIX off of NAME.
10665-# PREFIX and SUFFIX must not contain globbing or regex special
10666-# characters, hashes, percent signs, but SUFFIX may contain a leading
10667-# dot (in which case that matches only a dot).
10668-func_stripname ()
10669-{
10670- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
10671- # positional parameters, so assign one to ordinary parameter first.
10672- func_stripname_result=${3}
10673- func_stripname_result=${func_stripname_result#"${1}"}
10674- func_stripname_result=${func_stripname_result%"${2}"}
10675-}
10676-
10677-# func_opt_split
10678-func_opt_split ()
10679-{
10680- func_opt_split_opt=${1%%=*}
10681- func_opt_split_arg=${1#*=}
10682-}
10683-
10684-# func_lo2o object
10685-func_lo2o ()
10686-{
10687- case ${1} in
10688- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
10689- *) func_lo2o_result=${1} ;;
10690- esac
10691-}
10692-
10693-# func_xform libobj-or-source
10694-func_xform ()
10695-{
10696- func_xform_result=${1%.*}.lo
10697-}
10698-
10699-# func_arith arithmetic-term...
10700-func_arith ()
10701-{
10702- func_arith_result=$(( $* ))
10703-}
10704-
10705-# func_len string
10706-# STRING may not start with a hyphen.
10707-func_len ()
10708-{
10709- func_len_result=${#1}
10710-}
10711-
10712-_LT_EOF
10713- ;;
10714- *) # Bourne compatible functions.
10715- cat << \_LT_EOF >> "$cfgfile"
10716-
10717-# func_dirname file append nondir_replacement
10718-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10719-# otherwise set result to NONDIR_REPLACEMENT.
10720-func_dirname ()
10721-{
10722- # Extract subdirectory from the argument.
10723- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10724- if test "X$func_dirname_result" = "X${1}"; then
10725- func_dirname_result="${3}"
10726- else
10727- func_dirname_result="$func_dirname_result${2}"
10728- fi
10729-}
10730-
10731-# func_basename file
10732-func_basename ()
10733-{
10734- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10735-}
10736-
10737-
10738-# func_stripname prefix suffix name
10739-# strip PREFIX and SUFFIX off of NAME.
10740-# PREFIX and SUFFIX must not contain globbing or regex special
10741-# characters, hashes, percent signs, but SUFFIX may contain a leading
10742-# dot (in which case that matches only a dot).
10743-# func_strip_suffix prefix name
10744-func_stripname ()
10745-{
10746- case ${2} in
10747- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10748- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10749- esac
10750-}
10751-
10752-# sed scripts:
10753-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10754-my_sed_long_arg='1s/^-[^=]*=//'
10755-
10756-# func_opt_split
10757-func_opt_split ()
10758-{
10759- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10760- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10761-}
10762-
10763-# func_lo2o object
10764-func_lo2o ()
10765-{
10766- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10767-}
10768-
10769-# func_xform libobj-or-source
10770-func_xform ()
10771-{
10772- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10773-}
10774-
10775-# func_arith arithmetic-term...
10776-func_arith ()
10777-{
10778- func_arith_result=`expr "$@"`
10779-}
10780-
10781-# func_len string
10782-# STRING may not start with a hyphen.
10783-func_len ()
10784-{
10785- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10786-}
10787-
10788-_LT_EOF
10789-esac
10790-
10791-case $lt_shell_append in
10792- yes)
10793- cat << \_LT_EOF >> "$cfgfile"
10794-
10795-# func_append var value
10796-# Append VALUE to the end of shell variable VAR.
10797-func_append ()
10798-{
10799- eval "$1+=\$2"
10800-}
10801-_LT_EOF
10802- ;;
10803- *)
10804- cat << \_LT_EOF >> "$cfgfile"
10805-
10806-# func_append var value
10807-# Append VALUE to the end of shell variable VAR.
10808-func_append ()
10809-{
10810- eval "$1=\$$1\$2"
10811-}
10812-
10813-_LT_EOF
10814- ;;
10815- esac
10816+ sed '$q' "$ltmain" >> "$cfgfile" \
10817+ || (rm -f "$cfgfile"; exit 1)
10818
10819+ if test x"$xsi_shell" = xyes; then
10820+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10821+func_dirname ()\
10822+{\
10823+\ case ${1} in\
10824+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10825+\ * ) func_dirname_result="${3}" ;;\
10826+\ esac\
10827+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10828+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10829+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10830+test 0 -eq $? || _lt_function_replace_fail=:
10831+
10832+
10833+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10834+func_basename ()\
10835+{\
10836+\ func_basename_result="${1##*/}"\
10837+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10838+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10839+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10840+test 0 -eq $? || _lt_function_replace_fail=:
10841+
10842+
10843+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10844+func_dirname_and_basename ()\
10845+{\
10846+\ case ${1} in\
10847+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10848+\ * ) func_dirname_result="${3}" ;;\
10849+\ esac\
10850+\ func_basename_result="${1##*/}"\
10851+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10852+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10853+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10854+test 0 -eq $? || _lt_function_replace_fail=:
10855+
10856+
10857+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10858+func_stripname ()\
10859+{\
10860+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10861+\ # positional parameters, so assign one to ordinary parameter first.\
10862+\ func_stripname_result=${3}\
10863+\ func_stripname_result=${func_stripname_result#"${1}"}\
10864+\ func_stripname_result=${func_stripname_result%"${2}"}\
10865+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10866+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10867+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10868+test 0 -eq $? || _lt_function_replace_fail=:
10869+
10870+
10871+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10872+func_split_long_opt ()\
10873+{\
10874+\ func_split_long_opt_name=${1%%=*}\
10875+\ func_split_long_opt_arg=${1#*=}\
10876+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10877+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10878+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10879+test 0 -eq $? || _lt_function_replace_fail=:
10880+
10881+
10882+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10883+func_split_short_opt ()\
10884+{\
10885+\ func_split_short_opt_arg=${1#??}\
10886+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10887+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10888+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10889+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10890+test 0 -eq $? || _lt_function_replace_fail=:
10891+
10892+
10893+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10894+func_lo2o ()\
10895+{\
10896+\ case ${1} in\
10897+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10898+\ *) func_lo2o_result=${1} ;;\
10899+\ esac\
10900+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10901+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10902+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10903+test 0 -eq $? || _lt_function_replace_fail=:
10904+
10905+
10906+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10907+func_xform ()\
10908+{\
10909+ func_xform_result=${1%.*}.lo\
10910+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10911+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10912+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10913+test 0 -eq $? || _lt_function_replace_fail=:
10914+
10915+
10916+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10917+func_arith ()\
10918+{\
10919+ func_arith_result=$(( $* ))\
10920+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10921+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10922+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10923+test 0 -eq $? || _lt_function_replace_fail=:
10924+
10925+
10926+ sed -e '/^func_len ()$/,/^} # func_len /c\
10927+func_len ()\
10928+{\
10929+ func_len_result=${#1}\
10930+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10931+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10932+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10933+test 0 -eq $? || _lt_function_replace_fail=:
10934+
10935+fi
10936+
10937+if test x"$lt_shell_append" = xyes; then
10938+ sed -e '/^func_append ()$/,/^} # func_append /c\
10939+func_append ()\
10940+{\
10941+ eval "${1}+=\\${2}"\
10942+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10943+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10944+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10945+test 0 -eq $? || _lt_function_replace_fail=:
10946+
10947+
10948+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10949+func_append_quoted ()\
10950+{\
10951+\ func_quote_for_eval "${2}"\
10952+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10953+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10954+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10955+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10956+test 0 -eq $? || _lt_function_replace_fail=:
10957+
10958+
10959+ # Save a `func_append' function call where possible by direct use of '+='
10960+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10961+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10962+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10963+ test 0 -eq $? || _lt_function_replace_fail=:
10964+else
10965+ # Save a `func_append' function call even when '+=' is not available
10966+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10967+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10968+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10969+ test 0 -eq $? || _lt_function_replace_fail=:
10970+fi
10971+
10972+if test x"$_lt_function_replace_fail" = x":"; then
10973+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10974+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10975+fi
10976
10977- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10978- || (rm -f "$cfgfile"; exit 1)
10979
10980- mv -f "$cfgfile" "$ofile" ||
10981+ mv -f "$cfgfile" "$ofile" ||
10982 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10983 chmod +x "$ofile"
10984
10985Index: binutils-2.21/binutils/configure
10986===================================================================
10987--- binutils-2.21.orig/binutils/configure
10988+++ binutils-2.21/binutils/configure
10989@@ -654,8 +654,11 @@ OTOOL
10990 LIPO
10991 NMEDIT
10992 DSYMUTIL
10993+MANIFEST_TOOL
10994 RANLIB
10995+ac_ct_AR
10996 AR
10997+DLLTOOL
10998 OBJDUMP
10999 LN_S
11000 NM
11001@@ -768,6 +771,7 @@ enable_static
11002 with_pic
11003 enable_fast_install
11004 with_gnu_ld
11005+with_libtool_sysroot
11006 enable_libtool_lock
11007 enable_targets
11008 enable_werror
11009@@ -1429,6 +1433,8 @@ Optional Packages:
11010 --with-pic try to use only PIC/non-PIC objects [default=use
11011 both]
11012 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
11013+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
11014+ (or the compiler's sysroot if not specified).
11015 --with-gnu-ld assume the C compiler uses GNU ld default=no
11016 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
11017 --without-libiconv-prefix don't search for libiconv in includedir and libdir
11018@@ -5146,8 +5152,8 @@ esac
11019
11020
11021
11022-macro_version='2.2.7a'
11023-macro_revision='1.3134'
11024+macro_version='2.4'
11025+macro_revision='1.3293'
11026
11027
11028
11029@@ -5187,7 +5193,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
11030 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
11031 $as_echo_n "checking how to print strings... " >&6; }
11032 # Test print first, because it will be a builtin if present.
11033-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
11034+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
11035 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
11036 ECHO='print -r --'
11037 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
11038@@ -5873,8 +5879,8 @@ $as_echo_n "checking whether the shell u
11039 # Try some XSI features
11040 xsi_shell=no
11041 ( _lt_dummy="a/b/c"
11042- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11043- = c,a/b,, \
11044+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11045+ = c,a/b,b/c, \
11046 && eval 'test $(( 1 + 1 )) -eq 2 \
11047 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11048 && xsi_shell=yes
11049@@ -5923,6 +5929,80 @@ esac
11050
11051
11052
11053+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
11054+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
11055+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
11056+ $as_echo_n "(cached) " >&6
11057+else
11058+ case $host in
11059+ *-*-mingw* )
11060+ case $build in
11061+ *-*-mingw* ) # actually msys
11062+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11063+ ;;
11064+ *-*-cygwin* )
11065+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11066+ ;;
11067+ * ) # otherwise, assume *nix
11068+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11069+ ;;
11070+ esac
11071+ ;;
11072+ *-*-cygwin* )
11073+ case $build in
11074+ *-*-mingw* ) # actually msys
11075+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
11076+ ;;
11077+ *-*-cygwin* )
11078+ lt_cv_to_host_file_cmd=func_convert_file_noop
11079+ ;;
11080+ * ) # otherwise, assume *nix
11081+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
11082+ ;;
11083+ esac
11084+ ;;
11085+ * ) # unhandled hosts (and "normal" native builds)
11086+ lt_cv_to_host_file_cmd=func_convert_file_noop
11087+ ;;
11088+esac
11089+
11090+fi
11091+
11092+to_host_file_cmd=$lt_cv_to_host_file_cmd
11093+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
11094+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
11095+
11096+
11097+
11098+
11099+
11100+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
11101+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
11102+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
11103+ $as_echo_n "(cached) " >&6
11104+else
11105+ #assume ordinary cross tools, or native build.
11106+lt_cv_to_tool_file_cmd=func_convert_file_noop
11107+case $host in
11108+ *-*-mingw* )
11109+ case $build in
11110+ *-*-mingw* ) # actually msys
11111+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
11112+ ;;
11113+ esac
11114+ ;;
11115+esac
11116+
11117+fi
11118+
11119+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
11120+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
11121+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
11122+
11123+
11124+
11125+
11126+
11127 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
11128 $as_echo_n "checking for $LD option to reload object files... " >&6; }
11129 if test "${lt_cv_ld_reload_flag+set}" = set; then :
11130@@ -5939,6 +6019,11 @@ case $reload_flag in
11131 esac
11132 reload_cmds='$LD$reload_flag -o $output$reload_objs'
11133 case $host_os in
11134+ cygwin* | mingw* | pw32* | cegcc*)
11135+ if test "$GCC" != yes; then
11136+ reload_cmds=false
11137+ fi
11138+ ;;
11139 darwin*)
11140 if test "$GCC" = yes; then
11141 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
11142@@ -6107,7 +6192,8 @@ mingw* | pw32*)
11143 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
11144 lt_cv_file_magic_cmd='func_win32_libid'
11145 else
11146- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
11147+ # Keep this pattern in sync with the one in func_win32_libid.
11148+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
11149 lt_cv_file_magic_cmd='$OBJDUMP -f'
11150 fi
11151 ;;
11152@@ -6261,6 +6347,21 @@ esac
11153 fi
11154 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
11155 $as_echo "$lt_cv_deplibs_check_method" >&6; }
11156+
11157+file_magic_glob=
11158+want_nocaseglob=no
11159+if test "$build" = "$host"; then
11160+ case $host_os in
11161+ mingw* | pw32*)
11162+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
11163+ want_nocaseglob=yes
11164+ else
11165+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
11166+ fi
11167+ ;;
11168+ esac
11169+fi
11170+
11171 file_magic_cmd=$lt_cv_file_magic_cmd
11172 deplibs_check_method=$lt_cv_deplibs_check_method
11173 test -z "$deplibs_check_method" && deplibs_check_method=unknown
11174@@ -6276,9 +6377,162 @@ test -z "$deplibs_check_method" && depli
11175
11176
11177
11178+
11179+
11180+
11181+
11182+
11183+
11184+
11185+
11186+
11187+
11188 if test -n "$ac_tool_prefix"; then
11189- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
11190-set dummy ${ac_tool_prefix}ar; ac_word=$2
11191+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
11192+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
11193+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11194+$as_echo_n "checking for $ac_word... " >&6; }
11195+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
11196+ $as_echo_n "(cached) " >&6
11197+else
11198+ if test -n "$DLLTOOL"; then
11199+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
11200+else
11201+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11202+for as_dir in $PATH
11203+do
11204+ IFS=$as_save_IFS
11205+ test -z "$as_dir" && as_dir=.
11206+ for ac_exec_ext in '' $ac_executable_extensions; do
11207+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11208+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
11209+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11210+ break 2
11211+ fi
11212+done
11213+ done
11214+IFS=$as_save_IFS
11215+
11216+fi
11217+fi
11218+DLLTOOL=$ac_cv_prog_DLLTOOL
11219+if test -n "$DLLTOOL"; then
11220+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
11221+$as_echo "$DLLTOOL" >&6; }
11222+else
11223+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11224+$as_echo "no" >&6; }
11225+fi
11226+
11227+
11228+fi
11229+if test -z "$ac_cv_prog_DLLTOOL"; then
11230+ ac_ct_DLLTOOL=$DLLTOOL
11231+ # Extract the first word of "dlltool", so it can be a program name with args.
11232+set dummy dlltool; ac_word=$2
11233+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11234+$as_echo_n "checking for $ac_word... " >&6; }
11235+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
11236+ $as_echo_n "(cached) " >&6
11237+else
11238+ if test -n "$ac_ct_DLLTOOL"; then
11239+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
11240+else
11241+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11242+for as_dir in $PATH
11243+do
11244+ IFS=$as_save_IFS
11245+ test -z "$as_dir" && as_dir=.
11246+ for ac_exec_ext in '' $ac_executable_extensions; do
11247+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11248+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
11249+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11250+ break 2
11251+ fi
11252+done
11253+ done
11254+IFS=$as_save_IFS
11255+
11256+fi
11257+fi
11258+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
11259+if test -n "$ac_ct_DLLTOOL"; then
11260+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
11261+$as_echo "$ac_ct_DLLTOOL" >&6; }
11262+else
11263+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11264+$as_echo "no" >&6; }
11265+fi
11266+
11267+ if test "x$ac_ct_DLLTOOL" = x; then
11268+ DLLTOOL="false"
11269+ else
11270+ case $cross_compiling:$ac_tool_warned in
11271+yes:)
11272+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11273+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11274+ac_tool_warned=yes ;;
11275+esac
11276+ DLLTOOL=$ac_ct_DLLTOOL
11277+ fi
11278+else
11279+ DLLTOOL="$ac_cv_prog_DLLTOOL"
11280+fi
11281+
11282+test -z "$DLLTOOL" && DLLTOOL=dlltool
11283+
11284+
11285+
11286+
11287+
11288+
11289+
11290+
11291+
11292+
11293+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
11294+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
11295+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
11296+ $as_echo_n "(cached) " >&6
11297+else
11298+ lt_cv_sharedlib_from_linklib_cmd='unknown'
11299+
11300+case $host_os in
11301+cygwin* | mingw* | pw32* | cegcc*)
11302+ # two different shell functions defined in ltmain.sh
11303+ # decide which to use based on capabilities of $DLLTOOL
11304+ case `$DLLTOOL --help 2>&1` in
11305+ *--identify-strict*)
11306+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
11307+ ;;
11308+ *)
11309+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
11310+ ;;
11311+ esac
11312+ ;;
11313+*)
11314+ # fallback: assume linklib IS sharedlib
11315+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
11316+ ;;
11317+esac
11318+
11319+fi
11320+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
11321+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
11322+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
11323+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
11324+
11325+
11326+
11327+
11328+
11329+
11330+
11331+if test -n "$ac_tool_prefix"; then
11332+ for ac_prog in ar
11333+ do
11334+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
11335+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
11336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11337 $as_echo_n "checking for $ac_word... " >&6; }
11338 if test "${ac_cv_prog_AR+set}" = set; then :
11339@@ -6294,7 +6548,7 @@ do
11340 test -z "$as_dir" && as_dir=.
11341 for ac_exec_ext in '' $ac_executable_extensions; do
11342 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11343- ac_cv_prog_AR="${ac_tool_prefix}ar"
11344+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
11345 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11346 break 2
11347 fi
11348@@ -6314,11 +6568,15 @@ $as_echo "no" >&6; }
11349 fi
11350
11351
11352+ test -n "$AR" && break
11353+ done
11354 fi
11355-if test -z "$ac_cv_prog_AR"; then
11356+if test -z "$AR"; then
11357 ac_ct_AR=$AR
11358- # Extract the first word of "ar", so it can be a program name with args.
11359-set dummy ar; ac_word=$2
11360+ for ac_prog in ar
11361+do
11362+ # Extract the first word of "$ac_prog", so it can be a program name with args.
11363+set dummy $ac_prog; ac_word=$2
11364 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11365 $as_echo_n "checking for $ac_word... " >&6; }
11366 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
11367@@ -6334,7 +6592,7 @@ do
11368 test -z "$as_dir" && as_dir=.
11369 for ac_exec_ext in '' $ac_executable_extensions; do
11370 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11371- ac_cv_prog_ac_ct_AR="ar"
11372+ ac_cv_prog_ac_ct_AR="$ac_prog"
11373 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11374 break 2
11375 fi
11376@@ -6353,6 +6611,10 @@ else
11377 $as_echo "no" >&6; }
11378 fi
11379
11380+
11381+ test -n "$ac_ct_AR" && break
11382+done
11383+
11384 if test "x$ac_ct_AR" = x; then
11385 AR="false"
11386 else
11387@@ -6364,12 +6626,10 @@ ac_tool_warned=yes ;;
11388 esac
11389 AR=$ac_ct_AR
11390 fi
11391-else
11392- AR="$ac_cv_prog_AR"
11393 fi
11394
11395-test -z "$AR" && AR=ar
11396-test -z "$AR_FLAGS" && AR_FLAGS=cru
11397+: ${AR=ar}
11398+: ${AR_FLAGS=cru}
11399
11400
11401
11402@@ -6381,6 +6641,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
11403
11404
11405
11406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
11407+$as_echo_n "checking for archiver @FILE support... " >&6; }
11408+if test "${lt_cv_ar_at_file+set}" = set; then :
11409+ $as_echo_n "(cached) " >&6
11410+else
11411+ lt_cv_ar_at_file=no
11412+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11413+/* end confdefs.h. */
11414+
11415+int
11416+main ()
11417+{
11418+
11419+ ;
11420+ return 0;
11421+}
11422+_ACEOF
11423+if ac_fn_c_try_compile "$LINENO"; then :
11424+ echo conftest.$ac_objext > conftest.lst
11425+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
11426+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11427+ (eval $lt_ar_try) 2>&5
11428+ ac_status=$?
11429+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11430+ test $ac_status = 0; }
11431+ if test "$ac_status" -eq 0; then
11432+ # Ensure the archiver fails upon bogus file names.
11433+ rm -f conftest.$ac_objext libconftest.a
11434+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11435+ (eval $lt_ar_try) 2>&5
11436+ ac_status=$?
11437+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11438+ test $ac_status = 0; }
11439+ if test "$ac_status" -ne 0; then
11440+ lt_cv_ar_at_file=@
11441+ fi
11442+ fi
11443+ rm -f conftest.* libconftest.a
11444+
11445+fi
11446+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11447+
11448+fi
11449+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
11450+$as_echo "$lt_cv_ar_at_file" >&6; }
11451+
11452+if test "x$lt_cv_ar_at_file" = xno; then
11453+ archiver_list_spec=
11454+else
11455+ archiver_list_spec=$lt_cv_ar_at_file
11456+fi
11457+
11458+
11459+
11460+
11461+
11462+
11463+
11464 if test -n "$ac_tool_prefix"; then
11465 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
11466 set dummy ${ac_tool_prefix}strip; ac_word=$2
11467@@ -6715,8 +7033,8 @@ esac
11468 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11469
11470 # Transform an extracted symbol line into symbol name and symbol address
11471-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11472-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'"
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
11476 # Handle CRLF in mingw tool chain
11477 opt_cr=
11478@@ -6752,6 +7070,7 @@ for ac_symprfx in "" "_"; do
11479 else
11480 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11481 fi
11482+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
11483
11484 # Check to see that the pipe works correctly.
11485 pipe_works=no
11486@@ -6793,6 +7112,18 @@ _LT_EOF
11487 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11488 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11489 cat <<_LT_EOF > conftest.$ac_ext
11490+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
11491+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
11492+/* DATA imports from DLLs on WIN32 con't be const, because runtime
11493+ relocations are performed -- see ld's documentation on pseudo-relocs. */
11494+# define LT_DLSYM_CONST
11495+#elif defined(__osf__)
11496+/* This system does not cope well with relocations in const data. */
11497+# define LT_DLSYM_CONST
11498+#else
11499+# define LT_DLSYM_CONST const
11500+#endif
11501+
11502 #ifdef __cplusplus
11503 extern "C" {
11504 #endif
11505@@ -6804,7 +7135,7 @@ _LT_EOF
11506 cat <<_LT_EOF >> conftest.$ac_ext
11507
11508 /* The mapping between symbol names and symbols. */
11509-const struct {
11510+LT_DLSYM_CONST struct {
11511 const char *name;
11512 void *address;
11513 }
11514@@ -6830,8 +7161,8 @@ static const void *lt_preloaded_setup()
11515 _LT_EOF
11516 # Now try linking the two files.
11517 mv conftest.$ac_objext conftstm.$ac_objext
11518- lt_save_LIBS="$LIBS"
11519- lt_save_CFLAGS="$CFLAGS"
11520+ lt_globsym_save_LIBS=$LIBS
11521+ lt_globsym_save_CFLAGS=$CFLAGS
11522 LIBS="conftstm.$ac_objext"
11523 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11524 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11525@@ -6841,8 +7172,8 @@ _LT_EOF
11526 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11527 pipe_works=yes
11528 fi
11529- LIBS="$lt_save_LIBS"
11530- CFLAGS="$lt_save_CFLAGS"
11531+ LIBS=$lt_globsym_save_LIBS
11532+ CFLAGS=$lt_globsym_save_CFLAGS
11533 else
11534 echo "cannot find nm_test_func in $nlist" >&5
11535 fi
11536@@ -6879,6 +7210,19 @@ else
11537 $as_echo "ok" >&6; }
11538 fi
11539
11540+# Response file support.
11541+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11542+ nm_file_list_spec='@'
11543+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11544+ nm_file_list_spec='@'
11545+fi
11546+
11547+
11548+
11549+
11550+
11551+
11552+
11553
11554
11555
11556@@ -6899,6 +7243,42 @@ fi
11557
11558
11559
11560+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11561+$as_echo_n "checking for sysroot... " >&6; }
11562+
11563+# Check whether --with-libtool-sysroot was given.
11564+if test "${with_libtool_sysroot+set}" = set; then :
11565+ withval=$with_libtool_sysroot;
11566+else
11567+ with_libtool_sysroot=no
11568+fi
11569+
11570+
11571+lt_sysroot=
11572+case ${with_libtool_sysroot} in #(
11573+ yes)
11574+ if test "$GCC" = yes; then
11575+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11576+ fi
11577+ ;; #(
11578+ /*)
11579+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11580+ ;; #(
11581+ no|'')
11582+ ;; #(
11583+ *)
11584+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11585+$as_echo "${with_libtool_sysroot}" >&6; }
11586+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
11587+ ;;
11588+esac
11589+
11590+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11591+$as_echo "${lt_sysroot:-no}" >&6; }
11592+
11593+
11594+
11595+
11596
11597 # Check whether --enable-libtool-lock was given.
11598 if test "${enable_libtool_lock+set}" = set; then :
11599@@ -7093,6 +7473,123 @@ esac
11600
11601 need_locks="$enable_libtool_lock"
11602
11603+if test -n "$ac_tool_prefix"; then
11604+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11605+set dummy ${ac_tool_prefix}mt; ac_word=$2
11606+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11607+$as_echo_n "checking for $ac_word... " >&6; }
11608+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
11609+ $as_echo_n "(cached) " >&6
11610+else
11611+ if test -n "$MANIFEST_TOOL"; then
11612+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11613+else
11614+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11615+for as_dir in $PATH
11616+do
11617+ IFS=$as_save_IFS
11618+ test -z "$as_dir" && as_dir=.
11619+ for ac_exec_ext in '' $ac_executable_extensions; do
11620+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11621+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11622+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11623+ break 2
11624+ fi
11625+done
11626+ done
11627+IFS=$as_save_IFS
11628+
11629+fi
11630+fi
11631+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11632+if test -n "$MANIFEST_TOOL"; then
11633+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11634+$as_echo "$MANIFEST_TOOL" >&6; }
11635+else
11636+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11637+$as_echo "no" >&6; }
11638+fi
11639+
11640+
11641+fi
11642+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11643+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11644+ # Extract the first word of "mt", so it can be a program name with args.
11645+set dummy mt; ac_word=$2
11646+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11647+$as_echo_n "checking for $ac_word... " >&6; }
11648+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
11649+ $as_echo_n "(cached) " >&6
11650+else
11651+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11652+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11653+else
11654+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11655+for as_dir in $PATH
11656+do
11657+ IFS=$as_save_IFS
11658+ test -z "$as_dir" && as_dir=.
11659+ for ac_exec_ext in '' $ac_executable_extensions; do
11660+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11661+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11662+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11663+ break 2
11664+ fi
11665+done
11666+ done
11667+IFS=$as_save_IFS
11668+
11669+fi
11670+fi
11671+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11672+if test -n "$ac_ct_MANIFEST_TOOL"; then
11673+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11674+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11675+else
11676+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11677+$as_echo "no" >&6; }
11678+fi
11679+
11680+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11681+ MANIFEST_TOOL=":"
11682+ else
11683+ case $cross_compiling:$ac_tool_warned in
11684+yes:)
11685+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11686+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11687+ac_tool_warned=yes ;;
11688+esac
11689+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11690+ fi
11691+else
11692+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11693+fi
11694+
11695+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11696+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11697+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11698+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
11699+ $as_echo_n "(cached) " >&6
11700+else
11701+ lt_cv_path_mainfest_tool=no
11702+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11703+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11704+ cat conftest.err >&5
11705+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11706+ lt_cv_path_mainfest_tool=yes
11707+ fi
11708+ rm -f conftest*
11709+fi
11710+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11711+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11712+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11713+ MANIFEST_TOOL=:
11714+fi
11715+
11716+
11717+
11718+
11719+
11720
11721 case $host_os in
11722 rhapsody* | darwin*)
11723@@ -7656,6 +8153,8 @@ _LT_EOF
11724 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11725 echo "$AR cru libconftest.a conftest.o" >&5
11726 $AR cru libconftest.a conftest.o 2>&5
11727+ echo "$RANLIB libconftest.a" >&5
11728+ $RANLIB libconftest.a 2>&5
11729 cat > conftest.c << _LT_EOF
11730 int main() { return 0;}
11731 _LT_EOF
11732@@ -7851,7 +8350,8 @@ fi
11733 LIBTOOL_DEPS="$ltmain"
11734
11735 # Always use our own libtool.
11736-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11737+LIBTOOL='$(SHELL) $(top_builddir)'
11738+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
11739
11740
11741
11742@@ -7940,7 +8440,7 @@ aix3*)
11743 esac
11744
11745 # Global variables:
11746-ofile=libtool
11747+ofile=${host_alias}-libtool
11748 can_build_shared=yes
11749
11750 # All known linkers require a `.a' archive for static linking (except MSVC,
11751@@ -8238,8 +8738,6 @@ fi
11752 lt_prog_compiler_pic=
11753 lt_prog_compiler_static=
11754
11755-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11756-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11757
11758 if test "$GCC" = yes; then
11759 lt_prog_compiler_wl='-Wl,'
11760@@ -8404,6 +8902,12 @@ $as_echo_n "checking for $compiler optio
11761 lt_prog_compiler_pic='--shared'
11762 lt_prog_compiler_static='--static'
11763 ;;
11764+ nagfor*)
11765+ # NAG Fortran compiler
11766+ lt_prog_compiler_wl='-Wl,-Wl,,'
11767+ lt_prog_compiler_pic='-PIC'
11768+ lt_prog_compiler_static='-Bstatic'
11769+ ;;
11770 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11771 # Portland Group compilers (*not* the Pentium gcc compiler,
11772 # which looks to be a dead project)
11773@@ -8466,7 +8970,7 @@ $as_echo_n "checking for $compiler optio
11774 lt_prog_compiler_pic='-KPIC'
11775 lt_prog_compiler_static='-Bstatic'
11776 case $cc_basename in
11777- f77* | f90* | f95*)
11778+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11779 lt_prog_compiler_wl='-Qoption ld ';;
11780 *)
11781 lt_prog_compiler_wl='-Wl,';;
11782@@ -8523,13 +9027,17 @@ case $host_os in
11783 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11784 ;;
11785 esac
11786-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11787-$as_echo "$lt_prog_compiler_pic" >&6; }
11788-
11789-
11790-
11791-
11792
11793+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11794+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11795+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
11796+ $as_echo_n "(cached) " >&6
11797+else
11798+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11799+fi
11800+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11801+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11802+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11803
11804 #
11805 # Check to make sure the PIC flag actually works.
11806@@ -8590,6 +9098,11 @@ fi
11807
11808
11809
11810+
11811+
11812+
11813+
11814+
11815 #
11816 # Check to make sure the static flag actually works.
11817 #
11818@@ -8940,7 +9453,8 @@ _LT_EOF
11819 allow_undefined_flag=unsupported
11820 always_export_symbols=no
11821 enable_shared_with_static_runtimes=yes
11822- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11823+ 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'
11824+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11825
11826 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11827 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11828@@ -8988,7 +9502,7 @@ _LT_EOF
11829 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11830 && test "$tmp_diet" = no
11831 then
11832- tmp_addflag=
11833+ tmp_addflag=' $pic_flag'
11834 tmp_sharedflag='-shared'
11835 case $cc_basename,$host_cpu in
11836 pgcc*) # Portland Group C compiler
11837@@ -9039,12 +9553,12 @@ _LT_EOF
11838 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11839 hardcode_libdir_flag_spec=
11840 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11841- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11842+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11843 if test "x$supports_anon_versioning" = xyes; then
11844 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11845 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11846 echo "local: *; };" >> $output_objdir/$libname.ver~
11847- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11848+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11849 fi
11850 ;;
11851 esac
11852@@ -9058,8 +9572,8 @@ _LT_EOF
11853 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11854 wlarc=
11855 else
11856- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11857- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11858+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11859+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11860 fi
11861 ;;
11862
11863@@ -9077,8 +9591,8 @@ _LT_EOF
11864
11865 _LT_EOF
11866 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11867- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11868- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11869+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11870+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11871 else
11872 ld_shlibs=no
11873 fi
11874@@ -9124,8 +9638,8 @@ _LT_EOF
11875
11876 *)
11877 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11878- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11879- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11880+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11881+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11882 else
11883 ld_shlibs=no
11884 fi
11885@@ -9255,7 +9769,13 @@ _LT_EOF
11886 allow_undefined_flag='-berok'
11887 # Determine the default libpath from the value encoded in an
11888 # empty executable.
11889- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11890+ if test "${lt_cv_aix_libpath+set}" = set; then
11891+ aix_libpath=$lt_cv_aix_libpath
11892+else
11893+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11894+ $as_echo_n "(cached) " >&6
11895+else
11896+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11897 /* end confdefs.h. */
11898
11899 int
11900@@ -9268,22 +9788,29 @@ main ()
11901 _ACEOF
11902 if ac_fn_c_try_link "$LINENO"; then :
11903
11904-lt_aix_libpath_sed='
11905- /Import File Strings/,/^$/ {
11906- /^0/ {
11907- s/^0 *\(.*\)$/\1/
11908- p
11909- }
11910- }'
11911-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11912-# Check for a 64-bit object if we didn't find anything.
11913-if test -z "$aix_libpath"; then
11914- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11915-fi
11916+ lt_aix_libpath_sed='
11917+ /Import File Strings/,/^$/ {
11918+ /^0/ {
11919+ s/^0 *\([^ ]*\) *$/\1/
11920+ p
11921+ }
11922+ }'
11923+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11924+ # Check for a 64-bit object if we didn't find anything.
11925+ if test -z "$lt_cv_aix_libpath_"; then
11926+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11927+ fi
11928 fi
11929 rm -f core conftest.err conftest.$ac_objext \
11930 conftest$ac_exeext conftest.$ac_ext
11931-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11932+ if test -z "$lt_cv_aix_libpath_"; then
11933+ lt_cv_aix_libpath_="/usr/lib:/lib"
11934+ fi
11935+
11936+fi
11937+
11938+ aix_libpath=$lt_cv_aix_libpath_
11939+fi
11940
11941 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11942 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"
11943@@ -9295,7 +9822,13 @@ if test -z "$aix_libpath"; then aix_libp
11944 else
11945 # Determine the default libpath from the value encoded in an
11946 # empty executable.
11947- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11948+ if test "${lt_cv_aix_libpath+set}" = set; then
11949+ aix_libpath=$lt_cv_aix_libpath
11950+else
11951+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11952+ $as_echo_n "(cached) " >&6
11953+else
11954+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11955 /* end confdefs.h. */
11956
11957 int
11958@@ -9308,22 +9841,29 @@ main ()
11959 _ACEOF
11960 if ac_fn_c_try_link "$LINENO"; then :
11961
11962-lt_aix_libpath_sed='
11963- /Import File Strings/,/^$/ {
11964- /^0/ {
11965- s/^0 *\(.*\)$/\1/
11966- p
11967- }
11968- }'
11969-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11970-# Check for a 64-bit object if we didn't find anything.
11971-if test -z "$aix_libpath"; then
11972- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11973-fi
11974+ lt_aix_libpath_sed='
11975+ /Import File Strings/,/^$/ {
11976+ /^0/ {
11977+ s/^0 *\([^ ]*\) *$/\1/
11978+ p
11979+ }
11980+ }'
11981+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11982+ # Check for a 64-bit object if we didn't find anything.
11983+ if test -z "$lt_cv_aix_libpath_"; then
11984+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11985+ fi
11986 fi
11987 rm -f core conftest.err conftest.$ac_objext \
11988 conftest$ac_exeext conftest.$ac_ext
11989-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11990+ if test -z "$lt_cv_aix_libpath_"; then
11991+ lt_cv_aix_libpath_="/usr/lib:/lib"
11992+ fi
11993+
11994+fi
11995+
11996+ aix_libpath=$lt_cv_aix_libpath_
11997+fi
11998
11999 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
12000 # Warning - without using the other run time loading flags,
12001@@ -9368,20 +9908,63 @@ if test -z "$aix_libpath"; then aix_libp
12002 # Microsoft Visual C++.
12003 # hardcode_libdir_flag_spec is actually meaningless, as there is
12004 # no search path for DLLs.
12005- hardcode_libdir_flag_spec=' '
12006- allow_undefined_flag=unsupported
12007- # Tell ltmain to make .lib files, not .a files.
12008- libext=lib
12009- # Tell ltmain to make .dll files, not .so files.
12010- shrext_cmds=".dll"
12011- # FIXME: Setting linknames here is a bad hack.
12012- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12013- # The linker will automatically build a .lib file if we build a DLL.
12014- old_archive_from_new_cmds='true'
12015- # FIXME: Should let the user specify the lib program.
12016- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12017- fix_srcfile_path='`cygpath -w "$srcfile"`'
12018- enable_shared_with_static_runtimes=yes
12019+ case $cc_basename in
12020+ cl*)
12021+ # Native MSVC
12022+ hardcode_libdir_flag_spec=' '
12023+ allow_undefined_flag=unsupported
12024+ always_export_symbols=yes
12025+ file_list_spec='@'
12026+ # Tell ltmain to make .lib files, not .a files.
12027+ libext=lib
12028+ # Tell ltmain to make .dll files, not .so files.
12029+ shrext_cmds=".dll"
12030+ # FIXME: Setting linknames here is a bad hack.
12031+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12032+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12033+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12034+ else
12035+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12036+ fi~
12037+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12038+ linknames='
12039+ # The linker will not automatically build a static lib if we build a DLL.
12040+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
12041+ enable_shared_with_static_runtimes=yes
12042+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
12043+ # Don't use ranlib
12044+ old_postinstall_cmds='chmod 644 $oldlib'
12045+ postlink_cmds='lt_outputfile="@OUTPUT@"~
12046+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12047+ case $lt_outputfile in
12048+ *.exe|*.EXE) ;;
12049+ *)
12050+ lt_outputfile="$lt_outputfile.exe"
12051+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12052+ ;;
12053+ esac~
12054+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12055+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12056+ $RM "$lt_outputfile.manifest";
12057+ fi'
12058+ ;;
12059+ *)
12060+ # Assume MSVC wrapper
12061+ hardcode_libdir_flag_spec=' '
12062+ allow_undefined_flag=unsupported
12063+ # Tell ltmain to make .lib files, not .a files.
12064+ libext=lib
12065+ # Tell ltmain to make .dll files, not .so files.
12066+ shrext_cmds=".dll"
12067+ # FIXME: Setting linknames here is a bad hack.
12068+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12069+ # The linker will automatically build a .lib file if we build a DLL.
12070+ old_archive_from_new_cmds='true'
12071+ # FIXME: Should let the user specify the lib program.
12072+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12073+ enable_shared_with_static_runtimes=yes
12074+ ;;
12075+ esac
12076 ;;
12077
12078 darwin* | rhapsody*)
12079@@ -9446,7 +10029,7 @@ if test -z "$aix_libpath"; then aix_libp
12080
12081 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12082 freebsd* | dragonfly*)
12083- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
12084+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12085 hardcode_libdir_flag_spec='-R$libdir'
12086 hardcode_direct=yes
12087 hardcode_shlibpath_var=no
12088@@ -9454,7 +10037,7 @@ if test -z "$aix_libpath"; then aix_libp
12089
12090 hpux9*)
12091 if test "$GCC" = yes; then
12092- 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'
12093+ 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'
12094 else
12095 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'
12096 fi
12097@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libp
12098
12099 hpux10*)
12100 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
12101- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12102+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12103 else
12104 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12105 fi
12106@@ -9494,10 +10077,10 @@ if test -z "$aix_libpath"; then aix_libp
12107 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12108 ;;
12109 ia64*)
12110- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12111+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12112 ;;
12113 *)
12114- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12115+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12116 ;;
12117 esac
12118 else
12119@@ -9576,23 +10159,36 @@ fi
12120
12121 irix5* | irix6* | nonstopux*)
12122 if test "$GCC" = yes; then
12123- 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'
12124+ 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'
12125 # Try to use the -exported_symbol ld option, if it does not
12126 # work, assume that -exports_file does not work either and
12127 # implicitly export all symbols.
12128- save_LDFLAGS="$LDFLAGS"
12129- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12130- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12131+ # This should be the same for all languages, so no per-tag cache variable.
12132+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
12133+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
12134+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
12135+ $as_echo_n "(cached) " >&6
12136+else
12137+ save_LDFLAGS="$LDFLAGS"
12138+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12139+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12140 /* end confdefs.h. */
12141-int foo(void) {}
12142+int foo (void) { return 0; }
12143 _ACEOF
12144 if ac_fn_c_try_link "$LINENO"; then :
12145- 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'
12146-
12147+ lt_cv_irix_exported_symbol=yes
12148+else
12149+ lt_cv_irix_exported_symbol=no
12150 fi
12151 rm -f core conftest.err conftest.$ac_objext \
12152 conftest$ac_exeext conftest.$ac_ext
12153- LDFLAGS="$save_LDFLAGS"
12154+ LDFLAGS="$save_LDFLAGS"
12155+fi
12156+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
12157+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
12158+ if test "$lt_cv_irix_exported_symbol" = yes; then
12159+ 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'
12160+ fi
12161 else
12162 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'
12163 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'
12164@@ -9677,7 +10273,7 @@ rm -f core conftest.err conftest.$ac_obj
12165 osf4* | osf5*) # as osf3* with the addition of -msym flag
12166 if test "$GCC" = yes; then
12167 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
12168- 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'
12169+ 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'
12170 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12171 else
12172 allow_undefined_flag=' -expect_unresolved \*'
12173@@ -9696,9 +10292,9 @@ rm -f core conftest.err conftest.$ac_obj
12174 no_undefined_flag=' -z defs'
12175 if test "$GCC" = yes; then
12176 wlarc='${wl}'
12177- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12178+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12179 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12180- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
12181+ $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'
12182 else
12183 case `$CC -V 2>&1` in
12184 *"Compilers 5.0"*)
12185@@ -10274,8 +10870,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12186 need_version=no
12187 need_lib_prefix=no
12188
12189- case $GCC,$host_os in
12190- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12191+ case $GCC,$cc_basename in
12192+ yes,*)
12193+ # gcc
12194 library_names_spec='$libname.dll.a'
12195 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12196 postinstall_cmds='base_file=`basename \${file}`~
12197@@ -10308,13 +10905,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12198 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12199 ;;
12200 esac
12201+ dynamic_linker='Win32 ld.exe'
12202+ ;;
12203+
12204+ *,cl*)
12205+ # Native MSVC
12206+ libname_spec='$name'
12207+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12208+ library_names_spec='${libname}.dll.lib'
12209+
12210+ case $build_os in
12211+ mingw*)
12212+ sys_lib_search_path_spec=
12213+ lt_save_ifs=$IFS
12214+ IFS=';'
12215+ for lt_path in $LIB
12216+ do
12217+ IFS=$lt_save_ifs
12218+ # Let DOS variable expansion print the short 8.3 style file name.
12219+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12220+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12221+ done
12222+ IFS=$lt_save_ifs
12223+ # Convert to MSYS style.
12224+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12225+ ;;
12226+ cygwin*)
12227+ # Convert to unix form, then to dos form, then back to unix form
12228+ # but this time dos style (no spaces!) so that the unix form looks
12229+ # like /cygdrive/c/PROGRA~1:/cygdr...
12230+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12231+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12232+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12233+ ;;
12234+ *)
12235+ sys_lib_search_path_spec="$LIB"
12236+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12237+ # It is most probably a Windows format PATH.
12238+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12239+ else
12240+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12241+ fi
12242+ # FIXME: find the short name or the path components, as spaces are
12243+ # common. (e.g. "Program Files" -> "PROGRA~1")
12244+ ;;
12245+ esac
12246+
12247+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12248+ postinstall_cmds='base_file=`basename \${file}`~
12249+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12250+ dldir=$destdir/`dirname \$dlpath`~
12251+ test -d \$dldir || mkdir -p \$dldir~
12252+ $install_prog $dir/$dlname \$dldir/$dlname'
12253+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12254+ dlpath=$dir/\$dldll~
12255+ $RM \$dlpath'
12256+ shlibpath_overrides_runpath=yes
12257+ dynamic_linker='Win32 link.exe'
12258 ;;
12259
12260 *)
12261+ # Assume MSVC wrapper
12262 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12263+ dynamic_linker='Win32 ld.exe'
12264 ;;
12265 esac
12266- dynamic_linker='Win32 ld.exe'
12267 # FIXME: first we should search . and the directory the executable is in
12268 shlibpath_var=PATH
12269 ;;
12270@@ -10410,7 +11065,7 @@ haiku*)
12271 soname_spec='${libname}${release}${shared_ext}$major'
12272 shlibpath_var=LIBRARY_PATH
12273 shlibpath_overrides_runpath=yes
12274- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
12275+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
12276 hardcode_into_libs=yes
12277 ;;
12278
12279@@ -11206,7 +11861,7 @@ else
12280 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12281 lt_status=$lt_dlunknown
12282 cat > conftest.$ac_ext <<_LT_EOF
12283-#line 11209 "configure"
12284+#line $LINENO "configure"
12285 #include "confdefs.h"
12286
12287 #if HAVE_DLFCN_H
12288@@ -11250,10 +11905,10 @@ else
12289 /* When -fvisbility=hidden is used, assume the code has been annotated
12290 correspondingly for the symbols needed. */
12291 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12292-void fnord () __attribute__((visibility("default")));
12293+int fnord () __attribute__((visibility("default")));
12294 #endif
12295
12296-void fnord () { int i=42; }
12297+int fnord () { return 42; }
12298 int main ()
12299 {
12300 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12301@@ -11312,7 +11967,7 @@ else
12302 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12303 lt_status=$lt_dlunknown
12304 cat > conftest.$ac_ext <<_LT_EOF
12305-#line 11315 "configure"
12306+#line $LINENO "configure"
12307 #include "confdefs.h"
12308
12309 #if HAVE_DLFCN_H
12310@@ -11356,10 +12011,10 @@ else
12311 /* When -fvisbility=hidden is used, assume the code has been annotated
12312 correspondingly for the symbols needed. */
12313 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12314-void fnord () __attribute__((visibility("default")));
12315+int fnord () __attribute__((visibility("default")));
12316 #endif
12317
12318-void fnord () { int i=42; }
12319+int fnord () { return 42; }
12320 int main ()
12321 {
12322 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12323@@ -14751,13 +15406,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
12324 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12325 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12326 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
12327+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
12328+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
12329 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
12330 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
12331 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
12332 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
12333 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
12334+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
12335+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
12336+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
12337+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
12338 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
12339 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
12340+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
12341 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12342 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12343 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12344@@ -14772,14 +15434,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
12345 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12346 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12347 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"`'
12348+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
12349+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
12350 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
12351 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
12352 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
12353-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12354 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
12355+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12356 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
12357 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
12358 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
12359+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
12360 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12361 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12362 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12363@@ -14812,12 +15477,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
12364 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12365 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12366 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
12367-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
12368 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
12369 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
12370 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
12371 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
12372 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
12373+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
12374 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12375 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12376 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12377@@ -14872,8 +15537,13 @@ reload_flag \
12378 OBJDUMP \
12379 deplibs_check_method \
12380 file_magic_cmd \
12381+file_magic_glob \
12382+want_nocaseglob \
12383+DLLTOOL \
12384+sharedlib_from_linklib_cmd \
12385 AR \
12386 AR_FLAGS \
12387+archiver_list_spec \
12388 STRIP \
12389 RANLIB \
12390 CC \
12391@@ -14883,12 +15553,14 @@ lt_cv_sys_global_symbol_pipe \
12392 lt_cv_sys_global_symbol_to_cdecl \
12393 lt_cv_sys_global_symbol_to_c_name_address \
12394 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
12395+nm_file_list_spec \
12396 lt_prog_compiler_no_builtin_flag \
12397-lt_prog_compiler_wl \
12398 lt_prog_compiler_pic \
12399+lt_prog_compiler_wl \
12400 lt_prog_compiler_static \
12401 lt_cv_prog_compiler_c_o \
12402 need_locks \
12403+MANIFEST_TOOL \
12404 DSYMUTIL \
12405 NMEDIT \
12406 LIPO \
12407@@ -14904,7 +15576,6 @@ no_undefined_flag \
12408 hardcode_libdir_flag_spec \
12409 hardcode_libdir_flag_spec_ld \
12410 hardcode_libdir_separator \
12411-fix_srcfile_path \
12412 exclude_expsyms \
12413 include_expsyms \
12414 file_list_spec \
12415@@ -14940,6 +15611,7 @@ module_cmds \
12416 module_expsym_cmds \
12417 export_symbols_cmds \
12418 prelink_cmds \
12419+postlink_cmds \
12420 postinstall_cmds \
12421 postuninstall_cmds \
12422 finish_cmds \
12423@@ -15697,7 +16369,8 @@ $as_echo X"$file" |
12424 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12425 #
12426 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12427-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12428+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12429+# Inc.
12430 # Written by Gordon Matzigkeit, 1996
12431 #
12432 # This file is part of GNU Libtool.
12433@@ -15800,19 +16473,42 @@ SP2NL=$lt_lt_SP2NL
12434 # turn newlines into spaces.
12435 NL2SP=$lt_lt_NL2SP
12436
12437+# convert \$build file names to \$host format.
12438+to_host_file_cmd=$lt_cv_to_host_file_cmd
12439+
12440+# convert \$build files to toolchain format.
12441+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12442+
12443 # An object symbol dumper.
12444 OBJDUMP=$lt_OBJDUMP
12445
12446 # Method to check whether dependent libraries are shared objects.
12447 deplibs_check_method=$lt_deplibs_check_method
12448
12449-# Command to use when deplibs_check_method == "file_magic".
12450+# Command to use when deplibs_check_method = "file_magic".
12451 file_magic_cmd=$lt_file_magic_cmd
12452
12453+# How to find potential files when deplibs_check_method = "file_magic".
12454+file_magic_glob=$lt_file_magic_glob
12455+
12456+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
12457+want_nocaseglob=$lt_want_nocaseglob
12458+
12459+# DLL creation program.
12460+DLLTOOL=$lt_DLLTOOL
12461+
12462+# Command to associate shared and link libraries.
12463+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
12464+
12465 # The archiver.
12466 AR=$lt_AR
12467+
12468+# Flags to create an archive.
12469 AR_FLAGS=$lt_AR_FLAGS
12470
12471+# How to feed a file listing to the archiver.
12472+archiver_list_spec=$lt_archiver_list_spec
12473+
12474 # A symbol stripping program.
12475 STRIP=$lt_STRIP
12476
12477@@ -15842,6 +16538,12 @@ global_symbol_to_c_name_address=$lt_lt_c
12478 # Transform the output of nm in a C name address pair when lib prefix is needed.
12479 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12480
12481+# Specify filename containing input files for \$NM.
12482+nm_file_list_spec=$lt_nm_file_list_spec
12483+
12484+# The root where to search for dependent libraries,and in which our libraries should be installed.
12485+lt_sysroot=$lt_sysroot
12486+
12487 # The name of the directory that contains temporary libtool files.
12488 objdir=$objdir
12489
12490@@ -15851,6 +16553,9 @@ MAGIC_CMD=$MAGIC_CMD
12491 # Must we lock files when doing compilation?
12492 need_locks=$lt_need_locks
12493
12494+# Manifest tool.
12495+MANIFEST_TOOL=$lt_MANIFEST_TOOL
12496+
12497 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12498 DSYMUTIL=$lt_DSYMUTIL
12499
12500@@ -15965,12 +16670,12 @@ with_gcc=$GCC
12501 # Compiler flag to turn off builtin functions.
12502 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12503
12504-# How to pass a linker flag through the compiler.
12505-wl=$lt_lt_prog_compiler_wl
12506-
12507 # Additional compiler flags for building library objects.
12508 pic_flag=$lt_lt_prog_compiler_pic
12509
12510+# How to pass a linker flag through the compiler.
12511+wl=$lt_lt_prog_compiler_wl
12512+
12513 # Compiler flag to prevent dynamic linking.
12514 link_static_flag=$lt_lt_prog_compiler_static
12515
12516@@ -16057,9 +16762,6 @@ inherit_rpath=$inherit_rpath
12517 # Whether libtool must link a program against all its dependency libraries.
12518 link_all_deplibs=$link_all_deplibs
12519
12520-# Fix the shell variable \$srcfile for the compiler.
12521-fix_srcfile_path=$lt_fix_srcfile_path
12522-
12523 # Set to "yes" if exported symbols are required.
12524 always_export_symbols=$always_export_symbols
12525
12526@@ -16075,6 +16777,9 @@ include_expsyms=$lt_include_expsyms
12527 # Commands necessary for linking programs (against libraries) with templates.
12528 prelink_cmds=$lt_prelink_cmds
12529
12530+# Commands necessary for finishing linking programs.
12531+postlink_cmds=$lt_postlink_cmds
12532+
12533 # Specify filename containing input files.
12534 file_list_spec=$lt_file_list_spec
12535
12536@@ -16107,210 +16812,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12537 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12538 # text mode, it properly converts lines to CR/LF. This bash problem
12539 # is reportedly fixed, but why not run on old versions too?
12540- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
12541- || (rm -f "$cfgfile"; exit 1)
12542-
12543- case $xsi_shell in
12544- yes)
12545- cat << \_LT_EOF >> "$cfgfile"
12546-
12547-# func_dirname file append nondir_replacement
12548-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12549-# otherwise set result to NONDIR_REPLACEMENT.
12550-func_dirname ()
12551-{
12552- case ${1} in
12553- */*) func_dirname_result="${1%/*}${2}" ;;
12554- * ) func_dirname_result="${3}" ;;
12555- esac
12556-}
12557-
12558-# func_basename file
12559-func_basename ()
12560-{
12561- func_basename_result="${1##*/}"
12562-}
12563-
12564-# func_dirname_and_basename file append nondir_replacement
12565-# perform func_basename and func_dirname in a single function
12566-# call:
12567-# dirname: Compute the dirname of FILE. If nonempty,
12568-# add APPEND to the result, otherwise set result
12569-# to NONDIR_REPLACEMENT.
12570-# value returned in "$func_dirname_result"
12571-# basename: Compute filename of FILE.
12572-# value retuned in "$func_basename_result"
12573-# Implementation must be kept synchronized with func_dirname
12574-# and func_basename. For efficiency, we do not delegate to
12575-# those functions but instead duplicate the functionality here.
12576-func_dirname_and_basename ()
12577-{
12578- case ${1} in
12579- */*) func_dirname_result="${1%/*}${2}" ;;
12580- * ) func_dirname_result="${3}" ;;
12581- esac
12582- func_basename_result="${1##*/}"
12583-}
12584-
12585-# func_stripname prefix suffix name
12586-# strip PREFIX and SUFFIX off of NAME.
12587-# PREFIX and SUFFIX must not contain globbing or regex special
12588-# characters, hashes, percent signs, but SUFFIX may contain a leading
12589-# dot (in which case that matches only a dot).
12590-func_stripname ()
12591-{
12592- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
12593- # positional parameters, so assign one to ordinary parameter first.
12594- func_stripname_result=${3}
12595- func_stripname_result=${func_stripname_result#"${1}"}
12596- func_stripname_result=${func_stripname_result%"${2}"}
12597-}
12598-
12599-# func_opt_split
12600-func_opt_split ()
12601-{
12602- func_opt_split_opt=${1%%=*}
12603- func_opt_split_arg=${1#*=}
12604-}
12605-
12606-# func_lo2o object
12607-func_lo2o ()
12608-{
12609- case ${1} in
12610- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
12611- *) func_lo2o_result=${1} ;;
12612- esac
12613-}
12614-
12615-# func_xform libobj-or-source
12616-func_xform ()
12617-{
12618- func_xform_result=${1%.*}.lo
12619-}
12620-
12621-# func_arith arithmetic-term...
12622-func_arith ()
12623-{
12624- func_arith_result=$(( $* ))
12625-}
12626-
12627-# func_len string
12628-# STRING may not start with a hyphen.
12629-func_len ()
12630-{
12631- func_len_result=${#1}
12632-}
12633-
12634-_LT_EOF
12635- ;;
12636- *) # Bourne compatible functions.
12637- cat << \_LT_EOF >> "$cfgfile"
12638-
12639-# func_dirname file append nondir_replacement
12640-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12641-# otherwise set result to NONDIR_REPLACEMENT.
12642-func_dirname ()
12643-{
12644- # Extract subdirectory from the argument.
12645- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12646- if test "X$func_dirname_result" = "X${1}"; then
12647- func_dirname_result="${3}"
12648- else
12649- func_dirname_result="$func_dirname_result${2}"
12650- fi
12651-}
12652-
12653-# func_basename file
12654-func_basename ()
12655-{
12656- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12657-}
12658-
12659-
12660-# func_stripname prefix suffix name
12661-# strip PREFIX and SUFFIX off of NAME.
12662-# PREFIX and SUFFIX must not contain globbing or regex special
12663-# characters, hashes, percent signs, but SUFFIX may contain a leading
12664-# dot (in which case that matches only a dot).
12665-# func_strip_suffix prefix name
12666-func_stripname ()
12667-{
12668- case ${2} in
12669- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12670- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12671- esac
12672-}
12673-
12674-# sed scripts:
12675-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12676-my_sed_long_arg='1s/^-[^=]*=//'
12677-
12678-# func_opt_split
12679-func_opt_split ()
12680-{
12681- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12682- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12683-}
12684-
12685-# func_lo2o object
12686-func_lo2o ()
12687-{
12688- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12689-}
12690-
12691-# func_xform libobj-or-source
12692-func_xform ()
12693-{
12694- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12695-}
12696-
12697-# func_arith arithmetic-term...
12698-func_arith ()
12699-{
12700- func_arith_result=`expr "$@"`
12701-}
12702-
12703-# func_len string
12704-# STRING may not start with a hyphen.
12705-func_len ()
12706-{
12707- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12708-}
12709-
12710-_LT_EOF
12711-esac
12712-
12713-case $lt_shell_append in
12714- yes)
12715- cat << \_LT_EOF >> "$cfgfile"
12716-
12717-# func_append var value
12718-# Append VALUE to the end of shell variable VAR.
12719-func_append ()
12720-{
12721- eval "$1+=\$2"
12722-}
12723-_LT_EOF
12724- ;;
12725- *)
12726- cat << \_LT_EOF >> "$cfgfile"
12727-
12728-# func_append var value
12729-# Append VALUE to the end of shell variable VAR.
12730-func_append ()
12731-{
12732- eval "$1=\$$1\$2"
12733-}
12734-
12735-_LT_EOF
12736- ;;
12737- esac
12738+ sed '$q' "$ltmain" >> "$cfgfile" \
12739+ || (rm -f "$cfgfile"; exit 1)
12740
12741+ if test x"$xsi_shell" = xyes; then
12742+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12743+func_dirname ()\
12744+{\
12745+\ case ${1} in\
12746+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12747+\ * ) func_dirname_result="${3}" ;;\
12748+\ esac\
12749+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12750+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12751+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12752+test 0 -eq $? || _lt_function_replace_fail=:
12753+
12754+
12755+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12756+func_basename ()\
12757+{\
12758+\ func_basename_result="${1##*/}"\
12759+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12760+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12761+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12762+test 0 -eq $? || _lt_function_replace_fail=:
12763+
12764+
12765+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12766+func_dirname_and_basename ()\
12767+{\
12768+\ case ${1} in\
12769+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12770+\ * ) func_dirname_result="${3}" ;;\
12771+\ esac\
12772+\ func_basename_result="${1##*/}"\
12773+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12774+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12775+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12776+test 0 -eq $? || _lt_function_replace_fail=:
12777+
12778+
12779+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12780+func_stripname ()\
12781+{\
12782+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12783+\ # positional parameters, so assign one to ordinary parameter first.\
12784+\ func_stripname_result=${3}\
12785+\ func_stripname_result=${func_stripname_result#"${1}"}\
12786+\ func_stripname_result=${func_stripname_result%"${2}"}\
12787+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12788+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12789+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12790+test 0 -eq $? || _lt_function_replace_fail=:
12791+
12792+
12793+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12794+func_split_long_opt ()\
12795+{\
12796+\ func_split_long_opt_name=${1%%=*}\
12797+\ func_split_long_opt_arg=${1#*=}\
12798+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12799+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12800+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12801+test 0 -eq $? || _lt_function_replace_fail=:
12802+
12803+
12804+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12805+func_split_short_opt ()\
12806+{\
12807+\ func_split_short_opt_arg=${1#??}\
12808+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12809+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12810+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12811+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12812+test 0 -eq $? || _lt_function_replace_fail=:
12813+
12814+
12815+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12816+func_lo2o ()\
12817+{\
12818+\ case ${1} in\
12819+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12820+\ *) func_lo2o_result=${1} ;;\
12821+\ esac\
12822+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
12823+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12825+test 0 -eq $? || _lt_function_replace_fail=:
12826+
12827+
12828+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
12829+func_xform ()\
12830+{\
12831+ func_xform_result=${1%.*}.lo\
12832+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
12833+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12834+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12835+test 0 -eq $? || _lt_function_replace_fail=:
12836+
12837+
12838+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12839+func_arith ()\
12840+{\
12841+ func_arith_result=$(( $* ))\
12842+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12843+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12844+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12845+test 0 -eq $? || _lt_function_replace_fail=:
12846+
12847+
12848+ sed -e '/^func_len ()$/,/^} # func_len /c\
12849+func_len ()\
12850+{\
12851+ func_len_result=${#1}\
12852+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12853+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12854+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12855+test 0 -eq $? || _lt_function_replace_fail=:
12856+
12857+fi
12858+
12859+if test x"$lt_shell_append" = xyes; then
12860+ sed -e '/^func_append ()$/,/^} # func_append /c\
12861+func_append ()\
12862+{\
12863+ eval "${1}+=\\${2}"\
12864+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12865+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12866+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12867+test 0 -eq $? || _lt_function_replace_fail=:
12868+
12869+
12870+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12871+func_append_quoted ()\
12872+{\
12873+\ func_quote_for_eval "${2}"\
12874+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
12875+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
12876+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12877+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12878+test 0 -eq $? || _lt_function_replace_fail=:
12879+
12880+
12881+ # Save a `func_append' function call where possible by direct use of '+='
12882+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12883+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12884+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12885+ test 0 -eq $? || _lt_function_replace_fail=:
12886+else
12887+ # Save a `func_append' function call even when '+=' is not available
12888+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12889+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12890+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12891+ test 0 -eq $? || _lt_function_replace_fail=:
12892+fi
12893+
12894+if test x"$_lt_function_replace_fail" = x":"; then
12895+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12896+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12897+fi
12898
12899- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12900- || (rm -f "$cfgfile"; exit 1)
12901
12902- mv -f "$cfgfile" "$ofile" ||
12903+ mv -f "$cfgfile" "$ofile" ||
12904 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12905 chmod +x "$ofile"
12906
12907Index: binutils-2.21/gas/configure
12908===================================================================
12909--- binutils-2.21.orig/gas/configure
12910+++ binutils-2.21/gas/configure
12911@@ -645,8 +645,11 @@ OTOOL
12912 LIPO
12913 NMEDIT
12914 DSYMUTIL
12915+MANIFEST_TOOL
12916 RANLIB
12917+ac_ct_AR
12918 AR
12919+DLLTOOL
12920 OBJDUMP
12921 LN_S
12922 NM
12923@@ -759,6 +762,7 @@ enable_static
12924 with_pic
12925 enable_fast_install
12926 with_gnu_ld
12927+with_libtool_sysroot
12928 enable_libtool_lock
12929 enable_targets
12930 enable_checking
12931@@ -1420,6 +1424,8 @@ Optional Packages:
12932 --with-pic try to use only PIC/non-PIC objects [default=use
12933 both]
12934 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
12935+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
12936+ (or the compiler's sysroot if not specified).
12937 --with-zlib include zlib support (auto/yes/no) default=auto
12938
12939 Some influential environment variables:
12940@@ -5135,8 +5141,8 @@ esac
12941
12942
12943
12944-macro_version='2.2.7a'
12945-macro_revision='1.3134'
12946+macro_version='2.4'
12947+macro_revision='1.3293'
12948
12949
12950
12951@@ -5176,7 +5182,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
12953 $as_echo_n "checking how to print strings... " >&6; }
12954 # Test print first, because it will be a builtin if present.
12955-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
12956+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
12957 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12958 ECHO='print -r --'
12959 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12960@@ -5862,8 +5868,8 @@ $as_echo_n "checking whether the shell u
12961 # Try some XSI features
12962 xsi_shell=no
12963 ( _lt_dummy="a/b/c"
12964- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
12965- = c,a/b,, \
12966+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
12967+ = c,a/b,b/c, \
12968 && eval 'test $(( 1 + 1 )) -eq 2 \
12969 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
12970 && xsi_shell=yes
12971@@ -5912,6 +5918,80 @@ esac
12972
12973
12974
12975+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
12976+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
12977+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
12978+ $as_echo_n "(cached) " >&6
12979+else
12980+ case $host in
12981+ *-*-mingw* )
12982+ case $build in
12983+ *-*-mingw* ) # actually msys
12984+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
12985+ ;;
12986+ *-*-cygwin* )
12987+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
12988+ ;;
12989+ * ) # otherwise, assume *nix
12990+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
12991+ ;;
12992+ esac
12993+ ;;
12994+ *-*-cygwin* )
12995+ case $build in
12996+ *-*-mingw* ) # actually msys
12997+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
12998+ ;;
12999+ *-*-cygwin* )
13000+ lt_cv_to_host_file_cmd=func_convert_file_noop
13001+ ;;
13002+ * ) # otherwise, assume *nix
13003+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
13004+ ;;
13005+ esac
13006+ ;;
13007+ * ) # unhandled hosts (and "normal" native builds)
13008+ lt_cv_to_host_file_cmd=func_convert_file_noop
13009+ ;;
13010+esac
13011+
13012+fi
13013+
13014+to_host_file_cmd=$lt_cv_to_host_file_cmd
13015+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
13016+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
13017+
13018+
13019+
13020+
13021+
13022+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
13023+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
13024+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
13025+ $as_echo_n "(cached) " >&6
13026+else
13027+ #assume ordinary cross tools, or native build.
13028+lt_cv_to_tool_file_cmd=func_convert_file_noop
13029+case $host in
13030+ *-*-mingw* )
13031+ case $build in
13032+ *-*-mingw* ) # actually msys
13033+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
13034+ ;;
13035+ esac
13036+ ;;
13037+esac
13038+
13039+fi
13040+
13041+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
13042+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
13043+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
13044+
13045+
13046+
13047+
13048+
13049 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13050 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13051 if test "${lt_cv_ld_reload_flag+set}" = set; then :
13052@@ -5928,6 +6008,11 @@ case $reload_flag in
13053 esac
13054 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13055 case $host_os in
13056+ cygwin* | mingw* | pw32* | cegcc*)
13057+ if test "$GCC" != yes; then
13058+ reload_cmds=false
13059+ fi
13060+ ;;
13061 darwin*)
13062 if test "$GCC" = yes; then
13063 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13064@@ -6096,7 +6181,8 @@ mingw* | pw32*)
13065 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13066 lt_cv_file_magic_cmd='func_win32_libid'
13067 else
13068- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
13069+ # Keep this pattern in sync with the one in func_win32_libid.
13070+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
13071 lt_cv_file_magic_cmd='$OBJDUMP -f'
13072 fi
13073 ;;
13074@@ -6250,6 +6336,21 @@ esac
13075 fi
13076 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13077 $as_echo "$lt_cv_deplibs_check_method" >&6; }
13078+
13079+file_magic_glob=
13080+want_nocaseglob=no
13081+if test "$build" = "$host"; then
13082+ case $host_os in
13083+ mingw* | pw32*)
13084+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
13085+ want_nocaseglob=yes
13086+ else
13087+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
13088+ fi
13089+ ;;
13090+ esac
13091+fi
13092+
13093 file_magic_cmd=$lt_cv_file_magic_cmd
13094 deplibs_check_method=$lt_cv_deplibs_check_method
13095 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13096@@ -6265,9 +6366,162 @@ test -z "$deplibs_check_method" && depli
13097
13098
13099
13100+
13101+
13102+
13103+
13104+
13105+
13106+
13107+
13108+
13109+
13110+if test -n "$ac_tool_prefix"; then
13111+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
13112+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
13113+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13114+$as_echo_n "checking for $ac_word... " >&6; }
13115+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
13116+ $as_echo_n "(cached) " >&6
13117+else
13118+ if test -n "$DLLTOOL"; then
13119+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
13120+else
13121+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13122+for as_dir in $PATH
13123+do
13124+ IFS=$as_save_IFS
13125+ test -z "$as_dir" && as_dir=.
13126+ for ac_exec_ext in '' $ac_executable_extensions; do
13127+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13128+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
13129+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13130+ break 2
13131+ fi
13132+done
13133+ done
13134+IFS=$as_save_IFS
13135+
13136+fi
13137+fi
13138+DLLTOOL=$ac_cv_prog_DLLTOOL
13139+if test -n "$DLLTOOL"; then
13140+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
13141+$as_echo "$DLLTOOL" >&6; }
13142+else
13143+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13144+$as_echo "no" >&6; }
13145+fi
13146+
13147+
13148+fi
13149+if test -z "$ac_cv_prog_DLLTOOL"; then
13150+ ac_ct_DLLTOOL=$DLLTOOL
13151+ # Extract the first word of "dlltool", so it can be a program name with args.
13152+set dummy dlltool; ac_word=$2
13153+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13154+$as_echo_n "checking for $ac_word... " >&6; }
13155+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
13156+ $as_echo_n "(cached) " >&6
13157+else
13158+ if test -n "$ac_ct_DLLTOOL"; then
13159+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
13160+else
13161+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13162+for as_dir in $PATH
13163+do
13164+ IFS=$as_save_IFS
13165+ test -z "$as_dir" && as_dir=.
13166+ for ac_exec_ext in '' $ac_executable_extensions; do
13167+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13168+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
13169+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13170+ break 2
13171+ fi
13172+done
13173+ done
13174+IFS=$as_save_IFS
13175+
13176+fi
13177+fi
13178+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
13179+if test -n "$ac_ct_DLLTOOL"; then
13180+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
13181+$as_echo "$ac_ct_DLLTOOL" >&6; }
13182+else
13183+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13184+$as_echo "no" >&6; }
13185+fi
13186+
13187+ if test "x$ac_ct_DLLTOOL" = x; then
13188+ DLLTOOL="false"
13189+ else
13190+ case $cross_compiling:$ac_tool_warned in
13191+yes:)
13192+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13193+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13194+ac_tool_warned=yes ;;
13195+esac
13196+ DLLTOOL=$ac_ct_DLLTOOL
13197+ fi
13198+else
13199+ DLLTOOL="$ac_cv_prog_DLLTOOL"
13200+fi
13201+
13202+test -z "$DLLTOOL" && DLLTOOL=dlltool
13203+
13204+
13205+
13206+
13207+
13208+
13209+
13210+
13211+
13212+
13213+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
13214+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
13215+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
13216+ $as_echo_n "(cached) " >&6
13217+else
13218+ lt_cv_sharedlib_from_linklib_cmd='unknown'
13219+
13220+case $host_os in
13221+cygwin* | mingw* | pw32* | cegcc*)
13222+ # two different shell functions defined in ltmain.sh
13223+ # decide which to use based on capabilities of $DLLTOOL
13224+ case `$DLLTOOL --help 2>&1` in
13225+ *--identify-strict*)
13226+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
13227+ ;;
13228+ *)
13229+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
13230+ ;;
13231+ esac
13232+ ;;
13233+*)
13234+ # fallback: assume linklib IS sharedlib
13235+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
13236+ ;;
13237+esac
13238+
13239+fi
13240+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
13241+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
13242+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
13243+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
13244+
13245+
13246+
13247+
13248+
13249+
13250+
13251 if test -n "$ac_tool_prefix"; then
13252- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
13253-set dummy ${ac_tool_prefix}ar; ac_word=$2
13254+ for ac_prog in ar
13255+ do
13256+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
13257+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
13258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13259 $as_echo_n "checking for $ac_word... " >&6; }
13260 if test "${ac_cv_prog_AR+set}" = set; then :
13261@@ -6283,7 +6537,7 @@ do
13262 test -z "$as_dir" && as_dir=.
13263 for ac_exec_ext in '' $ac_executable_extensions; do
13264 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13265- ac_cv_prog_AR="${ac_tool_prefix}ar"
13266+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
13267 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13268 break 2
13269 fi
13270@@ -6303,11 +6557,15 @@ $as_echo "no" >&6; }
13271 fi
13272
13273
13274+ test -n "$AR" && break
13275+ done
13276 fi
13277-if test -z "$ac_cv_prog_AR"; then
13278+if test -z "$AR"; then
13279 ac_ct_AR=$AR
13280- # Extract the first word of "ar", so it can be a program name with args.
13281-set dummy ar; ac_word=$2
13282+ for ac_prog in ar
13283+do
13284+ # Extract the first word of "$ac_prog", so it can be a program name with args.
13285+set dummy $ac_prog; ac_word=$2
13286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13287 $as_echo_n "checking for $ac_word... " >&6; }
13288 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
13289@@ -6323,7 +6581,7 @@ do
13290 test -z "$as_dir" && as_dir=.
13291 for ac_exec_ext in '' $ac_executable_extensions; do
13292 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13293- ac_cv_prog_ac_ct_AR="ar"
13294+ ac_cv_prog_ac_ct_AR="$ac_prog"
13295 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13296 break 2
13297 fi
13298@@ -6342,6 +6600,10 @@ else
13299 $as_echo "no" >&6; }
13300 fi
13301
13302+
13303+ test -n "$ac_ct_AR" && break
13304+done
13305+
13306 if test "x$ac_ct_AR" = x; then
13307 AR="false"
13308 else
13309@@ -6353,16 +6615,72 @@ ac_tool_warned=yes ;;
13310 esac
13311 AR=$ac_ct_AR
13312 fi
13313-else
13314- AR="$ac_cv_prog_AR"
13315 fi
13316
13317-test -z "$AR" && AR=ar
13318-test -z "$AR_FLAGS" && AR_FLAGS=cru
13319+: ${AR=ar}
13320+: ${AR_FLAGS=cru}
13321+
13322+
13323+
13324+
13325+
13326+
13327+
13328+
13329+
13330+
13331+
13332+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13333+$as_echo_n "checking for archiver @FILE support... " >&6; }
13334+if test "${lt_cv_ar_at_file+set}" = set; then :
13335+ $as_echo_n "(cached) " >&6
13336+else
13337+ lt_cv_ar_at_file=no
13338+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13339+/* end confdefs.h. */
13340+
13341+int
13342+main ()
13343+{
13344
13345+ ;
13346+ return 0;
13347+}
13348+_ACEOF
13349+if ac_fn_c_try_compile "$LINENO"; then :
13350+ echo conftest.$ac_objext > conftest.lst
13351+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
13352+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13353+ (eval $lt_ar_try) 2>&5
13354+ ac_status=$?
13355+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13356+ test $ac_status = 0; }
13357+ if test "$ac_status" -eq 0; then
13358+ # Ensure the archiver fails upon bogus file names.
13359+ rm -f conftest.$ac_objext libconftest.a
13360+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13361+ (eval $lt_ar_try) 2>&5
13362+ ac_status=$?
13363+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13364+ test $ac_status = 0; }
13365+ if test "$ac_status" -ne 0; then
13366+ lt_cv_ar_at_file=@
13367+ fi
13368+ fi
13369+ rm -f conftest.* libconftest.a
13370
13371+fi
13372+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13373
13374+fi
13375+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13376+$as_echo "$lt_cv_ar_at_file" >&6; }
13377
13378+if test "x$lt_cv_ar_at_file" = xno; then
13379+ archiver_list_spec=
13380+else
13381+ archiver_list_spec=$lt_cv_ar_at_file
13382+fi
13383
13384
13385
13386@@ -6704,8 +7022,8 @@ esac
13387 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13388
13389 # Transform an extracted symbol line into symbol name and symbol address
13390-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13391-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'"
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
13395 # Handle CRLF in mingw tool chain
13396 opt_cr=
13397@@ -6741,6 +7059,7 @@ for ac_symprfx in "" "_"; do
13398 else
13399 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13400 fi
13401+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
13402
13403 # Check to see that the pipe works correctly.
13404 pipe_works=no
13405@@ -6782,6 +7101,18 @@ _LT_EOF
13406 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13407 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13408 cat <<_LT_EOF > conftest.$ac_ext
13409+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13410+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13411+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13412+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13413+# define LT_DLSYM_CONST
13414+#elif defined(__osf__)
13415+/* This system does not cope well with relocations in const data. */
13416+# define LT_DLSYM_CONST
13417+#else
13418+# define LT_DLSYM_CONST const
13419+#endif
13420+
13421 #ifdef __cplusplus
13422 extern "C" {
13423 #endif
13424@@ -6793,7 +7124,7 @@ _LT_EOF
13425 cat <<_LT_EOF >> conftest.$ac_ext
13426
13427 /* The mapping between symbol names and symbols. */
13428-const struct {
13429+LT_DLSYM_CONST struct {
13430 const char *name;
13431 void *address;
13432 }
13433@@ -6819,8 +7150,8 @@ static const void *lt_preloaded_setup()
13434 _LT_EOF
13435 # Now try linking the two files.
13436 mv conftest.$ac_objext conftstm.$ac_objext
13437- lt_save_LIBS="$LIBS"
13438- lt_save_CFLAGS="$CFLAGS"
13439+ lt_globsym_save_LIBS=$LIBS
13440+ lt_globsym_save_CFLAGS=$CFLAGS
13441 LIBS="conftstm.$ac_objext"
13442 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13443 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13444@@ -6830,8 +7161,8 @@ _LT_EOF
13445 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13446 pipe_works=yes
13447 fi
13448- LIBS="$lt_save_LIBS"
13449- CFLAGS="$lt_save_CFLAGS"
13450+ LIBS=$lt_globsym_save_LIBS
13451+ CFLAGS=$lt_globsym_save_CFLAGS
13452 else
13453 echo "cannot find nm_test_func in $nlist" >&5
13454 fi
13455@@ -6868,6 +7199,19 @@ else
13456 $as_echo "ok" >&6; }
13457 fi
13458
13459+# Response file support.
13460+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
13461+ nm_file_list_spec='@'
13462+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
13463+ nm_file_list_spec='@'
13464+fi
13465+
13466+
13467+
13468+
13469+
13470+
13471+
13472
13473
13474
13475@@ -6888,6 +7232,42 @@ fi
13476
13477
13478
13479+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
13480+$as_echo_n "checking for sysroot... " >&6; }
13481+
13482+# Check whether --with-libtool-sysroot was given.
13483+if test "${with_libtool_sysroot+set}" = set; then :
13484+ withval=$with_libtool_sysroot;
13485+else
13486+ with_libtool_sysroot=no
13487+fi
13488+
13489+
13490+lt_sysroot=
13491+case ${with_libtool_sysroot} in #(
13492+ yes)
13493+ if test "$GCC" = yes; then
13494+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
13495+ fi
13496+ ;; #(
13497+ /*)
13498+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
13499+ ;; #(
13500+ no|'')
13501+ ;; #(
13502+ *)
13503+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
13504+$as_echo "${with_libtool_sysroot}" >&6; }
13505+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
13506+ ;;
13507+esac
13508+
13509+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
13510+$as_echo "${lt_sysroot:-no}" >&6; }
13511+
13512+
13513+
13514+
13515
13516 # Check whether --enable-libtool-lock was given.
13517 if test "${enable_libtool_lock+set}" = set; then :
13518@@ -7082,6 +7462,123 @@ esac
13519
13520 need_locks="$enable_libtool_lock"
13521
13522+if test -n "$ac_tool_prefix"; then
13523+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
13524+set dummy ${ac_tool_prefix}mt; ac_word=$2
13525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13526+$as_echo_n "checking for $ac_word... " >&6; }
13527+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
13528+ $as_echo_n "(cached) " >&6
13529+else
13530+ if test -n "$MANIFEST_TOOL"; then
13531+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
13532+else
13533+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13534+for as_dir in $PATH
13535+do
13536+ IFS=$as_save_IFS
13537+ test -z "$as_dir" && as_dir=.
13538+ for ac_exec_ext in '' $ac_executable_extensions; do
13539+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13540+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
13541+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13542+ break 2
13543+ fi
13544+done
13545+ done
13546+IFS=$as_save_IFS
13547+
13548+fi
13549+fi
13550+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
13551+if test -n "$MANIFEST_TOOL"; then
13552+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
13553+$as_echo "$MANIFEST_TOOL" >&6; }
13554+else
13555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13556+$as_echo "no" >&6; }
13557+fi
13558+
13559+
13560+fi
13561+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
13562+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
13563+ # Extract the first word of "mt", so it can be a program name with args.
13564+set dummy mt; ac_word=$2
13565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13566+$as_echo_n "checking for $ac_word... " >&6; }
13567+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
13568+ $as_echo_n "(cached) " >&6
13569+else
13570+ if test -n "$ac_ct_MANIFEST_TOOL"; then
13571+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
13572+else
13573+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13574+for as_dir in $PATH
13575+do
13576+ IFS=$as_save_IFS
13577+ test -z "$as_dir" && as_dir=.
13578+ for ac_exec_ext in '' $ac_executable_extensions; do
13579+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13580+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
13581+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13582+ break 2
13583+ fi
13584+done
13585+ done
13586+IFS=$as_save_IFS
13587+
13588+fi
13589+fi
13590+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
13591+if test -n "$ac_ct_MANIFEST_TOOL"; then
13592+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
13593+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
13594+else
13595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13596+$as_echo "no" >&6; }
13597+fi
13598+
13599+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
13600+ MANIFEST_TOOL=":"
13601+ else
13602+ case $cross_compiling:$ac_tool_warned in
13603+yes:)
13604+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13605+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13606+ac_tool_warned=yes ;;
13607+esac
13608+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
13609+ fi
13610+else
13611+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
13612+fi
13613+
13614+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
13615+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
13616+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
13617+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
13618+ $as_echo_n "(cached) " >&6
13619+else
13620+ lt_cv_path_mainfest_tool=no
13621+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
13622+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
13623+ cat conftest.err >&5
13624+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
13625+ lt_cv_path_mainfest_tool=yes
13626+ fi
13627+ rm -f conftest*
13628+fi
13629+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
13630+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
13631+if test "x$lt_cv_path_mainfest_tool" != xyes; then
13632+ MANIFEST_TOOL=:
13633+fi
13634+
13635+
13636+
13637+
13638+
13639
13640 case $host_os in
13641 rhapsody* | darwin*)
13642@@ -7645,6 +8142,8 @@ _LT_EOF
13643 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13644 echo "$AR cru libconftest.a conftest.o" >&5
13645 $AR cru libconftest.a conftest.o 2>&5
13646+ echo "$RANLIB libconftest.a" >&5
13647+ $RANLIB libconftest.a 2>&5
13648 cat > conftest.c << _LT_EOF
13649 int main() { return 0;}
13650 _LT_EOF
13651@@ -7840,7 +8339,8 @@ fi
13652 LIBTOOL_DEPS="$ltmain"
13653
13654 # Always use our own libtool.
13655-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
13656+LIBTOOL='$(SHELL) $(top_builddir)'
13657+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
13658
13659
13660
13661@@ -7929,7 +8429,7 @@ aix3*)
13662 esac
13663
13664 # Global variables:
13665-ofile=libtool
13666+ofile=${host_alias}-libtool
13667 can_build_shared=yes
13668
13669 # All known linkers require a `.a' archive for static linking (except MSVC,
13670@@ -8227,8 +8727,6 @@ fi
13671 lt_prog_compiler_pic=
13672 lt_prog_compiler_static=
13673
13674-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13675-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13676
13677 if test "$GCC" = yes; then
13678 lt_prog_compiler_wl='-Wl,'
13679@@ -8393,6 +8891,12 @@ $as_echo_n "checking for $compiler optio
13680 lt_prog_compiler_pic='--shared'
13681 lt_prog_compiler_static='--static'
13682 ;;
13683+ nagfor*)
13684+ # NAG Fortran compiler
13685+ lt_prog_compiler_wl='-Wl,-Wl,,'
13686+ lt_prog_compiler_pic='-PIC'
13687+ lt_prog_compiler_static='-Bstatic'
13688+ ;;
13689 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13690 # Portland Group compilers (*not* the Pentium gcc compiler,
13691 # which looks to be a dead project)
13692@@ -8455,7 +8959,7 @@ $as_echo_n "checking for $compiler optio
13693 lt_prog_compiler_pic='-KPIC'
13694 lt_prog_compiler_static='-Bstatic'
13695 case $cc_basename in
13696- f77* | f90* | f95*)
13697+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
13698 lt_prog_compiler_wl='-Qoption ld ';;
13699 *)
13700 lt_prog_compiler_wl='-Wl,';;
13701@@ -8512,13 +9016,17 @@ case $host_os in
13702 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13703 ;;
13704 esac
13705-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
13706-$as_echo "$lt_prog_compiler_pic" >&6; }
13707-
13708-
13709-
13710-
13711
13712+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13713+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13714+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
13715+ $as_echo_n "(cached) " >&6
13716+else
13717+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
13718+fi
13719+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
13720+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
13721+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
13722
13723 #
13724 # Check to make sure the PIC flag actually works.
13725@@ -8579,6 +9087,11 @@ fi
13726
13727
13728
13729+
13730+
13731+
13732+
13733+
13734 #
13735 # Check to make sure the static flag actually works.
13736 #
13737@@ -8929,7 +9442,8 @@ _LT_EOF
13738 allow_undefined_flag=unsupported
13739 always_export_symbols=no
13740 enable_shared_with_static_runtimes=yes
13741- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13742+ 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'
13743+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
13744
13745 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13746 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13747@@ -8977,7 +9491,7 @@ _LT_EOF
13748 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
13749 && test "$tmp_diet" = no
13750 then
13751- tmp_addflag=
13752+ tmp_addflag=' $pic_flag'
13753 tmp_sharedflag='-shared'
13754 case $cc_basename,$host_cpu in
13755 pgcc*) # Portland Group C compiler
13756@@ -9028,12 +9542,12 @@ _LT_EOF
13757 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13758 hardcode_libdir_flag_spec=
13759 hardcode_libdir_flag_spec_ld='-rpath $libdir'
13760- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
13761+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
13762 if test "x$supports_anon_versioning" = xyes; then
13763 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
13764 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
13765 echo "local: *; };" >> $output_objdir/$libname.ver~
13766- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13767+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13768 fi
13769 ;;
13770 esac
13771@@ -9047,8 +9561,8 @@ _LT_EOF
13772 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13773 wlarc=
13774 else
13775- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13776- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13777+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13778+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13779 fi
13780 ;;
13781
13782@@ -9066,8 +9580,8 @@ _LT_EOF
13783
13784 _LT_EOF
13785 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13786- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13787- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13788+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13789+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13790 else
13791 ld_shlibs=no
13792 fi
13793@@ -9113,8 +9627,8 @@ _LT_EOF
13794
13795 *)
13796 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13797- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13798- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13799+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13800+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13801 else
13802 ld_shlibs=no
13803 fi
13804@@ -9244,7 +9758,13 @@ _LT_EOF
13805 allow_undefined_flag='-berok'
13806 # Determine the default libpath from the value encoded in an
13807 # empty executable.
13808- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13809+ if test "${lt_cv_aix_libpath+set}" = set; then
13810+ aix_libpath=$lt_cv_aix_libpath
13811+else
13812+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13813+ $as_echo_n "(cached) " >&6
13814+else
13815+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13816 /* end confdefs.h. */
13817
13818 int
13819@@ -9257,22 +9777,29 @@ main ()
13820 _ACEOF
13821 if ac_fn_c_try_link "$LINENO"; then :
13822
13823-lt_aix_libpath_sed='
13824- /Import File Strings/,/^$/ {
13825- /^0/ {
13826- s/^0 *\(.*\)$/\1/
13827- p
13828- }
13829- }'
13830-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13831-# Check for a 64-bit object if we didn't find anything.
13832-if test -z "$aix_libpath"; then
13833- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13834-fi
13835+ lt_aix_libpath_sed='
13836+ /Import File Strings/,/^$/ {
13837+ /^0/ {
13838+ s/^0 *\([^ ]*\) *$/\1/
13839+ p
13840+ }
13841+ }'
13842+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13843+ # Check for a 64-bit object if we didn't find anything.
13844+ if test -z "$lt_cv_aix_libpath_"; then
13845+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13846+ fi
13847 fi
13848 rm -f core conftest.err conftest.$ac_objext \
13849 conftest$ac_exeext conftest.$ac_ext
13850-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13851+ if test -z "$lt_cv_aix_libpath_"; then
13852+ lt_cv_aix_libpath_="/usr/lib:/lib"
13853+ fi
13854+
13855+fi
13856+
13857+ aix_libpath=$lt_cv_aix_libpath_
13858+fi
13859
13860 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13861 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"
13862@@ -9284,7 +9811,13 @@ if test -z "$aix_libpath"; then aix_libp
13863 else
13864 # Determine the default libpath from the value encoded in an
13865 # empty executable.
13866- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13867+ if test "${lt_cv_aix_libpath+set}" = set; then
13868+ aix_libpath=$lt_cv_aix_libpath
13869+else
13870+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13871+ $as_echo_n "(cached) " >&6
13872+else
13873+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13874 /* end confdefs.h. */
13875
13876 int
13877@@ -9297,22 +9830,29 @@ main ()
13878 _ACEOF
13879 if ac_fn_c_try_link "$LINENO"; then :
13880
13881-lt_aix_libpath_sed='
13882- /Import File Strings/,/^$/ {
13883- /^0/ {
13884- s/^0 *\(.*\)$/\1/
13885- p
13886- }
13887- }'
13888-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13889-# Check for a 64-bit object if we didn't find anything.
13890-if test -z "$aix_libpath"; then
13891- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13892-fi
13893+ lt_aix_libpath_sed='
13894+ /Import File Strings/,/^$/ {
13895+ /^0/ {
13896+ s/^0 *\([^ ]*\) *$/\1/
13897+ p
13898+ }
13899+ }'
13900+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13901+ # Check for a 64-bit object if we didn't find anything.
13902+ if test -z "$lt_cv_aix_libpath_"; then
13903+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13904+ fi
13905 fi
13906 rm -f core conftest.err conftest.$ac_objext \
13907 conftest$ac_exeext conftest.$ac_ext
13908-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13909+ if test -z "$lt_cv_aix_libpath_"; then
13910+ lt_cv_aix_libpath_="/usr/lib:/lib"
13911+ fi
13912+
13913+fi
13914+
13915+ aix_libpath=$lt_cv_aix_libpath_
13916+fi
13917
13918 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13919 # Warning - without using the other run time loading flags,
13920@@ -9357,20 +9897,63 @@ if test -z "$aix_libpath"; then aix_libp
13921 # Microsoft Visual C++.
13922 # hardcode_libdir_flag_spec is actually meaningless, as there is
13923 # no search path for DLLs.
13924- hardcode_libdir_flag_spec=' '
13925- allow_undefined_flag=unsupported
13926- # Tell ltmain to make .lib files, not .a files.
13927- libext=lib
13928- # Tell ltmain to make .dll files, not .so files.
13929- shrext_cmds=".dll"
13930- # FIXME: Setting linknames here is a bad hack.
13931- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
13932- # The linker will automatically build a .lib file if we build a DLL.
13933- old_archive_from_new_cmds='true'
13934- # FIXME: Should let the user specify the lib program.
13935- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
13936- fix_srcfile_path='`cygpath -w "$srcfile"`'
13937- enable_shared_with_static_runtimes=yes
13938+ case $cc_basename in
13939+ cl*)
13940+ # Native MSVC
13941+ hardcode_libdir_flag_spec=' '
13942+ allow_undefined_flag=unsupported
13943+ always_export_symbols=yes
13944+ file_list_spec='@'
13945+ # Tell ltmain to make .lib files, not .a files.
13946+ libext=lib
13947+ # Tell ltmain to make .dll files, not .so files.
13948+ shrext_cmds=".dll"
13949+ # FIXME: Setting linknames here is a bad hack.
13950+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
13951+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
13952+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
13953+ else
13954+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
13955+ fi~
13956+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
13957+ linknames='
13958+ # The linker will not automatically build a static lib if we build a DLL.
13959+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
13960+ enable_shared_with_static_runtimes=yes
13961+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13962+ # Don't use ranlib
13963+ old_postinstall_cmds='chmod 644 $oldlib'
13964+ postlink_cmds='lt_outputfile="@OUTPUT@"~
13965+ lt_tool_outputfile="@TOOL_OUTPUT@"~
13966+ case $lt_outputfile in
13967+ *.exe|*.EXE) ;;
13968+ *)
13969+ lt_outputfile="$lt_outputfile.exe"
13970+ lt_tool_outputfile="$lt_tool_outputfile.exe"
13971+ ;;
13972+ esac~
13973+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
13974+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
13975+ $RM "$lt_outputfile.manifest";
13976+ fi'
13977+ ;;
13978+ *)
13979+ # Assume MSVC wrapper
13980+ hardcode_libdir_flag_spec=' '
13981+ allow_undefined_flag=unsupported
13982+ # Tell ltmain to make .lib files, not .a files.
13983+ libext=lib
13984+ # Tell ltmain to make .dll files, not .so files.
13985+ shrext_cmds=".dll"
13986+ # FIXME: Setting linknames here is a bad hack.
13987+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
13988+ # The linker will automatically build a .lib file if we build a DLL.
13989+ old_archive_from_new_cmds='true'
13990+ # FIXME: Should let the user specify the lib program.
13991+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
13992+ enable_shared_with_static_runtimes=yes
13993+ ;;
13994+ esac
13995 ;;
13996
13997 darwin* | rhapsody*)
13998@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libp
13999
14000 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14001 freebsd* | dragonfly*)
14002- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14003+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14004 hardcode_libdir_flag_spec='-R$libdir'
14005 hardcode_direct=yes
14006 hardcode_shlibpath_var=no
14007@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libp
14008
14009 hpux9*)
14010 if test "$GCC" = yes; then
14011- 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'
14012+ 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'
14013 else
14014 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'
14015 fi
14016@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libp
14017
14018 hpux10*)
14019 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
14020- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14021+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14022 else
14023 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14024 fi
14025@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libp
14026 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14027 ;;
14028 ia64*)
14029- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14030+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14031 ;;
14032 *)
14033- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14034+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14035 ;;
14036 esac
14037 else
14038@@ -9565,23 +10148,36 @@ fi
14039
14040 irix5* | irix6* | nonstopux*)
14041 if test "$GCC" = yes; then
14042- 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'
14043+ 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'
14044 # Try to use the -exported_symbol ld option, if it does not
14045 # work, assume that -exports_file does not work either and
14046 # implicitly export all symbols.
14047- save_LDFLAGS="$LDFLAGS"
14048- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14049- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14050+ # This should be the same for all languages, so no per-tag cache variable.
14051+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
14052+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
14053+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
14054+ $as_echo_n "(cached) " >&6
14055+else
14056+ save_LDFLAGS="$LDFLAGS"
14057+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14058+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14059 /* end confdefs.h. */
14060-int foo(void) {}
14061+int foo (void) { return 0; }
14062 _ACEOF
14063 if ac_fn_c_try_link "$LINENO"; then :
14064- 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'
14065-
14066+ lt_cv_irix_exported_symbol=yes
14067+else
14068+ lt_cv_irix_exported_symbol=no
14069 fi
14070 rm -f core conftest.err conftest.$ac_objext \
14071 conftest$ac_exeext conftest.$ac_ext
14072- LDFLAGS="$save_LDFLAGS"
14073+ LDFLAGS="$save_LDFLAGS"
14074+fi
14075+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
14076+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
14077+ if test "$lt_cv_irix_exported_symbol" = yes; then
14078+ 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'
14079+ fi
14080 else
14081 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'
14082 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'
14083@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_obj
14084 osf4* | osf5*) # as osf3* with the addition of -msym flag
14085 if test "$GCC" = yes; then
14086 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
14087- 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'
14088+ 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'
14089 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14090 else
14091 allow_undefined_flag=' -expect_unresolved \*'
14092@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_obj
14093 no_undefined_flag=' -z defs'
14094 if test "$GCC" = yes; then
14095 wlarc='${wl}'
14096- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14097+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14098 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
14099- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
14100+ $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'
14101 else
14102 case `$CC -V 2>&1` in
14103 *"Compilers 5.0"*)
14104@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14105 need_version=no
14106 need_lib_prefix=no
14107
14108- case $GCC,$host_os in
14109- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
14110+ case $GCC,$cc_basename in
14111+ yes,*)
14112+ # gcc
14113 library_names_spec='$libname.dll.a'
14114 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14115 postinstall_cmds='base_file=`basename \${file}`~
14116@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14117 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14118 ;;
14119 esac
14120+ dynamic_linker='Win32 ld.exe'
14121+ ;;
14122+
14123+ *,cl*)
14124+ # Native MSVC
14125+ libname_spec='$name'
14126+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14127+ library_names_spec='${libname}.dll.lib'
14128+
14129+ case $build_os in
14130+ mingw*)
14131+ sys_lib_search_path_spec=
14132+ lt_save_ifs=$IFS
14133+ IFS=';'
14134+ for lt_path in $LIB
14135+ do
14136+ IFS=$lt_save_ifs
14137+ # Let DOS variable expansion print the short 8.3 style file name.
14138+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
14139+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
14140+ done
14141+ IFS=$lt_save_ifs
14142+ # Convert to MSYS style.
14143+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
14144+ ;;
14145+ cygwin*)
14146+ # Convert to unix form, then to dos form, then back to unix form
14147+ # but this time dos style (no spaces!) so that the unix form looks
14148+ # like /cygdrive/c/PROGRA~1:/cygdr...
14149+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
14150+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
14151+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14152+ ;;
14153+ *)
14154+ sys_lib_search_path_spec="$LIB"
14155+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
14156+ # It is most probably a Windows format PATH.
14157+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
14158+ else
14159+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14160+ fi
14161+ # FIXME: find the short name or the path components, as spaces are
14162+ # common. (e.g. "Program Files" -> "PROGRA~1")
14163+ ;;
14164+ esac
14165+
14166+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
14167+ postinstall_cmds='base_file=`basename \${file}`~
14168+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
14169+ dldir=$destdir/`dirname \$dlpath`~
14170+ test -d \$dldir || mkdir -p \$dldir~
14171+ $install_prog $dir/$dlname \$dldir/$dlname'
14172+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14173+ dlpath=$dir/\$dldll~
14174+ $RM \$dlpath'
14175+ shlibpath_overrides_runpath=yes
14176+ dynamic_linker='Win32 link.exe'
14177 ;;
14178
14179 *)
14180+ # Assume MSVC wrapper
14181 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
14182+ dynamic_linker='Win32 ld.exe'
14183 ;;
14184 esac
14185- dynamic_linker='Win32 ld.exe'
14186 # FIXME: first we should search . and the directory the executable is in
14187 shlibpath_var=PATH
14188 ;;
14189@@ -10399,7 +11054,7 @@ haiku*)
14190 soname_spec='${libname}${release}${shared_ext}$major'
14191 shlibpath_var=LIBRARY_PATH
14192 shlibpath_overrides_runpath=yes
14193- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
14194+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
14195 hardcode_into_libs=yes
14196 ;;
14197
14198@@ -11195,7 +11850,7 @@ else
14199 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14200 lt_status=$lt_dlunknown
14201 cat > conftest.$ac_ext <<_LT_EOF
14202-#line 11198 "configure"
14203+#line $LINENO "configure"
14204 #include "confdefs.h"
14205
14206 #if HAVE_DLFCN_H
14207@@ -11239,10 +11894,10 @@ else
14208 /* When -fvisbility=hidden is used, assume the code has been annotated
14209 correspondingly for the symbols needed. */
14210 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14211-void fnord () __attribute__((visibility("default")));
14212+int fnord () __attribute__((visibility("default")));
14213 #endif
14214
14215-void fnord () { int i=42; }
14216+int fnord () { return 42; }
14217 int main ()
14218 {
14219 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14220@@ -11301,7 +11956,7 @@ else
14221 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14222 lt_status=$lt_dlunknown
14223 cat > conftest.$ac_ext <<_LT_EOF
14224-#line 11304 "configure"
14225+#line $LINENO "configure"
14226 #include "confdefs.h"
14227
14228 #if HAVE_DLFCN_H
14229@@ -11345,10 +12000,10 @@ else
14230 /* When -fvisbility=hidden is used, assume the code has been annotated
14231 correspondingly for the symbols needed. */
14232 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14233-void fnord () __attribute__((visibility("default")));
14234+int fnord () __attribute__((visibility("default")));
14235 #endif
14236
14237-void fnord () { int i=42; }
14238+int fnord () { return 42; }
14239 int main ()
14240 {
14241 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14242@@ -14941,13 +15596,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
14243 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
14244 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
14245 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
14246+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
14247+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
14248 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
14249 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
14250 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
14251 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
14252 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
14253+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
14254+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
14255+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
14256+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
14257 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
14258 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
14259+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
14260 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
14261 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
14262 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
14263@@ -14962,14 +15624,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
14264 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
14265 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
14266 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"`'
14267+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
14268+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
14269 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
14270 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
14271 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
14272-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14273 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
14274+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14275 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
14276 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
14277 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
14278+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
14279 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
14280 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
14281 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
14282@@ -15002,12 +15667,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
14283 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
14284 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
14285 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
14286-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
14287 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
14288 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
14289 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
14290 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
14291 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
14292+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
14293 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
14294 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
14295 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
14296@@ -15062,8 +15727,13 @@ reload_flag \
14297 OBJDUMP \
14298 deplibs_check_method \
14299 file_magic_cmd \
14300+file_magic_glob \
14301+want_nocaseglob \
14302+DLLTOOL \
14303+sharedlib_from_linklib_cmd \
14304 AR \
14305 AR_FLAGS \
14306+archiver_list_spec \
14307 STRIP \
14308 RANLIB \
14309 CC \
14310@@ -15073,12 +15743,14 @@ lt_cv_sys_global_symbol_pipe \
14311 lt_cv_sys_global_symbol_to_cdecl \
14312 lt_cv_sys_global_symbol_to_c_name_address \
14313 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
14314+nm_file_list_spec \
14315 lt_prog_compiler_no_builtin_flag \
14316-lt_prog_compiler_wl \
14317 lt_prog_compiler_pic \
14318+lt_prog_compiler_wl \
14319 lt_prog_compiler_static \
14320 lt_cv_prog_compiler_c_o \
14321 need_locks \
14322+MANIFEST_TOOL \
14323 DSYMUTIL \
14324 NMEDIT \
14325 LIPO \
14326@@ -15094,7 +15766,6 @@ no_undefined_flag \
14327 hardcode_libdir_flag_spec \
14328 hardcode_libdir_flag_spec_ld \
14329 hardcode_libdir_separator \
14330-fix_srcfile_path \
14331 exclude_expsyms \
14332 include_expsyms \
14333 file_list_spec \
14334@@ -15130,6 +15801,7 @@ module_cmds \
14335 module_expsym_cmds \
14336 export_symbols_cmds \
14337 prelink_cmds \
14338+postlink_cmds \
14339 postinstall_cmds \
14340 postuninstall_cmds \
14341 finish_cmds \
14342@@ -15894,7 +16566,8 @@ $as_echo X"$file" |
14343 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
14344 #
14345 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14346-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
14347+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
14348+# Inc.
14349 # Written by Gordon Matzigkeit, 1996
14350 #
14351 # This file is part of GNU Libtool.
14352@@ -15997,19 +16670,42 @@ SP2NL=$lt_lt_SP2NL
14353 # turn newlines into spaces.
14354 NL2SP=$lt_lt_NL2SP
14355
14356+# convert \$build file names to \$host format.
14357+to_host_file_cmd=$lt_cv_to_host_file_cmd
14358+
14359+# convert \$build files to toolchain format.
14360+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14361+
14362 # An object symbol dumper.
14363 OBJDUMP=$lt_OBJDUMP
14364
14365 # Method to check whether dependent libraries are shared objects.
14366 deplibs_check_method=$lt_deplibs_check_method
14367
14368-# Command to use when deplibs_check_method == "file_magic".
14369+# Command to use when deplibs_check_method = "file_magic".
14370 file_magic_cmd=$lt_file_magic_cmd
14371
14372+# How to find potential files when deplibs_check_method = "file_magic".
14373+file_magic_glob=$lt_file_magic_glob
14374+
14375+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
14376+want_nocaseglob=$lt_want_nocaseglob
14377+
14378+# DLL creation program.
14379+DLLTOOL=$lt_DLLTOOL
14380+
14381+# Command to associate shared and link libraries.
14382+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
14383+
14384 # The archiver.
14385 AR=$lt_AR
14386+
14387+# Flags to create an archive.
14388 AR_FLAGS=$lt_AR_FLAGS
14389
14390+# How to feed a file listing to the archiver.
14391+archiver_list_spec=$lt_archiver_list_spec
14392+
14393 # A symbol stripping program.
14394 STRIP=$lt_STRIP
14395
14396@@ -16039,6 +16735,12 @@ global_symbol_to_c_name_address=$lt_lt_c
14397 # Transform the output of nm in a C name address pair when lib prefix is needed.
14398 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
14399
14400+# Specify filename containing input files for \$NM.
14401+nm_file_list_spec=$lt_nm_file_list_spec
14402+
14403+# The root where to search for dependent libraries,and in which our libraries should be installed.
14404+lt_sysroot=$lt_sysroot
14405+
14406 # The name of the directory that contains temporary libtool files.
14407 objdir=$objdir
14408
14409@@ -16048,6 +16750,9 @@ MAGIC_CMD=$MAGIC_CMD
14410 # Must we lock files when doing compilation?
14411 need_locks=$lt_need_locks
14412
14413+# Manifest tool.
14414+MANIFEST_TOOL=$lt_MANIFEST_TOOL
14415+
14416 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
14417 DSYMUTIL=$lt_DSYMUTIL
14418
14419@@ -16162,12 +16867,12 @@ with_gcc=$GCC
14420 # Compiler flag to turn off builtin functions.
14421 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
14422
14423-# How to pass a linker flag through the compiler.
14424-wl=$lt_lt_prog_compiler_wl
14425-
14426 # Additional compiler flags for building library objects.
14427 pic_flag=$lt_lt_prog_compiler_pic
14428
14429+# How to pass a linker flag through the compiler.
14430+wl=$lt_lt_prog_compiler_wl
14431+
14432 # Compiler flag to prevent dynamic linking.
14433 link_static_flag=$lt_lt_prog_compiler_static
14434
14435@@ -16254,9 +16959,6 @@ inherit_rpath=$inherit_rpath
14436 # Whether libtool must link a program against all its dependency libraries.
14437 link_all_deplibs=$link_all_deplibs
14438
14439-# Fix the shell variable \$srcfile for the compiler.
14440-fix_srcfile_path=$lt_fix_srcfile_path
14441-
14442 # Set to "yes" if exported symbols are required.
14443 always_export_symbols=$always_export_symbols
14444
14445@@ -16272,6 +16974,9 @@ include_expsyms=$lt_include_expsyms
14446 # Commands necessary for linking programs (against libraries) with templates.
14447 prelink_cmds=$lt_prelink_cmds
14448
14449+# Commands necessary for finishing linking programs.
14450+postlink_cmds=$lt_postlink_cmds
14451+
14452 # Specify filename containing input files.
14453 file_list_spec=$lt_file_list_spec
14454
14455@@ -16304,210 +17009,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
14456 # if finds mixed CR/LF and LF-only lines. Since sed operates in
14457 # text mode, it properly converts lines to CR/LF. This bash problem
14458 # is reportedly fixed, but why not run on old versions too?
14459- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
14460- || (rm -f "$cfgfile"; exit 1)
14461-
14462- case $xsi_shell in
14463- yes)
14464- cat << \_LT_EOF >> "$cfgfile"
14465-
14466-# func_dirname file append nondir_replacement
14467-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14468-# otherwise set result to NONDIR_REPLACEMENT.
14469-func_dirname ()
14470-{
14471- case ${1} in
14472- */*) func_dirname_result="${1%/*}${2}" ;;
14473- * ) func_dirname_result="${3}" ;;
14474- esac
14475-}
14476-
14477-# func_basename file
14478-func_basename ()
14479-{
14480- func_basename_result="${1##*/}"
14481-}
14482-
14483-# func_dirname_and_basename file append nondir_replacement
14484-# perform func_basename and func_dirname in a single function
14485-# call:
14486-# dirname: Compute the dirname of FILE. If nonempty,
14487-# add APPEND to the result, otherwise set result
14488-# to NONDIR_REPLACEMENT.
14489-# value returned in "$func_dirname_result"
14490-# basename: Compute filename of FILE.
14491-# value retuned in "$func_basename_result"
14492-# Implementation must be kept synchronized with func_dirname
14493-# and func_basename. For efficiency, we do not delegate to
14494-# those functions but instead duplicate the functionality here.
14495-func_dirname_and_basename ()
14496-{
14497- case ${1} in
14498- */*) func_dirname_result="${1%/*}${2}" ;;
14499- * ) func_dirname_result="${3}" ;;
14500- esac
14501- func_basename_result="${1##*/}"
14502-}
14503-
14504-# func_stripname prefix suffix name
14505-# strip PREFIX and SUFFIX off of NAME.
14506-# PREFIX and SUFFIX must not contain globbing or regex special
14507-# characters, hashes, percent signs, but SUFFIX may contain a leading
14508-# dot (in which case that matches only a dot).
14509-func_stripname ()
14510-{
14511- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
14512- # positional parameters, so assign one to ordinary parameter first.
14513- func_stripname_result=${3}
14514- func_stripname_result=${func_stripname_result#"${1}"}
14515- func_stripname_result=${func_stripname_result%"${2}"}
14516-}
14517-
14518-# func_opt_split
14519-func_opt_split ()
14520-{
14521- func_opt_split_opt=${1%%=*}
14522- func_opt_split_arg=${1#*=}
14523-}
14524-
14525-# func_lo2o object
14526-func_lo2o ()
14527-{
14528- case ${1} in
14529- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
14530- *) func_lo2o_result=${1} ;;
14531- esac
14532-}
14533-
14534-# func_xform libobj-or-source
14535-func_xform ()
14536-{
14537- func_xform_result=${1%.*}.lo
14538-}
14539-
14540-# func_arith arithmetic-term...
14541-func_arith ()
14542-{
14543- func_arith_result=$(( $* ))
14544-}
14545-
14546-# func_len string
14547-# STRING may not start with a hyphen.
14548-func_len ()
14549-{
14550- func_len_result=${#1}
14551-}
14552-
14553-_LT_EOF
14554- ;;
14555- *) # Bourne compatible functions.
14556- cat << \_LT_EOF >> "$cfgfile"
14557-
14558-# func_dirname file append nondir_replacement
14559-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14560-# otherwise set result to NONDIR_REPLACEMENT.
14561-func_dirname ()
14562-{
14563- # Extract subdirectory from the argument.
14564- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
14565- if test "X$func_dirname_result" = "X${1}"; then
14566- func_dirname_result="${3}"
14567- else
14568- func_dirname_result="$func_dirname_result${2}"
14569- fi
14570-}
14571-
14572-# func_basename file
14573-func_basename ()
14574-{
14575- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
14576-}
14577-
14578-
14579-# func_stripname prefix suffix name
14580-# strip PREFIX and SUFFIX off of NAME.
14581-# PREFIX and SUFFIX must not contain globbing or regex special
14582-# characters, hashes, percent signs, but SUFFIX may contain a leading
14583-# dot (in which case that matches only a dot).
14584-# func_strip_suffix prefix name
14585-func_stripname ()
14586-{
14587- case ${2} in
14588- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
14589- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
14590- esac
14591-}
14592-
14593-# sed scripts:
14594-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
14595-my_sed_long_arg='1s/^-[^=]*=//'
14596-
14597-# func_opt_split
14598-func_opt_split ()
14599-{
14600- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
14601- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
14602-}
14603-
14604-# func_lo2o object
14605-func_lo2o ()
14606-{
14607- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
14608-}
14609-
14610-# func_xform libobj-or-source
14611-func_xform ()
14612-{
14613- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
14614-}
14615-
14616-# func_arith arithmetic-term...
14617-func_arith ()
14618-{
14619- func_arith_result=`expr "$@"`
14620-}
14621-
14622-# func_len string
14623-# STRING may not start with a hyphen.
14624-func_len ()
14625-{
14626- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
14627-}
14628-
14629-_LT_EOF
14630-esac
14631-
14632-case $lt_shell_append in
14633- yes)
14634- cat << \_LT_EOF >> "$cfgfile"
14635-
14636-# func_append var value
14637-# Append VALUE to the end of shell variable VAR.
14638-func_append ()
14639-{
14640- eval "$1+=\$2"
14641-}
14642-_LT_EOF
14643- ;;
14644- *)
14645- cat << \_LT_EOF >> "$cfgfile"
14646-
14647-# func_append var value
14648-# Append VALUE to the end of shell variable VAR.
14649-func_append ()
14650-{
14651- eval "$1=\$$1\$2"
14652-}
14653-
14654-_LT_EOF
14655- ;;
14656- esac
14657+ sed '$q' "$ltmain" >> "$cfgfile" \
14658+ || (rm -f "$cfgfile"; exit 1)
14659
14660+ if test x"$xsi_shell" = xyes; then
14661+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
14662+func_dirname ()\
14663+{\
14664+\ case ${1} in\
14665+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14666+\ * ) func_dirname_result="${3}" ;;\
14667+\ esac\
14668+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
14669+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14670+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14671+test 0 -eq $? || _lt_function_replace_fail=:
14672+
14673+
14674+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
14675+func_basename ()\
14676+{\
14677+\ func_basename_result="${1##*/}"\
14678+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
14679+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14680+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14681+test 0 -eq $? || _lt_function_replace_fail=:
14682+
14683+
14684+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
14685+func_dirname_and_basename ()\
14686+{\
14687+\ case ${1} in\
14688+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14689+\ * ) func_dirname_result="${3}" ;;\
14690+\ esac\
14691+\ func_basename_result="${1##*/}"\
14692+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
14693+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14694+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14695+test 0 -eq $? || _lt_function_replace_fail=:
14696+
14697+
14698+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
14699+func_stripname ()\
14700+{\
14701+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
14702+\ # positional parameters, so assign one to ordinary parameter first.\
14703+\ func_stripname_result=${3}\
14704+\ func_stripname_result=${func_stripname_result#"${1}"}\
14705+\ func_stripname_result=${func_stripname_result%"${2}"}\
14706+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
14707+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14708+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14709+test 0 -eq $? || _lt_function_replace_fail=:
14710+
14711+
14712+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
14713+func_split_long_opt ()\
14714+{\
14715+\ func_split_long_opt_name=${1%%=*}\
14716+\ func_split_long_opt_arg=${1#*=}\
14717+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
14718+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14719+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14720+test 0 -eq $? || _lt_function_replace_fail=:
14721+
14722+
14723+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
14724+func_split_short_opt ()\
14725+{\
14726+\ func_split_short_opt_arg=${1#??}\
14727+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
14728+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
14729+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14730+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14731+test 0 -eq $? || _lt_function_replace_fail=:
14732+
14733+
14734+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
14735+func_lo2o ()\
14736+{\
14737+\ case ${1} in\
14738+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
14739+\ *) func_lo2o_result=${1} ;;\
14740+\ esac\
14741+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
14742+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14743+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14744+test 0 -eq $? || _lt_function_replace_fail=:
14745+
14746+
14747+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
14748+func_xform ()\
14749+{\
14750+ func_xform_result=${1%.*}.lo\
14751+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
14752+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14753+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14754+test 0 -eq $? || _lt_function_replace_fail=:
14755+
14756+
14757+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
14758+func_arith ()\
14759+{\
14760+ func_arith_result=$(( $* ))\
14761+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
14762+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14764+test 0 -eq $? || _lt_function_replace_fail=:
14765+
14766+
14767+ sed -e '/^func_len ()$/,/^} # func_len /c\
14768+func_len ()\
14769+{\
14770+ func_len_result=${#1}\
14771+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
14772+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14773+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14774+test 0 -eq $? || _lt_function_replace_fail=:
14775+
14776+fi
14777+
14778+if test x"$lt_shell_append" = xyes; then
14779+ sed -e '/^func_append ()$/,/^} # func_append /c\
14780+func_append ()\
14781+{\
14782+ eval "${1}+=\\${2}"\
14783+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
14784+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14785+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14786+test 0 -eq $? || _lt_function_replace_fail=:
14787+
14788+
14789+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
14790+func_append_quoted ()\
14791+{\
14792+\ func_quote_for_eval "${2}"\
14793+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
14794+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
14795+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14796+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14797+test 0 -eq $? || _lt_function_replace_fail=:
14798+
14799+
14800+ # Save a `func_append' function call where possible by direct use of '+='
14801+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
14802+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14803+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14804+ test 0 -eq $? || _lt_function_replace_fail=:
14805+else
14806+ # Save a `func_append' function call even when '+=' is not available
14807+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
14808+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14809+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14810+ test 0 -eq $? || _lt_function_replace_fail=:
14811+fi
14812+
14813+if test x"$_lt_function_replace_fail" = x":"; then
14814+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
14815+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
14816+fi
14817
14818- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
14819- || (rm -f "$cfgfile"; exit 1)
14820
14821- mv -f "$cfgfile" "$ofile" ||
14822+ mv -f "$cfgfile" "$ofile" ||
14823 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
14824 chmod +x "$ofile"
14825
14826Index: binutils-2.21/gprof/configure
14827===================================================================
14828--- binutils-2.21.orig/gprof/configure
14829+++ binutils-2.21/gprof/configure
14830@@ -629,8 +629,11 @@ OTOOL
14831 LIPO
14832 NMEDIT
14833 DSYMUTIL
14834+MANIFEST_TOOL
14835 RANLIB
14836+ac_ct_AR
14837 AR
14838+DLLTOOL
14839 OBJDUMP
14840 LN_S
14841 NM
14842@@ -743,6 +746,7 @@ enable_static
14843 with_pic
14844 enable_fast_install
14845 with_gnu_ld
14846+with_libtool_sysroot
14847 enable_libtool_lock
14848 enable_nls
14849 enable_maintainer_mode
14850@@ -1397,6 +1401,8 @@ Optional Packages:
14851 --with-pic try to use only PIC/non-PIC objects [default=use
14852 both]
14853 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
14854+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
14855+ (or the compiler's sysroot if not specified).
14856
14857 Some influential environment variables:
14858 CC C compiler command
14859@@ -5065,8 +5071,8 @@ esac
14860
14861
14862
14863-macro_version='2.2.7a'
14864-macro_revision='1.3134'
14865+macro_version='2.4'
14866+macro_revision='1.3293'
14867
14868
14869
14870@@ -5106,7 +5112,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
14871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
14872 $as_echo_n "checking how to print strings... " >&6; }
14873 # Test print first, because it will be a builtin if present.
14874-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
14875+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
14876 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
14877 ECHO='print -r --'
14878 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
14879@@ -5792,8 +5798,8 @@ $as_echo_n "checking whether the shell u
14880 # Try some XSI features
14881 xsi_shell=no
14882 ( _lt_dummy="a/b/c"
14883- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
14884- = c,a/b,, \
14885+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
14886+ = c,a/b,b/c, \
14887 && eval 'test $(( 1 + 1 )) -eq 2 \
14888 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
14889 && xsi_shell=yes
14890@@ -5842,6 +5848,80 @@ esac
14891
14892
14893
14894+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
14895+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
14896+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
14897+ $as_echo_n "(cached) " >&6
14898+else
14899+ case $host in
14900+ *-*-mingw* )
14901+ case $build in
14902+ *-*-mingw* ) # actually msys
14903+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
14904+ ;;
14905+ *-*-cygwin* )
14906+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
14907+ ;;
14908+ * ) # otherwise, assume *nix
14909+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
14910+ ;;
14911+ esac
14912+ ;;
14913+ *-*-cygwin* )
14914+ case $build in
14915+ *-*-mingw* ) # actually msys
14916+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
14917+ ;;
14918+ *-*-cygwin* )
14919+ lt_cv_to_host_file_cmd=func_convert_file_noop
14920+ ;;
14921+ * ) # otherwise, assume *nix
14922+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
14923+ ;;
14924+ esac
14925+ ;;
14926+ * ) # unhandled hosts (and "normal" native builds)
14927+ lt_cv_to_host_file_cmd=func_convert_file_noop
14928+ ;;
14929+esac
14930+
14931+fi
14932+
14933+to_host_file_cmd=$lt_cv_to_host_file_cmd
14934+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
14935+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
14936+
14937+
14938+
14939+
14940+
14941+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
14942+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
14943+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
14944+ $as_echo_n "(cached) " >&6
14945+else
14946+ #assume ordinary cross tools, or native build.
14947+lt_cv_to_tool_file_cmd=func_convert_file_noop
14948+case $host in
14949+ *-*-mingw* )
14950+ case $build in
14951+ *-*-mingw* ) # actually msys
14952+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
14953+ ;;
14954+ esac
14955+ ;;
14956+esac
14957+
14958+fi
14959+
14960+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14961+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
14962+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
14963+
14964+
14965+
14966+
14967+
14968 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
14969 $as_echo_n "checking for $LD option to reload object files... " >&6; }
14970 if test "${lt_cv_ld_reload_flag+set}" = set; then :
14971@@ -5858,6 +5938,11 @@ case $reload_flag in
14972 esac
14973 reload_cmds='$LD$reload_flag -o $output$reload_objs'
14974 case $host_os in
14975+ cygwin* | mingw* | pw32* | cegcc*)
14976+ if test "$GCC" != yes; then
14977+ reload_cmds=false
14978+ fi
14979+ ;;
14980 darwin*)
14981 if test "$GCC" = yes; then
14982 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
14983@@ -6026,7 +6111,8 @@ mingw* | pw32*)
14984 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
14985 lt_cv_file_magic_cmd='func_win32_libid'
14986 else
14987- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
14988+ # Keep this pattern in sync with the one in func_win32_libid.
14989+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
14990 lt_cv_file_magic_cmd='$OBJDUMP -f'
14991 fi
14992 ;;
14993@@ -6103,11 +6189,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
14994 lt_cv_deplibs_check_method=pass_all
14995 ;;
14996
14997-linux-uclibc*)
14998- lt_cv_deplibs_check_method=pass_all
14999- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
15000- ;;
15001-
15002 netbsd*)
15003 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
15004 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
15005@@ -6185,6 +6266,21 @@ esac
15006 fi
15007 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
15008 $as_echo "$lt_cv_deplibs_check_method" >&6; }
15009+
15010+file_magic_glob=
15011+want_nocaseglob=no
15012+if test "$build" = "$host"; then
15013+ case $host_os in
15014+ mingw* | pw32*)
15015+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
15016+ want_nocaseglob=yes
15017+ else
15018+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
15019+ fi
15020+ ;;
15021+ esac
15022+fi
15023+
15024 file_magic_cmd=$lt_cv_file_magic_cmd
15025 deplibs_check_method=$lt_cv_deplibs_check_method
15026 test -z "$deplibs_check_method" && deplibs_check_method=unknown
15027@@ -6200,9 +6296,162 @@ test -z "$deplibs_check_method" && depli
15028
15029
15030
15031+
15032+
15033+
15034+
15035+
15036+
15037+
15038+
15039+
15040+
15041 if test -n "$ac_tool_prefix"; then
15042- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
15043-set dummy ${ac_tool_prefix}ar; ac_word=$2
15044+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
15045+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
15046+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15047+$as_echo_n "checking for $ac_word... " >&6; }
15048+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
15049+ $as_echo_n "(cached) " >&6
15050+else
15051+ if test -n "$DLLTOOL"; then
15052+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
15053+else
15054+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15055+for as_dir in $PATH
15056+do
15057+ IFS=$as_save_IFS
15058+ test -z "$as_dir" && as_dir=.
15059+ for ac_exec_ext in '' $ac_executable_extensions; do
15060+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15061+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
15062+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15063+ break 2
15064+ fi
15065+done
15066+ done
15067+IFS=$as_save_IFS
15068+
15069+fi
15070+fi
15071+DLLTOOL=$ac_cv_prog_DLLTOOL
15072+if test -n "$DLLTOOL"; then
15073+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
15074+$as_echo "$DLLTOOL" >&6; }
15075+else
15076+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15077+$as_echo "no" >&6; }
15078+fi
15079+
15080+
15081+fi
15082+if test -z "$ac_cv_prog_DLLTOOL"; then
15083+ ac_ct_DLLTOOL=$DLLTOOL
15084+ # Extract the first word of "dlltool", so it can be a program name with args.
15085+set dummy dlltool; ac_word=$2
15086+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15087+$as_echo_n "checking for $ac_word... " >&6; }
15088+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
15089+ $as_echo_n "(cached) " >&6
15090+else
15091+ if test -n "$ac_ct_DLLTOOL"; then
15092+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
15093+else
15094+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15095+for as_dir in $PATH
15096+do
15097+ IFS=$as_save_IFS
15098+ test -z "$as_dir" && as_dir=.
15099+ for ac_exec_ext in '' $ac_executable_extensions; do
15100+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15101+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
15102+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15103+ break 2
15104+ fi
15105+done
15106+ done
15107+IFS=$as_save_IFS
15108+
15109+fi
15110+fi
15111+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
15112+if test -n "$ac_ct_DLLTOOL"; then
15113+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
15114+$as_echo "$ac_ct_DLLTOOL" >&6; }
15115+else
15116+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15117+$as_echo "no" >&6; }
15118+fi
15119+
15120+ if test "x$ac_ct_DLLTOOL" = x; then
15121+ DLLTOOL="false"
15122+ else
15123+ case $cross_compiling:$ac_tool_warned in
15124+yes:)
15125+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15126+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15127+ac_tool_warned=yes ;;
15128+esac
15129+ DLLTOOL=$ac_ct_DLLTOOL
15130+ fi
15131+else
15132+ DLLTOOL="$ac_cv_prog_DLLTOOL"
15133+fi
15134+
15135+test -z "$DLLTOOL" && DLLTOOL=dlltool
15136+
15137+
15138+
15139+
15140+
15141+
15142+
15143+
15144+
15145+
15146+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
15147+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
15148+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
15149+ $as_echo_n "(cached) " >&6
15150+else
15151+ lt_cv_sharedlib_from_linklib_cmd='unknown'
15152+
15153+case $host_os in
15154+cygwin* | mingw* | pw32* | cegcc*)
15155+ # two different shell functions defined in ltmain.sh
15156+ # decide which to use based on capabilities of $DLLTOOL
15157+ case `$DLLTOOL --help 2>&1` in
15158+ *--identify-strict*)
15159+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
15160+ ;;
15161+ *)
15162+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
15163+ ;;
15164+ esac
15165+ ;;
15166+*)
15167+ # fallback: assume linklib IS sharedlib
15168+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
15169+ ;;
15170+esac
15171+
15172+fi
15173+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
15174+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
15175+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
15176+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
15177+
15178+
15179+
15180+
15181+
15182+
15183+
15184+if test -n "$ac_tool_prefix"; then
15185+ for ac_prog in ar
15186+ do
15187+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
15188+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
15189 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15190 $as_echo_n "checking for $ac_word... " >&6; }
15191 if test "${ac_cv_prog_AR+set}" = set; then :
15192@@ -6218,7 +6467,7 @@ do
15193 test -z "$as_dir" && as_dir=.
15194 for ac_exec_ext in '' $ac_executable_extensions; do
15195 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15196- ac_cv_prog_AR="${ac_tool_prefix}ar"
15197+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
15198 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15199 break 2
15200 fi
15201@@ -6238,11 +6487,15 @@ $as_echo "no" >&6; }
15202 fi
15203
15204
15205+ test -n "$AR" && break
15206+ done
15207 fi
15208-if test -z "$ac_cv_prog_AR"; then
15209+if test -z "$AR"; then
15210 ac_ct_AR=$AR
15211- # Extract the first word of "ar", so it can be a program name with args.
15212-set dummy ar; ac_word=$2
15213+ for ac_prog in ar
15214+do
15215+ # Extract the first word of "$ac_prog", so it can be a program name with args.
15216+set dummy $ac_prog; ac_word=$2
15217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15218 $as_echo_n "checking for $ac_word... " >&6; }
15219 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
15220@@ -6258,7 +6511,7 @@ do
15221 test -z "$as_dir" && as_dir=.
15222 for ac_exec_ext in '' $ac_executable_extensions; do
15223 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15224- ac_cv_prog_ac_ct_AR="ar"
15225+ ac_cv_prog_ac_ct_AR="$ac_prog"
15226 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15227 break 2
15228 fi
15229@@ -6277,6 +6530,10 @@ else
15230 $as_echo "no" >&6; }
15231 fi
15232
15233+
15234+ test -n "$ac_ct_AR" && break
15235+done
15236+
15237 if test "x$ac_ct_AR" = x; then
15238 AR="false"
15239 else
15240@@ -6288,16 +6545,72 @@ ac_tool_warned=yes ;;
15241 esac
15242 AR=$ac_ct_AR
15243 fi
15244-else
15245- AR="$ac_cv_prog_AR"
15246 fi
15247
15248-test -z "$AR" && AR=ar
15249-test -z "$AR_FLAGS" && AR_FLAGS=cru
15250+: ${AR=ar}
15251+: ${AR_FLAGS=cru}
15252+
15253+
15254+
15255+
15256+
15257+
15258+
15259+
15260+
15261+
15262+
15263+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
15264+$as_echo_n "checking for archiver @FILE support... " >&6; }
15265+if test "${lt_cv_ar_at_file+set}" = set; then :
15266+ $as_echo_n "(cached) " >&6
15267+else
15268+ lt_cv_ar_at_file=no
15269+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15270+/* end confdefs.h. */
15271+
15272+int
15273+main ()
15274+{
15275
15276+ ;
15277+ return 0;
15278+}
15279+_ACEOF
15280+if ac_fn_c_try_compile "$LINENO"; then :
15281+ echo conftest.$ac_objext > conftest.lst
15282+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
15283+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15284+ (eval $lt_ar_try) 2>&5
15285+ ac_status=$?
15286+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15287+ test $ac_status = 0; }
15288+ if test "$ac_status" -eq 0; then
15289+ # Ensure the archiver fails upon bogus file names.
15290+ rm -f conftest.$ac_objext libconftest.a
15291+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15292+ (eval $lt_ar_try) 2>&5
15293+ ac_status=$?
15294+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15295+ test $ac_status = 0; }
15296+ if test "$ac_status" -ne 0; then
15297+ lt_cv_ar_at_file=@
15298+ fi
15299+ fi
15300+ rm -f conftest.* libconftest.a
15301
15302+fi
15303+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15304
15305+fi
15306+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
15307+$as_echo "$lt_cv_ar_at_file" >&6; }
15308
15309+if test "x$lt_cv_ar_at_file" = xno; then
15310+ archiver_list_spec=
15311+else
15312+ archiver_list_spec=$lt_cv_ar_at_file
15313+fi
15314
15315
15316
15317@@ -6639,8 +6952,8 @@ esac
15318 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15319
15320 # Transform an extracted symbol line into symbol name and symbol address
15321-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15322-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'"
15323+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15324+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'"
15325
15326 # Handle CRLF in mingw tool chain
15327 opt_cr=
15328@@ -6676,6 +6989,7 @@ for ac_symprfx in "" "_"; do
15329 else
15330 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
15331 fi
15332+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
15333
15334 # Check to see that the pipe works correctly.
15335 pipe_works=no
15336@@ -6717,6 +7031,18 @@ _LT_EOF
15337 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
15338 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
15339 cat <<_LT_EOF > conftest.$ac_ext
15340+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
15341+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
15342+/* DATA imports from DLLs on WIN32 con't be const, because runtime
15343+ relocations are performed -- see ld's documentation on pseudo-relocs. */
15344+# define LT_DLSYM_CONST
15345+#elif defined(__osf__)
15346+/* This system does not cope well with relocations in const data. */
15347+# define LT_DLSYM_CONST
15348+#else
15349+# define LT_DLSYM_CONST const
15350+#endif
15351+
15352 #ifdef __cplusplus
15353 extern "C" {
15354 #endif
15355@@ -6728,7 +7054,7 @@ _LT_EOF
15356 cat <<_LT_EOF >> conftest.$ac_ext
15357
15358 /* The mapping between symbol names and symbols. */
15359-const struct {
15360+LT_DLSYM_CONST struct {
15361 const char *name;
15362 void *address;
15363 }
15364@@ -6754,8 +7080,8 @@ static const void *lt_preloaded_setup()
15365 _LT_EOF
15366 # Now try linking the two files.
15367 mv conftest.$ac_objext conftstm.$ac_objext
15368- lt_save_LIBS="$LIBS"
15369- lt_save_CFLAGS="$CFLAGS"
15370+ lt_globsym_save_LIBS=$LIBS
15371+ lt_globsym_save_CFLAGS=$CFLAGS
15372 LIBS="conftstm.$ac_objext"
15373 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
15374 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
15375@@ -6765,8 +7091,8 @@ _LT_EOF
15376 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
15377 pipe_works=yes
15378 fi
15379- LIBS="$lt_save_LIBS"
15380- CFLAGS="$lt_save_CFLAGS"
15381+ LIBS=$lt_globsym_save_LIBS
15382+ CFLAGS=$lt_globsym_save_CFLAGS
15383 else
15384 echo "cannot find nm_test_func in $nlist" >&5
15385 fi
15386@@ -6803,6 +7129,17 @@ else
15387 $as_echo "ok" >&6; }
15388 fi
15389
15390+# Response file support.
15391+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
15392+ nm_file_list_spec='@'
15393+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
15394+ nm_file_list_spec='@'
15395+fi
15396+
15397+
15398+
15399+
15400+
15401
15402
15403
15404@@ -6824,6 +7161,44 @@ fi
15405
15406
15407
15408+
15409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
15410+$as_echo_n "checking for sysroot... " >&6; }
15411+
15412+# Check whether --with-libtool-sysroot was given.
15413+if test "${with_libtool_sysroot+set}" = set; then :
15414+ withval=$with_libtool_sysroot;
15415+else
15416+ with_libtool_sysroot=no
15417+fi
15418+
15419+
15420+lt_sysroot=
15421+case ${with_libtool_sysroot} in #(
15422+ yes)
15423+ if test "$GCC" = yes; then
15424+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
15425+ fi
15426+ ;; #(
15427+ /*)
15428+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
15429+ ;; #(
15430+ no|'')
15431+ ;; #(
15432+ *)
15433+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
15434+$as_echo "${with_libtool_sysroot}" >&6; }
15435+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
15436+ ;;
15437+esac
15438+
15439+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
15440+$as_echo "${lt_sysroot:-no}" >&6; }
15441+
15442+
15443+
15444+
15445+
15446 # Check whether --enable-libtool-lock was given.
15447 if test "${enable_libtool_lock+set}" = set; then :
15448 enableval=$enable_libtool_lock;
15449@@ -7017,6 +7392,123 @@ esac
15450
15451 need_locks="$enable_libtool_lock"
15452
15453+if test -n "$ac_tool_prefix"; then
15454+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
15455+set dummy ${ac_tool_prefix}mt; ac_word=$2
15456+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15457+$as_echo_n "checking for $ac_word... " >&6; }
15458+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
15459+ $as_echo_n "(cached) " >&6
15460+else
15461+ if test -n "$MANIFEST_TOOL"; then
15462+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
15463+else
15464+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15465+for as_dir in $PATH
15466+do
15467+ IFS=$as_save_IFS
15468+ test -z "$as_dir" && as_dir=.
15469+ for ac_exec_ext in '' $ac_executable_extensions; do
15470+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15471+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
15472+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15473+ break 2
15474+ fi
15475+done
15476+ done
15477+IFS=$as_save_IFS
15478+
15479+fi
15480+fi
15481+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
15482+if test -n "$MANIFEST_TOOL"; then
15483+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
15484+$as_echo "$MANIFEST_TOOL" >&6; }
15485+else
15486+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15487+$as_echo "no" >&6; }
15488+fi
15489+
15490+
15491+fi
15492+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
15493+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
15494+ # Extract the first word of "mt", so it can be a program name with args.
15495+set dummy mt; ac_word=$2
15496+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15497+$as_echo_n "checking for $ac_word... " >&6; }
15498+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
15499+ $as_echo_n "(cached) " >&6
15500+else
15501+ if test -n "$ac_ct_MANIFEST_TOOL"; then
15502+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
15503+else
15504+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15505+for as_dir in $PATH
15506+do
15507+ IFS=$as_save_IFS
15508+ test -z "$as_dir" && as_dir=.
15509+ for ac_exec_ext in '' $ac_executable_extensions; do
15510+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15511+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
15512+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15513+ break 2
15514+ fi
15515+done
15516+ done
15517+IFS=$as_save_IFS
15518+
15519+fi
15520+fi
15521+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
15522+if test -n "$ac_ct_MANIFEST_TOOL"; then
15523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
15524+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
15525+else
15526+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15527+$as_echo "no" >&6; }
15528+fi
15529+
15530+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
15531+ MANIFEST_TOOL=":"
15532+ else
15533+ case $cross_compiling:$ac_tool_warned in
15534+yes:)
15535+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15536+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15537+ac_tool_warned=yes ;;
15538+esac
15539+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
15540+ fi
15541+else
15542+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
15543+fi
15544+
15545+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
15546+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
15547+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
15548+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
15549+ $as_echo_n "(cached) " >&6
15550+else
15551+ lt_cv_path_mainfest_tool=no
15552+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
15553+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
15554+ cat conftest.err >&5
15555+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
15556+ lt_cv_path_mainfest_tool=yes
15557+ fi
15558+ rm -f conftest*
15559+fi
15560+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
15561+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
15562+if test "x$lt_cv_path_mainfest_tool" != xyes; then
15563+ MANIFEST_TOOL=:
15564+fi
15565+
15566+
15567+
15568+
15569+
15570
15571 case $host_os in
15572 rhapsody* | darwin*)
15573@@ -7580,6 +8072,8 @@ _LT_EOF
15574 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
15575 echo "$AR cru libconftest.a conftest.o" >&5
15576 $AR cru libconftest.a conftest.o 2>&5
15577+ echo "$RANLIB libconftest.a" >&5
15578+ $RANLIB libconftest.a 2>&5
15579 cat > conftest.c << _LT_EOF
15580 int main() { return 0;}
15581 _LT_EOF
15582@@ -7775,7 +8269,8 @@ fi
15583 LIBTOOL_DEPS="$ltmain"
15584
15585 # Always use our own libtool.
15586-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
15587+LIBTOOL='$(SHELL) $(top_builddir)'
15588+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
15589
15590
15591
15592@@ -7864,7 +8359,7 @@ aix3*)
15593 esac
15594
15595 # Global variables:
15596-ofile=libtool
15597+ofile=${host_alias}-libtool
15598 can_build_shared=yes
15599
15600 # All known linkers require a `.a' archive for static linking (except MSVC,
15601@@ -8162,8 +8657,6 @@ fi
15602 lt_prog_compiler_pic=
15603 lt_prog_compiler_static=
15604
15605-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15606-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15607
15608 if test "$GCC" = yes; then
15609 lt_prog_compiler_wl='-Wl,'
15610@@ -8328,6 +8821,12 @@ $as_echo_n "checking for $compiler optio
15611 lt_prog_compiler_pic='--shared'
15612 lt_prog_compiler_static='--static'
15613 ;;
15614+ nagfor*)
15615+ # NAG Fortran compiler
15616+ lt_prog_compiler_wl='-Wl,-Wl,,'
15617+ lt_prog_compiler_pic='-PIC'
15618+ lt_prog_compiler_static='-Bstatic'
15619+ ;;
15620 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
15621 # Portland Group compilers (*not* the Pentium gcc compiler,
15622 # which looks to be a dead project)
15623@@ -8390,7 +8889,7 @@ $as_echo_n "checking for $compiler optio
15624 lt_prog_compiler_pic='-KPIC'
15625 lt_prog_compiler_static='-Bstatic'
15626 case $cc_basename in
15627- f77* | f90* | f95*)
15628+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
15629 lt_prog_compiler_wl='-Qoption ld ';;
15630 *)
15631 lt_prog_compiler_wl='-Wl,';;
15632@@ -8447,13 +8946,17 @@ case $host_os in
15633 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
15634 ;;
15635 esac
15636-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
15637-$as_echo "$lt_prog_compiler_pic" >&6; }
15638-
15639-
15640-
15641-
15642
15643+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15644+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15645+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
15646+ $as_echo_n "(cached) " >&6
15647+else
15648+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
15649+fi
15650+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
15651+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
15652+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
15653
15654 #
15655 # Check to make sure the PIC flag actually works.
15656@@ -8514,6 +9017,11 @@ fi
15657
15658
15659
15660+
15661+
15662+
15663+
15664+
15665 #
15666 # Check to make sure the static flag actually works.
15667 #
15668@@ -8864,7 +9372,8 @@ _LT_EOF
15669 allow_undefined_flag=unsupported
15670 always_export_symbols=no
15671 enable_shared_with_static_runtimes=yes
15672- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15673+ 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'
15674+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
15675
15676 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
15677 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15678@@ -8912,7 +9421,7 @@ _LT_EOF
15679 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
15680 && test "$tmp_diet" = no
15681 then
15682- tmp_addflag=
15683+ tmp_addflag=' $pic_flag'
15684 tmp_sharedflag='-shared'
15685 case $cc_basename,$host_cpu in
15686 pgcc*) # Portland Group C compiler
15687@@ -8963,12 +9472,12 @@ _LT_EOF
15688 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
15689 hardcode_libdir_flag_spec=
15690 hardcode_libdir_flag_spec_ld='-rpath $libdir'
15691- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
15692+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
15693 if test "x$supports_anon_versioning" = xyes; then
15694 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
15695 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
15696 echo "local: *; };" >> $output_objdir/$libname.ver~
15697- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15698+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15699 fi
15700 ;;
15701 esac
15702@@ -8982,8 +9491,8 @@ _LT_EOF
15703 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15704 wlarc=
15705 else
15706- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15707- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15708+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15709+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15710 fi
15711 ;;
15712
15713@@ -9001,8 +9510,8 @@ _LT_EOF
15714
15715 _LT_EOF
15716 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15717- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15718- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15719+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15720+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15721 else
15722 ld_shlibs=no
15723 fi
15724@@ -9048,8 +9557,8 @@ _LT_EOF
15725
15726 *)
15727 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15728- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15729- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15730+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15731+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15732 else
15733 ld_shlibs=no
15734 fi
15735@@ -9179,7 +9688,13 @@ _LT_EOF
15736 allow_undefined_flag='-berok'
15737 # Determine the default libpath from the value encoded in an
15738 # empty executable.
15739- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15740+ if test "${lt_cv_aix_libpath+set}" = set; then
15741+ aix_libpath=$lt_cv_aix_libpath
15742+else
15743+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15744+ $as_echo_n "(cached) " >&6
15745+else
15746+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15747 /* end confdefs.h. */
15748
15749 int
15750@@ -9192,22 +9707,29 @@ main ()
15751 _ACEOF
15752 if ac_fn_c_try_link "$LINENO"; then :
15753
15754-lt_aix_libpath_sed='
15755- /Import File Strings/,/^$/ {
15756- /^0/ {
15757- s/^0 *\(.*\)$/\1/
15758- p
15759- }
15760- }'
15761-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15762-# Check for a 64-bit object if we didn't find anything.
15763-if test -z "$aix_libpath"; then
15764- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15765-fi
15766+ lt_aix_libpath_sed='
15767+ /Import File Strings/,/^$/ {
15768+ /^0/ {
15769+ s/^0 *\([^ ]*\) *$/\1/
15770+ p
15771+ }
15772+ }'
15773+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15774+ # Check for a 64-bit object if we didn't find anything.
15775+ if test -z "$lt_cv_aix_libpath_"; then
15776+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15777+ fi
15778 fi
15779 rm -f core conftest.err conftest.$ac_objext \
15780 conftest$ac_exeext conftest.$ac_ext
15781-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15782+ if test -z "$lt_cv_aix_libpath_"; then
15783+ lt_cv_aix_libpath_="/usr/lib:/lib"
15784+ fi
15785+
15786+fi
15787+
15788+ aix_libpath=$lt_cv_aix_libpath_
15789+fi
15790
15791 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15792 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"
15793@@ -9219,7 +9741,13 @@ if test -z "$aix_libpath"; then aix_libp
15794 else
15795 # Determine the default libpath from the value encoded in an
15796 # empty executable.
15797- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15798+ if test "${lt_cv_aix_libpath+set}" = set; then
15799+ aix_libpath=$lt_cv_aix_libpath
15800+else
15801+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15802+ $as_echo_n "(cached) " >&6
15803+else
15804+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15805 /* end confdefs.h. */
15806
15807 int
15808@@ -9232,22 +9760,29 @@ main ()
15809 _ACEOF
15810 if ac_fn_c_try_link "$LINENO"; then :
15811
15812-lt_aix_libpath_sed='
15813- /Import File Strings/,/^$/ {
15814- /^0/ {
15815- s/^0 *\(.*\)$/\1/
15816- p
15817- }
15818- }'
15819-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15820-# Check for a 64-bit object if we didn't find anything.
15821-if test -z "$aix_libpath"; then
15822- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15823-fi
15824+ lt_aix_libpath_sed='
15825+ /Import File Strings/,/^$/ {
15826+ /^0/ {
15827+ s/^0 *\([^ ]*\) *$/\1/
15828+ p
15829+ }
15830+ }'
15831+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15832+ # Check for a 64-bit object if we didn't find anything.
15833+ if test -z "$lt_cv_aix_libpath_"; then
15834+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15835+ fi
15836 fi
15837 rm -f core conftest.err conftest.$ac_objext \
15838 conftest$ac_exeext conftest.$ac_ext
15839-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15840+ if test -z "$lt_cv_aix_libpath_"; then
15841+ lt_cv_aix_libpath_="/usr/lib:/lib"
15842+ fi
15843+
15844+fi
15845+
15846+ aix_libpath=$lt_cv_aix_libpath_
15847+fi
15848
15849 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15850 # Warning - without using the other run time loading flags,
15851@@ -9292,20 +9827,63 @@ if test -z "$aix_libpath"; then aix_libp
15852 # Microsoft Visual C++.
15853 # hardcode_libdir_flag_spec is actually meaningless, as there is
15854 # no search path for DLLs.
15855- hardcode_libdir_flag_spec=' '
15856- allow_undefined_flag=unsupported
15857- # Tell ltmain to make .lib files, not .a files.
15858- libext=lib
15859- # Tell ltmain to make .dll files, not .so files.
15860- shrext_cmds=".dll"
15861- # FIXME: Setting linknames here is a bad hack.
15862- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15863- # The linker will automatically build a .lib file if we build a DLL.
15864- old_archive_from_new_cmds='true'
15865- # FIXME: Should let the user specify the lib program.
15866- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15867- fix_srcfile_path='`cygpath -w "$srcfile"`'
15868- enable_shared_with_static_runtimes=yes
15869+ case $cc_basename in
15870+ cl*)
15871+ # Native MSVC
15872+ hardcode_libdir_flag_spec=' '
15873+ allow_undefined_flag=unsupported
15874+ always_export_symbols=yes
15875+ file_list_spec='@'
15876+ # Tell ltmain to make .lib files, not .a files.
15877+ libext=lib
15878+ # Tell ltmain to make .dll files, not .so files.
15879+ shrext_cmds=".dll"
15880+ # FIXME: Setting linknames here is a bad hack.
15881+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
15882+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
15883+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
15884+ else
15885+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
15886+ fi~
15887+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
15888+ linknames='
15889+ # The linker will not automatically build a static lib if we build a DLL.
15890+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
15891+ enable_shared_with_static_runtimes=yes
15892+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15893+ # Don't use ranlib
15894+ old_postinstall_cmds='chmod 644 $oldlib'
15895+ postlink_cmds='lt_outputfile="@OUTPUT@"~
15896+ lt_tool_outputfile="@TOOL_OUTPUT@"~
15897+ case $lt_outputfile in
15898+ *.exe|*.EXE) ;;
15899+ *)
15900+ lt_outputfile="$lt_outputfile.exe"
15901+ lt_tool_outputfile="$lt_tool_outputfile.exe"
15902+ ;;
15903+ esac~
15904+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
15905+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
15906+ $RM "$lt_outputfile.manifest";
15907+ fi'
15908+ ;;
15909+ *)
15910+ # Assume MSVC wrapper
15911+ hardcode_libdir_flag_spec=' '
15912+ allow_undefined_flag=unsupported
15913+ # Tell ltmain to make .lib files, not .a files.
15914+ libext=lib
15915+ # Tell ltmain to make .dll files, not .so files.
15916+ shrext_cmds=".dll"
15917+ # FIXME: Setting linknames here is a bad hack.
15918+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15919+ # The linker will automatically build a .lib file if we build a DLL.
15920+ old_archive_from_new_cmds='true'
15921+ # FIXME: Should let the user specify the lib program.
15922+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15923+ enable_shared_with_static_runtimes=yes
15924+ ;;
15925+ esac
15926 ;;
15927
15928 darwin* | rhapsody*)
15929@@ -9370,7 +9948,7 @@ if test -z "$aix_libpath"; then aix_libp
15930
15931 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15932 freebsd* | dragonfly*)
15933- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
15934+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
15935 hardcode_libdir_flag_spec='-R$libdir'
15936 hardcode_direct=yes
15937 hardcode_shlibpath_var=no
15938@@ -9378,7 +9956,7 @@ if test -z "$aix_libpath"; then aix_libp
15939
15940 hpux9*)
15941 if test "$GCC" = yes; then
15942- 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'
15943+ 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'
15944 else
15945 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'
15946 fi
15947@@ -9394,7 +9972,7 @@ if test -z "$aix_libpath"; then aix_libp
15948
15949 hpux10*)
15950 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
15951- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15952+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15953 else
15954 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
15955 fi
15956@@ -9418,10 +9996,10 @@ if test -z "$aix_libpath"; then aix_libp
15957 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
15958 ;;
15959 ia64*)
15960- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15961+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15962 ;;
15963 *)
15964- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15965+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15966 ;;
15967 esac
15968 else
15969@@ -9500,23 +10078,36 @@ fi
15970
15971 irix5* | irix6* | nonstopux*)
15972 if test "$GCC" = yes; then
15973- 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'
15974+ 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'
15975 # Try to use the -exported_symbol ld option, if it does not
15976 # work, assume that -exports_file does not work either and
15977 # implicitly export all symbols.
15978- save_LDFLAGS="$LDFLAGS"
15979- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
15980- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15981+ # This should be the same for all languages, so no per-tag cache variable.
15982+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
15983+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
15984+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
15985+ $as_echo_n "(cached) " >&6
15986+else
15987+ save_LDFLAGS="$LDFLAGS"
15988+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
15989+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15990 /* end confdefs.h. */
15991-int foo(void) {}
15992+int foo (void) { return 0; }
15993 _ACEOF
15994 if ac_fn_c_try_link "$LINENO"; then :
15995- 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'
15996-
15997+ lt_cv_irix_exported_symbol=yes
15998+else
15999+ lt_cv_irix_exported_symbol=no
16000 fi
16001 rm -f core conftest.err conftest.$ac_objext \
16002 conftest$ac_exeext conftest.$ac_ext
16003- LDFLAGS="$save_LDFLAGS"
16004+ LDFLAGS="$save_LDFLAGS"
16005+fi
16006+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
16007+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
16008+ if test "$lt_cv_irix_exported_symbol" = yes; then
16009+ 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'
16010+ fi
16011 else
16012 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'
16013 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'
16014@@ -9601,7 +10192,7 @@ rm -f core conftest.err conftest.$ac_obj
16015 osf4* | osf5*) # as osf3* with the addition of -msym flag
16016 if test "$GCC" = yes; then
16017 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
16018- 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'
16019+ 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'
16020 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
16021 else
16022 allow_undefined_flag=' -expect_unresolved \*'
16023@@ -9620,9 +10211,9 @@ rm -f core conftest.err conftest.$ac_obj
16024 no_undefined_flag=' -z defs'
16025 if test "$GCC" = yes; then
16026 wlarc='${wl}'
16027- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16028+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16029 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
16030- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
16031+ $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'
16032 else
16033 case `$CC -V 2>&1` in
16034 *"Compilers 5.0"*)
16035@@ -10198,8 +10789,9 @@ cygwin* | mingw* | pw32* | cegcc*)
16036 need_version=no
16037 need_lib_prefix=no
16038
16039- case $GCC,$host_os in
16040- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
16041+ case $GCC,$cc_basename in
16042+ yes,*)
16043+ # gcc
16044 library_names_spec='$libname.dll.a'
16045 # DLL is installed to $(libdir)/../bin by postinstall_cmds
16046 postinstall_cmds='base_file=`basename \${file}`~
16047@@ -10232,13 +10824,71 @@ cygwin* | mingw* | pw32* | cegcc*)
16048 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16049 ;;
16050 esac
16051+ dynamic_linker='Win32 ld.exe'
16052+ ;;
16053+
16054+ *,cl*)
16055+ # Native MSVC
16056+ libname_spec='$name'
16057+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16058+ library_names_spec='${libname}.dll.lib'
16059+
16060+ case $build_os in
16061+ mingw*)
16062+ sys_lib_search_path_spec=
16063+ lt_save_ifs=$IFS
16064+ IFS=';'
16065+ for lt_path in $LIB
16066+ do
16067+ IFS=$lt_save_ifs
16068+ # Let DOS variable expansion print the short 8.3 style file name.
16069+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
16070+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
16071+ done
16072+ IFS=$lt_save_ifs
16073+ # Convert to MSYS style.
16074+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
16075+ ;;
16076+ cygwin*)
16077+ # Convert to unix form, then to dos form, then back to unix form
16078+ # but this time dos style (no spaces!) so that the unix form looks
16079+ # like /cygdrive/c/PROGRA~1:/cygdr...
16080+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
16081+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
16082+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16083+ ;;
16084+ *)
16085+ sys_lib_search_path_spec="$LIB"
16086+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
16087+ # It is most probably a Windows format PATH.
16088+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
16089+ else
16090+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16091+ fi
16092+ # FIXME: find the short name or the path components, as spaces are
16093+ # common. (e.g. "Program Files" -> "PROGRA~1")
16094+ ;;
16095+ esac
16096+
16097+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
16098+ postinstall_cmds='base_file=`basename \${file}`~
16099+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
16100+ dldir=$destdir/`dirname \$dlpath`~
16101+ test -d \$dldir || mkdir -p \$dldir~
16102+ $install_prog $dir/$dlname \$dldir/$dlname'
16103+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
16104+ dlpath=$dir/\$dldll~
16105+ $RM \$dlpath'
16106+ shlibpath_overrides_runpath=yes
16107+ dynamic_linker='Win32 link.exe'
16108 ;;
16109
16110 *)
16111+ # Assume MSVC wrapper
16112 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
16113+ dynamic_linker='Win32 ld.exe'
16114 ;;
16115 esac
16116- dynamic_linker='Win32 ld.exe'
16117 # FIXME: first we should search . and the directory the executable is in
16118 shlibpath_var=PATH
16119 ;;
16120@@ -10334,7 +10984,7 @@ haiku*)
16121 soname_spec='${libname}${release}${shared_ext}$major'
16122 shlibpath_var=LIBRARY_PATH
16123 shlibpath_overrides_runpath=yes
16124- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
16125+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
16126 hardcode_into_libs=yes
16127 ;;
16128
16129@@ -11130,7 +11780,7 @@ else
16130 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16131 lt_status=$lt_dlunknown
16132 cat > conftest.$ac_ext <<_LT_EOF
16133-#line 11128 "configure"
16134+#line $LINENO "configure"
16135 #include "confdefs.h"
16136
16137 #if HAVE_DLFCN_H
16138@@ -11174,10 +11824,10 @@ else
16139 /* When -fvisbility=hidden is used, assume the code has been annotated
16140 correspondingly for the symbols needed. */
16141 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16142-void fnord () __attribute__((visibility("default")));
16143+int fnord () __attribute__((visibility("default")));
16144 #endif
16145
16146-void fnord () { int i=42; }
16147+int fnord () { return 42; }
16148 int main ()
16149 {
16150 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16151@@ -11236,7 +11886,7 @@ else
16152 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16153 lt_status=$lt_dlunknown
16154 cat > conftest.$ac_ext <<_LT_EOF
16155-#line 11234 "configure"
16156+#line $LINENO "configure"
16157 #include "confdefs.h"
16158
16159 #if HAVE_DLFCN_H
16160@@ -11280,10 +11930,10 @@ else
16161 /* When -fvisbility=hidden is used, assume the code has been annotated
16162 correspondingly for the symbols needed. */
16163 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16164-void fnord () __attribute__((visibility("default")));
16165+int fnord () __attribute__((visibility("default")));
16166 #endif
16167
16168-void fnord () { int i=42; }
16169+int fnord () { return 42; }
16170 int main ()
16171 {
16172 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16173@@ -12825,13 +13475,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
16174 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
16175 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
16176 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
16177+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
16178+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
16179 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
16180 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
16181 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
16182 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
16183 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
16184+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
16185+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
16186+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
16187+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
16188 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
16189 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
16190+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
16191 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
16192 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
16193 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16194@@ -12846,14 +13503,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
16195 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
16196 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
16197 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"`'
16198+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
16199+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
16200 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
16201 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
16202 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
16203-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16204 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
16205+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16206 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
16207 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
16208 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
16209+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
16210 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
16211 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
16212 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
16213@@ -12886,12 +13546,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
16214 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
16215 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
16216 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
16217-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
16218 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
16219 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
16220 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
16221 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
16222 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
16223+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
16224 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
16225 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
16226 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
16227@@ -12946,8 +13606,13 @@ reload_flag \
16228 OBJDUMP \
16229 deplibs_check_method \
16230 file_magic_cmd \
16231+file_magic_glob \
16232+want_nocaseglob \
16233+DLLTOOL \
16234+sharedlib_from_linklib_cmd \
16235 AR \
16236 AR_FLAGS \
16237+archiver_list_spec \
16238 STRIP \
16239 RANLIB \
16240 CC \
16241@@ -12957,12 +13622,14 @@ lt_cv_sys_global_symbol_pipe \
16242 lt_cv_sys_global_symbol_to_cdecl \
16243 lt_cv_sys_global_symbol_to_c_name_address \
16244 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
16245+nm_file_list_spec \
16246 lt_prog_compiler_no_builtin_flag \
16247-lt_prog_compiler_wl \
16248 lt_prog_compiler_pic \
16249+lt_prog_compiler_wl \
16250 lt_prog_compiler_static \
16251 lt_cv_prog_compiler_c_o \
16252 need_locks \
16253+MANIFEST_TOOL \
16254 DSYMUTIL \
16255 NMEDIT \
16256 LIPO \
16257@@ -12978,7 +13645,6 @@ no_undefined_flag \
16258 hardcode_libdir_flag_spec \
16259 hardcode_libdir_flag_spec_ld \
16260 hardcode_libdir_separator \
16261-fix_srcfile_path \
16262 exclude_expsyms \
16263 include_expsyms \
16264 file_list_spec \
16265@@ -13014,6 +13680,7 @@ module_cmds \
16266 module_expsym_cmds \
16267 export_symbols_cmds \
16268 prelink_cmds \
16269+postlink_cmds \
16270 postinstall_cmds \
16271 postuninstall_cmds \
16272 finish_cmds \
16273@@ -13770,7 +14437,8 @@ $as_echo X"$file" |
16274 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
16275 #
16276 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
16277-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
16278+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
16279+# Inc.
16280 # Written by Gordon Matzigkeit, 1996
16281 #
16282 # This file is part of GNU Libtool.
16283@@ -13873,19 +14541,42 @@ SP2NL=$lt_lt_SP2NL
16284 # turn newlines into spaces.
16285 NL2SP=$lt_lt_NL2SP
16286
16287+# convert \$build file names to \$host format.
16288+to_host_file_cmd=$lt_cv_to_host_file_cmd
16289+
16290+# convert \$build files to toolchain format.
16291+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16292+
16293 # An object symbol dumper.
16294 OBJDUMP=$lt_OBJDUMP
16295
16296 # Method to check whether dependent libraries are shared objects.
16297 deplibs_check_method=$lt_deplibs_check_method
16298
16299-# Command to use when deplibs_check_method == "file_magic".
16300+# Command to use when deplibs_check_method = "file_magic".
16301 file_magic_cmd=$lt_file_magic_cmd
16302
16303+# How to find potential files when deplibs_check_method = "file_magic".
16304+file_magic_glob=$lt_file_magic_glob
16305+
16306+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
16307+want_nocaseglob=$lt_want_nocaseglob
16308+
16309+# DLL creation program.
16310+DLLTOOL=$lt_DLLTOOL
16311+
16312+# Command to associate shared and link libraries.
16313+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
16314+
16315 # The archiver.
16316 AR=$lt_AR
16317+
16318+# Flags to create an archive.
16319 AR_FLAGS=$lt_AR_FLAGS
16320
16321+# How to feed a file listing to the archiver.
16322+archiver_list_spec=$lt_archiver_list_spec
16323+
16324 # A symbol stripping program.
16325 STRIP=$lt_STRIP
16326
16327@@ -13915,6 +14606,12 @@ global_symbol_to_c_name_address=$lt_lt_c
16328 # Transform the output of nm in a C name address pair when lib prefix is needed.
16329 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
16330
16331+# Specify filename containing input files for \$NM.
16332+nm_file_list_spec=$lt_nm_file_list_spec
16333+
16334+# The root where to search for dependent libraries,and in which our libraries should be installed.
16335+lt_sysroot=$lt_sysroot
16336+
16337 # The name of the directory that contains temporary libtool files.
16338 objdir=$objdir
16339
16340@@ -13924,6 +14621,9 @@ MAGIC_CMD=$MAGIC_CMD
16341 # Must we lock files when doing compilation?
16342 need_locks=$lt_need_locks
16343
16344+# Manifest tool.
16345+MANIFEST_TOOL=$lt_MANIFEST_TOOL
16346+
16347 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
16348 DSYMUTIL=$lt_DSYMUTIL
16349
16350@@ -14038,12 +14738,12 @@ with_gcc=$GCC
16351 # Compiler flag to turn off builtin functions.
16352 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
16353
16354-# How to pass a linker flag through the compiler.
16355-wl=$lt_lt_prog_compiler_wl
16356-
16357 # Additional compiler flags for building library objects.
16358 pic_flag=$lt_lt_prog_compiler_pic
16359
16360+# How to pass a linker flag through the compiler.
16361+wl=$lt_lt_prog_compiler_wl
16362+
16363 # Compiler flag to prevent dynamic linking.
16364 link_static_flag=$lt_lt_prog_compiler_static
16365
16366@@ -14130,9 +14830,6 @@ inherit_rpath=$inherit_rpath
16367 # Whether libtool must link a program against all its dependency libraries.
16368 link_all_deplibs=$link_all_deplibs
16369
16370-# Fix the shell variable \$srcfile for the compiler.
16371-fix_srcfile_path=$lt_fix_srcfile_path
16372-
16373 # Set to "yes" if exported symbols are required.
16374 always_export_symbols=$always_export_symbols
16375
16376@@ -14148,6 +14845,9 @@ include_expsyms=$lt_include_expsyms
16377 # Commands necessary for linking programs (against libraries) with templates.
16378 prelink_cmds=$lt_prelink_cmds
16379
16380+# Commands necessary for finishing linking programs.
16381+postlink_cmds=$lt_postlink_cmds
16382+
16383 # Specify filename containing input files.
16384 file_list_spec=$lt_file_list_spec
16385
16386@@ -14180,210 +14880,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
16387 # if finds mixed CR/LF and LF-only lines. Since sed operates in
16388 # text mode, it properly converts lines to CR/LF. This bash problem
16389 # is reportedly fixed, but why not run on old versions too?
16390- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
16391- || (rm -f "$cfgfile"; exit 1)
16392-
16393- case $xsi_shell in
16394- yes)
16395- cat << \_LT_EOF >> "$cfgfile"
16396-
16397-# func_dirname file append nondir_replacement
16398-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16399-# otherwise set result to NONDIR_REPLACEMENT.
16400-func_dirname ()
16401-{
16402- case ${1} in
16403- */*) func_dirname_result="${1%/*}${2}" ;;
16404- * ) func_dirname_result="${3}" ;;
16405- esac
16406-}
16407-
16408-# func_basename file
16409-func_basename ()
16410-{
16411- func_basename_result="${1##*/}"
16412-}
16413-
16414-# func_dirname_and_basename file append nondir_replacement
16415-# perform func_basename and func_dirname in a single function
16416-# call:
16417-# dirname: Compute the dirname of FILE. If nonempty,
16418-# add APPEND to the result, otherwise set result
16419-# to NONDIR_REPLACEMENT.
16420-# value returned in "$func_dirname_result"
16421-# basename: Compute filename of FILE.
16422-# value retuned in "$func_basename_result"
16423-# Implementation must be kept synchronized with func_dirname
16424-# and func_basename. For efficiency, we do not delegate to
16425-# those functions but instead duplicate the functionality here.
16426-func_dirname_and_basename ()
16427-{
16428- case ${1} in
16429- */*) func_dirname_result="${1%/*}${2}" ;;
16430- * ) func_dirname_result="${3}" ;;
16431- esac
16432- func_basename_result="${1##*/}"
16433-}
16434-
16435-# func_stripname prefix suffix name
16436-# strip PREFIX and SUFFIX off of NAME.
16437-# PREFIX and SUFFIX must not contain globbing or regex special
16438-# characters, hashes, percent signs, but SUFFIX may contain a leading
16439-# dot (in which case that matches only a dot).
16440-func_stripname ()
16441-{
16442- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
16443- # positional parameters, so assign one to ordinary parameter first.
16444- func_stripname_result=${3}
16445- func_stripname_result=${func_stripname_result#"${1}"}
16446- func_stripname_result=${func_stripname_result%"${2}"}
16447-}
16448-
16449-# func_opt_split
16450-func_opt_split ()
16451-{
16452- func_opt_split_opt=${1%%=*}
16453- func_opt_split_arg=${1#*=}
16454-}
16455-
16456-# func_lo2o object
16457-func_lo2o ()
16458-{
16459- case ${1} in
16460- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
16461- *) func_lo2o_result=${1} ;;
16462- esac
16463-}
16464-
16465-# func_xform libobj-or-source
16466-func_xform ()
16467-{
16468- func_xform_result=${1%.*}.lo
16469-}
16470-
16471-# func_arith arithmetic-term...
16472-func_arith ()
16473-{
16474- func_arith_result=$(( $* ))
16475-}
16476-
16477-# func_len string
16478-# STRING may not start with a hyphen.
16479-func_len ()
16480-{
16481- func_len_result=${#1}
16482-}
16483-
16484-_LT_EOF
16485- ;;
16486- *) # Bourne compatible functions.
16487- cat << \_LT_EOF >> "$cfgfile"
16488-
16489-# func_dirname file append nondir_replacement
16490-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16491-# otherwise set result to NONDIR_REPLACEMENT.
16492-func_dirname ()
16493-{
16494- # Extract subdirectory from the argument.
16495- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
16496- if test "X$func_dirname_result" = "X${1}"; then
16497- func_dirname_result="${3}"
16498- else
16499- func_dirname_result="$func_dirname_result${2}"
16500- fi
16501-}
16502-
16503-# func_basename file
16504-func_basename ()
16505-{
16506- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
16507-}
16508-
16509-
16510-# func_stripname prefix suffix name
16511-# strip PREFIX and SUFFIX off of NAME.
16512-# PREFIX and SUFFIX must not contain globbing or regex special
16513-# characters, hashes, percent signs, but SUFFIX may contain a leading
16514-# dot (in which case that matches only a dot).
16515-# func_strip_suffix prefix name
16516-func_stripname ()
16517-{
16518- case ${2} in
16519- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
16520- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
16521- esac
16522-}
16523-
16524-# sed scripts:
16525-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
16526-my_sed_long_arg='1s/^-[^=]*=//'
16527-
16528-# func_opt_split
16529-func_opt_split ()
16530-{
16531- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
16532- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
16533-}
16534-
16535-# func_lo2o object
16536-func_lo2o ()
16537-{
16538- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
16539-}
16540-
16541-# func_xform libobj-or-source
16542-func_xform ()
16543-{
16544- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
16545-}
16546-
16547-# func_arith arithmetic-term...
16548-func_arith ()
16549-{
16550- func_arith_result=`expr "$@"`
16551-}
16552-
16553-# func_len string
16554-# STRING may not start with a hyphen.
16555-func_len ()
16556-{
16557- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
16558-}
16559-
16560-_LT_EOF
16561-esac
16562-
16563-case $lt_shell_append in
16564- yes)
16565- cat << \_LT_EOF >> "$cfgfile"
16566-
16567-# func_append var value
16568-# Append VALUE to the end of shell variable VAR.
16569-func_append ()
16570-{
16571- eval "$1+=\$2"
16572-}
16573-_LT_EOF
16574- ;;
16575- *)
16576- cat << \_LT_EOF >> "$cfgfile"
16577-
16578-# func_append var value
16579-# Append VALUE to the end of shell variable VAR.
16580-func_append ()
16581-{
16582- eval "$1=\$$1\$2"
16583-}
16584-
16585-_LT_EOF
16586- ;;
16587- esac
16588+ sed '$q' "$ltmain" >> "$cfgfile" \
16589+ || (rm -f "$cfgfile"; exit 1)
16590
16591+ if test x"$xsi_shell" = xyes; then
16592+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
16593+func_dirname ()\
16594+{\
16595+\ case ${1} in\
16596+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16597+\ * ) func_dirname_result="${3}" ;;\
16598+\ esac\
16599+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
16600+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16601+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16602+test 0 -eq $? || _lt_function_replace_fail=:
16603+
16604+
16605+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
16606+func_basename ()\
16607+{\
16608+\ func_basename_result="${1##*/}"\
16609+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
16610+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16611+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16612+test 0 -eq $? || _lt_function_replace_fail=:
16613+
16614+
16615+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
16616+func_dirname_and_basename ()\
16617+{\
16618+\ case ${1} in\
16619+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16620+\ * ) func_dirname_result="${3}" ;;\
16621+\ esac\
16622+\ func_basename_result="${1##*/}"\
16623+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
16624+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16625+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16626+test 0 -eq $? || _lt_function_replace_fail=:
16627+
16628+
16629+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
16630+func_stripname ()\
16631+{\
16632+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
16633+\ # positional parameters, so assign one to ordinary parameter first.\
16634+\ func_stripname_result=${3}\
16635+\ func_stripname_result=${func_stripname_result#"${1}"}\
16636+\ func_stripname_result=${func_stripname_result%"${2}"}\
16637+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
16638+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16639+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16640+test 0 -eq $? || _lt_function_replace_fail=:
16641+
16642+
16643+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
16644+func_split_long_opt ()\
16645+{\
16646+\ func_split_long_opt_name=${1%%=*}\
16647+\ func_split_long_opt_arg=${1#*=}\
16648+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
16649+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16650+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16651+test 0 -eq $? || _lt_function_replace_fail=:
16652+
16653+
16654+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
16655+func_split_short_opt ()\
16656+{\
16657+\ func_split_short_opt_arg=${1#??}\
16658+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
16659+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
16660+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16661+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16662+test 0 -eq $? || _lt_function_replace_fail=:
16663+
16664+
16665+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
16666+func_lo2o ()\
16667+{\
16668+\ case ${1} in\
16669+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
16670+\ *) func_lo2o_result=${1} ;;\
16671+\ esac\
16672+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
16673+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16674+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16675+test 0 -eq $? || _lt_function_replace_fail=:
16676+
16677+
16678+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
16679+func_xform ()\
16680+{\
16681+ func_xform_result=${1%.*}.lo\
16682+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
16683+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16684+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16685+test 0 -eq $? || _lt_function_replace_fail=:
16686+
16687+
16688+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
16689+func_arith ()\
16690+{\
16691+ func_arith_result=$(( $* ))\
16692+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
16693+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16694+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16695+test 0 -eq $? || _lt_function_replace_fail=:
16696+
16697+
16698+ sed -e '/^func_len ()$/,/^} # func_len /c\
16699+func_len ()\
16700+{\
16701+ func_len_result=${#1}\
16702+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
16703+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16704+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16705+test 0 -eq $? || _lt_function_replace_fail=:
16706+
16707+fi
16708+
16709+if test x"$lt_shell_append" = xyes; then
16710+ sed -e '/^func_append ()$/,/^} # func_append /c\
16711+func_append ()\
16712+{\
16713+ eval "${1}+=\\${2}"\
16714+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
16715+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16716+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16717+test 0 -eq $? || _lt_function_replace_fail=:
16718+
16719+
16720+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
16721+func_append_quoted ()\
16722+{\
16723+\ func_quote_for_eval "${2}"\
16724+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
16725+} # Extended-shell func_append_quoted implementation' "$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+
16730+
16731+ # Save a `func_append' function call where possible by direct use of '+='
16732+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
16733+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16734+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16735+ test 0 -eq $? || _lt_function_replace_fail=:
16736+else
16737+ # Save a `func_append' function call even when '+=' is not available
16738+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
16739+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16740+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16741+ test 0 -eq $? || _lt_function_replace_fail=:
16742+fi
16743+
16744+if test x"$_lt_function_replace_fail" = x":"; then
16745+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
16746+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
16747+fi
16748
16749- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
16750- || (rm -f "$cfgfile"; exit 1)
16751
16752- mv -f "$cfgfile" "$ofile" ||
16753+ mv -f "$cfgfile" "$ofile" ||
16754 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
16755 chmod +x "$ofile"
16756
16757Index: binutils-2.21/ld/configure
16758===================================================================
16759--- binutils-2.21.orig/ld/configure
16760+++ binutils-2.21/ld/configure
16761@@ -643,8 +643,11 @@ OTOOL
16762 LIPO
16763 NMEDIT
16764 DSYMUTIL
16765+MANIFEST_TOOL
16766 RANLIB
16767+ac_ct_AR
16768 AR
16769+DLLTOOL
16770 OBJDUMP
16771 LN_S
16772 NM
16773@@ -776,6 +779,7 @@ enable_static
16774 with_pic
16775 enable_fast_install
16776 with_gnu_ld
16777+with_libtool_sysroot
16778 enable_libtool_lock
16779 enable_nls
16780 '
16781@@ -1436,6 +1440,8 @@ Optional Packages:
16782 --with-pic try to use only PIC/non-PIC objects [default=use
16783 both]
16784 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
16785+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
16786+ (or the compiler's sysroot if not specified).
16787
16788 Some influential environment variables:
16789 CC C compiler command
16790@@ -5562,8 +5568,8 @@ esac
16791
16792
16793
16794-macro_version='2.2.7a'
16795-macro_revision='1.3134'
16796+macro_version='2.4'
16797+macro_revision='1.3293'
16798
16799
16800
16801@@ -5603,7 +5609,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16802 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16803 $as_echo_n "checking how to print strings... " >&6; }
16804 # Test print first, because it will be a builtin if present.
16805-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
16806+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
16807 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16808 ECHO='print -r --'
16809 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16810@@ -6289,8 +6295,8 @@ $as_echo_n "checking whether the shell u
16811 # Try some XSI features
16812 xsi_shell=no
16813 ( _lt_dummy="a/b/c"
16814- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
16815- = c,a/b,, \
16816+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
16817+ = c,a/b,b/c, \
16818 && eval 'test $(( 1 + 1 )) -eq 2 \
16819 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16820 && xsi_shell=yes
16821@@ -6339,6 +6345,80 @@ esac
16822
16823
16824
16825+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
16826+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
16827+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
16828+ $as_echo_n "(cached) " >&6
16829+else
16830+ case $host in
16831+ *-*-mingw* )
16832+ case $build in
16833+ *-*-mingw* ) # actually msys
16834+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
16835+ ;;
16836+ *-*-cygwin* )
16837+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
16838+ ;;
16839+ * ) # otherwise, assume *nix
16840+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
16841+ ;;
16842+ esac
16843+ ;;
16844+ *-*-cygwin* )
16845+ case $build in
16846+ *-*-mingw* ) # actually msys
16847+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
16848+ ;;
16849+ *-*-cygwin* )
16850+ lt_cv_to_host_file_cmd=func_convert_file_noop
16851+ ;;
16852+ * ) # otherwise, assume *nix
16853+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
16854+ ;;
16855+ esac
16856+ ;;
16857+ * ) # unhandled hosts (and "normal" native builds)
16858+ lt_cv_to_host_file_cmd=func_convert_file_noop
16859+ ;;
16860+esac
16861+
16862+fi
16863+
16864+to_host_file_cmd=$lt_cv_to_host_file_cmd
16865+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
16866+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
16867+
16868+
16869+
16870+
16871+
16872+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
16873+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
16874+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
16875+ $as_echo_n "(cached) " >&6
16876+else
16877+ #assume ordinary cross tools, or native build.
16878+lt_cv_to_tool_file_cmd=func_convert_file_noop
16879+case $host in
16880+ *-*-mingw* )
16881+ case $build in
16882+ *-*-mingw* ) # actually msys
16883+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
16884+ ;;
16885+ esac
16886+ ;;
16887+esac
16888+
16889+fi
16890+
16891+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16892+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
16893+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
16894+
16895+
16896+
16897+
16898+
16899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16900 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16901 if test "${lt_cv_ld_reload_flag+set}" = set; then :
16902@@ -6355,6 +6435,11 @@ case $reload_flag in
16903 esac
16904 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16905 case $host_os in
16906+ cygwin* | mingw* | pw32* | cegcc*)
16907+ if test "$GCC" != yes; then
16908+ reload_cmds=false
16909+ fi
16910+ ;;
16911 darwin*)
16912 if test "$GCC" = yes; then
16913 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16914@@ -6523,7 +6608,8 @@ mingw* | pw32*)
16915 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16916 lt_cv_file_magic_cmd='func_win32_libid'
16917 else
16918- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
16919+ # Keep this pattern in sync with the one in func_win32_libid.
16920+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
16921 lt_cv_file_magic_cmd='$OBJDUMP -f'
16922 fi
16923 ;;
16924@@ -6677,6 +6763,21 @@ esac
16925 fi
16926 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16927 $as_echo "$lt_cv_deplibs_check_method" >&6; }
16928+
16929+file_magic_glob=
16930+want_nocaseglob=no
16931+if test "$build" = "$host"; then
16932+ case $host_os in
16933+ mingw* | pw32*)
16934+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
16935+ want_nocaseglob=yes
16936+ else
16937+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
16938+ fi
16939+ ;;
16940+ esac
16941+fi
16942+
16943 file_magic_cmd=$lt_cv_file_magic_cmd
16944 deplibs_check_method=$lt_cv_deplibs_check_method
16945 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16946@@ -6692,9 +6793,162 @@ test -z "$deplibs_check_method" && depli
16947
16948
16949
16950+
16951+
16952+
16953+
16954+
16955+
16956+
16957+
16958+
16959+
16960+if test -n "$ac_tool_prefix"; then
16961+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
16962+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
16963+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16964+$as_echo_n "checking for $ac_word... " >&6; }
16965+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
16966+ $as_echo_n "(cached) " >&6
16967+else
16968+ if test -n "$DLLTOOL"; then
16969+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
16970+else
16971+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16972+for as_dir in $PATH
16973+do
16974+ IFS=$as_save_IFS
16975+ test -z "$as_dir" && as_dir=.
16976+ for ac_exec_ext in '' $ac_executable_extensions; do
16977+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16978+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
16979+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16980+ break 2
16981+ fi
16982+done
16983+ done
16984+IFS=$as_save_IFS
16985+
16986+fi
16987+fi
16988+DLLTOOL=$ac_cv_prog_DLLTOOL
16989+if test -n "$DLLTOOL"; then
16990+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
16991+$as_echo "$DLLTOOL" >&6; }
16992+else
16993+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16994+$as_echo "no" >&6; }
16995+fi
16996+
16997+
16998+fi
16999+if test -z "$ac_cv_prog_DLLTOOL"; then
17000+ ac_ct_DLLTOOL=$DLLTOOL
17001+ # Extract the first word of "dlltool", so it can be a program name with args.
17002+set dummy dlltool; ac_word=$2
17003+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17004+$as_echo_n "checking for $ac_word... " >&6; }
17005+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17006+ $as_echo_n "(cached) " >&6
17007+else
17008+ if test -n "$ac_ct_DLLTOOL"; then
17009+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17010+else
17011+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17012+for as_dir in $PATH
17013+do
17014+ IFS=$as_save_IFS
17015+ test -z "$as_dir" && as_dir=.
17016+ for ac_exec_ext in '' $ac_executable_extensions; do
17017+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17018+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17019+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17020+ break 2
17021+ fi
17022+done
17023+ done
17024+IFS=$as_save_IFS
17025+
17026+fi
17027+fi
17028+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17029+if test -n "$ac_ct_DLLTOOL"; then
17030+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17031+$as_echo "$ac_ct_DLLTOOL" >&6; }
17032+else
17033+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17034+$as_echo "no" >&6; }
17035+fi
17036+
17037+ if test "x$ac_ct_DLLTOOL" = x; then
17038+ DLLTOOL="false"
17039+ else
17040+ case $cross_compiling:$ac_tool_warned in
17041+yes:)
17042+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17043+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17044+ac_tool_warned=yes ;;
17045+esac
17046+ DLLTOOL=$ac_ct_DLLTOOL
17047+ fi
17048+else
17049+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17050+fi
17051+
17052+test -z "$DLLTOOL" && DLLTOOL=dlltool
17053+
17054+
17055+
17056+
17057+
17058+
17059+
17060+
17061+
17062+
17063+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17064+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17065+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17066+ $as_echo_n "(cached) " >&6
17067+else
17068+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17069+
17070+case $host_os in
17071+cygwin* | mingw* | pw32* | cegcc*)
17072+ # two different shell functions defined in ltmain.sh
17073+ # decide which to use based on capabilities of $DLLTOOL
17074+ case `$DLLTOOL --help 2>&1` in
17075+ *--identify-strict*)
17076+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17077+ ;;
17078+ *)
17079+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17080+ ;;
17081+ esac
17082+ ;;
17083+*)
17084+ # fallback: assume linklib IS sharedlib
17085+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17086+ ;;
17087+esac
17088+
17089+fi
17090+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17091+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17092+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17093+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17094+
17095+
17096+
17097+
17098+
17099+
17100+
17101 if test -n "$ac_tool_prefix"; then
17102- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17103-set dummy ${ac_tool_prefix}ar; ac_word=$2
17104+ for ac_prog in ar
17105+ do
17106+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17107+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17108 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17109 $as_echo_n "checking for $ac_word... " >&6; }
17110 if test "${ac_cv_prog_AR+set}" = set; then :
17111@@ -6710,7 +6964,7 @@ do
17112 test -z "$as_dir" && as_dir=.
17113 for ac_exec_ext in '' $ac_executable_extensions; do
17114 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17115- ac_cv_prog_AR="${ac_tool_prefix}ar"
17116+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17117 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17118 break 2
17119 fi
17120@@ -6730,11 +6984,15 @@ $as_echo "no" >&6; }
17121 fi
17122
17123
17124+ test -n "$AR" && break
17125+ done
17126 fi
17127-if test -z "$ac_cv_prog_AR"; then
17128+if test -z "$AR"; then
17129 ac_ct_AR=$AR
17130- # Extract the first word of "ar", so it can be a program name with args.
17131-set dummy ar; ac_word=$2
17132+ for ac_prog in ar
17133+do
17134+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17135+set dummy $ac_prog; ac_word=$2
17136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17137 $as_echo_n "checking for $ac_word... " >&6; }
17138 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17139@@ -6750,7 +7008,7 @@ do
17140 test -z "$as_dir" && as_dir=.
17141 for ac_exec_ext in '' $ac_executable_extensions; do
17142 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17143- ac_cv_prog_ac_ct_AR="ar"
17144+ ac_cv_prog_ac_ct_AR="$ac_prog"
17145 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17146 break 2
17147 fi
17148@@ -6769,6 +7027,10 @@ else
17149 $as_echo "no" >&6; }
17150 fi
17151
17152+
17153+ test -n "$ac_ct_AR" && break
17154+done
17155+
17156 if test "x$ac_ct_AR" = x; then
17157 AR="false"
17158 else
17159@@ -6780,16 +7042,72 @@ ac_tool_warned=yes ;;
17160 esac
17161 AR=$ac_ct_AR
17162 fi
17163-else
17164- AR="$ac_cv_prog_AR"
17165 fi
17166
17167-test -z "$AR" && AR=ar
17168-test -z "$AR_FLAGS" && AR_FLAGS=cru
17169+: ${AR=ar}
17170+: ${AR_FLAGS=cru}
17171+
17172+
17173+
17174+
17175+
17176+
17177+
17178+
17179+
17180+
17181+
17182+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17183+$as_echo_n "checking for archiver @FILE support... " >&6; }
17184+if test "${lt_cv_ar_at_file+set}" = set; then :
17185+ $as_echo_n "(cached) " >&6
17186+else
17187+ lt_cv_ar_at_file=no
17188+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17189+/* end confdefs.h. */
17190+
17191+int
17192+main ()
17193+{
17194
17195+ ;
17196+ return 0;
17197+}
17198+_ACEOF
17199+if ac_fn_c_try_compile "$LINENO"; then :
17200+ echo conftest.$ac_objext > conftest.lst
17201+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17202+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17203+ (eval $lt_ar_try) 2>&5
17204+ ac_status=$?
17205+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17206+ test $ac_status = 0; }
17207+ if test "$ac_status" -eq 0; then
17208+ # Ensure the archiver fails upon bogus file names.
17209+ rm -f conftest.$ac_objext libconftest.a
17210+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17211+ (eval $lt_ar_try) 2>&5
17212+ ac_status=$?
17213+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17214+ test $ac_status = 0; }
17215+ if test "$ac_status" -ne 0; then
17216+ lt_cv_ar_at_file=@
17217+ fi
17218+ fi
17219+ rm -f conftest.* libconftest.a
17220
17221+fi
17222+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17223
17224+fi
17225+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17226+$as_echo "$lt_cv_ar_at_file" >&6; }
17227
17228+if test "x$lt_cv_ar_at_file" = xno; then
17229+ archiver_list_spec=
17230+else
17231+ archiver_list_spec=$lt_cv_ar_at_file
17232+fi
17233
17234
17235
17236@@ -7131,8 +7449,8 @@ esac
17237 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17238
17239 # Transform an extracted symbol line into symbol name and symbol address
17240-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17241-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'"
17242+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17243+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'"
17244
17245 # Handle CRLF in mingw tool chain
17246 opt_cr=
17247@@ -7168,6 +7486,7 @@ for ac_symprfx in "" "_"; do
17248 else
17249 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17250 fi
17251+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17252
17253 # Check to see that the pipe works correctly.
17254 pipe_works=no
17255@@ -7209,6 +7528,18 @@ _LT_EOF
17256 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17257 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17258 cat <<_LT_EOF > conftest.$ac_ext
17259+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17260+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17261+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17262+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17263+# define LT_DLSYM_CONST
17264+#elif defined(__osf__)
17265+/* This system does not cope well with relocations in const data. */
17266+# define LT_DLSYM_CONST
17267+#else
17268+# define LT_DLSYM_CONST const
17269+#endif
17270+
17271 #ifdef __cplusplus
17272 extern "C" {
17273 #endif
17274@@ -7220,7 +7551,7 @@ _LT_EOF
17275 cat <<_LT_EOF >> conftest.$ac_ext
17276
17277 /* The mapping between symbol names and symbols. */
17278-const struct {
17279+LT_DLSYM_CONST struct {
17280 const char *name;
17281 void *address;
17282 }
17283@@ -7246,8 +7577,8 @@ static const void *lt_preloaded_setup()
17284 _LT_EOF
17285 # Now try linking the two files.
17286 mv conftest.$ac_objext conftstm.$ac_objext
17287- lt_save_LIBS="$LIBS"
17288- lt_save_CFLAGS="$CFLAGS"
17289+ lt_globsym_save_LIBS=$LIBS
17290+ lt_globsym_save_CFLAGS=$CFLAGS
17291 LIBS="conftstm.$ac_objext"
17292 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17293 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17294@@ -7257,8 +7588,8 @@ _LT_EOF
17295 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17296 pipe_works=yes
17297 fi
17298- LIBS="$lt_save_LIBS"
17299- CFLAGS="$lt_save_CFLAGS"
17300+ LIBS=$lt_globsym_save_LIBS
17301+ CFLAGS=$lt_globsym_save_CFLAGS
17302 else
17303 echo "cannot find nm_test_func in $nlist" >&5
17304 fi
17305@@ -7295,6 +7626,19 @@ else
17306 $as_echo "ok" >&6; }
17307 fi
17308
17309+# Response file support.
17310+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17311+ nm_file_list_spec='@'
17312+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17313+ nm_file_list_spec='@'
17314+fi
17315+
17316+
17317+
17318+
17319+
17320+
17321+
17322
17323
17324
17325@@ -7315,6 +7659,42 @@ fi
17326
17327
17328
17329+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17330+$as_echo_n "checking for sysroot... " >&6; }
17331+
17332+# Check whether --with-libtool-sysroot was given.
17333+if test "${with_libtool_sysroot+set}" = set; then :
17334+ withval=$with_libtool_sysroot;
17335+else
17336+ with_libtool_sysroot=no
17337+fi
17338+
17339+
17340+lt_sysroot=
17341+case ${with_libtool_sysroot} in #(
17342+ yes)
17343+ if test "$GCC" = yes; then
17344+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17345+ fi
17346+ ;; #(
17347+ /*)
17348+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17349+ ;; #(
17350+ no|'')
17351+ ;; #(
17352+ *)
17353+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17354+$as_echo "${with_libtool_sysroot}" >&6; }
17355+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17356+ ;;
17357+esac
17358+
17359+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17360+$as_echo "${lt_sysroot:-no}" >&6; }
17361+
17362+
17363+
17364+
17365
17366 # Check whether --enable-libtool-lock was given.
17367 if test "${enable_libtool_lock+set}" = set; then :
17368@@ -7509,6 +7889,123 @@ esac
17369
17370 need_locks="$enable_libtool_lock"
17371
17372+if test -n "$ac_tool_prefix"; then
17373+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17374+set dummy ${ac_tool_prefix}mt; ac_word=$2
17375+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17376+$as_echo_n "checking for $ac_word... " >&6; }
17377+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17378+ $as_echo_n "(cached) " >&6
17379+else
17380+ if test -n "$MANIFEST_TOOL"; then
17381+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17382+else
17383+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17384+for as_dir in $PATH
17385+do
17386+ IFS=$as_save_IFS
17387+ test -z "$as_dir" && as_dir=.
17388+ for ac_exec_ext in '' $ac_executable_extensions; do
17389+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17390+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17391+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17392+ break 2
17393+ fi
17394+done
17395+ done
17396+IFS=$as_save_IFS
17397+
17398+fi
17399+fi
17400+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17401+if test -n "$MANIFEST_TOOL"; then
17402+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17403+$as_echo "$MANIFEST_TOOL" >&6; }
17404+else
17405+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17406+$as_echo "no" >&6; }
17407+fi
17408+
17409+
17410+fi
17411+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17412+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17413+ # Extract the first word of "mt", so it can be a program name with args.
17414+set dummy mt; ac_word=$2
17415+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17416+$as_echo_n "checking for $ac_word... " >&6; }
17417+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17418+ $as_echo_n "(cached) " >&6
17419+else
17420+ if test -n "$ac_ct_MANIFEST_TOOL"; then
17421+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
17422+else
17423+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17424+for as_dir in $PATH
17425+do
17426+ IFS=$as_save_IFS
17427+ test -z "$as_dir" && as_dir=.
17428+ for ac_exec_ext in '' $ac_executable_extensions; do
17429+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17430+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17431+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17432+ break 2
17433+ fi
17434+done
17435+ done
17436+IFS=$as_save_IFS
17437+
17438+fi
17439+fi
17440+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
17441+if test -n "$ac_ct_MANIFEST_TOOL"; then
17442+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
17443+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
17444+else
17445+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17446+$as_echo "no" >&6; }
17447+fi
17448+
17449+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
17450+ MANIFEST_TOOL=":"
17451+ else
17452+ case $cross_compiling:$ac_tool_warned in
17453+yes:)
17454+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17455+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17456+ac_tool_warned=yes ;;
17457+esac
17458+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
17459+ fi
17460+else
17461+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
17462+fi
17463+
17464+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
17465+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
17466+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
17467+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
17468+ $as_echo_n "(cached) " >&6
17469+else
17470+ lt_cv_path_mainfest_tool=no
17471+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
17472+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
17473+ cat conftest.err >&5
17474+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
17475+ lt_cv_path_mainfest_tool=yes
17476+ fi
17477+ rm -f conftest*
17478+fi
17479+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
17480+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
17481+if test "x$lt_cv_path_mainfest_tool" != xyes; then
17482+ MANIFEST_TOOL=:
17483+fi
17484+
17485+
17486+
17487+
17488+
17489
17490 case $host_os in
17491 rhapsody* | darwin*)
17492@@ -8072,6 +8569,8 @@ _LT_EOF
17493 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17494 echo "$AR cru libconftest.a conftest.o" >&5
17495 $AR cru libconftest.a conftest.o 2>&5
17496+ echo "$RANLIB libconftest.a" >&5
17497+ $RANLIB libconftest.a 2>&5
17498 cat > conftest.c << _LT_EOF
17499 int main() { return 0;}
17500 _LT_EOF
17501@@ -8267,7 +8766,8 @@ fi
17502 LIBTOOL_DEPS="$ltmain"
17503
17504 # Always use our own libtool.
17505-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
17506+LIBTOOL='$(SHELL) $(top_builddir)'
17507+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
17508
17509
17510
17511@@ -8356,7 +8856,7 @@ aix3*)
17512 esac
17513
17514 # Global variables:
17515-ofile=libtool
17516+ofile=${host_alias}-libtool
17517 can_build_shared=yes
17518
17519 # All known linkers require a `.a' archive for static linking (except MSVC,
17520@@ -8654,8 +9154,6 @@ fi
17521 lt_prog_compiler_pic=
17522 lt_prog_compiler_static=
17523
17524-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17525-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17526
17527 if test "$GCC" = yes; then
17528 lt_prog_compiler_wl='-Wl,'
17529@@ -8820,6 +9318,12 @@ $as_echo_n "checking for $compiler optio
17530 lt_prog_compiler_pic='--shared'
17531 lt_prog_compiler_static='--static'
17532 ;;
17533+ nagfor*)
17534+ # NAG Fortran compiler
17535+ lt_prog_compiler_wl='-Wl,-Wl,,'
17536+ lt_prog_compiler_pic='-PIC'
17537+ lt_prog_compiler_static='-Bstatic'
17538+ ;;
17539 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17540 # Portland Group compilers (*not* the Pentium gcc compiler,
17541 # which looks to be a dead project)
17542@@ -8882,7 +9386,7 @@ $as_echo_n "checking for $compiler optio
17543 lt_prog_compiler_pic='-KPIC'
17544 lt_prog_compiler_static='-Bstatic'
17545 case $cc_basename in
17546- f77* | f90* | f95*)
17547+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
17548 lt_prog_compiler_wl='-Qoption ld ';;
17549 *)
17550 lt_prog_compiler_wl='-Wl,';;
17551@@ -8939,13 +9443,17 @@ case $host_os in
17552 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17553 ;;
17554 esac
17555-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
17556-$as_echo "$lt_prog_compiler_pic" >&6; }
17557-
17558-
17559-
17560-
17561
17562+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17563+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17564+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
17565+ $as_echo_n "(cached) " >&6
17566+else
17567+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
17568+fi
17569+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
17570+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
17571+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
17572
17573 #
17574 # Check to make sure the PIC flag actually works.
17575@@ -9006,6 +9514,11 @@ fi
17576
17577
17578
17579+
17580+
17581+
17582+
17583+
17584 #
17585 # Check to make sure the static flag actually works.
17586 #
17587@@ -9356,7 +9869,8 @@ _LT_EOF
17588 allow_undefined_flag=unsupported
17589 always_export_symbols=no
17590 enable_shared_with_static_runtimes=yes
17591- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17592+ 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'
17593+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
17594
17595 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17596 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17597@@ -9404,7 +9918,7 @@ _LT_EOF
17598 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
17599 && test "$tmp_diet" = no
17600 then
17601- tmp_addflag=
17602+ tmp_addflag=' $pic_flag'
17603 tmp_sharedflag='-shared'
17604 case $cc_basename,$host_cpu in
17605 pgcc*) # Portland Group C compiler
17606@@ -9455,12 +9969,12 @@ _LT_EOF
17607 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17608 hardcode_libdir_flag_spec=
17609 hardcode_libdir_flag_spec_ld='-rpath $libdir'
17610- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
17611+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
17612 if test "x$supports_anon_versioning" = xyes; then
17613 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
17614 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
17615 echo "local: *; };" >> $output_objdir/$libname.ver~
17616- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17617+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17618 fi
17619 ;;
17620 esac
17621@@ -9474,8 +9988,8 @@ _LT_EOF
17622 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17623 wlarc=
17624 else
17625- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17626- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17627+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17628+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17629 fi
17630 ;;
17631
17632@@ -9493,8 +10007,8 @@ _LT_EOF
17633
17634 _LT_EOF
17635 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17636- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17637- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17638+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17639+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17640 else
17641 ld_shlibs=no
17642 fi
17643@@ -9540,8 +10054,8 @@ _LT_EOF
17644
17645 *)
17646 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17647- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17648- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17649+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17650+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17651 else
17652 ld_shlibs=no
17653 fi
17654@@ -9671,7 +10185,13 @@ _LT_EOF
17655 allow_undefined_flag='-berok'
17656 # Determine the default libpath from the value encoded in an
17657 # empty executable.
17658- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17659+ if test "${lt_cv_aix_libpath+set}" = set; then
17660+ aix_libpath=$lt_cv_aix_libpath
17661+else
17662+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17663+ $as_echo_n "(cached) " >&6
17664+else
17665+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17666 /* end confdefs.h. */
17667
17668 int
17669@@ -9684,22 +10204,29 @@ main ()
17670 _ACEOF
17671 if ac_fn_c_try_link "$LINENO"; then :
17672
17673-lt_aix_libpath_sed='
17674- /Import File Strings/,/^$/ {
17675- /^0/ {
17676- s/^0 *\(.*\)$/\1/
17677- p
17678- }
17679- }'
17680-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17681-# Check for a 64-bit object if we didn't find anything.
17682-if test -z "$aix_libpath"; then
17683- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17684-fi
17685+ lt_aix_libpath_sed='
17686+ /Import File Strings/,/^$/ {
17687+ /^0/ {
17688+ s/^0 *\([^ ]*\) *$/\1/
17689+ p
17690+ }
17691+ }'
17692+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17693+ # Check for a 64-bit object if we didn't find anything.
17694+ if test -z "$lt_cv_aix_libpath_"; then
17695+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17696+ fi
17697 fi
17698 rm -f core conftest.err conftest.$ac_objext \
17699 conftest$ac_exeext conftest.$ac_ext
17700-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17701+ if test -z "$lt_cv_aix_libpath_"; then
17702+ lt_cv_aix_libpath_="/usr/lib:/lib"
17703+ fi
17704+
17705+fi
17706+
17707+ aix_libpath=$lt_cv_aix_libpath_
17708+fi
17709
17710 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17711 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"
17712@@ -9711,7 +10238,13 @@ if test -z "$aix_libpath"; then aix_libp
17713 else
17714 # Determine the default libpath from the value encoded in an
17715 # empty executable.
17716- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17717+ if test "${lt_cv_aix_libpath+set}" = set; then
17718+ aix_libpath=$lt_cv_aix_libpath
17719+else
17720+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17721+ $as_echo_n "(cached) " >&6
17722+else
17723+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17724 /* end confdefs.h. */
17725
17726 int
17727@@ -9724,22 +10257,29 @@ main ()
17728 _ACEOF
17729 if ac_fn_c_try_link "$LINENO"; then :
17730
17731-lt_aix_libpath_sed='
17732- /Import File Strings/,/^$/ {
17733- /^0/ {
17734- s/^0 *\(.*\)$/\1/
17735- p
17736- }
17737- }'
17738-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17739-# Check for a 64-bit object if we didn't find anything.
17740-if test -z "$aix_libpath"; then
17741- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17742-fi
17743+ lt_aix_libpath_sed='
17744+ /Import File Strings/,/^$/ {
17745+ /^0/ {
17746+ s/^0 *\([^ ]*\) *$/\1/
17747+ p
17748+ }
17749+ }'
17750+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17751+ # Check for a 64-bit object if we didn't find anything.
17752+ if test -z "$lt_cv_aix_libpath_"; then
17753+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17754+ fi
17755 fi
17756 rm -f core conftest.err conftest.$ac_objext \
17757 conftest$ac_exeext conftest.$ac_ext
17758-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17759+ if test -z "$lt_cv_aix_libpath_"; then
17760+ lt_cv_aix_libpath_="/usr/lib:/lib"
17761+ fi
17762+
17763+fi
17764+
17765+ aix_libpath=$lt_cv_aix_libpath_
17766+fi
17767
17768 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17769 # Warning - without using the other run time loading flags,
17770@@ -9784,20 +10324,63 @@ if test -z "$aix_libpath"; then aix_libp
17771 # Microsoft Visual C++.
17772 # hardcode_libdir_flag_spec is actually meaningless, as there is
17773 # no search path for DLLs.
17774- hardcode_libdir_flag_spec=' '
17775- allow_undefined_flag=unsupported
17776- # Tell ltmain to make .lib files, not .a files.
17777- libext=lib
17778- # Tell ltmain to make .dll files, not .so files.
17779- shrext_cmds=".dll"
17780- # FIXME: Setting linknames here is a bad hack.
17781- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17782- # The linker will automatically build a .lib file if we build a DLL.
17783- old_archive_from_new_cmds='true'
17784- # FIXME: Should let the user specify the lib program.
17785- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17786- fix_srcfile_path='`cygpath -w "$srcfile"`'
17787- enable_shared_with_static_runtimes=yes
17788+ case $cc_basename in
17789+ cl*)
17790+ # Native MSVC
17791+ hardcode_libdir_flag_spec=' '
17792+ allow_undefined_flag=unsupported
17793+ always_export_symbols=yes
17794+ file_list_spec='@'
17795+ # Tell ltmain to make .lib files, not .a files.
17796+ libext=lib
17797+ # Tell ltmain to make .dll files, not .so files.
17798+ shrext_cmds=".dll"
17799+ # FIXME: Setting linknames here is a bad hack.
17800+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
17801+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
17802+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
17803+ else
17804+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
17805+ fi~
17806+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
17807+ linknames='
17808+ # The linker will not automatically build a static lib if we build a DLL.
17809+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
17810+ enable_shared_with_static_runtimes=yes
17811+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17812+ # Don't use ranlib
17813+ old_postinstall_cmds='chmod 644 $oldlib'
17814+ postlink_cmds='lt_outputfile="@OUTPUT@"~
17815+ lt_tool_outputfile="@TOOL_OUTPUT@"~
17816+ case $lt_outputfile in
17817+ *.exe|*.EXE) ;;
17818+ *)
17819+ lt_outputfile="$lt_outputfile.exe"
17820+ lt_tool_outputfile="$lt_tool_outputfile.exe"
17821+ ;;
17822+ esac~
17823+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
17824+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
17825+ $RM "$lt_outputfile.manifest";
17826+ fi'
17827+ ;;
17828+ *)
17829+ # Assume MSVC wrapper
17830+ hardcode_libdir_flag_spec=' '
17831+ allow_undefined_flag=unsupported
17832+ # Tell ltmain to make .lib files, not .a files.
17833+ libext=lib
17834+ # Tell ltmain to make .dll files, not .so files.
17835+ shrext_cmds=".dll"
17836+ # FIXME: Setting linknames here is a bad hack.
17837+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17838+ # The linker will automatically build a .lib file if we build a DLL.
17839+ old_archive_from_new_cmds='true'
17840+ # FIXME: Should let the user specify the lib program.
17841+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17842+ enable_shared_with_static_runtimes=yes
17843+ ;;
17844+ esac
17845 ;;
17846
17847 darwin* | rhapsody*)
17848@@ -9862,7 +10445,7 @@ if test -z "$aix_libpath"; then aix_libp
17849
17850 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17851 freebsd* | dragonfly*)
17852- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
17853+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17854 hardcode_libdir_flag_spec='-R$libdir'
17855 hardcode_direct=yes
17856 hardcode_shlibpath_var=no
17857@@ -9870,7 +10453,7 @@ if test -z "$aix_libpath"; then aix_libp
17858
17859 hpux9*)
17860 if test "$GCC" = yes; then
17861- 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'
17862+ 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'
17863 else
17864 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'
17865 fi
17866@@ -9886,7 +10469,7 @@ if test -z "$aix_libpath"; then aix_libp
17867
17868 hpux10*)
17869 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
17870- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17871+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17872 else
17873 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17874 fi
17875@@ -9910,10 +10493,10 @@ if test -z "$aix_libpath"; then aix_libp
17876 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17877 ;;
17878 ia64*)
17879- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17880+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17881 ;;
17882 *)
17883- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17884+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17885 ;;
17886 esac
17887 else
17888@@ -9992,23 +10575,36 @@ fi
17889
17890 irix5* | irix6* | nonstopux*)
17891 if test "$GCC" = yes; then
17892- 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'
17893+ 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'
17894 # Try to use the -exported_symbol ld option, if it does not
17895 # work, assume that -exports_file does not work either and
17896 # implicitly export all symbols.
17897- save_LDFLAGS="$LDFLAGS"
17898- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17899- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17900+ # This should be the same for all languages, so no per-tag cache variable.
17901+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
17902+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
17903+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
17904+ $as_echo_n "(cached) " >&6
17905+else
17906+ save_LDFLAGS="$LDFLAGS"
17907+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17908+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17909 /* end confdefs.h. */
17910-int foo(void) {}
17911+int foo (void) { return 0; }
17912 _ACEOF
17913 if ac_fn_c_try_link "$LINENO"; then :
17914- 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'
17915-
17916+ lt_cv_irix_exported_symbol=yes
17917+else
17918+ lt_cv_irix_exported_symbol=no
17919 fi
17920 rm -f core conftest.err conftest.$ac_objext \
17921 conftest$ac_exeext conftest.$ac_ext
17922- LDFLAGS="$save_LDFLAGS"
17923+ LDFLAGS="$save_LDFLAGS"
17924+fi
17925+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
17926+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
17927+ if test "$lt_cv_irix_exported_symbol" = yes; then
17928+ 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'
17929+ fi
17930 else
17931 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'
17932 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'
17933@@ -10093,7 +10689,7 @@ rm -f core conftest.err conftest.$ac_obj
17934 osf4* | osf5*) # as osf3* with the addition of -msym flag
17935 if test "$GCC" = yes; then
17936 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
17937- 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'
17938+ 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'
17939 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17940 else
17941 allow_undefined_flag=' -expect_unresolved \*'
17942@@ -10112,9 +10708,9 @@ rm -f core conftest.err conftest.$ac_obj
17943 no_undefined_flag=' -z defs'
17944 if test "$GCC" = yes; then
17945 wlarc='${wl}'
17946- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17947+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17948 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
17949- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
17950+ $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'
17951 else
17952 case `$CC -V 2>&1` in
17953 *"Compilers 5.0"*)
17954@@ -10690,8 +11286,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17955 need_version=no
17956 need_lib_prefix=no
17957
17958- case $GCC,$host_os in
17959- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
17960+ case $GCC,$cc_basename in
17961+ yes,*)
17962+ # gcc
17963 library_names_spec='$libname.dll.a'
17964 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17965 postinstall_cmds='base_file=`basename \${file}`~
17966@@ -10724,13 +11321,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17967 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17968 ;;
17969 esac
17970+ dynamic_linker='Win32 ld.exe'
17971+ ;;
17972+
17973+ *,cl*)
17974+ # Native MSVC
17975+ libname_spec='$name'
17976+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17977+ library_names_spec='${libname}.dll.lib'
17978+
17979+ case $build_os in
17980+ mingw*)
17981+ sys_lib_search_path_spec=
17982+ lt_save_ifs=$IFS
17983+ IFS=';'
17984+ for lt_path in $LIB
17985+ do
17986+ IFS=$lt_save_ifs
17987+ # Let DOS variable expansion print the short 8.3 style file name.
17988+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
17989+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
17990+ done
17991+ IFS=$lt_save_ifs
17992+ # Convert to MSYS style.
17993+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
17994+ ;;
17995+ cygwin*)
17996+ # Convert to unix form, then to dos form, then back to unix form
17997+ # but this time dos style (no spaces!) so that the unix form looks
17998+ # like /cygdrive/c/PROGRA~1:/cygdr...
17999+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18000+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18001+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18002+ ;;
18003+ *)
18004+ sys_lib_search_path_spec="$LIB"
18005+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18006+ # It is most probably a Windows format PATH.
18007+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18008+ else
18009+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18010+ fi
18011+ # FIXME: find the short name or the path components, as spaces are
18012+ # common. (e.g. "Program Files" -> "PROGRA~1")
18013+ ;;
18014+ esac
18015+
18016+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18017+ postinstall_cmds='base_file=`basename \${file}`~
18018+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18019+ dldir=$destdir/`dirname \$dlpath`~
18020+ test -d \$dldir || mkdir -p \$dldir~
18021+ $install_prog $dir/$dlname \$dldir/$dlname'
18022+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18023+ dlpath=$dir/\$dldll~
18024+ $RM \$dlpath'
18025+ shlibpath_overrides_runpath=yes
18026+ dynamic_linker='Win32 link.exe'
18027 ;;
18028
18029 *)
18030+ # Assume MSVC wrapper
18031 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18032+ dynamic_linker='Win32 ld.exe'
18033 ;;
18034 esac
18035- dynamic_linker='Win32 ld.exe'
18036 # FIXME: first we should search . and the directory the executable is in
18037 shlibpath_var=PATH
18038 ;;
18039@@ -10826,7 +11481,7 @@ haiku*)
18040 soname_spec='${libname}${release}${shared_ext}$major'
18041 shlibpath_var=LIBRARY_PATH
18042 shlibpath_overrides_runpath=yes
18043- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18044+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18045 hardcode_into_libs=yes
18046 ;;
18047
18048@@ -11622,7 +12277,7 @@ else
18049 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18050 lt_status=$lt_dlunknown
18051 cat > conftest.$ac_ext <<_LT_EOF
18052-#line 11625 "configure"
18053+#line $LINENO "configure"
18054 #include "confdefs.h"
18055
18056 #if HAVE_DLFCN_H
18057@@ -11666,10 +12321,10 @@ else
18058 /* When -fvisbility=hidden is used, assume the code has been annotated
18059 correspondingly for the symbols needed. */
18060 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18061-void fnord () __attribute__((visibility("default")));
18062+int fnord () __attribute__((visibility("default")));
18063 #endif
18064
18065-void fnord () { int i=42; }
18066+int fnord () { return 42; }
18067 int main ()
18068 {
18069 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18070@@ -11728,7 +12383,7 @@ else
18071 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18072 lt_status=$lt_dlunknown
18073 cat > conftest.$ac_ext <<_LT_EOF
18074-#line 11731 "configure"
18075+#line $LINENO "configure"
18076 #include "confdefs.h"
18077
18078 #if HAVE_DLFCN_H
18079@@ -11772,10 +12427,10 @@ else
18080 /* When -fvisbility=hidden is used, assume the code has been annotated
18081 correspondingly for the symbols needed. */
18082 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18083-void fnord () __attribute__((visibility("default")));
18084+int fnord () __attribute__((visibility("default")));
18085 #endif
18086
18087-void fnord () { int i=42; }
18088+int fnord () { return 42; }
18089 int main ()
18090 {
18091 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18092@@ -14063,13 +14718,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18093 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18094 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18095 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18096+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18097+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18098 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18099 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18100 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18101 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18102 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18103+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18104+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18105+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18106+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18107 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18108 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18109+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18110 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18111 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18112 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18113@@ -14084,14 +14746,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18114 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18115 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18116 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"`'
18117+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18118+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18119 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18120 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18121 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18122-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18123 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18124+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18125 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18126 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18127 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18128+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18129 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18130 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18131 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18132@@ -14124,12 +14789,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18133 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18134 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18135 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18136-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18137 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18138 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18139 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18140 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18141 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18142+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18143 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18144 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18145 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18146@@ -14184,8 +14849,13 @@ reload_flag \
18147 OBJDUMP \
18148 deplibs_check_method \
18149 file_magic_cmd \
18150+file_magic_glob \
18151+want_nocaseglob \
18152+DLLTOOL \
18153+sharedlib_from_linklib_cmd \
18154 AR \
18155 AR_FLAGS \
18156+archiver_list_spec \
18157 STRIP \
18158 RANLIB \
18159 CC \
18160@@ -14195,12 +14865,14 @@ lt_cv_sys_global_symbol_pipe \
18161 lt_cv_sys_global_symbol_to_cdecl \
18162 lt_cv_sys_global_symbol_to_c_name_address \
18163 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18164+nm_file_list_spec \
18165 lt_prog_compiler_no_builtin_flag \
18166-lt_prog_compiler_wl \
18167 lt_prog_compiler_pic \
18168+lt_prog_compiler_wl \
18169 lt_prog_compiler_static \
18170 lt_cv_prog_compiler_c_o \
18171 need_locks \
18172+MANIFEST_TOOL \
18173 DSYMUTIL \
18174 NMEDIT \
18175 LIPO \
18176@@ -14216,7 +14888,6 @@ no_undefined_flag \
18177 hardcode_libdir_flag_spec \
18178 hardcode_libdir_flag_spec_ld \
18179 hardcode_libdir_separator \
18180-fix_srcfile_path \
18181 exclude_expsyms \
18182 include_expsyms \
18183 file_list_spec \
18184@@ -14252,6 +14923,7 @@ module_cmds \
18185 module_expsym_cmds \
18186 export_symbols_cmds \
18187 prelink_cmds \
18188+postlink_cmds \
18189 postinstall_cmds \
18190 postuninstall_cmds \
18191 finish_cmds \
18192@@ -15047,7 +15719,8 @@ $as_echo X"$file" |
18193 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18194 #
18195 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18196-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18197+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18198+# Inc.
18199 # Written by Gordon Matzigkeit, 1996
18200 #
18201 # This file is part of GNU Libtool.
18202@@ -15150,19 +15823,42 @@ SP2NL=$lt_lt_SP2NL
18203 # turn newlines into spaces.
18204 NL2SP=$lt_lt_NL2SP
18205
18206+# convert \$build file names to \$host format.
18207+to_host_file_cmd=$lt_cv_to_host_file_cmd
18208+
18209+# convert \$build files to toolchain format.
18210+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18211+
18212 # An object symbol dumper.
18213 OBJDUMP=$lt_OBJDUMP
18214
18215 # Method to check whether dependent libraries are shared objects.
18216 deplibs_check_method=$lt_deplibs_check_method
18217
18218-# Command to use when deplibs_check_method == "file_magic".
18219+# Command to use when deplibs_check_method = "file_magic".
18220 file_magic_cmd=$lt_file_magic_cmd
18221
18222+# How to find potential files when deplibs_check_method = "file_magic".
18223+file_magic_glob=$lt_file_magic_glob
18224+
18225+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18226+want_nocaseglob=$lt_want_nocaseglob
18227+
18228+# DLL creation program.
18229+DLLTOOL=$lt_DLLTOOL
18230+
18231+# Command to associate shared and link libraries.
18232+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18233+
18234 # The archiver.
18235 AR=$lt_AR
18236+
18237+# Flags to create an archive.
18238 AR_FLAGS=$lt_AR_FLAGS
18239
18240+# How to feed a file listing to the archiver.
18241+archiver_list_spec=$lt_archiver_list_spec
18242+
18243 # A symbol stripping program.
18244 STRIP=$lt_STRIP
18245
18246@@ -15192,6 +15888,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18247 # Transform the output of nm in a C name address pair when lib prefix is needed.
18248 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18249
18250+# Specify filename containing input files for \$NM.
18251+nm_file_list_spec=$lt_nm_file_list_spec
18252+
18253+# The root where to search for dependent libraries,and in which our libraries should be installed.
18254+lt_sysroot=$lt_sysroot
18255+
18256 # The name of the directory that contains temporary libtool files.
18257 objdir=$objdir
18258
18259@@ -15201,6 +15903,9 @@ MAGIC_CMD=$MAGIC_CMD
18260 # Must we lock files when doing compilation?
18261 need_locks=$lt_need_locks
18262
18263+# Manifest tool.
18264+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18265+
18266 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18267 DSYMUTIL=$lt_DSYMUTIL
18268
18269@@ -15315,12 +16020,12 @@ with_gcc=$GCC
18270 # Compiler flag to turn off builtin functions.
18271 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18272
18273-# How to pass a linker flag through the compiler.
18274-wl=$lt_lt_prog_compiler_wl
18275-
18276 # Additional compiler flags for building library objects.
18277 pic_flag=$lt_lt_prog_compiler_pic
18278
18279+# How to pass a linker flag through the compiler.
18280+wl=$lt_lt_prog_compiler_wl
18281+
18282 # Compiler flag to prevent dynamic linking.
18283 link_static_flag=$lt_lt_prog_compiler_static
18284
18285@@ -15407,9 +16112,6 @@ inherit_rpath=$inherit_rpath
18286 # Whether libtool must link a program against all its dependency libraries.
18287 link_all_deplibs=$link_all_deplibs
18288
18289-# Fix the shell variable \$srcfile for the compiler.
18290-fix_srcfile_path=$lt_fix_srcfile_path
18291-
18292 # Set to "yes" if exported symbols are required.
18293 always_export_symbols=$always_export_symbols
18294
18295@@ -15425,6 +16127,9 @@ include_expsyms=$lt_include_expsyms
18296 # Commands necessary for linking programs (against libraries) with templates.
18297 prelink_cmds=$lt_prelink_cmds
18298
18299+# Commands necessary for finishing linking programs.
18300+postlink_cmds=$lt_postlink_cmds
18301+
18302 # Specify filename containing input files.
18303 file_list_spec=$lt_file_list_spec
18304
18305@@ -15457,210 +16162,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18306 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18307 # text mode, it properly converts lines to CR/LF. This bash problem
18308 # is reportedly fixed, but why not run on old versions too?
18309- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18310- || (rm -f "$cfgfile"; exit 1)
18311-
18312- case $xsi_shell in
18313- yes)
18314- cat << \_LT_EOF >> "$cfgfile"
18315-
18316-# func_dirname file append nondir_replacement
18317-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18318-# otherwise set result to NONDIR_REPLACEMENT.
18319-func_dirname ()
18320-{
18321- case ${1} in
18322- */*) func_dirname_result="${1%/*}${2}" ;;
18323- * ) func_dirname_result="${3}" ;;
18324- esac
18325-}
18326-
18327-# func_basename file
18328-func_basename ()
18329-{
18330- func_basename_result="${1##*/}"
18331-}
18332-
18333-# func_dirname_and_basename file append nondir_replacement
18334-# perform func_basename and func_dirname in a single function
18335-# call:
18336-# dirname: Compute the dirname of FILE. If nonempty,
18337-# add APPEND to the result, otherwise set result
18338-# to NONDIR_REPLACEMENT.
18339-# value returned in "$func_dirname_result"
18340-# basename: Compute filename of FILE.
18341-# value retuned in "$func_basename_result"
18342-# Implementation must be kept synchronized with func_dirname
18343-# and func_basename. For efficiency, we do not delegate to
18344-# those functions but instead duplicate the functionality here.
18345-func_dirname_and_basename ()
18346-{
18347- case ${1} in
18348- */*) func_dirname_result="${1%/*}${2}" ;;
18349- * ) func_dirname_result="${3}" ;;
18350- esac
18351- func_basename_result="${1##*/}"
18352-}
18353-
18354-# func_stripname prefix suffix name
18355-# strip PREFIX and SUFFIX off of NAME.
18356-# PREFIX and SUFFIX must not contain globbing or regex special
18357-# characters, hashes, percent signs, but SUFFIX may contain a leading
18358-# dot (in which case that matches only a dot).
18359-func_stripname ()
18360-{
18361- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18362- # positional parameters, so assign one to ordinary parameter first.
18363- func_stripname_result=${3}
18364- func_stripname_result=${func_stripname_result#"${1}"}
18365- func_stripname_result=${func_stripname_result%"${2}"}
18366-}
18367-
18368-# func_opt_split
18369-func_opt_split ()
18370-{
18371- func_opt_split_opt=${1%%=*}
18372- func_opt_split_arg=${1#*=}
18373-}
18374-
18375-# func_lo2o object
18376-func_lo2o ()
18377-{
18378- case ${1} in
18379- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18380- *) func_lo2o_result=${1} ;;
18381- esac
18382-}
18383-
18384-# func_xform libobj-or-source
18385-func_xform ()
18386-{
18387- func_xform_result=${1%.*}.lo
18388-}
18389-
18390-# func_arith arithmetic-term...
18391-func_arith ()
18392-{
18393- func_arith_result=$(( $* ))
18394-}
18395-
18396-# func_len string
18397-# STRING may not start with a hyphen.
18398-func_len ()
18399-{
18400- func_len_result=${#1}
18401-}
18402-
18403-_LT_EOF
18404- ;;
18405- *) # Bourne compatible functions.
18406- cat << \_LT_EOF >> "$cfgfile"
18407-
18408-# func_dirname file append nondir_replacement
18409-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18410-# otherwise set result to NONDIR_REPLACEMENT.
18411-func_dirname ()
18412-{
18413- # Extract subdirectory from the argument.
18414- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18415- if test "X$func_dirname_result" = "X${1}"; then
18416- func_dirname_result="${3}"
18417- else
18418- func_dirname_result="$func_dirname_result${2}"
18419- fi
18420-}
18421-
18422-# func_basename file
18423-func_basename ()
18424-{
18425- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18426-}
18427-
18428-
18429-# func_stripname prefix suffix name
18430-# strip PREFIX and SUFFIX off of NAME.
18431-# PREFIX and SUFFIX must not contain globbing or regex special
18432-# characters, hashes, percent signs, but SUFFIX may contain a leading
18433-# dot (in which case that matches only a dot).
18434-# func_strip_suffix prefix name
18435-func_stripname ()
18436-{
18437- case ${2} in
18438- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18439- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18440- esac
18441-}
18442-
18443-# sed scripts:
18444-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18445-my_sed_long_arg='1s/^-[^=]*=//'
18446-
18447-# func_opt_split
18448-func_opt_split ()
18449-{
18450- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18451- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18452-}
18453-
18454-# func_lo2o object
18455-func_lo2o ()
18456-{
18457- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18458-}
18459-
18460-# func_xform libobj-or-source
18461-func_xform ()
18462-{
18463- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18464-}
18465-
18466-# func_arith arithmetic-term...
18467-func_arith ()
18468-{
18469- func_arith_result=`expr "$@"`
18470-}
18471-
18472-# func_len string
18473-# STRING may not start with a hyphen.
18474-func_len ()
18475-{
18476- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
18477-}
18478-
18479-_LT_EOF
18480-esac
18481-
18482-case $lt_shell_append in
18483- yes)
18484- cat << \_LT_EOF >> "$cfgfile"
18485-
18486-# func_append var value
18487-# Append VALUE to the end of shell variable VAR.
18488-func_append ()
18489-{
18490- eval "$1+=\$2"
18491-}
18492-_LT_EOF
18493- ;;
18494- *)
18495- cat << \_LT_EOF >> "$cfgfile"
18496-
18497-# func_append var value
18498-# Append VALUE to the end of shell variable VAR.
18499-func_append ()
18500-{
18501- eval "$1=\$$1\$2"
18502-}
18503-
18504-_LT_EOF
18505- ;;
18506- esac
18507+ sed '$q' "$ltmain" >> "$cfgfile" \
18508+ || (rm -f "$cfgfile"; exit 1)
18509
18510+ if test x"$xsi_shell" = xyes; then
18511+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
18512+func_dirname ()\
18513+{\
18514+\ case ${1} in\
18515+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18516+\ * ) func_dirname_result="${3}" ;;\
18517+\ esac\
18518+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
18519+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18520+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18521+test 0 -eq $? || _lt_function_replace_fail=:
18522+
18523+
18524+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
18525+func_basename ()\
18526+{\
18527+\ func_basename_result="${1##*/}"\
18528+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
18529+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18530+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18531+test 0 -eq $? || _lt_function_replace_fail=:
18532+
18533+
18534+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
18535+func_dirname_and_basename ()\
18536+{\
18537+\ case ${1} in\
18538+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18539+\ * ) func_dirname_result="${3}" ;;\
18540+\ esac\
18541+\ func_basename_result="${1##*/}"\
18542+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
18543+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18544+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18545+test 0 -eq $? || _lt_function_replace_fail=:
18546+
18547+
18548+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
18549+func_stripname ()\
18550+{\
18551+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
18552+\ # positional parameters, so assign one to ordinary parameter first.\
18553+\ func_stripname_result=${3}\
18554+\ func_stripname_result=${func_stripname_result#"${1}"}\
18555+\ func_stripname_result=${func_stripname_result%"${2}"}\
18556+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
18557+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18558+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18559+test 0 -eq $? || _lt_function_replace_fail=:
18560+
18561+
18562+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
18563+func_split_long_opt ()\
18564+{\
18565+\ func_split_long_opt_name=${1%%=*}\
18566+\ func_split_long_opt_arg=${1#*=}\
18567+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
18568+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18569+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18570+test 0 -eq $? || _lt_function_replace_fail=:
18571+
18572+
18573+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
18574+func_split_short_opt ()\
18575+{\
18576+\ func_split_short_opt_arg=${1#??}\
18577+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
18578+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
18579+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18580+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18581+test 0 -eq $? || _lt_function_replace_fail=:
18582+
18583+
18584+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
18585+func_lo2o ()\
18586+{\
18587+\ case ${1} in\
18588+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
18589+\ *) func_lo2o_result=${1} ;;\
18590+\ esac\
18591+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
18592+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18593+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18594+test 0 -eq $? || _lt_function_replace_fail=:
18595+
18596+
18597+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
18598+func_xform ()\
18599+{\
18600+ func_xform_result=${1%.*}.lo\
18601+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
18602+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18603+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18604+test 0 -eq $? || _lt_function_replace_fail=:
18605+
18606+
18607+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
18608+func_arith ()\
18609+{\
18610+ func_arith_result=$(( $* ))\
18611+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
18612+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18613+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18614+test 0 -eq $? || _lt_function_replace_fail=:
18615+
18616+
18617+ sed -e '/^func_len ()$/,/^} # func_len /c\
18618+func_len ()\
18619+{\
18620+ func_len_result=${#1}\
18621+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
18622+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18623+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18624+test 0 -eq $? || _lt_function_replace_fail=:
18625+
18626+fi
18627+
18628+if test x"$lt_shell_append" = xyes; then
18629+ sed -e '/^func_append ()$/,/^} # func_append /c\
18630+func_append ()\
18631+{\
18632+ eval "${1}+=\\${2}"\
18633+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
18634+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18635+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18636+test 0 -eq $? || _lt_function_replace_fail=:
18637+
18638+
18639+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
18640+func_append_quoted ()\
18641+{\
18642+\ func_quote_for_eval "${2}"\
18643+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
18644+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
18645+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18646+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18647+test 0 -eq $? || _lt_function_replace_fail=:
18648+
18649+
18650+ # Save a `func_append' function call where possible by direct use of '+='
18651+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
18652+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18653+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18654+ test 0 -eq $? || _lt_function_replace_fail=:
18655+else
18656+ # Save a `func_append' function call even when '+=' is not available
18657+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
18658+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18659+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18660+ test 0 -eq $? || _lt_function_replace_fail=:
18661+fi
18662+
18663+if test x"$_lt_function_replace_fail" = x":"; then
18664+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
18665+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
18666+fi
18667
18668- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
18669- || (rm -f "$cfgfile"; exit 1)
18670
18671- mv -f "$cfgfile" "$ofile" ||
18672+ mv -f "$cfgfile" "$ofile" ||
18673 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
18674 chmod +x "$ofile"
18675
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.bb
index 1621b77e9d..7dad2a620b 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.bb
@@ -1,3 +1,3 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross-canadian.inc 2require binutils-cross-canadian.inc
3PR = "r6" 3PR = "r0"
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross_2.21.bb
index 8c7e4bc1a3..01d99db419 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.21.bb
@@ -1,3 +1,2 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross.inc 2require binutils-cross.inc
3
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.bb
index 88627f87be..0d6efffa2f 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.bb
@@ -4,7 +4,7 @@ inherit crosssdk
4 4
5PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 5PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
6 6
7PR = "r4" 7PR = "r0"
8 8
9do_configure_prepend () { 9do_configure_prepend () {
10 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt 10 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils_2.20.1.bb b/meta/recipes-devtools/binutils/binutils_2.21.bb
index 75837b158f..8282eb8552 100644
--- a/meta/recipes-devtools/binutils/binutils_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.bb
@@ -1,6 +1,6 @@
1require binutils.inc 1require binutils.inc
2 2
3PR = "r4" 3PR = "r0"
4 4
5LIC_FILES_CHKSUM="\ 5LIC_FILES_CHKSUM="\
6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ 6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM="\
16 " 16 "
17 17
18SRC_URI = "\ 18SRC_URI = "\
19 ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2;name=tarball \ 19 ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
20 file://binutils-uclibc-100-uclibc-conf.patch \ 20 file://binutils-uclibc-100-uclibc-conf.patch \
21 file://110-arm-eabi-conf.patch \ 21 file://110-arm-eabi-conf.patch \
22 file://binutils-uclibc-300-001_ld_makefile_patch.patch \ 22 file://binutils-uclibc-300-001_ld_makefile_patch.patch \
@@ -24,18 +24,14 @@ SRC_URI = "\
24 file://binutils-uclibc-300-012_check_ldrunpath_length.patch \ 24 file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
25 file://binutils-uclibc-gas-needs-libm.patch \ 25 file://binutils-uclibc-gas-needs-libm.patch \
26 file://binutils-x86_64_i386_biarch.patch \ 26 file://binutils-x86_64_i386_biarch.patch \
27 file://binutils-mips-pie.patch \ 27 file://libtool-2.4-update.patch \
28 file://binutils-libtool.patch \ 28 file://binutils-2.19.1-ld-sysroot.patch \
29 file://libiberty_path_fix.patch \ 29 file://libiberty_path_fix.patch \
30 file://binutils-poison.patch \ 30# Need to consult w/ Mark Hatle to get this patch updated:
31# file://binutils-poison.patch \
31 " 32 "
32 33
33SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" 34SRC_URI[md5sum] = "c84c5acc9d266f1a7044b51c85a823f5"
34SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" 35SRC_URI[sha256sum] = "60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7"
35
36# powerpc patches
37SRC_URI += "\
38 file://binutils-2.16.1-e300c2c3.patch \
39 "
40 36
41BBCLASSEXTEND = "native" 37BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 20:27:57 +0000