summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-07-06 17:26:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 16:39:09 +0100
commit3f4f5c14ac8088d523c8c884f3dfb5f7ea1e5fdc (patch)
treea498a134a7c56bab7fe6cb7b9b37cb463b4515e6 /meta/recipes-devtools/binutils/binutils
parentcd16591d6cb5d37d027ac16211904d4d7db3033e (diff)
downloadpoky-3f4f5c14ac8088d523c8c884f3dfb5f7ea1e5fdc.tar.gz
binutils: upgrade from 2.21 to 2.21.1
(From OE-Core rev: 4810404f22d7cf8849dc32da68dd33a156cac407) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils')
-rw-r--r--meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch24
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch39
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-poison.patch247
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-pr12366.patch428
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch36
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch51
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch44
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch49
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch39
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch27
-rw-r--r--meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch22
-rw-r--r--meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch18732
-rw-r--r--meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch38
13 files changed, 19776 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch b/meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
new file mode 100644
index 0000000000..dc496137d0
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
@@ -0,0 +1,24 @@
1Upstream-Status: Pending
2
3--- /tmp/configure.ac 2008-06-22 14:14:59.000000000 +0200
4+++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.000000000 +0200
5@@ -561,7 +561,7 @@
6 noconfigdirs="$noconfigdirs target-libffi target-qthreads"
7 libgloss_dir=arm
8 ;;
9- arm*-*-linux-gnueabi)
10+ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
11 noconfigdirs="$noconfigdirs target-qthreads"
12 noconfigdirs="$noconfigdirs target-libobjc"
13 case ${with_newlib} in
14--- /tmp/configure 2008-06-22 14:17:11.000000000 +0200
15+++ binutils-2.18.50.0.7/configure 2008-06-22 14:17:56.000000000 +0200
16@@ -2307,7 +2307,7 @@
17 noconfigdirs="$noconfigdirs target-libffi target-qthreads"
18 libgloss_dir=arm
19 ;;
20- arm*-*-linux-gnueabi)
21+ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
22 noconfigdirs="$noconfigdirs target-qthreads"
23 noconfigdirs="$noconfigdirs target-libobjc"
24 case ${with_newlib} in
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
new file mode 100644
index 0000000000..1a640eac39
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Pending
2
3http://sourceware.org/bugzilla/show_bug.cgi?id=10340
4
5Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
6
7Always try to prepend the sysroot prefix to absolute filenames first.
8
9Index: binutils-2.21/ld/ldfile.c
10===================================================================
11--- binutils-2.21.orig/ld/ldfile.c
12+++ binutils-2.21/ld/ldfile.c
13@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc
14 directory first. */
15 if (! entry->is_archive)
16 {
17- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
18+ /* For absolute pathnames, try to always open the file in the
19+ sysroot first. If this fails, try to open the file at the
20+ given location. */
21+ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
22+ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
23 {
24 char *name = concat (ld_sysroot, entry->filename,
25 (const char *) NULL);
26 if (ldfile_try_open_bfd (name, entry))
27 {
28 entry->filename = name;
29+ entry->sysrooted = TRUE;
30 return TRUE;
31 }
32 free (name);
33 }
34- else if (ldfile_try_open_bfd (entry->filename, entry))
35+
36+ if (ldfile_try_open_bfd (entry->filename, entry))
37 {
38 entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
39 && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
new file mode 100644
index 0000000000..759aa88c59
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
@@ -0,0 +1,247 @@
1Upstream-Status: Inappropriate [distribution: codesourcery]
2
3Patch originally created by Mark Hatle, forward-ported to
4binutils 2.21 by Scott Garman.
5
6purpose: warn for uses of system directories when cross linking
7
8Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
9
102008-07-02 Joseph Myers <joseph@codesourcery.com>
11
12 ld/
13 * ld.h (args_type): Add error_poison_system_directories.
14 * ld.texinfo (--error-poison-system-directories): Document.
15 * ldfile.c (ldfile_add_library_path): Check
16 command_line.error_poison_system_directories.
17 * ldmain.c (main): Initialize
18 command_line.error_poison_system_directories.
19 * lexsup.c (enum option_values): Add
20 OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
21 (ld_options): Add --error-poison-system-directories.
22 (parse_args): Handle new option.
23
242007-06-13 Joseph Myers <joseph@codesourcery.com>
25
26 ld/
27 * config.in: Regenerate.
28 * ld.h (args_type): Add poison_system_directories.
29 * ld.texinfo (--no-poison-system-directories): Document.
30 * ldfile.c (ldfile_add_library_path): Check
31 command_line.poison_system_directories.
32 * ldmain.c (main): Initialize
33 command_line.poison_system_directories.
34 * lexsup.c (enum option_values): Add
35 OPTION_NO_POISON_SYSTEM_DIRECTORIES.
36 (ld_options): Add --no-poison-system-directories.
37 (parse_args): Handle new option.
38
392007-04-20 Joseph Myers <joseph@codesourcery.com>
40
41 Merge from Sourcery G++ binutils 2.17:
42
43 2007-03-20 Joseph Myers <joseph@codesourcery.com>
44 Based on patch by Mark Hatle <mark.hatle@windriver.com>.
45 ld/
46 * configure.in (--enable-poison-system-directories): New option.
47 * configure, config.in: Regenerate.
48 * ldfile.c (ldfile_add_library_path): If
49 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
50 /usr/lib, /usr/local/lib or /usr/X11R6/lib.
51
52Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
53Signed-off-by: Scott Garman <scott.a.garman@intel.com>
54
55diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in
56--- binutils-2.21.orig//ld/config.in 2010-11-05 03:34:27.000000000 -0700
57+++ binutils-2.21/ld/config.in 2011-01-19 10:48:15.147301022 -0800
58@@ -4,6 +4,9 @@
59 language is requested. */
60 #undef ENABLE_NLS
61
62+/* Define to warn for use of native system library directories */
63+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
64+
65 /* Additional extension a shared object might have. */
66 #undef EXTRA_SHLIB_EXTENSION
67
68diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure
69--- binutils-2.21.orig//ld/configure 2011-01-19 10:46:46.997571921 -0800
70+++ binutils-2.21/ld/configure 2011-01-19 11:03:50.577832729 -0800
71@@ -768,6 +768,7 @@
72 enable_targets
73 enable_64_bit_bfd
74 with_sysroot
75+enable_poison_system_directories
76 enable_gold
77 enable_got
78 enable_werror
79@@ -1418,6 +1419,8 @@
80 (and sometimes confusing) to the casual installer
81 --enable-targets alternative target configurations
82 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
83+ --enable-poison-system-directories
84+ warn for use of native system library directories
85 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
86 --enable-got=<type> GOT handling scheme (target, single, negative,
87 multigot)
88@@ -4203,7 +4206,18 @@
89 fi
90
91
92+# Check whether --enable-poison-system-directories was given.
93+if test "${enable_poison_system_directories+set}" = set; then :
94+ enableval=$enable_poison_system_directories;
95+else
96+ enable_poison_system_directories=no
97+fi
98+
99+if test "x${enable_poison_system_directories}" = "xyes"; then
100
101+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
102+
103+fi
104
105 # Check whether --enable-got was given.
106 if test "${enable_got+set}" = set; then :
107diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in
108--- binutils-2.21.orig//ld/configure.in 2010-11-23 05:50:32.000000000 -0800
109+++ binutils-2.21/ld/configure.in 2011-01-19 10:50:57.378398946 -0800
110@@ -69,6 +69,16 @@
111 AC_SUBST(TARGET_SYSTEM_ROOT)
112 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
113
114+AC_ARG_ENABLE([poison-system-directories],
115+ AS_HELP_STRING([--enable-poison-system-directories],
116+ [warn for use of native system library directories]),,
117+ [enable_poison_system_directories=no])
118+if test "x${enable_poison_system_directories}" = "xyes"; then
119+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
120+ [1],
121+ [Define to warn for use of native system library directories])
122+fi
123+
124 dnl Use --enable-gold to decide if this linker should be the default.
125 dnl "install_as_default" is set to false if gold is the default linker.
126 dnl "installed_linker" is the installed BFD linker name.
127diff -urN binutils-2.21.orig//ld/ldfile.c binutils-2.21/ld/ldfile.c
128--- binutils-2.21.orig//ld/ldfile.c 2011-01-19 10:46:47.157553281 -0800
129+++ binutils-2.21/ld/ldfile.c 2011-01-19 10:58:30.035468447 -0800
130@@ -124,6 +124,23 @@
131 {
132 new_dirs->name = xstrdup (name);
133 new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE);
134+
135+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
136+ if (command_line.poison_system_directories
137+ && ((!strncmp (name, "/lib", 4))
138+ || (!strncmp (name, "/usr/lib", 8))
139+ || (!strncmp (name, "/usr/local/lib", 14))
140+ || (!strncmp (name, "/usr/X11R6/lib", 14))))
141+ {
142+ if (command_line.error_poison_system_directories)
143+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
144+ "cross-compilation\n"), name);
145+ else
146+ einfo (_("%P: warning: library search path \"%s\" is unsafe for "
147+ "cross-compilation\n"), name);
148+ }
149+#endif
150+
151 }
152 }
153
154diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h
155--- binutils-2.21.orig//ld/ld.h 2009-11-26 05:45:25.000000000 -0800
156+++ binutils-2.21/ld/ld.h 2011-01-19 10:52:54.814716478 -0800
157@@ -198,6 +198,14 @@
158 input files. */
159 bfd_boolean accept_unknown_input_arch;
160
161+ /* If TRUE (the default) warn for uses of system directories when
162+ cross linking. */
163+ bfd_boolean poison_system_directories;
164+
165+ /* If TRUE (default FALSE) give an error for uses of system
166+ directories when cross linking instead of a warning. */
167+ bfd_boolean error_poison_system_directories;
168+
169 /* Big or little endian as set on command line. */
170 enum endian_enum endian;
171
172diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c
173--- binutils-2.21.orig//ld/ldmain.c 2010-11-05 00:20:07.000000000 -0700
174+++ binutils-2.21/ld/ldmain.c 2011-01-19 10:59:18.579767697 -0800
175@@ -259,6 +259,8 @@
176 command_line.warn_search_mismatch = TRUE;
177 command_line.check_section_addresses = -1;
178 command_line.disable_target_specific_optimizations = -1;
179+ command_line.poison_system_directories = TRUE;
180+ command_line.error_poison_system_directories = FALSE;
181
182 /* We initialize DEMANGLING based on the environment variable
183 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
184diff -urN binutils-2.21.orig//ld/ld.texinfo binutils-2.21/ld/ld.texinfo
185--- binutils-2.21.orig//ld/ld.texinfo 2010-10-28 04:40:26.000000000 -0700
186+++ binutils-2.21/ld/ld.texinfo 2011-01-19 10:56:04.452567113 -0800
187@@ -2133,6 +2133,18 @@
188
189 Passing @code{none} for @var{style} disables the setting from any
190 @code{--build-id} options earlier on the command line.
191+
192+@kindex --no-poison-system-directories
193+@item --no-poison-system-directories
194+Do not warn for @option{-L} options using system directories such as
195+@file{/usr/lib} when cross linking. This option is intended for use
196+in chroot environments when such directories contain the correct
197+libraries for the target system rather than the host.
198+
199+@kindex --error-poison-system-directories
200+@item --error-poison-system-directories
201+Give an error instead of a warning for @option{-L} options using
202+system directories when cross linking.
203 @end table
204
205 @c man end
206diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c
207--- binutils-2.21.orig//ld/lexsup.c 2010-10-27 23:45:33.000000000 -0700
208+++ binutils-2.21/ld/lexsup.c 2011-01-19 11:02:07.799898432 -0800
209@@ -175,6 +175,8 @@
210 OPTION_PLUGIN_OPT,
211 #endif /* ENABLE_PLUGINS */
212 OPTION_DEFAULT_SCRIPT,
213+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
214+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES
215 };
216
217 /* The long options. This structure is used for both the option
218@@ -603,6 +605,14 @@
219 TWO_DASHES },
220 { {"wrap", required_argument, NULL, OPTION_WRAP},
221 '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES },
222+ { {"no-poison-system-directories", no_argument, NULL,
223+ OPTION_NO_POISON_SYSTEM_DIRECTORIES},
224+ '\0', NULL, N_("Do not warn for -L options using system directories"),
225+ TWO_DASHES },
226+ { {"error-poison-system-directories", no_argument, NULL,
227+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
228+ '\0', NULL, N_("Give an error for -L options using system directories"),
229+ TWO_DASHES },
230 };
231
232 #define OPTION_COUNT ARRAY_SIZE (ld_options)
233@@ -1518,6 +1528,14 @@
234 einfo (_("%P%X: --hash-size needs a numeric argument\n"));
235 }
236 break;
237+
238+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
239+ command_line.poison_system_directories = FALSE;
240+ break;
241+
242+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
243+ command_line.error_poison_system_directories = TRUE;
244+ break;
245 }
246 }
247
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-pr12366.patch b/meta/recipes-devtools/binutils/binutils/binutils-pr12366.patch
new file mode 100644
index 0000000000..c11a802941
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-pr12366.patch
@@ -0,0 +1,428 @@
1This is backport from 2.21 branch
2
3Upstream-Status: Backport
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7
8commit 946593d19f203b02efd45b5102dd2787d9418e24
9Author: H.J. Lu <hjl.tools@gmail.com>
10Date: Wed May 25 17:41:32 2011 +0000
11
12 Handle STT_GNU_IFUNC symols when building shared library.
13
14 bfd/
15
16 2012-05-25 H.J. Lu <hongjiu.lu@intel.com>
17
18 Backport from mainline
19 2012-01-06 H.J. Lu <hongjiu.lu@intel.com>
20
21 PR ld/12366
22 PR ld/12371
23 * elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Properly
24 handle symbols marked with regular reference, but not non-GOT
25 reference when building shared library.
26
27 * elf32-i386.c (elf_i386_gc_sweep_hook): Properly handle
28 local and global STT_GNU_IFUNC symols when building shared
29 library.
30 * elf64-x86-64.c (elf_x86_64_gc_sweep_hook): Likewise.
31
32 ld/testsuite/
33
34 2012-05-25 H.J. Lu <hongjiu.lu@intel.com>
35
36 Backport from mainline
37 2012-01-06 H.J. Lu <hongjiu.lu@intel.com>
38
39 PR ld/12366
40 PR ld/12371
41 * ld-ifunc/ifunc-10-i386.s: Add more tests.
42 * ld-ifunc/ifunc-10-x86-64.s: Likewise.
43 * ld-ifunc/ifunc-11-i386.s: Likewise.
44 * ld-ifunc/ifunc-11-x86-64.s: Likewise.
45
46 * ld-ifunc/ifunc-12-i386.d: New.
47 * ld-ifunc/ifunc-12-i386.s: Likewise.
48 * ld-ifunc/ifunc-12-x86-64.d: Likewise.
49 * ld-ifunc/ifunc-12-x86-64.s: Likewise.
50 * ld-ifunc/ifunc-13-i386.d: Likewise.
51 * ld-ifunc/ifunc-13-x86-64.d: Likewise.
52 * ld-ifunc/ifunc-13a-i386.s: Likewise.
53 * ld-ifunc/ifunc-13a-x86-64.s: Likewise.
54 * ld-ifunc/ifunc-13b-i386.s: Likewise.
55 * ld-ifunc/ifunc-13b-x86-64.s: Likewise.
56
57Index: binutils-2.21/bfd/elf-ifunc.c
58===================================================================
59--- binutils-2.21.orig/bfd/elf-ifunc.c 2010-07-13 09:59:10.000000000 -0700
60+++ binutils-2.21/bfd/elf-ifunc.c 2011-06-21 16:33:40.751884107 -0700
61@@ -190,10 +190,29 @@
62 /* Support garbage collection against STT_GNU_IFUNC symbols. */
63 if (h->plt.refcount <= 0 && h->got.refcount <= 0)
64 {
65- h->got = htab->init_got_offset;
66- h->plt = htab->init_plt_offset;
67- *head = NULL;
68- return TRUE;
69+ /* When building shared library, we need to handle the case
70+ where it is marked with regular reference, but not non-GOT
71+ reference. It may happen if we didn't see STT_GNU_IFUNC
72+ symbol at the time when checking relocations. */
73+ bfd_size_type count = 0;
74+
75+ if (info->shared
76+ && !h->non_got_ref
77+ && h->ref_regular)
78+ {
79+ for (p = *head; p != NULL; p = p->next)
80+ count += p->count;
81+ if (count != 0)
82+ h->non_got_ref = 1;
83+ }
84+
85+ if (count == 0)
86+ {
87+ h->got = htab->init_got_offset;
88+ h->plt = htab->init_plt_offset;
89+ *head = NULL;
90+ return TRUE;
91+ }
92 }
93
94 /* Return and discard space for dynamic relocations against it if
95Index: binutils-2.21/bfd/elf32-i386.c
96===================================================================
97--- binutils-2.21.orig/bfd/elf32-i386.c 2010-10-21 05:29:02.000000000 -0700
98+++ binutils-2.21/bfd/elf32-i386.c 2011-06-21 16:33:40.761884138 -0700
99@@ -1807,23 +1807,10 @@
100 r_symndx = ELF32_R_SYM (rel->r_info);
101 if (r_symndx >= symtab_hdr->sh_info)
102 {
103- struct elf_i386_link_hash_entry *eh;
104- struct elf_dyn_relocs **pp;
105- struct elf_dyn_relocs *p;
106-
107 h = sym_hashes[r_symndx - symtab_hdr->sh_info];
108 while (h->root.type == bfd_link_hash_indirect
109 || h->root.type == bfd_link_hash_warning)
110 h = (struct elf_link_hash_entry *) h->root.u.i.link;
111- eh = (struct elf_i386_link_hash_entry *) h;
112-
113- for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
114- if (p->sec == sec)
115- {
116- /* Everything must go for SEC. */
117- *pp = p->next;
118- break;
119- }
120 }
121 else
122 {
123@@ -1843,6 +1830,22 @@
124 }
125 }
126
127+ if (h)
128+ {
129+ struct elf_i386_link_hash_entry *eh;
130+ struct elf_dyn_relocs **pp;
131+ struct elf_dyn_relocs *p;
132+
133+ eh = (struct elf_i386_link_hash_entry *) h;
134+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
135+ if (p->sec == sec)
136+ {
137+ /* Everything must go for SEC. */
138+ *pp = p->next;
139+ break;
140+ }
141+ }
142+
143 r_type = ELF32_R_TYPE (rel->r_info);
144 if (! elf_i386_tls_transition (info, abfd, sec, NULL,
145 symtab_hdr, sym_hashes,
146@@ -1883,7 +1886,8 @@
147
148 case R_386_32:
149 case R_386_PC32:
150- if (info->shared)
151+ if (info->shared
152+ && (h == NULL || h->type != STT_GNU_IFUNC))
153 break;
154 /* Fall through */
155
156Index: binutils-2.21/bfd/elf64-x86-64.c
157===================================================================
158--- binutils-2.21.orig/bfd/elf64-x86-64.c 2010-10-21 05:29:02.000000000 -0700
159+++ binutils-2.21/bfd/elf64-x86-64.c 2011-06-21 16:33:40.761884138 -0700
160@@ -1645,23 +1645,10 @@
161 r_symndx = ELF64_R_SYM (rel->r_info);
162 if (r_symndx >= symtab_hdr->sh_info)
163 {
164- struct elf64_x86_64_link_hash_entry *eh;
165- struct elf_dyn_relocs **pp;
166- struct elf_dyn_relocs *p;
167-
168 h = sym_hashes[r_symndx - symtab_hdr->sh_info];
169 while (h->root.type == bfd_link_hash_indirect
170 || h->root.type == bfd_link_hash_warning)
171 h = (struct elf_link_hash_entry *) h->root.u.i.link;
172- eh = (struct elf64_x86_64_link_hash_entry *) h;
173-
174- for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
175- if (p->sec == sec)
176- {
177- /* Everything must go for SEC. */
178- *pp = p->next;
179- break;
180- }
181 }
182 else
183 {
184@@ -1682,7 +1669,24 @@
185 }
186 }
187
188- r_type = ELF64_R_TYPE (rel->r_info);
189+ if (h)
190+ {
191+ struct elf64_x86_64_link_hash_entry *eh;
192+ struct elf_dyn_relocs **pp;
193+ struct elf_dyn_relocs *p;
194+
195+ eh = (struct elf64_x86_64_link_hash_entry *) h;
196+
197+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
198+ if (p->sec == sec)
199+ {
200+ /* Everything must go for SEC. */
201+ *pp = p->next;
202+ break;
203+ }
204+ }
205+
206+ r_type = ELF32_R_TYPE (rel->r_info);
207 if (! elf64_x86_64_tls_transition (info, abfd, sec, NULL,
208 symtab_hdr, sym_hashes,
209 &r_type, GOT_UNKNOWN,
210@@ -1733,7 +1737,8 @@
211 case R_X86_64_PC16:
212 case R_X86_64_PC32:
213 case R_X86_64_PC64:
214- if (info->shared)
215+ if (info->shared
216+ && (h == NULL || h->type != STT_GNU_IFUNC))
217 break;
218 /* Fall thru */
219
220Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.s
221===================================================================
222--- binutils-2.21.orig/ld/testsuite/ld-ifunc/ifunc-10-i386.s 2010-07-13 09:59:14.000000000 -0700
223+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.s 2011-06-21 16:36:36.832142380 -0700
224@@ -6,6 +6,8 @@
225 movl ifunc@GOTOFF(%ecx), %eax
226 call ifunc@PLT
227 call ifunc
228+ movl xxx@GOT(%ecx), %eax
229+ movl xxx, %eax
230 ret
231
232 .section .text.bar,"ax",@progbits
233@@ -18,3 +20,7 @@
234 .type ifunc, @gnu_indirect_function
235 ifunc:
236 ret
237+
238+ .section .data.foo,"aw",@progbits
239+xxx:
240+ .long ifunc
241Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s
242===================================================================
243--- binutils-2.21.orig/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s 2010-07-13 09:59:14.000000000 -0700
244+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s 2011-06-21 16:36:36.822142371 -0700
245@@ -6,6 +6,7 @@
246 movl ifunc(%rip), %eax
247 call ifunc@PLT
248 call ifunc
249+ movl xxx(%rip), %eax
250 ret
251
252 .section .text.bar,"ax",@progbits
253@@ -18,3 +19,7 @@
254 .type ifunc, @gnu_indirect_function
255 ifunc:
256 ret
257+
258+ .section .data.foo,"aw",@progbits
259+xxx:
260+ .quad ifunc
261Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.s
262===================================================================
263--- binutils-2.21.orig/ld/testsuite/ld-ifunc/ifunc-11-i386.s 2010-07-13 09:59:14.000000000 -0700
264+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.s 2011-06-21 16:36:36.832142380 -0700
265@@ -3,9 +3,11 @@
266 foo:
267 .global foo
268 movl ifunc@GOT(%ecx), %eax
269- movl ifunc@GOTOFF(%ecx), %eax
270+ movl ifunc@GOTOFF(%ecx), %eax
271 call ifunc@PLT
272 call ifunc
273+ movl xxx@GOT(%ecx), %eax
274+ movl xxx, %eax
275 ret
276
277 .section .text.bar,"ax",@progbits
278@@ -16,6 +18,10 @@
279
280 .section .text.ifunc,"ax",@progbits
281 .type ifunc, @gnu_indirect_function
282- .global ifunc
283+ .global ifunc
284 ifunc:
285 ret
286+
287+ .section .data.foo,"aw",@progbits
288+xxx:
289+ .long ifunc
290Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s
291===================================================================
292--- binutils-2.21.orig/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s 2010-07-13 09:59:14.000000000 -0700
293+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s 2011-06-21 16:36:36.822142371 -0700
294@@ -6,6 +6,7 @@
295 movl ifunc(%rip), %eax
296 call ifunc@PLT
297 call ifunc
298+ movl xxx(%rip), %eax
299 ret
300
301 .section .text.bar,"ax",@progbits
302@@ -19,3 +20,7 @@
303 .global ifunc
304 ifunc:
305 ret
306+
307+ .section .data.foo,"aw",@progbits
308+xxx:
309+ .quad ifunc
310Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.d
311===================================================================
312--- /dev/null 1970-01-01 00:00:00.000000000 +0000
313+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.d 2011-06-21 16:33:40.761884138 -0700
314@@ -0,0 +1,6 @@
315+#ld: -shared -m elf_i386 -e bar --gc-sections
316+#as: --32
317+#readelf: -r --wide
318+#target: x86_64-*-* i?86-*-*
319+
320+There are no relocations in this file.
321Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
322===================================================================
323--- /dev/null 1970-01-01 00:00:00.000000000 +0000
324+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d 2011-06-21 16:33:40.761884138 -0700
325@@ -0,0 +1,6 @@
326+#ld: -shared -m elf_x86_64 -e bar --gc-sections
327+#as: --64
328+#readelf: -r --wide
329+#target: x86_64-*-*
330+
331+There are no relocations in this file.
332Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-i386.d
333===================================================================
334--- /dev/null 1970-01-01 00:00:00.000000000 +0000
335+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-i386.d 2011-06-21 16:33:40.761884138 -0700
336@@ -0,0 +1,19 @@
337+#source: ifunc-13a-i386.s
338+#source: ifunc-13b-i386.s
339+#ld: -shared -m elf_i386 -z nocombreloc
340+#as: --32
341+#readelf: -r --wide
342+#target: x86_64-*-* i?86-*-*
343+
344+Relocation section '.rel.got' at .*
345+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
346+#...
347+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_GLOB_DAT[ ]+ifunc\(\)[ ]+ifunc
348+#...
349+Relocation section '.rel.ifunc' at .*
350+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
351+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_32[ ]+ifunc\(\)[ ]+ifunc
352+#...
353+Relocation section '.rel.plt' at .*
354+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
355+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc
356Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
357===================================================================
358--- /dev/null 1970-01-01 00:00:00.000000000 +0000
359+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d 2011-06-21 16:33:40.761884138 -0700
360@@ -0,0 +1,18 @@
361+#source: ifunc-13a-x86-64.s
362+#source: ifunc-13b-x86-64.s
363+#ld: -shared -m elf_x86_64 -z nocombreloc
364+#as: --64
365+#readelf: -r --wide
366+#target: x86_64-*-*
367+
368+Relocation section '.rela.got' at .*
369+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
370+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_GLOB_DAT[ ]+ifunc\(\)[ ]+ifunc \+ 0
371+#...
372+Relocation section '.rela.ifunc' at .*
373+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
374+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_64[ ]+ifunc\(\)[ ]+ifunc \+ 0
375+#...
376+Relocation section '.rela.plt' at .*
377+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
378+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc \+ 0
379Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-i386.s
380===================================================================
381--- /dev/null 1970-01-01 00:00:00.000000000 +0000
382+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-i386.s 2011-06-21 16:36:36.822142371 -0700
383@@ -0,0 +1,10 @@
384+ .text
385+ .type foo, @function
386+ .global
387+foo:
388+ movl xxx@GOT(%ebx), %eax
389+ ret
390+
391+ .data
392+xxx:
393+ .long ifunc
394Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s
395===================================================================
396--- /dev/null 1970-01-01 00:00:00.000000000 +0000
397+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s 2011-06-21 16:36:36.822142371 -0700
398@@ -0,0 +1,10 @@
399+ .text
400+ .type foo, @function
401+ .global
402+foo:
403+ movl xxx(%rip), %eax
404+ ret
405+
406+ .data
407+xxx:
408+ .quad ifunc
409Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-i386.s
410===================================================================
411--- /dev/null 1970-01-01 00:00:00.000000000 +0000
412+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-i386.s 2011-06-21 16:33:40.761884138 -0700
413@@ -0,0 +1,5 @@
414+ .text
415+ .type ifunc, @gnu_indirect_function
416+ .globl ifunc
417+ifunc:
418+ ret
419Index: binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s
420===================================================================
421--- /dev/null 1970-01-01 00:00:00.000000000 +0000
422+++ binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s 2011-06-21 16:33:40.761884138 -0700
423@@ -0,0 +1,5 @@
424+ .text
425+ .type ifunc, @gnu_indirect_function
426+ .globl ifunc
427+ifunc:
428+ ret
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
new file mode 100644
index 0000000000..3f627c691e
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
@@ -0,0 +1,36 @@
1Upstream-Status: Pending
2
3--- binutils-2.18.orig/configure
4+++ binutils-2.18/configure
5@@ -2206,7 +2206,7 @@
6 am33_2.0-*-linux*)
7 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
8 ;;
9- sh-*-linux*)
10+ sh*-*-linux*)
11 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
12 ;;
13 sh*-*-pe|mips*-*-pe|*arm-wince-pe)
14@@ -2504,7 +2504,7 @@
15 romp-*-*)
16 noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
17 ;;
18- sh-*-* | sh64-*-*)
19+ sh*-*-* | sh64-*-*)
20 case "${host}" in
21 i[3456789]86-*-vsta) ;; # don't add gprof back in
22 i[3456789]86-*-go32*) ;; # don't add gprof back in
23--- binutils-2.18.orig/gprof/configure
24+++ binutils-2.18/gprof/configure
25@@ -4124,6 +4124,11 @@
26 lt_cv_deplibs_check_method=pass_all
27 ;;
28
29+linux-uclibc*)
30+ lt_cv_deplibs_check_method=pass_all
31+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
32+ ;;
33+
34 netbsd*)
35 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
36 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..07312d70bf
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
@@ -0,0 +1,51 @@
1#!/bin/sh -e
2## 001_ld_makefile_patch.dpatch
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Description: correct where ld scripts are installed
6## DP: Author: Chris Chimelis <chris@debian.org>
7## DP: Upstream status: N/A
8## DP: Date: ??
9
10if [ $# -ne 1 ]; then
11 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
12 exit 1
13fi
14
15[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
16patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
17
18case "$1" in
19 -patch) patch $patch_opts -p1 < $0;;
20 -unpatch) patch $patch_opts -p1 -R < $0;;
21 *)
22 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
23 exit 1;;
24esac
25
26exit 0
27Upstream-Status: Inappropriate [debian patch]
28
29@DPATCH@
30--- binutils-2.16.91.0.1/ld/Makefile.am
31+++ binutils-2.16.91.0.1/ld/Makefile.am
32@@ -20,7 +20,7 @@
33 # We put the scripts in the directory $(scriptdir)/ldscripts.
34 # We can't put the scripts in $(datadir) because the SEARCH_DIR
35 # directives need to be different for native and cross linkers.
36-scriptdir = $(tooldir)/lib
37+scriptdir = $(libdir)
38
39 EMUL = @EMUL@
40 EMULATION_OFILES = @EMULATION_OFILES@
41--- binutils-2.16.91.0.1/ld/Makefile.in
42+++ binutils-2.16.91.0.1/ld/Makefile.in
43@@ -268,7 +268,7 @@
44 # We put the scripts in the directory $(scriptdir)/ldscripts.
45 # We can't put the scripts in $(datadir) because the SEARCH_DIR
46 # directives need to be different for native and cross linkers.
47-scriptdir = $(tooldir)/lib
48+scriptdir = $(libdir)
49 BASEDIR = $(srcdir)/..
50 BFDDIR = $(BASEDIR)/bfd
51 INCDIR = $(BASEDIR)/include
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
new file mode 100644
index 0000000000..35835b3986
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
@@ -0,0 +1,44 @@
1#!/bin/sh -e
2## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Specify which filename is causing an error if the filename is a
6## DP: directory. (#45832)
7
8if [ $# -ne 1 ]; then
9 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10 exit 1
11fi
12
13[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
15
16case "$1" in
17 -patch) patch $patch_opts -p1 < $0;;
18 -unpatch) patch $patch_opts -p1 -R < $0;;
19 *)
20 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
21 exit 1;;
22esac
23
24exit 0
25Upstream-Status: Inappropriate [debian patch]
26
27@DPATCH@
28diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
29--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100
30+++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100
31@@ -150,6 +150,13 @@
32 {
33 bfd *nbfd;
34 const bfd_target *target_vec;
35+ struct stat s;
36+
37+ if (stat (filename, &s) == 0)
38+ if (S_ISDIR(s.st_mode)) {
39+ bfd_set_error (bfd_error_file_not_recognized);
40+ return NULL;
41+ }
42
43 nbfd = _bfd_new_bfd ();
44 if (nbfd == NULL)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..3944f2e0b8
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -0,0 +1,49 @@
1#!/bin/sh -e
2## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
6## DP: cases where -rpath isn't specified. (#151024)
7
8if [ $# -ne 1 ]; then
9 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10 exit 1
11fi
12
13[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
15
16case "$1" in
17 -patch) patch $patch_opts -p1 < $0;;
18 -unpatch) patch $patch_opts -p1 -R < $0;;
19 *)
20 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
21 exit 1;;
22esac
23
24exit 0
25Upstream-Status: Inappropriate [debian patch]
26
27@DPATCH@
28Index: src/ld/emultempl/elf32.em
29===================================================================
30--- src.orig/ld/emultempl/elf32.em 2009-09-23 06:54:28.000000000 -0700
31+++ src/ld/emultempl/elf32.em 2009-10-06 10:58:16.883414592 -0700
32@@ -1237,6 +1237,8 @@ fragment <<EOF
33 && command_line.rpath == NULL)
34 {
35 lib_path = (const char *) getenv ("LD_RUN_PATH");
36+ if ((lib_path) && (strlen (lib_path) == 0))
37+ lib_path = NULL;
38 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
39 force))
40 break;
41@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation (
42 rpath = command_line.rpath;
43 if (rpath == NULL)
44 rpath = (const char *) getenv ("LD_RUN_PATH");
45+ if ((rpath) && (strlen (rpath) == 0))
46+ rpath = NULL;
47
48 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
49 {
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
new file mode 100644
index 0000000000..58315798d6
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
@@ -0,0 +1,39 @@
1Source: Khem Raj <raj.khem@gmail.com>
2Disposition: submit upstream.
3Upstream-Status: Pending
4
5Description:
6
7We do not need to have the libtool patch anymore for binutils after
8libtool has been updated upstream it include support for it. However
9for building gas natively on uclibc systems we have to link it with
10-lm so that it picks up missing symbols.
11
12/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double':
13floatformat.c:(.text+0x1ec): undefined reference to `frexp'
14floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
15/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double':
16floatformat.c:(.text+0x38a): undefined reference to `ldexp'
17floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
18floatformat.c:(.text+0x43e): undefined reference to `ldexp' floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
19collect2: ld returned 1 exit status
20make[4]: *** [as-new] Error 1
21
22Index: binutils-2.17.50/gas/configure.tgt
23===================================================================
24--- binutils-2.17.50.orig/gas/configure.tgt
25+++ binutils-2.17.50/gas/configure.tgt
26@@ -408,6 +408,12 @@ case ${generic_target} in
27 *-*-netware) fmt=elf em=netware ;;
28 esac
29
30+case ${generic_target} in
31+ arm-*-*uclibc*)
32+ need_libm=yes
33+ ;;
34+esac
35+
36 case ${cpu_type} in
37 alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
38 bfd_gas=yes
39
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch b/meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch
new file mode 100644
index 0000000000..16c775c550
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch
@@ -0,0 +1,27 @@
1#!/bin/sh -e
2## 127_x86_64_i386_biarch.dpatch
3##
4## DP: Description: Add (/usr)/lib32 to the search paths on x86_64.
5## DP: Author: Aurelien Jarno <aurel32.debian.org>
6## DP: Upstream status: Debian specific
7#
8# Hacked to apply with quilt
9# Adapted to binutils 2.18.50.0.7
10Upstream-Status: Inappropriate [embedded specific]
11
12--- binutils/ld/emulparams/elf_i386.sh
13+++ binutils/ld/emulparams/elf_i386.sh
14@@ -12,3 +12,13 @@
15 SEPARATE_GOTPLT=12
16 SHARABLE_SECTIONS=yes
17 IREL_IN_PLT=
18+
19+# Linux modify the default library search path to first include
20+# a 32-bit specific directory.
21+case "$target" in
22+ x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
23+ case "$EMULATION_NAME" in
24+ *i386*) LIBPATH_SUFFIX=32 ;;
25+ esac
26+ ;;
27+esac
diff --git a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch b/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
new file mode 100644
index 0000000000..3772dfbed7
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3don't let the distro compiler point to the wrong installation location
4
5Thanks to RP for helping find the source code causing the issue.
6
72010/08/13
8Nitin A Kamble <nitin.a.kamble@intel.com>
9Index: binutils-2.20.1/libiberty/Makefile.in
10===================================================================
11--- binutils-2.20.1.orig/libiberty/Makefile.in
12+++ binutils-2.20.1/libiberty/Makefile.in
13@@ -327,7 +327,8 @@ install: install_to_$(INSTALL_DEST) inst
14 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
15 # default multilib, so we have to take CFLAGS into account as well,
16 # since it will be passed the multilib flags.
17-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
18+#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
19+MULTIOSDIR = ""
20 install_to_libdir: all
21 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
22 $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
new file mode 100644
index 0000000000..fc1735e0d9
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
@@ -0,0 +1,18732 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: binutils-2.21.1/libtool.m4
4===================================================================
5--- binutils-2.21.1.orig/libtool.m4
6+++ binutils-2.21.1/libtool.m4
7@@ -1,7 +1,8 @@
8 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
9 #
10 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
11-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
13+# Inc.
14 # Written by Gordon Matzigkeit, 1996
15 #
16 # This file is free software; the Free Software Foundation gives
17@@ -10,7 +11,8 @@
18
19 m4_define([_LT_COPYING], [dnl
20 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
21-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
22+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
23+# Inc.
24 # Written by Gordon Matzigkeit, 1996
25 #
26 # This file is part of GNU Libtool.
27@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
28 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
29 ])
30
31-# serial 56 LT_INIT
32+# serial 57 LT_INIT
33
34
35 # LT_PREREQ(VERSION)
36@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
37 LIBTOOL_DEPS="$ltmain"
38
39 # Always use our own libtool.
40-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
41+LIBTOOL='$(SHELL) $(top_builddir)'
42+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
43 AC_SUBST(LIBTOOL)dnl
44
45 _LT_SETUP
46@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
47 dnl
48 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
49 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
50+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
51 m4_require([_LT_CMD_RELOAD])dnl
52 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
53+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
54 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
55 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
56+m4_require([_LT_WITH_SYSROOT])dnl
57
58 _LT_CONFIG_LIBTOOL_INIT([
59 # See if we are running on zsh, and set the options which allow our
60@@ -199,7 +205,7 @@ aix3*)
61 esac
62
63 # Global variables:
64-ofile=libtool
65+ofile=${host_alias}-libtool
66 can_build_shared=yes
67
68 # All known linkers require a `.a' archive for static linking (except MSVC,
69@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
70 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
71 configured by $[0], generated by m4_PACKAGE_STRING.
72
73-Copyright (C) 2009 Free Software Foundation, Inc.
74+Copyright (C) 2010 Free Software Foundation, Inc.
75 This config.lt script is free software; the Free Software Foundation
76 gives unlimited permision to copy, distribute and modify it."
77
78@@ -746,15 +752,12 @@ _LT_EOF
79 # if finds mixed CR/LF and LF-only lines. Since sed operates in
80 # text mode, it properly converts lines to CR/LF. This bash problem
81 # is reportedly fixed, but why not run on old versions too?
82- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
83- || (rm -f "$cfgfile"; exit 1)
84+ sed '$q' "$ltmain" >> "$cfgfile" \
85+ || (rm -f "$cfgfile"; exit 1)
86
87- _LT_PROG_XSI_SHELLFNS
88+ _LT_PROG_REPLACE_SHELLFNS
89
90- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
91- || (rm -f "$cfgfile"; exit 1)
92-
93- mv -f "$cfgfile" "$ofile" ||
94+ mv -f "$cfgfile" "$ofile" ||
95 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
96 chmod +x "$ofile"
97 ],
98@@ -980,6 +983,8 @@ _LT_EOF
99 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
100 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
101 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
102+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
103+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
104 cat > conftest.c << _LT_EOF
105 int main() { return 0;}
106 _LT_EOF
107@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
108 fi
109 ])
110
111-# _LT_SYS_MODULE_PATH_AIX
112-# -----------------------
113+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
114+# ----------------------------------
115 # Links a minimal program and checks the executable
116 # for the system default hardcoded library path. In most cases,
117 # this is /usr/lib:/lib, but when the MPI compilers are used
118 # the location of the communication and MPI libs are included too.
119 # If we don't find anything, use the default library path according
120 # to the aix ld manual.
121+# Store the results from the different compilers for each TAGNAME.
122+# Allow to override them for all tags through lt_cv_aix_libpath.
123 m4_defun([_LT_SYS_MODULE_PATH_AIX],
124 [m4_require([_LT_DECL_SED])dnl
125-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
126-lt_aix_libpath_sed='
127- /Import File Strings/,/^$/ {
128- /^0/ {
129- s/^0 *\(.*\)$/\1/
130- p
131- }
132- }'
133-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
134-# Check for a 64-bit object if we didn't find anything.
135-if test -z "$aix_libpath"; then
136- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
137-fi],[])
138-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
139+if test "${lt_cv_aix_libpath+set}" = set; then
140+ aix_libpath=$lt_cv_aix_libpath
141+else
142+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
143+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
144+ lt_aix_libpath_sed='[
145+ /Import File Strings/,/^$/ {
146+ /^0/ {
147+ s/^0 *\([^ ]*\) *$/\1/
148+ p
149+ }
150+ }]'
151+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
152+ # Check for a 64-bit object if we didn't find anything.
153+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
154+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
155+ fi],[])
156+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
157+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
158+ fi
159+ ])
160+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
161+fi
162 ])# _LT_SYS_MODULE_PATH_AIX
163
164
165@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
166
167 AC_MSG_CHECKING([how to print strings])
168 # Test print first, because it will be a builtin if present.
169-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
170+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
171 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
172 ECHO='print -r --'
173 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
174@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
175 ])# _LT_PROG_ECHO_BACKSLASH
176
177
178+# _LT_WITH_SYSROOT
179+# ----------------
180+AC_DEFUN([_LT_WITH_SYSROOT],
181+[AC_MSG_CHECKING([for sysroot])
182+AC_ARG_WITH([libtool-sysroot],
183+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
184+ (or the compiler's sysroot if not specified).],
185+[], [with_libtool_sysroot=no])
186+
187+dnl lt_sysroot will always be passed unquoted. We quote it here
188+dnl in case the user passed a directory name.
189+lt_sysroot=
190+case ${with_libtool_sysroot} in #(
191+ yes)
192+ if test "$GCC" = yes; then
193+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
194+ fi
195+ ;; #(
196+ /*)
197+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
198+ ;; #(
199+ no|'')
200+ ;; #(
201+ *)
202+ AC_MSG_RESULT([${with_libtool_sysroot}])
203+ AC_MSG_ERROR([The sysroot must be an absolute path.])
204+ ;;
205+esac
206+
207+ AC_MSG_RESULT([${lt_sysroot:-no}])
208+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
209+[dependent libraries, and in which our libraries should be installed.])])
210+
211 # _LT_ENABLE_LOCK
212 # ---------------
213 m4_defun([_LT_ENABLE_LOCK],
214@@ -1307,14 +1356,47 @@ need_locks="$enable_libtool_lock"
215 ])# _LT_ENABLE_LOCK
216
217
218+# _LT_PROG_AR
219+# -----------
220+m4_defun([_LT_PROG_AR],
221+[AC_CHECK_TOOLS(AR, [ar], false)
222+: ${AR=ar}
223+: ${AR_FLAGS=cru}
224+_LT_DECL([], [AR], [1], [The archiver])
225+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
226+
227+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
228+ [lt_cv_ar_at_file=no
229+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
230+ [echo conftest.$ac_objext > conftest.lst
231+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
232+ AC_TRY_EVAL([lt_ar_try])
233+ if test "$ac_status" -eq 0; then
234+ # Ensure the archiver fails upon bogus file names.
235+ rm -f conftest.$ac_objext libconftest.a
236+ AC_TRY_EVAL([lt_ar_try])
237+ if test "$ac_status" -ne 0; then
238+ lt_cv_ar_at_file=@
239+ fi
240+ fi
241+ rm -f conftest.* libconftest.a
242+ ])
243+ ])
244+
245+if test "x$lt_cv_ar_at_file" = xno; then
246+ archiver_list_spec=
247+else
248+ archiver_list_spec=$lt_cv_ar_at_file
249+fi
250+_LT_DECL([], [archiver_list_spec], [1],
251+ [How to feed a file listing to the archiver])
252+])# _LT_PROG_AR
253+
254+
255 # _LT_CMD_OLD_ARCHIVE
256 # -------------------
257 m4_defun([_LT_CMD_OLD_ARCHIVE],
258-[AC_CHECK_TOOL(AR, ar, false)
259-test -z "$AR" && AR=ar
260-test -z "$AR_FLAGS" && AR_FLAGS=cru
261-_LT_DECL([], [AR], [1], [The archiver])
262-_LT_DECL([], [AR_FLAGS], [1])
263+[_LT_PROG_AR
264
265 AC_CHECK_TOOL(STRIP, strip, :)
266 test -z "$STRIP" && STRIP=:
267@@ -1610,7 +1692,7 @@ else
268 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
269 lt_status=$lt_dlunknown
270 cat > conftest.$ac_ext <<_LT_EOF
271-[#line __oline__ "configure"
272+[#line $LINENO "configure"
273 #include "confdefs.h"
274
275 #if HAVE_DLFCN_H
276@@ -1654,10 +1736,10 @@ else
277 /* When -fvisbility=hidden is used, assume the code has been annotated
278 correspondingly for the symbols needed. */
279 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
280-void fnord () __attribute__((visibility("default")));
281+int fnord () __attribute__((visibility("default")));
282 #endif
283
284-void fnord () { int i=42; }
285+int fnord () { return 42; }
286 int main ()
287 {
288 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
289@@ -2197,8 +2279,9 @@ cygwin* | mingw* | pw32* | cegcc*)
290 need_version=no
291 need_lib_prefix=no
292
293- case $GCC,$host_os in
294- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
295+ case $GCC,$cc_basename in
296+ yes,*)
297+ # gcc
298 library_names_spec='$libname.dll.a'
299 # DLL is installed to $(libdir)/../bin by postinstall_cmds
300 postinstall_cmds='base_file=`basename \${file}`~
301@@ -2231,13 +2314,71 @@ m4_if([$1], [],[
302 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
303 ;;
304 esac
305+ dynamic_linker='Win32 ld.exe'
306+ ;;
307+
308+ *,cl*)
309+ # Native MSVC
310+ libname_spec='$name'
311+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
312+ library_names_spec='${libname}.dll.lib'
313+
314+ case $build_os in
315+ mingw*)
316+ sys_lib_search_path_spec=
317+ lt_save_ifs=$IFS
318+ IFS=';'
319+ for lt_path in $LIB
320+ do
321+ IFS=$lt_save_ifs
322+ # Let DOS variable expansion print the short 8.3 style file name.
323+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
324+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
325+ done
326+ IFS=$lt_save_ifs
327+ # Convert to MSYS style.
328+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
329+ ;;
330+ cygwin*)
331+ # Convert to unix form, then to dos form, then back to unix form
332+ # but this time dos style (no spaces!) so that the unix form looks
333+ # like /cygdrive/c/PROGRA~1:/cygdr...
334+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
335+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
336+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
337+ ;;
338+ *)
339+ sys_lib_search_path_spec="$LIB"
340+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
341+ # It is most probably a Windows format PATH.
342+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
343+ else
344+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
345+ fi
346+ # FIXME: find the short name or the path components, as spaces are
347+ # common. (e.g. "Program Files" -> "PROGRA~1")
348+ ;;
349+ esac
350+
351+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
352+ postinstall_cmds='base_file=`basename \${file}`~
353+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
354+ dldir=$destdir/`dirname \$dlpath`~
355+ test -d \$dldir || mkdir -p \$dldir~
356+ $install_prog $dir/$dlname \$dldir/$dlname'
357+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
358+ dlpath=$dir/\$dldll~
359+ $RM \$dlpath'
360+ shlibpath_overrides_runpath=yes
361+ dynamic_linker='Win32 link.exe'
362 ;;
363
364 *)
365+ # Assume MSVC wrapper
366 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
367+ dynamic_linker='Win32 ld.exe'
368 ;;
369 esac
370- dynamic_linker='Win32 ld.exe'
371 # FIXME: first we should search . and the directory the executable is in
372 shlibpath_var=PATH
373 ;;
374@@ -2333,7 +2474,7 @@ haiku*)
375 soname_spec='${libname}${release}${shared_ext}$major'
376 shlibpath_var=LIBRARY_PATH
377 shlibpath_overrides_runpath=yes
378- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
379+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
380 hardcode_into_libs=yes
381 ;;
382
383@@ -2941,6 +3082,11 @@ case $reload_flag in
384 esac
385 reload_cmds='$LD$reload_flag -o $output$reload_objs'
386 case $host_os in
387+ cygwin* | mingw* | pw32* | cegcc*)
388+ if test "$GCC" != yes; then
389+ reload_cmds=false
390+ fi
391+ ;;
392 darwin*)
393 if test "$GCC" = yes; then
394 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
395@@ -3007,7 +3153,8 @@ mingw* | pw32*)
396 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
397 lt_cv_file_magic_cmd='func_win32_libid'
398 else
399- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
400+ # Keep this pattern in sync with the one in func_win32_libid.
401+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
402 lt_cv_file_magic_cmd='$OBJDUMP -f'
403 fi
404 ;;
405@@ -3158,6 +3305,21 @@ tpf*)
406 ;;
407 esac
408 ])
409+
410+file_magic_glob=
411+want_nocaseglob=no
412+if test "$build" = "$host"; then
413+ case $host_os in
414+ mingw* | pw32*)
415+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
416+ want_nocaseglob=yes
417+ else
418+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
419+ fi
420+ ;;
421+ esac
422+fi
423+
424 file_magic_cmd=$lt_cv_file_magic_cmd
425 deplibs_check_method=$lt_cv_deplibs_check_method
426 test -z "$deplibs_check_method" && deplibs_check_method=unknown
427@@ -3165,7 +3327,11 @@ test -z "$deplibs_check_method" && depli
428 _LT_DECL([], [deplibs_check_method], [1],
429 [Method to check whether dependent libraries are shared objects])
430 _LT_DECL([], [file_magic_cmd], [1],
431- [Command to use when deplibs_check_method == "file_magic"])
432+ [Command to use when deplibs_check_method = "file_magic"])
433+_LT_DECL([], [file_magic_glob], [1],
434+ [How to find potential files when deplibs_check_method = "file_magic"])
435+_LT_DECL([], [want_nocaseglob], [1],
436+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
437 ])# _LT_CHECK_MAGIC_METHOD
438
439
440@@ -3268,6 +3434,67 @@ dnl aclocal-1.4 backwards compatibility:
441 dnl AC_DEFUN([AM_PROG_NM], [])
442 dnl AC_DEFUN([AC_PROG_NM], [])
443
444+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
445+# --------------------------------
446+# how to determine the name of the shared library
447+# associated with a specific link library.
448+# -- PORTME fill in with the dynamic library characteristics
449+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
450+[m4_require([_LT_DECL_EGREP])
451+m4_require([_LT_DECL_OBJDUMP])
452+m4_require([_LT_DECL_DLLTOOL])
453+AC_CACHE_CHECK([how to associate runtime and link libraries],
454+lt_cv_sharedlib_from_linklib_cmd,
455+[lt_cv_sharedlib_from_linklib_cmd='unknown'
456+
457+case $host_os in
458+cygwin* | mingw* | pw32* | cegcc*)
459+ # two different shell functions defined in ltmain.sh
460+ # decide which to use based on capabilities of $DLLTOOL
461+ case `$DLLTOOL --help 2>&1` in
462+ *--identify-strict*)
463+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
464+ ;;
465+ *)
466+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
467+ ;;
468+ esac
469+ ;;
470+*)
471+ # fallback: assume linklib IS sharedlib
472+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
473+ ;;
474+esac
475+])
476+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
477+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
478+
479+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
480+ [Command to associate shared and link libraries])
481+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
482+
483+
484+# _LT_PATH_MANIFEST_TOOL
485+# ----------------------
486+# locate the manifest tool
487+m4_defun([_LT_PATH_MANIFEST_TOOL],
488+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
489+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
490+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
491+ [lt_cv_path_mainfest_tool=no
492+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
493+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
494+ cat conftest.err >&AS_MESSAGE_LOG_FD
495+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
496+ lt_cv_path_mainfest_tool=yes
497+ fi
498+ rm -f conftest*])
499+if test "x$lt_cv_path_mainfest_tool" != xyes; then
500+ MANIFEST_TOOL=:
501+fi
502+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
503+])# _LT_PATH_MANIFEST_TOOL
504+
505
506 # LT_LIB_M
507 # --------
508@@ -3394,8 +3621,8 @@ esac
509 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
510
511 # Transform an extracted symbol line into symbol name and symbol address
512-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
513-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
514+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
515+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
516
517 # Handle CRLF in mingw tool chain
518 opt_cr=
519@@ -3431,6 +3658,7 @@ for ac_symprfx in "" "_"; do
520 else
521 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
522 fi
523+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
524
525 # Check to see that the pipe works correctly.
526 pipe_works=no
527@@ -3464,6 +3692,18 @@ _LT_EOF
528 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
529 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
530 cat <<_LT_EOF > conftest.$ac_ext
531+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
532+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
533+/* DATA imports from DLLs on WIN32 con't be const, because runtime
534+ relocations are performed -- see ld's documentation on pseudo-relocs. */
535+# define LT@&t@_DLSYM_CONST
536+#elif defined(__osf__)
537+/* This system does not cope well with relocations in const data. */
538+# define LT@&t@_DLSYM_CONST
539+#else
540+# define LT@&t@_DLSYM_CONST const
541+#endif
542+
543 #ifdef __cplusplus
544 extern "C" {
545 #endif
546@@ -3475,7 +3715,7 @@ _LT_EOF
547 cat <<_LT_EOF >> conftest.$ac_ext
548
549 /* The mapping between symbol names and symbols. */
550-const struct {
551+LT@&t@_DLSYM_CONST struct {
552 const char *name;
553 void *address;
554 }
555@@ -3501,15 +3741,15 @@ static const void *lt_preloaded_setup()
556 _LT_EOF
557 # Now try linking the two files.
558 mv conftest.$ac_objext conftstm.$ac_objext
559- lt_save_LIBS="$LIBS"
560- lt_save_CFLAGS="$CFLAGS"
561+ lt_globsym_save_LIBS=$LIBS
562+ lt_globsym_save_CFLAGS=$CFLAGS
563 LIBS="conftstm.$ac_objext"
564 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
565 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
566 pipe_works=yes
567 fi
568- LIBS="$lt_save_LIBS"
569- CFLAGS="$lt_save_CFLAGS"
570+ LIBS=$lt_globsym_save_LIBS
571+ CFLAGS=$lt_globsym_save_CFLAGS
572 else
573 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
574 fi
575@@ -3542,6 +3782,13 @@ else
576 AC_MSG_RESULT(ok)
577 fi
578
579+# Response file support.
580+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
581+ nm_file_list_spec='@'
582+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
583+ nm_file_list_spec='@'
584+fi
585+
586 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
587 [Take the output of nm and produce a listing of raw symbols and C names])
588 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
589@@ -3552,6 +3799,8 @@ _LT_DECL([global_symbol_to_c_name_addres
590 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
591 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
592 [Transform the output of nm in a C name address pair when lib prefix is needed])
593+_LT_DECL([], [nm_file_list_spec], [1],
594+ [Specify filename containing input files for $NM])
595 ]) # _LT_CMD_GLOBAL_SYMBOLS
596
597
598@@ -3563,7 +3812,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
599 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
600 _LT_TAGVAR(lt_prog_compiler_static, $1)=
601
602-AC_MSG_CHECKING([for $compiler option to produce PIC])
603 m4_if([$1], [CXX], [
604 # C++ specific cases for pic, static, wl, etc.
605 if test "$GXX" = yes; then
606@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [
607 ;;
608 esac
609 ;;
610+ mingw* | cygwin* | os2* | pw32* | cegcc*)
611+ # This hack is so that the source file can tell whether it is being
612+ # built for inclusion in a dll (and should export symbols for example).
613+ m4_if([$1], [GCJ], [],
614+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
615+ ;;
616 dgux*)
617 case $cc_basename in
618 ec++*)
619@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [
620 ;;
621 solaris*)
622 case $cc_basename in
623- CC*)
624+ CC* | sunCC*)
625 # Sun C++ 4.2, 5.x and Centerline C++
626 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
627 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
628@@ -4042,6 +4296,12 @@ m4_if([$1], [CXX], [
629 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
630 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
631 ;;
632+ nagfor*)
633+ # NAG Fortran compiler
634+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
635+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
636+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
637+ ;;
638 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
639 # Portland Group compilers (*not* the Pentium gcc compiler,
640 # which looks to be a dead project)
641@@ -4104,7 +4364,7 @@ m4_if([$1], [CXX], [
642 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
643 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
644 case $cc_basename in
645- f77* | f90* | f95*)
646+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
647 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
648 *)
649 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
650@@ -4161,9 +4421,11 @@ case $host_os in
651 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
652 ;;
653 esac
654-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
655-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
656- [How to pass a linker flag through the compiler])
657+
658+AC_CACHE_CHECK([for $compiler option to produce PIC],
659+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
660+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
661+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
662
663 #
664 # Check to make sure the PIC flag actually works.
665@@ -4182,6 +4444,8 @@ fi
666 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
667 [Additional compiler flags for building library objects])
668
669+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
670+ [How to pass a linker flag through the compiler])
671 #
672 # Check to make sure the static flag actually works.
673 #
674@@ -4202,6 +4466,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
675 m4_defun([_LT_LINKER_SHLIBS],
676 [AC_REQUIRE([LT_PATH_LD])dnl
677 AC_REQUIRE([LT_PATH_NM])dnl
678+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
679 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
680 m4_require([_LT_DECL_EGREP])dnl
681 m4_require([_LT_DECL_SED])dnl
682@@ -4210,6 +4475,7 @@ m4_require([_LT_TAG_COMPILER])dnl
683 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
684 m4_if([$1], [CXX], [
685 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
686+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
687 case $host_os in
688 aix[[4-9]]*)
689 # If we're using GNU nm, then we don't want the "-C" option.
690@@ -4224,15 +4490,20 @@ m4_if([$1], [CXX], [
691 ;;
692 pw32*)
693 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
694- ;;
695+ ;;
696 cygwin* | mingw* | cegcc*)
697- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
698- ;;
699+ case $cc_basename in
700+ cl*) ;;
701+ *)
702+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
703+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
704+ ;;
705+ esac
706+ ;;
707 *)
708 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
709- ;;
710+ ;;
711 esac
712- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
713 ], [
714 runpath_var=
715 _LT_TAGVAR(allow_undefined_flag, $1)=
716@@ -4400,7 +4671,8 @@ _LT_EOF
717 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
718 _LT_TAGVAR(always_export_symbols, $1)=no
719 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
720- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
721+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
722+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
723
724 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
725 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
726@@ -4448,7 +4720,7 @@ _LT_EOF
727 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
728 && test "$tmp_diet" = no
729 then
730- tmp_addflag=
731+ tmp_addflag=' $pic_flag'
732 tmp_sharedflag='-shared'
733 case $cc_basename,$host_cpu in
734 pgcc*) # Portland Group C compiler
735@@ -4499,12 +4771,12 @@ _LT_EOF
736 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
737 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
738 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
739- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
740+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
741 if test "x$supports_anon_versioning" = xyes; then
742 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
743 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
744 echo "local: *; };" >> $output_objdir/$libname.ver~
745- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
746+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
747 fi
748 ;;
749 esac
750@@ -4518,8 +4790,8 @@ _LT_EOF
751 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
752 wlarc=
753 else
754- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
755- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
756+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
757+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
758 fi
759 ;;
760
761@@ -4537,8 +4809,8 @@ _LT_EOF
762
763 _LT_EOF
764 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
765- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
766- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
767+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
768+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
769 else
770 _LT_TAGVAR(ld_shlibs, $1)=no
771 fi
772@@ -4584,8 +4856,8 @@ _LT_EOF
773
774 *)
775 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
776- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
777- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
778+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
779+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
780 else
781 _LT_TAGVAR(ld_shlibs, $1)=no
782 fi
783@@ -4715,7 +4987,7 @@ _LT_EOF
784 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
785 # Determine the default libpath from the value encoded in an
786 # empty executable.
787- _LT_SYS_MODULE_PATH_AIX
788+ _LT_SYS_MODULE_PATH_AIX([$1])
789 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
790 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
791 else
792@@ -4726,7 +4998,7 @@ _LT_EOF
793 else
794 # Determine the default libpath from the value encoded in an
795 # empty executable.
796- _LT_SYS_MODULE_PATH_AIX
797+ _LT_SYS_MODULE_PATH_AIX([$1])
798 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
799 # Warning - without using the other run time loading flags,
800 # -berok will link without error, but may produce a broken library.
801@@ -4770,20 +5042,63 @@ _LT_EOF
802 # Microsoft Visual C++.
803 # hardcode_libdir_flag_spec is actually meaningless, as there is
804 # no search path for DLLs.
805- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
806- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
807- # Tell ltmain to make .lib files, not .a files.
808- libext=lib
809- # Tell ltmain to make .dll files, not .so files.
810- shrext_cmds=".dll"
811- # FIXME: Setting linknames here is a bad hack.
812- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
813- # The linker will automatically build a .lib file if we build a DLL.
814- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
815- # FIXME: Should let the user specify the lib program.
816- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
817- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
818- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
819+ case $cc_basename in
820+ cl*)
821+ # Native MSVC
822+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
823+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
824+ _LT_TAGVAR(always_export_symbols, $1)=yes
825+ _LT_TAGVAR(file_list_spec, $1)='@'
826+ # Tell ltmain to make .lib files, not .a files.
827+ libext=lib
828+ # Tell ltmain to make .dll files, not .so files.
829+ shrext_cmds=".dll"
830+ # FIXME: Setting linknames here is a bad hack.
831+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
832+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
833+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
834+ else
835+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
836+ fi~
837+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
838+ linknames='
839+ # The linker will not automatically build a static lib if we build a DLL.
840+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
841+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
842+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
843+ # Don't use ranlib
844+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
845+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
846+ lt_tool_outputfile="@TOOL_OUTPUT@"~
847+ case $lt_outputfile in
848+ *.exe|*.EXE) ;;
849+ *)
850+ lt_outputfile="$lt_outputfile.exe"
851+ lt_tool_outputfile="$lt_tool_outputfile.exe"
852+ ;;
853+ esac~
854+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
855+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
856+ $RM "$lt_outputfile.manifest";
857+ fi'
858+ ;;
859+ *)
860+ # Assume MSVC wrapper
861+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
862+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
863+ # Tell ltmain to make .lib files, not .a files.
864+ libext=lib
865+ # Tell ltmain to make .dll files, not .so files.
866+ shrext_cmds=".dll"
867+ # FIXME: Setting linknames here is a bad hack.
868+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
869+ # The linker will automatically build a .lib file if we build a DLL.
870+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
871+ # FIXME: Should let the user specify the lib program.
872+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
873+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
874+ ;;
875+ esac
876 ;;
877
878 darwin* | rhapsody*)
879@@ -4821,7 +5136,7 @@ _LT_EOF
880
881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
882 freebsd* | dragonfly*)
883- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
884+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
885 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
886 _LT_TAGVAR(hardcode_direct, $1)=yes
887 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
888@@ -4829,7 +5144,7 @@ _LT_EOF
889
890 hpux9*)
891 if test "$GCC" = yes; then
892- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
893+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
894 else
895 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
896 fi
897@@ -4845,7 +5160,7 @@ _LT_EOF
898
899 hpux10*)
900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
901- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
902+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
903 else
904 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
905 fi
906@@ -4869,10 +5184,10 @@ _LT_EOF
907 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
908 ;;
909 ia64*)
910- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
911+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
912 ;;
913 *)
914- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
915+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
916 ;;
917 esac
918 else
919@@ -4919,16 +5234,31 @@ _LT_EOF
920
921 irix5* | irix6* | nonstopux*)
922 if test "$GCC" = yes; then
923- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
924+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
925 # Try to use the -exported_symbol ld option, if it does not
926 # work, assume that -exports_file does not work either and
927 # implicitly export all symbols.
928- save_LDFLAGS="$LDFLAGS"
929- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
930- AC_LINK_IFELSE(int foo(void) {},
931- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
932- )
933- LDFLAGS="$save_LDFLAGS"
934+ # This should be the same for all languages, so no per-tag cache variable.
935+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
936+ [lt_cv_irix_exported_symbol],
937+ [save_LDFLAGS="$LDFLAGS"
938+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
939+ AC_LINK_IFELSE(
940+ [AC_LANG_SOURCE(
941+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
942+ [C++], [[int foo (void) { return 0; }]],
943+ [Fortran 77], [[
944+ subroutine foo
945+ end]],
946+ [Fortran], [[
947+ subroutine foo
948+ end]])])],
949+ [lt_cv_irix_exported_symbol=yes],
950+ [lt_cv_irix_exported_symbol=no])
951+ LDFLAGS="$save_LDFLAGS"])
952+ if test "$lt_cv_irix_exported_symbol" = yes; then
953+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
954+ fi
955 else
956 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
957 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
958@@ -5013,7 +5343,7 @@ _LT_EOF
959 osf4* | osf5*) # as osf3* with the addition of -msym flag
960 if test "$GCC" = yes; then
961 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
962- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
963+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
964 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
965 else
966 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
967@@ -5032,9 +5362,9 @@ _LT_EOF
968 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
969 if test "$GCC" = yes; then
970 wlarc='${wl}'
971- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
972+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
973 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
974- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
975+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
976 else
977 case `$CC -V 2>&1` in
978 *"Compilers 5.0"*)
979@@ -5306,8 +5636,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
980 to runtime path list])
981 _LT_TAGDECL([], [link_all_deplibs], [0],
982 [Whether libtool must link a program against all its dependency libraries])
983-_LT_TAGDECL([], [fix_srcfile_path], [1],
984- [Fix the shell variable $srcfile for the compiler])
985 _LT_TAGDECL([], [always_export_symbols], [0],
986 [Set to "yes" if exported symbols are required])
987 _LT_TAGDECL([], [export_symbols_cmds], [2],
988@@ -5318,6 +5646,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
989 [Symbols that must always be exported])
990 _LT_TAGDECL([], [prelink_cmds], [2],
991 [Commands necessary for linking programs (against libraries) with templates])
992+_LT_TAGDECL([], [postlink_cmds], [2],
993+ [Commands necessary for finishing linking programs])
994 _LT_TAGDECL([], [file_list_spec], [1],
995 [Specify filename containing input files])
996 dnl FIXME: Not yet implemented
997@@ -5419,6 +5749,7 @@ CC="$lt_save_CC"
998 m4_defun([_LT_LANG_CXX_CONFIG],
999 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1000 m4_require([_LT_DECL_EGREP])dnl
1001+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1002 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1003 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1004 (test "X$CXX" != "Xg++"))) ; then
1005@@ -5480,6 +5811,7 @@ if test "$_lt_caught_CXX_error" != yes;
1006
1007 # Allow CC to be a program name with arguments.
1008 lt_save_CC=$CC
1009+ lt_save_CFLAGS=$CFLAGS
1010 lt_save_LD=$LD
1011 lt_save_GCC=$GCC
1012 GCC=$GXX
1013@@ -5497,6 +5829,7 @@ if test "$_lt_caught_CXX_error" != yes;
1014 fi
1015 test -z "${LDCXX+set}" || LD=$LDCXX
1016 CC=${CXX-"c++"}
1017+ CFLAGS=$CXXFLAGS
1018 compiler=$CC
1019 _LT_TAGVAR(compiler, $1)=$CC
1020 _LT_CC_BASENAME([$compiler])
1021@@ -5518,8 +5851,8 @@ if test "$_lt_caught_CXX_error" != yes;
1022 # Check if GNU C++ uses GNU ld as the underlying linker, since the
1023 # archiving commands below assume that GNU ld is being used.
1024 if test "$with_gnu_ld" = yes; then
1025- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1026- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1027+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1028+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1029
1030 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1031 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1032@@ -5660,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes;
1033 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
1034 # Determine the default libpath from the value encoded in an empty
1035 # executable.
1036- _LT_SYS_MODULE_PATH_AIX
1037+ _LT_SYS_MODULE_PATH_AIX([$1])
1038 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1039
1040 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1041@@ -5672,7 +6005,7 @@ if test "$_lt_caught_CXX_error" != yes;
1042 else
1043 # Determine the default libpath from the value encoded in an
1044 # empty executable.
1045- _LT_SYS_MODULE_PATH_AIX
1046+ _LT_SYS_MODULE_PATH_AIX([$1])
1047 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1048 # Warning - without using the other run time loading flags,
1049 # -berok will link without error, but may produce a broken library.
1050@@ -5714,29 +6047,75 @@ if test "$_lt_caught_CXX_error" != yes;
1051 ;;
1052
1053 cygwin* | mingw* | pw32* | cegcc*)
1054- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1055- # as there is no search path for DLLs.
1056- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1057- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1058- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1059- _LT_TAGVAR(always_export_symbols, $1)=no
1060- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1061-
1062- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1063- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1064- # If the export-symbols file already is a .def file (1st line
1065- # is EXPORTS), use it as is; otherwise, prepend...
1066- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1067- cp $export_symbols $output_objdir/$soname.def;
1068- else
1069- echo EXPORTS > $output_objdir/$soname.def;
1070- cat $export_symbols >> $output_objdir/$soname.def;
1071- fi~
1072- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1073- else
1074- _LT_TAGVAR(ld_shlibs, $1)=no
1075- fi
1076- ;;
1077+ case $GXX,$cc_basename in
1078+ ,cl* | no,cl*)
1079+ # Native MSVC
1080+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1081+ # no search path for DLLs.
1082+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1083+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1084+ _LT_TAGVAR(always_export_symbols, $1)=yes
1085+ _LT_TAGVAR(file_list_spec, $1)='@'
1086+ # Tell ltmain to make .lib files, not .a files.
1087+ libext=lib
1088+ # Tell ltmain to make .dll files, not .so files.
1089+ shrext_cmds=".dll"
1090+ # FIXME: Setting linknames here is a bad hack.
1091+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1092+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1093+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1094+ else
1095+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1096+ fi~
1097+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1098+ linknames='
1099+ # The linker will not automatically build a static lib if we build a DLL.
1100+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1101+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1102+ # Don't use ranlib
1103+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1104+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
1105+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1106+ case $lt_outputfile in
1107+ *.exe|*.EXE) ;;
1108+ *)
1109+ lt_outputfile="$lt_outputfile.exe"
1110+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1111+ ;;
1112+ esac~
1113+ func_to_tool_file "$lt_outputfile"~
1114+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1115+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1116+ $RM "$lt_outputfile.manifest";
1117+ fi'
1118+ ;;
1119+ *)
1120+ # g++
1121+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1122+ # as there is no search path for DLLs.
1123+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1124+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1125+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1126+ _LT_TAGVAR(always_export_symbols, $1)=no
1127+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1128+
1129+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1130+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1131+ # If the export-symbols file already is a .def file (1st line
1132+ # is EXPORTS), use it as is; otherwise, prepend...
1133+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1134+ cp $export_symbols $output_objdir/$soname.def;
1135+ else
1136+ echo EXPORTS > $output_objdir/$soname.def;
1137+ cat $export_symbols >> $output_objdir/$soname.def;
1138+ fi~
1139+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1140+ else
1141+ _LT_TAGVAR(ld_shlibs, $1)=no
1142+ fi
1143+ ;;
1144+ esac
1145+ ;;
1146 darwin* | rhapsody*)
1147 _LT_DARWIN_LINKER_FEATURES($1)
1148 ;;
1149@@ -5811,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes;
1150 ;;
1151 *)
1152 if test "$GXX" = yes; then
1153- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1154+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1155 else
1156 # FIXME: insert proper C++ library support
1157 _LT_TAGVAR(ld_shlibs, $1)=no
1158@@ -5882,10 +6261,10 @@ if test "$_lt_caught_CXX_error" != yes;
1159 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1160 ;;
1161 ia64*)
1162- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1163+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1164 ;;
1165 *)
1166- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1167+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1168 ;;
1169 esac
1170 fi
1171@@ -5926,9 +6305,9 @@ if test "$_lt_caught_CXX_error" != yes;
1172 *)
1173 if test "$GXX" = yes; then
1174 if test "$with_gnu_ld" = no; then
1175- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1176+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1177 else
1178- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1179+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1180 fi
1181 fi
1182 _LT_TAGVAR(link_all_deplibs, $1)=yes
1183@@ -5998,20 +6377,20 @@ if test "$_lt_caught_CXX_error" != yes;
1184 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1185 rm -rf $tpldir~
1186 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1187- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1188+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1189 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1190 rm -rf $tpldir~
1191 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1192- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1193+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1194 $RANLIB $oldlib'
1195 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1196 rm -rf $tpldir~
1197 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1198- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1199+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1200 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1201 rm -rf $tpldir~
1202 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1203- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1204+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1205 ;;
1206 *) # Version 6 and above use weak symbols
1207 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1208@@ -6206,7 +6585,7 @@ if test "$_lt_caught_CXX_error" != yes;
1209 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1210 ;;
1211 *)
1212- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1213+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1214 ;;
1215 esac
1216
1217@@ -6252,7 +6631,7 @@ if test "$_lt_caught_CXX_error" != yes;
1218
1219 solaris*)
1220 case $cc_basename in
1221- CC*)
1222+ CC* | sunCC*)
1223 # Sun C++ 4.2, 5.x and Centerline C++
1224 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1225 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1226@@ -6293,9 +6672,9 @@ if test "$_lt_caught_CXX_error" != yes;
1227 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1228 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
1229 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
1230- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1231+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1232 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1233- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1234+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1235
1236 # Commands to make compiler produce verbose output that lists
1237 # what "hidden" libraries, object files and flags are used when
1238@@ -6424,6 +6803,7 @@ if test "$_lt_caught_CXX_error" != yes;
1239 fi # test -n "$compiler"
1240
1241 CC=$lt_save_CC
1242+ CFLAGS=$lt_save_CFLAGS
1243 LDCXX=$LD
1244 LD=$lt_save_LD
1245 GCC=$lt_save_GCC
1246@@ -6438,6 +6818,29 @@ AC_LANG_POP
1247 ])# _LT_LANG_CXX_CONFIG
1248
1249
1250+# _LT_FUNC_STRIPNAME_CNF
1251+# ----------------------
1252+# func_stripname_cnf prefix suffix name
1253+# strip PREFIX and SUFFIX off of NAME.
1254+# PREFIX and SUFFIX must not contain globbing or regex special
1255+# characters, hashes, percent signs, but SUFFIX may contain a leading
1256+# dot (in which case that matches only a dot).
1257+#
1258+# This function is identical to the (non-XSI) version of func_stripname,
1259+# except this one can be used by m4 code that may be executed by configure,
1260+# rather than the libtool script.
1261+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
1262+AC_REQUIRE([_LT_DECL_SED])
1263+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
1264+func_stripname_cnf ()
1265+{
1266+ case ${2} in
1267+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1268+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1269+ esac
1270+} # func_stripname_cnf
1271+])# _LT_FUNC_STRIPNAME_CNF
1272+
1273 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
1274 # ---------------------------------
1275 # Figure out "hidden" library dependencies from verbose
1276@@ -6446,6 +6849,7 @@ AC_LANG_POP
1277 # objects, libraries and library flags.
1278 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
1279 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1280+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
1281 # Dependencies to place before and after the object being linked:
1282 _LT_TAGVAR(predep_objects, $1)=
1283 _LT_TAGVAR(postdep_objects, $1)=
1284@@ -6496,6 +6900,13 @@ public class foo {
1285 };
1286 _LT_EOF
1287 ])
1288+
1289+_lt_libdeps_save_CFLAGS=$CFLAGS
1290+case "$CC $CFLAGS " in #(
1291+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1292+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1293+esac
1294+
1295 dnl Parse the compiler output and extract the necessary
1296 dnl objects, libraries and library flags.
1297 if AC_TRY_EVAL(ac_compile); then
1298@@ -6507,7 +6918,7 @@ if AC_TRY_EVAL(ac_compile); then
1299 pre_test_object_deps_done=no
1300
1301 for p in `eval "$output_verbose_link_cmd"`; do
1302- case $p in
1303+ case ${prev}${p} in
1304
1305 -L* | -R* | -l*)
1306 # Some compilers place space between "-{L,R}" and the path.
1307@@ -6516,13 +6927,22 @@ if AC_TRY_EVAL(ac_compile); then
1308 test $p = "-R"; then
1309 prev=$p
1310 continue
1311- else
1312- prev=
1313 fi
1314
1315+ # Expand the sysroot to ease extracting the directories later.
1316+ if test -z "$prev"; then
1317+ case $p in
1318+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
1319+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
1320+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
1321+ esac
1322+ fi
1323+ case $p in
1324+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
1325+ esac
1326 if test "$pre_test_object_deps_done" = no; then
1327- case $p in
1328- -L* | -R*)
1329+ case ${prev} in
1330+ -L | -R)
1331 # Internal compiler library paths should come after those
1332 # provided the user. The postdeps already come after the
1333 # user supplied libs so there is no need to process them.
1334@@ -6542,8 +6962,10 @@ if AC_TRY_EVAL(ac_compile); then
1335 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
1336 fi
1337 fi
1338+ prev=
1339 ;;
1340
1341+ *.lto.$objext) ;; # Ignore GCC LTO objects
1342 *.$objext)
1343 # This assumes that the test object file only shows up
1344 # once in the compiler output.
1345@@ -6579,6 +7001,7 @@ else
1346 fi
1347
1348 $RM -f confest.$objext
1349+CFLAGS=$_lt_libdeps_save_CFLAGS
1350
1351 # PORTME: override above test on systems where it is broken
1352 m4_if([$1], [CXX],
1353@@ -6615,7 +7038,7 @@ linux*)
1354
1355 solaris*)
1356 case $cc_basename in
1357- CC*)
1358+ CC* | sunCC*)
1359 # The more standards-conforming stlport4 library is
1360 # incompatible with the Cstd library. Avoid specifying
1361 # it if it's in CXXFLAGS. Ignore libCrun as
1362@@ -6728,7 +7151,9 @@ if test "$_lt_disable_F77" != yes; then
1363 # Allow CC to be a program name with arguments.
1364 lt_save_CC="$CC"
1365 lt_save_GCC=$GCC
1366+ lt_save_CFLAGS=$CFLAGS
1367 CC=${F77-"f77"}
1368+ CFLAGS=$FFLAGS
1369 compiler=$CC
1370 _LT_TAGVAR(compiler, $1)=$CC
1371 _LT_CC_BASENAME([$compiler])
1372@@ -6782,6 +7207,7 @@ if test "$_lt_disable_F77" != yes; then
1373
1374 GCC=$lt_save_GCC
1375 CC="$lt_save_CC"
1376+ CFLAGS="$lt_save_CFLAGS"
1377 fi # test "$_lt_disable_F77" != yes
1378
1379 AC_LANG_POP
1380@@ -6858,7 +7284,9 @@ if test "$_lt_disable_FC" != yes; then
1381 # Allow CC to be a program name with arguments.
1382 lt_save_CC="$CC"
1383 lt_save_GCC=$GCC
1384+ lt_save_CFLAGS=$CFLAGS
1385 CC=${FC-"f95"}
1386+ CFLAGS=$FCFLAGS
1387 compiler=$CC
1388 GCC=$ac_cv_fc_compiler_gnu
1389
1390@@ -6914,7 +7342,8 @@ if test "$_lt_disable_FC" != yes; then
1391 fi # test -n "$compiler"
1392
1393 GCC=$lt_save_GCC
1394- CC="$lt_save_CC"
1395+ CC=$lt_save_CC
1396+ CFLAGS=$lt_save_CFLAGS
1397 fi # test "$_lt_disable_FC" != yes
1398
1399 AC_LANG_POP
1400@@ -6951,10 +7380,12 @@ _LT_COMPILER_BOILERPLATE
1401 _LT_LINKER_BOILERPLATE
1402
1403 # Allow CC to be a program name with arguments.
1404-lt_save_CC="$CC"
1405+lt_save_CC=$CC
1406+lt_save_CFLAGS=$CFLAGS
1407 lt_save_GCC=$GCC
1408 GCC=yes
1409 CC=${GCJ-"gcj"}
1410+CFLAGS=$GCJFLAGS
1411 compiler=$CC
1412 _LT_TAGVAR(compiler, $1)=$CC
1413 _LT_TAGVAR(LD, $1)="$LD"
1414@@ -6985,7 +7416,8 @@ fi
1415 AC_LANG_RESTORE
1416
1417 GCC=$lt_save_GCC
1418-CC="$lt_save_CC"
1419+CC=$lt_save_CC
1420+CFLAGS=$lt_save_CFLAGS
1421 ])# _LT_LANG_GCJ_CONFIG
1422
1423
1424@@ -7020,9 +7452,11 @@ _LT_LINKER_BOILERPLATE
1425
1426 # Allow CC to be a program name with arguments.
1427 lt_save_CC="$CC"
1428+lt_save_CFLAGS=$CFLAGS
1429 lt_save_GCC=$GCC
1430 GCC=
1431 CC=${RC-"windres"}
1432+CFLAGS=
1433 compiler=$CC
1434 _LT_TAGVAR(compiler, $1)=$CC
1435 _LT_CC_BASENAME([$compiler])
1436@@ -7035,7 +7469,8 @@ fi
1437
1438 GCC=$lt_save_GCC
1439 AC_LANG_RESTORE
1440-CC="$lt_save_CC"
1441+CC=$lt_save_CC
1442+CFLAGS=$lt_save_CFLAGS
1443 ])# _LT_LANG_RC_CONFIG
1444
1445
1446@@ -7094,6 +7529,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
1447 AC_SUBST([OBJDUMP])
1448 ])
1449
1450+# _LT_DECL_DLLTOOL
1451+# ----------------
1452+# Ensure DLLTOOL variable is set.
1453+m4_defun([_LT_DECL_DLLTOOL],
1454+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1455+test -z "$DLLTOOL" && DLLTOOL=dlltool
1456+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
1457+AC_SUBST([DLLTOOL])
1458+])
1459
1460 # _LT_DECL_SED
1461 # ------------
1462@@ -7187,8 +7631,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
1463 # Try some XSI features
1464 xsi_shell=no
1465 ( _lt_dummy="a/b/c"
1466- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
1467- = c,a/b,, \
1468+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
1469+ = c,a/b,b/c, \
1470 && eval 'test $(( 1 + 1 )) -eq 2 \
1471 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
1472 && xsi_shell=yes
1473@@ -7227,206 +7671,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
1474 ])# _LT_CHECK_SHELL_FEATURES
1475
1476
1477-# _LT_PROG_XSI_SHELLFNS
1478-# ---------------------
1479-# Bourne and XSI compatible variants of some useful shell functions.
1480-m4_defun([_LT_PROG_XSI_SHELLFNS],
1481-[case $xsi_shell in
1482- yes)
1483- cat << \_LT_EOF >> "$cfgfile"
1484-
1485-# func_dirname file append nondir_replacement
1486-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1487-# otherwise set result to NONDIR_REPLACEMENT.
1488-func_dirname ()
1489-{
1490- case ${1} in
1491- */*) func_dirname_result="${1%/*}${2}" ;;
1492- * ) func_dirname_result="${3}" ;;
1493- esac
1494-}
1495-
1496-# func_basename file
1497-func_basename ()
1498-{
1499- func_basename_result="${1##*/}"
1500-}
1501-
1502-# func_dirname_and_basename file append nondir_replacement
1503-# perform func_basename and func_dirname in a single function
1504-# call:
1505-# dirname: Compute the dirname of FILE. If nonempty,
1506-# add APPEND to the result, otherwise set result
1507-# to NONDIR_REPLACEMENT.
1508-# value returned in "$func_dirname_result"
1509-# basename: Compute filename of FILE.
1510-# value retuned in "$func_basename_result"
1511-# Implementation must be kept synchronized with func_dirname
1512-# and func_basename. For efficiency, we do not delegate to
1513-# those functions but instead duplicate the functionality here.
1514-func_dirname_and_basename ()
1515-{
1516- case ${1} in
1517- */*) func_dirname_result="${1%/*}${2}" ;;
1518- * ) func_dirname_result="${3}" ;;
1519- esac
1520- func_basename_result="${1##*/}"
1521-}
1522-
1523-# func_stripname prefix suffix name
1524-# strip PREFIX and SUFFIX off of NAME.
1525-# PREFIX and SUFFIX must not contain globbing or regex special
1526-# characters, hashes, percent signs, but SUFFIX may contain a leading
1527-# dot (in which case that matches only a dot).
1528-func_stripname ()
1529-{
1530- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1531- # positional parameters, so assign one to ordinary parameter first.
1532- func_stripname_result=${3}
1533- func_stripname_result=${func_stripname_result#"${1}"}
1534- func_stripname_result=${func_stripname_result%"${2}"}
1535-}
1536-
1537-# func_opt_split
1538-func_opt_split ()
1539-{
1540- func_opt_split_opt=${1%%=*}
1541- func_opt_split_arg=${1#*=}
1542-}
1543-
1544-# func_lo2o object
1545-func_lo2o ()
1546-{
1547- case ${1} in
1548- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1549- *) func_lo2o_result=${1} ;;
1550- esac
1551-}
1552-
1553-# func_xform libobj-or-source
1554-func_xform ()
1555-{
1556- func_xform_result=${1%.*}.lo
1557-}
1558-
1559-# func_arith arithmetic-term...
1560-func_arith ()
1561-{
1562- func_arith_result=$(( $[*] ))
1563-}
1564-
1565-# func_len string
1566-# STRING may not start with a hyphen.
1567-func_len ()
1568-{
1569- func_len_result=${#1}
1570-}
1571-
1572-_LT_EOF
1573- ;;
1574- *) # Bourne compatible functions.
1575- cat << \_LT_EOF >> "$cfgfile"
1576-
1577-# func_dirname file append nondir_replacement
1578-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1579-# otherwise set result to NONDIR_REPLACEMENT.
1580-func_dirname ()
1581-{
1582- # Extract subdirectory from the argument.
1583- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1584- if test "X$func_dirname_result" = "X${1}"; then
1585- func_dirname_result="${3}"
1586- else
1587- func_dirname_result="$func_dirname_result${2}"
1588- fi
1589-}
1590-
1591-# func_basename file
1592-func_basename ()
1593-{
1594- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1595-}
1596+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
1597+# ------------------------------------------------------
1598+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
1599+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
1600+m4_defun([_LT_PROG_FUNCTION_REPLACE],
1601+[dnl {
1602+sed -e '/^$1 ()$/,/^} # $1 /c\
1603+$1 ()\
1604+{\
1605+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
1606+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
1607+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1608+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1609+test 0 -eq $? || _lt_function_replace_fail=:
1610+])
1611
1612-dnl func_dirname_and_basename
1613-dnl A portable version of this function is already defined in general.m4sh
1614-dnl so there is no need for it here.
1615
1616-# func_stripname prefix suffix name
1617-# strip PREFIX and SUFFIX off of NAME.
1618-# PREFIX and SUFFIX must not contain globbing or regex special
1619-# characters, hashes, percent signs, but SUFFIX may contain a leading
1620-# dot (in which case that matches only a dot).
1621-# func_strip_suffix prefix name
1622-func_stripname ()
1623-{
1624- case ${2} in
1625- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1626- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1627- esac
1628-}
1629+# _LT_PROG_REPLACE_SHELLFNS
1630+# -------------------------
1631+# Replace existing portable implementations of several shell functions with
1632+# equivalent extended shell implementations where those features are available..
1633+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
1634+[if test x"$xsi_shell" = xyes; then
1635+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
1636+ case ${1} in
1637+ */*) func_dirname_result="${1%/*}${2}" ;;
1638+ * ) func_dirname_result="${3}" ;;
1639+ esac])
1640+
1641+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
1642+ func_basename_result="${1##*/}"])
1643+
1644+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
1645+ case ${1} in
1646+ */*) func_dirname_result="${1%/*}${2}" ;;
1647+ * ) func_dirname_result="${3}" ;;
1648+ esac
1649+ func_basename_result="${1##*/}"])
1650
1651-# sed scripts:
1652-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
1653-my_sed_long_arg='1s/^-[[^=]]*=//'
1654+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
1655+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1656+ # positional parameters, so assign one to ordinary parameter first.
1657+ func_stripname_result=${3}
1658+ func_stripname_result=${func_stripname_result#"${1}"}
1659+ func_stripname_result=${func_stripname_result%"${2}"}])
1660+
1661+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
1662+ func_split_long_opt_name=${1%%=*}
1663+ func_split_long_opt_arg=${1#*=}])
1664+
1665+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
1666+ func_split_short_opt_arg=${1#??}
1667+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
1668+
1669+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
1670+ case ${1} in
1671+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1672+ *) func_lo2o_result=${1} ;;
1673+ esac])
1674
1675-# func_opt_split
1676-func_opt_split ()
1677-{
1678- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1679- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1680-}
1681+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
1682
1683-# func_lo2o object
1684-func_lo2o ()
1685-{
1686- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1687-}
1688+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
1689
1690-# func_xform libobj-or-source
1691-func_xform ()
1692-{
1693- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
1694-}
1695+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
1696+fi
1697
1698-# func_arith arithmetic-term...
1699-func_arith ()
1700-{
1701- func_arith_result=`expr "$[@]"`
1702-}
1703+if test x"$lt_shell_append" = xyes; then
1704+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
1705
1706-# func_len string
1707-# STRING may not start with a hyphen.
1708-func_len ()
1709-{
1710- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
1711-}
1712+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
1713+ func_quote_for_eval "${2}"
1714+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
1715+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
1716+
1717+ # Save a `func_append' function call where possible by direct use of '+='
1718+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1719+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1720+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1721+ test 0 -eq $? || _lt_function_replace_fail=:
1722+else
1723+ # Save a `func_append' function call even when '+=' is not available
1724+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1727+ test 0 -eq $? || _lt_function_replace_fail=:
1728+fi
1729
1730-_LT_EOF
1731-esac
1732+if test x"$_lt_function_replace_fail" = x":"; then
1733+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
1734+fi
1735+])
1736
1737-case $lt_shell_append in
1738- yes)
1739- cat << \_LT_EOF >> "$cfgfile"
1740-
1741-# func_append var value
1742-# Append VALUE to the end of shell variable VAR.
1743-func_append ()
1744-{
1745- eval "$[1]+=\$[2]"
1746-}
1747-_LT_EOF
1748+# _LT_PATH_CONVERSION_FUNCTIONS
1749+# -----------------------------
1750+# Determine which file name conversion functions should be used by
1751+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
1752+# for certain cross-compile configurations and native mingw.
1753+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
1754+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1755+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1756+AC_MSG_CHECKING([how to convert $build file names to $host format])
1757+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
1758+[case $host in
1759+ *-*-mingw* )
1760+ case $build in
1761+ *-*-mingw* ) # actually msys
1762+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
1763+ ;;
1764+ *-*-cygwin* )
1765+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
1766+ ;;
1767+ * ) # otherwise, assume *nix
1768+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
1769+ ;;
1770+ esac
1771 ;;
1772- *)
1773- cat << \_LT_EOF >> "$cfgfile"
1774-
1775-# func_append var value
1776-# Append VALUE to the end of shell variable VAR.
1777-func_append ()
1778-{
1779- eval "$[1]=\$$[1]\$[2]"
1780-}
1781-
1782-_LT_EOF
1783+ *-*-cygwin* )
1784+ case $build in
1785+ *-*-mingw* ) # actually msys
1786+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
1787+ ;;
1788+ *-*-cygwin* )
1789+ lt_cv_to_host_file_cmd=func_convert_file_noop
1790+ ;;
1791+ * ) # otherwise, assume *nix
1792+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
1793+ ;;
1794+ esac
1795 ;;
1796- esac
1797+ * ) # unhandled hosts (and "normal" native builds)
1798+ lt_cv_to_host_file_cmd=func_convert_file_noop
1799+ ;;
1800+esac
1801+])
1802+to_host_file_cmd=$lt_cv_to_host_file_cmd
1803+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
1804+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
1805+ [0], [convert $build file names to $host format])dnl
1806+
1807+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
1808+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
1809+[#assume ordinary cross tools, or native build.
1810+lt_cv_to_tool_file_cmd=func_convert_file_noop
1811+case $host in
1812+ *-*-mingw* )
1813+ case $build in
1814+ *-*-mingw* ) # actually msys
1815+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
1816+ ;;
1817+ esac
1818+ ;;
1819+esac
1820 ])
1821+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1822+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
1823+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
1824+ [0], [convert $build files to toolchain format])dnl
1825+])# _LT_PATH_CONVERSION_FUNCTIONS
1826Index: binutils-2.21.1/ltmain.sh
1827===================================================================
1828--- binutils-2.21.1.orig/ltmain.sh
1829+++ binutils-2.21.1/ltmain.sh
1830@@ -1,10 +1,9 @@
1831-# Generated from ltmain.m4sh.
1832
1833-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
1834+# libtool (GNU libtool) 2.4
1835 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1836
1837 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
1838-# 2007, 2008, 2009 Free Software Foundation, Inc.
1839+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
1840 # This is free software; see the source for copying conditions. There is NO
1841 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1842
1843@@ -38,7 +37,6 @@
1844 # -n, --dry-run display commands without modifying any files
1845 # --features display basic configuration information and exit
1846 # --mode=MODE use operation mode MODE
1847-# --no-finish let install mode avoid finish commands
1848 # --preserve-dup-deps don't remove duplicate dependency libraries
1849 # --quiet, --silent don't print informational messages
1850 # --no-quiet, --no-silent
1851@@ -71,17 +69,19 @@
1852 # compiler: $LTCC
1853 # compiler flags: $LTCFLAGS
1854 # linker: $LD (gnu? $with_gnu_ld)
1855-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
1856+# $progname: (GNU libtool) 2.4
1857 # automake: $automake_version
1858 # autoconf: $autoconf_version
1859 #
1860 # Report bugs to <bug-libtool@gnu.org>.
1861+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
1862+# General help using GNU software: <http://www.gnu.org/gethelp/>.
1863
1864 PROGRAM=libtool
1865 PACKAGE=libtool
1866-VERSION=2.2.7a
1867-TIMESTAMP=" 1.3134 2009-11-29"
1868-package_revision=1.3134
1869+VERSION=2.4
1870+TIMESTAMP=""
1871+package_revision=1.3293
1872
1873 # Be Bourne compatible
1874 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1875@@ -106,9 +106,6 @@ _LTECHO_EOF'
1876 }
1877
1878 # NLS nuisances: We save the old values to restore during execute mode.
1879-# Only set LANG and LC_ALL to C if already set.
1880-# These must not be set unconditionally because not all systems understand
1881-# e.g. LANG=C (notably SCO).
1882 lt_user_locale=
1883 lt_safe_locale=
1884 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
1885@@ -121,15 +118,13 @@ do
1886 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
1887 fi"
1888 done
1889+LC_ALL=C
1890+LANGUAGE=C
1891+export LANGUAGE LC_ALL
1892
1893 $lt_unset CDPATH
1894
1895
1896-
1897-
1898-
1899-
1900-
1901 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
1902 # is ksh but when the shell is invoked as "sh" and the current value of
1903 # the _XPG environment variable is not equal to 1 (one), the special
1904@@ -140,7 +135,7 @@ progpath="$0"
1905
1906
1907 : ${CP="cp -f"}
1908-: ${ECHO=$as_echo}
1909+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
1910 : ${EGREP="/bin/grep -E"}
1911 : ${FGREP="/bin/grep -F"}
1912 : ${GREP="/bin/grep"}
1913@@ -149,7 +144,7 @@ progpath="$0"
1914 : ${MKDIR="mkdir"}
1915 : ${MV="mv -f"}
1916 : ${RM="rm -f"}
1917-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
1918+: ${SED="/bin/sed"}
1919 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
1920 : ${Xsed="$SED -e 1s/^X//"}
1921
1922@@ -169,6 +164,27 @@ IFS=" $lt_nl"
1923 dirname="s,/[^/]*$,,"
1924 basename="s,^.*/,,"
1925
1926+# func_dirname file append nondir_replacement
1927+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1928+# otherwise set result to NONDIR_REPLACEMENT.
1929+func_dirname ()
1930+{
1931+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1932+ if test "X$func_dirname_result" = "X${1}"; then
1933+ func_dirname_result="${3}"
1934+ else
1935+ func_dirname_result="$func_dirname_result${2}"
1936+ fi
1937+} # func_dirname may be replaced by extended shell implementation
1938+
1939+
1940+# func_basename file
1941+func_basename ()
1942+{
1943+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1944+} # func_basename may be replaced by extended shell implementation
1945+
1946+
1947 # func_dirname_and_basename file append nondir_replacement
1948 # perform func_basename and func_dirname in a single function
1949 # call:
1950@@ -183,17 +199,31 @@ basename="s,^.*/,,"
1951 # those functions but instead duplicate the functionality here.
1952 func_dirname_and_basename ()
1953 {
1954- # Extract subdirectory from the argument.
1955- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1956- if test "X$func_dirname_result" = "X${1}"; then
1957- func_dirname_result="${3}"
1958- else
1959- func_dirname_result="$func_dirname_result${2}"
1960- fi
1961- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1962-}
1963+ # Extract subdirectory from the argument.
1964+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1965+ if test "X$func_dirname_result" = "X${1}"; then
1966+ func_dirname_result="${3}"
1967+ else
1968+ func_dirname_result="$func_dirname_result${2}"
1969+ fi
1970+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1971+} # func_dirname_and_basename may be replaced by extended shell implementation
1972+
1973+
1974+# func_stripname prefix suffix name
1975+# strip PREFIX and SUFFIX off of NAME.
1976+# PREFIX and SUFFIX must not contain globbing or regex special
1977+# characters, hashes, percent signs, but SUFFIX may contain a leading
1978+# dot (in which case that matches only a dot).
1979+# func_strip_suffix prefix name
1980+func_stripname ()
1981+{
1982+ case ${2} in
1983+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1984+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1985+ esac
1986+} # func_stripname may be replaced by extended shell implementation
1987
1988-# Generated shell functions inserted here.
1989
1990 # These SED scripts presuppose an absolute path with a trailing slash.
1991 pathcar='s,^/\([^/]*\).*$,\1,'
1992@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
1993 # Same as above, but do not quote variable references.
1994 double_quote_subst='s/\(["`\\]\)/\\\1/g'
1995
1996+# Sed substitution that turns a string into a regex matching for the
1997+# string literally.
1998+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
1999+
2000+# Sed substitution that converts a w32 file name or path
2001+# which contains forward slashes, into one that contains
2002+# (escaped) backslashes. A very naive implementation.
2003+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2004+
2005 # Re-`\' parameter expansions in output of double_quote_subst that were
2006 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
2007 # in input to double_quote_subst, that '$' was protected from expansion.
2008@@ -404,7 +443,7 @@ opt_warning=:
2009 # name if it has been set yet.
2010 func_echo ()
2011 {
2012- $ECHO "$progname${mode+: }$mode: $*"
2013+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
2014 }
2015
2016 # func_verbose arg...
2017@@ -430,14 +469,14 @@ func_echo_all ()
2018 # Echo program name prefixed message to standard error.
2019 func_error ()
2020 {
2021- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
2022+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
2023 }
2024
2025 # func_warning arg...
2026 # Echo program name prefixed warning message to standard error.
2027 func_warning ()
2028 {
2029- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
2030+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
2031
2032 # bash bug again:
2033 :
2034@@ -656,19 +695,35 @@ func_show_eval_locale ()
2035 fi
2036 }
2037
2038-
2039-
2040+# func_tr_sh
2041+# Turn $1 into a string suitable for a shell variable name.
2042+# Result is stored in $func_tr_sh_result. All characters
2043+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
2044+# if $1 begins with a digit, a '_' is prepended as well.
2045+func_tr_sh ()
2046+{
2047+ case $1 in
2048+ [0-9]* | *[!a-zA-Z0-9_]*)
2049+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
2050+ ;;
2051+ * )
2052+ func_tr_sh_result=$1
2053+ ;;
2054+ esac
2055+}
2056
2057
2058 # func_version
2059 # Echo version message to standard output and exit.
2060 func_version ()
2061 {
2062+ $opt_debug
2063+
2064 $SED -n '/(C)/!b go
2065 :more
2066 /\./!{
2067 N
2068- s/\n# //
2069+ s/\n# / /
2070 b more
2071 }
2072 :go
2073@@ -685,7 +740,9 @@ func_version ()
2074 # Echo short help message to standard output and exit.
2075 func_usage ()
2076 {
2077- $SED -n '/^# Usage:/,/^# *-h/ {
2078+ $opt_debug
2079+
2080+ $SED -n '/^# Usage:/,/^# *.*--help/ {
2081 s/^# //
2082 s/^# *$//
2083 s/\$progname/'$progname'/
2084@@ -701,7 +758,10 @@ func_usage ()
2085 # unless 'noexit' is passed as argument.
2086 func_help ()
2087 {
2088+ $opt_debug
2089+
2090 $SED -n '/^# Usage:/,/# Report bugs to/ {
2091+ :print
2092 s/^# //
2093 s/^# *$//
2094 s*\$progname*'$progname'*
2095@@ -714,7 +774,11 @@ func_help ()
2096 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
2097 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
2098 p
2099- }' < "$progpath"
2100+ d
2101+ }
2102+ /^# .* home page:/b print
2103+ /^# General help using/b print
2104+ ' < "$progpath"
2105 ret=$?
2106 if test -z "$1"; then
2107 exit $ret
2108@@ -726,12 +790,39 @@ func_help ()
2109 # exit_cmd.
2110 func_missing_arg ()
2111 {
2112- func_error "missing argument for $1"
2113+ $opt_debug
2114+
2115+ func_error "missing argument for $1."
2116 exit_cmd=exit
2117 }
2118
2119-exit_cmd=:
2120
2121+# func_split_short_opt shortopt
2122+# Set func_split_short_opt_name and func_split_short_opt_arg shell
2123+# variables after splitting SHORTOPT after the 2nd character.
2124+func_split_short_opt ()
2125+{
2126+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
2127+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
2128+
2129+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
2130+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
2131+} # func_split_short_opt may be replaced by extended shell implementation
2132+
2133+
2134+# func_split_long_opt longopt
2135+# Set func_split_long_opt_name and func_split_long_opt_arg shell
2136+# variables after splitting LONGOPT at the `=' sign.
2137+func_split_long_opt ()
2138+{
2139+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
2140+ my_sed_long_arg='1s/^--[^=]*=//'
2141+
2142+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
2143+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
2144+} # func_split_long_opt may be replaced by extended shell implementation
2145+
2146+exit_cmd=:
2147
2148
2149
2150@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
2151 magic_exe="%%%MAGIC EXE variable%%%"
2152
2153 # Global variables.
2154-# $mode is unset
2155 nonopt=
2156-execute_dlfiles=
2157 preserve_args=
2158 lo2o="s/\\.lo\$/.${objext}/"
2159 o2lo="s/\\.${objext}\$/.lo/"
2160 extracted_archives=
2161 extracted_serial=0
2162
2163-opt_dry_run=false
2164-opt_finish=:
2165-opt_duplicate_deps=false
2166-opt_silent=false
2167-opt_debug=:
2168-
2169 # If this variable is set in any of the actions, the command in it
2170 # will be execed at the end. This prevents here-documents from being
2171 # left over by shells.
2172 exec_cmd=
2173
2174+# func_append var value
2175+# Append VALUE to the end of shell variable VAR.
2176+func_append ()
2177+{
2178+ eval "${1}=\$${1}\${2}"
2179+} # func_append may be replaced by extended shell implementation
2180+
2181+# func_append_quoted var value
2182+# Quote VALUE and append to the end of shell variable VAR, separated
2183+# by a space.
2184+func_append_quoted ()
2185+{
2186+ func_quote_for_eval "${2}"
2187+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
2188+} # func_append_quoted may be replaced by extended shell implementation
2189+
2190+
2191+# func_arith arithmetic-term...
2192+func_arith ()
2193+{
2194+ func_arith_result=`expr "${@}"`
2195+} # func_arith may be replaced by extended shell implementation
2196+
2197+
2198+# func_len string
2199+# STRING may not start with a hyphen.
2200+func_len ()
2201+{
2202+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
2203+} # func_len may be replaced by extended shell implementation
2204+
2205+
2206+# func_lo2o object
2207+func_lo2o ()
2208+{
2209+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2210+} # func_lo2o may be replaced by extended shell implementation
2211+
2212+
2213+# func_xform libobj-or-source
2214+func_xform ()
2215+{
2216+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
2217+} # func_xform may be replaced by extended shell implementation
2218+
2219+
2220 # func_fatal_configuration arg...
2221 # Echo program name prefixed message to standard error, followed by
2222 # a configuration failure hint, and exit.
2223@@ -850,130 +979,204 @@ func_enable_tag ()
2224 esac
2225 }
2226
2227-# Parse options once, thoroughly. This comes as soon as possible in
2228-# the script to make things like `libtool --version' happen quickly.
2229+# func_check_version_match
2230+# Ensure that we are using m4 macros, and libtool script from the same
2231+# release of libtool.
2232+func_check_version_match ()
2233 {
2234+ if test "$package_revision" != "$macro_revision"; then
2235+ if test "$VERSION" != "$macro_version"; then
2236+ if test -z "$macro_version"; then
2237+ cat >&2 <<_LT_EOF
2238+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2239+$progname: definition of this LT_INIT comes from an older release.
2240+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2241+$progname: and run autoconf again.
2242+_LT_EOF
2243+ else
2244+ cat >&2 <<_LT_EOF
2245+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2246+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2247+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2248+$progname: and run autoconf again.
2249+_LT_EOF
2250+ fi
2251+ else
2252+ cat >&2 <<_LT_EOF
2253+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2254+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2255+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2256+$progname: of $PACKAGE $VERSION and run autoconf again.
2257+_LT_EOF
2258+ fi
2259+
2260+ exit $EXIT_MISMATCH
2261+ fi
2262+}
2263+
2264+
2265+# Shorthand for --mode=foo, only valid as the first argument
2266+case $1 in
2267+clean|clea|cle|cl)
2268+ shift; set dummy --mode clean ${1+"$@"}; shift
2269+ ;;
2270+compile|compil|compi|comp|com|co|c)
2271+ shift; set dummy --mode compile ${1+"$@"}; shift
2272+ ;;
2273+execute|execut|execu|exec|exe|ex|e)
2274+ shift; set dummy --mode execute ${1+"$@"}; shift
2275+ ;;
2276+finish|finis|fini|fin|fi|f)
2277+ shift; set dummy --mode finish ${1+"$@"}; shift
2278+ ;;
2279+install|instal|insta|inst|ins|in|i)
2280+ shift; set dummy --mode install ${1+"$@"}; shift
2281+ ;;
2282+link|lin|li|l)
2283+ shift; set dummy --mode link ${1+"$@"}; shift
2284+ ;;
2285+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2286+ shift; set dummy --mode uninstall ${1+"$@"}; shift
2287+ ;;
2288+esac
2289
2290- # Shorthand for --mode=foo, only valid as the first argument
2291- case $1 in
2292- clean|clea|cle|cl)
2293- shift; set dummy --mode clean ${1+"$@"}; shift
2294- ;;
2295- compile|compil|compi|comp|com|co|c)
2296- shift; set dummy --mode compile ${1+"$@"}; shift
2297- ;;
2298- execute|execut|execu|exec|exe|ex|e)
2299- shift; set dummy --mode execute ${1+"$@"}; shift
2300- ;;
2301- finish|finis|fini|fin|fi|f)
2302- shift; set dummy --mode finish ${1+"$@"}; shift
2303- ;;
2304- install|instal|insta|inst|ins|in|i)
2305- shift; set dummy --mode install ${1+"$@"}; shift
2306- ;;
2307- link|lin|li|l)
2308- shift; set dummy --mode link ${1+"$@"}; shift
2309- ;;
2310- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2311- shift; set dummy --mode uninstall ${1+"$@"}; shift
2312- ;;
2313- esac
2314
2315- # Parse non-mode specific arguments:
2316- while test "$#" -gt 0; do
2317+
2318+# Option defaults:
2319+opt_debug=:
2320+opt_dry_run=false
2321+opt_config=false
2322+opt_preserve_dup_deps=false
2323+opt_features=false
2324+opt_finish=false
2325+opt_help=false
2326+opt_help_all=false
2327+opt_silent=:
2328+opt_verbose=:
2329+opt_silent=false
2330+opt_verbose=false
2331+
2332+
2333+# Parse options once, thoroughly. This comes as soon as possible in the
2334+# script to make things like `--version' happen as quickly as we can.
2335+{
2336+ # this just eases exit handling
2337+ while test $# -gt 0; do
2338 opt="$1"
2339 shift
2340-
2341 case $opt in
2342- --config) func_config ;;
2343-
2344- --debug) preserve_args="$preserve_args $opt"
2345+ --debug|-x) opt_debug='set -x'
2346 func_echo "enabling shell trace mode"
2347- opt_debug='set -x'
2348 $opt_debug
2349 ;;
2350-
2351- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
2352- execute_dlfiles="$execute_dlfiles $1"
2353- shift
2354+ --dry-run|--dryrun|-n)
2355+ opt_dry_run=:
2356 ;;
2357-
2358- --dry-run | -n) opt_dry_run=: ;;
2359- --features) func_features ;;
2360- --finish) mode="finish" ;;
2361- --no-finish) opt_finish=false ;;
2362-
2363- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
2364- case $1 in
2365- # Valid mode arguments:
2366- clean) ;;
2367- compile) ;;
2368- execute) ;;
2369- finish) ;;
2370- install) ;;
2371- link) ;;
2372- relink) ;;
2373- uninstall) ;;
2374-
2375- # Catch anything else as an error
2376- *) func_error "invalid argument for $opt"
2377- exit_cmd=exit
2378- break
2379- ;;
2380- esac
2381-
2382- mode="$1"
2383+ --config)
2384+ opt_config=:
2385+func_config
2386+ ;;
2387+ --dlopen|-dlopen)
2388+ optarg="$1"
2389+ opt_dlopen="${opt_dlopen+$opt_dlopen
2390+}$optarg"
2391 shift
2392 ;;
2393-
2394 --preserve-dup-deps)
2395- opt_duplicate_deps=: ;;
2396-
2397- --quiet|--silent) preserve_args="$preserve_args $opt"
2398- opt_silent=:
2399- opt_verbose=false
2400+ opt_preserve_dup_deps=:
2401 ;;
2402-
2403- --no-quiet|--no-silent)
2404- preserve_args="$preserve_args $opt"
2405- opt_silent=false
2406+ --features)
2407+ opt_features=:
2408+func_features
2409 ;;
2410-
2411- --verbose| -v) preserve_args="$preserve_args $opt"
2412+ --finish)
2413+ opt_finish=:
2414+set dummy --mode finish ${1+"$@"}; shift
2415+ ;;
2416+ --help)
2417+ opt_help=:
2418+ ;;
2419+ --help-all)
2420+ opt_help_all=:
2421+opt_help=': help-all'
2422+ ;;
2423+ --mode)
2424+ test $# = 0 && func_missing_arg $opt && break
2425+ optarg="$1"
2426+ opt_mode="$optarg"
2427+case $optarg in
2428+ # Valid mode arguments:
2429+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
2430+
2431+ # Catch anything else as an error
2432+ *) func_error "invalid argument for $opt"
2433+ exit_cmd=exit
2434+ break
2435+ ;;
2436+esac
2437+ shift
2438+ ;;
2439+ --no-silent|--no-quiet)
2440 opt_silent=false
2441- opt_verbose=:
2442+func_append preserve_args " $opt"
2443 ;;
2444-
2445- --no-verbose) preserve_args="$preserve_args $opt"
2446+ --no-verbose)
2447 opt_verbose=false
2448+func_append preserve_args " $opt"
2449 ;;
2450-
2451- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
2452- preserve_args="$preserve_args $opt $1"
2453- func_enable_tag "$1" # tagname is set here
2454+ --silent|--quiet)
2455+ opt_silent=:
2456+func_append preserve_args " $opt"
2457+ opt_verbose=false
2458+ ;;
2459+ --verbose|-v)
2460+ opt_verbose=:
2461+func_append preserve_args " $opt"
2462+opt_silent=false
2463+ ;;
2464+ --tag)
2465+ test $# = 0 && func_missing_arg $opt && break
2466+ optarg="$1"
2467+ opt_tag="$optarg"
2468+func_append preserve_args " $opt $optarg"
2469+func_enable_tag "$optarg"
2470 shift
2471 ;;
2472
2473+ -\?|-h) func_usage ;;
2474+ --help) func_help ;;
2475+ --version) func_version ;;
2476+
2477 # Separate optargs to long options:
2478- -dlopen=*|--mode=*|--tag=*)
2479- func_opt_split "$opt"
2480- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
2481+ --*=*)
2482+ func_split_long_opt "$opt"
2483+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
2484 shift
2485 ;;
2486
2487- -\?|-h) func_usage ;;
2488- --help) opt_help=: ;;
2489- --help-all) opt_help=': help-all' ;;
2490- --version) func_version ;;
2491-
2492- -*) func_fatal_help "unrecognized option \`$opt'" ;;
2493-
2494- *) nonopt="$opt"
2495- break
2496+ # Separate non-argument short options:
2497+ -\?*|-h*|-n*|-v*)
2498+ func_split_short_opt "$opt"
2499+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
2500+ shift
2501 ;;
2502+
2503+ --) break ;;
2504+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
2505+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
2506 esac
2507 done
2508
2509+ # Validate options:
2510+
2511+ # save first non-option argument
2512+ if test "$#" -gt 0; then
2513+ nonopt="$opt"
2514+ shift
2515+ fi
2516+
2517+ # preserve --debug
2518+ test "$opt_debug" = : || func_append preserve_args " --debug"
2519
2520 case $host in
2521 *cygwin* | *mingw* | *pw32* | *cegcc*)
2522@@ -981,82 +1184,44 @@ func_enable_tag ()
2523 opt_duplicate_compiler_generated_deps=:
2524 ;;
2525 *)
2526- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
2527+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
2528 ;;
2529 esac
2530
2531- # Having warned about all mis-specified options, bail out if
2532- # anything was wrong.
2533- $exit_cmd $EXIT_FAILURE
2534-}
2535+ $opt_help || {
2536+ # Sanity checks first:
2537+ func_check_version_match
2538
2539-# func_check_version_match
2540-# Ensure that we are using m4 macros, and libtool script from the same
2541-# release of libtool.
2542-func_check_version_match ()
2543-{
2544- if test "$package_revision" != "$macro_revision"; then
2545- if test "$VERSION" != "$macro_version"; then
2546- if test -z "$macro_version"; then
2547- cat >&2 <<_LT_EOF
2548-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2549-$progname: definition of this LT_INIT comes from an older release.
2550-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2551-$progname: and run autoconf again.
2552-_LT_EOF
2553- else
2554- cat >&2 <<_LT_EOF
2555-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2556-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2557-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2558-$progname: and run autoconf again.
2559-_LT_EOF
2560- fi
2561- else
2562- cat >&2 <<_LT_EOF
2563-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2564-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2565-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2566-$progname: of $PACKAGE $VERSION and run autoconf again.
2567-_LT_EOF
2568+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2569+ func_fatal_configuration "not configured to build any kind of library"
2570 fi
2571
2572- exit $EXIT_MISMATCH
2573- fi
2574-}
2575-
2576+ # Darwin sucks
2577+ eval std_shrext=\"$shrext_cmds\"
2578
2579-## ----------- ##
2580-## Main. ##
2581-## ----------- ##
2582-
2583-$opt_help || {
2584- # Sanity checks first:
2585- func_check_version_match
2586-
2587- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2588- func_fatal_configuration "not configured to build any kind of library"
2589- fi
2590+ # Only execute mode is allowed to have -dlopen flags.
2591+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
2592+ func_error "unrecognized option \`-dlopen'"
2593+ $ECHO "$help" 1>&2
2594+ exit $EXIT_FAILURE
2595+ fi
2596
2597- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
2598+ # Change the help message to a mode-specific one.
2599+ generic_help="$help"
2600+ help="Try \`$progname --help --mode=$opt_mode' for more information."
2601+ }
2602
2603
2604- # Darwin sucks
2605- eval "std_shrext=\"$shrext_cmds\""
2606+ # Bail if the options were screwed
2607+ $exit_cmd $EXIT_FAILURE
2608+}
2609
2610
2611- # Only execute mode is allowed to have -dlopen flags.
2612- if test -n "$execute_dlfiles" && test "$mode" != execute; then
2613- func_error "unrecognized option \`-dlopen'"
2614- $ECHO "$help" 1>&2
2615- exit $EXIT_FAILURE
2616- fi
2617
2618- # Change the help message to a mode-specific one.
2619- generic_help="$help"
2620- help="Try \`$progname --help --mode=$mode' for more information."
2621-}
2622
2623+## ----------- ##
2624+## Main. ##
2625+## ----------- ##
2626
2627 # func_lalib_p file
2628 # True iff FILE is a libtool `.la' library or `.lo' object file.
2629@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
2630 # temporary ltwrapper_script.
2631 func_ltwrapper_scriptname ()
2632 {
2633- func_ltwrapper_scriptname_result=""
2634- if func_ltwrapper_executable_p "$1"; then
2635- func_dirname_and_basename "$1" "" "."
2636- func_stripname '' '.exe' "$func_basename_result"
2637- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2638- fi
2639+ func_dirname_and_basename "$1" "" "."
2640+ func_stripname '' '.exe' "$func_basename_result"
2641+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2642 }
2643
2644 # func_ltwrapper_p file
2645@@ -1149,7 +1311,7 @@ func_execute_cmds ()
2646 save_ifs=$IFS; IFS='~'
2647 for cmd in $1; do
2648 IFS=$save_ifs
2649- eval "cmd=\"$cmd\""
2650+ eval cmd=\"$cmd\"
2651 func_show_eval "$cmd" "${2-:}"
2652 done
2653 IFS=$save_ifs
2654@@ -1172,6 +1334,37 @@ func_source ()
2655 }
2656
2657
2658+# func_resolve_sysroot PATH
2659+# Replace a leading = in PATH with a sysroot. Store the result into
2660+# func_resolve_sysroot_result
2661+func_resolve_sysroot ()
2662+{
2663+ func_resolve_sysroot_result=$1
2664+ case $func_resolve_sysroot_result in
2665+ =*)
2666+ func_stripname '=' '' "$func_resolve_sysroot_result"
2667+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
2668+ ;;
2669+ esac
2670+}
2671+
2672+# func_replace_sysroot PATH
2673+# If PATH begins with the sysroot, replace it with = and
2674+# store the result into func_replace_sysroot_result.
2675+func_replace_sysroot ()
2676+{
2677+ case "$lt_sysroot:$1" in
2678+ ?*:"$lt_sysroot"*)
2679+ func_stripname "$lt_sysroot" '' "$1"
2680+ func_replace_sysroot_result="=$func_stripname_result"
2681+ ;;
2682+ *)
2683+ # Including no sysroot.
2684+ func_replace_sysroot_result=$1
2685+ ;;
2686+ esac
2687+}
2688+
2689 # func_infer_tag arg
2690 # Infer tagged configuration to use if any are available and
2691 # if one wasn't chosen via the "--tag" command line option.
2692@@ -1184,8 +1377,7 @@ func_infer_tag ()
2693 if test -n "$available_tags" && test -z "$tagname"; then
2694 CC_quoted=
2695 for arg in $CC; do
2696- func_quote_for_eval "$arg"
2697- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2698+ func_append_quoted CC_quoted "$arg"
2699 done
2700 CC_expanded=`func_echo_all $CC`
2701 CC_quoted_expanded=`func_echo_all $CC_quoted`
2702@@ -1204,8 +1396,7 @@ func_infer_tag ()
2703 CC_quoted=
2704 for arg in $CC; do
2705 # Double-quote args containing other shell metacharacters.
2706- func_quote_for_eval "$arg"
2707- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2708+ func_append_quoted CC_quoted "$arg"
2709 done
2710 CC_expanded=`func_echo_all $CC`
2711 CC_quoted_expanded=`func_echo_all $CC_quoted`
2712@@ -1274,6 +1465,486 @@ EOF
2713 }
2714 }
2715
2716+
2717+##################################################
2718+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
2719+##################################################
2720+
2721+# func_convert_core_file_wine_to_w32 ARG
2722+# Helper function used by file name conversion functions when $build is *nix,
2723+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
2724+# correctly configured wine environment available, with the winepath program
2725+# in $build's $PATH.
2726+#
2727+# ARG is the $build file name to be converted to w32 format.
2728+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
2729+# be empty on error (or when ARG is empty)
2730+func_convert_core_file_wine_to_w32 ()
2731+{
2732+ $opt_debug
2733+ func_convert_core_file_wine_to_w32_result="$1"
2734+ if test -n "$1"; then
2735+ # Unfortunately, winepath does not exit with a non-zero error code, so we
2736+ # are forced to check the contents of stdout. On the other hand, if the
2737+ # command is not found, the shell will set an exit code of 127 and print
2738+ # *an error message* to stdout. So we must check for both error code of
2739+ # zero AND non-empty stdout, which explains the odd construction:
2740+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
2741+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
2742+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
2743+ $SED -e "$lt_sed_naive_backslashify"`
2744+ else
2745+ func_convert_core_file_wine_to_w32_result=
2746+ fi
2747+ fi
2748+}
2749+# end: func_convert_core_file_wine_to_w32
2750+
2751+
2752+# func_convert_core_path_wine_to_w32 ARG
2753+# Helper function used by path conversion functions when $build is *nix, and
2754+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
2755+# configured wine environment available, with the winepath program in $build's
2756+# $PATH. Assumes ARG has no leading or trailing path separator characters.
2757+#
2758+# ARG is path to be converted from $build format to win32.
2759+# Result is available in $func_convert_core_path_wine_to_w32_result.
2760+# Unconvertible file (directory) names in ARG are skipped; if no directory names
2761+# are convertible, then the result may be empty.
2762+func_convert_core_path_wine_to_w32 ()
2763+{
2764+ $opt_debug
2765+ # unfortunately, winepath doesn't convert paths, only file names
2766+ func_convert_core_path_wine_to_w32_result=""
2767+ if test -n "$1"; then
2768+ oldIFS=$IFS
2769+ IFS=:
2770+ for func_convert_core_path_wine_to_w32_f in $1; do
2771+ IFS=$oldIFS
2772+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
2773+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
2774+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
2775+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
2776+ else
2777+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
2778+ fi
2779+ fi
2780+ done
2781+ IFS=$oldIFS
2782+ fi
2783+}
2784+# end: func_convert_core_path_wine_to_w32
2785+
2786+
2787+# func_cygpath ARGS...
2788+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
2789+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
2790+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
2791+# (2), returns the Cygwin file name or path in func_cygpath_result (input
2792+# file name or path is assumed to be in w32 format, as previously converted
2793+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
2794+# or path in func_cygpath_result (input file name or path is assumed to be in
2795+# Cygwin format). Returns an empty string on error.
2796+#
2797+# ARGS are passed to cygpath, with the last one being the file name or path to
2798+# be converted.
2799+#
2800+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
2801+# environment variable; do not put it in $PATH.
2802+func_cygpath ()
2803+{
2804+ $opt_debug
2805+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
2806+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
2807+ if test "$?" -ne 0; then
2808+ # on failure, ensure result is empty
2809+ func_cygpath_result=
2810+ fi
2811+ else
2812+ func_cygpath_result=
2813+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
2814+ fi
2815+}
2816+#end: func_cygpath
2817+
2818+
2819+# func_convert_core_msys_to_w32 ARG
2820+# Convert file name or path ARG from MSYS format to w32 format. Return
2821+# result in func_convert_core_msys_to_w32_result.
2822+func_convert_core_msys_to_w32 ()
2823+{
2824+ $opt_debug
2825+ # awkward: cmd appends spaces to result
2826+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
2827+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2828+}
2829+#end: func_convert_core_msys_to_w32
2830+
2831+
2832+# func_convert_file_check ARG1 ARG2
2833+# Verify that ARG1 (a file name in $build format) was converted to $host
2834+# format in ARG2. Otherwise, emit an error message, but continue (resetting
2835+# func_to_host_file_result to ARG1).
2836+func_convert_file_check ()
2837+{
2838+ $opt_debug
2839+ if test -z "$2" && test -n "$1" ; then
2840+ func_error "Could not determine host file name corresponding to"
2841+ func_error " \`$1'"
2842+ func_error "Continuing, but uninstalled executables may not work."
2843+ # Fallback:
2844+ func_to_host_file_result="$1"
2845+ fi
2846+}
2847+# end func_convert_file_check
2848+
2849+
2850+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
2851+# Verify that FROM_PATH (a path in $build format) was converted to $host
2852+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
2853+# func_to_host_file_result to a simplistic fallback value (see below).
2854+func_convert_path_check ()
2855+{
2856+ $opt_debug
2857+ if test -z "$4" && test -n "$3"; then
2858+ func_error "Could not determine the host path corresponding to"
2859+ func_error " \`$3'"
2860+ func_error "Continuing, but uninstalled executables may not work."
2861+ # Fallback. This is a deliberately simplistic "conversion" and
2862+ # should not be "improved". See libtool.info.
2863+ if test "x$1" != "x$2"; then
2864+ lt_replace_pathsep_chars="s|$1|$2|g"
2865+ func_to_host_path_result=`echo "$3" |
2866+ $SED -e "$lt_replace_pathsep_chars"`
2867+ else
2868+ func_to_host_path_result="$3"
2869+ fi
2870+ fi
2871+}
2872+# end func_convert_path_check
2873+
2874+
2875+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
2876+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
2877+# and appending REPL if ORIG matches BACKPAT.
2878+func_convert_path_front_back_pathsep ()
2879+{
2880+ $opt_debug
2881+ case $4 in
2882+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
2883+ ;;
2884+ esac
2885+ case $4 in
2886+ $2 ) func_append func_to_host_path_result "$3"
2887+ ;;
2888+ esac
2889+}
2890+# end func_convert_path_front_back_pathsep
2891+
2892+
2893+##################################################
2894+# $build to $host FILE NAME CONVERSION FUNCTIONS #
2895+##################################################
2896+# invoked via `$to_host_file_cmd ARG'
2897+#
2898+# In each case, ARG is the path to be converted from $build to $host format.
2899+# Result will be available in $func_to_host_file_result.
2900+
2901+
2902+# func_to_host_file ARG
2903+# Converts the file name ARG from $build format to $host format. Return result
2904+# in func_to_host_file_result.
2905+func_to_host_file ()
2906+{
2907+ $opt_debug
2908+ $to_host_file_cmd "$1"
2909+}
2910+# end func_to_host_file
2911+
2912+
2913+# func_to_tool_file ARG LAZY
2914+# converts the file name ARG from $build format to toolchain format. Return
2915+# result in func_to_tool_file_result. If the conversion in use is listed
2916+# in (the comma separated) LAZY, no conversion takes place.
2917+func_to_tool_file ()
2918+{
2919+ $opt_debug
2920+ case ,$2, in
2921+ *,"$to_tool_file_cmd",*)
2922+ func_to_tool_file_result=$1
2923+ ;;
2924+ *)
2925+ $to_tool_file_cmd "$1"
2926+ func_to_tool_file_result=$func_to_host_file_result
2927+ ;;
2928+ esac
2929+}
2930+# end func_to_tool_file
2931+
2932+
2933+# func_convert_file_noop ARG
2934+# Copy ARG to func_to_host_file_result.
2935+func_convert_file_noop ()
2936+{
2937+ func_to_host_file_result="$1"
2938+}
2939+# end func_convert_file_noop
2940+
2941+
2942+# func_convert_file_msys_to_w32 ARG
2943+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
2944+# conversion to w32 is not available inside the cwrapper. Returns result in
2945+# func_to_host_file_result.
2946+func_convert_file_msys_to_w32 ()
2947+{
2948+ $opt_debug
2949+ func_to_host_file_result="$1"
2950+ if test -n "$1"; then
2951+ func_convert_core_msys_to_w32 "$1"
2952+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
2953+ fi
2954+ func_convert_file_check "$1" "$func_to_host_file_result"
2955+}
2956+# end func_convert_file_msys_to_w32
2957+
2958+
2959+# func_convert_file_cygwin_to_w32 ARG
2960+# Convert file name ARG from Cygwin to w32 format. Returns result in
2961+# func_to_host_file_result.
2962+func_convert_file_cygwin_to_w32 ()
2963+{
2964+ $opt_debug
2965+ func_to_host_file_result="$1"
2966+ if test -n "$1"; then
2967+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
2968+ # LT_CYGPATH in this case.
2969+ func_to_host_file_result=`cygpath -m "$1"`
2970+ fi
2971+ func_convert_file_check "$1" "$func_to_host_file_result"
2972+}
2973+# end func_convert_file_cygwin_to_w32
2974+
2975+
2976+# func_convert_file_nix_to_w32 ARG
2977+# Convert file name ARG from *nix to w32 format. Requires a wine environment
2978+# and a working winepath. Returns result in func_to_host_file_result.
2979+func_convert_file_nix_to_w32 ()
2980+{
2981+ $opt_debug
2982+ func_to_host_file_result="$1"
2983+ if test -n "$1"; then
2984+ func_convert_core_file_wine_to_w32 "$1"
2985+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
2986+ fi
2987+ func_convert_file_check "$1" "$func_to_host_file_result"
2988+}
2989+# end func_convert_file_nix_to_w32
2990+
2991+
2992+# func_convert_file_msys_to_cygwin ARG
2993+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
2994+# Returns result in func_to_host_file_result.
2995+func_convert_file_msys_to_cygwin ()
2996+{
2997+ $opt_debug
2998+ func_to_host_file_result="$1"
2999+ if test -n "$1"; then
3000+ func_convert_core_msys_to_w32 "$1"
3001+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
3002+ func_to_host_file_result="$func_cygpath_result"
3003+ fi
3004+ func_convert_file_check "$1" "$func_to_host_file_result"
3005+}
3006+# end func_convert_file_msys_to_cygwin
3007+
3008+
3009+# func_convert_file_nix_to_cygwin ARG
3010+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
3011+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
3012+# in func_to_host_file_result.
3013+func_convert_file_nix_to_cygwin ()
3014+{
3015+ $opt_debug
3016+ func_to_host_file_result="$1"
3017+ if test -n "$1"; then
3018+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
3019+ func_convert_core_file_wine_to_w32 "$1"
3020+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
3021+ func_to_host_file_result="$func_cygpath_result"
3022+ fi
3023+ func_convert_file_check "$1" "$func_to_host_file_result"
3024+}
3025+# end func_convert_file_nix_to_cygwin
3026+
3027+
3028+#############################################
3029+# $build to $host PATH CONVERSION FUNCTIONS #
3030+#############################################
3031+# invoked via `$to_host_path_cmd ARG'
3032+#
3033+# In each case, ARG is the path to be converted from $build to $host format.
3034+# The result will be available in $func_to_host_path_result.
3035+#
3036+# Path separators are also converted from $build format to $host format. If
3037+# ARG begins or ends with a path separator character, it is preserved (but
3038+# converted to $host format) on output.
3039+#
3040+# All path conversion functions are named using the following convention:
3041+# file name conversion function : func_convert_file_X_to_Y ()
3042+# path conversion function : func_convert_path_X_to_Y ()
3043+# where, for any given $build/$host combination the 'X_to_Y' value is the
3044+# same. If conversion functions are added for new $build/$host combinations,
3045+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
3046+# will break.
3047+
3048+
3049+# func_init_to_host_path_cmd
3050+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
3051+# appropriate value, based on the value of $to_host_file_cmd.
3052+to_host_path_cmd=
3053+func_init_to_host_path_cmd ()
3054+{
3055+ $opt_debug
3056+ if test -z "$to_host_path_cmd"; then
3057+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
3058+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
3059+ fi
3060+}
3061+
3062+
3063+# func_to_host_path ARG
3064+# Converts the path ARG from $build format to $host format. Return result
3065+# in func_to_host_path_result.
3066+func_to_host_path ()
3067+{
3068+ $opt_debug
3069+ func_init_to_host_path_cmd
3070+ $to_host_path_cmd "$1"
3071+}
3072+# end func_to_host_path
3073+
3074+
3075+# func_convert_path_noop ARG
3076+# Copy ARG to func_to_host_path_result.
3077+func_convert_path_noop ()
3078+{
3079+ func_to_host_path_result="$1"
3080+}
3081+# end func_convert_path_noop
3082+
3083+
3084+# func_convert_path_msys_to_w32 ARG
3085+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
3086+# conversion to w32 is not available inside the cwrapper. Returns result in
3087+# func_to_host_path_result.
3088+func_convert_path_msys_to_w32 ()
3089+{
3090+ $opt_debug
3091+ func_to_host_path_result="$1"
3092+ if test -n "$1"; then
3093+ # Remove leading and trailing path separator characters from ARG. MSYS
3094+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
3095+ # and winepath ignores them completely.
3096+ func_stripname : : "$1"
3097+ func_to_host_path_tmp1=$func_stripname_result
3098+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3099+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
3100+ func_convert_path_check : ";" \
3101+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3102+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3103+ fi
3104+}
3105+# end func_convert_path_msys_to_w32
3106+
3107+
3108+# func_convert_path_cygwin_to_w32 ARG
3109+# Convert path ARG from Cygwin to w32 format. Returns result in
3110+# func_to_host_file_result.
3111+func_convert_path_cygwin_to_w32 ()
3112+{
3113+ $opt_debug
3114+ func_to_host_path_result="$1"
3115+ if test -n "$1"; then
3116+ # See func_convert_path_msys_to_w32:
3117+ func_stripname : : "$1"
3118+ func_to_host_path_tmp1=$func_stripname_result
3119+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
3120+ func_convert_path_check : ";" \
3121+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3122+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3123+ fi
3124+}
3125+# end func_convert_path_cygwin_to_w32
3126+
3127+
3128+# func_convert_path_nix_to_w32 ARG
3129+# Convert path ARG from *nix to w32 format. Requires a wine environment and
3130+# a working winepath. Returns result in func_to_host_file_result.
3131+func_convert_path_nix_to_w32 ()
3132+{
3133+ $opt_debug
3134+ func_to_host_path_result="$1"
3135+ if test -n "$1"; then
3136+ # See func_convert_path_msys_to_w32:
3137+ func_stripname : : "$1"
3138+ func_to_host_path_tmp1=$func_stripname_result
3139+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3140+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
3141+ func_convert_path_check : ";" \
3142+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3143+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3144+ fi
3145+}
3146+# end func_convert_path_nix_to_w32
3147+
3148+
3149+# func_convert_path_msys_to_cygwin ARG
3150+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3151+# Returns result in func_to_host_file_result.
3152+func_convert_path_msys_to_cygwin ()
3153+{
3154+ $opt_debug
3155+ func_to_host_path_result="$1"
3156+ if test -n "$1"; then
3157+ # See func_convert_path_msys_to_w32:
3158+ func_stripname : : "$1"
3159+ func_to_host_path_tmp1=$func_stripname_result
3160+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3161+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
3162+ func_to_host_path_result="$func_cygpath_result"
3163+ func_convert_path_check : : \
3164+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3165+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3166+ fi
3167+}
3168+# end func_convert_path_msys_to_cygwin
3169+
3170+
3171+# func_convert_path_nix_to_cygwin ARG
3172+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
3173+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
3174+# func_to_host_file_result.
3175+func_convert_path_nix_to_cygwin ()
3176+{
3177+ $opt_debug
3178+ func_to_host_path_result="$1"
3179+ if test -n "$1"; then
3180+ # Remove leading and trailing path separator characters from
3181+ # ARG. msys behavior is inconsistent here, cygpath turns them
3182+ # into '.;' and ';.', and winepath ignores them completely.
3183+ func_stripname : : "$1"
3184+ func_to_host_path_tmp1=$func_stripname_result
3185+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3186+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
3187+ func_to_host_path_result="$func_cygpath_result"
3188+ func_convert_path_check : : \
3189+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3190+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3191+ fi
3192+}
3193+# end func_convert_path_nix_to_cygwin
3194+
3195+
3196 # func_mode_compile arg...
3197 func_mode_compile ()
3198 {
3199@@ -1314,12 +1985,12 @@ func_mode_compile ()
3200 ;;
3201
3202 -pie | -fpie | -fPIE)
3203- pie_flag="$pie_flag $arg"
3204+ func_append pie_flag " $arg"
3205 continue
3206 ;;
3207
3208 -shared | -static | -prefer-pic | -prefer-non-pic)
3209- later="$later $arg"
3210+ func_append later " $arg"
3211 continue
3212 ;;
3213
3214@@ -1340,15 +2011,14 @@ func_mode_compile ()
3215 save_ifs="$IFS"; IFS=','
3216 for arg in $args; do
3217 IFS="$save_ifs"
3218- func_quote_for_eval "$arg"
3219- lastarg="$lastarg $func_quote_for_eval_result"
3220+ func_append_quoted lastarg "$arg"
3221 done
3222 IFS="$save_ifs"
3223 func_stripname ' ' '' "$lastarg"
3224 lastarg=$func_stripname_result
3225
3226 # Add the arguments to base_compile.
3227- base_compile="$base_compile $lastarg"
3228+ func_append base_compile " $lastarg"
3229 continue
3230 ;;
3231
3232@@ -1364,8 +2034,7 @@ func_mode_compile ()
3233 esac # case $arg_mode
3234
3235 # Aesthetically quote the previous argument.
3236- func_quote_for_eval "$lastarg"
3237- base_compile="$base_compile $func_quote_for_eval_result"
3238+ func_append_quoted base_compile "$lastarg"
3239 done # for arg
3240
3241 case $arg_mode in
3242@@ -1496,17 +2165,16 @@ compiler."
3243 $opt_dry_run || $RM $removelist
3244 exit $EXIT_FAILURE
3245 fi
3246- removelist="$removelist $output_obj"
3247+ func_append removelist " $output_obj"
3248 $ECHO "$srcfile" > "$lockfile"
3249 fi
3250
3251 $opt_dry_run || $RM $removelist
3252- removelist="$removelist $lockfile"
3253+ func_append removelist " $lockfile"
3254 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
3255
3256- if test -n "$fix_srcfile_path"; then
3257- eval "srcfile=\"$fix_srcfile_path\""
3258- fi
3259+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3260+ srcfile=$func_to_tool_file_result
3261 func_quote_for_eval "$srcfile"
3262 qsrcfile=$func_quote_for_eval_result
3263
3264@@ -1526,7 +2194,7 @@ compiler."
3265
3266 if test -z "$output_obj"; then
3267 # Place PIC objects in $objdir
3268- command="$command -o $lobj"
3269+ func_append command " -o $lobj"
3270 fi
3271
3272 func_show_eval_locale "$command" \
3273@@ -1573,11 +2241,11 @@ compiler."
3274 command="$base_compile $qsrcfile $pic_flag"
3275 fi
3276 if test "$compiler_c_o" = yes; then
3277- command="$command -o $obj"
3278+ func_append command " -o $obj"
3279 fi
3280
3281 # Suppress compiler output if we already did a PIC compilation.
3282- command="$command$suppress_output"
3283+ func_append command "$suppress_output"
3284 func_show_eval_locale "$command" \
3285 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
3286
3287@@ -1622,13 +2290,13 @@ compiler."
3288 }
3289
3290 $opt_help || {
3291- test "$mode" = compile && func_mode_compile ${1+"$@"}
3292+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
3293 }
3294
3295 func_mode_help ()
3296 {
3297 # We need to display help for each of the modes.
3298- case $mode in
3299+ case $opt_mode in
3300 "")
3301 # Generic help is extracted from the usage comments
3302 # at the start of this file.
3303@@ -1659,8 +2327,8 @@ This mode accepts the following addition
3304
3305 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
3306 -no-suppress do not suppress compiler output for multiple passes
3307- -prefer-pic try to building PIC objects only
3308- -prefer-non-pic try to building non-PIC objects only
3309+ -prefer-pic try to build PIC objects only
3310+ -prefer-non-pic try to build non-PIC objects only
3311 -shared do not build a \`.o' file suitable for static linking
3312 -static only build a \`.o' file suitable for static linking
3313 -Wc,FLAG pass FLAG directly to the compiler
3314@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
3315 ;;
3316
3317 *)
3318- func_fatal_help "invalid operation mode \`$mode'"
3319+ func_fatal_help "invalid operation mode \`$opt_mode'"
3320 ;;
3321 esac
3322
3323@@ -1819,13 +2487,13 @@ if $opt_help; then
3324 else
3325 {
3326 func_help noexit
3327- for mode in compile link execute install finish uninstall clean; do
3328+ for opt_mode in compile link execute install finish uninstall clean; do
3329 func_mode_help
3330 done
3331 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
3332 {
3333 func_help noexit
3334- for mode in compile link execute install finish uninstall clean; do
3335+ for opt_mode in compile link execute install finish uninstall clean; do
3336 echo
3337 func_mode_help
3338 done
3339@@ -1854,13 +2522,16 @@ func_mode_execute ()
3340 func_fatal_help "you must specify a COMMAND"
3341
3342 # Handle -dlopen flags immediately.
3343- for file in $execute_dlfiles; do
3344+ for file in $opt_dlopen; do
3345 test -f "$file" \
3346 || func_fatal_help "\`$file' is not a file"
3347
3348 dir=
3349 case $file in
3350 *.la)
3351+ func_resolve_sysroot "$file"
3352+ file=$func_resolve_sysroot_result
3353+
3354 # Check to see that this really is a libtool archive.
3355 func_lalib_unsafe_p "$file" \
3356 || func_fatal_help "\`$lib' is not a valid libtool archive"
3357@@ -1882,7 +2553,7 @@ func_mode_execute ()
3358 dir="$func_dirname_result"
3359
3360 if test -f "$dir/$objdir/$dlname"; then
3361- dir="$dir/$objdir"
3362+ func_append dir "/$objdir"
3363 else
3364 if test ! -f "$dir/$dlname"; then
3365 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
3366@@ -1907,10 +2578,10 @@ func_mode_execute ()
3367 test -n "$absdir" && dir="$absdir"
3368
3369 # Now add the directory to shlibpath_var.
3370- if eval test -z \"\$$shlibpath_var\"; then
3371- eval $shlibpath_var=\$dir
3372+ if eval "test -z \"\$$shlibpath_var\""; then
3373+ eval "$shlibpath_var=\"\$dir\""
3374 else
3375- eval $shlibpath_var=\$dir:\$$shlibpath_var
3376+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
3377 fi
3378 done
3379
3380@@ -1939,8 +2610,7 @@ func_mode_execute ()
3381 ;;
3382 esac
3383 # Quote arguments (to preserve shell metacharacters).
3384- func_quote_for_eval "$file"
3385- args="$args $func_quote_for_eval_result"
3386+ func_append_quoted args "$file"
3387 done
3388
3389 if test "X$opt_dry_run" = Xfalse; then
3390@@ -1972,22 +2642,59 @@ func_mode_execute ()
3391 fi
3392 }
3393
3394-test "$mode" = execute && func_mode_execute ${1+"$@"}
3395+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
3396
3397
3398 # func_mode_finish arg...
3399 func_mode_finish ()
3400 {
3401 $opt_debug
3402- libdirs="$nonopt"
3403+ libs=
3404+ libdirs=
3405 admincmds=
3406
3407- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3408- for dir
3409- do
3410- libdirs="$libdirs $dir"
3411- done
3412+ for opt in "$nonopt" ${1+"$@"}
3413+ do
3414+ if test -d "$opt"; then
3415+ func_append libdirs " $opt"
3416+
3417+ elif test -f "$opt"; then
3418+ if func_lalib_unsafe_p "$opt"; then
3419+ func_append libs " $opt"
3420+ else
3421+ func_warning "\`$opt' is not a valid libtool archive"
3422+ fi
3423+
3424+ else
3425+ func_fatal_error "invalid argument \`$opt'"
3426+ fi
3427+ done
3428+
3429+ if test -n "$libs"; then
3430+ if test -n "$lt_sysroot"; then
3431+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
3432+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
3433+ else
3434+ sysroot_cmd=
3435+ fi
3436+
3437+ # Remove sysroot references
3438+ if $opt_dry_run; then
3439+ for lib in $libs; do
3440+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
3441+ done
3442+ else
3443+ tmpdir=`func_mktempdir`
3444+ for lib in $libs; do
3445+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
3446+ > $tmpdir/tmp-la
3447+ mv -f $tmpdir/tmp-la $lib
3448+ done
3449+ ${RM}r "$tmpdir"
3450+ fi
3451+ fi
3452
3453+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3454 for libdir in $libdirs; do
3455 if test -n "$finish_cmds"; then
3456 # Do each command in the finish commands.
3457@@ -1997,7 +2704,7 @@ func_mode_finish ()
3458 if test -n "$finish_eval"; then
3459 # Do the single finish_eval.
3460 eval cmds=\"$finish_eval\"
3461- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
3462+ $opt_dry_run || eval "$cmds" || func_append admincmds "
3463 $cmds"
3464 fi
3465 done
3466@@ -2006,53 +2713,55 @@ func_mode_finish ()
3467 # Exit here if they wanted silent mode.
3468 $opt_silent && exit $EXIT_SUCCESS
3469
3470- echo "----------------------------------------------------------------------"
3471- echo "Libraries have been installed in:"
3472- for libdir in $libdirs; do
3473- $ECHO " $libdir"
3474- done
3475- echo
3476- echo "If you ever happen to want to link against installed libraries"
3477- echo "in a given directory, LIBDIR, you must either use libtool, and"
3478- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3479- echo "flag during linking and do at least one of the following:"
3480- if test -n "$shlibpath_var"; then
3481- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3482- echo " during execution"
3483- fi
3484- if test -n "$runpath_var"; then
3485- echo " - add LIBDIR to the \`$runpath_var' environment variable"
3486- echo " during linking"
3487- fi
3488- if test -n "$hardcode_libdir_flag_spec"; then
3489- libdir=LIBDIR
3490- eval "flag=\"$hardcode_libdir_flag_spec\""
3491+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3492+ echo "----------------------------------------------------------------------"
3493+ echo "Libraries have been installed in:"
3494+ for libdir in $libdirs; do
3495+ $ECHO " $libdir"
3496+ done
3497+ echo
3498+ echo "If you ever happen to want to link against installed libraries"
3499+ echo "in a given directory, LIBDIR, you must either use libtool, and"
3500+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3501+ echo "flag during linking and do at least one of the following:"
3502+ if test -n "$shlibpath_var"; then
3503+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3504+ echo " during execution"
3505+ fi
3506+ if test -n "$runpath_var"; then
3507+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
3508+ echo " during linking"
3509+ fi
3510+ if test -n "$hardcode_libdir_flag_spec"; then
3511+ libdir=LIBDIR
3512+ eval flag=\"$hardcode_libdir_flag_spec\"
3513
3514- $ECHO " - use the \`$flag' linker flag"
3515- fi
3516- if test -n "$admincmds"; then
3517- $ECHO " - have your system administrator run these commands:$admincmds"
3518- fi
3519- if test -f /etc/ld.so.conf; then
3520- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3521- fi
3522- echo
3523+ $ECHO " - use the \`$flag' linker flag"
3524+ fi
3525+ if test -n "$admincmds"; then
3526+ $ECHO " - have your system administrator run these commands:$admincmds"
3527+ fi
3528+ if test -f /etc/ld.so.conf; then
3529+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3530+ fi
3531+ echo
3532
3533- echo "See any operating system documentation about shared libraries for"
3534- case $host in
3535- solaris2.[6789]|solaris2.1[0-9])
3536- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3537- echo "pages."
3538- ;;
3539- *)
3540- echo "more information, such as the ld(1) and ld.so(8) manual pages."
3541- ;;
3542- esac
3543- echo "----------------------------------------------------------------------"
3544+ echo "See any operating system documentation about shared libraries for"
3545+ case $host in
3546+ solaris2.[6789]|solaris2.1[0-9])
3547+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3548+ echo "pages."
3549+ ;;
3550+ *)
3551+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
3552+ ;;
3553+ esac
3554+ echo "----------------------------------------------------------------------"
3555+ fi
3556 exit $EXIT_SUCCESS
3557 }
3558
3559-test "$mode" = finish && func_mode_finish ${1+"$@"}
3560+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
3561
3562
3563 # func_mode_install arg...
3564@@ -2077,7 +2786,7 @@ func_mode_install ()
3565 # The real first argument should be the name of the installation program.
3566 # Aesthetically quote it.
3567 func_quote_for_eval "$arg"
3568- install_prog="$install_prog$func_quote_for_eval_result"
3569+ func_append install_prog "$func_quote_for_eval_result"
3570 install_shared_prog=$install_prog
3571 case " $install_prog " in
3572 *[\\\ /]cp\ *) install_cp=: ;;
3573@@ -2097,7 +2806,7 @@ func_mode_install ()
3574 do
3575 arg2=
3576 if test -n "$dest"; then
3577- files="$files $dest"
3578+ func_append files " $dest"
3579 dest=$arg
3580 continue
3581 fi
3582@@ -2135,11 +2844,11 @@ func_mode_install ()
3583
3584 # Aesthetically quote the argument.
3585 func_quote_for_eval "$arg"
3586- install_prog="$install_prog $func_quote_for_eval_result"
3587+ func_append install_prog " $func_quote_for_eval_result"
3588 if test -n "$arg2"; then
3589 func_quote_for_eval "$arg2"
3590 fi
3591- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
3592+ func_append install_shared_prog " $func_quote_for_eval_result"
3593 done
3594
3595 test -z "$install_prog" && \
3596@@ -2151,7 +2860,7 @@ func_mode_install ()
3597 if test -n "$install_override_mode" && $no_mode; then
3598 if $install_cp; then :; else
3599 func_quote_for_eval "$install_override_mode"
3600- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
3601+ func_append install_shared_prog " -m $func_quote_for_eval_result"
3602 fi
3603 fi
3604
3605@@ -2209,10 +2918,13 @@ func_mode_install ()
3606 case $file in
3607 *.$libext)
3608 # Do the static libraries later.
3609- staticlibs="$staticlibs $file"
3610+ func_append staticlibs " $file"
3611 ;;
3612
3613 *.la)
3614+ func_resolve_sysroot "$file"
3615+ file=$func_resolve_sysroot_result
3616+
3617 # Check to see that this really is a libtool archive.
3618 func_lalib_unsafe_p "$file" \
3619 || func_fatal_help "\`$file' is not a valid libtool archive"
3620@@ -2226,23 +2938,30 @@ func_mode_install ()
3621 if test "X$destdir" = "X$libdir"; then
3622 case "$current_libdirs " in
3623 *" $libdir "*) ;;
3624- *) current_libdirs="$current_libdirs $libdir" ;;
3625+ *) func_append current_libdirs " $libdir" ;;
3626 esac
3627 else
3628 # Note the libdir as a future libdir.
3629 case "$future_libdirs " in
3630 *" $libdir "*) ;;
3631- *) future_libdirs="$future_libdirs $libdir" ;;
3632+ *) func_append future_libdirs " $libdir" ;;
3633 esac
3634 fi
3635
3636 func_dirname "$file" "/" ""
3637 dir="$func_dirname_result"
3638- dir="$dir$objdir"
3639+ func_append dir "$objdir"
3640
3641 if test -n "$relink_command"; then
3642+ # Strip any trailing slash from the destination.
3643+ func_stripname '' '/' "$libdir"
3644+ destlibdir=$func_stripname_result
3645+
3646+ func_stripname '' '/' "$destdir"
3647+ s_destdir=$func_stripname_result
3648+
3649 # Determine the prefix the user has applied to our future dir.
3650- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
3651+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
3652
3653 # Don't allow the user to place us outside of our expected
3654 # location b/c this prevents finding dependent libraries that
3655@@ -2315,7 +3034,7 @@ func_mode_install ()
3656 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3657
3658 # Maybe install the static library, too.
3659- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3660+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
3661 ;;
3662
3663 *.lo)
3664@@ -2503,7 +3222,7 @@ func_mode_install ()
3665 test -n "$future_libdirs" && \
3666 func_warning "remember to run \`$progname --finish$future_libdirs'"
3667
3668- if test -n "$current_libdirs" && $opt_finish; then
3669+ if test -n "$current_libdirs"; then
3670 # Maybe just do a dry run.
3671 $opt_dry_run && current_libdirs=" -n$current_libdirs"
3672 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
3673@@ -2512,7 +3231,7 @@ func_mode_install ()
3674 fi
3675 }
3676
3677-test "$mode" = install && func_mode_install ${1+"$@"}
3678+test "$opt_mode" = install && func_mode_install ${1+"$@"}
3679
3680
3681 # func_generate_dlsyms outputname originator pic_p
3682@@ -2559,6 +3278,18 @@ extern \"C\" {
3683 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3684 #endif
3685
3686+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3687+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3688+/* DATA imports from DLLs on WIN32 con't be const, because runtime
3689+ relocations are performed -- see ld's documentation on pseudo-relocs. */
3690+# define LT_DLSYM_CONST
3691+#elif defined(__osf__)
3692+/* This system does not cope well with relocations in const data. */
3693+# define LT_DLSYM_CONST
3694+#else
3695+# define LT_DLSYM_CONST const
3696+#endif
3697+
3698 /* External symbol declarations for the compiler. */\
3699 "
3700
3701@@ -2570,21 +3301,22 @@ extern \"C\" {
3702 # Add our own program objects to the symbol list.
3703 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3704 for progfile in $progfiles; do
3705- func_verbose "extracting global C symbols from \`$progfile'"
3706- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3707+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3708+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3709+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
3710 done
3711
3712 if test -n "$exclude_expsyms"; then
3713 $opt_dry_run || {
3714- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
3715- $MV "$nlist"T "$nlist"
3716+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
3717+ eval '$MV "$nlist"T "$nlist"'
3718 }
3719 fi
3720
3721 if test -n "$export_symbols_regex"; then
3722 $opt_dry_run || {
3723- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
3724- $MV "$nlist"T "$nlist"
3725+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
3726+ eval '$MV "$nlist"T "$nlist"'
3727 }
3728 fi
3729
3730@@ -2593,23 +3325,23 @@ extern \"C\" {
3731 export_symbols="$output_objdir/$outputname.exp"
3732 $opt_dry_run || {
3733 $RM $export_symbols
3734- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
3735+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
3736 case $host in
3737 *cygwin* | *mingw* | *cegcc* )
3738- echo EXPORTS > "$output_objdir/$outputname.def"
3739- cat "$export_symbols" >> "$output_objdir/$outputname.def"
3740+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3741+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
3742 ;;
3743 esac
3744 }
3745 else
3746 $opt_dry_run || {
3747- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
3748- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
3749- $MV "$nlist"T "$nlist"
3750+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
3751+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
3752+ eval '$MV "$nlist"T "$nlist"'
3753 case $host in
3754 *cygwin* | *mingw* | *cegcc* )
3755- echo EXPORTS > "$output_objdir/$outputname.def"
3756- cat "$nlist" >> "$output_objdir/$outputname.def"
3757+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3758+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
3759 ;;
3760 esac
3761 }
3762@@ -2620,10 +3352,52 @@ extern \"C\" {
3763 func_verbose "extracting global C symbols from \`$dlprefile'"
3764 func_basename "$dlprefile"
3765 name="$func_basename_result"
3766- $opt_dry_run || {
3767- $ECHO ": $name " >> "$nlist"
3768- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3769- }
3770+ case $host in
3771+ *cygwin* | *mingw* | *cegcc* )
3772+ # if an import library, we need to obtain dlname
3773+ if func_win32_import_lib_p "$dlprefile"; then
3774+ func_tr_sh "$dlprefile"
3775+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
3776+ dlprefile_dlbasename=""
3777+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3778+ # Use subshell, to avoid clobbering current variable values
3779+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3780+ if test -n "$dlprefile_dlname" ; then
3781+ func_basename "$dlprefile_dlname"
3782+ dlprefile_dlbasename="$func_basename_result"
3783+ else
3784+ # no lafile. user explicitly requested -dlpreopen <import library>.
3785+ $sharedlib_from_linklib_cmd "$dlprefile"
3786+ dlprefile_dlbasename=$sharedlib_from_linklib_result
3787+ fi
3788+ fi
3789+ $opt_dry_run || {
3790+ if test -n "$dlprefile_dlbasename" ; then
3791+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3792+ else
3793+ func_warning "Could not compute DLL name from $name"
3794+ eval '$ECHO ": $name " >> "$nlist"'
3795+ fi
3796+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3797+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3798+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3799+ }
3800+ else # not an import lib
3801+ $opt_dry_run || {
3802+ eval '$ECHO ": $name " >> "$nlist"'
3803+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3804+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3805+ }
3806+ fi
3807+ ;;
3808+ *)
3809+ $opt_dry_run || {
3810+ eval '$ECHO ": $name " >> "$nlist"'
3811+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3812+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3813+ }
3814+ ;;
3815+ esac
3816 done
3817
3818 $opt_dry_run || {
3819@@ -2661,26 +3435,9 @@ typedef struct {
3820 const char *name;
3821 void *address;
3822 } lt_dlsymlist;
3823-"
3824- case $host in
3825- *cygwin* | *mingw* | *cegcc* )
3826- echo >> "$output_objdir/$my_dlsyms" "\
3827-/* DATA imports from DLLs on WIN32 con't be const, because
3828- runtime relocations are performed -- see ld's documentation
3829- on pseudo-relocs. */"
3830- lt_dlsym_const= ;;
3831- *osf5*)
3832- echo >> "$output_objdir/$my_dlsyms" "\
3833-/* This system does not cope well with relocations in const data */"
3834- lt_dlsym_const= ;;
3835- *)
3836- lt_dlsym_const=const ;;
3837- esac
3838-
3839- echo >> "$output_objdir/$my_dlsyms" "\
3840-extern $lt_dlsym_const lt_dlsymlist
3841+extern LT_DLSYM_CONST lt_dlsymlist
3842 lt_${my_prefix}_LTX_preloaded_symbols[];
3843-$lt_dlsym_const lt_dlsymlist
3844+LT_DLSYM_CONST lt_dlsymlist
3845 lt_${my_prefix}_LTX_preloaded_symbols[] =
3846 {\
3847 { \"$my_originator\", (void *) 0 },"
3848@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
3849 for arg in $LTCFLAGS; do
3850 case $arg in
3851 -pie | -fpie | -fPIE) ;;
3852- *) symtab_cflags="$symtab_cflags $arg" ;;
3853+ *) func_append symtab_cflags " $arg" ;;
3854 esac
3855 done
3856
3857@@ -2796,9 +3553,11 @@ func_win32_libid ()
3858 win32_libid_type="x86 archive import"
3859 ;;
3860 *ar\ archive*) # could be an import, or static
3861- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
3862- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3863- win32_nmres=`$NM -f posix -A "$1" |
3864+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3865+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3866+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3867+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3868+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
3869 $SED -n -e '
3870 1,100{
3871 / I /{
3872@@ -2827,6 +3586,131 @@ func_win32_libid ()
3873 $ECHO "$win32_libid_type"
3874 }
3875
3876+# func_cygming_dll_for_implib ARG
3877+#
3878+# Platform-specific function to extract the
3879+# name of the DLL associated with the specified
3880+# import library ARG.
3881+# Invoked by eval'ing the libtool variable
3882+# $sharedlib_from_linklib_cmd
3883+# Result is available in the variable
3884+# $sharedlib_from_linklib_result
3885+func_cygming_dll_for_implib ()
3886+{
3887+ $opt_debug
3888+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3889+}
3890+
3891+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3892+#
3893+# The is the core of a fallback implementation of a
3894+# platform-specific function to extract the name of the
3895+# DLL associated with the specified import library LIBNAME.
3896+#
3897+# SECTION_NAME is either .idata$6 or .idata$7, depending
3898+# on the platform and compiler that created the implib.
3899+#
3900+# Echos the name of the DLL associated with the
3901+# specified import library.
3902+func_cygming_dll_for_implib_fallback_core ()
3903+{
3904+ $opt_debug
3905+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3906+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3907+ $SED '/^Contents of section '"$match_literal"':/{
3908+ # Place marker at beginning of archive member dllname section
3909+ s/.*/====MARK====/
3910+ p
3911+ d
3912+ }
3913+ # These lines can sometimes be longer than 43 characters, but
3914+ # are always uninteresting
3915+ /:[ ]*file format pe[i]\{,1\}-/d
3916+ /^In archive [^:]*:/d
3917+ # Ensure marker is printed
3918+ /^====MARK====/p
3919+ # Remove all lines with less than 43 characters
3920+ /^.\{43\}/!d
3921+ # From remaining lines, remove first 43 characters
3922+ s/^.\{43\}//' |
3923+ $SED -n '
3924+ # Join marker and all lines until next marker into a single line
3925+ /^====MARK====/ b para
3926+ H
3927+ $ b para
3928+ b
3929+ :para
3930+ x
3931+ s/\n//g
3932+ # Remove the marker
3933+ s/^====MARK====//
3934+ # Remove trailing dots and whitespace
3935+ s/[\. \t]*$//
3936+ # Print
3937+ /./p' |
3938+ # we now have a list, one entry per line, of the stringified
3939+ # contents of the appropriate section of all members of the
3940+ # archive which possess that section. Heuristic: eliminate
3941+ # all those which have a first or second character that is
3942+ # a '.' (that is, objdump's representation of an unprintable
3943+ # character.) This should work for all archives with less than
3944+ # 0x302f exports -- but will fail for DLLs whose name actually
3945+ # begins with a literal '.' or a single character followed by
3946+ # a '.'.
3947+ #
3948+ # Of those that remain, print the first one.
3949+ $SED -e '/^\./d;/^.\./d;q'
3950+}
3951+
3952+# func_cygming_gnu_implib_p ARG
3953+# This predicate returns with zero status (TRUE) if
3954+# ARG is a GNU/binutils-style import library. Returns
3955+# with nonzero status (FALSE) otherwise.
3956+func_cygming_gnu_implib_p ()
3957+{
3958+ $opt_debug
3959+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3960+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
3961+ test -n "$func_cygming_gnu_implib_tmp"
3962+}
3963+
3964+# func_cygming_ms_implib_p ARG
3965+# This predicate returns with zero status (TRUE) if
3966+# ARG is an MS-style import library. Returns
3967+# with nonzero status (FALSE) otherwise.
3968+func_cygming_ms_implib_p ()
3969+{
3970+ $opt_debug
3971+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3972+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3973+ test -n "$func_cygming_ms_implib_tmp"
3974+}
3975+
3976+# func_cygming_dll_for_implib_fallback ARG
3977+# Platform-specific function to extract the
3978+# name of the DLL associated with the specified
3979+# import library ARG.
3980+#
3981+# This fallback implementation is for use when $DLLTOOL
3982+# does not support the --identify-strict option.
3983+# Invoked by eval'ing the libtool variable
3984+# $sharedlib_from_linklib_cmd
3985+# Result is available in the variable
3986+# $sharedlib_from_linklib_result
3987+func_cygming_dll_for_implib_fallback ()
3988+{
3989+ $opt_debug
3990+ if func_cygming_gnu_implib_p "$1" ; then
3991+ # binutils import library
3992+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3993+ elif func_cygming_ms_implib_p "$1" ; then
3994+ # ms-generated import library
3995+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
3996+ else
3997+ # unknown
3998+ sharedlib_from_linklib_result=""
3999+ fi
4000+}
4001
4002
4003 # func_extract_an_archive dir oldlib
4004@@ -2917,7 +3801,7 @@ func_extract_archives ()
4005 darwin_file=
4006 darwin_files=
4007 for darwin_file in $darwin_filelist; do
4008- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
4009+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
4010 $LIPO -create -output "$darwin_file" $darwin_files
4011 done # $darwin_filelist
4012 $RM -rf unfat-$$
4013@@ -2932,7 +3816,7 @@ func_extract_archives ()
4014 func_extract_an_archive "$my_xdir" "$my_xabs"
4015 ;;
4016 esac
4017- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4018+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
4019 done
4020
4021 func_extract_archives_result="$my_oldobjs"
4022@@ -3014,7 +3898,110 @@ func_fallback_echo ()
4023 _LTECHO_EOF'
4024 }
4025 ECHO=\"$qECHO\"
4026- fi\
4027+ fi
4028+
4029+# Very basic option parsing. These options are (a) specific to
4030+# the libtool wrapper, (b) are identical between the wrapper
4031+# /script/ and the wrapper /executable/ which is used only on
4032+# windows platforms, and (c) all begin with the string "--lt-"
4033+# (application programs are unlikely to have options which match
4034+# this pattern).
4035+#
4036+# There are only two supported options: --lt-debug and
4037+# --lt-dump-script. There is, deliberately, no --lt-help.
4038+#
4039+# The first argument to this parsing function should be the
4040+# script's $0 value, followed by "$@".
4041+lt_option_debug=
4042+func_parse_lt_options ()
4043+{
4044+ lt_script_arg0=\$0
4045+ shift
4046+ for lt_opt
4047+ do
4048+ case \"\$lt_opt\" in
4049+ --lt-debug) lt_option_debug=1 ;;
4050+ --lt-dump-script)
4051+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
4052+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
4053+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
4054+ cat \"\$lt_dump_D/\$lt_dump_F\"
4055+ exit 0
4056+ ;;
4057+ --lt-*)
4058+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
4059+ exit 1
4060+ ;;
4061+ esac
4062+ done
4063+
4064+ # Print the debug banner immediately:
4065+ if test -n \"\$lt_option_debug\"; then
4066+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
4067+ fi
4068+}
4069+
4070+# Used when --lt-debug. Prints its arguments to stdout
4071+# (redirection is the responsibility of the caller)
4072+func_lt_dump_args ()
4073+{
4074+ lt_dump_args_N=1;
4075+ for lt_arg
4076+ do
4077+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
4078+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
4079+ done
4080+}
4081+
4082+# Core function for launching the target application
4083+func_exec_program_core ()
4084+{
4085+"
4086+ case $host in
4087+ # Backslashes separate directories on plain windows
4088+ *-*-mingw | *-*-os2* | *-cegcc*)
4089+ $ECHO "\
4090+ if test -n \"\$lt_option_debug\"; then
4091+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
4092+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4093+ fi
4094+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4095+"
4096+ ;;
4097+
4098+ *)
4099+ $ECHO "\
4100+ if test -n \"\$lt_option_debug\"; then
4101+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
4102+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4103+ fi
4104+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
4105+"
4106+ ;;
4107+ esac
4108+ $ECHO "\
4109+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4110+ exit 1
4111+}
4112+
4113+# A function to encapsulate launching the target application
4114+# Strips options in the --lt-* namespace from \$@ and
4115+# launches target application with the remaining arguments.
4116+func_exec_program ()
4117+{
4118+ for lt_wr_arg
4119+ do
4120+ case \$lt_wr_arg in
4121+ --lt-*) ;;
4122+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
4123+ esac
4124+ shift
4125+ done
4126+ func_exec_program_core \${1+\"\$@\"}
4127+}
4128+
4129+ # Parse options
4130+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
4131
4132 # Find the directory that this script lives in.
4133 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
4134@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
4135
4136 # relink executable if necessary
4137 if test -n \"\$relink_command\"; then
4138- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
4139+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
4140 else
4141 $ECHO \"\$relink_command_output\" >&2
4142 $RM \"\$progdir/\$file\"
4143@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
4144
4145 if test -f \"\$progdir/\$program\"; then"
4146
4147+ # fixup the dll searchpath if we need to.
4148+ #
4149+ # Fix the DLL searchpath if we need to. Do this before prepending
4150+ # to shlibpath, because on Windows, both are PATH and uninstalled
4151+ # libraries must come first.
4152+ if test -n "$dllsearchpath"; then
4153+ $ECHO "\
4154+ # Add the dll search path components to the executable PATH
4155+ PATH=$dllsearchpath:\$PATH
4156+"
4157+ fi
4158+
4159 # Export our shlibpath_var if we have one.
4160 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4161 $ECHO "\
4162@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
4163 "
4164 fi
4165
4166- # fixup the dll searchpath if we need to.
4167- if test -n "$dllsearchpath"; then
4168- $ECHO "\
4169- # Add the dll search path components to the executable PATH
4170- PATH=$dllsearchpath:\$PATH
4171-"
4172- fi
4173-
4174 $ECHO "\
4175 if test \"\$libtool_execute_magic\" != \"$magic\"; then
4176 # Run the actual program with our arguments.
4177-"
4178- case $host in
4179- # Backslashes separate directories on plain windows
4180- *-*-mingw | *-*-os2* | *-cegcc*)
4181- $ECHO "\
4182- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4183-"
4184- ;;
4185-
4186- *)
4187- $ECHO "\
4188- exec \"\$progdir/\$program\" \${1+\"\$@\"}
4189-"
4190- ;;
4191- esac
4192- $ECHO "\
4193- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4194- exit 1
4195+ func_exec_program \${1+\"\$@\"}
4196 fi
4197 else
4198 # The program doesn't exist.
4199@@ -3158,166 +4132,6 @@ fi\
4200 }
4201
4202
4203-# func_to_host_path arg
4204-#
4205-# Convert paths to host format when used with build tools.
4206-# Intended for use with "native" mingw (where libtool itself
4207-# is running under the msys shell), or in the following cross-
4208-# build environments:
4209-# $build $host
4210-# mingw (msys) mingw [e.g. native]
4211-# cygwin mingw
4212-# *nix + wine mingw
4213-# where wine is equipped with the `winepath' executable.
4214-# In the native mingw case, the (msys) shell automatically
4215-# converts paths for any non-msys applications it launches,
4216-# but that facility isn't available from inside the cwrapper.
4217-# Similar accommodations are necessary for $host mingw and
4218-# $build cygwin. Calling this function does no harm for other
4219-# $host/$build combinations not listed above.
4220-#
4221-# ARG is the path (on $build) that should be converted to
4222-# the proper representation for $host. The result is stored
4223-# in $func_to_host_path_result.
4224-func_to_host_path ()
4225-{
4226- func_to_host_path_result="$1"
4227- if test -n "$1"; then
4228- case $host in
4229- *mingw* )
4230- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4231- case $build in
4232- *mingw* ) # actually, msys
4233- # awkward: cmd appends spaces to result
4234- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
4235- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4236- ;;
4237- *cygwin* )
4238- func_to_host_path_result=`cygpath -w "$1" |
4239- $SED -e "$lt_sed_naive_backslashify"`
4240- ;;
4241- * )
4242- # Unfortunately, winepath does not exit with a non-zero
4243- # error code, so we are forced to check the contents of
4244- # stdout. On the other hand, if the command is not
4245- # found, the shell will set an exit code of 127 and print
4246- # *an error message* to stdout. So we must check for both
4247- # error code of zero AND non-empty stdout, which explains
4248- # the odd construction:
4249- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
4250- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
4251- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
4252- $SED -e "$lt_sed_naive_backslashify"`
4253- else
4254- # Allow warning below.
4255- func_to_host_path_result=
4256- fi
4257- ;;
4258- esac
4259- if test -z "$func_to_host_path_result" ; then
4260- func_error "Could not determine host path corresponding to"
4261- func_error " \`$1'"
4262- func_error "Continuing, but uninstalled executables may not work."
4263- # Fallback:
4264- func_to_host_path_result="$1"
4265- fi
4266- ;;
4267- esac
4268- fi
4269-}
4270-# end: func_to_host_path
4271-
4272-# func_to_host_pathlist arg
4273-#
4274-# Convert pathlists to host format when used with build tools.
4275-# See func_to_host_path(), above. This function supports the
4276-# following $build/$host combinations (but does no harm for
4277-# combinations not listed here):
4278-# $build $host
4279-# mingw (msys) mingw [e.g. native]
4280-# cygwin mingw
4281-# *nix + wine mingw
4282-#
4283-# Path separators are also converted from $build format to
4284-# $host format. If ARG begins or ends with a path separator
4285-# character, it is preserved (but converted to $host format)
4286-# on output.
4287-#
4288-# ARG is a pathlist (on $build) that should be converted to
4289-# the proper representation on $host. The result is stored
4290-# in $func_to_host_pathlist_result.
4291-func_to_host_pathlist ()
4292-{
4293- func_to_host_pathlist_result="$1"
4294- if test -n "$1"; then
4295- case $host in
4296- *mingw* )
4297- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4298- # Remove leading and trailing path separator characters from
4299- # ARG. msys behavior is inconsistent here, cygpath turns them
4300- # into '.;' and ';.', and winepath ignores them completely.
4301- func_stripname : : "$1"
4302- func_to_host_pathlist_tmp1=$func_stripname_result
4303- case $build in
4304- *mingw* ) # Actually, msys.
4305- # Awkward: cmd appends spaces to result.
4306- func_to_host_pathlist_result=`
4307- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
4308- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4309- ;;
4310- *cygwin* )
4311- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
4312- $SED -e "$lt_sed_naive_backslashify"`
4313- ;;
4314- * )
4315- # unfortunately, winepath doesn't convert pathlists
4316- func_to_host_pathlist_result=""
4317- func_to_host_pathlist_oldIFS=$IFS
4318- IFS=:
4319- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
4320- IFS=$func_to_host_pathlist_oldIFS
4321- if test -n "$func_to_host_pathlist_f" ; then
4322- func_to_host_path "$func_to_host_pathlist_f"
4323- if test -n "$func_to_host_path_result" ; then
4324- if test -z "$func_to_host_pathlist_result" ; then
4325- func_to_host_pathlist_result="$func_to_host_path_result"
4326- else
4327- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
4328- fi
4329- fi
4330- fi
4331- done
4332- IFS=$func_to_host_pathlist_oldIFS
4333- ;;
4334- esac
4335- if test -z "$func_to_host_pathlist_result"; then
4336- func_error "Could not determine the host path(s) corresponding to"
4337- func_error " \`$1'"
4338- func_error "Continuing, but uninstalled executables may not work."
4339- # Fallback. This may break if $1 contains DOS-style drive
4340- # specifications. The fix is not to complicate the expression
4341- # below, but for the user to provide a working wine installation
4342- # with winepath so that path translation in the cross-to-mingw
4343- # case works properly.
4344- lt_replace_pathsep_nix_to_dos="s|:|;|g"
4345- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
4346- $SED -e "$lt_replace_pathsep_nix_to_dos"`
4347- fi
4348- # Now, add the leading and trailing path separators back
4349- case "$1" in
4350- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
4351- ;;
4352- esac
4353- case "$1" in
4354- *: ) func_append func_to_host_pathlist_result ";"
4355- ;;
4356- esac
4357- ;;
4358- esac
4359- fi
4360-}
4361-# end: func_to_host_pathlist
4362-
4363 # func_emit_cwrapperexe_src
4364 # emit the source code for a wrapper executable on stdout
4365 # Must ONLY be called from within func_mode_link because
4366@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
4367
4368 This wrapper executable should never be moved out of the build directory.
4369 If it is, it will not operate correctly.
4370-
4371- Currently, it simply execs the wrapper *script* "$SHELL $output",
4372- but could eventually absorb all of the scripts functionality and
4373- exec $objdir/$outputname directly.
4374 */
4375 EOF
4376 cat <<"EOF"
4377@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
4378 if (stale) { free ((void *) stale); stale = 0; } \
4379 } while (0)
4380
4381-#undef LTWRAPPER_DEBUGPRINTF
4382-#if defined LT_DEBUGWRAPPER
4383-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
4384-static void
4385-ltwrapper_debugprintf (const char *fmt, ...)
4386-{
4387- va_list args;
4388- va_start (args, fmt);
4389- (void) vfprintf (stderr, fmt, args);
4390- va_end (args);
4391-}
4392+#if defined(LT_DEBUGWRAPPER)
4393+static int lt_debug = 1;
4394 #else
4395-# define LTWRAPPER_DEBUGPRINTF(args)
4396+static int lt_debug = 0;
4397 #endif
4398
4399-const char *program_name = NULL;
4400+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
4401
4402 void *xmalloc (size_t num);
4403 char *xstrdup (const char *string);
4404@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
4405 int make_executable (const char *path);
4406 int check_executable (const char *path);
4407 char *strendzap (char *str, const char *pat);
4408-void lt_fatal (const char *message, ...);
4409+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
4410+void lt_fatal (const char *file, int line, const char *message, ...);
4411+static const char *nonnull (const char *s);
4412+static const char *nonempty (const char *s);
4413 void lt_setenv (const char *name, const char *value);
4414 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
4415 void lt_update_exe_path (const char *name, const char *value);
4416@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
4417 EOF
4418
4419 cat <<EOF
4420-const char * MAGIC_EXE = "$magic_exe";
4421+volatile const char * MAGIC_EXE = "$magic_exe";
4422 const char * LIB_PATH_VARNAME = "$shlibpath_var";
4423 EOF
4424
4425 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4426- func_to_host_pathlist "$temp_rpath"
4427+ func_to_host_path "$temp_rpath"
4428 cat <<EOF
4429-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4430+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
4431 EOF
4432 else
4433 cat <<"EOF"
4434@@ -3513,10 +4317,10 @@ EOF
4435 fi
4436
4437 if test -n "$dllsearchpath"; then
4438- func_to_host_pathlist "$dllsearchpath:"
4439+ func_to_host_path "$dllsearchpath:"
4440 cat <<EOF
4441 const char * EXE_PATH_VARNAME = "PATH";
4442-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4443+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
4444 EOF
4445 else
4446 cat <<"EOF"
4447@@ -3539,12 +4343,10 @@ EOF
4448 cat <<"EOF"
4449
4450 #define LTWRAPPER_OPTION_PREFIX "--lt-"
4451-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
4452
4453-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
4454 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
4455-
4456 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
4457+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
4458
4459 int
4460 main (int argc, char *argv[])
4461@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
4462 int i;
4463
4464 program_name = (char *) xstrdup (base_name (argv[0]));
4465- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
4466- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
4467+ newargz = XMALLOC (char *, argc + 1);
4468
4469- /* very simple arg parsing; don't want to rely on getopt */
4470+ /* very simple arg parsing; don't want to rely on getopt
4471+ * also, copy all non cwrapper options to newargz, except
4472+ * argz[0], which is handled differently
4473+ */
4474+ newargc=0;
4475 for (i = 1; i < argc; i++)
4476 {
4477 if (strcmp (argv[i], dumpscript_opt) == 0)
4478@@ -3581,21 +4386,54 @@ EOF
4479 lt_dump_script (stdout);
4480 return 0;
4481 }
4482+ if (strcmp (argv[i], debug_opt) == 0)
4483+ {
4484+ lt_debug = 1;
4485+ continue;
4486+ }
4487+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
4488+ {
4489+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4490+ namespace, but it is not one of the ones we know about and
4491+ have already dealt with, above (inluding dump-script), then
4492+ report an error. Otherwise, targets might begin to believe
4493+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4494+ namespace. The first time any user complains about this, we'll
4495+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4496+ or a configure.ac-settable value.
4497+ */
4498+ lt_fatal (__FILE__, __LINE__,
4499+ "unrecognized %s option: '%s'",
4500+ ltwrapper_option_prefix, argv[i]);
4501+ }
4502+ /* otherwise ... */
4503+ newargz[++newargc] = xstrdup (argv[i]);
4504 }
4505+ newargz[++newargc] = NULL;
4506+
4507+EOF
4508+ cat <<EOF
4509+ /* The GNU banner must be the first non-error debug message */
4510+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
4511+EOF
4512+ cat <<"EOF"
4513+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
4514+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
4515
4516- newargz = XMALLOC (char *, argc + 1);
4517 tmp_pathspec = find_executable (argv[0]);
4518 if (tmp_pathspec == NULL)
4519- lt_fatal ("Couldn't find %s", argv[0]);
4520- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
4521- tmp_pathspec));
4522+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
4523+ lt_debugprintf (__FILE__, __LINE__,
4524+ "(main) found exe (before symlink chase) at: %s\n",
4525+ tmp_pathspec);
4526
4527 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
4528- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
4529- actual_cwrapper_path));
4530+ lt_debugprintf (__FILE__, __LINE__,
4531+ "(main) found exe (after symlink chase) at: %s\n",
4532+ actual_cwrapper_path);
4533 XFREE (tmp_pathspec);
4534
4535- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
4536+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
4537 strendzap (actual_cwrapper_path, actual_cwrapper_name);
4538
4539 /* wrapper name transforms */
4540@@ -3613,8 +4451,9 @@ EOF
4541 target_name = tmp_pathspec;
4542 tmp_pathspec = 0;
4543
4544- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
4545- target_name));
4546+ lt_debugprintf (__FILE__, __LINE__,
4547+ "(main) libtool target name: %s\n",
4548+ target_name);
4549 EOF
4550
4551 cat <<EOF
4552@@ -3664,35 +4503,19 @@ EOF
4553
4554 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4555 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4556- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4557+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4558+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4559+ because on Windows, both *_VARNAMEs are PATH but uninstalled
4560+ libraries must come first. */
4561 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4562+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4563
4564- newargc=0;
4565- for (i = 1; i < argc; i++)
4566- {
4567- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
4568- {
4569- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4570- namespace, but it is not one of the ones we know about and
4571- have already dealt with, above (inluding dump-script), then
4572- report an error. Otherwise, targets might begin to believe
4573- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4574- namespace. The first time any user complains about this, we'll
4575- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4576- or a configure.ac-settable value.
4577- */
4578- lt_fatal ("Unrecognized option in %s namespace: '%s'",
4579- ltwrapper_option_prefix, argv[i]);
4580- }
4581- /* otherwise ... */
4582- newargz[++newargc] = xstrdup (argv[i]);
4583- }
4584- newargz[++newargc] = NULL;
4585-
4586- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
4587+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4588+ nonnull (lt_argv_zero));
4589 for (i = 0; i < newargc; i++)
4590 {
4591- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
4592+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
4593+ i, nonnull (newargz[i]));
4594 }
4595
4596 EOF
4597@@ -3706,7 +4529,9 @@ EOF
4598 if (rval == -1)
4599 {
4600 /* failed to start process */
4601- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
4602+ lt_debugprintf (__FILE__, __LINE__,
4603+ "(main) failed to launch target \"%s\": %s\n",
4604+ lt_argv_zero, nonnull (strerror (errno)));
4605 return 127;
4606 }
4607 return rval;
4608@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
4609 {
4610 void *p = (void *) malloc (num);
4611 if (!p)
4612- lt_fatal ("Memory exhausted");
4613+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
4614
4615 return p;
4616 }
4617@@ -3762,8 +4587,8 @@ check_executable (const char *path)
4618 {
4619 struct stat st;
4620
4621- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
4622- path ? (*path ? path : "EMPTY!") : "NULL!"));
4623+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
4624+ nonempty (path));
4625 if ((!path) || (!*path))
4626 return 0;
4627
4628@@ -3780,8 +4605,8 @@ make_executable (const char *path)
4629 int rval = 0;
4630 struct stat st;
4631
4632- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
4633- path ? (*path ? path : "EMPTY!") : "NULL!"));
4634+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
4635+ nonempty (path));
4636 if ((!path) || (!*path))
4637 return 0;
4638
4639@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
4640 int tmp_len;
4641 char *concat_name;
4642
4643- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
4644- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
4645+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
4646+ nonempty (wrapper));
4647
4648 if ((wrapper == NULL) || (*wrapper == '\0'))
4649 return NULL;
4650@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
4651 {
4652 /* empty path: current directory */
4653 if (getcwd (tmp, LT_PATHMAX) == NULL)
4654- lt_fatal ("getcwd failed");
4655+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4656+ nonnull (strerror (errno)));
4657 tmp_len = strlen (tmp);
4658 concat_name =
4659 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4660@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
4661 }
4662 /* Relative path | not found in path: prepend cwd */
4663 if (getcwd (tmp, LT_PATHMAX) == NULL)
4664- lt_fatal ("getcwd failed");
4665+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4666+ nonnull (strerror (errno)));
4667 tmp_len = strlen (tmp);
4668 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4669 memcpy (concat_name, tmp, tmp_len);
4670@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
4671 int has_symlinks = 0;
4672 while (strlen (tmp_pathspec) && !has_symlinks)
4673 {
4674- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
4675- tmp_pathspec));
4676+ lt_debugprintf (__FILE__, __LINE__,
4677+ "checking path component for symlinks: %s\n",
4678+ tmp_pathspec);
4679 if (lstat (tmp_pathspec, &s) == 0)
4680 {
4681 if (S_ISLNK (s.st_mode) != 0)
4682@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
4683 }
4684 else
4685 {
4686- char *errstr = strerror (errno);
4687- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
4688+ lt_fatal (__FILE__, __LINE__,
4689+ "error accessing file \"%s\": %s",
4690+ tmp_pathspec, nonnull (strerror (errno)));
4691 }
4692 }
4693 XFREE (tmp_pathspec);
4694@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
4695 tmp_pathspec = realpath (pathspec, buf);
4696 if (tmp_pathspec == 0)
4697 {
4698- lt_fatal ("Could not follow symlinks for %s", pathspec);
4699+ lt_fatal (__FILE__, __LINE__,
4700+ "could not follow symlinks for %s", pathspec);
4701 }
4702 return xstrdup (tmp_pathspec);
4703 #endif
4704@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
4705 return str;
4706 }
4707
4708+void
4709+lt_debugprintf (const char *file, int line, const char *fmt, ...)
4710+{
4711+ va_list args;
4712+ if (lt_debug)
4713+ {
4714+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
4715+ va_start (args, fmt);
4716+ (void) vfprintf (stderr, fmt, args);
4717+ va_end (args);
4718+ }
4719+}
4720+
4721 static void
4722-lt_error_core (int exit_status, const char *mode,
4723+lt_error_core (int exit_status, const char *file,
4724+ int line, const char *mode,
4725 const char *message, va_list ap)
4726 {
4727- fprintf (stderr, "%s: %s: ", program_name, mode);
4728+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
4729 vfprintf (stderr, message, ap);
4730 fprintf (stderr, ".\n");
4731
4732@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
4733 }
4734
4735 void
4736-lt_fatal (const char *message, ...)
4737+lt_fatal (const char *file, int line, const char *message, ...)
4738 {
4739 va_list ap;
4740 va_start (ap, message);
4741- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
4742+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
4743 va_end (ap);
4744 }
4745
4746+static const char *
4747+nonnull (const char *s)
4748+{
4749+ return s ? s : "(null)";
4750+}
4751+
4752+static const char *
4753+nonempty (const char *s)
4754+{
4755+ return (s && !*s) ? "(empty)" : nonnull (s);
4756+}
4757+
4758 void
4759 lt_setenv (const char *name, const char *value)
4760 {
4761- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
4762- (name ? name : "<NULL>"),
4763- (value ? value : "<NULL>")));
4764+ lt_debugprintf (__FILE__, __LINE__,
4765+ "(lt_setenv) setting '%s' to '%s'\n",
4766+ nonnull (name), nonnull (value));
4767 {
4768 #ifdef HAVE_SETENV
4769 /* always make a copy, for consistency with !HAVE_SETENV */
4770@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
4771 void
4772 lt_update_exe_path (const char *name, const char *value)
4773 {
4774- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4775- (name ? name : "<NULL>"),
4776- (value ? value : "<NULL>")));
4777+ lt_debugprintf (__FILE__, __LINE__,
4778+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4779+ nonnull (name), nonnull (value));
4780
4781 if (name && *name && value && *value)
4782 {
4783@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
4784 void
4785 lt_update_lib_path (const char *name, const char *value)
4786 {
4787- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4788- (name ? name : "<NULL>"),
4789- (value ? value : "<NULL>")));
4790+ lt_debugprintf (__FILE__, __LINE__,
4791+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4792+ nonnull (name), nonnull (value));
4793
4794 if (name && *name && value && *value)
4795 {
4796@@ -4222,7 +5078,7 @@ EOF
4797 func_win32_import_lib_p ()
4798 {
4799 $opt_debug
4800- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
4801+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4802 *import*) : ;;
4803 *) false ;;
4804 esac
4805@@ -4401,9 +5257,9 @@ func_mode_link ()
4806 ;;
4807 *)
4808 if test "$prev" = dlfiles; then
4809- dlfiles="$dlfiles $arg"
4810+ func_append dlfiles " $arg"
4811 else
4812- dlprefiles="$dlprefiles $arg"
4813+ func_append dlprefiles " $arg"
4814 fi
4815 prev=
4816 continue
4817@@ -4427,7 +5283,7 @@ func_mode_link ()
4818 *-*-darwin*)
4819 case "$deplibs " in
4820 *" $qarg.ltframework "*) ;;
4821- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
4822+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
4823 ;;
4824 esac
4825 ;;
4826@@ -4446,7 +5302,7 @@ func_mode_link ()
4827 moreargs=
4828 for fil in `cat "$save_arg"`
4829 do
4830-# moreargs="$moreargs $fil"
4831+# func_append moreargs " $fil"
4832 arg=$fil
4833 # A libtool-controlled object.
4834
4835@@ -4475,7 +5331,7 @@ func_mode_link ()
4836
4837 if test "$prev" = dlfiles; then
4838 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
4839- dlfiles="$dlfiles $pic_object"
4840+ func_append dlfiles " $pic_object"
4841 prev=
4842 continue
4843 else
4844@@ -4487,7 +5343,7 @@ func_mode_link ()
4845 # CHECK ME: I think I busted this. -Ossama
4846 if test "$prev" = dlprefiles; then
4847 # Preload the old-style object.
4848- dlprefiles="$dlprefiles $pic_object"
4849+ func_append dlprefiles " $pic_object"
4850 prev=
4851 fi
4852
4853@@ -4557,12 +5413,12 @@ func_mode_link ()
4854 if test "$prev" = rpath; then
4855 case "$rpath " in
4856 *" $arg "*) ;;
4857- *) rpath="$rpath $arg" ;;
4858+ *) func_append rpath " $arg" ;;
4859 esac
4860 else
4861 case "$xrpath " in
4862 *" $arg "*) ;;
4863- *) xrpath="$xrpath $arg" ;;
4864+ *) func_append xrpath " $arg" ;;
4865 esac
4866 fi
4867 prev=
4868@@ -4574,28 +5430,28 @@ func_mode_link ()
4869 continue
4870 ;;
4871 weak)
4872- weak_libs="$weak_libs $arg"
4873+ func_append weak_libs " $arg"
4874 prev=
4875 continue
4876 ;;
4877 xcclinker)
4878- linker_flags="$linker_flags $qarg"
4879- compiler_flags="$compiler_flags $qarg"
4880+ func_append linker_flags " $qarg"
4881+ func_append compiler_flags " $qarg"
4882 prev=
4883 func_append compile_command " $qarg"
4884 func_append finalize_command " $qarg"
4885 continue
4886 ;;
4887 xcompiler)
4888- compiler_flags="$compiler_flags $qarg"
4889+ func_append compiler_flags " $qarg"
4890 prev=
4891 func_append compile_command " $qarg"
4892 func_append finalize_command " $qarg"
4893 continue
4894 ;;
4895 xlinker)
4896- linker_flags="$linker_flags $qarg"
4897- compiler_flags="$compiler_flags $wl$qarg"
4898+ func_append linker_flags " $qarg"
4899+ func_append compiler_flags " $wl$qarg"
4900 prev=
4901 func_append compile_command " $wl$qarg"
4902 func_append finalize_command " $wl$qarg"
4903@@ -4686,15 +5542,16 @@ func_mode_link ()
4904 ;;
4905
4906 -L*)
4907- func_stripname '-L' '' "$arg"
4908- dir=$func_stripname_result
4909- if test -z "$dir"; then
4910+ func_stripname "-L" '' "$arg"
4911+ if test -z "$func_stripname_result"; then
4912 if test "$#" -gt 0; then
4913 func_fatal_error "require no space between \`-L' and \`$1'"
4914 else
4915 func_fatal_error "need path for \`-L' option"
4916 fi
4917 fi
4918+ func_resolve_sysroot "$func_stripname_result"
4919+ dir=$func_resolve_sysroot_result
4920 # We need an absolute path.
4921 case $dir in
4922 [\\/]* | [A-Za-z]:[\\/]*) ;;
4923@@ -4706,10 +5563,16 @@ func_mode_link ()
4924 ;;
4925 esac
4926 case "$deplibs " in
4927- *" -L$dir "*) ;;
4928+ *" -L$dir "* | *" $arg "*)
4929+ # Will only happen for absolute or sysroot arguments
4930+ ;;
4931 *)
4932- deplibs="$deplibs -L$dir"
4933- lib_search_path="$lib_search_path $dir"
4934+ # Preserve sysroot, but never include relative directories
4935+ case $dir in
4936+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
4937+ *) func_append deplibs " -L$dir" ;;
4938+ esac
4939+ func_append lib_search_path " $dir"
4940 ;;
4941 esac
4942 case $host in
4943@@ -4718,12 +5581,12 @@ func_mode_link ()
4944 case :$dllsearchpath: in
4945 *":$dir:"*) ;;
4946 ::) dllsearchpath=$dir;;
4947- *) dllsearchpath="$dllsearchpath:$dir";;
4948+ *) func_append dllsearchpath ":$dir";;
4949 esac
4950 case :$dllsearchpath: in
4951 *":$testbindir:"*) ;;
4952 ::) dllsearchpath=$testbindir;;
4953- *) dllsearchpath="$dllsearchpath:$testbindir";;
4954+ *) func_append dllsearchpath ":$testbindir";;
4955 esac
4956 ;;
4957 esac
4958@@ -4747,7 +5610,7 @@ func_mode_link ()
4959 ;;
4960 *-*-rhapsody* | *-*-darwin1.[012])
4961 # Rhapsody C and math libraries are in the System framework
4962- deplibs="$deplibs System.ltframework"
4963+ func_append deplibs " System.ltframework"
4964 continue
4965 ;;
4966 *-*-sco3.2v5* | *-*-sco5v6*)
4967@@ -4758,9 +5621,6 @@ func_mode_link ()
4968 # Compiler inserts libc in the correct place for threads to work
4969 test "X$arg" = "X-lc" && continue
4970 ;;
4971- *-*-linux*)
4972- test "X$arg" = "X-lc" && continue
4973- ;;
4974 esac
4975 elif test "X$arg" = "X-lc_r"; then
4976 case $host in
4977@@ -4770,7 +5630,7 @@ func_mode_link ()
4978 ;;
4979 esac
4980 fi
4981- deplibs="$deplibs $arg"
4982+ func_append deplibs " $arg"
4983 continue
4984 ;;
4985
4986@@ -4782,8 +5642,8 @@ func_mode_link ()
4987 # Tru64 UNIX uses -model [arg] to determine the layout of C++
4988 # classes, name mangling, and exception handling.
4989 # Darwin uses the -arch flag to determine output architecture.
4990- -model|-arch|-isysroot)
4991- compiler_flags="$compiler_flags $arg"
4992+ -model|-arch|-isysroot|--sysroot)
4993+ func_append compiler_flags " $arg"
4994 func_append compile_command " $arg"
4995 func_append finalize_command " $arg"
4996 prev=xcompiler
4997@@ -4791,12 +5651,12 @@ func_mode_link ()
4998 ;;
4999
5000 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5001- compiler_flags="$compiler_flags $arg"
5002+ func_append compiler_flags " $arg"
5003 func_append compile_command " $arg"
5004 func_append finalize_command " $arg"
5005 case "$new_inherited_linker_flags " in
5006 *" $arg "*) ;;
5007- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5008+ * ) func_append new_inherited_linker_flags " $arg" ;;
5009 esac
5010 continue
5011 ;;
5012@@ -4863,13 +5723,17 @@ func_mode_link ()
5013 # We need an absolute path.
5014 case $dir in
5015 [\\/]* | [A-Za-z]:[\\/]*) ;;
5016+ =*)
5017+ func_stripname '=' '' "$dir"
5018+ dir=$lt_sysroot$func_stripname_result
5019+ ;;
5020 *)
5021 func_fatal_error "only absolute run-paths are allowed"
5022 ;;
5023 esac
5024 case "$xrpath " in
5025 *" $dir "*) ;;
5026- *) xrpath="$xrpath $dir" ;;
5027+ *) func_append xrpath " $dir" ;;
5028 esac
5029 continue
5030 ;;
5031@@ -4922,8 +5786,8 @@ func_mode_link ()
5032 for flag in $args; do
5033 IFS="$save_ifs"
5034 func_quote_for_eval "$flag"
5035- arg="$arg $func_quote_for_eval_result"
5036- compiler_flags="$compiler_flags $func_quote_for_eval_result"
5037+ func_append arg " $func_quote_for_eval_result"
5038+ func_append compiler_flags " $func_quote_for_eval_result"
5039 done
5040 IFS="$save_ifs"
5041 func_stripname ' ' '' "$arg"
5042@@ -4938,9 +5802,9 @@ func_mode_link ()
5043 for flag in $args; do
5044 IFS="$save_ifs"
5045 func_quote_for_eval "$flag"
5046- arg="$arg $wl$func_quote_for_eval_result"
5047- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5048- linker_flags="$linker_flags $func_quote_for_eval_result"
5049+ func_append arg " $wl$func_quote_for_eval_result"
5050+ func_append compiler_flags " $wl$func_quote_for_eval_result"
5051+ func_append linker_flags " $func_quote_for_eval_result"
5052 done
5053 IFS="$save_ifs"
5054 func_stripname ' ' '' "$arg"
5055@@ -4968,24 +5832,27 @@ func_mode_link ()
5056 arg="$func_quote_for_eval_result"
5057 ;;
5058
5059- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
5060- # -r[0-9][0-9]* specifies the processor on the SGI compiler
5061- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
5062- # +DA*, +DD* enable 64-bit mode on the HP compiler
5063- # -q* pass through compiler args for the IBM compiler
5064- # -m*, -t[45]*, -txscale* pass through architecture-specific
5065- # compiler args for GCC
5066- # -F/path gives path to uninstalled frameworks, gcc on darwin
5067- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
5068- # @file GCC response files
5069- # -tp=* Portland pgcc target processor selection
5070+ # Flags to be passed through unchanged, with rationale:
5071+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
5072+ # -r[0-9][0-9]* specify processor for the SGI compiler
5073+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
5074+ # +DA*, +DD* enable 64-bit mode for the HP compiler
5075+ # -q* compiler args for the IBM compiler
5076+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
5077+ # -F/path path to uninstalled frameworks, gcc on darwin
5078+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5079+ # @file GCC response files
5080+ # -tp=* Portland pgcc target processor selection
5081+ # --sysroot=* for sysroot support
5082+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5083 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5084- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5085+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5086+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5087 func_quote_for_eval "$arg"
5088 arg="$func_quote_for_eval_result"
5089 func_append compile_command " $arg"
5090 func_append finalize_command " $arg"
5091- compiler_flags="$compiler_flags $arg"
5092+ func_append compiler_flags " $arg"
5093 continue
5094 ;;
5095
5096@@ -4997,7 +5864,7 @@ func_mode_link ()
5097
5098 *.$objext)
5099 # A standard object.
5100- objs="$objs $arg"
5101+ func_append objs " $arg"
5102 ;;
5103
5104 *.lo)
5105@@ -5028,7 +5895,7 @@ func_mode_link ()
5106
5107 if test "$prev" = dlfiles; then
5108 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5109- dlfiles="$dlfiles $pic_object"
5110+ func_append dlfiles " $pic_object"
5111 prev=
5112 continue
5113 else
5114@@ -5040,7 +5907,7 @@ func_mode_link ()
5115 # CHECK ME: I think I busted this. -Ossama
5116 if test "$prev" = dlprefiles; then
5117 # Preload the old-style object.
5118- dlprefiles="$dlprefiles $pic_object"
5119+ func_append dlprefiles " $pic_object"
5120 prev=
5121 fi
5122
5123@@ -5085,24 +5952,25 @@ func_mode_link ()
5124
5125 *.$libext)
5126 # An archive.
5127- deplibs="$deplibs $arg"
5128- old_deplibs="$old_deplibs $arg"
5129+ func_append deplibs " $arg"
5130+ func_append old_deplibs " $arg"
5131 continue
5132 ;;
5133
5134 *.la)
5135 # A libtool-controlled library.
5136
5137+ func_resolve_sysroot "$arg"
5138 if test "$prev" = dlfiles; then
5139 # This library was specified with -dlopen.
5140- dlfiles="$dlfiles $arg"
5141+ func_append dlfiles " $func_resolve_sysroot_result"
5142 prev=
5143 elif test "$prev" = dlprefiles; then
5144 # The library was specified with -dlpreopen.
5145- dlprefiles="$dlprefiles $arg"
5146+ func_append dlprefiles " $func_resolve_sysroot_result"
5147 prev=
5148 else
5149- deplibs="$deplibs $arg"
5150+ func_append deplibs " $func_resolve_sysroot_result"
5151 fi
5152 continue
5153 ;;
5154@@ -5127,7 +5995,7 @@ func_mode_link ()
5155 func_fatal_help "the \`$prevarg' option requires an argument"
5156
5157 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
5158- eval "arg=\"$export_dynamic_flag_spec\""
5159+ eval arg=\"$export_dynamic_flag_spec\"
5160 func_append compile_command " $arg"
5161 func_append finalize_command " $arg"
5162 fi
5163@@ -5144,11 +6012,13 @@ func_mode_link ()
5164 else
5165 shlib_search_path=
5166 fi
5167- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
5168- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
5169+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
5170+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
5171
5172 func_dirname "$output" "/" ""
5173 output_objdir="$func_dirname_result$objdir"
5174+ func_to_tool_file "$output_objdir/"
5175+ tool_output_objdir=$func_to_tool_file_result
5176 # Create the object directory.
5177 func_mkdir_p "$output_objdir"
5178
5179@@ -5169,12 +6039,12 @@ func_mode_link ()
5180 # Find all interdependent deplibs by searching for libraries
5181 # that are linked more than once (e.g. -la -lb -la)
5182 for deplib in $deplibs; do
5183- if $opt_duplicate_deps ; then
5184+ if $opt_preserve_dup_deps ; then
5185 case "$libs " in
5186- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5187+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5188 esac
5189 fi
5190- libs="$libs $deplib"
5191+ func_append libs " $deplib"
5192 done
5193
5194 if test "$linkmode" = lib; then
5195@@ -5187,9 +6057,9 @@ func_mode_link ()
5196 if $opt_duplicate_compiler_generated_deps; then
5197 for pre_post_dep in $predeps $postdeps; do
5198 case "$pre_post_deps " in
5199- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
5200+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5201 esac
5202- pre_post_deps="$pre_post_deps $pre_post_dep"
5203+ func_append pre_post_deps " $pre_post_dep"
5204 done
5205 fi
5206 pre_post_deps=
5207@@ -5256,8 +6126,9 @@ func_mode_link ()
5208 for lib in $dlprefiles; do
5209 # Ignore non-libtool-libs
5210 dependency_libs=
5211+ func_resolve_sysroot "$lib"
5212 case $lib in
5213- *.la) func_source "$lib" ;;
5214+ *.la) func_source "$func_resolve_sysroot_result" ;;
5215 esac
5216
5217 # Collect preopened libtool deplibs, except any this library
5218@@ -5267,7 +6138,7 @@ func_mode_link ()
5219 deplib_base=$func_basename_result
5220 case " $weak_libs " in
5221 *" $deplib_base "*) ;;
5222- *) deplibs="$deplibs $deplib" ;;
5223+ *) func_append deplibs " $deplib" ;;
5224 esac
5225 done
5226 done
5227@@ -5288,11 +6159,11 @@ func_mode_link ()
5228 compile_deplibs="$deplib $compile_deplibs"
5229 finalize_deplibs="$deplib $finalize_deplibs"
5230 else
5231- compiler_flags="$compiler_flags $deplib"
5232+ func_append compiler_flags " $deplib"
5233 if test "$linkmode" = lib ; then
5234 case "$new_inherited_linker_flags " in
5235 *" $deplib "*) ;;
5236- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5237+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5238 esac
5239 fi
5240 fi
5241@@ -5377,7 +6248,7 @@ func_mode_link ()
5242 if test "$linkmode" = lib ; then
5243 case "$new_inherited_linker_flags " in
5244 *" $deplib "*) ;;
5245- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5246+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5247 esac
5248 fi
5249 fi
5250@@ -5390,7 +6261,8 @@ func_mode_link ()
5251 test "$pass" = conv && continue
5252 newdependency_libs="$deplib $newdependency_libs"
5253 func_stripname '-L' '' "$deplib"
5254- newlib_search_path="$newlib_search_path $func_stripname_result"
5255+ func_resolve_sysroot "$func_stripname_result"
5256+ func_append newlib_search_path " $func_resolve_sysroot_result"
5257 ;;
5258 prog)
5259 if test "$pass" = conv; then
5260@@ -5404,7 +6276,8 @@ func_mode_link ()
5261 finalize_deplibs="$deplib $finalize_deplibs"
5262 fi
5263 func_stripname '-L' '' "$deplib"
5264- newlib_search_path="$newlib_search_path $func_stripname_result"
5265+ func_resolve_sysroot "$func_stripname_result"
5266+ func_append newlib_search_path " $func_resolve_sysroot_result"
5267 ;;
5268 *)
5269 func_warning "\`-L' is ignored for archives/objects"
5270@@ -5415,17 +6288,21 @@ func_mode_link ()
5271 -R*)
5272 if test "$pass" = link; then
5273 func_stripname '-R' '' "$deplib"
5274- dir=$func_stripname_result
5275+ func_resolve_sysroot "$func_stripname_result"
5276+ dir=$func_resolve_sysroot_result
5277 # Make sure the xrpath contains only unique directories.
5278 case "$xrpath " in
5279 *" $dir "*) ;;
5280- *) xrpath="$xrpath $dir" ;;
5281+ *) func_append xrpath " $dir" ;;
5282 esac
5283 fi
5284 deplibs="$deplib $deplibs"
5285 continue
5286 ;;
5287- *.la) lib="$deplib" ;;
5288+ *.la)
5289+ func_resolve_sysroot "$deplib"
5290+ lib=$func_resolve_sysroot_result
5291+ ;;
5292 *.$libext)
5293 if test "$pass" = conv; then
5294 deplibs="$deplib $deplibs"
5295@@ -5488,11 +6365,11 @@ func_mode_link ()
5296 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
5297 # If there is no dlopen support or we're linking statically,
5298 # we need to preload.
5299- newdlprefiles="$newdlprefiles $deplib"
5300+ func_append newdlprefiles " $deplib"
5301 compile_deplibs="$deplib $compile_deplibs"
5302 finalize_deplibs="$deplib $finalize_deplibs"
5303 else
5304- newdlfiles="$newdlfiles $deplib"
5305+ func_append newdlfiles " $deplib"
5306 fi
5307 fi
5308 continue
5309@@ -5538,7 +6415,7 @@ func_mode_link ()
5310 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5311 case " $new_inherited_linker_flags " in
5312 *" $tmp_inherited_linker_flag "*) ;;
5313- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
5314+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5315 esac
5316 done
5317 fi
5318@@ -5546,8 +6423,8 @@ func_mode_link ()
5319 if test "$linkmode,$pass" = "lib,link" ||
5320 test "$linkmode,$pass" = "prog,scan" ||
5321 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
5322- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5323- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
5324+ test -n "$dlopen" && func_append dlfiles " $dlopen"
5325+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5326 fi
5327
5328 if test "$pass" = conv; then
5329@@ -5558,20 +6435,20 @@ func_mode_link ()
5330 func_fatal_error "cannot find name of link library for \`$lib'"
5331 fi
5332 # It is a libtool convenience library, so add in its objects.
5333- convenience="$convenience $ladir/$objdir/$old_library"
5334- old_convenience="$old_convenience $ladir/$objdir/$old_library"
5335+ func_append convenience " $ladir/$objdir/$old_library"
5336+ func_append old_convenience " $ladir/$objdir/$old_library"
5337 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5338 func_fatal_error "\`$lib' is not a convenience library"
5339 fi
5340 tmp_libs=
5341 for deplib in $dependency_libs; do
5342 deplibs="$deplib $deplibs"
5343- if $opt_duplicate_deps ; then
5344+ if $opt_preserve_dup_deps ; then
5345 case "$tmp_libs " in
5346- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5347+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5348 esac
5349 fi
5350- tmp_libs="$tmp_libs $deplib"
5351+ func_append tmp_libs " $deplib"
5352 done
5353 continue
5354 fi # $pass = conv
5355@@ -5579,9 +6456,15 @@ func_mode_link ()
5356
5357 # Get the name of the library we link against.
5358 linklib=
5359- for l in $old_library $library_names; do
5360- linklib="$l"
5361- done
5362+ if test -n "$old_library" &&
5363+ { test "$prefer_static_libs" = yes ||
5364+ test "$prefer_static_libs,$installed" = "built,no"; }; then
5365+ linklib=$old_library
5366+ else
5367+ for l in $old_library $library_names; do
5368+ linklib="$l"
5369+ done
5370+ fi
5371 if test -z "$linklib"; then
5372 func_fatal_error "cannot find name of link library for \`$lib'"
5373 fi
5374@@ -5598,9 +6481,9 @@ func_mode_link ()
5375 # statically, we need to preload. We also need to preload any
5376 # dependent libraries so libltdl's deplib preloader doesn't
5377 # bomb out in the load deplibs phase.
5378- dlprefiles="$dlprefiles $lib $dependency_libs"
5379+ func_append dlprefiles " $lib $dependency_libs"
5380 else
5381- newdlfiles="$newdlfiles $lib"
5382+ func_append newdlfiles " $lib"
5383 fi
5384 continue
5385 fi # $pass = dlopen
5386@@ -5622,14 +6505,14 @@ func_mode_link ()
5387
5388 # Find the relevant object directory and library name.
5389 if test "X$installed" = Xyes; then
5390- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5391+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5392 func_warning "library \`$lib' was moved."
5393 dir="$ladir"
5394 absdir="$abs_ladir"
5395 libdir="$abs_ladir"
5396 else
5397- dir="$libdir"
5398- absdir="$libdir"
5399+ dir="$lt_sysroot$libdir"
5400+ absdir="$lt_sysroot$libdir"
5401 fi
5402 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
5403 else
5404@@ -5637,12 +6520,12 @@ func_mode_link ()
5405 dir="$ladir"
5406 absdir="$abs_ladir"
5407 # Remove this search path later
5408- notinst_path="$notinst_path $abs_ladir"
5409+ func_append notinst_path " $abs_ladir"
5410 else
5411 dir="$ladir/$objdir"
5412 absdir="$abs_ladir/$objdir"
5413 # Remove this search path later
5414- notinst_path="$notinst_path $abs_ladir"
5415+ func_append notinst_path " $abs_ladir"
5416 fi
5417 fi # $installed = yes
5418 func_stripname 'lib' '.la' "$laname"
5419@@ -5653,20 +6536,46 @@ func_mode_link ()
5420 if test -z "$libdir" && test "$linkmode" = prog; then
5421 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
5422 fi
5423- # Prefer using a static library (so that no silly _DYNAMIC symbols
5424- # are required to link).
5425- if test -n "$old_library"; then
5426- newdlprefiles="$newdlprefiles $dir/$old_library"
5427- # Keep a list of preopened convenience libraries to check
5428- # that they are being used correctly in the link pass.
5429- test -z "$libdir" && \
5430- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5431- # Otherwise, use the dlname, so that lt_dlopen finds it.
5432- elif test -n "$dlname"; then
5433- newdlprefiles="$newdlprefiles $dir/$dlname"
5434- else
5435- newdlprefiles="$newdlprefiles $dir/$linklib"
5436- fi
5437+ case "$host" in
5438+ # special handling for platforms with PE-DLLs.
5439+ *cygwin* | *mingw* | *cegcc* )
5440+ # Linker will automatically link against shared library if both
5441+ # static and shared are present. Therefore, ensure we extract
5442+ # symbols from the import library if a shared library is present
5443+ # (otherwise, the dlopen module name will be incorrect). We do
5444+ # this by putting the import library name into $newdlprefiles.
5445+ # We recover the dlopen module name by 'saving' the la file
5446+ # name in a special purpose variable, and (later) extracting the
5447+ # dlname from the la file.
5448+ if test -n "$dlname"; then
5449+ func_tr_sh "$dir/$linklib"
5450+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
5451+ func_append newdlprefiles " $dir/$linklib"
5452+ else
5453+ func_append newdlprefiles " $dir/$old_library"
5454+ # Keep a list of preopened convenience libraries to check
5455+ # that they are being used correctly in the link pass.
5456+ test -z "$libdir" && \
5457+ func_append dlpreconveniencelibs " $dir/$old_library"
5458+ fi
5459+ ;;
5460+ * )
5461+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5462+ # are required to link).
5463+ if test -n "$old_library"; then
5464+ func_append newdlprefiles " $dir/$old_library"
5465+ # Keep a list of preopened convenience libraries to check
5466+ # that they are being used correctly in the link pass.
5467+ test -z "$libdir" && \
5468+ func_append dlpreconveniencelibs " $dir/$old_library"
5469+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5470+ elif test -n "$dlname"; then
5471+ func_append newdlprefiles " $dir/$dlname"
5472+ else
5473+ func_append newdlprefiles " $dir/$linklib"
5474+ fi
5475+ ;;
5476+ esac
5477 fi # $pass = dlpreopen
5478
5479 if test -z "$libdir"; then
5480@@ -5684,7 +6593,7 @@ func_mode_link ()
5481
5482
5483 if test "$linkmode" = prog && test "$pass" != link; then
5484- newlib_search_path="$newlib_search_path $ladir"
5485+ func_append newlib_search_path " $ladir"
5486 deplibs="$lib $deplibs"
5487
5488 linkalldeplibs=no
5489@@ -5697,7 +6606,8 @@ func_mode_link ()
5490 for deplib in $dependency_libs; do
5491 case $deplib in
5492 -L*) func_stripname '-L' '' "$deplib"
5493- newlib_search_path="$newlib_search_path $func_stripname_result"
5494+ func_resolve_sysroot "$func_stripname_result"
5495+ func_append newlib_search_path " $func_resolve_sysroot_result"
5496 ;;
5497 esac
5498 # Need to link against all dependency_libs?
5499@@ -5708,12 +6618,12 @@ func_mode_link ()
5500 # or/and link against static libraries
5501 newdependency_libs="$deplib $newdependency_libs"
5502 fi
5503- if $opt_duplicate_deps ; then
5504+ if $opt_preserve_dup_deps ; then
5505 case "$tmp_libs " in
5506- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5507+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5508 esac
5509 fi
5510- tmp_libs="$tmp_libs $deplib"
5511+ func_append tmp_libs " $deplib"
5512 done # for deplib
5513 continue
5514 fi # $linkmode = prog...
5515@@ -5728,7 +6638,7 @@ func_mode_link ()
5516 # Make sure the rpath contains only unique directories.
5517 case "$temp_rpath:" in
5518 *"$absdir:"*) ;;
5519- *) temp_rpath="$temp_rpath$absdir:" ;;
5520+ *) func_append temp_rpath "$absdir:" ;;
5521 esac
5522 fi
5523
5524@@ -5740,7 +6650,7 @@ func_mode_link ()
5525 *)
5526 case "$compile_rpath " in
5527 *" $absdir "*) ;;
5528- *) compile_rpath="$compile_rpath $absdir"
5529+ *) func_append compile_rpath " $absdir" ;;
5530 esac
5531 ;;
5532 esac
5533@@ -5749,7 +6659,7 @@ func_mode_link ()
5534 *)
5535 case "$finalize_rpath " in
5536 *" $libdir "*) ;;
5537- *) finalize_rpath="$finalize_rpath $libdir"
5538+ *) func_append finalize_rpath " $libdir" ;;
5539 esac
5540 ;;
5541 esac
5542@@ -5774,12 +6684,12 @@ func_mode_link ()
5543 case $host in
5544 *cygwin* | *mingw* | *cegcc*)
5545 # No point in relinking DLLs because paths are not encoded
5546- notinst_deplibs="$notinst_deplibs $lib"
5547+ func_append notinst_deplibs " $lib"
5548 need_relink=no
5549 ;;
5550 *)
5551 if test "$installed" = no; then
5552- notinst_deplibs="$notinst_deplibs $lib"
5553+ func_append notinst_deplibs " $lib"
5554 need_relink=yes
5555 fi
5556 ;;
5557@@ -5814,7 +6724,7 @@ func_mode_link ()
5558 *)
5559 case "$compile_rpath " in
5560 *" $absdir "*) ;;
5561- *) compile_rpath="$compile_rpath $absdir"
5562+ *) func_append compile_rpath " $absdir" ;;
5563 esac
5564 ;;
5565 esac
5566@@ -5823,7 +6733,7 @@ func_mode_link ()
5567 *)
5568 case "$finalize_rpath " in
5569 *" $libdir "*) ;;
5570- *) finalize_rpath="$finalize_rpath $libdir"
5571+ *) func_append finalize_rpath " $libdir" ;;
5572 esac
5573 ;;
5574 esac
5575@@ -5835,7 +6745,7 @@ func_mode_link ()
5576 shift
5577 realname="$1"
5578 shift
5579- eval "libname=\"$libname_spec\""
5580+ libname=`eval "\\$ECHO \"$libname_spec\""`
5581 # use dlname if we got it. it's perfectly good, no?
5582 if test -n "$dlname"; then
5583 soname="$dlname"
5584@@ -5848,7 +6758,7 @@ func_mode_link ()
5585 versuffix="-$major"
5586 ;;
5587 esac
5588- eval "soname=\"$soname_spec\""
5589+ eval soname=\"$soname_spec\"
5590 else
5591 soname="$realname"
5592 fi
5593@@ -5877,7 +6787,7 @@ func_mode_link ()
5594 linklib=$newlib
5595 fi # test -n "$old_archive_from_expsyms_cmds"
5596
5597- if test "$linkmode" = prog || test "$mode" != relink; then
5598+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
5599 add_shlibpath=
5600 add_dir=
5601 add=
5602@@ -5933,7 +6843,7 @@ func_mode_link ()
5603 if test -n "$inst_prefix_dir"; then
5604 case $libdir in
5605 [\\/]*)
5606- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5607+ func_append add_dir " -L$inst_prefix_dir$libdir"
5608 ;;
5609 esac
5610 fi
5611@@ -5955,7 +6865,7 @@ func_mode_link ()
5612 if test -n "$add_shlibpath"; then
5613 case :$compile_shlibpath: in
5614 *":$add_shlibpath:"*) ;;
5615- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
5616+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
5617 esac
5618 fi
5619 if test "$linkmode" = prog; then
5620@@ -5969,13 +6879,13 @@ func_mode_link ()
5621 test "$hardcode_shlibpath_var" = yes; then
5622 case :$finalize_shlibpath: in
5623 *":$libdir:"*) ;;
5624- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5625+ *) func_append finalize_shlibpath "$libdir:" ;;
5626 esac
5627 fi
5628 fi
5629 fi
5630
5631- if test "$linkmode" = prog || test "$mode" = relink; then
5632+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
5633 add_shlibpath=
5634 add_dir=
5635 add=
5636@@ -5989,7 +6899,7 @@ func_mode_link ()
5637 elif test "$hardcode_shlibpath_var" = yes; then
5638 case :$finalize_shlibpath: in
5639 *":$libdir:"*) ;;
5640- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5641+ *) func_append finalize_shlibpath "$libdir:" ;;
5642 esac
5643 add="-l$name"
5644 elif test "$hardcode_automatic" = yes; then
5645@@ -6001,12 +6911,12 @@ func_mode_link ()
5646 fi
5647 else
5648 # We cannot seem to hardcode it, guess we'll fake it.
5649- add_dir="-L$libdir"
5650+ add_dir="-L$lt_sysroot$libdir"
5651 # Try looking first in the location we're being installed to.
5652 if test -n "$inst_prefix_dir"; then
5653 case $libdir in
5654 [\\/]*)
5655- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5656+ func_append add_dir " -L$inst_prefix_dir$libdir"
5657 ;;
5658 esac
5659 fi
5660@@ -6083,27 +6993,33 @@ func_mode_link ()
5661 temp_xrpath=$func_stripname_result
5662 case " $xrpath " in
5663 *" $temp_xrpath "*) ;;
5664- *) xrpath="$xrpath $temp_xrpath";;
5665+ *) func_append xrpath " $temp_xrpath";;
5666 esac;;
5667- *) temp_deplibs="$temp_deplibs $libdir";;
5668+ *) func_append temp_deplibs " $libdir";;
5669 esac
5670 done
5671 dependency_libs="$temp_deplibs"
5672 fi
5673
5674- newlib_search_path="$newlib_search_path $absdir"
5675+ func_append newlib_search_path " $absdir"
5676 # Link against this library
5677 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
5678 # ... and its dependency_libs
5679 tmp_libs=
5680 for deplib in $dependency_libs; do
5681 newdependency_libs="$deplib $newdependency_libs"
5682- if $opt_duplicate_deps ; then
5683+ case $deplib in
5684+ -L*) func_stripname '-L' '' "$deplib"
5685+ func_resolve_sysroot "$func_stripname_result";;
5686+ *) func_resolve_sysroot "$deplib" ;;
5687+ esac
5688+ if $opt_preserve_dup_deps ; then
5689 case "$tmp_libs " in
5690- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5691+ *" $func_resolve_sysroot_result "*)
5692+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
5693 esac
5694 fi
5695- tmp_libs="$tmp_libs $deplib"
5696+ func_append tmp_libs " $func_resolve_sysroot_result"
5697 done
5698
5699 if test "$link_all_deplibs" != no; then
5700@@ -6113,8 +7029,10 @@ func_mode_link ()
5701 case $deplib in
5702 -L*) path="$deplib" ;;
5703 *.la)
5704+ func_resolve_sysroot "$deplib"
5705+ deplib=$func_resolve_sysroot_result
5706 func_dirname "$deplib" "" "."
5707- dir="$func_dirname_result"
5708+ dir=$func_dirname_result
5709 # We need an absolute path.
5710 case $dir in
5711 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
5712@@ -6130,7 +7048,7 @@ func_mode_link ()
5713 case $host in
5714 *-*-darwin*)
5715 depdepl=
5716- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5717+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5718 if test -n "$deplibrary_names" ; then
5719 for tmp in $deplibrary_names ; do
5720 depdepl=$tmp
5721@@ -6141,8 +7059,8 @@ func_mode_link ()
5722 if test -z "$darwin_install_name"; then
5723 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
5724 fi
5725- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5726- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
5727+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5728+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
5729 path=
5730 fi
5731 fi
5732@@ -6152,7 +7070,7 @@ func_mode_link ()
5733 ;;
5734 esac
5735 else
5736- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5737+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5738 test -z "$libdir" && \
5739 func_fatal_error "\`$deplib' is not a valid libtool archive"
5740 test "$absdir" != "$libdir" && \
5741@@ -6192,7 +7110,7 @@ func_mode_link ()
5742 for dir in $newlib_search_path; do
5743 case "$lib_search_path " in
5744 *" $dir "*) ;;
5745- *) lib_search_path="$lib_search_path $dir" ;;
5746+ *) func_append lib_search_path " $dir" ;;
5747 esac
5748 done
5749 newlib_search_path=
5750@@ -6205,7 +7123,7 @@ func_mode_link ()
5751 fi
5752 for var in $vars dependency_libs; do
5753 # Add libraries to $var in reverse order
5754- eval tmp_libs=\$$var
5755+ eval tmp_libs=\"\$$var\"
5756 new_libs=
5757 for deplib in $tmp_libs; do
5758 # FIXME: Pedantically, this is the right thing to do, so
5759@@ -6250,13 +7168,13 @@ func_mode_link ()
5760 -L*)
5761 case " $tmp_libs " in
5762 *" $deplib "*) ;;
5763- *) tmp_libs="$tmp_libs $deplib" ;;
5764+ *) func_append tmp_libs " $deplib" ;;
5765 esac
5766 ;;
5767- *) tmp_libs="$tmp_libs $deplib" ;;
5768+ *) func_append tmp_libs " $deplib" ;;
5769 esac
5770 done
5771- eval $var=\$tmp_libs
5772+ eval $var=\"$tmp_libs\"
5773 done # for var
5774 fi
5775 # Last step: remove runtime libs from dependency_libs
5776@@ -6269,7 +7187,7 @@ func_mode_link ()
5777 ;;
5778 esac
5779 if test -n "$i" ; then
5780- tmp_libs="$tmp_libs $i"
5781+ func_append tmp_libs " $i"
5782 fi
5783 done
5784 dependency_libs=$tmp_libs
5785@@ -6310,7 +7228,7 @@ func_mode_link ()
5786 # Now set the variables for building old libraries.
5787 build_libtool_libs=no
5788 oldlibs="$output"
5789- objs="$objs$old_deplibs"
5790+ func_append objs "$old_deplibs"
5791 ;;
5792
5793 lib)
5794@@ -6319,8 +7237,8 @@ func_mode_link ()
5795 lib*)
5796 func_stripname 'lib' '.la' "$outputname"
5797 name=$func_stripname_result
5798- eval "shared_ext=\"$shrext_cmds\""
5799- eval "libname=\"$libname_spec\""
5800+ eval shared_ext=\"$shrext_cmds\"
5801+ eval libname=\"$libname_spec\"
5802 ;;
5803 *)
5804 test "$module" = no && \
5805@@ -6330,8 +7248,8 @@ func_mode_link ()
5806 # Add the "lib" prefix for modules if required
5807 func_stripname '' '.la' "$outputname"
5808 name=$func_stripname_result
5809- eval "shared_ext=\"$shrext_cmds\""
5810- eval "libname=\"$libname_spec\""
5811+ eval shared_ext=\"$shrext_cmds\"
5812+ eval libname=\"$libname_spec\"
5813 else
5814 func_stripname '' '.la' "$outputname"
5815 libname=$func_stripname_result
5816@@ -6346,7 +7264,7 @@ func_mode_link ()
5817 echo
5818 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
5819 $ECHO "*** objects $objs is not portable!"
5820- libobjs="$libobjs $objs"
5821+ func_append libobjs " $objs"
5822 fi
5823 fi
5824
5825@@ -6544,7 +7462,7 @@ func_mode_link ()
5826 done
5827
5828 # Make executables depend on our current version.
5829- verstring="$verstring:${current}.0"
5830+ func_append verstring ":${current}.0"
5831 ;;
5832
5833 qnx)
5834@@ -6612,10 +7530,10 @@ func_mode_link ()
5835 fi
5836
5837 func_generate_dlsyms "$libname" "$libname" "yes"
5838- libobjs="$libobjs $symfileobj"
5839+ func_append libobjs " $symfileobj"
5840 test "X$libobjs" = "X " && libobjs=
5841
5842- if test "$mode" != relink; then
5843+ if test "$opt_mode" != relink; then
5844 # Remove our outputs, but don't remove object files since they
5845 # may have been created when compiling PIC objects.
5846 removelist=
5847@@ -6631,7 +7549,7 @@ func_mode_link ()
5848 continue
5849 fi
5850 fi
5851- removelist="$removelist $p"
5852+ func_append removelist " $p"
5853 ;;
5854 *) ;;
5855 esac
5856@@ -6642,7 +7560,7 @@ func_mode_link ()
5857
5858 # Now set the variables for building old libraries.
5859 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
5860- oldlibs="$oldlibs $output_objdir/$libname.$libext"
5861+ func_append oldlibs " $output_objdir/$libname.$libext"
5862
5863 # Transform .lo files to .o files.
5864 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
5865@@ -6659,10 +7577,11 @@ func_mode_link ()
5866 # If the user specified any rpath flags, then add them.
5867 temp_xrpath=
5868 for libdir in $xrpath; do
5869- temp_xrpath="$temp_xrpath -R$libdir"
5870+ func_replace_sysroot "$libdir"
5871+ func_append temp_xrpath " -R$func_replace_sysroot_result"
5872 case "$finalize_rpath " in
5873 *" $libdir "*) ;;
5874- *) finalize_rpath="$finalize_rpath $libdir" ;;
5875+ *) func_append finalize_rpath " $libdir" ;;
5876 esac
5877 done
5878 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
5879@@ -6676,7 +7595,7 @@ func_mode_link ()
5880 for lib in $old_dlfiles; do
5881 case " $dlprefiles $dlfiles " in
5882 *" $lib "*) ;;
5883- *) dlfiles="$dlfiles $lib" ;;
5884+ *) func_append dlfiles " $lib" ;;
5885 esac
5886 done
5887
5888@@ -6686,7 +7605,7 @@ func_mode_link ()
5889 for lib in $old_dlprefiles; do
5890 case "$dlprefiles " in
5891 *" $lib "*) ;;
5892- *) dlprefiles="$dlprefiles $lib" ;;
5893+ *) func_append dlprefiles " $lib" ;;
5894 esac
5895 done
5896
5897@@ -6698,7 +7617,7 @@ func_mode_link ()
5898 ;;
5899 *-*-rhapsody* | *-*-darwin1.[012])
5900 # Rhapsody C library is in the System framework
5901- deplibs="$deplibs System.ltframework"
5902+ func_append deplibs " System.ltframework"
5903 ;;
5904 *-*-netbsd*)
5905 # Don't link with libc until the a.out ld.so is fixed.
5906@@ -6715,7 +7634,7 @@ func_mode_link ()
5907 *)
5908 # Add libc to deplibs on all other systems if necessary.
5909 if test "$build_libtool_need_lc" = "yes"; then
5910- deplibs="$deplibs -lc"
5911+ func_append deplibs " -lc"
5912 fi
5913 ;;
5914 esac
5915@@ -6764,18 +7683,18 @@ EOF
5916 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5917 case " $predeps $postdeps " in
5918 *" $i "*)
5919- newdeplibs="$newdeplibs $i"
5920+ func_append newdeplibs " $i"
5921 i=""
5922 ;;
5923 esac
5924 fi
5925 if test -n "$i" ; then
5926- eval "libname=\"$libname_spec\""
5927- eval "deplib_matches=\"$library_names_spec\""
5928+ libname=`eval "\\$ECHO \"$libname_spec\""`
5929+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5930 set dummy $deplib_matches; shift
5931 deplib_match=$1
5932 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5933- newdeplibs="$newdeplibs $i"
5934+ func_append newdeplibs " $i"
5935 else
5936 droppeddeps=yes
5937 echo
5938@@ -6789,7 +7708,7 @@ EOF
5939 fi
5940 ;;
5941 *)
5942- newdeplibs="$newdeplibs $i"
5943+ func_append newdeplibs " $i"
5944 ;;
5945 esac
5946 done
5947@@ -6807,18 +7726,18 @@ EOF
5948 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5949 case " $predeps $postdeps " in
5950 *" $i "*)
5951- newdeplibs="$newdeplibs $i"
5952+ func_append newdeplibs " $i"
5953 i=""
5954 ;;
5955 esac
5956 fi
5957 if test -n "$i" ; then
5958- eval "libname=\"$libname_spec\""
5959- eval "deplib_matches=\"$library_names_spec\""
5960+ libname=`eval "\\$ECHO \"$libname_spec\""`
5961+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5962 set dummy $deplib_matches; shift
5963 deplib_match=$1
5964 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5965- newdeplibs="$newdeplibs $i"
5966+ func_append newdeplibs " $i"
5967 else
5968 droppeddeps=yes
5969 echo
5970@@ -6840,7 +7759,7 @@ EOF
5971 fi
5972 ;;
5973 *)
5974- newdeplibs="$newdeplibs $i"
5975+ func_append newdeplibs " $i"
5976 ;;
5977 esac
5978 done
5979@@ -6857,15 +7776,27 @@ EOF
5980 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5981 case " $predeps $postdeps " in
5982 *" $a_deplib "*)
5983- newdeplibs="$newdeplibs $a_deplib"
5984+ func_append newdeplibs " $a_deplib"
5985 a_deplib=""
5986 ;;
5987 esac
5988 fi
5989 if test -n "$a_deplib" ; then
5990- eval "libname=\"$libname_spec\""
5991+ libname=`eval "\\$ECHO \"$libname_spec\""`
5992+ if test -n "$file_magic_glob"; then
5993+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
5994+ else
5995+ libnameglob=$libname
5996+ fi
5997+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
5998 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
5999- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6000+ if test "$want_nocaseglob" = yes; then
6001+ shopt -s nocaseglob
6002+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6003+ $nocaseglob
6004+ else
6005+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6006+ fi
6007 for potent_lib in $potential_libs; do
6008 # Follow soft links.
6009 if ls -lLd "$potent_lib" 2>/dev/null |
6010@@ -6885,10 +7816,10 @@ EOF
6011 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6012 esac
6013 done
6014- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
6015+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
6016 $SED -e 10q |
6017 $EGREP "$file_magic_regex" > /dev/null; then
6018- newdeplibs="$newdeplibs $a_deplib"
6019+ func_append newdeplibs " $a_deplib"
6020 a_deplib=""
6021 break 2
6022 fi
6023@@ -6913,7 +7844,7 @@ EOF
6024 ;;
6025 *)
6026 # Add a -L argument.
6027- newdeplibs="$newdeplibs $a_deplib"
6028+ func_append newdeplibs " $a_deplib"
6029 ;;
6030 esac
6031 done # Gone through all deplibs.
6032@@ -6929,20 +7860,20 @@ EOF
6033 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6034 case " $predeps $postdeps " in
6035 *" $a_deplib "*)
6036- newdeplibs="$newdeplibs $a_deplib"
6037+ func_append newdeplibs " $a_deplib"
6038 a_deplib=""
6039 ;;
6040 esac
6041 fi
6042 if test -n "$a_deplib" ; then
6043- eval "libname=\"$libname_spec\""
6044+ libname=`eval "\\$ECHO \"$libname_spec\""`
6045 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6046 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6047 for potent_lib in $potential_libs; do
6048 potlib="$potent_lib" # see symlink-check above in file_magic test
6049 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6050 $EGREP "$match_pattern_regex" > /dev/null; then
6051- newdeplibs="$newdeplibs $a_deplib"
6052+ func_append newdeplibs " $a_deplib"
6053 a_deplib=""
6054 break 2
6055 fi
6056@@ -6967,7 +7898,7 @@ EOF
6057 ;;
6058 *)
6059 # Add a -L argument.
6060- newdeplibs="$newdeplibs $a_deplib"
6061+ func_append newdeplibs " $a_deplib"
6062 ;;
6063 esac
6064 done # Gone through all deplibs.
6065@@ -7071,7 +8002,7 @@ EOF
6066 *)
6067 case " $deplibs " in
6068 *" -L$path/$objdir "*)
6069- new_libs="$new_libs -L$path/$objdir" ;;
6070+ func_append new_libs " -L$path/$objdir" ;;
6071 esac
6072 ;;
6073 esac
6074@@ -7081,10 +8012,10 @@ EOF
6075 -L*)
6076 case " $new_libs " in
6077 *" $deplib "*) ;;
6078- *) new_libs="$new_libs $deplib" ;;
6079+ *) func_append new_libs " $deplib" ;;
6080 esac
6081 ;;
6082- *) new_libs="$new_libs $deplib" ;;
6083+ *) func_append new_libs " $deplib" ;;
6084 esac
6085 done
6086 deplibs="$new_libs"
6087@@ -7101,10 +8032,12 @@ EOF
6088 hardcode_libdirs=
6089 dep_rpath=
6090 rpath="$finalize_rpath"
6091- test "$mode" != relink && rpath="$compile_rpath$rpath"
6092+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
6093 for libdir in $rpath; do
6094 if test -n "$hardcode_libdir_flag_spec"; then
6095 if test -n "$hardcode_libdir_separator"; then
6096+ func_replace_sysroot "$libdir"
6097+ libdir=$func_replace_sysroot_result
6098 if test -z "$hardcode_libdirs"; then
6099 hardcode_libdirs="$libdir"
6100 else
6101@@ -7113,18 +8046,18 @@ EOF
6102 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6103 ;;
6104 *)
6105- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6106+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6107 ;;
6108 esac
6109 fi
6110 else
6111- eval "flag=\"$hardcode_libdir_flag_spec\""
6112- dep_rpath="$dep_rpath $flag"
6113+ eval flag=\"$hardcode_libdir_flag_spec\"
6114+ func_append dep_rpath " $flag"
6115 fi
6116 elif test -n "$runpath_var"; then
6117 case "$perm_rpath " in
6118 *" $libdir "*) ;;
6119- *) perm_rpath="$perm_rpath $libdir" ;;
6120+ *) func_apped perm_rpath " $libdir" ;;
6121 esac
6122 fi
6123 done
6124@@ -7133,40 +8066,38 @@ EOF
6125 test -n "$hardcode_libdirs"; then
6126 libdir="$hardcode_libdirs"
6127 if test -n "$hardcode_libdir_flag_spec_ld"; then
6128- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
6129+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
6130 else
6131- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
6132+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
6133 fi
6134 fi
6135 if test -n "$runpath_var" && test -n "$perm_rpath"; then
6136 # We should set the runpath_var.
6137 rpath=
6138 for dir in $perm_rpath; do
6139- rpath="$rpath$dir:"
6140+ func_append rpath "$dir:"
6141 done
6142- eval $runpath_var=\$rpath\$$runpath_var
6143- export $runpath_var
6144+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
6145 fi
6146 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
6147 fi
6148
6149 shlibpath="$finalize_shlibpath"
6150- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6151+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6152 if test -n "$shlibpath"; then
6153- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
6154- export $shlibpath_var
6155+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
6156 fi
6157
6158 # Get the real and link names of the library.
6159- eval "shared_ext=\"$shrext_cmds\""
6160- eval "library_names=\"$library_names_spec\""
6161+ eval shared_ext=\"$shrext_cmds\"
6162+ eval library_names=\"$library_names_spec\"
6163 set dummy $library_names
6164 shift
6165 realname="$1"
6166 shift
6167
6168 if test -n "$soname_spec"; then
6169- eval "soname=\"$soname_spec\""
6170+ eval soname=\"$soname_spec\"
6171 else
6172 soname="$realname"
6173 fi
6174@@ -7178,7 +8109,7 @@ EOF
6175 linknames=
6176 for link
6177 do
6178- linknames="$linknames $link"
6179+ func_append linknames " $link"
6180 done
6181
6182 # Use standard objects if they are pic
6183@@ -7189,7 +8120,7 @@ EOF
6184 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6185 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
6186 export_symbols="$output_objdir/$libname.uexp"
6187- delfiles="$delfiles $export_symbols"
6188+ func_append delfiles " $export_symbols"
6189 fi
6190
6191 orig_export_symbols=
6192@@ -7220,13 +8151,45 @@ EOF
6193 $opt_dry_run || $RM $export_symbols
6194 cmds=$export_symbols_cmds
6195 save_ifs="$IFS"; IFS='~'
6196- for cmd in $cmds; do
6197+ for cmd1 in $cmds; do
6198 IFS="$save_ifs"
6199- eval "cmd=\"$cmd\""
6200- func_len " $cmd"
6201- len=$func_len_result
6202- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6203+ # Take the normal branch if the nm_file_list_spec branch
6204+ # doesn't work or if tool conversion is not needed.
6205+ case $nm_file_list_spec~$to_tool_file_cmd in
6206+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
6207+ try_normal_branch=yes
6208+ eval cmd=\"$cmd1\"
6209+ func_len " $cmd"
6210+ len=$func_len_result
6211+ ;;
6212+ *)
6213+ try_normal_branch=no
6214+ ;;
6215+ esac
6216+ if test "$try_normal_branch" = yes \
6217+ && { test "$len" -lt "$max_cmd_len" \
6218+ || test "$max_cmd_len" -le -1; }
6219+ then
6220+ func_show_eval "$cmd" 'exit $?'
6221+ skipped_export=false
6222+ elif test -n "$nm_file_list_spec"; then
6223+ func_basename "$output"
6224+ output_la=$func_basename_result
6225+ save_libobjs=$libobjs
6226+ save_output=$output
6227+ output=${output_objdir}/${output_la}.nm
6228+ func_to_tool_file "$output"
6229+ libobjs=$nm_file_list_spec$func_to_tool_file_result
6230+ func_append delfiles " $output"
6231+ func_verbose "creating $NM input file list: $output"
6232+ for obj in $save_libobjs; do
6233+ func_to_tool_file "$obj"
6234+ $ECHO "$func_to_tool_file_result"
6235+ done > "$output"
6236+ eval cmd=\"$cmd1\"
6237 func_show_eval "$cmd" 'exit $?'
6238+ output=$save_output
6239+ libobjs=$save_libobjs
6240 skipped_export=false
6241 else
6242 # The command line is too long to execute in one step.
6243@@ -7248,7 +8211,7 @@ EOF
6244 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6245 tmp_export_symbols="$export_symbols"
6246 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6247- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6248+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6249 fi
6250
6251 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
6252@@ -7260,7 +8223,7 @@ EOF
6253 # global variables. join(1) would be nice here, but unfortunately
6254 # isn't a blessed tool.
6255 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6256- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6257+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6258 export_symbols=$output_objdir/$libname.def
6259 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6260 fi
6261@@ -7270,7 +8233,7 @@ EOF
6262 case " $convenience " in
6263 *" $test_deplib "*) ;;
6264 *)
6265- tmp_deplibs="$tmp_deplibs $test_deplib"
6266+ func_append tmp_deplibs " $test_deplib"
6267 ;;
6268 esac
6269 done
6270@@ -7286,43 +8249,43 @@ EOF
6271 fi
6272 if test -n "$whole_archive_flag_spec"; then
6273 save_libobjs=$libobjs
6274- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6275+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6276 test "X$libobjs" = "X " && libobjs=
6277 else
6278 gentop="$output_objdir/${outputname}x"
6279- generated="$generated $gentop"
6280+ func_append generated " $gentop"
6281
6282 func_extract_archives $gentop $convenience
6283- libobjs="$libobjs $func_extract_archives_result"
6284+ func_append libobjs " $func_extract_archives_result"
6285 test "X$libobjs" = "X " && libobjs=
6286 fi
6287 fi
6288
6289 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
6290- eval "flag=\"$thread_safe_flag_spec\""
6291- linker_flags="$linker_flags $flag"
6292+ eval flag=\"$thread_safe_flag_spec\"
6293+ func_append linker_flags " $flag"
6294 fi
6295
6296 # Make a backup of the uninstalled library when relinking
6297- if test "$mode" = relink; then
6298- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
6299+ if test "$opt_mode" = relink; then
6300+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
6301 fi
6302
6303 # Do each of the archive commands.
6304 if test "$module" = yes && test -n "$module_cmds" ; then
6305 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
6306- eval "test_cmds=\"$module_expsym_cmds\""
6307+ eval test_cmds=\"$module_expsym_cmds\"
6308 cmds=$module_expsym_cmds
6309 else
6310- eval "test_cmds=\"$module_cmds\""
6311+ eval test_cmds=\"$module_cmds\"
6312 cmds=$module_cmds
6313 fi
6314 else
6315 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
6316- eval "test_cmds=\"$archive_expsym_cmds\""
6317+ eval test_cmds=\"$archive_expsym_cmds\"
6318 cmds=$archive_expsym_cmds
6319 else
6320- eval "test_cmds=\"$archive_cmds\""
6321+ eval test_cmds=\"$archive_cmds\"
6322 cmds=$archive_cmds
6323 fi
6324 fi
6325@@ -7366,10 +8329,13 @@ EOF
6326 echo 'INPUT (' > $output
6327 for obj in $save_libobjs
6328 do
6329- $ECHO "$obj" >> $output
6330+ func_to_tool_file "$obj"
6331+ $ECHO "$func_to_tool_file_result" >> $output
6332 done
6333 echo ')' >> $output
6334- delfiles="$delfiles $output"
6335+ func_append delfiles " $output"
6336+ func_to_tool_file "$output"
6337+ output=$func_to_tool_file_result
6338 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
6339 output=${output_objdir}/${output_la}.lnk
6340 func_verbose "creating linker input file list: $output"
6341@@ -7383,15 +8349,17 @@ EOF
6342 fi
6343 for obj
6344 do
6345- $ECHO "$obj" >> $output
6346+ func_to_tool_file "$obj"
6347+ $ECHO "$func_to_tool_file_result" >> $output
6348 done
6349- delfiles="$delfiles $output"
6350- output=$firstobj\"$file_list_spec$output\"
6351+ func_append delfiles " $output"
6352+ func_to_tool_file "$output"
6353+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
6354 else
6355 if test -n "$save_libobjs"; then
6356 func_verbose "creating reloadable object files..."
6357 output=$output_objdir/$output_la-${k}.$objext
6358- eval "test_cmds=\"$reload_cmds\""
6359+ eval test_cmds=\"$reload_cmds\"
6360 func_len " $test_cmds"
6361 len0=$func_len_result
6362 len=$len0
6363@@ -7411,12 +8379,12 @@ EOF
6364 if test "$k" -eq 1 ; then
6365 # The first file doesn't have a previous command to add.
6366 reload_objs=$objlist
6367- eval "concat_cmds=\"$reload_cmds\""
6368+ eval concat_cmds=\"$reload_cmds\"
6369 else
6370 # All subsequent reloadable object files will link in
6371 # the last one created.
6372 reload_objs="$objlist $last_robj"
6373- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
6374+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
6375 fi
6376 last_robj=$output_objdir/$output_la-${k}.$objext
6377 func_arith $k + 1
6378@@ -7433,11 +8401,11 @@ EOF
6379 # files will link in the last one created.
6380 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6381 reload_objs="$objlist $last_robj"
6382- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
6383+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
6384 if test -n "$last_robj"; then
6385- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
6386+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
6387 fi
6388- delfiles="$delfiles $output"
6389+ func_append delfiles " $output"
6390
6391 else
6392 output=
6393@@ -7450,9 +8418,9 @@ EOF
6394 libobjs=$output
6395 # Append the command to create the export file.
6396 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6397- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
6398+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
6399 if test -n "$last_robj"; then
6400- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
6401+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
6402 fi
6403 fi
6404
6405@@ -7471,7 +8439,7 @@ EOF
6406 lt_exit=$?
6407
6408 # Restore the uninstalled library and exit
6409- if test "$mode" = relink; then
6410+ if test "$opt_mode" = relink; then
6411 ( cd "$output_objdir" && \
6412 $RM "${realname}T" && \
6413 $MV "${realname}U" "$realname" )
6414@@ -7492,7 +8460,7 @@ EOF
6415 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6416 tmp_export_symbols="$export_symbols"
6417 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6418- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6419+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6420 fi
6421
6422 if test -n "$orig_export_symbols"; then
6423@@ -7504,7 +8472,7 @@ EOF
6424 # global variables. join(1) would be nice here, but unfortunately
6425 # isn't a blessed tool.
6426 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6427- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6428+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6429 export_symbols=$output_objdir/$libname.def
6430 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6431 fi
6432@@ -7515,7 +8483,7 @@ EOF
6433 output=$save_output
6434
6435 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
6436- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6437+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6438 test "X$libobjs" = "X " && libobjs=
6439 fi
6440 # Expand the library linking commands again to reset the
6441@@ -7539,23 +8507,23 @@ EOF
6442
6443 if test -n "$delfiles"; then
6444 # Append the command to remove temporary files to $cmds.
6445- eval "cmds=\"\$cmds~\$RM $delfiles\""
6446+ eval cmds=\"\$cmds~\$RM $delfiles\"
6447 fi
6448
6449 # Add any objects from preloaded convenience libraries
6450 if test -n "$dlprefiles"; then
6451 gentop="$output_objdir/${outputname}x"
6452- generated="$generated $gentop"
6453+ func_append generated " $gentop"
6454
6455 func_extract_archives $gentop $dlprefiles
6456- libobjs="$libobjs $func_extract_archives_result"
6457+ func_append libobjs " $func_extract_archives_result"
6458 test "X$libobjs" = "X " && libobjs=
6459 fi
6460
6461 save_ifs="$IFS"; IFS='~'
6462 for cmd in $cmds; do
6463 IFS="$save_ifs"
6464- eval "cmd=\"$cmd\""
6465+ eval cmd=\"$cmd\"
6466 $opt_silent || {
6467 func_quote_for_expand "$cmd"
6468 eval "func_echo $func_quote_for_expand_result"
6469@@ -7564,7 +8532,7 @@ EOF
6470 lt_exit=$?
6471
6472 # Restore the uninstalled library and exit
6473- if test "$mode" = relink; then
6474+ if test "$opt_mode" = relink; then
6475 ( cd "$output_objdir" && \
6476 $RM "${realname}T" && \
6477 $MV "${realname}U" "$realname" )
6478@@ -7576,8 +8544,8 @@ EOF
6479 IFS="$save_ifs"
6480
6481 # Restore the uninstalled library and exit
6482- if test "$mode" = relink; then
6483- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
6484+ if test "$opt_mode" = relink; then
6485+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
6486
6487 if test -n "$convenience"; then
6488 if test -z "$whole_archive_flag_spec"; then
6489@@ -7656,17 +8624,20 @@ EOF
6490
6491 if test -n "$convenience"; then
6492 if test -n "$whole_archive_flag_spec"; then
6493- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
6494+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
6495 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
6496 else
6497 gentop="$output_objdir/${obj}x"
6498- generated="$generated $gentop"
6499+ func_append generated " $gentop"
6500
6501 func_extract_archives $gentop $convenience
6502 reload_conv_objs="$reload_objs $func_extract_archives_result"
6503 fi
6504 fi
6505
6506+ # If we're not building shared, we need to use non_pic_objs
6507+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
6508+
6509 # Create the old-style object.
6510 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
6511
6512@@ -7690,7 +8661,7 @@ EOF
6513 # Create an invalid libtool object if no PIC, so that we don't
6514 # accidentally link it into a program.
6515 # $show "echo timestamp > $libobj"
6516- # $opt_dry_run || echo timestamp > $libobj || exit $?
6517+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
6518 exit $EXIT_SUCCESS
6519 fi
6520
6521@@ -7740,8 +8711,8 @@ EOF
6522 if test "$tagname" = CXX ; then
6523 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
6524 10.[0123])
6525- compile_command="$compile_command ${wl}-bind_at_load"
6526- finalize_command="$finalize_command ${wl}-bind_at_load"
6527+ func_append compile_command " ${wl}-bind_at_load"
6528+ func_append finalize_command " ${wl}-bind_at_load"
6529 ;;
6530 esac
6531 fi
6532@@ -7761,7 +8732,7 @@ EOF
6533 *)
6534 case " $compile_deplibs " in
6535 *" -L$path/$objdir "*)
6536- new_libs="$new_libs -L$path/$objdir" ;;
6537+ func_append new_libs " -L$path/$objdir" ;;
6538 esac
6539 ;;
6540 esac
6541@@ -7771,17 +8742,17 @@ EOF
6542 -L*)
6543 case " $new_libs " in
6544 *" $deplib "*) ;;
6545- *) new_libs="$new_libs $deplib" ;;
6546+ *) func_append new_libs " $deplib" ;;
6547 esac
6548 ;;
6549- *) new_libs="$new_libs $deplib" ;;
6550+ *) func_append new_libs " $deplib" ;;
6551 esac
6552 done
6553 compile_deplibs="$new_libs"
6554
6555
6556- compile_command="$compile_command $compile_deplibs"
6557- finalize_command="$finalize_command $finalize_deplibs"
6558+ func_append compile_command " $compile_deplibs"
6559+ func_append finalize_command " $finalize_deplibs"
6560
6561 if test -n "$rpath$xrpath"; then
6562 # If the user specified any rpath flags, then add them.
6563@@ -7789,7 +8760,7 @@ EOF
6564 # This is the magic to use -rpath.
6565 case "$finalize_rpath " in
6566 *" $libdir "*) ;;
6567- *) finalize_rpath="$finalize_rpath $libdir" ;;
6568+ *) func_append finalize_rpath " $libdir" ;;
6569 esac
6570 done
6571 fi
6572@@ -7808,18 +8779,18 @@ EOF
6573 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6574 ;;
6575 *)
6576- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6577+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6578 ;;
6579 esac
6580 fi
6581 else
6582- eval "flag=\"$hardcode_libdir_flag_spec\""
6583- rpath="$rpath $flag"
6584+ eval flag=\"$hardcode_libdir_flag_spec\"
6585+ func_append rpath " $flag"
6586 fi
6587 elif test -n "$runpath_var"; then
6588 case "$perm_rpath " in
6589 *" $libdir "*) ;;
6590- *) perm_rpath="$perm_rpath $libdir" ;;
6591+ *) func_append perm_rpath " $libdir" ;;
6592 esac
6593 fi
6594 case $host in
6595@@ -7828,12 +8799,12 @@ EOF
6596 case :$dllsearchpath: in
6597 *":$libdir:"*) ;;
6598 ::) dllsearchpath=$libdir;;
6599- *) dllsearchpath="$dllsearchpath:$libdir";;
6600+ *) func_append dllsearchpath ":$libdir";;
6601 esac
6602 case :$dllsearchpath: in
6603 *":$testbindir:"*) ;;
6604 ::) dllsearchpath=$testbindir;;
6605- *) dllsearchpath="$dllsearchpath:$testbindir";;
6606+ *) func_append dllsearchpath ":$testbindir";;
6607 esac
6608 ;;
6609 esac
6610@@ -7842,7 +8813,7 @@ EOF
6611 if test -n "$hardcode_libdir_separator" &&
6612 test -n "$hardcode_libdirs"; then
6613 libdir="$hardcode_libdirs"
6614- eval "rpath=\" $hardcode_libdir_flag_spec\""
6615+ eval rpath=\" $hardcode_libdir_flag_spec\"
6616 fi
6617 compile_rpath="$rpath"
6618
6619@@ -7859,18 +8830,18 @@ EOF
6620 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6621 ;;
6622 *)
6623- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6624+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6625 ;;
6626 esac
6627 fi
6628 else
6629- eval "flag=\"$hardcode_libdir_flag_spec\""
6630- rpath="$rpath $flag"
6631+ eval flag=\"$hardcode_libdir_flag_spec\"
6632+ func_append rpath " $flag"
6633 fi
6634 elif test -n "$runpath_var"; then
6635 case "$finalize_perm_rpath " in
6636 *" $libdir "*) ;;
6637- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
6638+ *) func_append finalize_perm_rpath " $libdir" ;;
6639 esac
6640 fi
6641 done
6642@@ -7878,7 +8849,7 @@ EOF
6643 if test -n "$hardcode_libdir_separator" &&
6644 test -n "$hardcode_libdirs"; then
6645 libdir="$hardcode_libdirs"
6646- eval "rpath=\" $hardcode_libdir_flag_spec\""
6647+ eval rpath=\" $hardcode_libdir_flag_spec\"
6648 fi
6649 finalize_rpath="$rpath"
6650
6651@@ -7921,6 +8892,12 @@ EOF
6652 exit_status=0
6653 func_show_eval "$link_command" 'exit_status=$?'
6654
6655+ if test -n "$postlink_cmds"; then
6656+ func_to_tool_file "$output"
6657+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6658+ func_execute_cmds "$postlink_cmds" 'exit $?'
6659+ fi
6660+
6661 # Delete the generated files.
6662 if test -f "$output_objdir/${outputname}S.${objext}"; then
6663 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
6664@@ -7943,7 +8920,7 @@ EOF
6665 # We should set the runpath_var.
6666 rpath=
6667 for dir in $perm_rpath; do
6668- rpath="$rpath$dir:"
6669+ func_append rpath "$dir:"
6670 done
6671 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
6672 fi
6673@@ -7951,7 +8928,7 @@ EOF
6674 # We should set the runpath_var.
6675 rpath=
6676 for dir in $finalize_perm_rpath; do
6677- rpath="$rpath$dir:"
6678+ func_append rpath "$dir:"
6679 done
6680 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
6681 fi
6682@@ -7966,6 +8943,13 @@ EOF
6683 $opt_dry_run || $RM $output
6684 # Link the executable and exit
6685 func_show_eval "$link_command" 'exit $?'
6686+
6687+ if test -n "$postlink_cmds"; then
6688+ func_to_tool_file "$output"
6689+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6690+ func_execute_cmds "$postlink_cmds" 'exit $?'
6691+ fi
6692+
6693 exit $EXIT_SUCCESS
6694 fi
6695
6696@@ -7999,6 +8983,12 @@ EOF
6697
6698 func_show_eval "$link_command" 'exit $?'
6699
6700+ if test -n "$postlink_cmds"; then
6701+ func_to_tool_file "$output_objdir/$outputname"
6702+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6703+ func_execute_cmds "$postlink_cmds" 'exit $?'
6704+ fi
6705+
6706 # Now create the wrapper script.
6707 func_verbose "creating $output"
6708
6709@@ -8096,7 +9086,7 @@ EOF
6710 else
6711 oldobjs="$old_deplibs $non_pic_objects"
6712 if test "$preload" = yes && test -f "$symfileobj"; then
6713- oldobjs="$oldobjs $symfileobj"
6714+ func_append oldobjs " $symfileobj"
6715 fi
6716 fi
6717 addlibs="$old_convenience"
6718@@ -8104,10 +9094,10 @@ EOF
6719
6720 if test -n "$addlibs"; then
6721 gentop="$output_objdir/${outputname}x"
6722- generated="$generated $gentop"
6723+ func_append generated " $gentop"
6724
6725 func_extract_archives $gentop $addlibs
6726- oldobjs="$oldobjs $func_extract_archives_result"
6727+ func_append oldobjs " $func_extract_archives_result"
6728 fi
6729
6730 # Do each command in the archive commands.
6731@@ -8118,10 +9108,10 @@ EOF
6732 # Add any objects from preloaded convenience libraries
6733 if test -n "$dlprefiles"; then
6734 gentop="$output_objdir/${outputname}x"
6735- generated="$generated $gentop"
6736+ func_append generated " $gentop"
6737
6738 func_extract_archives $gentop $dlprefiles
6739- oldobjs="$oldobjs $func_extract_archives_result"
6740+ func_append oldobjs " $func_extract_archives_result"
6741 fi
6742
6743 # POSIX demands no paths to be encoded in archives. We have
6744@@ -8139,7 +9129,7 @@ EOF
6745 else
6746 echo "copying selected object files to avoid basename conflicts..."
6747 gentop="$output_objdir/${outputname}x"
6748- generated="$generated $gentop"
6749+ func_append generated " $gentop"
6750 func_mkdir_p "$gentop"
6751 save_oldobjs=$oldobjs
6752 oldobjs=
6753@@ -8163,18 +9153,28 @@ EOF
6754 esac
6755 done
6756 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
6757- oldobjs="$oldobjs $gentop/$newobj"
6758+ func_append oldobjs " $gentop/$newobj"
6759 ;;
6760- *) oldobjs="$oldobjs $obj" ;;
6761+ *) func_append oldobjs " $obj" ;;
6762 esac
6763 done
6764 fi
6765- eval "cmds=\"$old_archive_cmds\""
6766+ eval cmds=\"$old_archive_cmds\"
6767
6768 func_len " $cmds"
6769 len=$func_len_result
6770 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6771 cmds=$old_archive_cmds
6772+ elif test -n "$archiver_list_spec"; then
6773+ func_verbose "using command file archive linking..."
6774+ for obj in $oldobjs
6775+ do
6776+ func_to_tool_file "$obj"
6777+ $ECHO "$func_to_tool_file_result"
6778+ done > $output_objdir/$libname.libcmd
6779+ func_to_tool_file "$output_objdir/$libname.libcmd"
6780+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
6781+ cmds=$old_archive_cmds
6782 else
6783 # the command line is too long to link in one step, link in parts
6784 func_verbose "using piecewise archive linking..."
6785@@ -8189,7 +9189,7 @@ EOF
6786 do
6787 last_oldobj=$obj
6788 done
6789- eval "test_cmds=\"$old_archive_cmds\""
6790+ eval test_cmds=\"$old_archive_cmds\"
6791 func_len " $test_cmds"
6792 len0=$func_len_result
6793 len=$len0
6794@@ -8208,7 +9208,7 @@ EOF
6795 RANLIB=$save_RANLIB
6796 fi
6797 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6798- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
6799+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
6800 objlist=
6801 len=$len0
6802 fi
6803@@ -8216,9 +9216,9 @@ EOF
6804 RANLIB=$save_RANLIB
6805 oldobjs=$objlist
6806 if test "X$oldobjs" = "X" ; then
6807- eval "cmds=\"\$concat_cmds\""
6808+ eval cmds=\"\$concat_cmds\"
6809 else
6810- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
6811+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
6812 fi
6813 fi
6814 fi
6815@@ -8268,12 +9268,23 @@ EOF
6816 *.la)
6817 func_basename "$deplib"
6818 name="$func_basename_result"
6819- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
6820+ func_resolve_sysroot "$deplib"
6821+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6822 test -z "$libdir" && \
6823 func_fatal_error "\`$deplib' is not a valid libtool archive"
6824- newdependency_libs="$newdependency_libs $libdir/$name"
6825+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
6826+ ;;
6827+ -L*)
6828+ func_stripname -L '' "$deplib"
6829+ func_replace_sysroot "$func_stripname_result"
6830+ func_append newdependency_libs " -L$func_replace_sysroot_result"
6831 ;;
6832- *) newdependency_libs="$newdependency_libs $deplib" ;;
6833+ -R*)
6834+ func_stripname -R '' "$deplib"
6835+ func_replace_sysroot "$func_stripname_result"
6836+ func_append newdependency_libs " -R$func_replace_sysroot_result"
6837+ ;;
6838+ *) func_append newdependency_libs " $deplib" ;;
6839 esac
6840 done
6841 dependency_libs="$newdependency_libs"
6842@@ -8284,12 +9295,14 @@ EOF
6843 *.la)
6844 func_basename "$lib"
6845 name="$func_basename_result"
6846- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6847+ func_resolve_sysroot "$lib"
6848+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6849+
6850 test -z "$libdir" && \
6851 func_fatal_error "\`$lib' is not a valid libtool archive"
6852- newdlfiles="$newdlfiles $libdir/$name"
6853+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
6854 ;;
6855- *) newdlfiles="$newdlfiles $lib" ;;
6856+ *) func_append newdlfiles " $lib" ;;
6857 esac
6858 done
6859 dlfiles="$newdlfiles"
6860@@ -8303,10 +9316,11 @@ EOF
6861 # the library:
6862 func_basename "$lib"
6863 name="$func_basename_result"
6864- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6865+ func_resolve_sysroot "$lib"
6866+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6867 test -z "$libdir" && \
6868 func_fatal_error "\`$lib' is not a valid libtool archive"
6869- newdlprefiles="$newdlprefiles $libdir/$name"
6870+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
6871 ;;
6872 esac
6873 done
6874@@ -8318,7 +9332,7 @@ EOF
6875 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6876 *) abs=`pwd`"/$lib" ;;
6877 esac
6878- newdlfiles="$newdlfiles $abs"
6879+ func_append newdlfiles " $abs"
6880 done
6881 dlfiles="$newdlfiles"
6882 newdlprefiles=
6883@@ -8327,7 +9341,7 @@ EOF
6884 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6885 *) abs=`pwd`"/$lib" ;;
6886 esac
6887- newdlprefiles="$newdlprefiles $abs"
6888+ func_append newdlprefiles " $abs"
6889 done
6890 dlprefiles="$newdlprefiles"
6891 fi
6892@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
6893 exit $EXIT_SUCCESS
6894 }
6895
6896-{ test "$mode" = link || test "$mode" = relink; } &&
6897+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
6898 func_mode_link ${1+"$@"}
6899
6900
6901@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
6902 for arg
6903 do
6904 case $arg in
6905- -f) RM="$RM $arg"; rmforce=yes ;;
6906- -*) RM="$RM $arg" ;;
6907- *) files="$files $arg" ;;
6908+ -f) func_append RM " $arg"; rmforce=yes ;;
6909+ -*) func_append RM " $arg" ;;
6910+ *) func_append files " $arg" ;;
6911 esac
6912 done
6913
6914@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
6915
6916 rmdirs=
6917
6918- origobjdir="$objdir"
6919 for file in $files; do
6920 func_dirname "$file" "" "."
6921 dir="$func_dirname_result"
6922 if test "X$dir" = X.; then
6923- objdir="$origobjdir"
6924+ odir="$objdir"
6925 else
6926- objdir="$dir/$origobjdir"
6927+ odir="$dir/$objdir"
6928 fi
6929 func_basename "$file"
6930 name="$func_basename_result"
6931- test "$mode" = uninstall && objdir="$dir"
6932+ test "$opt_mode" = uninstall && odir="$dir"
6933
6934- # Remember objdir for removal later, being careful to avoid duplicates
6935- if test "$mode" = clean; then
6936+ # Remember odir for removal later, being careful to avoid duplicates
6937+ if test "$opt_mode" = clean; then
6938 case " $rmdirs " in
6939- *" $objdir "*) ;;
6940- *) rmdirs="$rmdirs $objdir" ;;
6941+ *" $odir "*) ;;
6942+ *) func_append rmdirs " $odir" ;;
6943 esac
6944 fi
6945
6946@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
6947
6948 # Delete the libtool libraries and symlinks.
6949 for n in $library_names; do
6950- rmfiles="$rmfiles $objdir/$n"
6951+ func_append rmfiles " $odir/$n"
6952 done
6953- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
6954+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
6955
6956- case "$mode" in
6957+ case "$opt_mode" in
6958 clean)
6959- case " $library_names " in
6960- # " " in the beginning catches empty $dlname
6961+ case " $library_names " in
6962 *" $dlname "*) ;;
6963- *) rmfiles="$rmfiles $objdir/$dlname" ;;
6964+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
6965 esac
6966- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
6967+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
6968 ;;
6969 uninstall)
6970 if test -n "$library_names"; then
6971@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
6972 # Add PIC object to the list of files to remove.
6973 if test -n "$pic_object" &&
6974 test "$pic_object" != none; then
6975- rmfiles="$rmfiles $dir/$pic_object"
6976+ func_append rmfiles " $dir/$pic_object"
6977 fi
6978
6979 # Add non-PIC object to the list of files to remove.
6980 if test -n "$non_pic_object" &&
6981 test "$non_pic_object" != none; then
6982- rmfiles="$rmfiles $dir/$non_pic_object"
6983+ func_append rmfiles " $dir/$non_pic_object"
6984 fi
6985 fi
6986 ;;
6987
6988 *)
6989- if test "$mode" = clean ; then
6990+ if test "$opt_mode" = clean ; then
6991 noexename=$name
6992 case $file in
6993 *.exe)
6994@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
6995 noexename=$func_stripname_result
6996 # $file with .exe has already been added to rmfiles,
6997 # add $file without .exe
6998- rmfiles="$rmfiles $file"
6999+ func_append rmfiles " $file"
7000 ;;
7001 esac
7002 # Do a test to see if this is a libtool program.
7003@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
7004 func_ltwrapper_scriptname "$file"
7005 relink_command=
7006 func_source $func_ltwrapper_scriptname_result
7007- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
7008+ func_append rmfiles " $func_ltwrapper_scriptname_result"
7009 else
7010 relink_command=
7011 func_source $dir/$noexename
7012@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
7013
7014 # note $name still contains .exe if it was in $file originally
7015 # as does the version of $file that was added into $rmfiles
7016- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
7017+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
7018 if test "$fast_install" = yes && test -n "$relink_command"; then
7019- rmfiles="$rmfiles $objdir/lt-$name"
7020+ func_append rmfiles " $odir/lt-$name"
7021 fi
7022 if test "X$noexename" != "X$name" ; then
7023- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
7024+ func_append rmfiles " $odir/lt-${noexename}.c"
7025 fi
7026 fi
7027 fi
7028@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
7029 esac
7030 func_show_eval "$RM $rmfiles" 'exit_status=1'
7031 done
7032- objdir="$origobjdir"
7033
7034 # Try to remove the ${objdir}s in the directories where we deleted files
7035 for dir in $rmdirs; do
7036@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
7037 exit $exit_status
7038 }
7039
7040-{ test "$mode" = uninstall || test "$mode" = clean; } &&
7041+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
7042 func_mode_uninstall ${1+"$@"}
7043
7044-test -z "$mode" && {
7045+test -z "$opt_mode" && {
7046 help="$generic_help"
7047 func_fatal_help "you must specify a MODE"
7048 }
7049
7050 test -z "$exec_cmd" && \
7051- func_fatal_help "invalid operation mode \`$mode'"
7052+ func_fatal_help "invalid operation mode \`$opt_mode'"
7053
7054 if test -n "$exec_cmd"; then
7055 eval exec "$exec_cmd"
7056Index: binutils-2.21.1/ltoptions.m4
7057===================================================================
7058--- binutils-2.21.1.orig/ltoptions.m4
7059+++ binutils-2.21.1/ltoptions.m4
7060@@ -8,7 +8,7 @@
7061 # unlimited permission to copy and/or distribute it, with or without
7062 # modifications, as long as this notice is preserved.
7063
7064-# serial 6 ltoptions.m4
7065+# serial 7 ltoptions.m4
7066
7067 # This is to help aclocal find these macros, as it can't see m4_define.
7068 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7069Index: binutils-2.21.1/ltversion.m4
7070===================================================================
7071--- binutils-2.21.1.orig/ltversion.m4
7072+++ binutils-2.21.1/ltversion.m4
7073@@ -7,17 +7,17 @@
7074 # unlimited permission to copy and/or distribute it, with or without
7075 # modifications, as long as this notice is preserved.
7076
7077-# Generated from ltversion.in.
7078+# @configure_input@
7079
7080-# serial 3134 ltversion.m4
7081+# serial 3293 ltversion.m4
7082 # This file is part of GNU Libtool
7083
7084-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
7085-m4_define([LT_PACKAGE_REVISION], [1.3134])
7086+m4_define([LT_PACKAGE_VERSION], [2.4])
7087+m4_define([LT_PACKAGE_REVISION], [1.3293])
7088
7089 AC_DEFUN([LTVERSION_VERSION],
7090-[macro_version='2.2.7a'
7091-macro_revision='1.3134'
7092+[macro_version='2.4'
7093+macro_revision='1.3293'
7094 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7095 _LT_DECL(, macro_revision, 0)
7096 ])
7097Index: binutils-2.21.1/lt~obsolete.m4
7098===================================================================
7099--- binutils-2.21.1.orig/lt~obsolete.m4
7100+++ binutils-2.21.1/lt~obsolete.m4
7101@@ -7,7 +7,7 @@
7102 # unlimited permission to copy and/or distribute it, with or without
7103 # modifications, as long as this notice is preserved.
7104
7105-# serial 4 lt~obsolete.m4
7106+# serial 5 lt~obsolete.m4
7107
7108 # These exist entirely to fool aclocal when bootstrapping libtool.
7109 #
7110Index: binutils-2.21.1/configure
7111===================================================================
7112--- binutils-2.21.1.orig/configure
7113+++ binutils-2.21.1/configure
7114@@ -2670,7 +2670,7 @@ host_libs="intl mmalloc libiberty opcode
7115 # binutils, gas and ld appear in that order because it makes sense to run
7116 # "make check" in that particular order.
7117 # If --enable-gold is used, "gold" may replace "ld".
7118-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
7119+host_tools="byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
7120
7121 # libgcj represents the runtime libraries only used by gcj.
7122 libgcj="target-libffi \
7123@@ -3148,7 +3148,7 @@ case "${target}" in
7124 am33_2.0-*-linux*)
7125 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
7126 ;;
7127- sh*-*-linux*)
7128+ sh-*-linux*)
7129 noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
7130 ;;
7131 sh*-*-pe|mips*-*-pe|*arm-wince-pe)
7132@@ -3487,7 +3487,7 @@ case "${target}" in
7133 romp-*-*)
7134 noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
7135 ;;
7136- sh*-*-* | sh64-*-*)
7137+ sh-*-* | sh64-*-*)
7138 case "${host}" in
7139 i[3456789]86-*-vsta) ;; # don't add gprof back in
7140 i[3456789]86-*-go32*) ;; # don't add gprof back in
7141@@ -7597,7 +7597,7 @@ case " $build_configdirs " in
7142 # For an installed makeinfo, we require it to be from texinfo 4.7 or
7143 # higher, else we use the "missing" dummy.
7144 if ${MAKEINFO} --version \
7145- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
7146+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
7147 :
7148 else
7149 MAKEINFO="$MISSING makeinfo"
7150Index: binutils-2.21.1/bfd/configure
7151===================================================================
7152--- binutils-2.21.1.orig/bfd/configure
7153+++ binutils-2.21.1/bfd/configure
7154@@ -667,6 +667,9 @@ OTOOL
7155 LIPO
7156 NMEDIT
7157 DSYMUTIL
7158+MANIFEST_TOOL
7159+ac_ct_AR
7160+DLLTOOL
7161 OBJDUMP
7162 LN_S
7163 NM
7164@@ -779,6 +782,7 @@ enable_static
7165 with_pic
7166 enable_fast_install
7167 with_gnu_ld
7168+with_libtool_sysroot
7169 enable_libtool_lock
7170 enable_plugins
7171 enable_largefile
7172@@ -1453,6 +1457,8 @@ Optional Packages:
7173 --with-pic try to use only PIC/non-PIC objects [default=use
7174 both]
7175 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7176+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7177+ (or the compiler's sysroot if not specified).
7178 --with-mmap try using mmap for BFD input files if available
7179 --with-separate-debug-dir=DIR
7180 Look for global separate debug info in DIR
7181@@ -5383,8 +5389,8 @@ esac
7182
7183
7184
7185-macro_version='2.2.7a'
7186-macro_revision='1.3134'
7187+macro_version='2.4'
7188+macro_revision='1.3293'
7189
7190
7191
7192@@ -5424,7 +5430,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7193 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7194 $as_echo_n "checking how to print strings... " >&6; }
7195 # Test print first, because it will be a builtin if present.
7196-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7197+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7198 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7199 ECHO='print -r --'
7200 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7201@@ -6110,8 +6116,8 @@ $as_echo_n "checking whether the shell u
7202 # Try some XSI features
7203 xsi_shell=no
7204 ( _lt_dummy="a/b/c"
7205- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7206- = c,a/b,, \
7207+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7208+ = c,a/b,b/c, \
7209 && eval 'test $(( 1 + 1 )) -eq 2 \
7210 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7211 && xsi_shell=yes
7212@@ -6160,6 +6166,80 @@ esac
7213
7214
7215
7216+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7217+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7218+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7219+ $as_echo_n "(cached) " >&6
7220+else
7221+ case $host in
7222+ *-*-mingw* )
7223+ case $build in
7224+ *-*-mingw* ) # actually msys
7225+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7226+ ;;
7227+ *-*-cygwin* )
7228+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7229+ ;;
7230+ * ) # otherwise, assume *nix
7231+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7232+ ;;
7233+ esac
7234+ ;;
7235+ *-*-cygwin* )
7236+ case $build in
7237+ *-*-mingw* ) # actually msys
7238+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7239+ ;;
7240+ *-*-cygwin* )
7241+ lt_cv_to_host_file_cmd=func_convert_file_noop
7242+ ;;
7243+ * ) # otherwise, assume *nix
7244+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7245+ ;;
7246+ esac
7247+ ;;
7248+ * ) # unhandled hosts (and "normal" native builds)
7249+ lt_cv_to_host_file_cmd=func_convert_file_noop
7250+ ;;
7251+esac
7252+
7253+fi
7254+
7255+to_host_file_cmd=$lt_cv_to_host_file_cmd
7256+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7257+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7258+
7259+
7260+
7261+
7262+
7263+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7264+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7265+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7266+ $as_echo_n "(cached) " >&6
7267+else
7268+ #assume ordinary cross tools, or native build.
7269+lt_cv_to_tool_file_cmd=func_convert_file_noop
7270+case $host in
7271+ *-*-mingw* )
7272+ case $build in
7273+ *-*-mingw* ) # actually msys
7274+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7275+ ;;
7276+ esac
7277+ ;;
7278+esac
7279+
7280+fi
7281+
7282+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7283+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7284+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7285+
7286+
7287+
7288+
7289+
7290 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7291 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7292 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7293@@ -6176,6 +6256,11 @@ case $reload_flag in
7294 esac
7295 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7296 case $host_os in
7297+ cygwin* | mingw* | pw32* | cegcc*)
7298+ if test "$GCC" != yes; then
7299+ reload_cmds=false
7300+ fi
7301+ ;;
7302 darwin*)
7303 if test "$GCC" = yes; then
7304 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7305@@ -6344,7 +6429,8 @@ mingw* | pw32*)
7306 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7307 lt_cv_file_magic_cmd='func_win32_libid'
7308 else
7309- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7310+ # Keep this pattern in sync with the one in func_win32_libid.
7311+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7312 lt_cv_file_magic_cmd='$OBJDUMP -f'
7313 fi
7314 ;;
7315@@ -6498,6 +6584,21 @@ esac
7316 fi
7317 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7318 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7319+
7320+file_magic_glob=
7321+want_nocaseglob=no
7322+if test "$build" = "$host"; then
7323+ case $host_os in
7324+ mingw* | pw32*)
7325+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7326+ want_nocaseglob=yes
7327+ else
7328+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7329+ fi
7330+ ;;
7331+ esac
7332+fi
7333+
7334 file_magic_cmd=$lt_cv_file_magic_cmd
7335 deplibs_check_method=$lt_cv_deplibs_check_method
7336 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7337@@ -6513,9 +6614,162 @@ test -z "$deplibs_check_method" && depli
7338
7339
7340
7341+
7342+
7343+
7344+
7345+
7346+
7347+
7348+
7349+
7350+
7351 if test -n "$ac_tool_prefix"; then
7352- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
7353-set dummy ${ac_tool_prefix}ar; ac_word=$2
7354+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7355+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7356+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7357+$as_echo_n "checking for $ac_word... " >&6; }
7358+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7359+ $as_echo_n "(cached) " >&6
7360+else
7361+ if test -n "$DLLTOOL"; then
7362+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7363+else
7364+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7365+for as_dir in $PATH
7366+do
7367+ IFS=$as_save_IFS
7368+ test -z "$as_dir" && as_dir=.
7369+ for ac_exec_ext in '' $ac_executable_extensions; do
7370+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7371+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7372+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7373+ break 2
7374+ fi
7375+done
7376+ done
7377+IFS=$as_save_IFS
7378+
7379+fi
7380+fi
7381+DLLTOOL=$ac_cv_prog_DLLTOOL
7382+if test -n "$DLLTOOL"; then
7383+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7384+$as_echo "$DLLTOOL" >&6; }
7385+else
7386+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7387+$as_echo "no" >&6; }
7388+fi
7389+
7390+
7391+fi
7392+if test -z "$ac_cv_prog_DLLTOOL"; then
7393+ ac_ct_DLLTOOL=$DLLTOOL
7394+ # Extract the first word of "dlltool", so it can be a program name with args.
7395+set dummy dlltool; ac_word=$2
7396+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7397+$as_echo_n "checking for $ac_word... " >&6; }
7398+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7399+ $as_echo_n "(cached) " >&6
7400+else
7401+ if test -n "$ac_ct_DLLTOOL"; then
7402+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7403+else
7404+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7405+for as_dir in $PATH
7406+do
7407+ IFS=$as_save_IFS
7408+ test -z "$as_dir" && as_dir=.
7409+ for ac_exec_ext in '' $ac_executable_extensions; do
7410+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7411+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7412+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7413+ break 2
7414+ fi
7415+done
7416+ done
7417+IFS=$as_save_IFS
7418+
7419+fi
7420+fi
7421+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7422+if test -n "$ac_ct_DLLTOOL"; then
7423+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7424+$as_echo "$ac_ct_DLLTOOL" >&6; }
7425+else
7426+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7427+$as_echo "no" >&6; }
7428+fi
7429+
7430+ if test "x$ac_ct_DLLTOOL" = x; then
7431+ DLLTOOL="false"
7432+ else
7433+ case $cross_compiling:$ac_tool_warned in
7434+yes:)
7435+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7436+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7437+ac_tool_warned=yes ;;
7438+esac
7439+ DLLTOOL=$ac_ct_DLLTOOL
7440+ fi
7441+else
7442+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7443+fi
7444+
7445+test -z "$DLLTOOL" && DLLTOOL=dlltool
7446+
7447+
7448+
7449+
7450+
7451+
7452+
7453+
7454+
7455+
7456+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7457+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7458+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
7459+ $as_echo_n "(cached) " >&6
7460+else
7461+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7462+
7463+case $host_os in
7464+cygwin* | mingw* | pw32* | cegcc*)
7465+ # two different shell functions defined in ltmain.sh
7466+ # decide which to use based on capabilities of $DLLTOOL
7467+ case `$DLLTOOL --help 2>&1` in
7468+ *--identify-strict*)
7469+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7470+ ;;
7471+ *)
7472+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7473+ ;;
7474+ esac
7475+ ;;
7476+*)
7477+ # fallback: assume linklib IS sharedlib
7478+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
7479+ ;;
7480+esac
7481+
7482+fi
7483+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
7484+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
7485+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
7486+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
7487+
7488+
7489+
7490+
7491+
7492+
7493+
7494+if test -n "$ac_tool_prefix"; then
7495+ for ac_prog in ar
7496+ do
7497+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7498+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7500 $as_echo_n "checking for $ac_word... " >&6; }
7501 if test "${ac_cv_prog_AR+set}" = set; then :
7502@@ -6531,7 +6785,7 @@ do
7503 test -z "$as_dir" && as_dir=.
7504 for ac_exec_ext in '' $ac_executable_extensions; do
7505 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7506- ac_cv_prog_AR="${ac_tool_prefix}ar"
7507+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
7508 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7509 break 2
7510 fi
7511@@ -6551,11 +6805,15 @@ $as_echo "no" >&6; }
7512 fi
7513
7514
7515+ test -n "$AR" && break
7516+ done
7517 fi
7518-if test -z "$ac_cv_prog_AR"; then
7519+if test -z "$AR"; then
7520 ac_ct_AR=$AR
7521- # Extract the first word of "ar", so it can be a program name with args.
7522-set dummy ar; ac_word=$2
7523+ for ac_prog in ar
7524+do
7525+ # Extract the first word of "$ac_prog", so it can be a program name with args.
7526+set dummy $ac_prog; ac_word=$2
7527 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7528 $as_echo_n "checking for $ac_word... " >&6; }
7529 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
7530@@ -6571,7 +6829,7 @@ do
7531 test -z "$as_dir" && as_dir=.
7532 for ac_exec_ext in '' $ac_executable_extensions; do
7533 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7534- ac_cv_prog_ac_ct_AR="ar"
7535+ ac_cv_prog_ac_ct_AR="$ac_prog"
7536 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7537 break 2
7538 fi
7539@@ -6590,6 +6848,10 @@ else
7540 $as_echo "no" >&6; }
7541 fi
7542
7543+
7544+ test -n "$ac_ct_AR" && break
7545+done
7546+
7547 if test "x$ac_ct_AR" = x; then
7548 AR="false"
7549 else
7550@@ -6601,16 +6863,72 @@ ac_tool_warned=yes ;;
7551 esac
7552 AR=$ac_ct_AR
7553 fi
7554-else
7555- AR="$ac_cv_prog_AR"
7556 fi
7557
7558-test -z "$AR" && AR=ar
7559-test -z "$AR_FLAGS" && AR_FLAGS=cru
7560+: ${AR=ar}
7561+: ${AR_FLAGS=cru}
7562+
7563+
7564+
7565+
7566+
7567+
7568+
7569+
7570+
7571+
7572
7573+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
7574+$as_echo_n "checking for archiver @FILE support... " >&6; }
7575+if test "${lt_cv_ar_at_file+set}" = set; then :
7576+ $as_echo_n "(cached) " >&6
7577+else
7578+ lt_cv_ar_at_file=no
7579+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7580+/* end confdefs.h. */
7581
7582+int
7583+main ()
7584+{
7585
7586+ ;
7587+ return 0;
7588+}
7589+_ACEOF
7590+if ac_fn_c_try_compile "$LINENO"; then :
7591+ echo conftest.$ac_objext > conftest.lst
7592+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
7593+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7594+ (eval $lt_ar_try) 2>&5
7595+ ac_status=$?
7596+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7597+ test $ac_status = 0; }
7598+ if test "$ac_status" -eq 0; then
7599+ # Ensure the archiver fails upon bogus file names.
7600+ rm -f conftest.$ac_objext libconftest.a
7601+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
7602+ (eval $lt_ar_try) 2>&5
7603+ ac_status=$?
7604+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7605+ test $ac_status = 0; }
7606+ if test "$ac_status" -ne 0; then
7607+ lt_cv_ar_at_file=@
7608+ fi
7609+ fi
7610+ rm -f conftest.* libconftest.a
7611
7612+fi
7613+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7614+
7615+fi
7616+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
7617+$as_echo "$lt_cv_ar_at_file" >&6; }
7618+
7619+if test "x$lt_cv_ar_at_file" = xno; then
7620+ archiver_list_spec=
7621+else
7622+ archiver_list_spec=$lt_cv_ar_at_file
7623+fi
7624
7625
7626
7627@@ -6952,8 +7270,8 @@ esac
7628 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7629
7630 # Transform an extracted symbol line into symbol name and symbol address
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+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
7634+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'"
7635
7636 # Handle CRLF in mingw tool chain
7637 opt_cr=
7638@@ -6989,6 +7307,7 @@ for ac_symprfx in "" "_"; do
7639 else
7640 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
7641 fi
7642+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
7643
7644 # Check to see that the pipe works correctly.
7645 pipe_works=no
7646@@ -7030,6 +7349,18 @@ _LT_EOF
7647 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
7648 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
7649 cat <<_LT_EOF > conftest.$ac_ext
7650+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
7651+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
7652+/* DATA imports from DLLs on WIN32 con't be const, because runtime
7653+ relocations are performed -- see ld's documentation on pseudo-relocs. */
7654+# define LT_DLSYM_CONST
7655+#elif defined(__osf__)
7656+/* This system does not cope well with relocations in const data. */
7657+# define LT_DLSYM_CONST
7658+#else
7659+# define LT_DLSYM_CONST const
7660+#endif
7661+
7662 #ifdef __cplusplus
7663 extern "C" {
7664 #endif
7665@@ -7041,7 +7372,7 @@ _LT_EOF
7666 cat <<_LT_EOF >> conftest.$ac_ext
7667
7668 /* The mapping between symbol names and symbols. */
7669-const struct {
7670+LT_DLSYM_CONST struct {
7671 const char *name;
7672 void *address;
7673 }
7674@@ -7067,8 +7398,8 @@ static const void *lt_preloaded_setup()
7675 _LT_EOF
7676 # Now try linking the two files.
7677 mv conftest.$ac_objext conftstm.$ac_objext
7678- lt_save_LIBS="$LIBS"
7679- lt_save_CFLAGS="$CFLAGS"
7680+ lt_globsym_save_LIBS=$LIBS
7681+ lt_globsym_save_CFLAGS=$CFLAGS
7682 LIBS="conftstm.$ac_objext"
7683 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
7684 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7685@@ -7078,8 +7409,8 @@ _LT_EOF
7686 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
7687 pipe_works=yes
7688 fi
7689- LIBS="$lt_save_LIBS"
7690- CFLAGS="$lt_save_CFLAGS"
7691+ LIBS=$lt_globsym_save_LIBS
7692+ CFLAGS=$lt_globsym_save_CFLAGS
7693 else
7694 echo "cannot find nm_test_func in $nlist" >&5
7695 fi
7696@@ -7116,6 +7447,20 @@ else
7697 $as_echo "ok" >&6; }
7698 fi
7699
7700+# Response file support.
7701+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
7702+ nm_file_list_spec='@'
7703+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
7704+ nm_file_list_spec='@'
7705+fi
7706+
7707+
7708+
7709+
7710+
7711+
7712+
7713+
7714
7715
7716
7717@@ -7135,6 +7480,41 @@ fi
7718
7719
7720
7721+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
7722+$as_echo_n "checking for sysroot... " >&6; }
7723+
7724+# Check whether --with-libtool-sysroot was given.
7725+if test "${with_libtool_sysroot+set}" = set; then :
7726+ withval=$with_libtool_sysroot;
7727+else
7728+ with_libtool_sysroot=no
7729+fi
7730+
7731+
7732+lt_sysroot=
7733+case ${with_libtool_sysroot} in #(
7734+ yes)
7735+ if test "$GCC" = yes; then
7736+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
7737+ fi
7738+ ;; #(
7739+ /*)
7740+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
7741+ ;; #(
7742+ no|'')
7743+ ;; #(
7744+ *)
7745+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
7746+$as_echo "${with_libtool_sysroot}" >&6; }
7747+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
7748+ ;;
7749+esac
7750+
7751+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
7752+$as_echo "${lt_sysroot:-no}" >&6; }
7753+
7754+
7755+
7756
7757
7758 # Check whether --enable-libtool-lock was given.
7759@@ -7330,6 +7710,123 @@ esac
7760
7761 need_locks="$enable_libtool_lock"
7762
7763+if test -n "$ac_tool_prefix"; then
7764+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
7765+set dummy ${ac_tool_prefix}mt; ac_word=$2
7766+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7767+$as_echo_n "checking for $ac_word... " >&6; }
7768+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
7769+ $as_echo_n "(cached) " >&6
7770+else
7771+ if test -n "$MANIFEST_TOOL"; then
7772+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
7773+else
7774+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7775+for as_dir in $PATH
7776+do
7777+ IFS=$as_save_IFS
7778+ test -z "$as_dir" && as_dir=.
7779+ for ac_exec_ext in '' $ac_executable_extensions; do
7780+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7781+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7782+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7783+ break 2
7784+ fi
7785+done
7786+ done
7787+IFS=$as_save_IFS
7788+
7789+fi
7790+fi
7791+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
7792+if test -n "$MANIFEST_TOOL"; then
7793+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
7794+$as_echo "$MANIFEST_TOOL" >&6; }
7795+else
7796+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7797+$as_echo "no" >&6; }
7798+fi
7799+
7800+
7801+fi
7802+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
7803+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
7804+ # Extract the first word of "mt", so it can be a program name with args.
7805+set dummy mt; ac_word=$2
7806+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7807+$as_echo_n "checking for $ac_word... " >&6; }
7808+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
7809+ $as_echo_n "(cached) " >&6
7810+else
7811+ if test -n "$ac_ct_MANIFEST_TOOL"; then
7812+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
7813+else
7814+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7815+for as_dir in $PATH
7816+do
7817+ IFS=$as_save_IFS
7818+ test -z "$as_dir" && as_dir=.
7819+ for ac_exec_ext in '' $ac_executable_extensions; do
7820+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7821+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7822+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7823+ break 2
7824+ fi
7825+done
7826+ done
7827+IFS=$as_save_IFS
7828+
7829+fi
7830+fi
7831+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
7832+if test -n "$ac_ct_MANIFEST_TOOL"; then
7833+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
7834+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
7835+else
7836+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7837+$as_echo "no" >&6; }
7838+fi
7839+
7840+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
7841+ MANIFEST_TOOL=":"
7842+ else
7843+ case $cross_compiling:$ac_tool_warned in
7844+yes:)
7845+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7846+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7847+ac_tool_warned=yes ;;
7848+esac
7849+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
7850+ fi
7851+else
7852+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
7853+fi
7854+
7855+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
7856+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
7857+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
7858+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
7859+ $as_echo_n "(cached) " >&6
7860+else
7861+ lt_cv_path_mainfest_tool=no
7862+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
7863+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
7864+ cat conftest.err >&5
7865+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
7866+ lt_cv_path_mainfest_tool=yes
7867+ fi
7868+ rm -f conftest*
7869+fi
7870+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
7871+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
7872+if test "x$lt_cv_path_mainfest_tool" != xyes; then
7873+ MANIFEST_TOOL=:
7874+fi
7875+
7876+
7877+
7878+
7879+
7880
7881 case $host_os in
7882 rhapsody* | darwin*)
7883@@ -7893,6 +8390,8 @@ _LT_EOF
7884 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
7885 echo "$AR cru libconftest.a conftest.o" >&5
7886 $AR cru libconftest.a conftest.o 2>&5
7887+ echo "$RANLIB libconftest.a" >&5
7888+ $RANLIB libconftest.a 2>&5
7889 cat > conftest.c << _LT_EOF
7890 int main() { return 0;}
7891 _LT_EOF
7892@@ -8057,7 +8556,8 @@ fi
7893 LIBTOOL_DEPS="$ltmain"
7894
7895 # Always use our own libtool.
7896-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
7897+LIBTOOL='$(SHELL) $(top_builddir)'
7898+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
7899
7900
7901
7902@@ -8146,7 +8646,7 @@ aix3*)
7903 esac
7904
7905 # Global variables:
7906-ofile=libtool
7907+ofile=${host_alias}-libtool
7908 can_build_shared=yes
7909
7910 # All known linkers require a `.a' archive for static linking (except MSVC,
7911@@ -8444,8 +8944,6 @@ fi
7912 lt_prog_compiler_pic=
7913 lt_prog_compiler_static=
7914
7915-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7916-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7917
7918 if test "$GCC" = yes; then
7919 lt_prog_compiler_wl='-Wl,'
7920@@ -8610,6 +9108,12 @@ $as_echo_n "checking for $compiler optio
7921 lt_prog_compiler_pic='--shared'
7922 lt_prog_compiler_static='--static'
7923 ;;
7924+ nagfor*)
7925+ # NAG Fortran compiler
7926+ lt_prog_compiler_wl='-Wl,-Wl,,'
7927+ lt_prog_compiler_pic='-PIC'
7928+ lt_prog_compiler_static='-Bstatic'
7929+ ;;
7930 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
7931 # Portland Group compilers (*not* the Pentium gcc compiler,
7932 # which looks to be a dead project)
7933@@ -8672,7 +9176,7 @@ $as_echo_n "checking for $compiler optio
7934 lt_prog_compiler_pic='-KPIC'
7935 lt_prog_compiler_static='-Bstatic'
7936 case $cc_basename in
7937- f77* | f90* | f95*)
7938+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
7939 lt_prog_compiler_wl='-Qoption ld ';;
7940 *)
7941 lt_prog_compiler_wl='-Wl,';;
7942@@ -8729,13 +9233,17 @@ case $host_os in
7943 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
7944 ;;
7945 esac
7946-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
7947-$as_echo "$lt_prog_compiler_pic" >&6; }
7948-
7949-
7950-
7951-
7952
7953+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
7954+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7955+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
7956+ $as_echo_n "(cached) " >&6
7957+else
7958+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
7959+fi
7960+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
7961+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
7962+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
7963
7964 #
7965 # Check to make sure the PIC flag actually works.
7966@@ -8796,6 +9304,11 @@ fi
7967
7968
7969
7970+
7971+
7972+
7973+
7974+
7975 #
7976 # Check to make sure the static flag actually works.
7977 #
7978@@ -9146,7 +9659,8 @@ _LT_EOF
7979 allow_undefined_flag=unsupported
7980 always_export_symbols=no
7981 enable_shared_with_static_runtimes=yes
7982- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
7983+ 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'
7984+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
7985
7986 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
7987 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7988@@ -9194,7 +9708,7 @@ _LT_EOF
7989 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
7990 && test "$tmp_diet" = no
7991 then
7992- tmp_addflag=
7993+ tmp_addflag=' $pic_flag'
7994 tmp_sharedflag='-shared'
7995 case $cc_basename,$host_cpu in
7996 pgcc*) # Portland Group C compiler
7997@@ -9245,12 +9759,12 @@ _LT_EOF
7998 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
7999 hardcode_libdir_flag_spec=
8000 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8001- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8002+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8003 if test "x$supports_anon_versioning" = xyes; then
8004 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8005 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8006 echo "local: *; };" >> $output_objdir/$libname.ver~
8007- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8008+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8009 fi
8010 ;;
8011 esac
8012@@ -9264,8 +9778,8 @@ _LT_EOF
8013 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8014 wlarc=
8015 else
8016- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8017- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8018+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8019+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8020 fi
8021 ;;
8022
8023@@ -9283,8 +9797,8 @@ _LT_EOF
8024
8025 _LT_EOF
8026 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8027- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8028- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8029+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8030+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8031 else
8032 ld_shlibs=no
8033 fi
8034@@ -9330,8 +9844,8 @@ _LT_EOF
8035
8036 *)
8037 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8038- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8039- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8040+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8041+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8042 else
8043 ld_shlibs=no
8044 fi
8045@@ -9461,7 +9975,13 @@ _LT_EOF
8046 allow_undefined_flag='-berok'
8047 # Determine the default libpath from the value encoded in an
8048 # empty executable.
8049- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8050+ if test "${lt_cv_aix_libpath+set}" = set; then
8051+ aix_libpath=$lt_cv_aix_libpath
8052+else
8053+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8054+ $as_echo_n "(cached) " >&6
8055+else
8056+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8057 /* end confdefs.h. */
8058
8059 int
8060@@ -9474,22 +9994,29 @@ main ()
8061 _ACEOF
8062 if ac_fn_c_try_link "$LINENO"; then :
8063
8064-lt_aix_libpath_sed='
8065- /Import File Strings/,/^$/ {
8066- /^0/ {
8067- s/^0 *\(.*\)$/\1/
8068- p
8069- }
8070- }'
8071-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8072-# Check for a 64-bit object if we didn't find anything.
8073-if test -z "$aix_libpath"; then
8074- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8075-fi
8076+ lt_aix_libpath_sed='
8077+ /Import File Strings/,/^$/ {
8078+ /^0/ {
8079+ s/^0 *\([^ ]*\) *$/\1/
8080+ p
8081+ }
8082+ }'
8083+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8084+ # Check for a 64-bit object if we didn't find anything.
8085+ if test -z "$lt_cv_aix_libpath_"; then
8086+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8087+ fi
8088 fi
8089 rm -f core conftest.err conftest.$ac_objext \
8090 conftest$ac_exeext conftest.$ac_ext
8091-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8092+ if test -z "$lt_cv_aix_libpath_"; then
8093+ lt_cv_aix_libpath_="/usr/lib:/lib"
8094+ fi
8095+
8096+fi
8097+
8098+ aix_libpath=$lt_cv_aix_libpath_
8099+fi
8100
8101 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8102 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"
8103@@ -9501,7 +10028,13 @@ if test -z "$aix_libpath"; then aix_libp
8104 else
8105 # Determine the default libpath from the value encoded in an
8106 # empty executable.
8107- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8108+ if test "${lt_cv_aix_libpath+set}" = set; then
8109+ aix_libpath=$lt_cv_aix_libpath
8110+else
8111+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8112+ $as_echo_n "(cached) " >&6
8113+else
8114+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8115 /* end confdefs.h. */
8116
8117 int
8118@@ -9514,22 +10047,29 @@ main ()
8119 _ACEOF
8120 if ac_fn_c_try_link "$LINENO"; then :
8121
8122-lt_aix_libpath_sed='
8123- /Import File Strings/,/^$/ {
8124- /^0/ {
8125- s/^0 *\(.*\)$/\1/
8126- p
8127- }
8128- }'
8129-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8130-# Check for a 64-bit object if we didn't find anything.
8131-if test -z "$aix_libpath"; then
8132- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8133-fi
8134+ lt_aix_libpath_sed='
8135+ /Import File Strings/,/^$/ {
8136+ /^0/ {
8137+ s/^0 *\([^ ]*\) *$/\1/
8138+ p
8139+ }
8140+ }'
8141+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8142+ # Check for a 64-bit object if we didn't find anything.
8143+ if test -z "$lt_cv_aix_libpath_"; then
8144+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8145+ fi
8146 fi
8147 rm -f core conftest.err conftest.$ac_objext \
8148 conftest$ac_exeext conftest.$ac_ext
8149-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8150+ if test -z "$lt_cv_aix_libpath_"; then
8151+ lt_cv_aix_libpath_="/usr/lib:/lib"
8152+ fi
8153+
8154+fi
8155+
8156+ aix_libpath=$lt_cv_aix_libpath_
8157+fi
8158
8159 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8160 # Warning - without using the other run time loading flags,
8161@@ -9574,20 +10114,63 @@ if test -z "$aix_libpath"; then aix_libp
8162 # Microsoft Visual C++.
8163 # hardcode_libdir_flag_spec is actually meaningless, as there is
8164 # no search path for DLLs.
8165- hardcode_libdir_flag_spec=' '
8166- allow_undefined_flag=unsupported
8167- # Tell ltmain to make .lib files, not .a files.
8168- libext=lib
8169- # Tell ltmain to make .dll files, not .so files.
8170- shrext_cmds=".dll"
8171- # FIXME: Setting linknames here is a bad hack.
8172- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8173- # The linker will automatically build a .lib file if we build a DLL.
8174- old_archive_from_new_cmds='true'
8175- # FIXME: Should let the user specify the lib program.
8176- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8177- fix_srcfile_path='`cygpath -w "$srcfile"`'
8178- enable_shared_with_static_runtimes=yes
8179+ case $cc_basename in
8180+ cl*)
8181+ # Native MSVC
8182+ hardcode_libdir_flag_spec=' '
8183+ allow_undefined_flag=unsupported
8184+ always_export_symbols=yes
8185+ file_list_spec='@'
8186+ # Tell ltmain to make .lib files, not .a files.
8187+ libext=lib
8188+ # Tell ltmain to make .dll files, not .so files.
8189+ shrext_cmds=".dll"
8190+ # FIXME: Setting linknames here is a bad hack.
8191+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8192+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8193+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8194+ else
8195+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8196+ fi~
8197+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8198+ linknames='
8199+ # The linker will not automatically build a static lib if we build a DLL.
8200+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8201+ enable_shared_with_static_runtimes=yes
8202+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8203+ # Don't use ranlib
8204+ old_postinstall_cmds='chmod 644 $oldlib'
8205+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8206+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8207+ case $lt_outputfile in
8208+ *.exe|*.EXE) ;;
8209+ *)
8210+ lt_outputfile="$lt_outputfile.exe"
8211+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8212+ ;;
8213+ esac~
8214+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8215+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8216+ $RM "$lt_outputfile.manifest";
8217+ fi'
8218+ ;;
8219+ *)
8220+ # Assume MSVC wrapper
8221+ hardcode_libdir_flag_spec=' '
8222+ allow_undefined_flag=unsupported
8223+ # Tell ltmain to make .lib files, not .a files.
8224+ libext=lib
8225+ # Tell ltmain to make .dll files, not .so files.
8226+ shrext_cmds=".dll"
8227+ # FIXME: Setting linknames here is a bad hack.
8228+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8229+ # The linker will automatically build a .lib file if we build a DLL.
8230+ old_archive_from_new_cmds='true'
8231+ # FIXME: Should let the user specify the lib program.
8232+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8233+ enable_shared_with_static_runtimes=yes
8234+ ;;
8235+ esac
8236 ;;
8237
8238 darwin* | rhapsody*)
8239@@ -9652,7 +10235,7 @@ if test -z "$aix_libpath"; then aix_libp
8240
8241 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8242 freebsd* | dragonfly*)
8243- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8244+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8245 hardcode_libdir_flag_spec='-R$libdir'
8246 hardcode_direct=yes
8247 hardcode_shlibpath_var=no
8248@@ -9660,7 +10243,7 @@ if test -z "$aix_libpath"; then aix_libp
8249
8250 hpux9*)
8251 if test "$GCC" = yes; then
8252- 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'
8253+ 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'
8254 else
8255 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'
8256 fi
8257@@ -9676,7 +10259,7 @@ if test -z "$aix_libpath"; then aix_libp
8258
8259 hpux10*)
8260 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8261- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8262+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8263 else
8264 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8265 fi
8266@@ -9700,10 +10283,10 @@ if test -z "$aix_libpath"; then aix_libp
8267 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8268 ;;
8269 ia64*)
8270- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8271+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8272 ;;
8273 *)
8274- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8275+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8276 ;;
8277 esac
8278 else
8279@@ -9782,23 +10365,36 @@ fi
8280
8281 irix5* | irix6* | nonstopux*)
8282 if test "$GCC" = yes; then
8283- 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'
8284+ 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'
8285 # Try to use the -exported_symbol ld option, if it does not
8286 # work, assume that -exports_file does not work either and
8287 # implicitly export all symbols.
8288- save_LDFLAGS="$LDFLAGS"
8289- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8290- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8291+ # This should be the same for all languages, so no per-tag cache variable.
8292+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8293+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8294+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8295+ $as_echo_n "(cached) " >&6
8296+else
8297+ save_LDFLAGS="$LDFLAGS"
8298+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8299+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8300 /* end confdefs.h. */
8301-int foo(void) {}
8302+int foo (void) { return 0; }
8303 _ACEOF
8304 if ac_fn_c_try_link "$LINENO"; then :
8305- 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'
8306-
8307+ lt_cv_irix_exported_symbol=yes
8308+else
8309+ lt_cv_irix_exported_symbol=no
8310 fi
8311 rm -f core conftest.err conftest.$ac_objext \
8312 conftest$ac_exeext conftest.$ac_ext
8313- LDFLAGS="$save_LDFLAGS"
8314+ LDFLAGS="$save_LDFLAGS"
8315+fi
8316+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8317+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8318+ if test "$lt_cv_irix_exported_symbol" = yes; then
8319+ 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'
8320+ fi
8321 else
8322 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'
8323 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'
8324@@ -9883,7 +10479,7 @@ rm -f core conftest.err conftest.$ac_obj
8325 osf4* | osf5*) # as osf3* with the addition of -msym flag
8326 if test "$GCC" = yes; then
8327 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8328- 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'
8329+ 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'
8330 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8331 else
8332 allow_undefined_flag=' -expect_unresolved \*'
8333@@ -9902,9 +10498,9 @@ rm -f core conftest.err conftest.$ac_obj
8334 no_undefined_flag=' -z defs'
8335 if test "$GCC" = yes; then
8336 wlarc='${wl}'
8337- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8338+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8339 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8340- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8341+ $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'
8342 else
8343 case `$CC -V 2>&1` in
8344 *"Compilers 5.0"*)
8345@@ -10480,8 +11076,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8346 need_version=no
8347 need_lib_prefix=no
8348
8349- case $GCC,$host_os in
8350- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8351+ case $GCC,$cc_basename in
8352+ yes,*)
8353+ # gcc
8354 library_names_spec='$libname.dll.a'
8355 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8356 postinstall_cmds='base_file=`basename \${file}`~
8357@@ -10514,13 +11111,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8358 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8359 ;;
8360 esac
8361+ dynamic_linker='Win32 ld.exe'
8362+ ;;
8363+
8364+ *,cl*)
8365+ # Native MSVC
8366+ libname_spec='$name'
8367+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8368+ library_names_spec='${libname}.dll.lib'
8369+
8370+ case $build_os in
8371+ mingw*)
8372+ sys_lib_search_path_spec=
8373+ lt_save_ifs=$IFS
8374+ IFS=';'
8375+ for lt_path in $LIB
8376+ do
8377+ IFS=$lt_save_ifs
8378+ # Let DOS variable expansion print the short 8.3 style file name.
8379+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8380+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8381+ done
8382+ IFS=$lt_save_ifs
8383+ # Convert to MSYS style.
8384+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8385+ ;;
8386+ cygwin*)
8387+ # Convert to unix form, then to dos form, then back to unix form
8388+ # but this time dos style (no spaces!) so that the unix form looks
8389+ # like /cygdrive/c/PROGRA~1:/cygdr...
8390+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8391+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8392+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8393+ ;;
8394+ *)
8395+ sys_lib_search_path_spec="$LIB"
8396+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8397+ # It is most probably a Windows format PATH.
8398+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8399+ else
8400+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8401+ fi
8402+ # FIXME: find the short name or the path components, as spaces are
8403+ # common. (e.g. "Program Files" -> "PROGRA~1")
8404+ ;;
8405+ esac
8406+
8407+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8408+ postinstall_cmds='base_file=`basename \${file}`~
8409+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8410+ dldir=$destdir/`dirname \$dlpath`~
8411+ test -d \$dldir || mkdir -p \$dldir~
8412+ $install_prog $dir/$dlname \$dldir/$dlname'
8413+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8414+ dlpath=$dir/\$dldll~
8415+ $RM \$dlpath'
8416+ shlibpath_overrides_runpath=yes
8417+ dynamic_linker='Win32 link.exe'
8418 ;;
8419
8420 *)
8421+ # Assume MSVC wrapper
8422 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8423+ dynamic_linker='Win32 ld.exe'
8424 ;;
8425 esac
8426- dynamic_linker='Win32 ld.exe'
8427 # FIXME: first we should search . and the directory the executable is in
8428 shlibpath_var=PATH
8429 ;;
8430@@ -10616,7 +11271,7 @@ haiku*)
8431 soname_spec='${libname}${release}${shared_ext}$major'
8432 shlibpath_var=LIBRARY_PATH
8433 shlibpath_overrides_runpath=yes
8434- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8435+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8436 hardcode_into_libs=yes
8437 ;;
8438
8439@@ -11412,7 +12067,7 @@ else
8440 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8441 lt_status=$lt_dlunknown
8442 cat > conftest.$ac_ext <<_LT_EOF
8443-#line 11415 "configure"
8444+#line $LINENO "configure"
8445 #include "confdefs.h"
8446
8447 #if HAVE_DLFCN_H
8448@@ -11456,10 +12111,10 @@ else
8449 /* When -fvisbility=hidden is used, assume the code has been annotated
8450 correspondingly for the symbols needed. */
8451 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8452-void fnord () __attribute__((visibility("default")));
8453+int fnord () __attribute__((visibility("default")));
8454 #endif
8455
8456-void fnord () { int i=42; }
8457+int fnord () { return 42; }
8458 int main ()
8459 {
8460 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8461@@ -11518,7 +12173,7 @@ else
8462 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8463 lt_status=$lt_dlunknown
8464 cat > conftest.$ac_ext <<_LT_EOF
8465-#line 11521 "configure"
8466+#line $LINENO "configure"
8467 #include "confdefs.h"
8468
8469 #if HAVE_DLFCN_H
8470@@ -11562,10 +12217,10 @@ else
8471 /* When -fvisbility=hidden is used, assume the code has been annotated
8472 correspondingly for the symbols needed. */
8473 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8474-void fnord () __attribute__((visibility("default")));
8475+int fnord () __attribute__((visibility("default")));
8476 #endif
8477
8478-void fnord () { int i=42; }
8479+int fnord () { return 42; }
8480 int main ()
8481 {
8482 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8483@@ -15045,7 +15700,7 @@ SHARED_LDFLAGS=
8484 if test "$enable_shared" = "yes"; then
8485 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
8486 if test -n "$x"; then
8487- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
8488+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
8489 fi
8490
8491 # More hacks to build DLLs on Windows.
8492@@ -16619,13 +17274,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
8493 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
8494 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
8495 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
8496+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
8497+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
8498 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
8499 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
8500 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
8501 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
8502 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
8503+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
8504+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
8505+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
8506+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
8507 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
8508 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
8509+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
8510 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
8511 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
8512 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
8513@@ -16640,14 +17302,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
8514 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
8515 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
8516 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"`'
8517+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
8518+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
8519 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
8520 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
8521 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
8522-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8523 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
8524+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
8525 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
8526 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
8527 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
8528+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
8529 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
8530 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
8531 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
8532@@ -16680,12 +17345,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
8533 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
8534 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
8535 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
8536-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
8537 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
8538 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
8539 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
8540 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
8541 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
8542+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
8543 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
8544 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
8545 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
8546@@ -16740,8 +17405,13 @@ reload_flag \
8547 OBJDUMP \
8548 deplibs_check_method \
8549 file_magic_cmd \
8550+file_magic_glob \
8551+want_nocaseglob \
8552+DLLTOOL \
8553+sharedlib_from_linklib_cmd \
8554 AR \
8555 AR_FLAGS \
8556+archiver_list_spec \
8557 STRIP \
8558 RANLIB \
8559 CC \
8560@@ -16751,12 +17421,14 @@ lt_cv_sys_global_symbol_pipe \
8561 lt_cv_sys_global_symbol_to_cdecl \
8562 lt_cv_sys_global_symbol_to_c_name_address \
8563 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
8564+nm_file_list_spec \
8565 lt_prog_compiler_no_builtin_flag \
8566-lt_prog_compiler_wl \
8567 lt_prog_compiler_pic \
8568+lt_prog_compiler_wl \
8569 lt_prog_compiler_static \
8570 lt_cv_prog_compiler_c_o \
8571 need_locks \
8572+MANIFEST_TOOL \
8573 DSYMUTIL \
8574 NMEDIT \
8575 LIPO \
8576@@ -16772,7 +17444,6 @@ no_undefined_flag \
8577 hardcode_libdir_flag_spec \
8578 hardcode_libdir_flag_spec_ld \
8579 hardcode_libdir_separator \
8580-fix_srcfile_path \
8581 exclude_expsyms \
8582 include_expsyms \
8583 file_list_spec \
8584@@ -16808,6 +17479,7 @@ module_cmds \
8585 module_expsym_cmds \
8586 export_symbols_cmds \
8587 prelink_cmds \
8588+postlink_cmds \
8589 postinstall_cmds \
8590 postuninstall_cmds \
8591 finish_cmds \
8592@@ -17587,7 +18259,8 @@ $as_echo X"$file" |
8593 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
8594 #
8595 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
8596-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
8597+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
8598+# Inc.
8599 # Written by Gordon Matzigkeit, 1996
8600 #
8601 # This file is part of GNU Libtool.
8602@@ -17690,19 +18363,42 @@ SP2NL=$lt_lt_SP2NL
8603 # turn newlines into spaces.
8604 NL2SP=$lt_lt_NL2SP
8605
8606+# convert \$build file names to \$host format.
8607+to_host_file_cmd=$lt_cv_to_host_file_cmd
8608+
8609+# convert \$build files to toolchain format.
8610+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
8611+
8612 # An object symbol dumper.
8613 OBJDUMP=$lt_OBJDUMP
8614
8615 # Method to check whether dependent libraries are shared objects.
8616 deplibs_check_method=$lt_deplibs_check_method
8617
8618-# Command to use when deplibs_check_method == "file_magic".
8619+# Command to use when deplibs_check_method = "file_magic".
8620 file_magic_cmd=$lt_file_magic_cmd
8621
8622+# How to find potential files when deplibs_check_method = "file_magic".
8623+file_magic_glob=$lt_file_magic_glob
8624+
8625+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
8626+want_nocaseglob=$lt_want_nocaseglob
8627+
8628+# DLL creation program.
8629+DLLTOOL=$lt_DLLTOOL
8630+
8631+# Command to associate shared and link libraries.
8632+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
8633+
8634 # The archiver.
8635 AR=$lt_AR
8636+
8637+# Flags to create an archive.
8638 AR_FLAGS=$lt_AR_FLAGS
8639
8640+# How to feed a file listing to the archiver.
8641+archiver_list_spec=$lt_archiver_list_spec
8642+
8643 # A symbol stripping program.
8644 STRIP=$lt_STRIP
8645
8646@@ -17732,6 +18428,12 @@ global_symbol_to_c_name_address=$lt_lt_c
8647 # Transform the output of nm in a C name address pair when lib prefix is needed.
8648 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
8649
8650+# Specify filename containing input files for \$NM.
8651+nm_file_list_spec=$lt_nm_file_list_spec
8652+
8653+# The root where to search for dependent libraries,and in which our libraries should be installed.
8654+lt_sysroot=$lt_sysroot
8655+
8656 # The name of the directory that contains temporary libtool files.
8657 objdir=$objdir
8658
8659@@ -17741,6 +18443,9 @@ MAGIC_CMD=$MAGIC_CMD
8660 # Must we lock files when doing compilation?
8661 need_locks=$lt_need_locks
8662
8663+# Manifest tool.
8664+MANIFEST_TOOL=$lt_MANIFEST_TOOL
8665+
8666 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
8667 DSYMUTIL=$lt_DSYMUTIL
8668
8669@@ -17855,12 +18560,12 @@ with_gcc=$GCC
8670 # Compiler flag to turn off builtin functions.
8671 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
8672
8673-# How to pass a linker flag through the compiler.
8674-wl=$lt_lt_prog_compiler_wl
8675-
8676 # Additional compiler flags for building library objects.
8677 pic_flag=$lt_lt_prog_compiler_pic
8678
8679+# How to pass a linker flag through the compiler.
8680+wl=$lt_lt_prog_compiler_wl
8681+
8682 # Compiler flag to prevent dynamic linking.
8683 link_static_flag=$lt_lt_prog_compiler_static
8684
8685@@ -17947,9 +18652,6 @@ inherit_rpath=$inherit_rpath
8686 # Whether libtool must link a program against all its dependency libraries.
8687 link_all_deplibs=$link_all_deplibs
8688
8689-# Fix the shell variable \$srcfile for the compiler.
8690-fix_srcfile_path=$lt_fix_srcfile_path
8691-
8692 # Set to "yes" if exported symbols are required.
8693 always_export_symbols=$always_export_symbols
8694
8695@@ -17965,6 +18667,9 @@ include_expsyms=$lt_include_expsyms
8696 # Commands necessary for linking programs (against libraries) with templates.
8697 prelink_cmds=$lt_prelink_cmds
8698
8699+# Commands necessary for finishing linking programs.
8700+postlink_cmds=$lt_postlink_cmds
8701+
8702 # Specify filename containing input files.
8703 file_list_spec=$lt_file_list_spec
8704
8705@@ -17997,210 +18702,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
8706 # if finds mixed CR/LF and LF-only lines. Since sed operates in
8707 # text mode, it properly converts lines to CR/LF. This bash problem
8708 # is reportedly fixed, but why not run on old versions too?
8709- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
8710- || (rm -f "$cfgfile"; exit 1)
8711-
8712- case $xsi_shell in
8713- yes)
8714- cat << \_LT_EOF >> "$cfgfile"
8715-
8716-# func_dirname file append nondir_replacement
8717-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8718-# otherwise set result to NONDIR_REPLACEMENT.
8719-func_dirname ()
8720-{
8721- case ${1} in
8722- */*) func_dirname_result="${1%/*}${2}" ;;
8723- * ) func_dirname_result="${3}" ;;
8724- esac
8725-}
8726-
8727-# func_basename file
8728-func_basename ()
8729-{
8730- func_basename_result="${1##*/}"
8731-}
8732-
8733-# func_dirname_and_basename file append nondir_replacement
8734-# perform func_basename and func_dirname in a single function
8735-# call:
8736-# dirname: Compute the dirname of FILE. If nonempty,
8737-# add APPEND to the result, otherwise set result
8738-# to NONDIR_REPLACEMENT.
8739-# value returned in "$func_dirname_result"
8740-# basename: Compute filename of FILE.
8741-# value retuned in "$func_basename_result"
8742-# Implementation must be kept synchronized with func_dirname
8743-# and func_basename. For efficiency, we do not delegate to
8744-# those functions but instead duplicate the functionality here.
8745-func_dirname_and_basename ()
8746-{
8747- case ${1} in
8748- */*) func_dirname_result="${1%/*}${2}" ;;
8749- * ) func_dirname_result="${3}" ;;
8750- esac
8751- func_basename_result="${1##*/}"
8752-}
8753-
8754-# func_stripname prefix suffix name
8755-# strip PREFIX and SUFFIX off of NAME.
8756-# PREFIX and SUFFIX must not contain globbing or regex special
8757-# characters, hashes, percent signs, but SUFFIX may contain a leading
8758-# dot (in which case that matches only a dot).
8759-func_stripname ()
8760-{
8761- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
8762- # positional parameters, so assign one to ordinary parameter first.
8763- func_stripname_result=${3}
8764- func_stripname_result=${func_stripname_result#"${1}"}
8765- func_stripname_result=${func_stripname_result%"${2}"}
8766-}
8767-
8768-# func_opt_split
8769-func_opt_split ()
8770-{
8771- func_opt_split_opt=${1%%=*}
8772- func_opt_split_arg=${1#*=}
8773-}
8774-
8775-# func_lo2o object
8776-func_lo2o ()
8777-{
8778- case ${1} in
8779- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
8780- *) func_lo2o_result=${1} ;;
8781- esac
8782-}
8783-
8784-# func_xform libobj-or-source
8785-func_xform ()
8786-{
8787- func_xform_result=${1%.*}.lo
8788-}
8789-
8790-# func_arith arithmetic-term...
8791-func_arith ()
8792-{
8793- func_arith_result=$(( $* ))
8794-}
8795-
8796-# func_len string
8797-# STRING may not start with a hyphen.
8798-func_len ()
8799-{
8800- func_len_result=${#1}
8801-}
8802-
8803-_LT_EOF
8804- ;;
8805- *) # Bourne compatible functions.
8806- cat << \_LT_EOF >> "$cfgfile"
8807-
8808-# func_dirname file append nondir_replacement
8809-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
8810-# otherwise set result to NONDIR_REPLACEMENT.
8811-func_dirname ()
8812-{
8813- # Extract subdirectory from the argument.
8814- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
8815- if test "X$func_dirname_result" = "X${1}"; then
8816- func_dirname_result="${3}"
8817- else
8818- func_dirname_result="$func_dirname_result${2}"
8819- fi
8820-}
8821-
8822-# func_basename file
8823-func_basename ()
8824-{
8825- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
8826-}
8827-
8828-
8829-# func_stripname prefix suffix name
8830-# strip PREFIX and SUFFIX off of NAME.
8831-# PREFIX and SUFFIX must not contain globbing or regex special
8832-# characters, hashes, percent signs, but SUFFIX may contain a leading
8833-# dot (in which case that matches only a dot).
8834-# func_strip_suffix prefix name
8835-func_stripname ()
8836-{
8837- case ${2} in
8838- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8839- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8840- esac
8841-}
8842-
8843-# sed scripts:
8844-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
8845-my_sed_long_arg='1s/^-[^=]*=//'
8846-
8847-# func_opt_split
8848-func_opt_split ()
8849-{
8850- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
8851- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
8852-}
8853-
8854-# func_lo2o object
8855-func_lo2o ()
8856-{
8857- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
8858-}
8859-
8860-# func_xform libobj-or-source
8861-func_xform ()
8862-{
8863- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
8864-}
8865-
8866-# func_arith arithmetic-term...
8867-func_arith ()
8868-{
8869- func_arith_result=`expr "$@"`
8870-}
8871-
8872-# func_len string
8873-# STRING may not start with a hyphen.
8874-func_len ()
8875-{
8876- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
8877-}
8878-
8879-_LT_EOF
8880-esac
8881-
8882-case $lt_shell_append in
8883- yes)
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+=\$2"
8891-}
8892-_LT_EOF
8893- ;;
8894- *)
8895- cat << \_LT_EOF >> "$cfgfile"
8896-
8897-# func_append var value
8898-# Append VALUE to the end of shell variable VAR.
8899-func_append ()
8900-{
8901- eval "$1=\$$1\$2"
8902-}
8903-
8904-_LT_EOF
8905- ;;
8906- esac
8907+ sed '$q' "$ltmain" >> "$cfgfile" \
8908+ || (rm -f "$cfgfile"; exit 1)
8909
8910+ if test x"$xsi_shell" = xyes; then
8911+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
8912+func_dirname ()\
8913+{\
8914+\ case ${1} in\
8915+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8916+\ * ) func_dirname_result="${3}" ;;\
8917+\ esac\
8918+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
8919+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8920+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8921+test 0 -eq $? || _lt_function_replace_fail=:
8922+
8923+
8924+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
8925+func_basename ()\
8926+{\
8927+\ func_basename_result="${1##*/}"\
8928+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
8929+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8930+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8931+test 0 -eq $? || _lt_function_replace_fail=:
8932+
8933+
8934+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
8935+func_dirname_and_basename ()\
8936+{\
8937+\ case ${1} in\
8938+\ */*) func_dirname_result="${1%/*}${2}" ;;\
8939+\ * ) func_dirname_result="${3}" ;;\
8940+\ esac\
8941+\ func_basename_result="${1##*/}"\
8942+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
8943+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8944+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8945+test 0 -eq $? || _lt_function_replace_fail=:
8946+
8947+
8948+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
8949+func_stripname ()\
8950+{\
8951+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
8952+\ # positional parameters, so assign one to ordinary parameter first.\
8953+\ func_stripname_result=${3}\
8954+\ func_stripname_result=${func_stripname_result#"${1}"}\
8955+\ func_stripname_result=${func_stripname_result%"${2}"}\
8956+} # Extended-shell func_stripname 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_long_opt ()$/,/^} # func_split_long_opt /c\
8963+func_split_long_opt ()\
8964+{\
8965+\ func_split_long_opt_name=${1%%=*}\
8966+\ func_split_long_opt_arg=${1#*=}\
8967+} # Extended-shell func_split_long_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_split_short_opt ()$/,/^} # func_split_short_opt /c\
8974+func_split_short_opt ()\
8975+{\
8976+\ func_split_short_opt_arg=${1#??}\
8977+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
8978+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
8979+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8980+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8981+test 0 -eq $? || _lt_function_replace_fail=:
8982+
8983+
8984+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
8985+func_lo2o ()\
8986+{\
8987+\ case ${1} in\
8988+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
8989+\ *) func_lo2o_result=${1} ;;\
8990+\ esac\
8991+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
8992+ && mv -f "$cfgfile.tmp" "$cfgfile" \
8993+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
8994+test 0 -eq $? || _lt_function_replace_fail=:
8995+
8996+
8997+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
8998+func_xform ()\
8999+{\
9000+ func_xform_result=${1%.*}.lo\
9001+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
9002+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9003+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9004+test 0 -eq $? || _lt_function_replace_fail=:
9005+
9006+
9007+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
9008+func_arith ()\
9009+{\
9010+ func_arith_result=$(( $* ))\
9011+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
9012+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9013+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9014+test 0 -eq $? || _lt_function_replace_fail=:
9015+
9016+
9017+ sed -e '/^func_len ()$/,/^} # func_len /c\
9018+func_len ()\
9019+{\
9020+ func_len_result=${#1}\
9021+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
9022+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9023+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9024+test 0 -eq $? || _lt_function_replace_fail=:
9025+
9026+fi
9027+
9028+if test x"$lt_shell_append" = xyes; then
9029+ sed -e '/^func_append ()$/,/^} # func_append /c\
9030+func_append ()\
9031+{\
9032+ eval "${1}+=\\${2}"\
9033+} # Extended-shell func_append 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+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
9040+func_append_quoted ()\
9041+{\
9042+\ func_quote_for_eval "${2}"\
9043+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
9044+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
9045+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9046+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9047+test 0 -eq $? || _lt_function_replace_fail=:
9048+
9049+
9050+ # Save a `func_append' function call where possible by direct use of '+='
9051+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
9052+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9053+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9054+ test 0 -eq $? || _lt_function_replace_fail=:
9055+else
9056+ # Save a `func_append' function call even when '+=' is not available
9057+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
9058+ && mv -f "$cfgfile.tmp" "$cfgfile" \
9059+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
9060+ test 0 -eq $? || _lt_function_replace_fail=:
9061+fi
9062+
9063+if test x"$_lt_function_replace_fail" = x":"; then
9064+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
9065+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
9066+fi
9067
9068- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
9069- || (rm -f "$cfgfile"; exit 1)
9070
9071- mv -f "$cfgfile" "$ofile" ||
9072+ mv -f "$cfgfile" "$ofile" ||
9073 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
9074 chmod +x "$ofile"
9075
9076Index: binutils-2.21.1/opcodes/configure
9077===================================================================
9078--- binutils-2.21.1.orig/opcodes/configure
9079+++ binutils-2.21.1/opcodes/configure
9080@@ -647,6 +647,9 @@ OTOOL
9081 LIPO
9082 NMEDIT
9083 DSYMUTIL
9084+MANIFEST_TOOL
9085+ac_ct_AR
9086+DLLTOOL
9087 OBJDUMP
9088 LN_S
9089 NM
9090@@ -759,6 +762,7 @@ enable_static
9091 with_pic
9092 enable_fast_install
9093 with_gnu_ld
9094+with_libtool_sysroot
9095 enable_libtool_lock
9096 enable_targets
9097 enable_werror
9098@@ -1417,6 +1421,8 @@ Optional Packages:
9099 --with-pic try to use only PIC/non-PIC objects [default=use
9100 both]
9101 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
9102+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
9103+ (or the compiler's sysroot if not specified).
9104
9105 Some influential environment variables:
9106 CC C compiler command
9107@@ -5112,8 +5118,8 @@ esac
9108
9109
9110
9111-macro_version='2.2.7a'
9112-macro_revision='1.3134'
9113+macro_version='2.4'
9114+macro_revision='1.3293'
9115
9116
9117
9118@@ -5153,7 +5159,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
9119 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
9120 $as_echo_n "checking how to print strings... " >&6; }
9121 # Test print first, because it will be a builtin if present.
9122-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
9123+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
9124 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
9125 ECHO='print -r --'
9126 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
9127@@ -5839,8 +5845,8 @@ $as_echo_n "checking whether the shell u
9128 # Try some XSI features
9129 xsi_shell=no
9130 ( _lt_dummy="a/b/c"
9131- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
9132- = c,a/b,, \
9133+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
9134+ = c,a/b,b/c, \
9135 && eval 'test $(( 1 + 1 )) -eq 2 \
9136 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
9137 && xsi_shell=yes
9138@@ -5889,6 +5895,80 @@ esac
9139
9140
9141
9142+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
9143+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
9144+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
9145+ $as_echo_n "(cached) " >&6
9146+else
9147+ case $host in
9148+ *-*-mingw* )
9149+ case $build in
9150+ *-*-mingw* ) # actually msys
9151+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
9152+ ;;
9153+ *-*-cygwin* )
9154+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
9155+ ;;
9156+ * ) # otherwise, assume *nix
9157+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
9158+ ;;
9159+ esac
9160+ ;;
9161+ *-*-cygwin* )
9162+ case $build in
9163+ *-*-mingw* ) # actually msys
9164+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
9165+ ;;
9166+ *-*-cygwin* )
9167+ lt_cv_to_host_file_cmd=func_convert_file_noop
9168+ ;;
9169+ * ) # otherwise, assume *nix
9170+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
9171+ ;;
9172+ esac
9173+ ;;
9174+ * ) # unhandled hosts (and "normal" native builds)
9175+ lt_cv_to_host_file_cmd=func_convert_file_noop
9176+ ;;
9177+esac
9178+
9179+fi
9180+
9181+to_host_file_cmd=$lt_cv_to_host_file_cmd
9182+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
9183+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
9184+
9185+
9186+
9187+
9188+
9189+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
9190+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
9191+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
9192+ $as_echo_n "(cached) " >&6
9193+else
9194+ #assume ordinary cross tools, or native build.
9195+lt_cv_to_tool_file_cmd=func_convert_file_noop
9196+case $host in
9197+ *-*-mingw* )
9198+ case $build in
9199+ *-*-mingw* ) # actually msys
9200+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
9201+ ;;
9202+ esac
9203+ ;;
9204+esac
9205+
9206+fi
9207+
9208+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9209+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
9210+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
9211+
9212+
9213+
9214+
9215+
9216 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
9217 $as_echo_n "checking for $LD option to reload object files... " >&6; }
9218 if test "${lt_cv_ld_reload_flag+set}" = set; then :
9219@@ -5905,6 +5985,11 @@ case $reload_flag in
9220 esac
9221 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9222 case $host_os in
9223+ cygwin* | mingw* | pw32* | cegcc*)
9224+ if test "$GCC" != yes; then
9225+ reload_cmds=false
9226+ fi
9227+ ;;
9228 darwin*)
9229 if test "$GCC" = yes; then
9230 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
9231@@ -6073,7 +6158,8 @@ mingw* | pw32*)
9232 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
9233 lt_cv_file_magic_cmd='func_win32_libid'
9234 else
9235- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
9236+ # Keep this pattern in sync with the one in func_win32_libid.
9237+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
9238 lt_cv_file_magic_cmd='$OBJDUMP -f'
9239 fi
9240 ;;
9241@@ -6227,6 +6313,21 @@ esac
9242 fi
9243 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
9244 $as_echo "$lt_cv_deplibs_check_method" >&6; }
9245+
9246+file_magic_glob=
9247+want_nocaseglob=no
9248+if test "$build" = "$host"; then
9249+ case $host_os in
9250+ mingw* | pw32*)
9251+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
9252+ want_nocaseglob=yes
9253+ else
9254+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
9255+ fi
9256+ ;;
9257+ esac
9258+fi
9259+
9260 file_magic_cmd=$lt_cv_file_magic_cmd
9261 deplibs_check_method=$lt_cv_deplibs_check_method
9262 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9263@@ -6242,9 +6343,162 @@ test -z "$deplibs_check_method" && depli
9264
9265
9266
9267+
9268+
9269+
9270+
9271+
9272+
9273+
9274+
9275+
9276+
9277 if test -n "$ac_tool_prefix"; then
9278- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9279-set dummy ${ac_tool_prefix}ar; ac_word=$2
9280+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
9281+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
9282+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9283+$as_echo_n "checking for $ac_word... " >&6; }
9284+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
9285+ $as_echo_n "(cached) " >&6
9286+else
9287+ if test -n "$DLLTOOL"; then
9288+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
9289+else
9290+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9291+for as_dir in $PATH
9292+do
9293+ IFS=$as_save_IFS
9294+ test -z "$as_dir" && as_dir=.
9295+ for ac_exec_ext in '' $ac_executable_extensions; do
9296+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9297+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
9298+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9299+ break 2
9300+ fi
9301+done
9302+ done
9303+IFS=$as_save_IFS
9304+
9305+fi
9306+fi
9307+DLLTOOL=$ac_cv_prog_DLLTOOL
9308+if test -n "$DLLTOOL"; then
9309+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
9310+$as_echo "$DLLTOOL" >&6; }
9311+else
9312+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9313+$as_echo "no" >&6; }
9314+fi
9315+
9316+
9317+fi
9318+if test -z "$ac_cv_prog_DLLTOOL"; then
9319+ ac_ct_DLLTOOL=$DLLTOOL
9320+ # Extract the first word of "dlltool", so it can be a program name with args.
9321+set dummy dlltool; ac_word=$2
9322+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9323+$as_echo_n "checking for $ac_word... " >&6; }
9324+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
9325+ $as_echo_n "(cached) " >&6
9326+else
9327+ if test -n "$ac_ct_DLLTOOL"; then
9328+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
9329+else
9330+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9331+for as_dir in $PATH
9332+do
9333+ IFS=$as_save_IFS
9334+ test -z "$as_dir" && as_dir=.
9335+ for ac_exec_ext in '' $ac_executable_extensions; do
9336+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9337+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
9338+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9339+ break 2
9340+ fi
9341+done
9342+ done
9343+IFS=$as_save_IFS
9344+
9345+fi
9346+fi
9347+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
9348+if test -n "$ac_ct_DLLTOOL"; then
9349+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
9350+$as_echo "$ac_ct_DLLTOOL" >&6; }
9351+else
9352+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9353+$as_echo "no" >&6; }
9354+fi
9355+
9356+ if test "x$ac_ct_DLLTOOL" = x; then
9357+ DLLTOOL="false"
9358+ else
9359+ case $cross_compiling:$ac_tool_warned in
9360+yes:)
9361+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9362+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9363+ac_tool_warned=yes ;;
9364+esac
9365+ DLLTOOL=$ac_ct_DLLTOOL
9366+ fi
9367+else
9368+ DLLTOOL="$ac_cv_prog_DLLTOOL"
9369+fi
9370+
9371+test -z "$DLLTOOL" && DLLTOOL=dlltool
9372+
9373+
9374+
9375+
9376+
9377+
9378+
9379+
9380+
9381+
9382+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
9383+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
9384+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
9385+ $as_echo_n "(cached) " >&6
9386+else
9387+ lt_cv_sharedlib_from_linklib_cmd='unknown'
9388+
9389+case $host_os in
9390+cygwin* | mingw* | pw32* | cegcc*)
9391+ # two different shell functions defined in ltmain.sh
9392+ # decide which to use based on capabilities of $DLLTOOL
9393+ case `$DLLTOOL --help 2>&1` in
9394+ *--identify-strict*)
9395+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
9396+ ;;
9397+ *)
9398+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
9399+ ;;
9400+ esac
9401+ ;;
9402+*)
9403+ # fallback: assume linklib IS sharedlib
9404+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
9405+ ;;
9406+esac
9407+
9408+fi
9409+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
9410+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
9411+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
9412+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
9413+
9414+
9415+
9416+
9417+
9418+
9419+
9420+if test -n "$ac_tool_prefix"; then
9421+ for ac_prog in ar
9422+ do
9423+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9424+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9426 $as_echo_n "checking for $ac_word... " >&6; }
9427 if test "${ac_cv_prog_AR+set}" = set; then :
9428@@ -6260,7 +6514,7 @@ do
9429 test -z "$as_dir" && as_dir=.
9430 for ac_exec_ext in '' $ac_executable_extensions; do
9431 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9432- ac_cv_prog_AR="${ac_tool_prefix}ar"
9433+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
9434 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9435 break 2
9436 fi
9437@@ -6280,11 +6534,15 @@ $as_echo "no" >&6; }
9438 fi
9439
9440
9441+ test -n "$AR" && break
9442+ done
9443 fi
9444-if test -z "$ac_cv_prog_AR"; then
9445+if test -z "$AR"; then
9446 ac_ct_AR=$AR
9447- # Extract the first word of "ar", so it can be a program name with args.
9448-set dummy ar; ac_word=$2
9449+ for ac_prog in ar
9450+do
9451+ # Extract the first word of "$ac_prog", so it can be a program name with args.
9452+set dummy $ac_prog; ac_word=$2
9453 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9454 $as_echo_n "checking for $ac_word... " >&6; }
9455 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
9456@@ -6300,7 +6558,7 @@ do
9457 test -z "$as_dir" && as_dir=.
9458 for ac_exec_ext in '' $ac_executable_extensions; do
9459 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9460- ac_cv_prog_ac_ct_AR="ar"
9461+ ac_cv_prog_ac_ct_AR="$ac_prog"
9462 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9463 break 2
9464 fi
9465@@ -6319,6 +6577,10 @@ else
9466 $as_echo "no" >&6; }
9467 fi
9468
9469+
9470+ test -n "$ac_ct_AR" && break
9471+done
9472+
9473 if test "x$ac_ct_AR" = x; then
9474 AR="false"
9475 else
9476@@ -6330,12 +6592,11 @@ ac_tool_warned=yes ;;
9477 esac
9478 AR=$ac_ct_AR
9479 fi
9480-else
9481- AR="$ac_cv_prog_AR"
9482 fi
9483
9484-test -z "$AR" && AR=ar
9485-test -z "$AR_FLAGS" && AR_FLAGS=cru
9486+: ${AR=ar}
9487+: ${AR_FLAGS=cru}
9488+
9489
9490
9491
9492@@ -6346,6 +6607,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
9493
9494
9495
9496+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
9497+$as_echo_n "checking for archiver @FILE support... " >&6; }
9498+if test "${lt_cv_ar_at_file+set}" = set; then :
9499+ $as_echo_n "(cached) " >&6
9500+else
9501+ lt_cv_ar_at_file=no
9502+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9503+/* end confdefs.h. */
9504+
9505+int
9506+main ()
9507+{
9508+
9509+ ;
9510+ return 0;
9511+}
9512+_ACEOF
9513+if ac_fn_c_try_compile "$LINENO"; then :
9514+ echo conftest.$ac_objext > conftest.lst
9515+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
9516+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9517+ (eval $lt_ar_try) 2>&5
9518+ ac_status=$?
9519+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9520+ test $ac_status = 0; }
9521+ if test "$ac_status" -eq 0; then
9522+ # Ensure the archiver fails upon bogus file names.
9523+ rm -f conftest.$ac_objext libconftest.a
9524+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9525+ (eval $lt_ar_try) 2>&5
9526+ ac_status=$?
9527+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9528+ test $ac_status = 0; }
9529+ if test "$ac_status" -ne 0; then
9530+ lt_cv_ar_at_file=@
9531+ fi
9532+ fi
9533+ rm -f conftest.* libconftest.a
9534+
9535+fi
9536+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9537+
9538+fi
9539+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
9540+$as_echo "$lt_cv_ar_at_file" >&6; }
9541+
9542+if test "x$lt_cv_ar_at_file" = xno; then
9543+ archiver_list_spec=
9544+else
9545+ archiver_list_spec=$lt_cv_ar_at_file
9546+fi
9547+
9548+
9549+
9550+
9551+
9552+
9553
9554 if test -n "$ac_tool_prefix"; then
9555 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9556@@ -6681,8 +6999,8 @@ esac
9557 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9558
9559 # Transform an extracted symbol line into symbol name and symbol address
9560-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9561-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'"
9562+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9563+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'"
9564
9565 # Handle CRLF in mingw tool chain
9566 opt_cr=
9567@@ -6718,6 +7036,7 @@ for ac_symprfx in "" "_"; do
9568 else
9569 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
9570 fi
9571+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
9572
9573 # Check to see that the pipe works correctly.
9574 pipe_works=no
9575@@ -6759,6 +7078,18 @@ _LT_EOF
9576 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
9577 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
9578 cat <<_LT_EOF > conftest.$ac_ext
9579+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
9580+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
9581+/* DATA imports from DLLs on WIN32 con't be const, because runtime
9582+ relocations are performed -- see ld's documentation on pseudo-relocs. */
9583+# define LT_DLSYM_CONST
9584+#elif defined(__osf__)
9585+/* This system does not cope well with relocations in const data. */
9586+# define LT_DLSYM_CONST
9587+#else
9588+# define LT_DLSYM_CONST const
9589+#endif
9590+
9591 #ifdef __cplusplus
9592 extern "C" {
9593 #endif
9594@@ -6770,7 +7101,7 @@ _LT_EOF
9595 cat <<_LT_EOF >> conftest.$ac_ext
9596
9597 /* The mapping between symbol names and symbols. */
9598-const struct {
9599+LT_DLSYM_CONST struct {
9600 const char *name;
9601 void *address;
9602 }
9603@@ -6796,8 +7127,8 @@ static const void *lt_preloaded_setup()
9604 _LT_EOF
9605 # Now try linking the two files.
9606 mv conftest.$ac_objext conftstm.$ac_objext
9607- lt_save_LIBS="$LIBS"
9608- lt_save_CFLAGS="$CFLAGS"
9609+ lt_globsym_save_LIBS=$LIBS
9610+ lt_globsym_save_CFLAGS=$CFLAGS
9611 LIBS="conftstm.$ac_objext"
9612 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
9613 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
9614@@ -6807,8 +7138,8 @@ _LT_EOF
9615 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
9616 pipe_works=yes
9617 fi
9618- LIBS="$lt_save_LIBS"
9619- CFLAGS="$lt_save_CFLAGS"
9620+ LIBS=$lt_globsym_save_LIBS
9621+ CFLAGS=$lt_globsym_save_CFLAGS
9622 else
9623 echo "cannot find nm_test_func in $nlist" >&5
9624 fi
9625@@ -6845,6 +7176,14 @@ else
9626 $as_echo "ok" >&6; }
9627 fi
9628
9629+# Response file support.
9630+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
9631+ nm_file_list_spec='@'
9632+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
9633+ nm_file_list_spec='@'
9634+fi
9635+
9636+
9637
9638
9639
9640@@ -6866,6 +7205,47 @@ fi
9641
9642
9643
9644+
9645+
9646+
9647+
9648+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
9649+$as_echo_n "checking for sysroot... " >&6; }
9650+
9651+# Check whether --with-libtool-sysroot was given.
9652+if test "${with_libtool_sysroot+set}" = set; then :
9653+ withval=$with_libtool_sysroot;
9654+else
9655+ with_libtool_sysroot=no
9656+fi
9657+
9658+
9659+lt_sysroot=
9660+case ${with_libtool_sysroot} in #(
9661+ yes)
9662+ if test "$GCC" = yes; then
9663+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
9664+ fi
9665+ ;; #(
9666+ /*)
9667+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
9668+ ;; #(
9669+ no|'')
9670+ ;; #(
9671+ *)
9672+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
9673+$as_echo "${with_libtool_sysroot}" >&6; }
9674+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
9675+ ;;
9676+esac
9677+
9678+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
9679+$as_echo "${lt_sysroot:-no}" >&6; }
9680+
9681+
9682+
9683+
9684+
9685 # Check whether --enable-libtool-lock was given.
9686 if test "${enable_libtool_lock+set}" = set; then :
9687 enableval=$enable_libtool_lock;
9688@@ -7059,6 +7439,123 @@ esac
9689
9690 need_locks="$enable_libtool_lock"
9691
9692+if test -n "$ac_tool_prefix"; then
9693+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
9694+set dummy ${ac_tool_prefix}mt; ac_word=$2
9695+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9696+$as_echo_n "checking for $ac_word... " >&6; }
9697+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
9698+ $as_echo_n "(cached) " >&6
9699+else
9700+ if test -n "$MANIFEST_TOOL"; then
9701+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
9702+else
9703+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9704+for as_dir in $PATH
9705+do
9706+ IFS=$as_save_IFS
9707+ test -z "$as_dir" && as_dir=.
9708+ for ac_exec_ext in '' $ac_executable_extensions; do
9709+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9710+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
9711+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9712+ break 2
9713+ fi
9714+done
9715+ done
9716+IFS=$as_save_IFS
9717+
9718+fi
9719+fi
9720+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
9721+if test -n "$MANIFEST_TOOL"; then
9722+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
9723+$as_echo "$MANIFEST_TOOL" >&6; }
9724+else
9725+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9726+$as_echo "no" >&6; }
9727+fi
9728+
9729+
9730+fi
9731+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
9732+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
9733+ # Extract the first word of "mt", so it can be a program name with args.
9734+set dummy mt; ac_word=$2
9735+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9736+$as_echo_n "checking for $ac_word... " >&6; }
9737+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
9738+ $as_echo_n "(cached) " >&6
9739+else
9740+ if test -n "$ac_ct_MANIFEST_TOOL"; then
9741+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
9742+else
9743+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9744+for as_dir in $PATH
9745+do
9746+ IFS=$as_save_IFS
9747+ test -z "$as_dir" && as_dir=.
9748+ for ac_exec_ext in '' $ac_executable_extensions; do
9749+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9750+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
9751+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9752+ break 2
9753+ fi
9754+done
9755+ done
9756+IFS=$as_save_IFS
9757+
9758+fi
9759+fi
9760+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
9761+if test -n "$ac_ct_MANIFEST_TOOL"; then
9762+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
9763+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
9764+else
9765+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9766+$as_echo "no" >&6; }
9767+fi
9768+
9769+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
9770+ MANIFEST_TOOL=":"
9771+ else
9772+ case $cross_compiling:$ac_tool_warned in
9773+yes:)
9774+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9775+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9776+ac_tool_warned=yes ;;
9777+esac
9778+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
9779+ fi
9780+else
9781+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
9782+fi
9783+
9784+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
9785+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
9786+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
9787+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
9788+ $as_echo_n "(cached) " >&6
9789+else
9790+ lt_cv_path_mainfest_tool=no
9791+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
9792+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
9793+ cat conftest.err >&5
9794+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
9795+ lt_cv_path_mainfest_tool=yes
9796+ fi
9797+ rm -f conftest*
9798+fi
9799+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
9800+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
9801+if test "x$lt_cv_path_mainfest_tool" != xyes; then
9802+ MANIFEST_TOOL=:
9803+fi
9804+
9805+
9806+
9807+
9808+
9809
9810 case $host_os in
9811 rhapsody* | darwin*)
9812@@ -7622,6 +8119,8 @@ _LT_EOF
9813 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
9814 echo "$AR cru libconftest.a conftest.o" >&5
9815 $AR cru libconftest.a conftest.o 2>&5
9816+ echo "$RANLIB libconftest.a" >&5
9817+ $RANLIB libconftest.a 2>&5
9818 cat > conftest.c << _LT_EOF
9819 int main() { return 0;}
9820 _LT_EOF
9821@@ -7787,7 +8286,8 @@ fi
9822 LIBTOOL_DEPS="$ltmain"
9823
9824 # Always use our own libtool.
9825-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
9826+LIBTOOL='$(SHELL) $(top_builddir)'
9827+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
9828
9829
9830
9831@@ -7876,7 +8376,7 @@ aix3*)
9832 esac
9833
9834 # Global variables:
9835-ofile=libtool
9836+ofile=${host_alias}-libtool
9837 can_build_shared=yes
9838
9839 # All known linkers require a `.a' archive for static linking (except MSVC,
9840@@ -8174,8 +8674,6 @@ fi
9841 lt_prog_compiler_pic=
9842 lt_prog_compiler_static=
9843
9844-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9845-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9846
9847 if test "$GCC" = yes; then
9848 lt_prog_compiler_wl='-Wl,'
9849@@ -8340,6 +8838,12 @@ $as_echo_n "checking for $compiler optio
9850 lt_prog_compiler_pic='--shared'
9851 lt_prog_compiler_static='--static'
9852 ;;
9853+ nagfor*)
9854+ # NAG Fortran compiler
9855+ lt_prog_compiler_wl='-Wl,-Wl,,'
9856+ lt_prog_compiler_pic='-PIC'
9857+ lt_prog_compiler_static='-Bstatic'
9858+ ;;
9859 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
9860 # Portland Group compilers (*not* the Pentium gcc compiler,
9861 # which looks to be a dead project)
9862@@ -8402,7 +8906,7 @@ $as_echo_n "checking for $compiler optio
9863 lt_prog_compiler_pic='-KPIC'
9864 lt_prog_compiler_static='-Bstatic'
9865 case $cc_basename in
9866- f77* | f90* | f95*)
9867+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
9868 lt_prog_compiler_wl='-Qoption ld ';;
9869 *)
9870 lt_prog_compiler_wl='-Wl,';;
9871@@ -8459,13 +8963,17 @@ case $host_os in
9872 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
9873 ;;
9874 esac
9875-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
9876-$as_echo "$lt_prog_compiler_pic" >&6; }
9877-
9878-
9879-
9880-
9881
9882+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9883+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9884+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
9885+ $as_echo_n "(cached) " >&6
9886+else
9887+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
9888+fi
9889+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
9890+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
9891+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
9892
9893 #
9894 # Check to make sure the PIC flag actually works.
9895@@ -8526,6 +9034,11 @@ fi
9896
9897
9898
9899+
9900+
9901+
9902+
9903+
9904 #
9905 # Check to make sure the static flag actually works.
9906 #
9907@@ -8876,7 +9389,8 @@ _LT_EOF
9908 allow_undefined_flag=unsupported
9909 always_export_symbols=no
9910 enable_shared_with_static_runtimes=yes
9911- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
9912+ 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'
9913+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9914
9915 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9916 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9917@@ -8924,7 +9438,7 @@ _LT_EOF
9918 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
9919 && test "$tmp_diet" = no
9920 then
9921- tmp_addflag=
9922+ tmp_addflag=' $pic_flag'
9923 tmp_sharedflag='-shared'
9924 case $cc_basename,$host_cpu in
9925 pgcc*) # Portland Group C compiler
9926@@ -8975,12 +9489,12 @@ _LT_EOF
9927 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
9928 hardcode_libdir_flag_spec=
9929 hardcode_libdir_flag_spec_ld='-rpath $libdir'
9930- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
9931+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
9932 if test "x$supports_anon_versioning" = xyes; then
9933 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
9934 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
9935 echo "local: *; };" >> $output_objdir/$libname.ver~
9936- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9937+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9938 fi
9939 ;;
9940 esac
9941@@ -8994,8 +9508,8 @@ _LT_EOF
9942 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9943 wlarc=
9944 else
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 fi
9950 ;;
9951
9952@@ -9013,8 +9527,8 @@ _LT_EOF
9953
9954 _LT_EOF
9955 elif $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@@ -9060,8 +9574,8 @@ _LT_EOF
9964
9965 *)
9966 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
9967- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9968- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9969+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9970+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9971 else
9972 ld_shlibs=no
9973 fi
9974@@ -9191,7 +9705,13 @@ _LT_EOF
9975 allow_undefined_flag='-berok'
9976 # Determine the default libpath from the value encoded in an
9977 # empty executable.
9978- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9979+ if test "${lt_cv_aix_libpath+set}" = set; then
9980+ aix_libpath=$lt_cv_aix_libpath
9981+else
9982+ if test "${lt_cv_aix_libpath_+set}" = set; then :
9983+ $as_echo_n "(cached) " >&6
9984+else
9985+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9986 /* end confdefs.h. */
9987
9988 int
9989@@ -9204,22 +9724,29 @@ main ()
9990 _ACEOF
9991 if ac_fn_c_try_link "$LINENO"; then :
9992
9993-lt_aix_libpath_sed='
9994- /Import File Strings/,/^$/ {
9995- /^0/ {
9996- s/^0 *\(.*\)$/\1/
9997- p
9998- }
9999- }'
10000-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10001-# Check for a 64-bit object if we didn't find anything.
10002-if test -z "$aix_libpath"; then
10003- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10004-fi
10005+ lt_aix_libpath_sed='
10006+ /Import File Strings/,/^$/ {
10007+ /^0/ {
10008+ s/^0 *\([^ ]*\) *$/\1/
10009+ p
10010+ }
10011+ }'
10012+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10013+ # Check for a 64-bit object if we didn't find anything.
10014+ if test -z "$lt_cv_aix_libpath_"; then
10015+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10016+ fi
10017 fi
10018 rm -f core conftest.err conftest.$ac_objext \
10019 conftest$ac_exeext conftest.$ac_ext
10020-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10021+ if test -z "$lt_cv_aix_libpath_"; then
10022+ lt_cv_aix_libpath_="/usr/lib:/lib"
10023+ fi
10024+
10025+fi
10026+
10027+ aix_libpath=$lt_cv_aix_libpath_
10028+fi
10029
10030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10031 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"
10032@@ -9231,7 +9758,13 @@ if test -z "$aix_libpath"; then aix_libp
10033 else
10034 # Determine the default libpath from the value encoded in an
10035 # empty executable.
10036- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10037+ if test "${lt_cv_aix_libpath+set}" = set; then
10038+ aix_libpath=$lt_cv_aix_libpath
10039+else
10040+ if test "${lt_cv_aix_libpath_+set}" = set; then :
10041+ $as_echo_n "(cached) " >&6
10042+else
10043+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10044 /* end confdefs.h. */
10045
10046 int
10047@@ -9244,22 +9777,29 @@ main ()
10048 _ACEOF
10049 if ac_fn_c_try_link "$LINENO"; then :
10050
10051-lt_aix_libpath_sed='
10052- /Import File Strings/,/^$/ {
10053- /^0/ {
10054- s/^0 *\(.*\)$/\1/
10055- p
10056- }
10057- }'
10058-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10059-# Check for a 64-bit object if we didn't find anything.
10060-if test -z "$aix_libpath"; then
10061- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10062-fi
10063+ lt_aix_libpath_sed='
10064+ /Import File Strings/,/^$/ {
10065+ /^0/ {
10066+ s/^0 *\([^ ]*\) *$/\1/
10067+ p
10068+ }
10069+ }'
10070+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10071+ # Check for a 64-bit object if we didn't find anything.
10072+ if test -z "$lt_cv_aix_libpath_"; then
10073+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10074+ fi
10075 fi
10076 rm -f core conftest.err conftest.$ac_objext \
10077 conftest$ac_exeext conftest.$ac_ext
10078-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10079+ if test -z "$lt_cv_aix_libpath_"; then
10080+ lt_cv_aix_libpath_="/usr/lib:/lib"
10081+ fi
10082+
10083+fi
10084+
10085+ aix_libpath=$lt_cv_aix_libpath_
10086+fi
10087
10088 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10089 # Warning - without using the other run time loading flags,
10090@@ -9304,20 +9844,63 @@ if test -z "$aix_libpath"; then aix_libp
10091 # Microsoft Visual C++.
10092 # hardcode_libdir_flag_spec is actually meaningless, as there is
10093 # no search path for DLLs.
10094- hardcode_libdir_flag_spec=' '
10095- allow_undefined_flag=unsupported
10096- # Tell ltmain to make .lib files, not .a files.
10097- libext=lib
10098- # Tell ltmain to make .dll files, not .so files.
10099- shrext_cmds=".dll"
10100- # FIXME: Setting linknames here is a bad hack.
10101- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10102- # The linker will automatically build a .lib file if we build a DLL.
10103- old_archive_from_new_cmds='true'
10104- # FIXME: Should let the user specify the lib program.
10105- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10106- fix_srcfile_path='`cygpath -w "$srcfile"`'
10107- enable_shared_with_static_runtimes=yes
10108+ case $cc_basename in
10109+ cl*)
10110+ # Native MSVC
10111+ hardcode_libdir_flag_spec=' '
10112+ allow_undefined_flag=unsupported
10113+ always_export_symbols=yes
10114+ file_list_spec='@'
10115+ # Tell ltmain to make .lib files, not .a files.
10116+ libext=lib
10117+ # Tell ltmain to make .dll files, not .so files.
10118+ shrext_cmds=".dll"
10119+ # FIXME: Setting linknames here is a bad hack.
10120+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
10121+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
10122+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
10123+ else
10124+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
10125+ fi~
10126+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
10127+ linknames='
10128+ # The linker will not automatically build a static lib if we build a DLL.
10129+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
10130+ enable_shared_with_static_runtimes=yes
10131+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
10132+ # Don't use ranlib
10133+ old_postinstall_cmds='chmod 644 $oldlib'
10134+ postlink_cmds='lt_outputfile="@OUTPUT@"~
10135+ lt_tool_outputfile="@TOOL_OUTPUT@"~
10136+ case $lt_outputfile in
10137+ *.exe|*.EXE) ;;
10138+ *)
10139+ lt_outputfile="$lt_outputfile.exe"
10140+ lt_tool_outputfile="$lt_tool_outputfile.exe"
10141+ ;;
10142+ esac~
10143+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
10144+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
10145+ $RM "$lt_outputfile.manifest";
10146+ fi'
10147+ ;;
10148+ *)
10149+ # Assume MSVC wrapper
10150+ hardcode_libdir_flag_spec=' '
10151+ allow_undefined_flag=unsupported
10152+ # Tell ltmain to make .lib files, not .a files.
10153+ libext=lib
10154+ # Tell ltmain to make .dll files, not .so files.
10155+ shrext_cmds=".dll"
10156+ # FIXME: Setting linknames here is a bad hack.
10157+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10158+ # The linker will automatically build a .lib file if we build a DLL.
10159+ old_archive_from_new_cmds='true'
10160+ # FIXME: Should let the user specify the lib program.
10161+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
10162+ enable_shared_with_static_runtimes=yes
10163+ ;;
10164+ esac
10165 ;;
10166
10167 darwin* | rhapsody*)
10168@@ -9382,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libp
10169
10170 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
10171 freebsd* | dragonfly*)
10172- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
10173+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10174 hardcode_libdir_flag_spec='-R$libdir'
10175 hardcode_direct=yes
10176 hardcode_shlibpath_var=no
10177@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libp
10178
10179 hpux9*)
10180 if test "$GCC" = yes; then
10181- 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'
10182+ 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'
10183 else
10184 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'
10185 fi
10186@@ -9406,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libp
10187
10188 hpux10*)
10189 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
10190- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10191+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10192 else
10193 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10194 fi
10195@@ -9430,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libp
10196 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10197 ;;
10198 ia64*)
10199- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10200+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10201 ;;
10202 *)
10203- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10204+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10205 ;;
10206 esac
10207 else
10208@@ -9512,23 +10095,36 @@ fi
10209
10210 irix5* | irix6* | nonstopux*)
10211 if test "$GCC" = yes; then
10212- 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'
10213+ 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'
10214 # Try to use the -exported_symbol ld option, if it does not
10215 # work, assume that -exports_file does not work either and
10216 # implicitly export all symbols.
10217- save_LDFLAGS="$LDFLAGS"
10218- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10219- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10220+ # This should be the same for all languages, so no per-tag cache variable.
10221+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
10222+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
10223+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
10224+ $as_echo_n "(cached) " >&6
10225+else
10226+ save_LDFLAGS="$LDFLAGS"
10227+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
10228+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10229 /* end confdefs.h. */
10230-int foo(void) {}
10231+int foo (void) { return 0; }
10232 _ACEOF
10233 if ac_fn_c_try_link "$LINENO"; then :
10234- 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'
10235-
10236+ lt_cv_irix_exported_symbol=yes
10237+else
10238+ lt_cv_irix_exported_symbol=no
10239 fi
10240 rm -f core conftest.err conftest.$ac_objext \
10241 conftest$ac_exeext conftest.$ac_ext
10242- LDFLAGS="$save_LDFLAGS"
10243+ LDFLAGS="$save_LDFLAGS"
10244+fi
10245+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
10246+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
10247+ if test "$lt_cv_irix_exported_symbol" = yes; then
10248+ 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'
10249+ fi
10250 else
10251 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'
10252 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'
10253@@ -9613,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_obj
10254 osf4* | osf5*) # as osf3* with the addition of -msym flag
10255 if test "$GCC" = yes; then
10256 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
10257- 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'
10258+ 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'
10259 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10260 else
10261 allow_undefined_flag=' -expect_unresolved \*'
10262@@ -9632,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_obj
10263 no_undefined_flag=' -z defs'
10264 if test "$GCC" = yes; then
10265 wlarc='${wl}'
10266- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10267+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10268 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
10269- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
10270+ $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'
10271 else
10272 case `$CC -V 2>&1` in
10273 *"Compilers 5.0"*)
10274@@ -10210,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10275 need_version=no
10276 need_lib_prefix=no
10277
10278- case $GCC,$host_os in
10279- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10280+ case $GCC,$cc_basename in
10281+ yes,*)
10282+ # gcc
10283 library_names_spec='$libname.dll.a'
10284 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10285 postinstall_cmds='base_file=`basename \${file}`~
10286@@ -10244,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
10287 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10288 ;;
10289 esac
10290+ dynamic_linker='Win32 ld.exe'
10291+ ;;
10292+
10293+ *,cl*)
10294+ # Native MSVC
10295+ libname_spec='$name'
10296+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10297+ library_names_spec='${libname}.dll.lib'
10298+
10299+ case $build_os in
10300+ mingw*)
10301+ sys_lib_search_path_spec=
10302+ lt_save_ifs=$IFS
10303+ IFS=';'
10304+ for lt_path in $LIB
10305+ do
10306+ IFS=$lt_save_ifs
10307+ # Let DOS variable expansion print the short 8.3 style file name.
10308+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10309+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10310+ done
10311+ IFS=$lt_save_ifs
10312+ # Convert to MSYS style.
10313+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
10314+ ;;
10315+ cygwin*)
10316+ # Convert to unix form, then to dos form, then back to unix form
10317+ # but this time dos style (no spaces!) so that the unix form looks
10318+ # like /cygdrive/c/PROGRA~1:/cygdr...
10319+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10320+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10321+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10322+ ;;
10323+ *)
10324+ sys_lib_search_path_spec="$LIB"
10325+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
10326+ # It is most probably a Windows format PATH.
10327+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10328+ else
10329+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10330+ fi
10331+ # FIXME: find the short name or the path components, as spaces are
10332+ # common. (e.g. "Program Files" -> "PROGRA~1")
10333+ ;;
10334+ esac
10335+
10336+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10337+ postinstall_cmds='base_file=`basename \${file}`~
10338+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10339+ dldir=$destdir/`dirname \$dlpath`~
10340+ test -d \$dldir || mkdir -p \$dldir~
10341+ $install_prog $dir/$dlname \$dldir/$dlname'
10342+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10343+ dlpath=$dir/\$dldll~
10344+ $RM \$dlpath'
10345+ shlibpath_overrides_runpath=yes
10346+ dynamic_linker='Win32 link.exe'
10347 ;;
10348
10349 *)
10350+ # Assume MSVC wrapper
10351 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
10352+ dynamic_linker='Win32 ld.exe'
10353 ;;
10354 esac
10355- dynamic_linker='Win32 ld.exe'
10356 # FIXME: first we should search . and the directory the executable is in
10357 shlibpath_var=PATH
10358 ;;
10359@@ -10346,7 +11001,7 @@ haiku*)
10360 soname_spec='${libname}${release}${shared_ext}$major'
10361 shlibpath_var=LIBRARY_PATH
10362 shlibpath_overrides_runpath=yes
10363- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10364+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10365 hardcode_into_libs=yes
10366 ;;
10367
10368@@ -11142,7 +11797,7 @@ else
10369 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10370 lt_status=$lt_dlunknown
10371 cat > conftest.$ac_ext <<_LT_EOF
10372-#line 11145 "configure"
10373+#line $LINENO "configure"
10374 #include "confdefs.h"
10375
10376 #if HAVE_DLFCN_H
10377@@ -11186,10 +11841,10 @@ else
10378 /* When -fvisbility=hidden is used, assume the code has been annotated
10379 correspondingly for the symbols needed. */
10380 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10381-void fnord () __attribute__((visibility("default")));
10382+int fnord () __attribute__((visibility("default")));
10383 #endif
10384
10385-void fnord () { int i=42; }
10386+int fnord () { return 42; }
10387 int main ()
10388 {
10389 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10390@@ -11248,7 +11903,7 @@ else
10391 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10392 lt_status=$lt_dlunknown
10393 cat > conftest.$ac_ext <<_LT_EOF
10394-#line 11251 "configure"
10395+#line $LINENO "configure"
10396 #include "confdefs.h"
10397
10398 #if HAVE_DLFCN_H
10399@@ -11292,10 +11947,10 @@ else
10400 /* When -fvisbility=hidden is used, assume the code has been annotated
10401 correspondingly for the symbols needed. */
10402 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10403-void fnord () __attribute__((visibility("default")));
10404+int fnord () __attribute__((visibility("default")));
10405 #endif
10406
10407-void fnord () { int i=42; }
10408+int fnord () { return 42; }
10409 int main ()
10410 {
10411 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10412@@ -12328,7 +12983,7 @@ if test "$enable_shared" = "yes"; then
10413 # since libbfd may not pull in the entirety of libiberty.
10414 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
10415 if test -n "$x"; then
10416- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
10417+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
10418 fi
10419
10420 case "${host}" in
10421@@ -13289,13 +13944,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
10422 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
10423 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
10424 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
10425+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
10426+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
10427 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
10428 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
10429 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
10430 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
10431 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
10432+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
10433+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
10434+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
10435+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
10436 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
10437 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
10438+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
10439 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
10440 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
10441 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
10442@@ -13310,14 +13972,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
10443 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
10444 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
10445 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"`'
10446+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
10447+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
10448 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
10449 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
10450 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
10451-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10452 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
10453+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
10454 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
10455 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
10456 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
10457+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
10458 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
10459 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
10460 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
10461@@ -13350,12 +14015,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
10462 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
10463 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
10464 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
10465-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
10466 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
10467 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
10468 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
10469 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
10470 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
10471+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
10472 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
10473 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
10474 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
10475@@ -13410,8 +14075,13 @@ reload_flag \
10476 OBJDUMP \
10477 deplibs_check_method \
10478 file_magic_cmd \
10479+file_magic_glob \
10480+want_nocaseglob \
10481+DLLTOOL \
10482+sharedlib_from_linklib_cmd \
10483 AR \
10484 AR_FLAGS \
10485+archiver_list_spec \
10486 STRIP \
10487 RANLIB \
10488 CC \
10489@@ -13421,12 +14091,14 @@ lt_cv_sys_global_symbol_pipe \
10490 lt_cv_sys_global_symbol_to_cdecl \
10491 lt_cv_sys_global_symbol_to_c_name_address \
10492 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
10493+nm_file_list_spec \
10494 lt_prog_compiler_no_builtin_flag \
10495-lt_prog_compiler_wl \
10496 lt_prog_compiler_pic \
10497+lt_prog_compiler_wl \
10498 lt_prog_compiler_static \
10499 lt_cv_prog_compiler_c_o \
10500 need_locks \
10501+MANIFEST_TOOL \
10502 DSYMUTIL \
10503 NMEDIT \
10504 LIPO \
10505@@ -13442,7 +14114,6 @@ no_undefined_flag \
10506 hardcode_libdir_flag_spec \
10507 hardcode_libdir_flag_spec_ld \
10508 hardcode_libdir_separator \
10509-fix_srcfile_path \
10510 exclude_expsyms \
10511 include_expsyms \
10512 file_list_spec \
10513@@ -13478,6 +14149,7 @@ module_cmds \
10514 module_expsym_cmds \
10515 export_symbols_cmds \
10516 prelink_cmds \
10517+postlink_cmds \
10518 postinstall_cmds \
10519 postuninstall_cmds \
10520 finish_cmds \
10521@@ -14234,7 +14906,8 @@ $as_echo X"$file" |
10522 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
10523 #
10524 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10525-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10526+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10527+# Inc.
10528 # Written by Gordon Matzigkeit, 1996
10529 #
10530 # This file is part of GNU Libtool.
10531@@ -14337,19 +15010,42 @@ SP2NL=$lt_lt_SP2NL
10532 # turn newlines into spaces.
10533 NL2SP=$lt_lt_NL2SP
10534
10535+# convert \$build file names to \$host format.
10536+to_host_file_cmd=$lt_cv_to_host_file_cmd
10537+
10538+# convert \$build files to toolchain format.
10539+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10540+
10541 # An object symbol dumper.
10542 OBJDUMP=$lt_OBJDUMP
10543
10544 # Method to check whether dependent libraries are shared objects.
10545 deplibs_check_method=$lt_deplibs_check_method
10546
10547-# Command to use when deplibs_check_method == "file_magic".
10548+# Command to use when deplibs_check_method = "file_magic".
10549 file_magic_cmd=$lt_file_magic_cmd
10550
10551+# How to find potential files when deplibs_check_method = "file_magic".
10552+file_magic_glob=$lt_file_magic_glob
10553+
10554+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
10555+want_nocaseglob=$lt_want_nocaseglob
10556+
10557+# DLL creation program.
10558+DLLTOOL=$lt_DLLTOOL
10559+
10560+# Command to associate shared and link libraries.
10561+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
10562+
10563 # The archiver.
10564 AR=$lt_AR
10565+
10566+# Flags to create an archive.
10567 AR_FLAGS=$lt_AR_FLAGS
10568
10569+# How to feed a file listing to the archiver.
10570+archiver_list_spec=$lt_archiver_list_spec
10571+
10572 # A symbol stripping program.
10573 STRIP=$lt_STRIP
10574
10575@@ -14379,6 +15075,12 @@ global_symbol_to_c_name_address=$lt_lt_c
10576 # Transform the output of nm in a C name address pair when lib prefix is needed.
10577 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
10578
10579+# Specify filename containing input files for \$NM.
10580+nm_file_list_spec=$lt_nm_file_list_spec
10581+
10582+# The root where to search for dependent libraries,and in which our libraries should be installed.
10583+lt_sysroot=$lt_sysroot
10584+
10585 # The name of the directory that contains temporary libtool files.
10586 objdir=$objdir
10587
10588@@ -14388,6 +15090,9 @@ MAGIC_CMD=$MAGIC_CMD
10589 # Must we lock files when doing compilation?
10590 need_locks=$lt_need_locks
10591
10592+# Manifest tool.
10593+MANIFEST_TOOL=$lt_MANIFEST_TOOL
10594+
10595 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10596 DSYMUTIL=$lt_DSYMUTIL
10597
10598@@ -14502,12 +15207,12 @@ with_gcc=$GCC
10599 # Compiler flag to turn off builtin functions.
10600 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10601
10602-# How to pass a linker flag through the compiler.
10603-wl=$lt_lt_prog_compiler_wl
10604-
10605 # Additional compiler flags for building library objects.
10606 pic_flag=$lt_lt_prog_compiler_pic
10607
10608+# How to pass a linker flag through the compiler.
10609+wl=$lt_lt_prog_compiler_wl
10610+
10611 # Compiler flag to prevent dynamic linking.
10612 link_static_flag=$lt_lt_prog_compiler_static
10613
10614@@ -14594,9 +15299,6 @@ inherit_rpath=$inherit_rpath
10615 # Whether libtool must link a program against all its dependency libraries.
10616 link_all_deplibs=$link_all_deplibs
10617
10618-# Fix the shell variable \$srcfile for the compiler.
10619-fix_srcfile_path=$lt_fix_srcfile_path
10620-
10621 # Set to "yes" if exported symbols are required.
10622 always_export_symbols=$always_export_symbols
10623
10624@@ -14612,6 +15314,9 @@ include_expsyms=$lt_include_expsyms
10625 # Commands necessary for linking programs (against libraries) with templates.
10626 prelink_cmds=$lt_prelink_cmds
10627
10628+# Commands necessary for finishing linking programs.
10629+postlink_cmds=$lt_postlink_cmds
10630+
10631 # Specify filename containing input files.
10632 file_list_spec=$lt_file_list_spec
10633
10634@@ -14644,210 +15349,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10635 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10636 # text mode, it properly converts lines to CR/LF. This bash problem
10637 # is reportedly fixed, but why not run on old versions too?
10638- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10639- || (rm -f "$cfgfile"; exit 1)
10640-
10641- case $xsi_shell in
10642- yes)
10643- cat << \_LT_EOF >> "$cfgfile"
10644-
10645-# func_dirname file append nondir_replacement
10646-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10647-# otherwise set result to NONDIR_REPLACEMENT.
10648-func_dirname ()
10649-{
10650- case ${1} in
10651- */*) func_dirname_result="${1%/*}${2}" ;;
10652- * ) func_dirname_result="${3}" ;;
10653- esac
10654-}
10655-
10656-# func_basename file
10657-func_basename ()
10658-{
10659- func_basename_result="${1##*/}"
10660-}
10661-
10662-# func_dirname_and_basename file append nondir_replacement
10663-# perform func_basename and func_dirname in a single function
10664-# call:
10665-# dirname: Compute the dirname of FILE. If nonempty,
10666-# add APPEND to the result, otherwise set result
10667-# to NONDIR_REPLACEMENT.
10668-# value returned in "$func_dirname_result"
10669-# basename: Compute filename of FILE.
10670-# value retuned in "$func_basename_result"
10671-# Implementation must be kept synchronized with func_dirname
10672-# and func_basename. For efficiency, we do not delegate to
10673-# those functions but instead duplicate the functionality here.
10674-func_dirname_and_basename ()
10675-{
10676- case ${1} in
10677- */*) func_dirname_result="${1%/*}${2}" ;;
10678- * ) func_dirname_result="${3}" ;;
10679- esac
10680- func_basename_result="${1##*/}"
10681-}
10682-
10683-# func_stripname prefix suffix name
10684-# strip PREFIX and SUFFIX off of NAME.
10685-# PREFIX and SUFFIX must not contain globbing or regex special
10686-# characters, hashes, percent signs, but SUFFIX may contain a leading
10687-# dot (in which case that matches only a dot).
10688-func_stripname ()
10689-{
10690- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
10691- # positional parameters, so assign one to ordinary parameter first.
10692- func_stripname_result=${3}
10693- func_stripname_result=${func_stripname_result#"${1}"}
10694- func_stripname_result=${func_stripname_result%"${2}"}
10695-}
10696-
10697-# func_opt_split
10698-func_opt_split ()
10699-{
10700- func_opt_split_opt=${1%%=*}
10701- func_opt_split_arg=${1#*=}
10702-}
10703-
10704-# func_lo2o object
10705-func_lo2o ()
10706-{
10707- case ${1} in
10708- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
10709- *) func_lo2o_result=${1} ;;
10710- esac
10711-}
10712-
10713-# func_xform libobj-or-source
10714-func_xform ()
10715-{
10716- func_xform_result=${1%.*}.lo
10717-}
10718-
10719-# func_arith arithmetic-term...
10720-func_arith ()
10721-{
10722- func_arith_result=$(( $* ))
10723-}
10724-
10725-# func_len string
10726-# STRING may not start with a hyphen.
10727-func_len ()
10728-{
10729- func_len_result=${#1}
10730-}
10731-
10732-_LT_EOF
10733- ;;
10734- *) # Bourne compatible functions.
10735- cat << \_LT_EOF >> "$cfgfile"
10736-
10737-# func_dirname file append nondir_replacement
10738-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10739-# otherwise set result to NONDIR_REPLACEMENT.
10740-func_dirname ()
10741-{
10742- # Extract subdirectory from the argument.
10743- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10744- if test "X$func_dirname_result" = "X${1}"; then
10745- func_dirname_result="${3}"
10746- else
10747- func_dirname_result="$func_dirname_result${2}"
10748- fi
10749-}
10750-
10751-# func_basename file
10752-func_basename ()
10753-{
10754- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10755-}
10756-
10757-
10758-# func_stripname prefix suffix name
10759-# strip PREFIX and SUFFIX off of NAME.
10760-# PREFIX and SUFFIX must not contain globbing or regex special
10761-# characters, hashes, percent signs, but SUFFIX may contain a leading
10762-# dot (in which case that matches only a dot).
10763-# func_strip_suffix prefix name
10764-func_stripname ()
10765-{
10766- case ${2} in
10767- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10768- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10769- esac
10770-}
10771-
10772-# sed scripts:
10773-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10774-my_sed_long_arg='1s/^-[^=]*=//'
10775-
10776-# func_opt_split
10777-func_opt_split ()
10778-{
10779- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10780- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10781-}
10782-
10783-# func_lo2o object
10784-func_lo2o ()
10785-{
10786- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10787-}
10788-
10789-# func_xform libobj-or-source
10790-func_xform ()
10791-{
10792- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10793-}
10794-
10795-# func_arith arithmetic-term...
10796-func_arith ()
10797-{
10798- func_arith_result=`expr "$@"`
10799-}
10800-
10801-# func_len string
10802-# STRING may not start with a hyphen.
10803-func_len ()
10804-{
10805- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10806-}
10807-
10808-_LT_EOF
10809-esac
10810-
10811-case $lt_shell_append in
10812- yes)
10813- cat << \_LT_EOF >> "$cfgfile"
10814-
10815-# func_append var value
10816-# Append VALUE to the end of shell variable VAR.
10817-func_append ()
10818-{
10819- eval "$1+=\$2"
10820-}
10821-_LT_EOF
10822- ;;
10823- *)
10824- cat << \_LT_EOF >> "$cfgfile"
10825-
10826-# func_append var value
10827-# Append VALUE to the end of shell variable VAR.
10828-func_append ()
10829-{
10830- eval "$1=\$$1\$2"
10831-}
10832-
10833-_LT_EOF
10834- ;;
10835- esac
10836+ sed '$q' "$ltmain" >> "$cfgfile" \
10837+ || (rm -f "$cfgfile"; exit 1)
10838
10839+ if test x"$xsi_shell" = xyes; then
10840+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10841+func_dirname ()\
10842+{\
10843+\ case ${1} in\
10844+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10845+\ * ) func_dirname_result="${3}" ;;\
10846+\ esac\
10847+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10848+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10849+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10850+test 0 -eq $? || _lt_function_replace_fail=:
10851+
10852+
10853+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10854+func_basename ()\
10855+{\
10856+\ func_basename_result="${1##*/}"\
10857+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10858+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10859+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10860+test 0 -eq $? || _lt_function_replace_fail=:
10861+
10862+
10863+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10864+func_dirname_and_basename ()\
10865+{\
10866+\ case ${1} in\
10867+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10868+\ * ) func_dirname_result="${3}" ;;\
10869+\ esac\
10870+\ func_basename_result="${1##*/}"\
10871+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10872+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10873+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10874+test 0 -eq $? || _lt_function_replace_fail=:
10875+
10876+
10877+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10878+func_stripname ()\
10879+{\
10880+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10881+\ # positional parameters, so assign one to ordinary parameter first.\
10882+\ func_stripname_result=${3}\
10883+\ func_stripname_result=${func_stripname_result#"${1}"}\
10884+\ func_stripname_result=${func_stripname_result%"${2}"}\
10885+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10886+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10887+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10888+test 0 -eq $? || _lt_function_replace_fail=:
10889+
10890+
10891+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10892+func_split_long_opt ()\
10893+{\
10894+\ func_split_long_opt_name=${1%%=*}\
10895+\ func_split_long_opt_arg=${1#*=}\
10896+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10897+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10898+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10899+test 0 -eq $? || _lt_function_replace_fail=:
10900+
10901+
10902+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10903+func_split_short_opt ()\
10904+{\
10905+\ func_split_short_opt_arg=${1#??}\
10906+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10907+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10908+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10909+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10910+test 0 -eq $? || _lt_function_replace_fail=:
10911+
10912+
10913+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10914+func_lo2o ()\
10915+{\
10916+\ case ${1} in\
10917+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10918+\ *) func_lo2o_result=${1} ;;\
10919+\ esac\
10920+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
10927+func_xform ()\
10928+{\
10929+ func_xform_result=${1%.*}.lo\
10930+} # Extended-shell func_xform 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+
10936+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10937+func_arith ()\
10938+{\
10939+ func_arith_result=$(( $* ))\
10940+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10941+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10942+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10943+test 0 -eq $? || _lt_function_replace_fail=:
10944+
10945+
10946+ sed -e '/^func_len ()$/,/^} # func_len /c\
10947+func_len ()\
10948+{\
10949+ func_len_result=${#1}\
10950+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10951+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10952+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10953+test 0 -eq $? || _lt_function_replace_fail=:
10954+
10955+fi
10956+
10957+if test x"$lt_shell_append" = xyes; then
10958+ sed -e '/^func_append ()$/,/^} # func_append /c\
10959+func_append ()\
10960+{\
10961+ eval "${1}+=\\${2}"\
10962+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10963+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10964+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10965+test 0 -eq $? || _lt_function_replace_fail=:
10966+
10967+
10968+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10969+func_append_quoted ()\
10970+{\
10971+\ func_quote_for_eval "${2}"\
10972+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10973+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10974+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10975+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10976+test 0 -eq $? || _lt_function_replace_fail=:
10977+
10978+
10979+ # Save a `func_append' function call where possible by direct use of '+='
10980+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10981+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10982+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10983+ test 0 -eq $? || _lt_function_replace_fail=:
10984+else
10985+ # Save a `func_append' function call even when '+=' is not available
10986+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10987+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10988+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10989+ test 0 -eq $? || _lt_function_replace_fail=:
10990+fi
10991+
10992+if test x"$_lt_function_replace_fail" = x":"; then
10993+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10994+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10995+fi
10996
10997- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10998- || (rm -f "$cfgfile"; exit 1)
10999
11000- mv -f "$cfgfile" "$ofile" ||
11001+ mv -f "$cfgfile" "$ofile" ||
11002 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
11003 chmod +x "$ofile"
11004
11005Index: binutils-2.21.1/binutils/configure
11006===================================================================
11007--- binutils-2.21.1.orig/binutils/configure
11008+++ binutils-2.21.1/binutils/configure
11009@@ -654,8 +654,11 @@ OTOOL
11010 LIPO
11011 NMEDIT
11012 DSYMUTIL
11013+MANIFEST_TOOL
11014 RANLIB
11015+ac_ct_AR
11016 AR
11017+DLLTOOL
11018 OBJDUMP
11019 LN_S
11020 NM
11021@@ -768,6 +771,7 @@ enable_static
11022 with_pic
11023 enable_fast_install
11024 with_gnu_ld
11025+with_libtool_sysroot
11026 enable_libtool_lock
11027 enable_targets
11028 enable_werror
11029@@ -1429,6 +1433,8 @@ Optional Packages:
11030 --with-pic try to use only PIC/non-PIC objects [default=use
11031 both]
11032 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
11033+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
11034+ (or the compiler's sysroot if not specified).
11035 --with-gnu-ld assume the C compiler uses GNU ld default=no
11036 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
11037 --without-libiconv-prefix don't search for libiconv in includedir and libdir
11038@@ -5146,8 +5152,8 @@ esac
11039
11040
11041
11042-macro_version='2.2.7a'
11043-macro_revision='1.3134'
11044+macro_version='2.4'
11045+macro_revision='1.3293'
11046
11047
11048
11049@@ -5187,7 +5193,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
11050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
11051 $as_echo_n "checking how to print strings... " >&6; }
11052 # Test print first, because it will be a builtin if present.
11053-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
11054+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
11055 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
11056 ECHO='print -r --'
11057 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
11058@@ -5873,8 +5879,8 @@ $as_echo_n "checking whether the shell u
11059 # Try some XSI features
11060 xsi_shell=no
11061 ( _lt_dummy="a/b/c"
11062- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11063- = c,a/b,, \
11064+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11065+ = c,a/b,b/c, \
11066 && eval 'test $(( 1 + 1 )) -eq 2 \
11067 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11068 && xsi_shell=yes
11069@@ -5923,6 +5929,80 @@ esac
11070
11071
11072
11073+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
11074+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
11075+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
11076+ $as_echo_n "(cached) " >&6
11077+else
11078+ case $host in
11079+ *-*-mingw* )
11080+ case $build in
11081+ *-*-mingw* ) # actually msys
11082+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
11083+ ;;
11084+ *-*-cygwin* )
11085+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
11086+ ;;
11087+ * ) # otherwise, assume *nix
11088+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
11089+ ;;
11090+ esac
11091+ ;;
11092+ *-*-cygwin* )
11093+ case $build in
11094+ *-*-mingw* ) # actually msys
11095+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
11096+ ;;
11097+ *-*-cygwin* )
11098+ lt_cv_to_host_file_cmd=func_convert_file_noop
11099+ ;;
11100+ * ) # otherwise, assume *nix
11101+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
11102+ ;;
11103+ esac
11104+ ;;
11105+ * ) # unhandled hosts (and "normal" native builds)
11106+ lt_cv_to_host_file_cmd=func_convert_file_noop
11107+ ;;
11108+esac
11109+
11110+fi
11111+
11112+to_host_file_cmd=$lt_cv_to_host_file_cmd
11113+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
11114+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
11115+
11116+
11117+
11118+
11119+
11120+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
11121+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
11122+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
11123+ $as_echo_n "(cached) " >&6
11124+else
11125+ #assume ordinary cross tools, or native build.
11126+lt_cv_to_tool_file_cmd=func_convert_file_noop
11127+case $host in
11128+ *-*-mingw* )
11129+ case $build in
11130+ *-*-mingw* ) # actually msys
11131+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
11132+ ;;
11133+ esac
11134+ ;;
11135+esac
11136+
11137+fi
11138+
11139+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
11140+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
11141+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
11142+
11143+
11144+
11145+
11146+
11147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
11148 $as_echo_n "checking for $LD option to reload object files... " >&6; }
11149 if test "${lt_cv_ld_reload_flag+set}" = set; then :
11150@@ -5939,6 +6019,11 @@ case $reload_flag in
11151 esac
11152 reload_cmds='$LD$reload_flag -o $output$reload_objs'
11153 case $host_os in
11154+ cygwin* | mingw* | pw32* | cegcc*)
11155+ if test "$GCC" != yes; then
11156+ reload_cmds=false
11157+ fi
11158+ ;;
11159 darwin*)
11160 if test "$GCC" = yes; then
11161 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
11162@@ -6107,7 +6192,8 @@ mingw* | pw32*)
11163 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
11164 lt_cv_file_magic_cmd='func_win32_libid'
11165 else
11166- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
11167+ # Keep this pattern in sync with the one in func_win32_libid.
11168+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
11169 lt_cv_file_magic_cmd='$OBJDUMP -f'
11170 fi
11171 ;;
11172@@ -6261,6 +6347,21 @@ esac
11173 fi
11174 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
11175 $as_echo "$lt_cv_deplibs_check_method" >&6; }
11176+
11177+file_magic_glob=
11178+want_nocaseglob=no
11179+if test "$build" = "$host"; then
11180+ case $host_os in
11181+ mingw* | pw32*)
11182+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
11183+ want_nocaseglob=yes
11184+ else
11185+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
11186+ fi
11187+ ;;
11188+ esac
11189+fi
11190+
11191 file_magic_cmd=$lt_cv_file_magic_cmd
11192 deplibs_check_method=$lt_cv_deplibs_check_method
11193 test -z "$deplibs_check_method" && deplibs_check_method=unknown
11194@@ -6276,9 +6377,162 @@ test -z "$deplibs_check_method" && depli
11195
11196
11197
11198+
11199+
11200+
11201+
11202+
11203+
11204+
11205+
11206+
11207+
11208 if test -n "$ac_tool_prefix"; then
11209- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
11210-set dummy ${ac_tool_prefix}ar; ac_word=$2
11211+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
11212+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
11213+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11214+$as_echo_n "checking for $ac_word... " >&6; }
11215+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
11216+ $as_echo_n "(cached) " >&6
11217+else
11218+ if test -n "$DLLTOOL"; then
11219+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
11220+else
11221+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11222+for as_dir in $PATH
11223+do
11224+ IFS=$as_save_IFS
11225+ test -z "$as_dir" && as_dir=.
11226+ for ac_exec_ext in '' $ac_executable_extensions; do
11227+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11228+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
11229+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11230+ break 2
11231+ fi
11232+done
11233+ done
11234+IFS=$as_save_IFS
11235+
11236+fi
11237+fi
11238+DLLTOOL=$ac_cv_prog_DLLTOOL
11239+if test -n "$DLLTOOL"; then
11240+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
11241+$as_echo "$DLLTOOL" >&6; }
11242+else
11243+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11244+$as_echo "no" >&6; }
11245+fi
11246+
11247+
11248+fi
11249+if test -z "$ac_cv_prog_DLLTOOL"; then
11250+ ac_ct_DLLTOOL=$DLLTOOL
11251+ # Extract the first word of "dlltool", so it can be a program name with args.
11252+set dummy dlltool; ac_word=$2
11253+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11254+$as_echo_n "checking for $ac_word... " >&6; }
11255+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
11256+ $as_echo_n "(cached) " >&6
11257+else
11258+ if test -n "$ac_ct_DLLTOOL"; then
11259+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
11260+else
11261+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11262+for as_dir in $PATH
11263+do
11264+ IFS=$as_save_IFS
11265+ test -z "$as_dir" && as_dir=.
11266+ for ac_exec_ext in '' $ac_executable_extensions; do
11267+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11268+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
11269+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11270+ break 2
11271+ fi
11272+done
11273+ done
11274+IFS=$as_save_IFS
11275+
11276+fi
11277+fi
11278+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
11279+if test -n "$ac_ct_DLLTOOL"; then
11280+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
11281+$as_echo "$ac_ct_DLLTOOL" >&6; }
11282+else
11283+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11284+$as_echo "no" >&6; }
11285+fi
11286+
11287+ if test "x$ac_ct_DLLTOOL" = x; then
11288+ DLLTOOL="false"
11289+ else
11290+ case $cross_compiling:$ac_tool_warned in
11291+yes:)
11292+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11293+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11294+ac_tool_warned=yes ;;
11295+esac
11296+ DLLTOOL=$ac_ct_DLLTOOL
11297+ fi
11298+else
11299+ DLLTOOL="$ac_cv_prog_DLLTOOL"
11300+fi
11301+
11302+test -z "$DLLTOOL" && DLLTOOL=dlltool
11303+
11304+
11305+
11306+
11307+
11308+
11309+
11310+
11311+
11312+
11313+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
11314+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
11315+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
11316+ $as_echo_n "(cached) " >&6
11317+else
11318+ lt_cv_sharedlib_from_linklib_cmd='unknown'
11319+
11320+case $host_os in
11321+cygwin* | mingw* | pw32* | cegcc*)
11322+ # two different shell functions defined in ltmain.sh
11323+ # decide which to use based on capabilities of $DLLTOOL
11324+ case `$DLLTOOL --help 2>&1` in
11325+ *--identify-strict*)
11326+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
11327+ ;;
11328+ *)
11329+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
11330+ ;;
11331+ esac
11332+ ;;
11333+*)
11334+ # fallback: assume linklib IS sharedlib
11335+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
11336+ ;;
11337+esac
11338+
11339+fi
11340+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
11341+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
11342+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
11343+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
11344+
11345+
11346+
11347+
11348+
11349+
11350+
11351+if test -n "$ac_tool_prefix"; then
11352+ for ac_prog in ar
11353+ do
11354+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
11355+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
11356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11357 $as_echo_n "checking for $ac_word... " >&6; }
11358 if test "${ac_cv_prog_AR+set}" = set; then :
11359@@ -6294,7 +6548,7 @@ do
11360 test -z "$as_dir" && as_dir=.
11361 for ac_exec_ext in '' $ac_executable_extensions; do
11362 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11363- ac_cv_prog_AR="${ac_tool_prefix}ar"
11364+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
11365 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11366 break 2
11367 fi
11368@@ -6314,11 +6568,15 @@ $as_echo "no" >&6; }
11369 fi
11370
11371
11372+ test -n "$AR" && break
11373+ done
11374 fi
11375-if test -z "$ac_cv_prog_AR"; then
11376+if test -z "$AR"; then
11377 ac_ct_AR=$AR
11378- # Extract the first word of "ar", so it can be a program name with args.
11379-set dummy ar; ac_word=$2
11380+ for ac_prog in ar
11381+do
11382+ # Extract the first word of "$ac_prog", so it can be a program name with args.
11383+set dummy $ac_prog; ac_word=$2
11384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11385 $as_echo_n "checking for $ac_word... " >&6; }
11386 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
11387@@ -6334,7 +6592,7 @@ do
11388 test -z "$as_dir" && as_dir=.
11389 for ac_exec_ext in '' $ac_executable_extensions; do
11390 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11391- ac_cv_prog_ac_ct_AR="ar"
11392+ ac_cv_prog_ac_ct_AR="$ac_prog"
11393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11394 break 2
11395 fi
11396@@ -6353,6 +6611,10 @@ else
11397 $as_echo "no" >&6; }
11398 fi
11399
11400+
11401+ test -n "$ac_ct_AR" && break
11402+done
11403+
11404 if test "x$ac_ct_AR" = x; then
11405 AR="false"
11406 else
11407@@ -6364,12 +6626,10 @@ ac_tool_warned=yes ;;
11408 esac
11409 AR=$ac_ct_AR
11410 fi
11411-else
11412- AR="$ac_cv_prog_AR"
11413 fi
11414
11415-test -z "$AR" && AR=ar
11416-test -z "$AR_FLAGS" && AR_FLAGS=cru
11417+: ${AR=ar}
11418+: ${AR_FLAGS=cru}
11419
11420
11421
11422@@ -6381,6 +6641,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
11423
11424
11425
11426+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
11427+$as_echo_n "checking for archiver @FILE support... " >&6; }
11428+if test "${lt_cv_ar_at_file+set}" = set; then :
11429+ $as_echo_n "(cached) " >&6
11430+else
11431+ lt_cv_ar_at_file=no
11432+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11433+/* end confdefs.h. */
11434+
11435+int
11436+main ()
11437+{
11438+
11439+ ;
11440+ return 0;
11441+}
11442+_ACEOF
11443+if ac_fn_c_try_compile "$LINENO"; then :
11444+ echo conftest.$ac_objext > conftest.lst
11445+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
11446+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11447+ (eval $lt_ar_try) 2>&5
11448+ ac_status=$?
11449+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11450+ test $ac_status = 0; }
11451+ if test "$ac_status" -eq 0; then
11452+ # Ensure the archiver fails upon bogus file names.
11453+ rm -f conftest.$ac_objext libconftest.a
11454+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
11455+ (eval $lt_ar_try) 2>&5
11456+ ac_status=$?
11457+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11458+ test $ac_status = 0; }
11459+ if test "$ac_status" -ne 0; then
11460+ lt_cv_ar_at_file=@
11461+ fi
11462+ fi
11463+ rm -f conftest.* libconftest.a
11464+
11465+fi
11466+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11467+
11468+fi
11469+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
11470+$as_echo "$lt_cv_ar_at_file" >&6; }
11471+
11472+if test "x$lt_cv_ar_at_file" = xno; then
11473+ archiver_list_spec=
11474+else
11475+ archiver_list_spec=$lt_cv_ar_at_file
11476+fi
11477+
11478+
11479+
11480+
11481+
11482+
11483+
11484 if test -n "$ac_tool_prefix"; then
11485 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
11486 set dummy ${ac_tool_prefix}strip; ac_word=$2
11487@@ -6715,8 +7033,8 @@ esac
11488 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11489
11490 # Transform an extracted symbol line into symbol name and symbol address
11491-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11492-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'"
11493+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11494+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'"
11495
11496 # Handle CRLF in mingw tool chain
11497 opt_cr=
11498@@ -6752,6 +7070,7 @@ for ac_symprfx in "" "_"; do
11499 else
11500 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11501 fi
11502+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
11503
11504 # Check to see that the pipe works correctly.
11505 pipe_works=no
11506@@ -6793,6 +7112,18 @@ _LT_EOF
11507 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11508 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11509 cat <<_LT_EOF > conftest.$ac_ext
11510+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
11511+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
11512+/* DATA imports from DLLs on WIN32 con't be const, because runtime
11513+ relocations are performed -- see ld's documentation on pseudo-relocs. */
11514+# define LT_DLSYM_CONST
11515+#elif defined(__osf__)
11516+/* This system does not cope well with relocations in const data. */
11517+# define LT_DLSYM_CONST
11518+#else
11519+# define LT_DLSYM_CONST const
11520+#endif
11521+
11522 #ifdef __cplusplus
11523 extern "C" {
11524 #endif
11525@@ -6804,7 +7135,7 @@ _LT_EOF
11526 cat <<_LT_EOF >> conftest.$ac_ext
11527
11528 /* The mapping between symbol names and symbols. */
11529-const struct {
11530+LT_DLSYM_CONST struct {
11531 const char *name;
11532 void *address;
11533 }
11534@@ -6830,8 +7161,8 @@ static const void *lt_preloaded_setup()
11535 _LT_EOF
11536 # Now try linking the two files.
11537 mv conftest.$ac_objext conftstm.$ac_objext
11538- lt_save_LIBS="$LIBS"
11539- lt_save_CFLAGS="$CFLAGS"
11540+ lt_globsym_save_LIBS=$LIBS
11541+ lt_globsym_save_CFLAGS=$CFLAGS
11542 LIBS="conftstm.$ac_objext"
11543 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11544 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11545@@ -6841,8 +7172,8 @@ _LT_EOF
11546 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11547 pipe_works=yes
11548 fi
11549- LIBS="$lt_save_LIBS"
11550- CFLAGS="$lt_save_CFLAGS"
11551+ LIBS=$lt_globsym_save_LIBS
11552+ CFLAGS=$lt_globsym_save_CFLAGS
11553 else
11554 echo "cannot find nm_test_func in $nlist" >&5
11555 fi
11556@@ -6879,6 +7210,19 @@ else
11557 $as_echo "ok" >&6; }
11558 fi
11559
11560+# Response file support.
11561+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11562+ nm_file_list_spec='@'
11563+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11564+ nm_file_list_spec='@'
11565+fi
11566+
11567+
11568+
11569+
11570+
11571+
11572+
11573
11574
11575
11576@@ -6899,6 +7243,42 @@ fi
11577
11578
11579
11580+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11581+$as_echo_n "checking for sysroot... " >&6; }
11582+
11583+# Check whether --with-libtool-sysroot was given.
11584+if test "${with_libtool_sysroot+set}" = set; then :
11585+ withval=$with_libtool_sysroot;
11586+else
11587+ with_libtool_sysroot=no
11588+fi
11589+
11590+
11591+lt_sysroot=
11592+case ${with_libtool_sysroot} in #(
11593+ yes)
11594+ if test "$GCC" = yes; then
11595+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11596+ fi
11597+ ;; #(
11598+ /*)
11599+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11600+ ;; #(
11601+ no|'')
11602+ ;; #(
11603+ *)
11604+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11605+$as_echo "${with_libtool_sysroot}" >&6; }
11606+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
11607+ ;;
11608+esac
11609+
11610+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11611+$as_echo "${lt_sysroot:-no}" >&6; }
11612+
11613+
11614+
11615+
11616
11617 # Check whether --enable-libtool-lock was given.
11618 if test "${enable_libtool_lock+set}" = set; then :
11619@@ -7093,6 +7473,123 @@ esac
11620
11621 need_locks="$enable_libtool_lock"
11622
11623+if test -n "$ac_tool_prefix"; then
11624+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11625+set dummy ${ac_tool_prefix}mt; ac_word=$2
11626+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11627+$as_echo_n "checking for $ac_word... " >&6; }
11628+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
11629+ $as_echo_n "(cached) " >&6
11630+else
11631+ if test -n "$MANIFEST_TOOL"; then
11632+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11633+else
11634+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11635+for as_dir in $PATH
11636+do
11637+ IFS=$as_save_IFS
11638+ test -z "$as_dir" && as_dir=.
11639+ for ac_exec_ext in '' $ac_executable_extensions; do
11640+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11641+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11642+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11643+ break 2
11644+ fi
11645+done
11646+ done
11647+IFS=$as_save_IFS
11648+
11649+fi
11650+fi
11651+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11652+if test -n "$MANIFEST_TOOL"; then
11653+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11654+$as_echo "$MANIFEST_TOOL" >&6; }
11655+else
11656+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11657+$as_echo "no" >&6; }
11658+fi
11659+
11660+
11661+fi
11662+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11663+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11664+ # Extract the first word of "mt", so it can be a program name with args.
11665+set dummy mt; ac_word=$2
11666+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11667+$as_echo_n "checking for $ac_word... " >&6; }
11668+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
11669+ $as_echo_n "(cached) " >&6
11670+else
11671+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11672+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11673+else
11674+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11675+for as_dir in $PATH
11676+do
11677+ IFS=$as_save_IFS
11678+ test -z "$as_dir" && as_dir=.
11679+ for ac_exec_ext in '' $ac_executable_extensions; do
11680+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11681+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11682+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11683+ break 2
11684+ fi
11685+done
11686+ done
11687+IFS=$as_save_IFS
11688+
11689+fi
11690+fi
11691+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11692+if test -n "$ac_ct_MANIFEST_TOOL"; then
11693+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11694+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11695+else
11696+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11697+$as_echo "no" >&6; }
11698+fi
11699+
11700+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11701+ MANIFEST_TOOL=":"
11702+ else
11703+ case $cross_compiling:$ac_tool_warned in
11704+yes:)
11705+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11706+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11707+ac_tool_warned=yes ;;
11708+esac
11709+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11710+ fi
11711+else
11712+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11713+fi
11714+
11715+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11716+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11717+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11718+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
11719+ $as_echo_n "(cached) " >&6
11720+else
11721+ lt_cv_path_mainfest_tool=no
11722+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11723+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11724+ cat conftest.err >&5
11725+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11726+ lt_cv_path_mainfest_tool=yes
11727+ fi
11728+ rm -f conftest*
11729+fi
11730+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11731+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11732+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11733+ MANIFEST_TOOL=:
11734+fi
11735+
11736+
11737+
11738+
11739+
11740
11741 case $host_os in
11742 rhapsody* | darwin*)
11743@@ -7656,6 +8153,8 @@ _LT_EOF
11744 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11745 echo "$AR cru libconftest.a conftest.o" >&5
11746 $AR cru libconftest.a conftest.o 2>&5
11747+ echo "$RANLIB libconftest.a" >&5
11748+ $RANLIB libconftest.a 2>&5
11749 cat > conftest.c << _LT_EOF
11750 int main() { return 0;}
11751 _LT_EOF
11752@@ -7851,7 +8350,8 @@ fi
11753 LIBTOOL_DEPS="$ltmain"
11754
11755 # Always use our own libtool.
11756-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11757+LIBTOOL='$(SHELL) $(top_builddir)'
11758+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
11759
11760
11761
11762@@ -7940,7 +8440,7 @@ aix3*)
11763 esac
11764
11765 # Global variables:
11766-ofile=libtool
11767+ofile=${host_alias}-libtool
11768 can_build_shared=yes
11769
11770 # All known linkers require a `.a' archive for static linking (except MSVC,
11771@@ -8238,8 +8738,6 @@ fi
11772 lt_prog_compiler_pic=
11773 lt_prog_compiler_static=
11774
11775-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11776-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11777
11778 if test "$GCC" = yes; then
11779 lt_prog_compiler_wl='-Wl,'
11780@@ -8404,6 +8902,12 @@ $as_echo_n "checking for $compiler optio
11781 lt_prog_compiler_pic='--shared'
11782 lt_prog_compiler_static='--static'
11783 ;;
11784+ nagfor*)
11785+ # NAG Fortran compiler
11786+ lt_prog_compiler_wl='-Wl,-Wl,,'
11787+ lt_prog_compiler_pic='-PIC'
11788+ lt_prog_compiler_static='-Bstatic'
11789+ ;;
11790 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11791 # Portland Group compilers (*not* the Pentium gcc compiler,
11792 # which looks to be a dead project)
11793@@ -8466,7 +8970,7 @@ $as_echo_n "checking for $compiler optio
11794 lt_prog_compiler_pic='-KPIC'
11795 lt_prog_compiler_static='-Bstatic'
11796 case $cc_basename in
11797- f77* | f90* | f95*)
11798+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11799 lt_prog_compiler_wl='-Qoption ld ';;
11800 *)
11801 lt_prog_compiler_wl='-Wl,';;
11802@@ -8523,13 +9027,17 @@ case $host_os in
11803 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11804 ;;
11805 esac
11806-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11807-$as_echo "$lt_prog_compiler_pic" >&6; }
11808-
11809-
11810-
11811-
11812
11813+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11814+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11815+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
11816+ $as_echo_n "(cached) " >&6
11817+else
11818+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11819+fi
11820+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11821+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11822+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11823
11824 #
11825 # Check to make sure the PIC flag actually works.
11826@@ -8590,6 +9098,11 @@ fi
11827
11828
11829
11830+
11831+
11832+
11833+
11834+
11835 #
11836 # Check to make sure the static flag actually works.
11837 #
11838@@ -8940,7 +9453,8 @@ _LT_EOF
11839 allow_undefined_flag=unsupported
11840 always_export_symbols=no
11841 enable_shared_with_static_runtimes=yes
11842- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11843+ 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'
11844+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11845
11846 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11847 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11848@@ -8988,7 +9502,7 @@ _LT_EOF
11849 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11850 && test "$tmp_diet" = no
11851 then
11852- tmp_addflag=
11853+ tmp_addflag=' $pic_flag'
11854 tmp_sharedflag='-shared'
11855 case $cc_basename,$host_cpu in
11856 pgcc*) # Portland Group C compiler
11857@@ -9039,12 +9553,12 @@ _LT_EOF
11858 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11859 hardcode_libdir_flag_spec=
11860 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11861- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11862+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11863 if test "x$supports_anon_versioning" = xyes; then
11864 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11865 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11866 echo "local: *; };" >> $output_objdir/$libname.ver~
11867- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11868+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11869 fi
11870 ;;
11871 esac
11872@@ -9058,8 +9572,8 @@ _LT_EOF
11873 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11874 wlarc=
11875 else
11876- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11877- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11878+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11879+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11880 fi
11881 ;;
11882
11883@@ -9077,8 +9591,8 @@ _LT_EOF
11884
11885 _LT_EOF
11886 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11887- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11888- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11889+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11890+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11891 else
11892 ld_shlibs=no
11893 fi
11894@@ -9124,8 +9638,8 @@ _LT_EOF
11895
11896 *)
11897 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11898- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11899- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11900+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11901+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11902 else
11903 ld_shlibs=no
11904 fi
11905@@ -9255,7 +9769,13 @@ _LT_EOF
11906 allow_undefined_flag='-berok'
11907 # Determine the default libpath from the value encoded in an
11908 # empty executable.
11909- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11910+ if test "${lt_cv_aix_libpath+set}" = set; then
11911+ aix_libpath=$lt_cv_aix_libpath
11912+else
11913+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11914+ $as_echo_n "(cached) " >&6
11915+else
11916+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11917 /* end confdefs.h. */
11918
11919 int
11920@@ -9268,22 +9788,29 @@ main ()
11921 _ACEOF
11922 if ac_fn_c_try_link "$LINENO"; then :
11923
11924-lt_aix_libpath_sed='
11925- /Import File Strings/,/^$/ {
11926- /^0/ {
11927- s/^0 *\(.*\)$/\1/
11928- p
11929- }
11930- }'
11931-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11932-# Check for a 64-bit object if we didn't find anything.
11933-if test -z "$aix_libpath"; then
11934- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11935-fi
11936+ lt_aix_libpath_sed='
11937+ /Import File Strings/,/^$/ {
11938+ /^0/ {
11939+ s/^0 *\([^ ]*\) *$/\1/
11940+ p
11941+ }
11942+ }'
11943+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11944+ # Check for a 64-bit object if we didn't find anything.
11945+ if test -z "$lt_cv_aix_libpath_"; then
11946+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11947+ fi
11948 fi
11949 rm -f core conftest.err conftest.$ac_objext \
11950 conftest$ac_exeext conftest.$ac_ext
11951-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11952+ if test -z "$lt_cv_aix_libpath_"; then
11953+ lt_cv_aix_libpath_="/usr/lib:/lib"
11954+ fi
11955+
11956+fi
11957+
11958+ aix_libpath=$lt_cv_aix_libpath_
11959+fi
11960
11961 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11962 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"
11963@@ -9295,7 +9822,13 @@ if test -z "$aix_libpath"; then aix_libp
11964 else
11965 # Determine the default libpath from the value encoded in an
11966 # empty executable.
11967- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11968+ if test "${lt_cv_aix_libpath+set}" = set; then
11969+ aix_libpath=$lt_cv_aix_libpath
11970+else
11971+ if test "${lt_cv_aix_libpath_+set}" = set; then :
11972+ $as_echo_n "(cached) " >&6
11973+else
11974+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11975 /* end confdefs.h. */
11976
11977 int
11978@@ -9308,22 +9841,29 @@ main ()
11979 _ACEOF
11980 if ac_fn_c_try_link "$LINENO"; then :
11981
11982-lt_aix_libpath_sed='
11983- /Import File Strings/,/^$/ {
11984- /^0/ {
11985- s/^0 *\(.*\)$/\1/
11986- p
11987- }
11988- }'
11989-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11990-# Check for a 64-bit object if we didn't find anything.
11991-if test -z "$aix_libpath"; then
11992- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11993-fi
11994+ lt_aix_libpath_sed='
11995+ /Import File Strings/,/^$/ {
11996+ /^0/ {
11997+ s/^0 *\([^ ]*\) *$/\1/
11998+ p
11999+ }
12000+ }'
12001+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12002+ # Check for a 64-bit object if we didn't find anything.
12003+ if test -z "$lt_cv_aix_libpath_"; then
12004+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12005+ fi
12006 fi
12007 rm -f core conftest.err conftest.$ac_objext \
12008 conftest$ac_exeext conftest.$ac_ext
12009-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12010+ if test -z "$lt_cv_aix_libpath_"; then
12011+ lt_cv_aix_libpath_="/usr/lib:/lib"
12012+ fi
12013+
12014+fi
12015+
12016+ aix_libpath=$lt_cv_aix_libpath_
12017+fi
12018
12019 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
12020 # Warning - without using the other run time loading flags,
12021@@ -9368,20 +9908,63 @@ if test -z "$aix_libpath"; then aix_libp
12022 # Microsoft Visual C++.
12023 # hardcode_libdir_flag_spec is actually meaningless, as there is
12024 # no search path for DLLs.
12025- hardcode_libdir_flag_spec=' '
12026- allow_undefined_flag=unsupported
12027- # Tell ltmain to make .lib files, not .a files.
12028- libext=lib
12029- # Tell ltmain to make .dll files, not .so files.
12030- shrext_cmds=".dll"
12031- # FIXME: Setting linknames here is a bad hack.
12032- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12033- # The linker will automatically build a .lib file if we build a DLL.
12034- old_archive_from_new_cmds='true'
12035- # FIXME: Should let the user specify the lib program.
12036- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12037- fix_srcfile_path='`cygpath -w "$srcfile"`'
12038- enable_shared_with_static_runtimes=yes
12039+ case $cc_basename in
12040+ cl*)
12041+ # Native MSVC
12042+ hardcode_libdir_flag_spec=' '
12043+ allow_undefined_flag=unsupported
12044+ always_export_symbols=yes
12045+ file_list_spec='@'
12046+ # Tell ltmain to make .lib files, not .a files.
12047+ libext=lib
12048+ # Tell ltmain to make .dll files, not .so files.
12049+ shrext_cmds=".dll"
12050+ # FIXME: Setting linknames here is a bad hack.
12051+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12052+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12053+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12054+ else
12055+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12056+ fi~
12057+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12058+ linknames='
12059+ # The linker will not automatically build a static lib if we build a DLL.
12060+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
12061+ enable_shared_with_static_runtimes=yes
12062+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
12063+ # Don't use ranlib
12064+ old_postinstall_cmds='chmod 644 $oldlib'
12065+ postlink_cmds='lt_outputfile="@OUTPUT@"~
12066+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12067+ case $lt_outputfile in
12068+ *.exe|*.EXE) ;;
12069+ *)
12070+ lt_outputfile="$lt_outputfile.exe"
12071+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12072+ ;;
12073+ esac~
12074+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12075+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12076+ $RM "$lt_outputfile.manifest";
12077+ fi'
12078+ ;;
12079+ *)
12080+ # Assume MSVC wrapper
12081+ hardcode_libdir_flag_spec=' '
12082+ allow_undefined_flag=unsupported
12083+ # Tell ltmain to make .lib files, not .a files.
12084+ libext=lib
12085+ # Tell ltmain to make .dll files, not .so files.
12086+ shrext_cmds=".dll"
12087+ # FIXME: Setting linknames here is a bad hack.
12088+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12089+ # The linker will automatically build a .lib file if we build a DLL.
12090+ old_archive_from_new_cmds='true'
12091+ # FIXME: Should let the user specify the lib program.
12092+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12093+ enable_shared_with_static_runtimes=yes
12094+ ;;
12095+ esac
12096 ;;
12097
12098 darwin* | rhapsody*)
12099@@ -9446,7 +10029,7 @@ if test -z "$aix_libpath"; then aix_libp
12100
12101 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12102 freebsd* | dragonfly*)
12103- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
12104+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12105 hardcode_libdir_flag_spec='-R$libdir'
12106 hardcode_direct=yes
12107 hardcode_shlibpath_var=no
12108@@ -9454,7 +10037,7 @@ if test -z "$aix_libpath"; then aix_libp
12109
12110 hpux9*)
12111 if test "$GCC" = yes; then
12112- 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'
12113+ 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'
12114 else
12115 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'
12116 fi
12117@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libp
12118
12119 hpux10*)
12120 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
12121- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12122+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12123 else
12124 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12125 fi
12126@@ -9494,10 +10077,10 @@ if test -z "$aix_libpath"; then aix_libp
12127 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12128 ;;
12129 ia64*)
12130- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12131+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12132 ;;
12133 *)
12134- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12135+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12136 ;;
12137 esac
12138 else
12139@@ -9576,23 +10159,36 @@ fi
12140
12141 irix5* | irix6* | nonstopux*)
12142 if test "$GCC" = yes; then
12143- 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'
12144+ 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'
12145 # Try to use the -exported_symbol ld option, if it does not
12146 # work, assume that -exports_file does not work either and
12147 # implicitly export all symbols.
12148- save_LDFLAGS="$LDFLAGS"
12149- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12150- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12151+ # This should be the same for all languages, so no per-tag cache variable.
12152+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
12153+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
12154+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
12155+ $as_echo_n "(cached) " >&6
12156+else
12157+ save_LDFLAGS="$LDFLAGS"
12158+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12159+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12160 /* end confdefs.h. */
12161-int foo(void) {}
12162+int foo (void) { return 0; }
12163 _ACEOF
12164 if ac_fn_c_try_link "$LINENO"; then :
12165- 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'
12166-
12167+ lt_cv_irix_exported_symbol=yes
12168+else
12169+ lt_cv_irix_exported_symbol=no
12170 fi
12171 rm -f core conftest.err conftest.$ac_objext \
12172 conftest$ac_exeext conftest.$ac_ext
12173- LDFLAGS="$save_LDFLAGS"
12174+ LDFLAGS="$save_LDFLAGS"
12175+fi
12176+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
12177+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
12178+ if test "$lt_cv_irix_exported_symbol" = yes; then
12179+ 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'
12180+ fi
12181 else
12182 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'
12183 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'
12184@@ -9677,7 +10273,7 @@ rm -f core conftest.err conftest.$ac_obj
12185 osf4* | osf5*) # as osf3* with the addition of -msym flag
12186 if test "$GCC" = yes; then
12187 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
12188- 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'
12189+ 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'
12190 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12191 else
12192 allow_undefined_flag=' -expect_unresolved \*'
12193@@ -9696,9 +10292,9 @@ rm -f core conftest.err conftest.$ac_obj
12194 no_undefined_flag=' -z defs'
12195 if test "$GCC" = yes; then
12196 wlarc='${wl}'
12197- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12198+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12199 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12200- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
12201+ $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'
12202 else
12203 case `$CC -V 2>&1` in
12204 *"Compilers 5.0"*)
12205@@ -10274,8 +10870,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12206 need_version=no
12207 need_lib_prefix=no
12208
12209- case $GCC,$host_os in
12210- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12211+ case $GCC,$cc_basename in
12212+ yes,*)
12213+ # gcc
12214 library_names_spec='$libname.dll.a'
12215 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12216 postinstall_cmds='base_file=`basename \${file}`~
12217@@ -10308,13 +10905,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12218 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12219 ;;
12220 esac
12221+ dynamic_linker='Win32 ld.exe'
12222+ ;;
12223+
12224+ *,cl*)
12225+ # Native MSVC
12226+ libname_spec='$name'
12227+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12228+ library_names_spec='${libname}.dll.lib'
12229+
12230+ case $build_os in
12231+ mingw*)
12232+ sys_lib_search_path_spec=
12233+ lt_save_ifs=$IFS
12234+ IFS=';'
12235+ for lt_path in $LIB
12236+ do
12237+ IFS=$lt_save_ifs
12238+ # Let DOS variable expansion print the short 8.3 style file name.
12239+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12240+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12241+ done
12242+ IFS=$lt_save_ifs
12243+ # Convert to MSYS style.
12244+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12245+ ;;
12246+ cygwin*)
12247+ # Convert to unix form, then to dos form, then back to unix form
12248+ # but this time dos style (no spaces!) so that the unix form looks
12249+ # like /cygdrive/c/PROGRA~1:/cygdr...
12250+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12251+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12252+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12253+ ;;
12254+ *)
12255+ sys_lib_search_path_spec="$LIB"
12256+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12257+ # It is most probably a Windows format PATH.
12258+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12259+ else
12260+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12261+ fi
12262+ # FIXME: find the short name or the path components, as spaces are
12263+ # common. (e.g. "Program Files" -> "PROGRA~1")
12264+ ;;
12265+ esac
12266+
12267+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12268+ postinstall_cmds='base_file=`basename \${file}`~
12269+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12270+ dldir=$destdir/`dirname \$dlpath`~
12271+ test -d \$dldir || mkdir -p \$dldir~
12272+ $install_prog $dir/$dlname \$dldir/$dlname'
12273+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12274+ dlpath=$dir/\$dldll~
12275+ $RM \$dlpath'
12276+ shlibpath_overrides_runpath=yes
12277+ dynamic_linker='Win32 link.exe'
12278 ;;
12279
12280 *)
12281+ # Assume MSVC wrapper
12282 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12283+ dynamic_linker='Win32 ld.exe'
12284 ;;
12285 esac
12286- dynamic_linker='Win32 ld.exe'
12287 # FIXME: first we should search . and the directory the executable is in
12288 shlibpath_var=PATH
12289 ;;
12290@@ -10410,7 +11065,7 @@ haiku*)
12291 soname_spec='${libname}${release}${shared_ext}$major'
12292 shlibpath_var=LIBRARY_PATH
12293 shlibpath_overrides_runpath=yes
12294- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
12295+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
12296 hardcode_into_libs=yes
12297 ;;
12298
12299@@ -11206,7 +11861,7 @@ else
12300 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12301 lt_status=$lt_dlunknown
12302 cat > conftest.$ac_ext <<_LT_EOF
12303-#line 11209 "configure"
12304+#line $LINENO "configure"
12305 #include "confdefs.h"
12306
12307 #if HAVE_DLFCN_H
12308@@ -11250,10 +11905,10 @@ else
12309 /* When -fvisbility=hidden is used, assume the code has been annotated
12310 correspondingly for the symbols needed. */
12311 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12312-void fnord () __attribute__((visibility("default")));
12313+int fnord () __attribute__((visibility("default")));
12314 #endif
12315
12316-void fnord () { int i=42; }
12317+int fnord () { return 42; }
12318 int main ()
12319 {
12320 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12321@@ -11312,7 +11967,7 @@ else
12322 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12323 lt_status=$lt_dlunknown
12324 cat > conftest.$ac_ext <<_LT_EOF
12325-#line 11315 "configure"
12326+#line $LINENO "configure"
12327 #include "confdefs.h"
12328
12329 #if HAVE_DLFCN_H
12330@@ -11356,10 +12011,10 @@ else
12331 /* When -fvisbility=hidden is used, assume the code has been annotated
12332 correspondingly for the symbols needed. */
12333 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12334-void fnord () __attribute__((visibility("default")));
12335+int fnord () __attribute__((visibility("default")));
12336 #endif
12337
12338-void fnord () { int i=42; }
12339+int fnord () { return 42; }
12340 int main ()
12341 {
12342 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12343@@ -14754,13 +15409,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
12344 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12345 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12346 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
12347+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
12348+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
12349 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
12350 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
12351 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
12352 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
12353 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
12354+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
12355+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
12356+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
12357+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
12358 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
12359 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
12360+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
12361 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12362 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12363 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12364@@ -14775,14 +15437,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
12365 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12366 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12367 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"`'
12368+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
12369+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
12370 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
12371 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
12372 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
12373-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12374 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
12375+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12376 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
12377 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
12378 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
12379+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
12380 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12381 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12382 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12383@@ -14815,12 +15480,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
12384 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12385 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12386 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
12387-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
12388 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
12389 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
12390 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
12391 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
12392 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
12393+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
12394 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12395 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12396 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12397@@ -14875,8 +15540,13 @@ reload_flag \
12398 OBJDUMP \
12399 deplibs_check_method \
12400 file_magic_cmd \
12401+file_magic_glob \
12402+want_nocaseglob \
12403+DLLTOOL \
12404+sharedlib_from_linklib_cmd \
12405 AR \
12406 AR_FLAGS \
12407+archiver_list_spec \
12408 STRIP \
12409 RANLIB \
12410 CC \
12411@@ -14886,12 +15556,14 @@ lt_cv_sys_global_symbol_pipe \
12412 lt_cv_sys_global_symbol_to_cdecl \
12413 lt_cv_sys_global_symbol_to_c_name_address \
12414 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
12415+nm_file_list_spec \
12416 lt_prog_compiler_no_builtin_flag \
12417-lt_prog_compiler_wl \
12418 lt_prog_compiler_pic \
12419+lt_prog_compiler_wl \
12420 lt_prog_compiler_static \
12421 lt_cv_prog_compiler_c_o \
12422 need_locks \
12423+MANIFEST_TOOL \
12424 DSYMUTIL \
12425 NMEDIT \
12426 LIPO \
12427@@ -14907,7 +15579,6 @@ no_undefined_flag \
12428 hardcode_libdir_flag_spec \
12429 hardcode_libdir_flag_spec_ld \
12430 hardcode_libdir_separator \
12431-fix_srcfile_path \
12432 exclude_expsyms \
12433 include_expsyms \
12434 file_list_spec \
12435@@ -14943,6 +15614,7 @@ module_cmds \
12436 module_expsym_cmds \
12437 export_symbols_cmds \
12438 prelink_cmds \
12439+postlink_cmds \
12440 postinstall_cmds \
12441 postuninstall_cmds \
12442 finish_cmds \
12443@@ -15700,7 +16372,8 @@ $as_echo X"$file" |
12444 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12445 #
12446 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12447-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12448+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12449+# Inc.
12450 # Written by Gordon Matzigkeit, 1996
12451 #
12452 # This file is part of GNU Libtool.
12453@@ -15803,19 +16476,42 @@ SP2NL=$lt_lt_SP2NL
12454 # turn newlines into spaces.
12455 NL2SP=$lt_lt_NL2SP
12456
12457+# convert \$build file names to \$host format.
12458+to_host_file_cmd=$lt_cv_to_host_file_cmd
12459+
12460+# convert \$build files to toolchain format.
12461+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12462+
12463 # An object symbol dumper.
12464 OBJDUMP=$lt_OBJDUMP
12465
12466 # Method to check whether dependent libraries are shared objects.
12467 deplibs_check_method=$lt_deplibs_check_method
12468
12469-# Command to use when deplibs_check_method == "file_magic".
12470+# Command to use when deplibs_check_method = "file_magic".
12471 file_magic_cmd=$lt_file_magic_cmd
12472
12473+# How to find potential files when deplibs_check_method = "file_magic".
12474+file_magic_glob=$lt_file_magic_glob
12475+
12476+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
12477+want_nocaseglob=$lt_want_nocaseglob
12478+
12479+# DLL creation program.
12480+DLLTOOL=$lt_DLLTOOL
12481+
12482+# Command to associate shared and link libraries.
12483+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
12484+
12485 # The archiver.
12486 AR=$lt_AR
12487+
12488+# Flags to create an archive.
12489 AR_FLAGS=$lt_AR_FLAGS
12490
12491+# How to feed a file listing to the archiver.
12492+archiver_list_spec=$lt_archiver_list_spec
12493+
12494 # A symbol stripping program.
12495 STRIP=$lt_STRIP
12496
12497@@ -15845,6 +16541,12 @@ global_symbol_to_c_name_address=$lt_lt_c
12498 # Transform the output of nm in a C name address pair when lib prefix is needed.
12499 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12500
12501+# Specify filename containing input files for \$NM.
12502+nm_file_list_spec=$lt_nm_file_list_spec
12503+
12504+# The root where to search for dependent libraries,and in which our libraries should be installed.
12505+lt_sysroot=$lt_sysroot
12506+
12507 # The name of the directory that contains temporary libtool files.
12508 objdir=$objdir
12509
12510@@ -15854,6 +16556,9 @@ MAGIC_CMD=$MAGIC_CMD
12511 # Must we lock files when doing compilation?
12512 need_locks=$lt_need_locks
12513
12514+# Manifest tool.
12515+MANIFEST_TOOL=$lt_MANIFEST_TOOL
12516+
12517 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12518 DSYMUTIL=$lt_DSYMUTIL
12519
12520@@ -15968,12 +16673,12 @@ with_gcc=$GCC
12521 # Compiler flag to turn off builtin functions.
12522 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12523
12524-# How to pass a linker flag through the compiler.
12525-wl=$lt_lt_prog_compiler_wl
12526-
12527 # Additional compiler flags for building library objects.
12528 pic_flag=$lt_lt_prog_compiler_pic
12529
12530+# How to pass a linker flag through the compiler.
12531+wl=$lt_lt_prog_compiler_wl
12532+
12533 # Compiler flag to prevent dynamic linking.
12534 link_static_flag=$lt_lt_prog_compiler_static
12535
12536@@ -16060,9 +16765,6 @@ inherit_rpath=$inherit_rpath
12537 # Whether libtool must link a program against all its dependency libraries.
12538 link_all_deplibs=$link_all_deplibs
12539
12540-# Fix the shell variable \$srcfile for the compiler.
12541-fix_srcfile_path=$lt_fix_srcfile_path
12542-
12543 # Set to "yes" if exported symbols are required.
12544 always_export_symbols=$always_export_symbols
12545
12546@@ -16078,6 +16780,9 @@ include_expsyms=$lt_include_expsyms
12547 # Commands necessary for linking programs (against libraries) with templates.
12548 prelink_cmds=$lt_prelink_cmds
12549
12550+# Commands necessary for finishing linking programs.
12551+postlink_cmds=$lt_postlink_cmds
12552+
12553 # Specify filename containing input files.
12554 file_list_spec=$lt_file_list_spec
12555
12556@@ -16110,210 +16815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12557 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12558 # text mode, it properly converts lines to CR/LF. This bash problem
12559 # is reportedly fixed, but why not run on old versions too?
12560- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
12561- || (rm -f "$cfgfile"; exit 1)
12562-
12563- case $xsi_shell in
12564- yes)
12565- cat << \_LT_EOF >> "$cfgfile"
12566-
12567-# func_dirname file append nondir_replacement
12568-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12569-# otherwise set result to NONDIR_REPLACEMENT.
12570-func_dirname ()
12571-{
12572- case ${1} in
12573- */*) func_dirname_result="${1%/*}${2}" ;;
12574- * ) func_dirname_result="${3}" ;;
12575- esac
12576-}
12577-
12578-# func_basename file
12579-func_basename ()
12580-{
12581- func_basename_result="${1##*/}"
12582-}
12583-
12584-# func_dirname_and_basename file append nondir_replacement
12585-# perform func_basename and func_dirname in a single function
12586-# call:
12587-# dirname: Compute the dirname of FILE. If nonempty,
12588-# add APPEND to the result, otherwise set result
12589-# to NONDIR_REPLACEMENT.
12590-# value returned in "$func_dirname_result"
12591-# basename: Compute filename of FILE.
12592-# value retuned in "$func_basename_result"
12593-# Implementation must be kept synchronized with func_dirname
12594-# and func_basename. For efficiency, we do not delegate to
12595-# those functions but instead duplicate the functionality here.
12596-func_dirname_and_basename ()
12597-{
12598- case ${1} in
12599- */*) func_dirname_result="${1%/*}${2}" ;;
12600- * ) func_dirname_result="${3}" ;;
12601- esac
12602- func_basename_result="${1##*/}"
12603-}
12604-
12605-# func_stripname prefix suffix name
12606-# strip PREFIX and SUFFIX off of NAME.
12607-# PREFIX and SUFFIX must not contain globbing or regex special
12608-# characters, hashes, percent signs, but SUFFIX may contain a leading
12609-# dot (in which case that matches only a dot).
12610-func_stripname ()
12611-{
12612- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
12613- # positional parameters, so assign one to ordinary parameter first.
12614- func_stripname_result=${3}
12615- func_stripname_result=${func_stripname_result#"${1}"}
12616- func_stripname_result=${func_stripname_result%"${2}"}
12617-}
12618-
12619-# func_opt_split
12620-func_opt_split ()
12621-{
12622- func_opt_split_opt=${1%%=*}
12623- func_opt_split_arg=${1#*=}
12624-}
12625-
12626-# func_lo2o object
12627-func_lo2o ()
12628-{
12629- case ${1} in
12630- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
12631- *) func_lo2o_result=${1} ;;
12632- esac
12633-}
12634-
12635-# func_xform libobj-or-source
12636-func_xform ()
12637-{
12638- func_xform_result=${1%.*}.lo
12639-}
12640-
12641-# func_arith arithmetic-term...
12642-func_arith ()
12643-{
12644- func_arith_result=$(( $* ))
12645-}
12646-
12647-# func_len string
12648-# STRING may not start with a hyphen.
12649-func_len ()
12650-{
12651- func_len_result=${#1}
12652-}
12653-
12654-_LT_EOF
12655- ;;
12656- *) # Bourne compatible functions.
12657- cat << \_LT_EOF >> "$cfgfile"
12658-
12659-# func_dirname file append nondir_replacement
12660-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12661-# otherwise set result to NONDIR_REPLACEMENT.
12662-func_dirname ()
12663-{
12664- # Extract subdirectory from the argument.
12665- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12666- if test "X$func_dirname_result" = "X${1}"; then
12667- func_dirname_result="${3}"
12668- else
12669- func_dirname_result="$func_dirname_result${2}"
12670- fi
12671-}
12672-
12673-# func_basename file
12674-func_basename ()
12675-{
12676- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12677-}
12678-
12679-
12680-# func_stripname prefix suffix name
12681-# strip PREFIX and SUFFIX off of NAME.
12682-# PREFIX and SUFFIX must not contain globbing or regex special
12683-# characters, hashes, percent signs, but SUFFIX may contain a leading
12684-# dot (in which case that matches only a dot).
12685-# func_strip_suffix prefix name
12686-func_stripname ()
12687-{
12688- case ${2} in
12689- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12690- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12691- esac
12692-}
12693-
12694-# sed scripts:
12695-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12696-my_sed_long_arg='1s/^-[^=]*=//'
12697-
12698-# func_opt_split
12699-func_opt_split ()
12700-{
12701- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12702- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12703-}
12704-
12705-# func_lo2o object
12706-func_lo2o ()
12707-{
12708- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12709-}
12710-
12711-# func_xform libobj-or-source
12712-func_xform ()
12713-{
12714- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12715-}
12716-
12717-# func_arith arithmetic-term...
12718-func_arith ()
12719-{
12720- func_arith_result=`expr "$@"`
12721-}
12722-
12723-# func_len string
12724-# STRING may not start with a hyphen.
12725-func_len ()
12726-{
12727- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12728-}
12729-
12730-_LT_EOF
12731-esac
12732-
12733-case $lt_shell_append in
12734- yes)
12735- cat << \_LT_EOF >> "$cfgfile"
12736-
12737-# func_append var value
12738-# Append VALUE to the end of shell variable VAR.
12739-func_append ()
12740-{
12741- eval "$1+=\$2"
12742-}
12743-_LT_EOF
12744- ;;
12745- *)
12746- cat << \_LT_EOF >> "$cfgfile"
12747-
12748-# func_append var value
12749-# Append VALUE to the end of shell variable VAR.
12750-func_append ()
12751-{
12752- eval "$1=\$$1\$2"
12753-}
12754-
12755-_LT_EOF
12756- ;;
12757- esac
12758+ sed '$q' "$ltmain" >> "$cfgfile" \
12759+ || (rm -f "$cfgfile"; exit 1)
12760
12761+ if test x"$xsi_shell" = xyes; then
12762+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12763+func_dirname ()\
12764+{\
12765+\ case ${1} in\
12766+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12767+\ * ) func_dirname_result="${3}" ;;\
12768+\ esac\
12769+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12770+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12771+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12772+test 0 -eq $? || _lt_function_replace_fail=:
12773+
12774+
12775+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12776+func_basename ()\
12777+{\
12778+\ func_basename_result="${1##*/}"\
12779+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12780+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12781+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12782+test 0 -eq $? || _lt_function_replace_fail=:
12783+
12784+
12785+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12786+func_dirname_and_basename ()\
12787+{\
12788+\ case ${1} in\
12789+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12790+\ * ) func_dirname_result="${3}" ;;\
12791+\ esac\
12792+\ func_basename_result="${1##*/}"\
12793+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12794+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12795+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12796+test 0 -eq $? || _lt_function_replace_fail=:
12797+
12798+
12799+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12800+func_stripname ()\
12801+{\
12802+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12803+\ # positional parameters, so assign one to ordinary parameter first.\
12804+\ func_stripname_result=${3}\
12805+\ func_stripname_result=${func_stripname_result#"${1}"}\
12806+\ func_stripname_result=${func_stripname_result%"${2}"}\
12807+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12808+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12809+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12810+test 0 -eq $? || _lt_function_replace_fail=:
12811+
12812+
12813+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12814+func_split_long_opt ()\
12815+{\
12816+\ func_split_long_opt_name=${1%%=*}\
12817+\ func_split_long_opt_arg=${1#*=}\
12818+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12819+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12820+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12821+test 0 -eq $? || _lt_function_replace_fail=:
12822+
12823+
12824+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12825+func_split_short_opt ()\
12826+{\
12827+\ func_split_short_opt_arg=${1#??}\
12828+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12829+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12830+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12831+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12832+test 0 -eq $? || _lt_function_replace_fail=:
12833+
12834+
12835+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12836+func_lo2o ()\
12837+{\
12838+\ case ${1} in\
12839+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12840+\ *) func_lo2o_result=${1} ;;\
12841+\ esac\
12842+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
12849+func_xform ()\
12850+{\
12851+ func_xform_result=${1%.*}.lo\
12852+} # Extended-shell func_xform 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+
12858+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12859+func_arith ()\
12860+{\
12861+ func_arith_result=$(( $* ))\
12862+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12863+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12864+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12865+test 0 -eq $? || _lt_function_replace_fail=:
12866+
12867+
12868+ sed -e '/^func_len ()$/,/^} # func_len /c\
12869+func_len ()\
12870+{\
12871+ func_len_result=${#1}\
12872+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12873+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12874+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12875+test 0 -eq $? || _lt_function_replace_fail=:
12876+
12877+fi
12878+
12879+if test x"$lt_shell_append" = xyes; then
12880+ sed -e '/^func_append ()$/,/^} # func_append /c\
12881+func_append ()\
12882+{\
12883+ eval "${1}+=\\${2}"\
12884+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12885+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12886+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12887+test 0 -eq $? || _lt_function_replace_fail=:
12888+
12889+
12890+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12891+func_append_quoted ()\
12892+{\
12893+\ func_quote_for_eval "${2}"\
12894+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
12895+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
12896+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12897+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12898+test 0 -eq $? || _lt_function_replace_fail=:
12899+
12900+
12901+ # Save a `func_append' function call where possible by direct use of '+='
12902+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12903+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12904+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12905+ test 0 -eq $? || _lt_function_replace_fail=:
12906+else
12907+ # Save a `func_append' function call even when '+=' is not available
12908+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12909+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12910+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12911+ test 0 -eq $? || _lt_function_replace_fail=:
12912+fi
12913+
12914+if test x"$_lt_function_replace_fail" = x":"; then
12915+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12916+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12917+fi
12918
12919- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12920- || (rm -f "$cfgfile"; exit 1)
12921
12922- mv -f "$cfgfile" "$ofile" ||
12923+ mv -f "$cfgfile" "$ofile" ||
12924 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12925 chmod +x "$ofile"
12926
12927Index: binutils-2.21.1/gas/configure
12928===================================================================
12929--- binutils-2.21.1.orig/gas/configure
12930+++ binutils-2.21.1/gas/configure
12931@@ -645,8 +645,11 @@ OTOOL
12932 LIPO
12933 NMEDIT
12934 DSYMUTIL
12935+MANIFEST_TOOL
12936 RANLIB
12937+ac_ct_AR
12938 AR
12939+DLLTOOL
12940 OBJDUMP
12941 LN_S
12942 NM
12943@@ -759,6 +762,7 @@ enable_static
12944 with_pic
12945 enable_fast_install
12946 with_gnu_ld
12947+with_libtool_sysroot
12948 enable_libtool_lock
12949 enable_targets
12950 enable_checking
12951@@ -1420,6 +1424,8 @@ Optional Packages:
12952 --with-pic try to use only PIC/non-PIC objects [default=use
12953 both]
12954 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
12955+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
12956+ (or the compiler's sysroot if not specified).
12957 --with-zlib include zlib support (auto/yes/no) default=auto
12958
12959 Some influential environment variables:
12960@@ -5135,8 +5141,8 @@ esac
12961
12962
12963
12964-macro_version='2.2.7a'
12965-macro_revision='1.3134'
12966+macro_version='2.4'
12967+macro_revision='1.3293'
12968
12969
12970
12971@@ -5176,7 +5182,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12972 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
12973 $as_echo_n "checking how to print strings... " >&6; }
12974 # Test print first, because it will be a builtin if present.
12975-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
12976+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
12977 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12978 ECHO='print -r --'
12979 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12980@@ -5862,8 +5868,8 @@ $as_echo_n "checking whether the shell u
12981 # Try some XSI features
12982 xsi_shell=no
12983 ( _lt_dummy="a/b/c"
12984- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
12985- = c,a/b,, \
12986+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
12987+ = c,a/b,b/c, \
12988 && eval 'test $(( 1 + 1 )) -eq 2 \
12989 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
12990 && xsi_shell=yes
12991@@ -5912,6 +5918,80 @@ esac
12992
12993
12994
12995+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
12996+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
12997+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
12998+ $as_echo_n "(cached) " >&6
12999+else
13000+ case $host in
13001+ *-*-mingw* )
13002+ case $build in
13003+ *-*-mingw* ) # actually msys
13004+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
13005+ ;;
13006+ *-*-cygwin* )
13007+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
13008+ ;;
13009+ * ) # otherwise, assume *nix
13010+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
13011+ ;;
13012+ esac
13013+ ;;
13014+ *-*-cygwin* )
13015+ case $build in
13016+ *-*-mingw* ) # actually msys
13017+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
13018+ ;;
13019+ *-*-cygwin* )
13020+ lt_cv_to_host_file_cmd=func_convert_file_noop
13021+ ;;
13022+ * ) # otherwise, assume *nix
13023+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
13024+ ;;
13025+ esac
13026+ ;;
13027+ * ) # unhandled hosts (and "normal" native builds)
13028+ lt_cv_to_host_file_cmd=func_convert_file_noop
13029+ ;;
13030+esac
13031+
13032+fi
13033+
13034+to_host_file_cmd=$lt_cv_to_host_file_cmd
13035+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
13036+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
13037+
13038+
13039+
13040+
13041+
13042+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
13043+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
13044+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
13045+ $as_echo_n "(cached) " >&6
13046+else
13047+ #assume ordinary cross tools, or native build.
13048+lt_cv_to_tool_file_cmd=func_convert_file_noop
13049+case $host in
13050+ *-*-mingw* )
13051+ case $build in
13052+ *-*-mingw* ) # actually msys
13053+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
13054+ ;;
13055+ esac
13056+ ;;
13057+esac
13058+
13059+fi
13060+
13061+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
13062+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
13063+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
13064+
13065+
13066+
13067+
13068+
13069 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13070 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13071 if test "${lt_cv_ld_reload_flag+set}" = set; then :
13072@@ -5928,6 +6008,11 @@ case $reload_flag in
13073 esac
13074 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13075 case $host_os in
13076+ cygwin* | mingw* | pw32* | cegcc*)
13077+ if test "$GCC" != yes; then
13078+ reload_cmds=false
13079+ fi
13080+ ;;
13081 darwin*)
13082 if test "$GCC" = yes; then
13083 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13084@@ -6096,7 +6181,8 @@ mingw* | pw32*)
13085 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13086 lt_cv_file_magic_cmd='func_win32_libid'
13087 else
13088- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
13089+ # Keep this pattern in sync with the one in func_win32_libid.
13090+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
13091 lt_cv_file_magic_cmd='$OBJDUMP -f'
13092 fi
13093 ;;
13094@@ -6250,6 +6336,21 @@ esac
13095 fi
13096 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13097 $as_echo "$lt_cv_deplibs_check_method" >&6; }
13098+
13099+file_magic_glob=
13100+want_nocaseglob=no
13101+if test "$build" = "$host"; then
13102+ case $host_os in
13103+ mingw* | pw32*)
13104+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
13105+ want_nocaseglob=yes
13106+ else
13107+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
13108+ fi
13109+ ;;
13110+ esac
13111+fi
13112+
13113 file_magic_cmd=$lt_cv_file_magic_cmd
13114 deplibs_check_method=$lt_cv_deplibs_check_method
13115 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13116@@ -6265,9 +6366,162 @@ test -z "$deplibs_check_method" && depli
13117
13118
13119
13120+
13121+
13122+
13123+
13124+
13125+
13126+
13127+
13128+
13129+
13130+if test -n "$ac_tool_prefix"; then
13131+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
13132+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
13133+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13134+$as_echo_n "checking for $ac_word... " >&6; }
13135+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
13136+ $as_echo_n "(cached) " >&6
13137+else
13138+ if test -n "$DLLTOOL"; then
13139+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
13140+else
13141+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13142+for as_dir in $PATH
13143+do
13144+ IFS=$as_save_IFS
13145+ test -z "$as_dir" && as_dir=.
13146+ for ac_exec_ext in '' $ac_executable_extensions; do
13147+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13148+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
13149+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13150+ break 2
13151+ fi
13152+done
13153+ done
13154+IFS=$as_save_IFS
13155+
13156+fi
13157+fi
13158+DLLTOOL=$ac_cv_prog_DLLTOOL
13159+if test -n "$DLLTOOL"; then
13160+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
13161+$as_echo "$DLLTOOL" >&6; }
13162+else
13163+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13164+$as_echo "no" >&6; }
13165+fi
13166+
13167+
13168+fi
13169+if test -z "$ac_cv_prog_DLLTOOL"; then
13170+ ac_ct_DLLTOOL=$DLLTOOL
13171+ # Extract the first word of "dlltool", so it can be a program name with args.
13172+set dummy dlltool; ac_word=$2
13173+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13174+$as_echo_n "checking for $ac_word... " >&6; }
13175+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
13176+ $as_echo_n "(cached) " >&6
13177+else
13178+ if test -n "$ac_ct_DLLTOOL"; then
13179+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
13180+else
13181+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13182+for as_dir in $PATH
13183+do
13184+ IFS=$as_save_IFS
13185+ test -z "$as_dir" && as_dir=.
13186+ for ac_exec_ext in '' $ac_executable_extensions; do
13187+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13188+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
13189+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13190+ break 2
13191+ fi
13192+done
13193+ done
13194+IFS=$as_save_IFS
13195+
13196+fi
13197+fi
13198+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
13199+if test -n "$ac_ct_DLLTOOL"; then
13200+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
13201+$as_echo "$ac_ct_DLLTOOL" >&6; }
13202+else
13203+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13204+$as_echo "no" >&6; }
13205+fi
13206+
13207+ if test "x$ac_ct_DLLTOOL" = x; then
13208+ DLLTOOL="false"
13209+ else
13210+ case $cross_compiling:$ac_tool_warned in
13211+yes:)
13212+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13213+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13214+ac_tool_warned=yes ;;
13215+esac
13216+ DLLTOOL=$ac_ct_DLLTOOL
13217+ fi
13218+else
13219+ DLLTOOL="$ac_cv_prog_DLLTOOL"
13220+fi
13221+
13222+test -z "$DLLTOOL" && DLLTOOL=dlltool
13223+
13224+
13225+
13226+
13227+
13228+
13229+
13230+
13231+
13232+
13233+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
13234+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
13235+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
13236+ $as_echo_n "(cached) " >&6
13237+else
13238+ lt_cv_sharedlib_from_linklib_cmd='unknown'
13239+
13240+case $host_os in
13241+cygwin* | mingw* | pw32* | cegcc*)
13242+ # two different shell functions defined in ltmain.sh
13243+ # decide which to use based on capabilities of $DLLTOOL
13244+ case `$DLLTOOL --help 2>&1` in
13245+ *--identify-strict*)
13246+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
13247+ ;;
13248+ *)
13249+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
13250+ ;;
13251+ esac
13252+ ;;
13253+*)
13254+ # fallback: assume linklib IS sharedlib
13255+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
13256+ ;;
13257+esac
13258+
13259+fi
13260+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
13261+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
13262+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
13263+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
13264+
13265+
13266+
13267+
13268+
13269+
13270+
13271 if test -n "$ac_tool_prefix"; then
13272- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
13273-set dummy ${ac_tool_prefix}ar; ac_word=$2
13274+ for ac_prog in ar
13275+ do
13276+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
13277+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
13278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13279 $as_echo_n "checking for $ac_word... " >&6; }
13280 if test "${ac_cv_prog_AR+set}" = set; then :
13281@@ -6283,7 +6537,7 @@ do
13282 test -z "$as_dir" && as_dir=.
13283 for ac_exec_ext in '' $ac_executable_extensions; do
13284 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13285- ac_cv_prog_AR="${ac_tool_prefix}ar"
13286+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
13287 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13288 break 2
13289 fi
13290@@ -6303,11 +6557,15 @@ $as_echo "no" >&6; }
13291 fi
13292
13293
13294+ test -n "$AR" && break
13295+ done
13296 fi
13297-if test -z "$ac_cv_prog_AR"; then
13298+if test -z "$AR"; then
13299 ac_ct_AR=$AR
13300- # Extract the first word of "ar", so it can be a program name with args.
13301-set dummy ar; ac_word=$2
13302+ for ac_prog in ar
13303+do
13304+ # Extract the first word of "$ac_prog", so it can be a program name with args.
13305+set dummy $ac_prog; ac_word=$2
13306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13307 $as_echo_n "checking for $ac_word... " >&6; }
13308 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
13309@@ -6323,7 +6581,7 @@ do
13310 test -z "$as_dir" && as_dir=.
13311 for ac_exec_ext in '' $ac_executable_extensions; do
13312 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13313- ac_cv_prog_ac_ct_AR="ar"
13314+ ac_cv_prog_ac_ct_AR="$ac_prog"
13315 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13316 break 2
13317 fi
13318@@ -6342,6 +6600,10 @@ else
13319 $as_echo "no" >&6; }
13320 fi
13321
13322+
13323+ test -n "$ac_ct_AR" && break
13324+done
13325+
13326 if test "x$ac_ct_AR" = x; then
13327 AR="false"
13328 else
13329@@ -6353,16 +6615,72 @@ ac_tool_warned=yes ;;
13330 esac
13331 AR=$ac_ct_AR
13332 fi
13333-else
13334- AR="$ac_cv_prog_AR"
13335 fi
13336
13337-test -z "$AR" && AR=ar
13338-test -z "$AR_FLAGS" && AR_FLAGS=cru
13339+: ${AR=ar}
13340+: ${AR_FLAGS=cru}
13341+
13342+
13343+
13344+
13345+
13346+
13347+
13348+
13349+
13350+
13351+
13352+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13353+$as_echo_n "checking for archiver @FILE support... " >&6; }
13354+if test "${lt_cv_ar_at_file+set}" = set; then :
13355+ $as_echo_n "(cached) " >&6
13356+else
13357+ lt_cv_ar_at_file=no
13358+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13359+/* end confdefs.h. */
13360+
13361+int
13362+main ()
13363+{
13364
13365+ ;
13366+ return 0;
13367+}
13368+_ACEOF
13369+if ac_fn_c_try_compile "$LINENO"; then :
13370+ echo conftest.$ac_objext > conftest.lst
13371+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
13372+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13373+ (eval $lt_ar_try) 2>&5
13374+ ac_status=$?
13375+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13376+ test $ac_status = 0; }
13377+ if test "$ac_status" -eq 0; then
13378+ # Ensure the archiver fails upon bogus file names.
13379+ rm -f conftest.$ac_objext libconftest.a
13380+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
13381+ (eval $lt_ar_try) 2>&5
13382+ ac_status=$?
13383+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13384+ test $ac_status = 0; }
13385+ if test "$ac_status" -ne 0; then
13386+ lt_cv_ar_at_file=@
13387+ fi
13388+ fi
13389+ rm -f conftest.* libconftest.a
13390
13391+fi
13392+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13393
13394+fi
13395+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13396+$as_echo "$lt_cv_ar_at_file" >&6; }
13397
13398+if test "x$lt_cv_ar_at_file" = xno; then
13399+ archiver_list_spec=
13400+else
13401+ archiver_list_spec=$lt_cv_ar_at_file
13402+fi
13403
13404
13405
13406@@ -6704,8 +7022,8 @@ esac
13407 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13408
13409 # Transform an extracted symbol line into symbol name and symbol address
13410-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13411-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'"
13412+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
13413+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'"
13414
13415 # Handle CRLF in mingw tool chain
13416 opt_cr=
13417@@ -6741,6 +7059,7 @@ for ac_symprfx in "" "_"; do
13418 else
13419 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13420 fi
13421+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
13422
13423 # Check to see that the pipe works correctly.
13424 pipe_works=no
13425@@ -6782,6 +7101,18 @@ _LT_EOF
13426 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13427 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13428 cat <<_LT_EOF > conftest.$ac_ext
13429+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13430+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13431+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13432+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13433+# define LT_DLSYM_CONST
13434+#elif defined(__osf__)
13435+/* This system does not cope well with relocations in const data. */
13436+# define LT_DLSYM_CONST
13437+#else
13438+# define LT_DLSYM_CONST const
13439+#endif
13440+
13441 #ifdef __cplusplus
13442 extern "C" {
13443 #endif
13444@@ -6793,7 +7124,7 @@ _LT_EOF
13445 cat <<_LT_EOF >> conftest.$ac_ext
13446
13447 /* The mapping between symbol names and symbols. */
13448-const struct {
13449+LT_DLSYM_CONST struct {
13450 const char *name;
13451 void *address;
13452 }
13453@@ -6819,8 +7150,8 @@ static const void *lt_preloaded_setup()
13454 _LT_EOF
13455 # Now try linking the two files.
13456 mv conftest.$ac_objext conftstm.$ac_objext
13457- lt_save_LIBS="$LIBS"
13458- lt_save_CFLAGS="$CFLAGS"
13459+ lt_globsym_save_LIBS=$LIBS
13460+ lt_globsym_save_CFLAGS=$CFLAGS
13461 LIBS="conftstm.$ac_objext"
13462 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13463 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13464@@ -6830,8 +7161,8 @@ _LT_EOF
13465 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13466 pipe_works=yes
13467 fi
13468- LIBS="$lt_save_LIBS"
13469- CFLAGS="$lt_save_CFLAGS"
13470+ LIBS=$lt_globsym_save_LIBS
13471+ CFLAGS=$lt_globsym_save_CFLAGS
13472 else
13473 echo "cannot find nm_test_func in $nlist" >&5
13474 fi
13475@@ -6868,6 +7199,19 @@ else
13476 $as_echo "ok" >&6; }
13477 fi
13478
13479+# Response file support.
13480+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
13481+ nm_file_list_spec='@'
13482+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
13483+ nm_file_list_spec='@'
13484+fi
13485+
13486+
13487+
13488+
13489+
13490+
13491+
13492
13493
13494
13495@@ -6888,6 +7232,42 @@ fi
13496
13497
13498
13499+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
13500+$as_echo_n "checking for sysroot... " >&6; }
13501+
13502+# Check whether --with-libtool-sysroot was given.
13503+if test "${with_libtool_sysroot+set}" = set; then :
13504+ withval=$with_libtool_sysroot;
13505+else
13506+ with_libtool_sysroot=no
13507+fi
13508+
13509+
13510+lt_sysroot=
13511+case ${with_libtool_sysroot} in #(
13512+ yes)
13513+ if test "$GCC" = yes; then
13514+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
13515+ fi
13516+ ;; #(
13517+ /*)
13518+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
13519+ ;; #(
13520+ no|'')
13521+ ;; #(
13522+ *)
13523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
13524+$as_echo "${with_libtool_sysroot}" >&6; }
13525+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
13526+ ;;
13527+esac
13528+
13529+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
13530+$as_echo "${lt_sysroot:-no}" >&6; }
13531+
13532+
13533+
13534+
13535
13536 # Check whether --enable-libtool-lock was given.
13537 if test "${enable_libtool_lock+set}" = set; then :
13538@@ -7082,6 +7462,123 @@ esac
13539
13540 need_locks="$enable_libtool_lock"
13541
13542+if test -n "$ac_tool_prefix"; then
13543+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
13544+set dummy ${ac_tool_prefix}mt; ac_word=$2
13545+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13546+$as_echo_n "checking for $ac_word... " >&6; }
13547+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
13548+ $as_echo_n "(cached) " >&6
13549+else
13550+ if test -n "$MANIFEST_TOOL"; then
13551+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
13552+else
13553+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13554+for as_dir in $PATH
13555+do
13556+ IFS=$as_save_IFS
13557+ test -z "$as_dir" && as_dir=.
13558+ for ac_exec_ext in '' $ac_executable_extensions; do
13559+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13560+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
13561+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13562+ break 2
13563+ fi
13564+done
13565+ done
13566+IFS=$as_save_IFS
13567+
13568+fi
13569+fi
13570+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
13571+if test -n "$MANIFEST_TOOL"; then
13572+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
13573+$as_echo "$MANIFEST_TOOL" >&6; }
13574+else
13575+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13576+$as_echo "no" >&6; }
13577+fi
13578+
13579+
13580+fi
13581+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
13582+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
13583+ # Extract the first word of "mt", so it can be a program name with args.
13584+set dummy mt; ac_word=$2
13585+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13586+$as_echo_n "checking for $ac_word... " >&6; }
13587+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
13588+ $as_echo_n "(cached) " >&6
13589+else
13590+ if test -n "$ac_ct_MANIFEST_TOOL"; then
13591+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
13592+else
13593+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13594+for as_dir in $PATH
13595+do
13596+ IFS=$as_save_IFS
13597+ test -z "$as_dir" && as_dir=.
13598+ for ac_exec_ext in '' $ac_executable_extensions; do
13599+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13600+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
13601+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13602+ break 2
13603+ fi
13604+done
13605+ done
13606+IFS=$as_save_IFS
13607+
13608+fi
13609+fi
13610+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
13611+if test -n "$ac_ct_MANIFEST_TOOL"; then
13612+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
13613+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
13614+else
13615+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13616+$as_echo "no" >&6; }
13617+fi
13618+
13619+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
13620+ MANIFEST_TOOL=":"
13621+ else
13622+ case $cross_compiling:$ac_tool_warned in
13623+yes:)
13624+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13625+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13626+ac_tool_warned=yes ;;
13627+esac
13628+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
13629+ fi
13630+else
13631+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
13632+fi
13633+
13634+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
13635+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
13636+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
13637+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
13638+ $as_echo_n "(cached) " >&6
13639+else
13640+ lt_cv_path_mainfest_tool=no
13641+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
13642+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
13643+ cat conftest.err >&5
13644+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
13645+ lt_cv_path_mainfest_tool=yes
13646+ fi
13647+ rm -f conftest*
13648+fi
13649+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
13650+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
13651+if test "x$lt_cv_path_mainfest_tool" != xyes; then
13652+ MANIFEST_TOOL=:
13653+fi
13654+
13655+
13656+
13657+
13658+
13659
13660 case $host_os in
13661 rhapsody* | darwin*)
13662@@ -7645,6 +8142,8 @@ _LT_EOF
13663 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13664 echo "$AR cru libconftest.a conftest.o" >&5
13665 $AR cru libconftest.a conftest.o 2>&5
13666+ echo "$RANLIB libconftest.a" >&5
13667+ $RANLIB libconftest.a 2>&5
13668 cat > conftest.c << _LT_EOF
13669 int main() { return 0;}
13670 _LT_EOF
13671@@ -7840,7 +8339,8 @@ fi
13672 LIBTOOL_DEPS="$ltmain"
13673
13674 # Always use our own libtool.
13675-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
13676+LIBTOOL='$(SHELL) $(top_builddir)'
13677+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
13678
13679
13680
13681@@ -7929,7 +8429,7 @@ aix3*)
13682 esac
13683
13684 # Global variables:
13685-ofile=libtool
13686+ofile=${host_alias}-libtool
13687 can_build_shared=yes
13688
13689 # All known linkers require a `.a' archive for static linking (except MSVC,
13690@@ -8227,8 +8727,6 @@ fi
13691 lt_prog_compiler_pic=
13692 lt_prog_compiler_static=
13693
13694-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13695-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13696
13697 if test "$GCC" = yes; then
13698 lt_prog_compiler_wl='-Wl,'
13699@@ -8393,6 +8891,12 @@ $as_echo_n "checking for $compiler optio
13700 lt_prog_compiler_pic='--shared'
13701 lt_prog_compiler_static='--static'
13702 ;;
13703+ nagfor*)
13704+ # NAG Fortran compiler
13705+ lt_prog_compiler_wl='-Wl,-Wl,,'
13706+ lt_prog_compiler_pic='-PIC'
13707+ lt_prog_compiler_static='-Bstatic'
13708+ ;;
13709 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13710 # Portland Group compilers (*not* the Pentium gcc compiler,
13711 # which looks to be a dead project)
13712@@ -8455,7 +8959,7 @@ $as_echo_n "checking for $compiler optio
13713 lt_prog_compiler_pic='-KPIC'
13714 lt_prog_compiler_static='-Bstatic'
13715 case $cc_basename in
13716- f77* | f90* | f95*)
13717+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
13718 lt_prog_compiler_wl='-Qoption ld ';;
13719 *)
13720 lt_prog_compiler_wl='-Wl,';;
13721@@ -8512,13 +9016,17 @@ case $host_os in
13722 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13723 ;;
13724 esac
13725-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
13726-$as_echo "$lt_prog_compiler_pic" >&6; }
13727-
13728-
13729-
13730-
13731
13732+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
13733+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13734+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
13735+ $as_echo_n "(cached) " >&6
13736+else
13737+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
13738+fi
13739+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
13740+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
13741+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
13742
13743 #
13744 # Check to make sure the PIC flag actually works.
13745@@ -8579,6 +9087,11 @@ fi
13746
13747
13748
13749+
13750+
13751+
13752+
13753+
13754 #
13755 # Check to make sure the static flag actually works.
13756 #
13757@@ -8929,7 +9442,8 @@ _LT_EOF
13758 allow_undefined_flag=unsupported
13759 always_export_symbols=no
13760 enable_shared_with_static_runtimes=yes
13761- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13762+ 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'
13763+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
13764
13765 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13766 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13767@@ -8977,7 +9491,7 @@ _LT_EOF
13768 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
13769 && test "$tmp_diet" = no
13770 then
13771- tmp_addflag=
13772+ tmp_addflag=' $pic_flag'
13773 tmp_sharedflag='-shared'
13774 case $cc_basename,$host_cpu in
13775 pgcc*) # Portland Group C compiler
13776@@ -9028,12 +9542,12 @@ _LT_EOF
13777 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13778 hardcode_libdir_flag_spec=
13779 hardcode_libdir_flag_spec_ld='-rpath $libdir'
13780- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
13781+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
13782 if test "x$supports_anon_versioning" = xyes; then
13783 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
13784 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
13785 echo "local: *; };" >> $output_objdir/$libname.ver~
13786- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13787+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
13788 fi
13789 ;;
13790 esac
13791@@ -9047,8 +9561,8 @@ _LT_EOF
13792 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13793 wlarc=
13794 else
13795- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13796- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13797+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13798+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13799 fi
13800 ;;
13801
13802@@ -9066,8 +9580,8 @@ _LT_EOF
13803
13804 _LT_EOF
13805 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13806- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13807- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13808+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13809+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13810 else
13811 ld_shlibs=no
13812 fi
13813@@ -9113,8 +9627,8 @@ _LT_EOF
13814
13815 *)
13816 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
13817- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13818- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13819+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13820+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13821 else
13822 ld_shlibs=no
13823 fi
13824@@ -9244,7 +9758,13 @@ _LT_EOF
13825 allow_undefined_flag='-berok'
13826 # Determine the default libpath from the value encoded in an
13827 # empty executable.
13828- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13829+ if test "${lt_cv_aix_libpath+set}" = set; then
13830+ aix_libpath=$lt_cv_aix_libpath
13831+else
13832+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13833+ $as_echo_n "(cached) " >&6
13834+else
13835+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13836 /* end confdefs.h. */
13837
13838 int
13839@@ -9257,22 +9777,29 @@ main ()
13840 _ACEOF
13841 if ac_fn_c_try_link "$LINENO"; then :
13842
13843-lt_aix_libpath_sed='
13844- /Import File Strings/,/^$/ {
13845- /^0/ {
13846- s/^0 *\(.*\)$/\1/
13847- p
13848- }
13849- }'
13850-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13851-# Check for a 64-bit object if we didn't find anything.
13852-if test -z "$aix_libpath"; then
13853- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13854-fi
13855+ lt_aix_libpath_sed='
13856+ /Import File Strings/,/^$/ {
13857+ /^0/ {
13858+ s/^0 *\([^ ]*\) *$/\1/
13859+ p
13860+ }
13861+ }'
13862+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13863+ # Check for a 64-bit object if we didn't find anything.
13864+ if test -z "$lt_cv_aix_libpath_"; then
13865+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13866+ fi
13867 fi
13868 rm -f core conftest.err conftest.$ac_objext \
13869 conftest$ac_exeext conftest.$ac_ext
13870-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13871+ if test -z "$lt_cv_aix_libpath_"; then
13872+ lt_cv_aix_libpath_="/usr/lib:/lib"
13873+ fi
13874+
13875+fi
13876+
13877+ aix_libpath=$lt_cv_aix_libpath_
13878+fi
13879
13880 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13881 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"
13882@@ -9284,7 +9811,13 @@ if test -z "$aix_libpath"; then aix_libp
13883 else
13884 # Determine the default libpath from the value encoded in an
13885 # empty executable.
13886- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13887+ if test "${lt_cv_aix_libpath+set}" = set; then
13888+ aix_libpath=$lt_cv_aix_libpath
13889+else
13890+ if test "${lt_cv_aix_libpath_+set}" = set; then :
13891+ $as_echo_n "(cached) " >&6
13892+else
13893+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13894 /* end confdefs.h. */
13895
13896 int
13897@@ -9297,22 +9830,29 @@ main ()
13898 _ACEOF
13899 if ac_fn_c_try_link "$LINENO"; then :
13900
13901-lt_aix_libpath_sed='
13902- /Import File Strings/,/^$/ {
13903- /^0/ {
13904- s/^0 *\(.*\)$/\1/
13905- p
13906- }
13907- }'
13908-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13909-# Check for a 64-bit object if we didn't find anything.
13910-if test -z "$aix_libpath"; then
13911- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13912-fi
13913+ lt_aix_libpath_sed='
13914+ /Import File Strings/,/^$/ {
13915+ /^0/ {
13916+ s/^0 *\([^ ]*\) *$/\1/
13917+ p
13918+ }
13919+ }'
13920+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13921+ # Check for a 64-bit object if we didn't find anything.
13922+ if test -z "$lt_cv_aix_libpath_"; then
13923+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
13924+ fi
13925 fi
13926 rm -f core conftest.err conftest.$ac_objext \
13927 conftest$ac_exeext conftest.$ac_ext
13928-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13929+ if test -z "$lt_cv_aix_libpath_"; then
13930+ lt_cv_aix_libpath_="/usr/lib:/lib"
13931+ fi
13932+
13933+fi
13934+
13935+ aix_libpath=$lt_cv_aix_libpath_
13936+fi
13937
13938 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13939 # Warning - without using the other run time loading flags,
13940@@ -9357,20 +9897,63 @@ if test -z "$aix_libpath"; then aix_libp
13941 # Microsoft Visual C++.
13942 # hardcode_libdir_flag_spec is actually meaningless, as there is
13943 # no search path for DLLs.
13944- hardcode_libdir_flag_spec=' '
13945- allow_undefined_flag=unsupported
13946- # Tell ltmain to make .lib files, not .a files.
13947- libext=lib
13948- # Tell ltmain to make .dll files, not .so files.
13949- shrext_cmds=".dll"
13950- # FIXME: Setting linknames here is a bad hack.
13951- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
13952- # The linker will automatically build a .lib file if we build a DLL.
13953- old_archive_from_new_cmds='true'
13954- # FIXME: Should let the user specify the lib program.
13955- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
13956- fix_srcfile_path='`cygpath -w "$srcfile"`'
13957- enable_shared_with_static_runtimes=yes
13958+ case $cc_basename in
13959+ cl*)
13960+ # Native MSVC
13961+ hardcode_libdir_flag_spec=' '
13962+ allow_undefined_flag=unsupported
13963+ always_export_symbols=yes
13964+ file_list_spec='@'
13965+ # Tell ltmain to make .lib files, not .a files.
13966+ libext=lib
13967+ # Tell ltmain to make .dll files, not .so files.
13968+ shrext_cmds=".dll"
13969+ # FIXME: Setting linknames here is a bad hack.
13970+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
13971+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
13972+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
13973+ else
13974+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
13975+ fi~
13976+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
13977+ linknames='
13978+ # The linker will not automatically build a static lib if we build a DLL.
13979+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
13980+ enable_shared_with_static_runtimes=yes
13981+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
13982+ # Don't use ranlib
13983+ old_postinstall_cmds='chmod 644 $oldlib'
13984+ postlink_cmds='lt_outputfile="@OUTPUT@"~
13985+ lt_tool_outputfile="@TOOL_OUTPUT@"~
13986+ case $lt_outputfile in
13987+ *.exe|*.EXE) ;;
13988+ *)
13989+ lt_outputfile="$lt_outputfile.exe"
13990+ lt_tool_outputfile="$lt_tool_outputfile.exe"
13991+ ;;
13992+ esac~
13993+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
13994+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
13995+ $RM "$lt_outputfile.manifest";
13996+ fi'
13997+ ;;
13998+ *)
13999+ # Assume MSVC wrapper
14000+ hardcode_libdir_flag_spec=' '
14001+ allow_undefined_flag=unsupported
14002+ # Tell ltmain to make .lib files, not .a files.
14003+ libext=lib
14004+ # Tell ltmain to make .dll files, not .so files.
14005+ shrext_cmds=".dll"
14006+ # FIXME: Setting linknames here is a bad hack.
14007+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
14008+ # The linker will automatically build a .lib file if we build a DLL.
14009+ old_archive_from_new_cmds='true'
14010+ # FIXME: Should let the user specify the lib program.
14011+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
14012+ enable_shared_with_static_runtimes=yes
14013+ ;;
14014+ esac
14015 ;;
14016
14017 darwin* | rhapsody*)
14018@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libp
14019
14020 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14021 freebsd* | dragonfly*)
14022- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14023+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14024 hardcode_libdir_flag_spec='-R$libdir'
14025 hardcode_direct=yes
14026 hardcode_shlibpath_var=no
14027@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libp
14028
14029 hpux9*)
14030 if test "$GCC" = yes; then
14031- 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'
14032+ 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'
14033 else
14034 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'
14035 fi
14036@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libp
14037
14038 hpux10*)
14039 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
14040- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14041+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14042 else
14043 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14044 fi
14045@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libp
14046 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14047 ;;
14048 ia64*)
14049- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14050+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14051 ;;
14052 *)
14053- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14054+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14055 ;;
14056 esac
14057 else
14058@@ -9565,23 +10148,36 @@ fi
14059
14060 irix5* | irix6* | nonstopux*)
14061 if test "$GCC" = yes; then
14062- 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'
14063+ 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'
14064 # Try to use the -exported_symbol ld option, if it does not
14065 # work, assume that -exports_file does not work either and
14066 # implicitly export all symbols.
14067- save_LDFLAGS="$LDFLAGS"
14068- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14069- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14070+ # This should be the same for all languages, so no per-tag cache variable.
14071+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
14072+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
14073+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
14074+ $as_echo_n "(cached) " >&6
14075+else
14076+ save_LDFLAGS="$LDFLAGS"
14077+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
14078+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14079 /* end confdefs.h. */
14080-int foo(void) {}
14081+int foo (void) { return 0; }
14082 _ACEOF
14083 if ac_fn_c_try_link "$LINENO"; then :
14084- 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'
14085-
14086+ lt_cv_irix_exported_symbol=yes
14087+else
14088+ lt_cv_irix_exported_symbol=no
14089 fi
14090 rm -f core conftest.err conftest.$ac_objext \
14091 conftest$ac_exeext conftest.$ac_ext
14092- LDFLAGS="$save_LDFLAGS"
14093+ LDFLAGS="$save_LDFLAGS"
14094+fi
14095+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
14096+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
14097+ if test "$lt_cv_irix_exported_symbol" = yes; then
14098+ 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'
14099+ fi
14100 else
14101 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'
14102 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'
14103@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_obj
14104 osf4* | osf5*) # as osf3* with the addition of -msym flag
14105 if test "$GCC" = yes; then
14106 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
14107- 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'
14108+ 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'
14109 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14110 else
14111 allow_undefined_flag=' -expect_unresolved \*'
14112@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_obj
14113 no_undefined_flag=' -z defs'
14114 if test "$GCC" = yes; then
14115 wlarc='${wl}'
14116- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14117+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14118 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
14119- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
14120+ $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'
14121 else
14122 case `$CC -V 2>&1` in
14123 *"Compilers 5.0"*)
14124@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14125 need_version=no
14126 need_lib_prefix=no
14127
14128- case $GCC,$host_os in
14129- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
14130+ case $GCC,$cc_basename in
14131+ yes,*)
14132+ # gcc
14133 library_names_spec='$libname.dll.a'
14134 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14135 postinstall_cmds='base_file=`basename \${file}`~
14136@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14137 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14138 ;;
14139 esac
14140+ dynamic_linker='Win32 ld.exe'
14141+ ;;
14142+
14143+ *,cl*)
14144+ # Native MSVC
14145+ libname_spec='$name'
14146+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14147+ library_names_spec='${libname}.dll.lib'
14148+
14149+ case $build_os in
14150+ mingw*)
14151+ sys_lib_search_path_spec=
14152+ lt_save_ifs=$IFS
14153+ IFS=';'
14154+ for lt_path in $LIB
14155+ do
14156+ IFS=$lt_save_ifs
14157+ # Let DOS variable expansion print the short 8.3 style file name.
14158+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
14159+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
14160+ done
14161+ IFS=$lt_save_ifs
14162+ # Convert to MSYS style.
14163+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
14164+ ;;
14165+ cygwin*)
14166+ # Convert to unix form, then to dos form, then back to unix form
14167+ # but this time dos style (no spaces!) so that the unix form looks
14168+ # like /cygdrive/c/PROGRA~1:/cygdr...
14169+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
14170+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
14171+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14172+ ;;
14173+ *)
14174+ sys_lib_search_path_spec="$LIB"
14175+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
14176+ # It is most probably a Windows format PATH.
14177+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
14178+ else
14179+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
14180+ fi
14181+ # FIXME: find the short name or the path components, as spaces are
14182+ # common. (e.g. "Program Files" -> "PROGRA~1")
14183+ ;;
14184+ esac
14185+
14186+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
14187+ postinstall_cmds='base_file=`basename \${file}`~
14188+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
14189+ dldir=$destdir/`dirname \$dlpath`~
14190+ test -d \$dldir || mkdir -p \$dldir~
14191+ $install_prog $dir/$dlname \$dldir/$dlname'
14192+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14193+ dlpath=$dir/\$dldll~
14194+ $RM \$dlpath'
14195+ shlibpath_overrides_runpath=yes
14196+ dynamic_linker='Win32 link.exe'
14197 ;;
14198
14199 *)
14200+ # Assume MSVC wrapper
14201 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
14202+ dynamic_linker='Win32 ld.exe'
14203 ;;
14204 esac
14205- dynamic_linker='Win32 ld.exe'
14206 # FIXME: first we should search . and the directory the executable is in
14207 shlibpath_var=PATH
14208 ;;
14209@@ -10399,7 +11054,7 @@ haiku*)
14210 soname_spec='${libname}${release}${shared_ext}$major'
14211 shlibpath_var=LIBRARY_PATH
14212 shlibpath_overrides_runpath=yes
14213- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
14214+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
14215 hardcode_into_libs=yes
14216 ;;
14217
14218@@ -11195,7 +11850,7 @@ else
14219 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14220 lt_status=$lt_dlunknown
14221 cat > conftest.$ac_ext <<_LT_EOF
14222-#line 11198 "configure"
14223+#line $LINENO "configure"
14224 #include "confdefs.h"
14225
14226 #if HAVE_DLFCN_H
14227@@ -11239,10 +11894,10 @@ else
14228 /* When -fvisbility=hidden is used, assume the code has been annotated
14229 correspondingly for the symbols needed. */
14230 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14231-void fnord () __attribute__((visibility("default")));
14232+int fnord () __attribute__((visibility("default")));
14233 #endif
14234
14235-void fnord () { int i=42; }
14236+int fnord () { return 42; }
14237 int main ()
14238 {
14239 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14240@@ -11301,7 +11956,7 @@ else
14241 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14242 lt_status=$lt_dlunknown
14243 cat > conftest.$ac_ext <<_LT_EOF
14244-#line 11304 "configure"
14245+#line $LINENO "configure"
14246 #include "confdefs.h"
14247
14248 #if HAVE_DLFCN_H
14249@@ -11345,10 +12000,10 @@ else
14250 /* When -fvisbility=hidden is used, assume the code has been annotated
14251 correspondingly for the symbols needed. */
14252 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
14253-void fnord () __attribute__((visibility("default")));
14254+int fnord () __attribute__((visibility("default")));
14255 #endif
14256
14257-void fnord () { int i=42; }
14258+int fnord () { return 42; }
14259 int main ()
14260 {
14261 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14262@@ -14941,13 +15596,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
14263 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
14264 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
14265 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
14266+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
14267+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
14268 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
14269 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
14270 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
14271 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
14272 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
14273+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
14274+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
14275+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
14276+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
14277 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
14278 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
14279+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
14280 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
14281 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
14282 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
14283@@ -14962,14 +15624,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
14284 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
14285 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
14286 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"`'
14287+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
14288+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
14289 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
14290 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
14291 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
14292-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14293 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
14294+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
14295 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
14296 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
14297 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
14298+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
14299 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
14300 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
14301 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
14302@@ -15002,12 +15667,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
14303 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
14304 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
14305 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
14306-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
14307 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
14308 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
14309 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
14310 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
14311 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
14312+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
14313 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
14314 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
14315 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
14316@@ -15062,8 +15727,13 @@ reload_flag \
14317 OBJDUMP \
14318 deplibs_check_method \
14319 file_magic_cmd \
14320+file_magic_glob \
14321+want_nocaseglob \
14322+DLLTOOL \
14323+sharedlib_from_linklib_cmd \
14324 AR \
14325 AR_FLAGS \
14326+archiver_list_spec \
14327 STRIP \
14328 RANLIB \
14329 CC \
14330@@ -15073,12 +15743,14 @@ lt_cv_sys_global_symbol_pipe \
14331 lt_cv_sys_global_symbol_to_cdecl \
14332 lt_cv_sys_global_symbol_to_c_name_address \
14333 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
14334+nm_file_list_spec \
14335 lt_prog_compiler_no_builtin_flag \
14336-lt_prog_compiler_wl \
14337 lt_prog_compiler_pic \
14338+lt_prog_compiler_wl \
14339 lt_prog_compiler_static \
14340 lt_cv_prog_compiler_c_o \
14341 need_locks \
14342+MANIFEST_TOOL \
14343 DSYMUTIL \
14344 NMEDIT \
14345 LIPO \
14346@@ -15094,7 +15766,6 @@ no_undefined_flag \
14347 hardcode_libdir_flag_spec \
14348 hardcode_libdir_flag_spec_ld \
14349 hardcode_libdir_separator \
14350-fix_srcfile_path \
14351 exclude_expsyms \
14352 include_expsyms \
14353 file_list_spec \
14354@@ -15130,6 +15801,7 @@ module_cmds \
14355 module_expsym_cmds \
14356 export_symbols_cmds \
14357 prelink_cmds \
14358+postlink_cmds \
14359 postinstall_cmds \
14360 postuninstall_cmds \
14361 finish_cmds \
14362@@ -15894,7 +16566,8 @@ $as_echo X"$file" |
14363 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
14364 #
14365 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14366-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
14367+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
14368+# Inc.
14369 # Written by Gordon Matzigkeit, 1996
14370 #
14371 # This file is part of GNU Libtool.
14372@@ -15997,19 +16670,42 @@ SP2NL=$lt_lt_SP2NL
14373 # turn newlines into spaces.
14374 NL2SP=$lt_lt_NL2SP
14375
14376+# convert \$build file names to \$host format.
14377+to_host_file_cmd=$lt_cv_to_host_file_cmd
14378+
14379+# convert \$build files to toolchain format.
14380+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14381+
14382 # An object symbol dumper.
14383 OBJDUMP=$lt_OBJDUMP
14384
14385 # Method to check whether dependent libraries are shared objects.
14386 deplibs_check_method=$lt_deplibs_check_method
14387
14388-# Command to use when deplibs_check_method == "file_magic".
14389+# Command to use when deplibs_check_method = "file_magic".
14390 file_magic_cmd=$lt_file_magic_cmd
14391
14392+# How to find potential files when deplibs_check_method = "file_magic".
14393+file_magic_glob=$lt_file_magic_glob
14394+
14395+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
14396+want_nocaseglob=$lt_want_nocaseglob
14397+
14398+# DLL creation program.
14399+DLLTOOL=$lt_DLLTOOL
14400+
14401+# Command to associate shared and link libraries.
14402+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
14403+
14404 # The archiver.
14405 AR=$lt_AR
14406+
14407+# Flags to create an archive.
14408 AR_FLAGS=$lt_AR_FLAGS
14409
14410+# How to feed a file listing to the archiver.
14411+archiver_list_spec=$lt_archiver_list_spec
14412+
14413 # A symbol stripping program.
14414 STRIP=$lt_STRIP
14415
14416@@ -16039,6 +16735,12 @@ global_symbol_to_c_name_address=$lt_lt_c
14417 # Transform the output of nm in a C name address pair when lib prefix is needed.
14418 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
14419
14420+# Specify filename containing input files for \$NM.
14421+nm_file_list_spec=$lt_nm_file_list_spec
14422+
14423+# The root where to search for dependent libraries,and in which our libraries should be installed.
14424+lt_sysroot=$lt_sysroot
14425+
14426 # The name of the directory that contains temporary libtool files.
14427 objdir=$objdir
14428
14429@@ -16048,6 +16750,9 @@ MAGIC_CMD=$MAGIC_CMD
14430 # Must we lock files when doing compilation?
14431 need_locks=$lt_need_locks
14432
14433+# Manifest tool.
14434+MANIFEST_TOOL=$lt_MANIFEST_TOOL
14435+
14436 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
14437 DSYMUTIL=$lt_DSYMUTIL
14438
14439@@ -16162,12 +16867,12 @@ with_gcc=$GCC
14440 # Compiler flag to turn off builtin functions.
14441 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
14442
14443-# How to pass a linker flag through the compiler.
14444-wl=$lt_lt_prog_compiler_wl
14445-
14446 # Additional compiler flags for building library objects.
14447 pic_flag=$lt_lt_prog_compiler_pic
14448
14449+# How to pass a linker flag through the compiler.
14450+wl=$lt_lt_prog_compiler_wl
14451+
14452 # Compiler flag to prevent dynamic linking.
14453 link_static_flag=$lt_lt_prog_compiler_static
14454
14455@@ -16254,9 +16959,6 @@ inherit_rpath=$inherit_rpath
14456 # Whether libtool must link a program against all its dependency libraries.
14457 link_all_deplibs=$link_all_deplibs
14458
14459-# Fix the shell variable \$srcfile for the compiler.
14460-fix_srcfile_path=$lt_fix_srcfile_path
14461-
14462 # Set to "yes" if exported symbols are required.
14463 always_export_symbols=$always_export_symbols
14464
14465@@ -16272,6 +16974,9 @@ include_expsyms=$lt_include_expsyms
14466 # Commands necessary for linking programs (against libraries) with templates.
14467 prelink_cmds=$lt_prelink_cmds
14468
14469+# Commands necessary for finishing linking programs.
14470+postlink_cmds=$lt_postlink_cmds
14471+
14472 # Specify filename containing input files.
14473 file_list_spec=$lt_file_list_spec
14474
14475@@ -16304,210 +17009,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
14476 # if finds mixed CR/LF and LF-only lines. Since sed operates in
14477 # text mode, it properly converts lines to CR/LF. This bash problem
14478 # is reportedly fixed, but why not run on old versions too?
14479- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
14480- || (rm -f "$cfgfile"; exit 1)
14481-
14482- case $xsi_shell in
14483- yes)
14484- cat << \_LT_EOF >> "$cfgfile"
14485-
14486-# func_dirname file append nondir_replacement
14487-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14488-# otherwise set result to NONDIR_REPLACEMENT.
14489-func_dirname ()
14490-{
14491- case ${1} in
14492- */*) func_dirname_result="${1%/*}${2}" ;;
14493- * ) func_dirname_result="${3}" ;;
14494- esac
14495-}
14496-
14497-# func_basename file
14498-func_basename ()
14499-{
14500- func_basename_result="${1##*/}"
14501-}
14502-
14503-# func_dirname_and_basename file append nondir_replacement
14504-# perform func_basename and func_dirname in a single function
14505-# call:
14506-# dirname: Compute the dirname of FILE. If nonempty,
14507-# add APPEND to the result, otherwise set result
14508-# to NONDIR_REPLACEMENT.
14509-# value returned in "$func_dirname_result"
14510-# basename: Compute filename of FILE.
14511-# value retuned in "$func_basename_result"
14512-# Implementation must be kept synchronized with func_dirname
14513-# and func_basename. For efficiency, we do not delegate to
14514-# those functions but instead duplicate the functionality here.
14515-func_dirname_and_basename ()
14516-{
14517- case ${1} in
14518- */*) func_dirname_result="${1%/*}${2}" ;;
14519- * ) func_dirname_result="${3}" ;;
14520- esac
14521- func_basename_result="${1##*/}"
14522-}
14523-
14524-# func_stripname prefix suffix name
14525-# strip PREFIX and SUFFIX off of NAME.
14526-# PREFIX and SUFFIX must not contain globbing or regex special
14527-# characters, hashes, percent signs, but SUFFIX may contain a leading
14528-# dot (in which case that matches only a dot).
14529-func_stripname ()
14530-{
14531- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
14532- # positional parameters, so assign one to ordinary parameter first.
14533- func_stripname_result=${3}
14534- func_stripname_result=${func_stripname_result#"${1}"}
14535- func_stripname_result=${func_stripname_result%"${2}"}
14536-}
14537-
14538-# func_opt_split
14539-func_opt_split ()
14540-{
14541- func_opt_split_opt=${1%%=*}
14542- func_opt_split_arg=${1#*=}
14543-}
14544-
14545-# func_lo2o object
14546-func_lo2o ()
14547-{
14548- case ${1} in
14549- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
14550- *) func_lo2o_result=${1} ;;
14551- esac
14552-}
14553-
14554-# func_xform libobj-or-source
14555-func_xform ()
14556-{
14557- func_xform_result=${1%.*}.lo
14558-}
14559-
14560-# func_arith arithmetic-term...
14561-func_arith ()
14562-{
14563- func_arith_result=$(( $* ))
14564-}
14565-
14566-# func_len string
14567-# STRING may not start with a hyphen.
14568-func_len ()
14569-{
14570- func_len_result=${#1}
14571-}
14572-
14573-_LT_EOF
14574- ;;
14575- *) # Bourne compatible functions.
14576- cat << \_LT_EOF >> "$cfgfile"
14577-
14578-# func_dirname file append nondir_replacement
14579-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
14580-# otherwise set result to NONDIR_REPLACEMENT.
14581-func_dirname ()
14582-{
14583- # Extract subdirectory from the argument.
14584- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
14585- if test "X$func_dirname_result" = "X${1}"; then
14586- func_dirname_result="${3}"
14587- else
14588- func_dirname_result="$func_dirname_result${2}"
14589- fi
14590-}
14591-
14592-# func_basename file
14593-func_basename ()
14594-{
14595- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
14596-}
14597-
14598-
14599-# func_stripname prefix suffix name
14600-# strip PREFIX and SUFFIX off of NAME.
14601-# PREFIX and SUFFIX must not contain globbing or regex special
14602-# characters, hashes, percent signs, but SUFFIX may contain a leading
14603-# dot (in which case that matches only a dot).
14604-# func_strip_suffix prefix name
14605-func_stripname ()
14606-{
14607- case ${2} in
14608- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
14609- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
14610- esac
14611-}
14612-
14613-# sed scripts:
14614-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
14615-my_sed_long_arg='1s/^-[^=]*=//'
14616-
14617-# func_opt_split
14618-func_opt_split ()
14619-{
14620- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
14621- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
14622-}
14623-
14624-# func_lo2o object
14625-func_lo2o ()
14626-{
14627- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
14628-}
14629-
14630-# func_xform libobj-or-source
14631-func_xform ()
14632-{
14633- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
14634-}
14635-
14636-# func_arith arithmetic-term...
14637-func_arith ()
14638-{
14639- func_arith_result=`expr "$@"`
14640-}
14641-
14642-# func_len string
14643-# STRING may not start with a hyphen.
14644-func_len ()
14645-{
14646- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
14647-}
14648-
14649-_LT_EOF
14650-esac
14651-
14652-case $lt_shell_append in
14653- yes)
14654- cat << \_LT_EOF >> "$cfgfile"
14655-
14656-# func_append var value
14657-# Append VALUE to the end of shell variable VAR.
14658-func_append ()
14659-{
14660- eval "$1+=\$2"
14661-}
14662-_LT_EOF
14663- ;;
14664- *)
14665- cat << \_LT_EOF >> "$cfgfile"
14666-
14667-# func_append var value
14668-# Append VALUE to the end of shell variable VAR.
14669-func_append ()
14670-{
14671- eval "$1=\$$1\$2"
14672-}
14673-
14674-_LT_EOF
14675- ;;
14676- esac
14677+ sed '$q' "$ltmain" >> "$cfgfile" \
14678+ || (rm -f "$cfgfile"; exit 1)
14679
14680+ if test x"$xsi_shell" = xyes; then
14681+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
14682+func_dirname ()\
14683+{\
14684+\ case ${1} in\
14685+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14686+\ * ) func_dirname_result="${3}" ;;\
14687+\ esac\
14688+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
14689+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14690+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14691+test 0 -eq $? || _lt_function_replace_fail=:
14692+
14693+
14694+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
14695+func_basename ()\
14696+{\
14697+\ func_basename_result="${1##*/}"\
14698+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
14699+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14700+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14701+test 0 -eq $? || _lt_function_replace_fail=:
14702+
14703+
14704+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
14705+func_dirname_and_basename ()\
14706+{\
14707+\ case ${1} in\
14708+\ */*) func_dirname_result="${1%/*}${2}" ;;\
14709+\ * ) func_dirname_result="${3}" ;;\
14710+\ esac\
14711+\ func_basename_result="${1##*/}"\
14712+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
14713+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14714+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14715+test 0 -eq $? || _lt_function_replace_fail=:
14716+
14717+
14718+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
14719+func_stripname ()\
14720+{\
14721+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
14722+\ # positional parameters, so assign one to ordinary parameter first.\
14723+\ func_stripname_result=${3}\
14724+\ func_stripname_result=${func_stripname_result#"${1}"}\
14725+\ func_stripname_result=${func_stripname_result%"${2}"}\
14726+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
14727+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14728+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14729+test 0 -eq $? || _lt_function_replace_fail=:
14730+
14731+
14732+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
14733+func_split_long_opt ()\
14734+{\
14735+\ func_split_long_opt_name=${1%%=*}\
14736+\ func_split_long_opt_arg=${1#*=}\
14737+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
14738+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14739+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14740+test 0 -eq $? || _lt_function_replace_fail=:
14741+
14742+
14743+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
14744+func_split_short_opt ()\
14745+{\
14746+\ func_split_short_opt_arg=${1#??}\
14747+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
14748+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
14749+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14750+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14751+test 0 -eq $? || _lt_function_replace_fail=:
14752+
14753+
14754+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
14755+func_lo2o ()\
14756+{\
14757+\ case ${1} in\
14758+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
14759+\ *) func_lo2o_result=${1} ;;\
14760+\ esac\
14761+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
14768+func_xform ()\
14769+{\
14770+ func_xform_result=${1%.*}.lo\
14771+} # Extended-shell func_xform 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+
14777+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
14778+func_arith ()\
14779+{\
14780+ func_arith_result=$(( $* ))\
14781+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
14782+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14783+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14784+test 0 -eq $? || _lt_function_replace_fail=:
14785+
14786+
14787+ sed -e '/^func_len ()$/,/^} # func_len /c\
14788+func_len ()\
14789+{\
14790+ func_len_result=${#1}\
14791+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
14792+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14793+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14794+test 0 -eq $? || _lt_function_replace_fail=:
14795+
14796+fi
14797+
14798+if test x"$lt_shell_append" = xyes; then
14799+ sed -e '/^func_append ()$/,/^} # func_append /c\
14800+func_append ()\
14801+{\
14802+ eval "${1}+=\\${2}"\
14803+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
14804+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14805+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14806+test 0 -eq $? || _lt_function_replace_fail=:
14807+
14808+
14809+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
14810+func_append_quoted ()\
14811+{\
14812+\ func_quote_for_eval "${2}"\
14813+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
14814+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
14815+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14816+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14817+test 0 -eq $? || _lt_function_replace_fail=:
14818+
14819+
14820+ # Save a `func_append' function call where possible by direct use of '+='
14821+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
14822+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14823+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14824+ test 0 -eq $? || _lt_function_replace_fail=:
14825+else
14826+ # Save a `func_append' function call even when '+=' is not available
14827+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
14828+ && mv -f "$cfgfile.tmp" "$cfgfile" \
14829+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
14830+ test 0 -eq $? || _lt_function_replace_fail=:
14831+fi
14832+
14833+if test x"$_lt_function_replace_fail" = x":"; then
14834+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
14835+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
14836+fi
14837
14838- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
14839- || (rm -f "$cfgfile"; exit 1)
14840
14841- mv -f "$cfgfile" "$ofile" ||
14842+ mv -f "$cfgfile" "$ofile" ||
14843 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
14844 chmod +x "$ofile"
14845
14846Index: binutils-2.21.1/gprof/configure
14847===================================================================
14848--- binutils-2.21.1.orig/gprof/configure
14849+++ binutils-2.21.1/gprof/configure
14850@@ -629,8 +629,11 @@ OTOOL
14851 LIPO
14852 NMEDIT
14853 DSYMUTIL
14854+MANIFEST_TOOL
14855 RANLIB
14856+ac_ct_AR
14857 AR
14858+DLLTOOL
14859 OBJDUMP
14860 LN_S
14861 NM
14862@@ -743,6 +746,7 @@ enable_static
14863 with_pic
14864 enable_fast_install
14865 with_gnu_ld
14866+with_libtool_sysroot
14867 enable_libtool_lock
14868 enable_nls
14869 enable_maintainer_mode
14870@@ -1397,6 +1401,8 @@ Optional Packages:
14871 --with-pic try to use only PIC/non-PIC objects [default=use
14872 both]
14873 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
14874+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
14875+ (or the compiler's sysroot if not specified).
14876
14877 Some influential environment variables:
14878 CC C compiler command
14879@@ -5065,8 +5071,8 @@ esac
14880
14881
14882
14883-macro_version='2.2.7a'
14884-macro_revision='1.3134'
14885+macro_version='2.4'
14886+macro_revision='1.3293'
14887
14888
14889
14890@@ -5106,7 +5112,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
14891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
14892 $as_echo_n "checking how to print strings... " >&6; }
14893 # Test print first, because it will be a builtin if present.
14894-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
14895+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
14896 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
14897 ECHO='print -r --'
14898 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
14899@@ -5792,8 +5798,8 @@ $as_echo_n "checking whether the shell u
14900 # Try some XSI features
14901 xsi_shell=no
14902 ( _lt_dummy="a/b/c"
14903- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
14904- = c,a/b,, \
14905+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
14906+ = c,a/b,b/c, \
14907 && eval 'test $(( 1 + 1 )) -eq 2 \
14908 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
14909 && xsi_shell=yes
14910@@ -5842,6 +5848,80 @@ esac
14911
14912
14913
14914+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
14915+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
14916+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
14917+ $as_echo_n "(cached) " >&6
14918+else
14919+ case $host in
14920+ *-*-mingw* )
14921+ case $build in
14922+ *-*-mingw* ) # actually msys
14923+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
14924+ ;;
14925+ *-*-cygwin* )
14926+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
14927+ ;;
14928+ * ) # otherwise, assume *nix
14929+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
14930+ ;;
14931+ esac
14932+ ;;
14933+ *-*-cygwin* )
14934+ case $build in
14935+ *-*-mingw* ) # actually msys
14936+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
14937+ ;;
14938+ *-*-cygwin* )
14939+ lt_cv_to_host_file_cmd=func_convert_file_noop
14940+ ;;
14941+ * ) # otherwise, assume *nix
14942+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
14943+ ;;
14944+ esac
14945+ ;;
14946+ * ) # unhandled hosts (and "normal" native builds)
14947+ lt_cv_to_host_file_cmd=func_convert_file_noop
14948+ ;;
14949+esac
14950+
14951+fi
14952+
14953+to_host_file_cmd=$lt_cv_to_host_file_cmd
14954+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
14955+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
14956+
14957+
14958+
14959+
14960+
14961+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
14962+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
14963+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
14964+ $as_echo_n "(cached) " >&6
14965+else
14966+ #assume ordinary cross tools, or native build.
14967+lt_cv_to_tool_file_cmd=func_convert_file_noop
14968+case $host in
14969+ *-*-mingw* )
14970+ case $build in
14971+ *-*-mingw* ) # actually msys
14972+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
14973+ ;;
14974+ esac
14975+ ;;
14976+esac
14977+
14978+fi
14979+
14980+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
14981+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
14982+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
14983+
14984+
14985+
14986+
14987+
14988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
14989 $as_echo_n "checking for $LD option to reload object files... " >&6; }
14990 if test "${lt_cv_ld_reload_flag+set}" = set; then :
14991@@ -5858,6 +5938,11 @@ case $reload_flag in
14992 esac
14993 reload_cmds='$LD$reload_flag -o $output$reload_objs'
14994 case $host_os in
14995+ cygwin* | mingw* | pw32* | cegcc*)
14996+ if test "$GCC" != yes; then
14997+ reload_cmds=false
14998+ fi
14999+ ;;
15000 darwin*)
15001 if test "$GCC" = yes; then
15002 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
15003@@ -6026,7 +6111,8 @@ mingw* | pw32*)
15004 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
15005 lt_cv_file_magic_cmd='func_win32_libid'
15006 else
15007- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
15008+ # Keep this pattern in sync with the one in func_win32_libid.
15009+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
15010 lt_cv_file_magic_cmd='$OBJDUMP -f'
15011 fi
15012 ;;
15013@@ -6103,11 +6189,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
15014 lt_cv_deplibs_check_method=pass_all
15015 ;;
15016
15017-linux-uclibc*)
15018- lt_cv_deplibs_check_method=pass_all
15019- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
15020- ;;
15021-
15022 netbsd*)
15023 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
15024 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
15025@@ -6185,6 +6266,21 @@ esac
15026 fi
15027 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
15028 $as_echo "$lt_cv_deplibs_check_method" >&6; }
15029+
15030+file_magic_glob=
15031+want_nocaseglob=no
15032+if test "$build" = "$host"; then
15033+ case $host_os in
15034+ mingw* | pw32*)
15035+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
15036+ want_nocaseglob=yes
15037+ else
15038+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
15039+ fi
15040+ ;;
15041+ esac
15042+fi
15043+
15044 file_magic_cmd=$lt_cv_file_magic_cmd
15045 deplibs_check_method=$lt_cv_deplibs_check_method
15046 test -z "$deplibs_check_method" && deplibs_check_method=unknown
15047@@ -6200,9 +6296,162 @@ test -z "$deplibs_check_method" && depli
15048
15049
15050
15051+
15052+
15053+
15054+
15055+
15056+
15057+
15058+
15059+
15060+
15061 if test -n "$ac_tool_prefix"; then
15062- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
15063-set dummy ${ac_tool_prefix}ar; ac_word=$2
15064+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
15065+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
15066+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15067+$as_echo_n "checking for $ac_word... " >&6; }
15068+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
15069+ $as_echo_n "(cached) " >&6
15070+else
15071+ if test -n "$DLLTOOL"; then
15072+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
15073+else
15074+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15075+for as_dir in $PATH
15076+do
15077+ IFS=$as_save_IFS
15078+ test -z "$as_dir" && as_dir=.
15079+ for ac_exec_ext in '' $ac_executable_extensions; do
15080+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15081+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
15082+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15083+ break 2
15084+ fi
15085+done
15086+ done
15087+IFS=$as_save_IFS
15088+
15089+fi
15090+fi
15091+DLLTOOL=$ac_cv_prog_DLLTOOL
15092+if test -n "$DLLTOOL"; then
15093+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
15094+$as_echo "$DLLTOOL" >&6; }
15095+else
15096+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15097+$as_echo "no" >&6; }
15098+fi
15099+
15100+
15101+fi
15102+if test -z "$ac_cv_prog_DLLTOOL"; then
15103+ ac_ct_DLLTOOL=$DLLTOOL
15104+ # Extract the first word of "dlltool", so it can be a program name with args.
15105+set dummy dlltool; ac_word=$2
15106+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15107+$as_echo_n "checking for $ac_word... " >&6; }
15108+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
15109+ $as_echo_n "(cached) " >&6
15110+else
15111+ if test -n "$ac_ct_DLLTOOL"; then
15112+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
15113+else
15114+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15115+for as_dir in $PATH
15116+do
15117+ IFS=$as_save_IFS
15118+ test -z "$as_dir" && as_dir=.
15119+ for ac_exec_ext in '' $ac_executable_extensions; do
15120+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15121+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
15122+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15123+ break 2
15124+ fi
15125+done
15126+ done
15127+IFS=$as_save_IFS
15128+
15129+fi
15130+fi
15131+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
15132+if test -n "$ac_ct_DLLTOOL"; then
15133+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
15134+$as_echo "$ac_ct_DLLTOOL" >&6; }
15135+else
15136+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15137+$as_echo "no" >&6; }
15138+fi
15139+
15140+ if test "x$ac_ct_DLLTOOL" = x; then
15141+ DLLTOOL="false"
15142+ else
15143+ case $cross_compiling:$ac_tool_warned in
15144+yes:)
15145+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15146+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15147+ac_tool_warned=yes ;;
15148+esac
15149+ DLLTOOL=$ac_ct_DLLTOOL
15150+ fi
15151+else
15152+ DLLTOOL="$ac_cv_prog_DLLTOOL"
15153+fi
15154+
15155+test -z "$DLLTOOL" && DLLTOOL=dlltool
15156+
15157+
15158+
15159+
15160+
15161+
15162+
15163+
15164+
15165+
15166+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
15167+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
15168+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
15169+ $as_echo_n "(cached) " >&6
15170+else
15171+ lt_cv_sharedlib_from_linklib_cmd='unknown'
15172+
15173+case $host_os in
15174+cygwin* | mingw* | pw32* | cegcc*)
15175+ # two different shell functions defined in ltmain.sh
15176+ # decide which to use based on capabilities of $DLLTOOL
15177+ case `$DLLTOOL --help 2>&1` in
15178+ *--identify-strict*)
15179+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
15180+ ;;
15181+ *)
15182+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
15183+ ;;
15184+ esac
15185+ ;;
15186+*)
15187+ # fallback: assume linklib IS sharedlib
15188+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
15189+ ;;
15190+esac
15191+
15192+fi
15193+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
15194+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
15195+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
15196+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
15197+
15198+
15199+
15200+
15201+
15202+
15203+
15204+if test -n "$ac_tool_prefix"; then
15205+ for ac_prog in ar
15206+ do
15207+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
15208+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
15209 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15210 $as_echo_n "checking for $ac_word... " >&6; }
15211 if test "${ac_cv_prog_AR+set}" = set; then :
15212@@ -6218,7 +6467,7 @@ do
15213 test -z "$as_dir" && as_dir=.
15214 for ac_exec_ext in '' $ac_executable_extensions; do
15215 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15216- ac_cv_prog_AR="${ac_tool_prefix}ar"
15217+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
15218 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15219 break 2
15220 fi
15221@@ -6238,11 +6487,15 @@ $as_echo "no" >&6; }
15222 fi
15223
15224
15225+ test -n "$AR" && break
15226+ done
15227 fi
15228-if test -z "$ac_cv_prog_AR"; then
15229+if test -z "$AR"; then
15230 ac_ct_AR=$AR
15231- # Extract the first word of "ar", so it can be a program name with args.
15232-set dummy ar; ac_word=$2
15233+ for ac_prog in ar
15234+do
15235+ # Extract the first word of "$ac_prog", so it can be a program name with args.
15236+set dummy $ac_prog; ac_word=$2
15237 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15238 $as_echo_n "checking for $ac_word... " >&6; }
15239 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
15240@@ -6258,7 +6511,7 @@ do
15241 test -z "$as_dir" && as_dir=.
15242 for ac_exec_ext in '' $ac_executable_extensions; do
15243 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15244- ac_cv_prog_ac_ct_AR="ar"
15245+ ac_cv_prog_ac_ct_AR="$ac_prog"
15246 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15247 break 2
15248 fi
15249@@ -6277,6 +6530,10 @@ else
15250 $as_echo "no" >&6; }
15251 fi
15252
15253+
15254+ test -n "$ac_ct_AR" && break
15255+done
15256+
15257 if test "x$ac_ct_AR" = x; then
15258 AR="false"
15259 else
15260@@ -6288,16 +6545,72 @@ ac_tool_warned=yes ;;
15261 esac
15262 AR=$ac_ct_AR
15263 fi
15264-else
15265- AR="$ac_cv_prog_AR"
15266 fi
15267
15268-test -z "$AR" && AR=ar
15269-test -z "$AR_FLAGS" && AR_FLAGS=cru
15270+: ${AR=ar}
15271+: ${AR_FLAGS=cru}
15272+
15273+
15274+
15275+
15276+
15277+
15278+
15279+
15280+
15281+
15282+
15283+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
15284+$as_echo_n "checking for archiver @FILE support... " >&6; }
15285+if test "${lt_cv_ar_at_file+set}" = set; then :
15286+ $as_echo_n "(cached) " >&6
15287+else
15288+ lt_cv_ar_at_file=no
15289+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15290+/* end confdefs.h. */
15291+
15292+int
15293+main ()
15294+{
15295
15296+ ;
15297+ return 0;
15298+}
15299+_ACEOF
15300+if ac_fn_c_try_compile "$LINENO"; then :
15301+ echo conftest.$ac_objext > conftest.lst
15302+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
15303+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15304+ (eval $lt_ar_try) 2>&5
15305+ ac_status=$?
15306+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15307+ test $ac_status = 0; }
15308+ if test "$ac_status" -eq 0; then
15309+ # Ensure the archiver fails upon bogus file names.
15310+ rm -f conftest.$ac_objext libconftest.a
15311+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
15312+ (eval $lt_ar_try) 2>&5
15313+ ac_status=$?
15314+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15315+ test $ac_status = 0; }
15316+ if test "$ac_status" -ne 0; then
15317+ lt_cv_ar_at_file=@
15318+ fi
15319+ fi
15320+ rm -f conftest.* libconftest.a
15321
15322+fi
15323+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15324
15325+fi
15326+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
15327+$as_echo "$lt_cv_ar_at_file" >&6; }
15328
15329+if test "x$lt_cv_ar_at_file" = xno; then
15330+ archiver_list_spec=
15331+else
15332+ archiver_list_spec=$lt_cv_ar_at_file
15333+fi
15334
15335
15336
15337@@ -6639,8 +6952,8 @@ esac
15338 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15339
15340 # Transform an extracted symbol line into symbol name and symbol address
15341-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15342-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'"
15343+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
15344+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'"
15345
15346 # Handle CRLF in mingw tool chain
15347 opt_cr=
15348@@ -6676,6 +6989,7 @@ for ac_symprfx in "" "_"; do
15349 else
15350 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
15351 fi
15352+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
15353
15354 # Check to see that the pipe works correctly.
15355 pipe_works=no
15356@@ -6717,6 +7031,18 @@ _LT_EOF
15357 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
15358 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
15359 cat <<_LT_EOF > conftest.$ac_ext
15360+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
15361+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
15362+/* DATA imports from DLLs on WIN32 con't be const, because runtime
15363+ relocations are performed -- see ld's documentation on pseudo-relocs. */
15364+# define LT_DLSYM_CONST
15365+#elif defined(__osf__)
15366+/* This system does not cope well with relocations in const data. */
15367+# define LT_DLSYM_CONST
15368+#else
15369+# define LT_DLSYM_CONST const
15370+#endif
15371+
15372 #ifdef __cplusplus
15373 extern "C" {
15374 #endif
15375@@ -6728,7 +7054,7 @@ _LT_EOF
15376 cat <<_LT_EOF >> conftest.$ac_ext
15377
15378 /* The mapping between symbol names and symbols. */
15379-const struct {
15380+LT_DLSYM_CONST struct {
15381 const char *name;
15382 void *address;
15383 }
15384@@ -6754,8 +7080,8 @@ static const void *lt_preloaded_setup()
15385 _LT_EOF
15386 # Now try linking the two files.
15387 mv conftest.$ac_objext conftstm.$ac_objext
15388- lt_save_LIBS="$LIBS"
15389- lt_save_CFLAGS="$CFLAGS"
15390+ lt_globsym_save_LIBS=$LIBS
15391+ lt_globsym_save_CFLAGS=$CFLAGS
15392 LIBS="conftstm.$ac_objext"
15393 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
15394 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
15395@@ -6765,8 +7091,8 @@ _LT_EOF
15396 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
15397 pipe_works=yes
15398 fi
15399- LIBS="$lt_save_LIBS"
15400- CFLAGS="$lt_save_CFLAGS"
15401+ LIBS=$lt_globsym_save_LIBS
15402+ CFLAGS=$lt_globsym_save_CFLAGS
15403 else
15404 echo "cannot find nm_test_func in $nlist" >&5
15405 fi
15406@@ -6803,6 +7129,17 @@ else
15407 $as_echo "ok" >&6; }
15408 fi
15409
15410+# Response file support.
15411+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
15412+ nm_file_list_spec='@'
15413+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
15414+ nm_file_list_spec='@'
15415+fi
15416+
15417+
15418+
15419+
15420+
15421
15422
15423
15424@@ -6824,6 +7161,44 @@ fi
15425
15426
15427
15428+
15429+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
15430+$as_echo_n "checking for sysroot... " >&6; }
15431+
15432+# Check whether --with-libtool-sysroot was given.
15433+if test "${with_libtool_sysroot+set}" = set; then :
15434+ withval=$with_libtool_sysroot;
15435+else
15436+ with_libtool_sysroot=no
15437+fi
15438+
15439+
15440+lt_sysroot=
15441+case ${with_libtool_sysroot} in #(
15442+ yes)
15443+ if test "$GCC" = yes; then
15444+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
15445+ fi
15446+ ;; #(
15447+ /*)
15448+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
15449+ ;; #(
15450+ no|'')
15451+ ;; #(
15452+ *)
15453+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
15454+$as_echo "${with_libtool_sysroot}" >&6; }
15455+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
15456+ ;;
15457+esac
15458+
15459+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
15460+$as_echo "${lt_sysroot:-no}" >&6; }
15461+
15462+
15463+
15464+
15465+
15466 # Check whether --enable-libtool-lock was given.
15467 if test "${enable_libtool_lock+set}" = set; then :
15468 enableval=$enable_libtool_lock;
15469@@ -7017,6 +7392,123 @@ esac
15470
15471 need_locks="$enable_libtool_lock"
15472
15473+if test -n "$ac_tool_prefix"; then
15474+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
15475+set dummy ${ac_tool_prefix}mt; ac_word=$2
15476+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15477+$as_echo_n "checking for $ac_word... " >&6; }
15478+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
15479+ $as_echo_n "(cached) " >&6
15480+else
15481+ if test -n "$MANIFEST_TOOL"; then
15482+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
15483+else
15484+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15485+for as_dir in $PATH
15486+do
15487+ IFS=$as_save_IFS
15488+ test -z "$as_dir" && as_dir=.
15489+ for ac_exec_ext in '' $ac_executable_extensions; do
15490+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15491+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
15492+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15493+ break 2
15494+ fi
15495+done
15496+ done
15497+IFS=$as_save_IFS
15498+
15499+fi
15500+fi
15501+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
15502+if test -n "$MANIFEST_TOOL"; then
15503+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
15504+$as_echo "$MANIFEST_TOOL" >&6; }
15505+else
15506+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15507+$as_echo "no" >&6; }
15508+fi
15509+
15510+
15511+fi
15512+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
15513+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
15514+ # Extract the first word of "mt", so it can be a program name with args.
15515+set dummy mt; ac_word=$2
15516+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15517+$as_echo_n "checking for $ac_word... " >&6; }
15518+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
15519+ $as_echo_n "(cached) " >&6
15520+else
15521+ if test -n "$ac_ct_MANIFEST_TOOL"; then
15522+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
15523+else
15524+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15525+for as_dir in $PATH
15526+do
15527+ IFS=$as_save_IFS
15528+ test -z "$as_dir" && as_dir=.
15529+ for ac_exec_ext in '' $ac_executable_extensions; do
15530+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15531+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
15532+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15533+ break 2
15534+ fi
15535+done
15536+ done
15537+IFS=$as_save_IFS
15538+
15539+fi
15540+fi
15541+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
15542+if test -n "$ac_ct_MANIFEST_TOOL"; then
15543+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
15544+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
15545+else
15546+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15547+$as_echo "no" >&6; }
15548+fi
15549+
15550+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
15551+ MANIFEST_TOOL=":"
15552+ else
15553+ case $cross_compiling:$ac_tool_warned in
15554+yes:)
15555+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15556+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15557+ac_tool_warned=yes ;;
15558+esac
15559+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
15560+ fi
15561+else
15562+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
15563+fi
15564+
15565+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
15566+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
15567+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
15568+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
15569+ $as_echo_n "(cached) " >&6
15570+else
15571+ lt_cv_path_mainfest_tool=no
15572+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
15573+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
15574+ cat conftest.err >&5
15575+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
15576+ lt_cv_path_mainfest_tool=yes
15577+ fi
15578+ rm -f conftest*
15579+fi
15580+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
15581+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
15582+if test "x$lt_cv_path_mainfest_tool" != xyes; then
15583+ MANIFEST_TOOL=:
15584+fi
15585+
15586+
15587+
15588+
15589+
15590
15591 case $host_os in
15592 rhapsody* | darwin*)
15593@@ -7580,6 +8072,8 @@ _LT_EOF
15594 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
15595 echo "$AR cru libconftest.a conftest.o" >&5
15596 $AR cru libconftest.a conftest.o 2>&5
15597+ echo "$RANLIB libconftest.a" >&5
15598+ $RANLIB libconftest.a 2>&5
15599 cat > conftest.c << _LT_EOF
15600 int main() { return 0;}
15601 _LT_EOF
15602@@ -7775,7 +8269,8 @@ fi
15603 LIBTOOL_DEPS="$ltmain"
15604
15605 # Always use our own libtool.
15606-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
15607+LIBTOOL='$(SHELL) $(top_builddir)'
15608+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
15609
15610
15611
15612@@ -7864,7 +8359,7 @@ aix3*)
15613 esac
15614
15615 # Global variables:
15616-ofile=libtool
15617+ofile=${host_alias}-libtool
15618 can_build_shared=yes
15619
15620 # All known linkers require a `.a' archive for static linking (except MSVC,
15621@@ -8162,8 +8657,6 @@ fi
15622 lt_prog_compiler_pic=
15623 lt_prog_compiler_static=
15624
15625-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15626-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15627
15628 if test "$GCC" = yes; then
15629 lt_prog_compiler_wl='-Wl,'
15630@@ -8328,6 +8821,12 @@ $as_echo_n "checking for $compiler optio
15631 lt_prog_compiler_pic='--shared'
15632 lt_prog_compiler_static='--static'
15633 ;;
15634+ nagfor*)
15635+ # NAG Fortran compiler
15636+ lt_prog_compiler_wl='-Wl,-Wl,,'
15637+ lt_prog_compiler_pic='-PIC'
15638+ lt_prog_compiler_static='-Bstatic'
15639+ ;;
15640 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
15641 # Portland Group compilers (*not* the Pentium gcc compiler,
15642 # which looks to be a dead project)
15643@@ -8390,7 +8889,7 @@ $as_echo_n "checking for $compiler optio
15644 lt_prog_compiler_pic='-KPIC'
15645 lt_prog_compiler_static='-Bstatic'
15646 case $cc_basename in
15647- f77* | f90* | f95*)
15648+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
15649 lt_prog_compiler_wl='-Qoption ld ';;
15650 *)
15651 lt_prog_compiler_wl='-Wl,';;
15652@@ -8447,13 +8946,17 @@ case $host_os in
15653 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
15654 ;;
15655 esac
15656-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
15657-$as_echo "$lt_prog_compiler_pic" >&6; }
15658-
15659-
15660-
15661-
15662
15663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
15664+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15665+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
15666+ $as_echo_n "(cached) " >&6
15667+else
15668+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
15669+fi
15670+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
15671+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
15672+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
15673
15674 #
15675 # Check to make sure the PIC flag actually works.
15676@@ -8514,6 +9017,11 @@ fi
15677
15678
15679
15680+
15681+
15682+
15683+
15684+
15685 #
15686 # Check to make sure the static flag actually works.
15687 #
15688@@ -8864,7 +9372,8 @@ _LT_EOF
15689 allow_undefined_flag=unsupported
15690 always_export_symbols=no
15691 enable_shared_with_static_runtimes=yes
15692- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15693+ 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'
15694+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
15695
15696 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
15697 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15698@@ -8912,7 +9421,7 @@ _LT_EOF
15699 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
15700 && test "$tmp_diet" = no
15701 then
15702- tmp_addflag=
15703+ tmp_addflag=' $pic_flag'
15704 tmp_sharedflag='-shared'
15705 case $cc_basename,$host_cpu in
15706 pgcc*) # Portland Group C compiler
15707@@ -8963,12 +9472,12 @@ _LT_EOF
15708 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
15709 hardcode_libdir_flag_spec=
15710 hardcode_libdir_flag_spec_ld='-rpath $libdir'
15711- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
15712+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
15713 if test "x$supports_anon_versioning" = xyes; then
15714 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
15715 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
15716 echo "local: *; };" >> $output_objdir/$libname.ver~
15717- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15718+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
15719 fi
15720 ;;
15721 esac
15722@@ -8982,8 +9491,8 @@ _LT_EOF
15723 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15724 wlarc=
15725 else
15726- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15727- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15728+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15729+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15730 fi
15731 ;;
15732
15733@@ -9001,8 +9510,8 @@ _LT_EOF
15734
15735 _LT_EOF
15736 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15737- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15738- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15739+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15740+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15741 else
15742 ld_shlibs=no
15743 fi
15744@@ -9048,8 +9557,8 @@ _LT_EOF
15745
15746 *)
15747 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
15748- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15749- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15750+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15751+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
15752 else
15753 ld_shlibs=no
15754 fi
15755@@ -9179,7 +9688,13 @@ _LT_EOF
15756 allow_undefined_flag='-berok'
15757 # Determine the default libpath from the value encoded in an
15758 # empty executable.
15759- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15760+ if test "${lt_cv_aix_libpath+set}" = set; then
15761+ aix_libpath=$lt_cv_aix_libpath
15762+else
15763+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15764+ $as_echo_n "(cached) " >&6
15765+else
15766+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15767 /* end confdefs.h. */
15768
15769 int
15770@@ -9192,22 +9707,29 @@ main ()
15771 _ACEOF
15772 if ac_fn_c_try_link "$LINENO"; then :
15773
15774-lt_aix_libpath_sed='
15775- /Import File Strings/,/^$/ {
15776- /^0/ {
15777- s/^0 *\(.*\)$/\1/
15778- p
15779- }
15780- }'
15781-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15782-# Check for a 64-bit object if we didn't find anything.
15783-if test -z "$aix_libpath"; then
15784- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15785-fi
15786+ lt_aix_libpath_sed='
15787+ /Import File Strings/,/^$/ {
15788+ /^0/ {
15789+ s/^0 *\([^ ]*\) *$/\1/
15790+ p
15791+ }
15792+ }'
15793+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15794+ # Check for a 64-bit object if we didn't find anything.
15795+ if test -z "$lt_cv_aix_libpath_"; then
15796+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15797+ fi
15798 fi
15799 rm -f core conftest.err conftest.$ac_objext \
15800 conftest$ac_exeext conftest.$ac_ext
15801-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15802+ if test -z "$lt_cv_aix_libpath_"; then
15803+ lt_cv_aix_libpath_="/usr/lib:/lib"
15804+ fi
15805+
15806+fi
15807+
15808+ aix_libpath=$lt_cv_aix_libpath_
15809+fi
15810
15811 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15812 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"
15813@@ -9219,7 +9741,13 @@ if test -z "$aix_libpath"; then aix_libp
15814 else
15815 # Determine the default libpath from the value encoded in an
15816 # empty executable.
15817- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15818+ if test "${lt_cv_aix_libpath+set}" = set; then
15819+ aix_libpath=$lt_cv_aix_libpath
15820+else
15821+ if test "${lt_cv_aix_libpath_+set}" = set; then :
15822+ $as_echo_n "(cached) " >&6
15823+else
15824+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15825 /* end confdefs.h. */
15826
15827 int
15828@@ -9232,22 +9760,29 @@ main ()
15829 _ACEOF
15830 if ac_fn_c_try_link "$LINENO"; then :
15831
15832-lt_aix_libpath_sed='
15833- /Import File Strings/,/^$/ {
15834- /^0/ {
15835- s/^0 *\(.*\)$/\1/
15836- p
15837- }
15838- }'
15839-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15840-# Check for a 64-bit object if we didn't find anything.
15841-if test -z "$aix_libpath"; then
15842- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15843-fi
15844+ lt_aix_libpath_sed='
15845+ /Import File Strings/,/^$/ {
15846+ /^0/ {
15847+ s/^0 *\([^ ]*\) *$/\1/
15848+ p
15849+ }
15850+ }'
15851+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15852+ # Check for a 64-bit object if we didn't find anything.
15853+ if test -z "$lt_cv_aix_libpath_"; then
15854+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15855+ fi
15856 fi
15857 rm -f core conftest.err conftest.$ac_objext \
15858 conftest$ac_exeext conftest.$ac_ext
15859-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15860+ if test -z "$lt_cv_aix_libpath_"; then
15861+ lt_cv_aix_libpath_="/usr/lib:/lib"
15862+ fi
15863+
15864+fi
15865+
15866+ aix_libpath=$lt_cv_aix_libpath_
15867+fi
15868
15869 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15870 # Warning - without using the other run time loading flags,
15871@@ -9292,20 +9827,63 @@ if test -z "$aix_libpath"; then aix_libp
15872 # Microsoft Visual C++.
15873 # hardcode_libdir_flag_spec is actually meaningless, as there is
15874 # no search path for DLLs.
15875- hardcode_libdir_flag_spec=' '
15876- allow_undefined_flag=unsupported
15877- # Tell ltmain to make .lib files, not .a files.
15878- libext=lib
15879- # Tell ltmain to make .dll files, not .so files.
15880- shrext_cmds=".dll"
15881- # FIXME: Setting linknames here is a bad hack.
15882- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15883- # The linker will automatically build a .lib file if we build a DLL.
15884- old_archive_from_new_cmds='true'
15885- # FIXME: Should let the user specify the lib program.
15886- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15887- fix_srcfile_path='`cygpath -w "$srcfile"`'
15888- enable_shared_with_static_runtimes=yes
15889+ case $cc_basename in
15890+ cl*)
15891+ # Native MSVC
15892+ hardcode_libdir_flag_spec=' '
15893+ allow_undefined_flag=unsupported
15894+ always_export_symbols=yes
15895+ file_list_spec='@'
15896+ # Tell ltmain to make .lib files, not .a files.
15897+ libext=lib
15898+ # Tell ltmain to make .dll files, not .so files.
15899+ shrext_cmds=".dll"
15900+ # FIXME: Setting linknames here is a bad hack.
15901+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
15902+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
15903+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
15904+ else
15905+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
15906+ fi~
15907+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
15908+ linknames='
15909+ # The linker will not automatically build a static lib if we build a DLL.
15910+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
15911+ enable_shared_with_static_runtimes=yes
15912+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15913+ # Don't use ranlib
15914+ old_postinstall_cmds='chmod 644 $oldlib'
15915+ postlink_cmds='lt_outputfile="@OUTPUT@"~
15916+ lt_tool_outputfile="@TOOL_OUTPUT@"~
15917+ case $lt_outputfile in
15918+ *.exe|*.EXE) ;;
15919+ *)
15920+ lt_outputfile="$lt_outputfile.exe"
15921+ lt_tool_outputfile="$lt_tool_outputfile.exe"
15922+ ;;
15923+ esac~
15924+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
15925+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
15926+ $RM "$lt_outputfile.manifest";
15927+ fi'
15928+ ;;
15929+ *)
15930+ # Assume MSVC wrapper
15931+ hardcode_libdir_flag_spec=' '
15932+ allow_undefined_flag=unsupported
15933+ # Tell ltmain to make .lib files, not .a files.
15934+ libext=lib
15935+ # Tell ltmain to make .dll files, not .so files.
15936+ shrext_cmds=".dll"
15937+ # FIXME: Setting linknames here is a bad hack.
15938+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
15939+ # The linker will automatically build a .lib file if we build a DLL.
15940+ old_archive_from_new_cmds='true'
15941+ # FIXME: Should let the user specify the lib program.
15942+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15943+ enable_shared_with_static_runtimes=yes
15944+ ;;
15945+ esac
15946 ;;
15947
15948 darwin* | rhapsody*)
15949@@ -9370,7 +9948,7 @@ if test -z "$aix_libpath"; then aix_libp
15950
15951 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15952 freebsd* | dragonfly*)
15953- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
15954+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
15955 hardcode_libdir_flag_spec='-R$libdir'
15956 hardcode_direct=yes
15957 hardcode_shlibpath_var=no
15958@@ -9378,7 +9956,7 @@ if test -z "$aix_libpath"; then aix_libp
15959
15960 hpux9*)
15961 if test "$GCC" = yes; then
15962- 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'
15963+ 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'
15964 else
15965 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'
15966 fi
15967@@ -9394,7 +9972,7 @@ if test -z "$aix_libpath"; then aix_libp
15968
15969 hpux10*)
15970 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
15971- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15972+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15973 else
15974 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
15975 fi
15976@@ -9418,10 +9996,10 @@ if test -z "$aix_libpath"; then aix_libp
15977 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
15978 ;;
15979 ia64*)
15980- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15981+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
15982 ;;
15983 *)
15984- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15985+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
15986 ;;
15987 esac
15988 else
15989@@ -9500,23 +10078,36 @@ fi
15990
15991 irix5* | irix6* | nonstopux*)
15992 if test "$GCC" = yes; then
15993- 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'
15994+ 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'
15995 # Try to use the -exported_symbol ld option, if it does not
15996 # work, assume that -exports_file does not work either and
15997 # implicitly export all symbols.
15998- save_LDFLAGS="$LDFLAGS"
15999- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
16000- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16001+ # This should be the same for all languages, so no per-tag cache variable.
16002+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
16003+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
16004+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
16005+ $as_echo_n "(cached) " >&6
16006+else
16007+ save_LDFLAGS="$LDFLAGS"
16008+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
16009+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16010 /* end confdefs.h. */
16011-int foo(void) {}
16012+int foo (void) { return 0; }
16013 _ACEOF
16014 if ac_fn_c_try_link "$LINENO"; then :
16015- 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'
16016-
16017+ lt_cv_irix_exported_symbol=yes
16018+else
16019+ lt_cv_irix_exported_symbol=no
16020 fi
16021 rm -f core conftest.err conftest.$ac_objext \
16022 conftest$ac_exeext conftest.$ac_ext
16023- LDFLAGS="$save_LDFLAGS"
16024+ LDFLAGS="$save_LDFLAGS"
16025+fi
16026+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
16027+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
16028+ if test "$lt_cv_irix_exported_symbol" = yes; then
16029+ 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'
16030+ fi
16031 else
16032 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'
16033 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'
16034@@ -9601,7 +10192,7 @@ rm -f core conftest.err conftest.$ac_obj
16035 osf4* | osf5*) # as osf3* with the addition of -msym flag
16036 if test "$GCC" = yes; then
16037 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
16038- 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'
16039+ 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'
16040 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
16041 else
16042 allow_undefined_flag=' -expect_unresolved \*'
16043@@ -9620,9 +10211,9 @@ rm -f core conftest.err conftest.$ac_obj
16044 no_undefined_flag=' -z defs'
16045 if test "$GCC" = yes; then
16046 wlarc='${wl}'
16047- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16048+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16049 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
16050- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
16051+ $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'
16052 else
16053 case `$CC -V 2>&1` in
16054 *"Compilers 5.0"*)
16055@@ -10198,8 +10789,9 @@ cygwin* | mingw* | pw32* | cegcc*)
16056 need_version=no
16057 need_lib_prefix=no
16058
16059- case $GCC,$host_os in
16060- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
16061+ case $GCC,$cc_basename in
16062+ yes,*)
16063+ # gcc
16064 library_names_spec='$libname.dll.a'
16065 # DLL is installed to $(libdir)/../bin by postinstall_cmds
16066 postinstall_cmds='base_file=`basename \${file}`~
16067@@ -10232,13 +10824,71 @@ cygwin* | mingw* | pw32* | cegcc*)
16068 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16069 ;;
16070 esac
16071+ dynamic_linker='Win32 ld.exe'
16072+ ;;
16073+
16074+ *,cl*)
16075+ # Native MSVC
16076+ libname_spec='$name'
16077+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
16078+ library_names_spec='${libname}.dll.lib'
16079+
16080+ case $build_os in
16081+ mingw*)
16082+ sys_lib_search_path_spec=
16083+ lt_save_ifs=$IFS
16084+ IFS=';'
16085+ for lt_path in $LIB
16086+ do
16087+ IFS=$lt_save_ifs
16088+ # Let DOS variable expansion print the short 8.3 style file name.
16089+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
16090+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
16091+ done
16092+ IFS=$lt_save_ifs
16093+ # Convert to MSYS style.
16094+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
16095+ ;;
16096+ cygwin*)
16097+ # Convert to unix form, then to dos form, then back to unix form
16098+ # but this time dos style (no spaces!) so that the unix form looks
16099+ # like /cygdrive/c/PROGRA~1:/cygdr...
16100+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
16101+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
16102+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16103+ ;;
16104+ *)
16105+ sys_lib_search_path_spec="$LIB"
16106+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
16107+ # It is most probably a Windows format PATH.
16108+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
16109+ else
16110+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16111+ fi
16112+ # FIXME: find the short name or the path components, as spaces are
16113+ # common. (e.g. "Program Files" -> "PROGRA~1")
16114+ ;;
16115+ esac
16116+
16117+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
16118+ postinstall_cmds='base_file=`basename \${file}`~
16119+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
16120+ dldir=$destdir/`dirname \$dlpath`~
16121+ test -d \$dldir || mkdir -p \$dldir~
16122+ $install_prog $dir/$dlname \$dldir/$dlname'
16123+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
16124+ dlpath=$dir/\$dldll~
16125+ $RM \$dlpath'
16126+ shlibpath_overrides_runpath=yes
16127+ dynamic_linker='Win32 link.exe'
16128 ;;
16129
16130 *)
16131+ # Assume MSVC wrapper
16132 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
16133+ dynamic_linker='Win32 ld.exe'
16134 ;;
16135 esac
16136- dynamic_linker='Win32 ld.exe'
16137 # FIXME: first we should search . and the directory the executable is in
16138 shlibpath_var=PATH
16139 ;;
16140@@ -10334,7 +10984,7 @@ haiku*)
16141 soname_spec='${libname}${release}${shared_ext}$major'
16142 shlibpath_var=LIBRARY_PATH
16143 shlibpath_overrides_runpath=yes
16144- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
16145+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
16146 hardcode_into_libs=yes
16147 ;;
16148
16149@@ -11130,7 +11780,7 @@ else
16150 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16151 lt_status=$lt_dlunknown
16152 cat > conftest.$ac_ext <<_LT_EOF
16153-#line 11128 "configure"
16154+#line $LINENO "configure"
16155 #include "confdefs.h"
16156
16157 #if HAVE_DLFCN_H
16158@@ -11174,10 +11824,10 @@ else
16159 /* When -fvisbility=hidden is used, assume the code has been annotated
16160 correspondingly for the symbols needed. */
16161 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16162-void fnord () __attribute__((visibility("default")));
16163+int fnord () __attribute__((visibility("default")));
16164 #endif
16165
16166-void fnord () { int i=42; }
16167+int fnord () { return 42; }
16168 int main ()
16169 {
16170 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16171@@ -11236,7 +11886,7 @@ else
16172 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16173 lt_status=$lt_dlunknown
16174 cat > conftest.$ac_ext <<_LT_EOF
16175-#line 11234 "configure"
16176+#line $LINENO "configure"
16177 #include "confdefs.h"
16178
16179 #if HAVE_DLFCN_H
16180@@ -11280,10 +11930,10 @@ else
16181 /* When -fvisbility=hidden is used, assume the code has been annotated
16182 correspondingly for the symbols needed. */
16183 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
16184-void fnord () __attribute__((visibility("default")));
16185+int fnord () __attribute__((visibility("default")));
16186 #endif
16187
16188-void fnord () { int i=42; }
16189+int fnord () { return 42; }
16190 int main ()
16191 {
16192 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16193@@ -12825,13 +13475,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
16194 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
16195 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
16196 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
16197+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
16198+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
16199 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
16200 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
16201 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
16202 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
16203 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
16204+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
16205+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
16206+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
16207+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
16208 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
16209 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
16210+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
16211 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
16212 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
16213 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16214@@ -12846,14 +13503,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
16215 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
16216 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
16217 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"`'
16218+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
16219+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
16220 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
16221 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
16222 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
16223-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16224 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
16225+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16226 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
16227 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
16228 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
16229+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
16230 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
16231 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
16232 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
16233@@ -12886,12 +13546,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
16234 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
16235 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
16236 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
16237-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
16238 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
16239 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
16240 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
16241 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
16242 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
16243+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
16244 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
16245 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
16246 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
16247@@ -12946,8 +13606,13 @@ reload_flag \
16248 OBJDUMP \
16249 deplibs_check_method \
16250 file_magic_cmd \
16251+file_magic_glob \
16252+want_nocaseglob \
16253+DLLTOOL \
16254+sharedlib_from_linklib_cmd \
16255 AR \
16256 AR_FLAGS \
16257+archiver_list_spec \
16258 STRIP \
16259 RANLIB \
16260 CC \
16261@@ -12957,12 +13622,14 @@ lt_cv_sys_global_symbol_pipe \
16262 lt_cv_sys_global_symbol_to_cdecl \
16263 lt_cv_sys_global_symbol_to_c_name_address \
16264 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
16265+nm_file_list_spec \
16266 lt_prog_compiler_no_builtin_flag \
16267-lt_prog_compiler_wl \
16268 lt_prog_compiler_pic \
16269+lt_prog_compiler_wl \
16270 lt_prog_compiler_static \
16271 lt_cv_prog_compiler_c_o \
16272 need_locks \
16273+MANIFEST_TOOL \
16274 DSYMUTIL \
16275 NMEDIT \
16276 LIPO \
16277@@ -12978,7 +13645,6 @@ no_undefined_flag \
16278 hardcode_libdir_flag_spec \
16279 hardcode_libdir_flag_spec_ld \
16280 hardcode_libdir_separator \
16281-fix_srcfile_path \
16282 exclude_expsyms \
16283 include_expsyms \
16284 file_list_spec \
16285@@ -13014,6 +13680,7 @@ module_cmds \
16286 module_expsym_cmds \
16287 export_symbols_cmds \
16288 prelink_cmds \
16289+postlink_cmds \
16290 postinstall_cmds \
16291 postuninstall_cmds \
16292 finish_cmds \
16293@@ -13770,7 +14437,8 @@ $as_echo X"$file" |
16294 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
16295 #
16296 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
16297-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
16298+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
16299+# Inc.
16300 # Written by Gordon Matzigkeit, 1996
16301 #
16302 # This file is part of GNU Libtool.
16303@@ -13873,19 +14541,42 @@ SP2NL=$lt_lt_SP2NL
16304 # turn newlines into spaces.
16305 NL2SP=$lt_lt_NL2SP
16306
16307+# convert \$build file names to \$host format.
16308+to_host_file_cmd=$lt_cv_to_host_file_cmd
16309+
16310+# convert \$build files to toolchain format.
16311+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16312+
16313 # An object symbol dumper.
16314 OBJDUMP=$lt_OBJDUMP
16315
16316 # Method to check whether dependent libraries are shared objects.
16317 deplibs_check_method=$lt_deplibs_check_method
16318
16319-# Command to use when deplibs_check_method == "file_magic".
16320+# Command to use when deplibs_check_method = "file_magic".
16321 file_magic_cmd=$lt_file_magic_cmd
16322
16323+# How to find potential files when deplibs_check_method = "file_magic".
16324+file_magic_glob=$lt_file_magic_glob
16325+
16326+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
16327+want_nocaseglob=$lt_want_nocaseglob
16328+
16329+# DLL creation program.
16330+DLLTOOL=$lt_DLLTOOL
16331+
16332+# Command to associate shared and link libraries.
16333+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
16334+
16335 # The archiver.
16336 AR=$lt_AR
16337+
16338+# Flags to create an archive.
16339 AR_FLAGS=$lt_AR_FLAGS
16340
16341+# How to feed a file listing to the archiver.
16342+archiver_list_spec=$lt_archiver_list_spec
16343+
16344 # A symbol stripping program.
16345 STRIP=$lt_STRIP
16346
16347@@ -13915,6 +14606,12 @@ global_symbol_to_c_name_address=$lt_lt_c
16348 # Transform the output of nm in a C name address pair when lib prefix is needed.
16349 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
16350
16351+# Specify filename containing input files for \$NM.
16352+nm_file_list_spec=$lt_nm_file_list_spec
16353+
16354+# The root where to search for dependent libraries,and in which our libraries should be installed.
16355+lt_sysroot=$lt_sysroot
16356+
16357 # The name of the directory that contains temporary libtool files.
16358 objdir=$objdir
16359
16360@@ -13924,6 +14621,9 @@ MAGIC_CMD=$MAGIC_CMD
16361 # Must we lock files when doing compilation?
16362 need_locks=$lt_need_locks
16363
16364+# Manifest tool.
16365+MANIFEST_TOOL=$lt_MANIFEST_TOOL
16366+
16367 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
16368 DSYMUTIL=$lt_DSYMUTIL
16369
16370@@ -14038,12 +14738,12 @@ with_gcc=$GCC
16371 # Compiler flag to turn off builtin functions.
16372 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
16373
16374-# How to pass a linker flag through the compiler.
16375-wl=$lt_lt_prog_compiler_wl
16376-
16377 # Additional compiler flags for building library objects.
16378 pic_flag=$lt_lt_prog_compiler_pic
16379
16380+# How to pass a linker flag through the compiler.
16381+wl=$lt_lt_prog_compiler_wl
16382+
16383 # Compiler flag to prevent dynamic linking.
16384 link_static_flag=$lt_lt_prog_compiler_static
16385
16386@@ -14130,9 +14830,6 @@ inherit_rpath=$inherit_rpath
16387 # Whether libtool must link a program against all its dependency libraries.
16388 link_all_deplibs=$link_all_deplibs
16389
16390-# Fix the shell variable \$srcfile for the compiler.
16391-fix_srcfile_path=$lt_fix_srcfile_path
16392-
16393 # Set to "yes" if exported symbols are required.
16394 always_export_symbols=$always_export_symbols
16395
16396@@ -14148,6 +14845,9 @@ include_expsyms=$lt_include_expsyms
16397 # Commands necessary for linking programs (against libraries) with templates.
16398 prelink_cmds=$lt_prelink_cmds
16399
16400+# Commands necessary for finishing linking programs.
16401+postlink_cmds=$lt_postlink_cmds
16402+
16403 # Specify filename containing input files.
16404 file_list_spec=$lt_file_list_spec
16405
16406@@ -14180,210 +14880,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
16407 # if finds mixed CR/LF and LF-only lines. Since sed operates in
16408 # text mode, it properly converts lines to CR/LF. This bash problem
16409 # is reportedly fixed, but why not run on old versions too?
16410- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
16411- || (rm -f "$cfgfile"; exit 1)
16412-
16413- case $xsi_shell in
16414- yes)
16415- cat << \_LT_EOF >> "$cfgfile"
16416-
16417-# func_dirname file append nondir_replacement
16418-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16419-# otherwise set result to NONDIR_REPLACEMENT.
16420-func_dirname ()
16421-{
16422- case ${1} in
16423- */*) func_dirname_result="${1%/*}${2}" ;;
16424- * ) func_dirname_result="${3}" ;;
16425- esac
16426-}
16427-
16428-# func_basename file
16429-func_basename ()
16430-{
16431- func_basename_result="${1##*/}"
16432-}
16433-
16434-# func_dirname_and_basename file append nondir_replacement
16435-# perform func_basename and func_dirname in a single function
16436-# call:
16437-# dirname: Compute the dirname of FILE. If nonempty,
16438-# add APPEND to the result, otherwise set result
16439-# to NONDIR_REPLACEMENT.
16440-# value returned in "$func_dirname_result"
16441-# basename: Compute filename of FILE.
16442-# value retuned in "$func_basename_result"
16443-# Implementation must be kept synchronized with func_dirname
16444-# and func_basename. For efficiency, we do not delegate to
16445-# those functions but instead duplicate the functionality here.
16446-func_dirname_and_basename ()
16447-{
16448- case ${1} in
16449- */*) func_dirname_result="${1%/*}${2}" ;;
16450- * ) func_dirname_result="${3}" ;;
16451- esac
16452- func_basename_result="${1##*/}"
16453-}
16454-
16455-# func_stripname prefix suffix name
16456-# strip PREFIX and SUFFIX off of NAME.
16457-# PREFIX and SUFFIX must not contain globbing or regex special
16458-# characters, hashes, percent signs, but SUFFIX may contain a leading
16459-# dot (in which case that matches only a dot).
16460-func_stripname ()
16461-{
16462- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
16463- # positional parameters, so assign one to ordinary parameter first.
16464- func_stripname_result=${3}
16465- func_stripname_result=${func_stripname_result#"${1}"}
16466- func_stripname_result=${func_stripname_result%"${2}"}
16467-}
16468-
16469-# func_opt_split
16470-func_opt_split ()
16471-{
16472- func_opt_split_opt=${1%%=*}
16473- func_opt_split_arg=${1#*=}
16474-}
16475-
16476-# func_lo2o object
16477-func_lo2o ()
16478-{
16479- case ${1} in
16480- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
16481- *) func_lo2o_result=${1} ;;
16482- esac
16483-}
16484-
16485-# func_xform libobj-or-source
16486-func_xform ()
16487-{
16488- func_xform_result=${1%.*}.lo
16489-}
16490-
16491-# func_arith arithmetic-term...
16492-func_arith ()
16493-{
16494- func_arith_result=$(( $* ))
16495-}
16496-
16497-# func_len string
16498-# STRING may not start with a hyphen.
16499-func_len ()
16500-{
16501- func_len_result=${#1}
16502-}
16503-
16504-_LT_EOF
16505- ;;
16506- *) # Bourne compatible functions.
16507- cat << \_LT_EOF >> "$cfgfile"
16508-
16509-# func_dirname file append nondir_replacement
16510-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
16511-# otherwise set result to NONDIR_REPLACEMENT.
16512-func_dirname ()
16513-{
16514- # Extract subdirectory from the argument.
16515- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
16516- if test "X$func_dirname_result" = "X${1}"; then
16517- func_dirname_result="${3}"
16518- else
16519- func_dirname_result="$func_dirname_result${2}"
16520- fi
16521-}
16522-
16523-# func_basename file
16524-func_basename ()
16525-{
16526- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
16527-}
16528-
16529-
16530-# func_stripname prefix suffix name
16531-# strip PREFIX and SUFFIX off of NAME.
16532-# PREFIX and SUFFIX must not contain globbing or regex special
16533-# characters, hashes, percent signs, but SUFFIX may contain a leading
16534-# dot (in which case that matches only a dot).
16535-# func_strip_suffix prefix name
16536-func_stripname ()
16537-{
16538- case ${2} in
16539- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
16540- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
16541- esac
16542-}
16543-
16544-# sed scripts:
16545-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
16546-my_sed_long_arg='1s/^-[^=]*=//'
16547-
16548-# func_opt_split
16549-func_opt_split ()
16550-{
16551- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
16552- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
16553-}
16554-
16555-# func_lo2o object
16556-func_lo2o ()
16557-{
16558- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
16559-}
16560-
16561-# func_xform libobj-or-source
16562-func_xform ()
16563-{
16564- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
16565-}
16566-
16567-# func_arith arithmetic-term...
16568-func_arith ()
16569-{
16570- func_arith_result=`expr "$@"`
16571-}
16572-
16573-# func_len string
16574-# STRING may not start with a hyphen.
16575-func_len ()
16576-{
16577- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
16578-}
16579-
16580-_LT_EOF
16581-esac
16582-
16583-case $lt_shell_append in
16584- yes)
16585- cat << \_LT_EOF >> "$cfgfile"
16586-
16587-# func_append var value
16588-# Append VALUE to the end of shell variable VAR.
16589-func_append ()
16590-{
16591- eval "$1+=\$2"
16592-}
16593-_LT_EOF
16594- ;;
16595- *)
16596- cat << \_LT_EOF >> "$cfgfile"
16597-
16598-# func_append var value
16599-# Append VALUE to the end of shell variable VAR.
16600-func_append ()
16601-{
16602- eval "$1=\$$1\$2"
16603-}
16604-
16605-_LT_EOF
16606- ;;
16607- esac
16608+ sed '$q' "$ltmain" >> "$cfgfile" \
16609+ || (rm -f "$cfgfile"; exit 1)
16610
16611+ if test x"$xsi_shell" = xyes; then
16612+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
16613+func_dirname ()\
16614+{\
16615+\ case ${1} in\
16616+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16617+\ * ) func_dirname_result="${3}" ;;\
16618+\ esac\
16619+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
16620+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16621+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16622+test 0 -eq $? || _lt_function_replace_fail=:
16623+
16624+
16625+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
16626+func_basename ()\
16627+{\
16628+\ func_basename_result="${1##*/}"\
16629+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
16630+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16631+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16632+test 0 -eq $? || _lt_function_replace_fail=:
16633+
16634+
16635+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
16636+func_dirname_and_basename ()\
16637+{\
16638+\ case ${1} in\
16639+\ */*) func_dirname_result="${1%/*}${2}" ;;\
16640+\ * ) func_dirname_result="${3}" ;;\
16641+\ esac\
16642+\ func_basename_result="${1##*/}"\
16643+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
16644+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16645+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16646+test 0 -eq $? || _lt_function_replace_fail=:
16647+
16648+
16649+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
16650+func_stripname ()\
16651+{\
16652+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
16653+\ # positional parameters, so assign one to ordinary parameter first.\
16654+\ func_stripname_result=${3}\
16655+\ func_stripname_result=${func_stripname_result#"${1}"}\
16656+\ func_stripname_result=${func_stripname_result%"${2}"}\
16657+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
16658+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16659+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16660+test 0 -eq $? || _lt_function_replace_fail=:
16661+
16662+
16663+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
16664+func_split_long_opt ()\
16665+{\
16666+\ func_split_long_opt_name=${1%%=*}\
16667+\ func_split_long_opt_arg=${1#*=}\
16668+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
16669+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16670+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16671+test 0 -eq $? || _lt_function_replace_fail=:
16672+
16673+
16674+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
16675+func_split_short_opt ()\
16676+{\
16677+\ func_split_short_opt_arg=${1#??}\
16678+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
16679+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
16680+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16681+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16682+test 0 -eq $? || _lt_function_replace_fail=:
16683+
16684+
16685+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
16686+func_lo2o ()\
16687+{\
16688+\ case ${1} in\
16689+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
16690+\ *) func_lo2o_result=${1} ;;\
16691+\ esac\
16692+} # Extended-shell func_lo2o 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_xform ()$/,/^} # func_xform /c\
16699+func_xform ()\
16700+{\
16701+ func_xform_result=${1%.*}.lo\
16702+} # Extended-shell func_xform 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+
16708+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
16709+func_arith ()\
16710+{\
16711+ func_arith_result=$(( $* ))\
16712+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
16713+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16714+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16715+test 0 -eq $? || _lt_function_replace_fail=:
16716+
16717+
16718+ sed -e '/^func_len ()$/,/^} # func_len /c\
16719+func_len ()\
16720+{\
16721+ func_len_result=${#1}\
16722+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
16723+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16724+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16725+test 0 -eq $? || _lt_function_replace_fail=:
16726+
16727+fi
16728+
16729+if test x"$lt_shell_append" = xyes; then
16730+ sed -e '/^func_append ()$/,/^} # func_append /c\
16731+func_append ()\
16732+{\
16733+ eval "${1}+=\\${2}"\
16734+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
16735+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16736+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16737+test 0 -eq $? || _lt_function_replace_fail=:
16738+
16739+
16740+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
16741+func_append_quoted ()\
16742+{\
16743+\ func_quote_for_eval "${2}"\
16744+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
16745+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
16746+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16747+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16748+test 0 -eq $? || _lt_function_replace_fail=:
16749+
16750+
16751+ # Save a `func_append' function call where possible by direct use of '+='
16752+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
16753+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16754+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16755+ test 0 -eq $? || _lt_function_replace_fail=:
16756+else
16757+ # Save a `func_append' function call even when '+=' is not available
16758+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
16759+ && mv -f "$cfgfile.tmp" "$cfgfile" \
16760+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
16761+ test 0 -eq $? || _lt_function_replace_fail=:
16762+fi
16763+
16764+if test x"$_lt_function_replace_fail" = x":"; then
16765+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
16766+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
16767+fi
16768
16769- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
16770- || (rm -f "$cfgfile"; exit 1)
16771
16772- mv -f "$cfgfile" "$ofile" ||
16773+ mv -f "$cfgfile" "$ofile" ||
16774 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
16775 chmod +x "$ofile"
16776
16777Index: binutils-2.21.1/ld/configure
16778===================================================================
16779--- binutils-2.21.1.orig/ld/configure
16780+++ binutils-2.21.1/ld/configure
16781@@ -644,8 +644,11 @@ OTOOL
16782 LIPO
16783 NMEDIT
16784 DSYMUTIL
16785+MANIFEST_TOOL
16786 RANLIB
16787+ac_ct_AR
16788 AR
16789+DLLTOOL
16790 OBJDUMP
16791 LN_S
16792 NM
16793@@ -783,6 +786,7 @@ enable_static
16794 with_pic
16795 enable_fast_install
16796 with_gnu_ld
16797+with_libtool_sysroot
16798 enable_libtool_lock
16799 enable_nls
16800 '
16801@@ -1447,6 +1451,8 @@ Optional Packages:
16802 --with-pic try to use only PIC/non-PIC objects [default=use
16803 both]
16804 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
16805+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
16806+ (or the compiler's sysroot if not specified).
16807
16808 Some influential environment variables:
16809 CC C compiler command
16810@@ -6081,8 +6087,8 @@ esac
16811
16812
16813
16814-macro_version='2.2.7a'
16815-macro_revision='1.3134'
16816+macro_version='2.4'
16817+macro_revision='1.3293'
16818
16819
16820
16821@@ -6122,7 +6128,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16823 $as_echo_n "checking how to print strings... " >&6; }
16824 # Test print first, because it will be a builtin if present.
16825-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
16826+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
16827 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16828 ECHO='print -r --'
16829 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16830@@ -6808,8 +6814,8 @@ $as_echo_n "checking whether the shell u
16831 # Try some XSI features
16832 xsi_shell=no
16833 ( _lt_dummy="a/b/c"
16834- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
16835- = c,a/b,, \
16836+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
16837+ = c,a/b,b/c, \
16838 && eval 'test $(( 1 + 1 )) -eq 2 \
16839 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16840 && xsi_shell=yes
16841@@ -6858,6 +6864,80 @@ esac
16842
16843
16844
16845+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
16846+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
16847+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
16848+ $as_echo_n "(cached) " >&6
16849+else
16850+ case $host in
16851+ *-*-mingw* )
16852+ case $build in
16853+ *-*-mingw* ) # actually msys
16854+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
16855+ ;;
16856+ *-*-cygwin* )
16857+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
16858+ ;;
16859+ * ) # otherwise, assume *nix
16860+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
16861+ ;;
16862+ esac
16863+ ;;
16864+ *-*-cygwin* )
16865+ case $build in
16866+ *-*-mingw* ) # actually msys
16867+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
16868+ ;;
16869+ *-*-cygwin* )
16870+ lt_cv_to_host_file_cmd=func_convert_file_noop
16871+ ;;
16872+ * ) # otherwise, assume *nix
16873+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
16874+ ;;
16875+ esac
16876+ ;;
16877+ * ) # unhandled hosts (and "normal" native builds)
16878+ lt_cv_to_host_file_cmd=func_convert_file_noop
16879+ ;;
16880+esac
16881+
16882+fi
16883+
16884+to_host_file_cmd=$lt_cv_to_host_file_cmd
16885+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
16886+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
16887+
16888+
16889+
16890+
16891+
16892+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
16893+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
16894+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
16895+ $as_echo_n "(cached) " >&6
16896+else
16897+ #assume ordinary cross tools, or native build.
16898+lt_cv_to_tool_file_cmd=func_convert_file_noop
16899+case $host in
16900+ *-*-mingw* )
16901+ case $build in
16902+ *-*-mingw* ) # actually msys
16903+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
16904+ ;;
16905+ esac
16906+ ;;
16907+esac
16908+
16909+fi
16910+
16911+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
16912+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
16913+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
16914+
16915+
16916+
16917+
16918+
16919 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16920 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16921 if test "${lt_cv_ld_reload_flag+set}" = set; then :
16922@@ -6874,6 +6954,11 @@ case $reload_flag in
16923 esac
16924 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16925 case $host_os in
16926+ cygwin* | mingw* | pw32* | cegcc*)
16927+ if test "$GCC" != yes; then
16928+ reload_cmds=false
16929+ fi
16930+ ;;
16931 darwin*)
16932 if test "$GCC" = yes; then
16933 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16934@@ -7042,7 +7127,8 @@ mingw* | pw32*)
16935 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16936 lt_cv_file_magic_cmd='func_win32_libid'
16937 else
16938- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
16939+ # Keep this pattern in sync with the one in func_win32_libid.
16940+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
16941 lt_cv_file_magic_cmd='$OBJDUMP -f'
16942 fi
16943 ;;
16944@@ -7196,6 +7282,21 @@ esac
16945 fi
16946 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16947 $as_echo "$lt_cv_deplibs_check_method" >&6; }
16948+
16949+file_magic_glob=
16950+want_nocaseglob=no
16951+if test "$build" = "$host"; then
16952+ case $host_os in
16953+ mingw* | pw32*)
16954+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
16955+ want_nocaseglob=yes
16956+ else
16957+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
16958+ fi
16959+ ;;
16960+ esac
16961+fi
16962+
16963 file_magic_cmd=$lt_cv_file_magic_cmd
16964 deplibs_check_method=$lt_cv_deplibs_check_method
16965 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16966@@ -7211,9 +7312,162 @@ test -z "$deplibs_check_method" && depli
16967
16968
16969
16970+
16971+
16972+
16973+
16974+
16975+
16976+
16977+
16978+
16979+
16980 if test -n "$ac_tool_prefix"; then
16981- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
16982-set dummy ${ac_tool_prefix}ar; ac_word=$2
16983+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
16984+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
16985+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16986+$as_echo_n "checking for $ac_word... " >&6; }
16987+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
16988+ $as_echo_n "(cached) " >&6
16989+else
16990+ if test -n "$DLLTOOL"; then
16991+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
16992+else
16993+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16994+for as_dir in $PATH
16995+do
16996+ IFS=$as_save_IFS
16997+ test -z "$as_dir" && as_dir=.
16998+ for ac_exec_ext in '' $ac_executable_extensions; do
16999+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17000+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17001+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17002+ break 2
17003+ fi
17004+done
17005+ done
17006+IFS=$as_save_IFS
17007+
17008+fi
17009+fi
17010+DLLTOOL=$ac_cv_prog_DLLTOOL
17011+if test -n "$DLLTOOL"; then
17012+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17013+$as_echo "$DLLTOOL" >&6; }
17014+else
17015+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17016+$as_echo "no" >&6; }
17017+fi
17018+
17019+
17020+fi
17021+if test -z "$ac_cv_prog_DLLTOOL"; then
17022+ ac_ct_DLLTOOL=$DLLTOOL
17023+ # Extract the first word of "dlltool", so it can be a program name with args.
17024+set dummy dlltool; ac_word=$2
17025+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17026+$as_echo_n "checking for $ac_word... " >&6; }
17027+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17028+ $as_echo_n "(cached) " >&6
17029+else
17030+ if test -n "$ac_ct_DLLTOOL"; then
17031+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17032+else
17033+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17034+for as_dir in $PATH
17035+do
17036+ IFS=$as_save_IFS
17037+ test -z "$as_dir" && as_dir=.
17038+ for ac_exec_ext in '' $ac_executable_extensions; do
17039+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17040+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17041+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17042+ break 2
17043+ fi
17044+done
17045+ done
17046+IFS=$as_save_IFS
17047+
17048+fi
17049+fi
17050+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17051+if test -n "$ac_ct_DLLTOOL"; then
17052+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17053+$as_echo "$ac_ct_DLLTOOL" >&6; }
17054+else
17055+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17056+$as_echo "no" >&6; }
17057+fi
17058+
17059+ if test "x$ac_ct_DLLTOOL" = x; then
17060+ DLLTOOL="false"
17061+ else
17062+ case $cross_compiling:$ac_tool_warned in
17063+yes:)
17064+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17065+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17066+ac_tool_warned=yes ;;
17067+esac
17068+ DLLTOOL=$ac_ct_DLLTOOL
17069+ fi
17070+else
17071+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17072+fi
17073+
17074+test -z "$DLLTOOL" && DLLTOOL=dlltool
17075+
17076+
17077+
17078+
17079+
17080+
17081+
17082+
17083+
17084+
17085+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17086+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17087+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17088+ $as_echo_n "(cached) " >&6
17089+else
17090+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17091+
17092+case $host_os in
17093+cygwin* | mingw* | pw32* | cegcc*)
17094+ # two different shell functions defined in ltmain.sh
17095+ # decide which to use based on capabilities of $DLLTOOL
17096+ case `$DLLTOOL --help 2>&1` in
17097+ *--identify-strict*)
17098+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17099+ ;;
17100+ *)
17101+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17102+ ;;
17103+ esac
17104+ ;;
17105+*)
17106+ # fallback: assume linklib IS sharedlib
17107+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17108+ ;;
17109+esac
17110+
17111+fi
17112+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17113+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17114+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17115+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17116+
17117+
17118+
17119+
17120+
17121+
17122+
17123+if test -n "$ac_tool_prefix"; then
17124+ for ac_prog in ar
17125+ do
17126+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17127+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17128 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17129 $as_echo_n "checking for $ac_word... " >&6; }
17130 if test "${ac_cv_prog_AR+set}" = set; then :
17131@@ -7229,7 +7483,7 @@ do
17132 test -z "$as_dir" && as_dir=.
17133 for ac_exec_ext in '' $ac_executable_extensions; do
17134 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17135- ac_cv_prog_AR="${ac_tool_prefix}ar"
17136+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17137 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17138 break 2
17139 fi
17140@@ -7249,11 +7503,15 @@ $as_echo "no" >&6; }
17141 fi
17142
17143
17144+ test -n "$AR" && break
17145+ done
17146 fi
17147-if test -z "$ac_cv_prog_AR"; then
17148+if test -z "$AR"; then
17149 ac_ct_AR=$AR
17150- # Extract the first word of "ar", so it can be a program name with args.
17151-set dummy ar; ac_word=$2
17152+ for ac_prog in ar
17153+do
17154+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17155+set dummy $ac_prog; ac_word=$2
17156 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17157 $as_echo_n "checking for $ac_word... " >&6; }
17158 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17159@@ -7269,7 +7527,7 @@ do
17160 test -z "$as_dir" && as_dir=.
17161 for ac_exec_ext in '' $ac_executable_extensions; do
17162 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17163- ac_cv_prog_ac_ct_AR="ar"
17164+ ac_cv_prog_ac_ct_AR="$ac_prog"
17165 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17166 break 2
17167 fi
17168@@ -7288,6 +7546,10 @@ else
17169 $as_echo "no" >&6; }
17170 fi
17171
17172+
17173+ test -n "$ac_ct_AR" && break
17174+done
17175+
17176 if test "x$ac_ct_AR" = x; then
17177 AR="false"
17178 else
17179@@ -7299,12 +7561,10 @@ ac_tool_warned=yes ;;
17180 esac
17181 AR=$ac_ct_AR
17182 fi
17183-else
17184- AR="$ac_cv_prog_AR"
17185 fi
17186
17187-test -z "$AR" && AR=ar
17188-test -z "$AR_FLAGS" && AR_FLAGS=cru
17189+: ${AR=ar}
17190+: ${AR_FLAGS=cru}
17191
17192
17193
17194@@ -7316,6 +7576,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
17195
17196
17197
17198+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17199+$as_echo_n "checking for archiver @FILE support... " >&6; }
17200+if test "${lt_cv_ar_at_file+set}" = set; then :
17201+ $as_echo_n "(cached) " >&6
17202+else
17203+ lt_cv_ar_at_file=no
17204+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17205+/* end confdefs.h. */
17206+
17207+int
17208+main ()
17209+{
17210+
17211+ ;
17212+ return 0;
17213+}
17214+_ACEOF
17215+if ac_fn_c_try_compile "$LINENO"; then :
17216+ echo conftest.$ac_objext > conftest.lst
17217+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17218+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17219+ (eval $lt_ar_try) 2>&5
17220+ ac_status=$?
17221+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17222+ test $ac_status = 0; }
17223+ if test "$ac_status" -eq 0; then
17224+ # Ensure the archiver fails upon bogus file names.
17225+ rm -f conftest.$ac_objext libconftest.a
17226+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17227+ (eval $lt_ar_try) 2>&5
17228+ ac_status=$?
17229+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17230+ test $ac_status = 0; }
17231+ if test "$ac_status" -ne 0; then
17232+ lt_cv_ar_at_file=@
17233+ fi
17234+ fi
17235+ rm -f conftest.* libconftest.a
17236+
17237+fi
17238+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17239+
17240+fi
17241+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17242+$as_echo "$lt_cv_ar_at_file" >&6; }
17243+
17244+if test "x$lt_cv_ar_at_file" = xno; then
17245+ archiver_list_spec=
17246+else
17247+ archiver_list_spec=$lt_cv_ar_at_file
17248+fi
17249+
17250+
17251+
17252+
17253+
17254+
17255+
17256 if test -n "$ac_tool_prefix"; then
17257 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
17258 set dummy ${ac_tool_prefix}strip; ac_word=$2
17259@@ -7650,8 +7968,8 @@ esac
17260 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17261
17262 # Transform an extracted symbol line into symbol name and symbol address
17263-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17264-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'"
17265+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17266+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'"
17267
17268 # Handle CRLF in mingw tool chain
17269 opt_cr=
17270@@ -7687,6 +8005,7 @@ for ac_symprfx in "" "_"; do
17271 else
17272 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17273 fi
17274+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17275
17276 # Check to see that the pipe works correctly.
17277 pipe_works=no
17278@@ -7728,6 +8047,18 @@ _LT_EOF
17279 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17280 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17281 cat <<_LT_EOF > conftest.$ac_ext
17282+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17283+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17284+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17285+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17286+# define LT_DLSYM_CONST
17287+#elif defined(__osf__)
17288+/* This system does not cope well with relocations in const data. */
17289+# define LT_DLSYM_CONST
17290+#else
17291+# define LT_DLSYM_CONST const
17292+#endif
17293+
17294 #ifdef __cplusplus
17295 extern "C" {
17296 #endif
17297@@ -7739,7 +8070,7 @@ _LT_EOF
17298 cat <<_LT_EOF >> conftest.$ac_ext
17299
17300 /* The mapping between symbol names and symbols. */
17301-const struct {
17302+LT_DLSYM_CONST struct {
17303 const char *name;
17304 void *address;
17305 }
17306@@ -7765,8 +8096,8 @@ static const void *lt_preloaded_setup()
17307 _LT_EOF
17308 # Now try linking the two files.
17309 mv conftest.$ac_objext conftstm.$ac_objext
17310- lt_save_LIBS="$LIBS"
17311- lt_save_CFLAGS="$CFLAGS"
17312+ lt_globsym_save_LIBS=$LIBS
17313+ lt_globsym_save_CFLAGS=$CFLAGS
17314 LIBS="conftstm.$ac_objext"
17315 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17316 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17317@@ -7776,8 +8107,8 @@ _LT_EOF
17318 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17319 pipe_works=yes
17320 fi
17321- LIBS="$lt_save_LIBS"
17322- CFLAGS="$lt_save_CFLAGS"
17323+ LIBS=$lt_globsym_save_LIBS
17324+ CFLAGS=$lt_globsym_save_CFLAGS
17325 else
17326 echo "cannot find nm_test_func in $nlist" >&5
17327 fi
17328@@ -7814,6 +8145,21 @@ else
17329 $as_echo "ok" >&6; }
17330 fi
17331
17332+# Response file support.
17333+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17334+ nm_file_list_spec='@'
17335+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17336+ nm_file_list_spec='@'
17337+fi
17338+
17339+
17340+
17341+
17342+
17343+
17344+
17345+
17346+
17347
17348
17349
17350@@ -7832,6 +8178,40 @@ fi
17351
17352
17353
17354+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17355+$as_echo_n "checking for sysroot... " >&6; }
17356+
17357+# Check whether --with-libtool-sysroot was given.
17358+if test "${with_libtool_sysroot+set}" = set; then :
17359+ withval=$with_libtool_sysroot;
17360+else
17361+ with_libtool_sysroot=no
17362+fi
17363+
17364+
17365+lt_sysroot=
17366+case ${with_libtool_sysroot} in #(
17367+ yes)
17368+ if test "$GCC" = yes; then
17369+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17370+ fi
17371+ ;; #(
17372+ /*)
17373+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17374+ ;; #(
17375+ no|'')
17376+ ;; #(
17377+ *)
17378+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17379+$as_echo "${with_libtool_sysroot}" >&6; }
17380+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
17381+ ;;
17382+esac
17383+
17384+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17385+$as_echo "${lt_sysroot:-no}" >&6; }
17386+
17387+
17388
17389
17390
17391@@ -8022,11 +8402,128 @@ sparc*-*solaris*)
17392 ;;
17393 esac
17394 fi
17395- rm -rf conftest*
17396- ;;
17397+ rm -rf conftest*
17398+ ;;
17399+esac
17400+
17401+need_locks="$enable_libtool_lock"
17402+
17403+if test -n "$ac_tool_prefix"; then
17404+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17405+set dummy ${ac_tool_prefix}mt; ac_word=$2
17406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17407+$as_echo_n "checking for $ac_word... " >&6; }
17408+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
17409+ $as_echo_n "(cached) " >&6
17410+else
17411+ if test -n "$MANIFEST_TOOL"; then
17412+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17413+else
17414+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17415+for as_dir in $PATH
17416+do
17417+ IFS=$as_save_IFS
17418+ test -z "$as_dir" && as_dir=.
17419+ for ac_exec_ext in '' $ac_executable_extensions; do
17420+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17421+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17422+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17423+ break 2
17424+ fi
17425+done
17426+ done
17427+IFS=$as_save_IFS
17428+
17429+fi
17430+fi
17431+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
17432+if test -n "$MANIFEST_TOOL"; then
17433+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
17434+$as_echo "$MANIFEST_TOOL" >&6; }
17435+else
17436+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17437+$as_echo "no" >&6; }
17438+fi
17439+
17440+
17441+fi
17442+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
17443+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
17444+ # Extract the first word of "mt", so it can be a program name with args.
17445+set dummy mt; ac_word=$2
17446+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17447+$as_echo_n "checking for $ac_word... " >&6; }
17448+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
17449+ $as_echo_n "(cached) " >&6
17450+else
17451+ if test -n "$ac_ct_MANIFEST_TOOL"; then
17452+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
17453+else
17454+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17455+for as_dir in $PATH
17456+do
17457+ IFS=$as_save_IFS
17458+ test -z "$as_dir" && as_dir=.
17459+ for ac_exec_ext in '' $ac_executable_extensions; do
17460+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17461+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17462+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17463+ break 2
17464+ fi
17465+done
17466+ done
17467+IFS=$as_save_IFS
17468+
17469+fi
17470+fi
17471+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
17472+if test -n "$ac_ct_MANIFEST_TOOL"; then
17473+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
17474+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
17475+else
17476+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17477+$as_echo "no" >&6; }
17478+fi
17479+
17480+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
17481+ MANIFEST_TOOL=":"
17482+ else
17483+ case $cross_compiling:$ac_tool_warned in
17484+yes:)
17485+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17486+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17487+ac_tool_warned=yes ;;
17488 esac
17489+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
17490+ fi
17491+else
17492+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
17493+fi
17494+
17495+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
17496+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
17497+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
17498+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
17499+ $as_echo_n "(cached) " >&6
17500+else
17501+ lt_cv_path_mainfest_tool=no
17502+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
17503+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
17504+ cat conftest.err >&5
17505+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
17506+ lt_cv_path_mainfest_tool=yes
17507+ fi
17508+ rm -f conftest*
17509+fi
17510+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
17511+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
17512+if test "x$lt_cv_path_mainfest_tool" != xyes; then
17513+ MANIFEST_TOOL=:
17514+fi
17515+
17516+
17517+
17518
17519-need_locks="$enable_libtool_lock"
17520
17521
17522 case $host_os in
17523@@ -8591,6 +9088,8 @@ _LT_EOF
17524 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17525 echo "$AR cru libconftest.a conftest.o" >&5
17526 $AR cru libconftest.a conftest.o 2>&5
17527+ echo "$RANLIB libconftest.a" >&5
17528+ $RANLIB libconftest.a 2>&5
17529 cat > conftest.c << _LT_EOF
17530 int main() { return 0;}
17531 _LT_EOF
17532@@ -8787,7 +9286,8 @@ fi
17533 LIBTOOL_DEPS="$ltmain"
17534
17535 # Always use our own libtool.
17536-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
17537+LIBTOOL='$(SHELL) $(top_builddir)'
17538+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
17539
17540
17541
17542@@ -8876,7 +9376,7 @@ aix3*)
17543 esac
17544
17545 # Global variables:
17546-ofile=libtool
17547+ofile=${host_alias}-libtool
17548 can_build_shared=yes
17549
17550 # All known linkers require a `.a' archive for static linking (except MSVC,
17551@@ -9174,8 +9674,6 @@ fi
17552 lt_prog_compiler_pic=
17553 lt_prog_compiler_static=
17554
17555-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17556-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17557
17558 if test "$GCC" = yes; then
17559 lt_prog_compiler_wl='-Wl,'
17560@@ -9340,6 +9838,12 @@ $as_echo_n "checking for $compiler optio
17561 lt_prog_compiler_pic='--shared'
17562 lt_prog_compiler_static='--static'
17563 ;;
17564+ nagfor*)
17565+ # NAG Fortran compiler
17566+ lt_prog_compiler_wl='-Wl,-Wl,,'
17567+ lt_prog_compiler_pic='-PIC'
17568+ lt_prog_compiler_static='-Bstatic'
17569+ ;;
17570 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17571 # Portland Group compilers (*not* the Pentium gcc compiler,
17572 # which looks to be a dead project)
17573@@ -9402,7 +9906,7 @@ $as_echo_n "checking for $compiler optio
17574 lt_prog_compiler_pic='-KPIC'
17575 lt_prog_compiler_static='-Bstatic'
17576 case $cc_basename in
17577- f77* | f90* | f95*)
17578+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
17579 lt_prog_compiler_wl='-Qoption ld ';;
17580 *)
17581 lt_prog_compiler_wl='-Wl,';;
17582@@ -9459,13 +9963,17 @@ case $host_os in
17583 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17584 ;;
17585 esac
17586-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
17587-$as_echo "$lt_prog_compiler_pic" >&6; }
17588-
17589-
17590-
17591-
17592
17593+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
17594+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17595+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
17596+ $as_echo_n "(cached) " >&6
17597+else
17598+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
17599+fi
17600+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
17601+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
17602+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
17603
17604 #
17605 # Check to make sure the PIC flag actually works.
17606@@ -9526,6 +10034,11 @@ fi
17607
17608
17609
17610+
17611+
17612+
17613+
17614+
17615 #
17616 # Check to make sure the static flag actually works.
17617 #
17618@@ -9876,7 +10389,8 @@ _LT_EOF
17619 allow_undefined_flag=unsupported
17620 always_export_symbols=no
17621 enable_shared_with_static_runtimes=yes
17622- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17623+ 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'
17624+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
17625
17626 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17627 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17628@@ -9924,7 +10438,7 @@ _LT_EOF
17629 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
17630 && test "$tmp_diet" = no
17631 then
17632- tmp_addflag=
17633+ tmp_addflag=' $pic_flag'
17634 tmp_sharedflag='-shared'
17635 case $cc_basename,$host_cpu in
17636 pgcc*) # Portland Group C compiler
17637@@ -9975,12 +10489,12 @@ _LT_EOF
17638 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17639 hardcode_libdir_flag_spec=
17640 hardcode_libdir_flag_spec_ld='-rpath $libdir'
17641- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
17642+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
17643 if test "x$supports_anon_versioning" = xyes; then
17644 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
17645 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
17646 echo "local: *; };" >> $output_objdir/$libname.ver~
17647- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17648+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
17649 fi
17650 ;;
17651 esac
17652@@ -9994,8 +10508,8 @@ _LT_EOF
17653 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17654 wlarc=
17655 else
17656- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17657- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17658+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17659+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17660 fi
17661 ;;
17662
17663@@ -10013,8 +10527,8 @@ _LT_EOF
17664
17665 _LT_EOF
17666 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17667- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17668- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17669+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17670+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17671 else
17672 ld_shlibs=no
17673 fi
17674@@ -10060,8 +10574,8 @@ _LT_EOF
17675
17676 *)
17677 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
17678- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17679- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17680+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17681+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
17682 else
17683 ld_shlibs=no
17684 fi
17685@@ -10191,7 +10705,13 @@ _LT_EOF
17686 allow_undefined_flag='-berok'
17687 # Determine the default libpath from the value encoded in an
17688 # empty executable.
17689- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17690+ if test "${lt_cv_aix_libpath+set}" = set; then
17691+ aix_libpath=$lt_cv_aix_libpath
17692+else
17693+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17694+ $as_echo_n "(cached) " >&6
17695+else
17696+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17697 /* end confdefs.h. */
17698
17699 int
17700@@ -10204,22 +10724,29 @@ main ()
17701 _ACEOF
17702 if ac_fn_c_try_link "$LINENO"; then :
17703
17704-lt_aix_libpath_sed='
17705- /Import File Strings/,/^$/ {
17706- /^0/ {
17707- s/^0 *\(.*\)$/\1/
17708- p
17709- }
17710- }'
17711-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17712-# Check for a 64-bit object if we didn't find anything.
17713-if test -z "$aix_libpath"; then
17714- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17715-fi
17716+ lt_aix_libpath_sed='
17717+ /Import File Strings/,/^$/ {
17718+ /^0/ {
17719+ s/^0 *\([^ ]*\) *$/\1/
17720+ p
17721+ }
17722+ }'
17723+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17724+ # Check for a 64-bit object if we didn't find anything.
17725+ if test -z "$lt_cv_aix_libpath_"; then
17726+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17727+ fi
17728 fi
17729 rm -f core conftest.err conftest.$ac_objext \
17730 conftest$ac_exeext conftest.$ac_ext
17731-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17732+ if test -z "$lt_cv_aix_libpath_"; then
17733+ lt_cv_aix_libpath_="/usr/lib:/lib"
17734+ fi
17735+
17736+fi
17737+
17738+ aix_libpath=$lt_cv_aix_libpath_
17739+fi
17740
17741 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17742 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"
17743@@ -10231,7 +10758,13 @@ if test -z "$aix_libpath"; then aix_libp
17744 else
17745 # Determine the default libpath from the value encoded in an
17746 # empty executable.
17747- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17748+ if test "${lt_cv_aix_libpath+set}" = set; then
17749+ aix_libpath=$lt_cv_aix_libpath
17750+else
17751+ if test "${lt_cv_aix_libpath_+set}" = set; then :
17752+ $as_echo_n "(cached) " >&6
17753+else
17754+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17755 /* end confdefs.h. */
17756
17757 int
17758@@ -10244,22 +10777,29 @@ main ()
17759 _ACEOF
17760 if ac_fn_c_try_link "$LINENO"; then :
17761
17762-lt_aix_libpath_sed='
17763- /Import File Strings/,/^$/ {
17764- /^0/ {
17765- s/^0 *\(.*\)$/\1/
17766- p
17767- }
17768- }'
17769-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17770-# Check for a 64-bit object if we didn't find anything.
17771-if test -z "$aix_libpath"; then
17772- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17773-fi
17774+ lt_aix_libpath_sed='
17775+ /Import File Strings/,/^$/ {
17776+ /^0/ {
17777+ s/^0 *\([^ ]*\) *$/\1/
17778+ p
17779+ }
17780+ }'
17781+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17782+ # Check for a 64-bit object if we didn't find anything.
17783+ if test -z "$lt_cv_aix_libpath_"; then
17784+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17785+ fi
17786 fi
17787 rm -f core conftest.err conftest.$ac_objext \
17788 conftest$ac_exeext conftest.$ac_ext
17789-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17790+ if test -z "$lt_cv_aix_libpath_"; then
17791+ lt_cv_aix_libpath_="/usr/lib:/lib"
17792+ fi
17793+
17794+fi
17795+
17796+ aix_libpath=$lt_cv_aix_libpath_
17797+fi
17798
17799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17800 # Warning - without using the other run time loading flags,
17801@@ -10304,20 +10844,63 @@ if test -z "$aix_libpath"; then aix_libp
17802 # Microsoft Visual C++.
17803 # hardcode_libdir_flag_spec is actually meaningless, as there is
17804 # no search path for DLLs.
17805- hardcode_libdir_flag_spec=' '
17806- allow_undefined_flag=unsupported
17807- # Tell ltmain to make .lib files, not .a files.
17808- libext=lib
17809- # Tell ltmain to make .dll files, not .so files.
17810- shrext_cmds=".dll"
17811- # FIXME: Setting linknames here is a bad hack.
17812- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17813- # The linker will automatically build a .lib file if we build a DLL.
17814- old_archive_from_new_cmds='true'
17815- # FIXME: Should let the user specify the lib program.
17816- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17817- fix_srcfile_path='`cygpath -w "$srcfile"`'
17818- enable_shared_with_static_runtimes=yes
17819+ case $cc_basename in
17820+ cl*)
17821+ # Native MSVC
17822+ hardcode_libdir_flag_spec=' '
17823+ allow_undefined_flag=unsupported
17824+ always_export_symbols=yes
17825+ file_list_spec='@'
17826+ # Tell ltmain to make .lib files, not .a files.
17827+ libext=lib
17828+ # Tell ltmain to make .dll files, not .so files.
17829+ shrext_cmds=".dll"
17830+ # FIXME: Setting linknames here is a bad hack.
17831+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
17832+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
17833+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
17834+ else
17835+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
17836+ fi~
17837+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
17838+ linknames='
17839+ # The linker will not automatically build a static lib if we build a DLL.
17840+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
17841+ enable_shared_with_static_runtimes=yes
17842+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17843+ # Don't use ranlib
17844+ old_postinstall_cmds='chmod 644 $oldlib'
17845+ postlink_cmds='lt_outputfile="@OUTPUT@"~
17846+ lt_tool_outputfile="@TOOL_OUTPUT@"~
17847+ case $lt_outputfile in
17848+ *.exe|*.EXE) ;;
17849+ *)
17850+ lt_outputfile="$lt_outputfile.exe"
17851+ lt_tool_outputfile="$lt_tool_outputfile.exe"
17852+ ;;
17853+ esac~
17854+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
17855+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
17856+ $RM "$lt_outputfile.manifest";
17857+ fi'
17858+ ;;
17859+ *)
17860+ # Assume MSVC wrapper
17861+ hardcode_libdir_flag_spec=' '
17862+ allow_undefined_flag=unsupported
17863+ # Tell ltmain to make .lib files, not .a files.
17864+ libext=lib
17865+ # Tell ltmain to make .dll files, not .so files.
17866+ shrext_cmds=".dll"
17867+ # FIXME: Setting linknames here is a bad hack.
17868+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
17869+ # The linker will automatically build a .lib file if we build a DLL.
17870+ old_archive_from_new_cmds='true'
17871+ # FIXME: Should let the user specify the lib program.
17872+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17873+ enable_shared_with_static_runtimes=yes
17874+ ;;
17875+ esac
17876 ;;
17877
17878 darwin* | rhapsody*)
17879@@ -10382,7 +10965,7 @@ if test -z "$aix_libpath"; then aix_libp
17880
17881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17882 freebsd* | dragonfly*)
17883- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
17884+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17885 hardcode_libdir_flag_spec='-R$libdir'
17886 hardcode_direct=yes
17887 hardcode_shlibpath_var=no
17888@@ -10390,7 +10973,7 @@ if test -z "$aix_libpath"; then aix_libp
17889
17890 hpux9*)
17891 if test "$GCC" = yes; then
17892- 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'
17893+ 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'
17894 else
17895 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'
17896 fi
17897@@ -10406,7 +10989,7 @@ if test -z "$aix_libpath"; then aix_libp
17898
17899 hpux10*)
17900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
17901- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17902+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17903 else
17904 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17905 fi
17906@@ -10430,10 +11013,10 @@ if test -z "$aix_libpath"; then aix_libp
17907 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17908 ;;
17909 ia64*)
17910- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17911+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17912 ;;
17913 *)
17914- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17915+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
17916 ;;
17917 esac
17918 else
17919@@ -10512,23 +11095,36 @@ fi
17920
17921 irix5* | irix6* | nonstopux*)
17922 if test "$GCC" = yes; then
17923- 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'
17924+ 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'
17925 # Try to use the -exported_symbol ld option, if it does not
17926 # work, assume that -exports_file does not work either and
17927 # implicitly export all symbols.
17928- save_LDFLAGS="$LDFLAGS"
17929- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17930- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17931+ # This should be the same for all languages, so no per-tag cache variable.
17932+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
17933+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
17934+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
17935+ $as_echo_n "(cached) " >&6
17936+else
17937+ save_LDFLAGS="$LDFLAGS"
17938+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
17939+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17940 /* end confdefs.h. */
17941-int foo(void) {}
17942+int foo (void) { return 0; }
17943 _ACEOF
17944 if ac_fn_c_try_link "$LINENO"; then :
17945- 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'
17946-
17947+ lt_cv_irix_exported_symbol=yes
17948+else
17949+ lt_cv_irix_exported_symbol=no
17950 fi
17951 rm -f core conftest.err conftest.$ac_objext \
17952 conftest$ac_exeext conftest.$ac_ext
17953- LDFLAGS="$save_LDFLAGS"
17954+ LDFLAGS="$save_LDFLAGS"
17955+fi
17956+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
17957+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
17958+ if test "$lt_cv_irix_exported_symbol" = yes; then
17959+ 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'
17960+ fi
17961 else
17962 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'
17963 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'
17964@@ -10613,7 +11209,7 @@ rm -f core conftest.err conftest.$ac_obj
17965 osf4* | osf5*) # as osf3* with the addition of -msym flag
17966 if test "$GCC" = yes; then
17967 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
17968- 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'
17969+ 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'
17970 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17971 else
17972 allow_undefined_flag=' -expect_unresolved \*'
17973@@ -10632,9 +11228,9 @@ rm -f core conftest.err conftest.$ac_obj
17974 no_undefined_flag=' -z defs'
17975 if test "$GCC" = yes; then
17976 wlarc='${wl}'
17977- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17978+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17979 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
17980- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
17981+ $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'
17982 else
17983 case `$CC -V 2>&1` in
17984 *"Compilers 5.0"*)
17985@@ -11210,8 +11806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17986 need_version=no
17987 need_lib_prefix=no
17988
17989- case $GCC,$host_os in
17990- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
17991+ case $GCC,$cc_basename in
17992+ yes,*)
17993+ # gcc
17994 library_names_spec='$libname.dll.a'
17995 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17996 postinstall_cmds='base_file=`basename \${file}`~
17997@@ -11244,13 +11841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17998 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17999 ;;
18000 esac
18001+ dynamic_linker='Win32 ld.exe'
18002+ ;;
18003+
18004+ *,cl*)
18005+ # Native MSVC
18006+ libname_spec='$name'
18007+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18008+ library_names_spec='${libname}.dll.lib'
18009+
18010+ case $build_os in
18011+ mingw*)
18012+ sys_lib_search_path_spec=
18013+ lt_save_ifs=$IFS
18014+ IFS=';'
18015+ for lt_path in $LIB
18016+ do
18017+ IFS=$lt_save_ifs
18018+ # Let DOS variable expansion print the short 8.3 style file name.
18019+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18020+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18021+ done
18022+ IFS=$lt_save_ifs
18023+ # Convert to MSYS style.
18024+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18025+ ;;
18026+ cygwin*)
18027+ # Convert to unix form, then to dos form, then back to unix form
18028+ # but this time dos style (no spaces!) so that the unix form looks
18029+ # like /cygdrive/c/PROGRA~1:/cygdr...
18030+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18031+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18032+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18033+ ;;
18034+ *)
18035+ sys_lib_search_path_spec="$LIB"
18036+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18037+ # It is most probably a Windows format PATH.
18038+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18039+ else
18040+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18041+ fi
18042+ # FIXME: find the short name or the path components, as spaces are
18043+ # common. (e.g. "Program Files" -> "PROGRA~1")
18044+ ;;
18045+ esac
18046+
18047+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18048+ postinstall_cmds='base_file=`basename \${file}`~
18049+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18050+ dldir=$destdir/`dirname \$dlpath`~
18051+ test -d \$dldir || mkdir -p \$dldir~
18052+ $install_prog $dir/$dlname \$dldir/$dlname'
18053+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18054+ dlpath=$dir/\$dldll~
18055+ $RM \$dlpath'
18056+ shlibpath_overrides_runpath=yes
18057+ dynamic_linker='Win32 link.exe'
18058 ;;
18059
18060 *)
18061+ # Assume MSVC wrapper
18062 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18063+ dynamic_linker='Win32 ld.exe'
18064 ;;
18065 esac
18066- dynamic_linker='Win32 ld.exe'
18067 # FIXME: first we should search . and the directory the executable is in
18068 shlibpath_var=PATH
18069 ;;
18070@@ -11346,7 +12001,7 @@ haiku*)
18071 soname_spec='${libname}${release}${shared_ext}$major'
18072 shlibpath_var=LIBRARY_PATH
18073 shlibpath_overrides_runpath=yes
18074- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18075+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18076 hardcode_into_libs=yes
18077 ;;
18078
18079@@ -12142,7 +12797,7 @@ else
18080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18081 lt_status=$lt_dlunknown
18082 cat > conftest.$ac_ext <<_LT_EOF
18083-#line 12145 "configure"
18084+#line $LINENO "configure"
18085 #include "confdefs.h"
18086
18087 #if HAVE_DLFCN_H
18088@@ -12186,10 +12841,10 @@ else
18089 /* When -fvisbility=hidden is used, assume the code has been annotated
18090 correspondingly for the symbols needed. */
18091 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18092-void fnord () __attribute__((visibility("default")));
18093+int fnord () __attribute__((visibility("default")));
18094 #endif
18095
18096-void fnord () { int i=42; }
18097+int fnord () { return 42; }
18098 int main ()
18099 {
18100 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18101@@ -12248,7 +12903,7 @@ else
18102 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18103 lt_status=$lt_dlunknown
18104 cat > conftest.$ac_ext <<_LT_EOF
18105-#line 12251 "configure"
18106+#line $LINENO "configure"
18107 #include "confdefs.h"
18108
18109 #if HAVE_DLFCN_H
18110@@ -12292,10 +12947,10 @@ else
18111 /* When -fvisbility=hidden is used, assume the code has been annotated
18112 correspondingly for the symbols needed. */
18113 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18114-void fnord () __attribute__((visibility("default")));
18115+int fnord () __attribute__((visibility("default")));
18116 #endif
18117
18118-void fnord () { int i=42; }
18119+int fnord () { return 42; }
18120 int main ()
18121 {
18122 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18123@@ -17606,13 +18261,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18124 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18125 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18126 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18127+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18128+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18129 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18130 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18131 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18132 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18133 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18134+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18135+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18136+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18137+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18138 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18139 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18140+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18141 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18142 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18143 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18144@@ -17627,14 +18289,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18145 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18146 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18147 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"`'
18148+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18149+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18150 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18151 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18152 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18153-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18154 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18155+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18156 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18157 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18158 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18159+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18160 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18161 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18162 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18163@@ -17667,12 +18332,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18164 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18165 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18166 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18167-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18168 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18169 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18170 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18171 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18172 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18173+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18174 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18175 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18176 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18177@@ -17782,8 +18447,13 @@ reload_flag \
18178 OBJDUMP \
18179 deplibs_check_method \
18180 file_magic_cmd \
18181+file_magic_glob \
18182+want_nocaseglob \
18183+DLLTOOL \
18184+sharedlib_from_linklib_cmd \
18185 AR \
18186 AR_FLAGS \
18187+archiver_list_spec \
18188 STRIP \
18189 RANLIB \
18190 CC \
18191@@ -17793,12 +18463,14 @@ lt_cv_sys_global_symbol_pipe \
18192 lt_cv_sys_global_symbol_to_cdecl \
18193 lt_cv_sys_global_symbol_to_c_name_address \
18194 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18195+nm_file_list_spec \
18196 lt_prog_compiler_no_builtin_flag \
18197-lt_prog_compiler_wl \
18198 lt_prog_compiler_pic \
18199+lt_prog_compiler_wl \
18200 lt_prog_compiler_static \
18201 lt_cv_prog_compiler_c_o \
18202 need_locks \
18203+MANIFEST_TOOL \
18204 DSYMUTIL \
18205 NMEDIT \
18206 LIPO \
18207@@ -17814,7 +18486,6 @@ no_undefined_flag \
18208 hardcode_libdir_flag_spec \
18209 hardcode_libdir_flag_spec_ld \
18210 hardcode_libdir_separator \
18211-fix_srcfile_path \
18212 exclude_expsyms \
18213 include_expsyms \
18214 file_list_spec \
18215@@ -17883,6 +18554,7 @@ module_cmds \
18216 module_expsym_cmds \
18217 export_symbols_cmds \
18218 prelink_cmds \
18219+postlink_cmds \
18220 postinstall_cmds \
18221 postuninstall_cmds \
18222 finish_cmds \
18223@@ -18690,7 +19362,8 @@ $as_echo X"$file" |
18224 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18225 #
18226 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18227-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18228+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18229+# Inc.
18230 # Written by Gordon Matzigkeit, 1996
18231 #
18232 # This file is part of GNU Libtool.
18233@@ -18793,19 +19466,42 @@ SP2NL=$lt_lt_SP2NL
18234 # turn newlines into spaces.
18235 NL2SP=$lt_lt_NL2SP
18236
18237+# convert \$build file names to \$host format.
18238+to_host_file_cmd=$lt_cv_to_host_file_cmd
18239+
18240+# convert \$build files to toolchain format.
18241+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18242+
18243 # An object symbol dumper.
18244 OBJDUMP=$lt_OBJDUMP
18245
18246 # Method to check whether dependent libraries are shared objects.
18247 deplibs_check_method=$lt_deplibs_check_method
18248
18249-# Command to use when deplibs_check_method == "file_magic".
18250+# Command to use when deplibs_check_method = "file_magic".
18251 file_magic_cmd=$lt_file_magic_cmd
18252
18253+# How to find potential files when deplibs_check_method = "file_magic".
18254+file_magic_glob=$lt_file_magic_glob
18255+
18256+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18257+want_nocaseglob=$lt_want_nocaseglob
18258+
18259+# DLL creation program.
18260+DLLTOOL=$lt_DLLTOOL
18261+
18262+# Command to associate shared and link libraries.
18263+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18264+
18265 # The archiver.
18266 AR=$lt_AR
18267+
18268+# Flags to create an archive.
18269 AR_FLAGS=$lt_AR_FLAGS
18270
18271+# How to feed a file listing to the archiver.
18272+archiver_list_spec=$lt_archiver_list_spec
18273+
18274 # A symbol stripping program.
18275 STRIP=$lt_STRIP
18276
18277@@ -18835,6 +19531,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18278 # Transform the output of nm in a C name address pair when lib prefix is needed.
18279 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18280
18281+# Specify filename containing input files for \$NM.
18282+nm_file_list_spec=$lt_nm_file_list_spec
18283+
18284+# The root where to search for dependent libraries,and in which our libraries should be installed.
18285+lt_sysroot=$lt_sysroot
18286+
18287 # The name of the directory that contains temporary libtool files.
18288 objdir=$objdir
18289
18290@@ -18844,6 +19546,9 @@ MAGIC_CMD=$MAGIC_CMD
18291 # Must we lock files when doing compilation?
18292 need_locks=$lt_need_locks
18293
18294+# Manifest tool.
18295+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18296+
18297 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18298 DSYMUTIL=$lt_DSYMUTIL
18299
18300@@ -18958,12 +19663,12 @@ with_gcc=$GCC
18301 # Compiler flag to turn off builtin functions.
18302 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18303
18304-# How to pass a linker flag through the compiler.
18305-wl=$lt_lt_prog_compiler_wl
18306-
18307 # Additional compiler flags for building library objects.
18308 pic_flag=$lt_lt_prog_compiler_pic
18309
18310+# How to pass a linker flag through the compiler.
18311+wl=$lt_lt_prog_compiler_wl
18312+
18313 # Compiler flag to prevent dynamic linking.
18314 link_static_flag=$lt_lt_prog_compiler_static
18315
18316@@ -19050,9 +19755,6 @@ inherit_rpath=$inherit_rpath
18317 # Whether libtool must link a program against all its dependency libraries.
18318 link_all_deplibs=$link_all_deplibs
18319
18320-# Fix the shell variable \$srcfile for the compiler.
18321-fix_srcfile_path=$lt_fix_srcfile_path
18322-
18323 # Set to "yes" if exported symbols are required.
18324 always_export_symbols=$always_export_symbols
18325
18326@@ -19068,6 +19770,9 @@ include_expsyms=$lt_include_expsyms
18327 # Commands necessary for linking programs (against libraries) with templates.
18328 prelink_cmds=$lt_prelink_cmds
18329
18330+# Commands necessary for finishing linking programs.
18331+postlink_cmds=$lt_postlink_cmds
18332+
18333 # Specify filename containing input files.
18334 file_list_spec=$lt_file_list_spec
18335
18336@@ -19114,210 +19819,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18337 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18338 # text mode, it properly converts lines to CR/LF. This bash problem
18339 # is reportedly fixed, but why not run on old versions too?
18340- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18341- || (rm -f "$cfgfile"; exit 1)
18342-
18343- case $xsi_shell in
18344- yes)
18345- cat << \_LT_EOF >> "$cfgfile"
18346-
18347-# func_dirname file append nondir_replacement
18348-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18349-# otherwise set result to NONDIR_REPLACEMENT.
18350-func_dirname ()
18351-{
18352- case ${1} in
18353- */*) func_dirname_result="${1%/*}${2}" ;;
18354- * ) func_dirname_result="${3}" ;;
18355- esac
18356-}
18357-
18358-# func_basename file
18359-func_basename ()
18360-{
18361- func_basename_result="${1##*/}"
18362-}
18363-
18364-# func_dirname_and_basename file append nondir_replacement
18365-# perform func_basename and func_dirname in a single function
18366-# call:
18367-# dirname: Compute the dirname of FILE. If nonempty,
18368-# add APPEND to the result, otherwise set result
18369-# to NONDIR_REPLACEMENT.
18370-# value returned in "$func_dirname_result"
18371-# basename: Compute filename of FILE.
18372-# value retuned in "$func_basename_result"
18373-# Implementation must be kept synchronized with func_dirname
18374-# and func_basename. For efficiency, we do not delegate to
18375-# those functions but instead duplicate the functionality here.
18376-func_dirname_and_basename ()
18377-{
18378- case ${1} in
18379- */*) func_dirname_result="${1%/*}${2}" ;;
18380- * ) func_dirname_result="${3}" ;;
18381- esac
18382- func_basename_result="${1##*/}"
18383-}
18384-
18385-# func_stripname prefix suffix name
18386-# strip PREFIX and SUFFIX off of NAME.
18387-# PREFIX and SUFFIX must not contain globbing or regex special
18388-# characters, hashes, percent signs, but SUFFIX may contain a leading
18389-# dot (in which case that matches only a dot).
18390-func_stripname ()
18391-{
18392- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18393- # positional parameters, so assign one to ordinary parameter first.
18394- func_stripname_result=${3}
18395- func_stripname_result=${func_stripname_result#"${1}"}
18396- func_stripname_result=${func_stripname_result%"${2}"}
18397-}
18398-
18399-# func_opt_split
18400-func_opt_split ()
18401-{
18402- func_opt_split_opt=${1%%=*}
18403- func_opt_split_arg=${1#*=}
18404-}
18405-
18406-# func_lo2o object
18407-func_lo2o ()
18408-{
18409- case ${1} in
18410- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18411- *) func_lo2o_result=${1} ;;
18412- esac
18413-}
18414-
18415-# func_xform libobj-or-source
18416-func_xform ()
18417-{
18418- func_xform_result=${1%.*}.lo
18419-}
18420-
18421-# func_arith arithmetic-term...
18422-func_arith ()
18423-{
18424- func_arith_result=$(( $* ))
18425-}
18426-
18427-# func_len string
18428-# STRING may not start with a hyphen.
18429-func_len ()
18430-{
18431- func_len_result=${#1}
18432-}
18433-
18434-_LT_EOF
18435- ;;
18436- *) # Bourne compatible functions.
18437- cat << \_LT_EOF >> "$cfgfile"
18438-
18439-# func_dirname file append nondir_replacement
18440-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18441-# otherwise set result to NONDIR_REPLACEMENT.
18442-func_dirname ()
18443-{
18444- # Extract subdirectory from the argument.
18445- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
18446- if test "X$func_dirname_result" = "X${1}"; then
18447- func_dirname_result="${3}"
18448- else
18449- func_dirname_result="$func_dirname_result${2}"
18450- fi
18451-}
18452-
18453-# func_basename file
18454-func_basename ()
18455-{
18456- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
18457-}
18458-
18459-
18460-# func_stripname prefix suffix name
18461-# strip PREFIX and SUFFIX off of NAME.
18462-# PREFIX and SUFFIX must not contain globbing or regex special
18463-# characters, hashes, percent signs, but SUFFIX may contain a leading
18464-# dot (in which case that matches only a dot).
18465-# func_strip_suffix prefix name
18466-func_stripname ()
18467-{
18468- case ${2} in
18469- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
18470- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
18471- esac
18472-}
18473-
18474-# sed scripts:
18475-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
18476-my_sed_long_arg='1s/^-[^=]*=//'
18477-
18478-# func_opt_split
18479-func_opt_split ()
18480-{
18481- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
18482- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
18483-}
18484-
18485-# func_lo2o object
18486-func_lo2o ()
18487-{
18488- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18489-}
18490-
18491-# func_xform libobj-or-source
18492-func_xform ()
18493-{
18494- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18495-}
18496-
18497-# func_arith arithmetic-term...
18498-func_arith ()
18499-{
18500- func_arith_result=`expr "$@"`
18501-}
18502-
18503-# func_len string
18504-# STRING may not start with a hyphen.
18505-func_len ()
18506-{
18507- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
18508-}
18509-
18510-_LT_EOF
18511-esac
18512-
18513-case $lt_shell_append in
18514- yes)
18515- cat << \_LT_EOF >> "$cfgfile"
18516-
18517-# func_append var value
18518-# Append VALUE to the end of shell variable VAR.
18519-func_append ()
18520-{
18521- eval "$1+=\$2"
18522-}
18523-_LT_EOF
18524- ;;
18525- *)
18526- cat << \_LT_EOF >> "$cfgfile"
18527-
18528-# func_append var value
18529-# Append VALUE to the end of shell variable VAR.
18530-func_append ()
18531-{
18532- eval "$1=\$$1\$2"
18533-}
18534-
18535-_LT_EOF
18536- ;;
18537- esac
18538+ sed '$q' "$ltmain" >> "$cfgfile" \
18539+ || (rm -f "$cfgfile"; exit 1)
18540
18541+ if test x"$xsi_shell" = xyes; then
18542+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
18543+func_dirname ()\
18544+{\
18545+\ case ${1} in\
18546+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18547+\ * ) func_dirname_result="${3}" ;;\
18548+\ esac\
18549+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
18550+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18551+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18552+test 0 -eq $? || _lt_function_replace_fail=:
18553+
18554+
18555+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
18556+func_basename ()\
18557+{\
18558+\ func_basename_result="${1##*/}"\
18559+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
18560+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18561+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18562+test 0 -eq $? || _lt_function_replace_fail=:
18563+
18564+
18565+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
18566+func_dirname_and_basename ()\
18567+{\
18568+\ case ${1} in\
18569+\ */*) func_dirname_result="${1%/*}${2}" ;;\
18570+\ * ) func_dirname_result="${3}" ;;\
18571+\ esac\
18572+\ func_basename_result="${1##*/}"\
18573+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
18574+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18575+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18576+test 0 -eq $? || _lt_function_replace_fail=:
18577+
18578+
18579+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
18580+func_stripname ()\
18581+{\
18582+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
18583+\ # positional parameters, so assign one to ordinary parameter first.\
18584+\ func_stripname_result=${3}\
18585+\ func_stripname_result=${func_stripname_result#"${1}"}\
18586+\ func_stripname_result=${func_stripname_result%"${2}"}\
18587+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
18588+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18589+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18590+test 0 -eq $? || _lt_function_replace_fail=:
18591+
18592+
18593+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
18594+func_split_long_opt ()\
18595+{\
18596+\ func_split_long_opt_name=${1%%=*}\
18597+\ func_split_long_opt_arg=${1#*=}\
18598+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
18599+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18600+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18601+test 0 -eq $? || _lt_function_replace_fail=:
18602+
18603+
18604+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
18605+func_split_short_opt ()\
18606+{\
18607+\ func_split_short_opt_arg=${1#??}\
18608+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
18609+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
18610+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18611+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18612+test 0 -eq $? || _lt_function_replace_fail=:
18613+
18614+
18615+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
18616+func_lo2o ()\
18617+{\
18618+\ case ${1} in\
18619+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
18620+\ *) func_lo2o_result=${1} ;;\
18621+\ esac\
18622+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
18623+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18624+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18625+test 0 -eq $? || _lt_function_replace_fail=:
18626+
18627+
18628+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
18629+func_xform ()\
18630+{\
18631+ func_xform_result=${1%.*}.lo\
18632+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
18633+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18634+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18635+test 0 -eq $? || _lt_function_replace_fail=:
18636+
18637+
18638+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
18639+func_arith ()\
18640+{\
18641+ func_arith_result=$(( $* ))\
18642+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
18643+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18645+test 0 -eq $? || _lt_function_replace_fail=:
18646+
18647+
18648+ sed -e '/^func_len ()$/,/^} # func_len /c\
18649+func_len ()\
18650+{\
18651+ func_len_result=${#1}\
18652+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
18653+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18654+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18655+test 0 -eq $? || _lt_function_replace_fail=:
18656+
18657+fi
18658+
18659+if test x"$lt_shell_append" = xyes; then
18660+ sed -e '/^func_append ()$/,/^} # func_append /c\
18661+func_append ()\
18662+{\
18663+ eval "${1}+=\\${2}"\
18664+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
18665+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18666+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18667+test 0 -eq $? || _lt_function_replace_fail=:
18668+
18669+
18670+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
18671+func_append_quoted ()\
18672+{\
18673+\ func_quote_for_eval "${2}"\
18674+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
18675+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
18676+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18677+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18678+test 0 -eq $? || _lt_function_replace_fail=:
18679+
18680+
18681+ # Save a `func_append' function call where possible by direct use of '+='
18682+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
18683+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18684+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18685+ test 0 -eq $? || _lt_function_replace_fail=:
18686+else
18687+ # Save a `func_append' function call even when '+=' is not available
18688+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
18689+ && mv -f "$cfgfile.tmp" "$cfgfile" \
18690+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
18691+ test 0 -eq $? || _lt_function_replace_fail=:
18692+fi
18693+
18694+if test x"$_lt_function_replace_fail" = x":"; then
18695+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
18696+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
18697+fi
18698
18699- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
18700- || (rm -f "$cfgfile"; exit 1)
18701
18702- mv -f "$cfgfile" "$ofile" ||
18703+ mv -f "$cfgfile" "$ofile" ||
18704 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
18705 chmod +x "$ofile"
18706
18707Index: binutils-2.21.1/bfd/configure.in
18708===================================================================
18709--- binutils-2.21.1.orig/bfd/configure.in
18710+++ binutils-2.21.1/bfd/configure.in
18711@@ -536,7 +536,7 @@ changequote(,)dnl
18712 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18713 changequote([,])dnl
18714 if test -n "$x"; then
18715- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18716+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18717 fi
18718
18719 # More hacks to build DLLs on Windows.
18720Index: binutils-2.21.1/opcodes/configure.in
18721===================================================================
18722--- binutils-2.21.1.orig/opcodes/configure.in
18723+++ binutils-2.21.1/opcodes/configure.in
18724@@ -134,7 +134,7 @@ changequote(,)dnl
18725 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18726 changequote([,])dnl
18727 if test -n "$x"; then
18728- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18729+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18730 fi
18731
18732 case "${host}" in
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch b/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
new file mode 100644
index 0000000000..2666d311ff
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
@@ -0,0 +1,38 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Enabling sysroot support in libtool exposed a bug where the final
4library had an RPATH encoded into it which still pointed to the
5sysroot. This works around the issue until it gets sorted out
6upstream.
7
8Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
9Signed-off-by: Scott Garman <scott.a.garman@intel.com>
10
11diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh
12--- binutils-2.21.orig//ltmain.sh 2011-01-18 11:50:40.821710085 -0800
13+++ binutils-2.21/ltmain.sh 2011-01-18 11:51:38.774952785 -0800
14@@ -8035,9 +8035,11 @@
15 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16 for libdir in $rpath; do
17 if test -n "$hardcode_libdir_flag_spec"; then
18+ func_replace_sysroot "$libdir"
19+ libdir=$func_replace_sysroot_result
20+ func_stripname '=' '' "$libdir"
21+ libdir=$func_stripname_result
22 if test -n "$hardcode_libdir_separator"; then
23- func_replace_sysroot "$libdir"
24- libdir=$func_replace_sysroot_result
25 if test -z "$hardcode_libdirs"; then
26 hardcode_libdirs="$libdir"
27 else
28@@ -8770,6 +8772,10 @@
29 hardcode_libdirs=
30 for libdir in $compile_rpath $finalize_rpath; do
31 if test -n "$hardcode_libdir_flag_spec"; then
32+ func_replace_sysroot "$libdir"
33+ libdir=$func_replace_sysroot_result
34+ func_stripname '=' '' "$libdir"
35+ libdir=$func_stripname_result
36 if test -n "$hardcode_libdir_separator"; then
37 if test -z "$hardcode_libdirs"; then
38 hardcode_libdirs="$libdir"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-01 11:15:47 +0000